diff options
| -rw-r--r-- | misc/fbreader/Makefile | 6 | ||||
| -rw-r--r-- | misc/fbreader/PLIST | 6 | ||||
| -rw-r--r-- | misc/fbreader/distinfo | 12 | ||||
| -rw-r--r-- | misc/fbreader/patches/patch-ag | 14 | ||||
| -rw-r--r-- | misc/fbreader/patches/patch-ah | 14 |
5 files changed, 27 insertions, 25 deletions
diff --git a/misc/fbreader/Makefile b/misc/fbreader/Makefile index d793633defb..5043e8cde2c 100644 --- a/misc/fbreader/Makefile +++ b/misc/fbreader/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.4 2009/08/31 20:17:48 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2009/10/31 03:20:35 wiz Exp $ # -DISTNAME= fbreader-sources-0.10.1 +DISTNAME= fbreader-sources-0.10.7 PKGNAME= ${DISTNAME:S/-sources//} -PKGREVISION= 1 CATEGORIES= misc MASTER_SITES= http://www.fbreader.org/ EXTRACT_SUFX= .tgz @@ -11,6 +10,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.fbreader.org/ COMMENT= Ebook reader software +LICENSE= gnu-gpl-v2 AND modified-bsd PKG_DESTDIR_SUPPORT= user-destdir diff --git a/misc/fbreader/PLIST b/misc/fbreader/PLIST index 2108ca7f2f5..a15dad57775 100644 --- a/misc/fbreader/PLIST +++ b/misc/fbreader/PLIST @@ -1,9 +1,9 @@ -@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:07:21 joerg Exp $ +@comment $NetBSD: PLIST,v 1.3 2009/10/31 03:20:35 wiz Exp $ bin/FBReader lib/libzlcore.so.0.10 -lib/libzlcore.so.0.10.1 +lib/libzlcore.so.0.10.7 lib/libzltext.so.0.10 -lib/libzltext.so.0.10.1 +lib/libzltext.so.0.10.7 lib/zlibrary/ui/zlui-gtk.so share/FBReader/default/config.xml share/FBReader/default/external.xml diff --git a/misc/fbreader/distinfo b/misc/fbreader/distinfo index 211a7bd6770..5eaa345672e 100644 --- a/misc/fbreader/distinfo +++ b/misc/fbreader/distinfo @@ -1,15 +1,15 @@ -$NetBSD: distinfo,v 1.1.1.1 2009/01/18 17:39:37 wiz Exp $ +$NetBSD: distinfo,v 1.2 2009/10/31 03:20:35 wiz Exp $ -SHA1 (fbreader-sources-0.10.1.tgz) = 83589da5559d324503cdc0967c4df71b2fddf43d -RMD160 (fbreader-sources-0.10.1.tgz) = 1dd908c143875b08f8b04c6945e15652b64da364 -Size (fbreader-sources-0.10.1.tgz) = 1596725 bytes +SHA1 (fbreader-sources-0.10.7.tgz) = d47a2fa46d43057cac9408db1f2c409f0d3a9942 +RMD160 (fbreader-sources-0.10.7.tgz) = dec4d8ee716697dd021535295c9fe62970f059a2 +Size (fbreader-sources-0.10.7.tgz) = 1600984 bytes SHA1 (patch-aa) = c76391244ee4a5f2efb1729157638ddb1ca97d3e SHA1 (patch-ab) = b2b2efd7389a847429003e460bd3ccfe4fb27722 SHA1 (patch-ac) = 95c7a7bee4cfc017cdf52ac04895d78fde2530df SHA1 (patch-ad) = 1ba41ce767a7affeae6a02953eea390b8db88bf7 SHA1 (patch-ae) = 29b33b9440e013cf87ae02ec4d32826f62e6b2ba SHA1 (patch-af) = dad6ecbf5ca5663d11ea4a5dbb0bed1ab3cae6d8 -SHA1 (patch-ag) = 9c536b53b51bec9394f40d3b12fd14d162c212f1 -SHA1 (patch-ah) = dabb36a6370840f7a0efd8b8398b8dcac3d83882 +SHA1 (patch-ag) = 19e92bd82df3cfb134ff17c9bdbb59028aceff95 +SHA1 (patch-ah) = 1a154c4650eefd8d255e3b17583e401000c07a54 SHA1 (patch-ai) = d851a0cc23f9515afa5433cb31755a792b5a9345 SHA1 (patch-aj) = 5db2865b8975eb9972ec78ebc0914a81bd382b4c diff --git a/misc/fbreader/patches/patch-ag b/misc/fbreader/patches/patch-ag index 800200d3228..de1dfd7f387 100644 --- a/misc/fbreader/patches/patch-ag +++ b/misc/fbreader/patches/patch-ag @@ -1,13 +1,15 @@ -$NetBSD: patch-ag,v 1.1.1.1 2009/01/18 17:39:37 wiz Exp $ +$NetBSD: patch-ag,v 1.2 2009/10/31 03:20:35 wiz Exp $ ---- zlibrary/core/Makefile.orig 2008-03-22 13:00:31.000000000 +0000 +--- zlibrary/core/Makefile.orig 2009-10-20 11:48:34.000000000 +0000 +++ zlibrary/core/Makefile -@@ -44,7 +44,7 @@ $(TARGET): .objects - @echo -n "Creating $@ ..." +@@ -50,8 +50,8 @@ $(TARGET): .objects + @echo -n 'Creating $@ ...' @$(RM_QUIET) $(TARGET) ifeq "$(ZLSHARED)" "yes" -- @$(LD) $(LDFLAGS) -shared -Wl,-soname,$(TARGET_SONAME) -o $(TARGET) -lc $(patsubst %, %/*.o, $(SUBDIRS)) $(XML_LIB) $(ARCHIVER_LIB) -ldl -+ @$(LD) $(LDFLAGS) -shared -Wl,-soname,$(TARGET_SONAME) -o $(TARGET) -lc $(patsubst %, %/*.o, $(SUBDIRS)) $(XML_LIB) $(ARCHIVER_LIB) +- @$(LD) $(LDFLAGS) -shared -Wl,-soname,$(TARGET_SONAME) -o $(TARGET) -lc $(patsubst %, %/*.o, $(SUBDIRS)) $(XML_LIBS) $(ARCHIVER_LIBS) $(NETWORK_LIBS) -ldl +- #@$(LD) $(LDFLAGS) -dynamiclib -dylinker_install_name $(TARGET_SONAME) -o $(TARGET) -lc $(patsubst %, %/*.o, $(SUBDIRS)) $(XML_LIBS) $(ARCHIVER_LIBS) $(NETWORK_LIBS) -ldl -liconv ++ @$(LD) $(LDFLAGS) -shared -Wl,-soname,$(TARGET_SONAME) -o $(TARGET) -lc $(patsubst %, %/*.o, $(SUBDIRS)) $(XML_LIBS) $(ARCHIVER_LIBS) $(NETWORK_LIBS) ++ #@$(LD) $(LDFLAGS) -dynamiclib -dylinker_install_name $(TARGET_SONAME) -o $(TARGET) -lc $(patsubst %, %/*.o, $(SUBDIRS)) $(XML_LIBS) $(ARCHIVER_LIBS) $(NETWORK_LIBS) -liconv @ln -sf $(TARGET) $(TARGET_SONAME) @ln -sf $(TARGET) $(TARGET_SHORTNAME) else diff --git a/misc/fbreader/patches/patch-ah b/misc/fbreader/patches/patch-ah index 56675978fe9..639f801bf9b 100644 --- a/misc/fbreader/patches/patch-ah +++ b/misc/fbreader/patches/patch-ah @@ -1,15 +1,15 @@ -$NetBSD: patch-ah,v 1.1.1.1 2009/01/18 17:39:37 wiz Exp $ +$NetBSD: patch-ah,v 1.2 2009/10/31 03:20:35 wiz Exp $ ---- makefiles/config.mk.orig 2009-01-11 01:44:33.000000000 +0100 +--- makefiles/config.mk.orig 2009-10-20 11:48:35.000000000 +0000 +++ makefiles/config.mk -@@ -33,8 +33,8 @@ ZINCLUDE = -I $(ROOTDIR)/zlibrary/core/i +@@ -38,8 +38,8 @@ ZINCLUDE = -I $(ROOTDIR)/zlibrary/core/i ZLSHARED ?= yes ifeq "$(ZLSHARED)" "yes" -- CORE_LIBS = -lm -L$(ROOTDIR)/zlibrary/core -lzlcore $(XML_LIB) $(ARCHIVER_LIB) -ldl +- CORE_LIBS = -lm -L$(ROOTDIR)/zlibrary/core -lzlcore -ldl - TEXT_LIBS = -lzltext -+ CORE_LIBS = -lm -L$(ROOTDIR)/zlibrary/core -lzlcore $(XML_LIB) $(ARCHIVER_LIB) ++ CORE_LIBS = -lm -L$(ROOTDIR)/zlibrary/core -lzlcore + TEXT_LIBS = -lzltext -llinebreak else - CORE_LIBS = -lm -L$(ROOTDIR)/zlibrary/ui -L$(ROOTDIR)/zlibrary/core -lzlcore -lzlui-$(UI_TYPE) -lzlcore $(UILIBS) $(XML_LIB) $(ARCHIVER_LIB) - TEXT_LIBS = -lzltext -llinebreak -lfribidi + CORE_LIBS = -lm -L$(ROOTDIR)/zlibrary/ui -L$(ROOTDIR)/zlibrary/core -lzlcore -lzlui-$(UI_TYPE) -lzlcore $(UILIBS) $(XML_LIBS) $(ARCHIVER_LIBS) $(NETWORK_LIBS) + TEXT_LIBS = -lzltext $(EXTERNAL_LIBS) -llinebreak -lfribidi |