From edbf8a32cc8515b633084b0fe37e975980ffc9a3 Mon Sep 17 00:00:00 2001 From: sat Date: Wed, 18 Jul 2007 10:15:15 +0000 Subject: - Update to 0.8.5a --- deskutils/fbreader/Makefile | 18 ++++++++++++------ deskutils/fbreader/distinfo | 6 +++--- ...brary__src__unix__iconv__IConvEncodingConverter.cpp | 4 ++-- .../patch-zlibrary__src__unix__time__ZLUnixTime.cpp | 4 ++-- deskutils/fbreader/pkg-plist | 10 ++++++++-- 5 files changed, 27 insertions(+), 15 deletions(-) diff --git a/deskutils/fbreader/Makefile b/deskutils/fbreader/Makefile index 6628d5194511..7a489967ac57 100644 --- a/deskutils/fbreader/Makefile +++ b/deskutils/fbreader/Makefile @@ -7,7 +7,7 @@ PORTNAME= fbreader DISTVERSIONPREFIX= sources- -DISTVERSION= 0.8.4a +DISTVERSION= 0.8.5a CATEGORIES= deskutils MASTER_SITES= http://www.fbreader.org/ CENKES EXTRACT_SUFX= .tgz @@ -18,6 +18,7 @@ COMMENT= Powerful e-book reader LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 \ enca.5:${PORTSDIR}/converters/enca +USE_LDCONFIG= yes USE_QT_VER= 4 QT_COMPONENTS= gui corelib moc USE_GMAKE= yes @@ -26,16 +27,21 @@ LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lcompat MAKE_ENV+= TARGET_ARCH=desktop UI_TYPE=qt4 TARGET_STATUS=release \ ROOTDIR=${WRKSRC} EXTERNALINCLUDE="-I${LOCALBASE}/include" \ LDFLAGS="${LDFLAGS}" INSTALLDIR="${PREFIX}" LIBDIR=${PREFIX}/lib \ - BUILD_SHARED_LIBRARY=no + BUILD_SHARED_LIBRARY=yes MAKE_ARGS+= MAKE=gmake WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} INSTALL_TARGET= do_install post-patch: @${REINPLACE_CMD} -e '/^LDFLAGS/s|=|+=|' ${WRKSRC}/makefiles/arch/*mk - @${FIND} ${WRKSRC} -name Makefile|\ - ${XARGS} ${REINPLACE_CMD} -e 's/make /gmake /g' - @${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|g'\ - ${WRKSRC}/fbreader/desktop/Makefile + @${REINPLACE_CMD} -e 's|-ldl||;/CORE_LIBS/s|$$| -liconv|'\ + ${WRKSRC}/makefiles/config.mk ${WRKSRC}/zlibrary/core/Makefile + @${REINPLACE_CMD} -e '/TARGET =/s|\.so\..*|.so.0|;s|$$[(]LIBDIR[)]|${PREFIX}/lib|'\ + ${WRKSRC}/zlibrary/[ct]*/Makefile + @${FIND} ${WRKSRC} -name Makefile -or -name \*.mk|\ + ${XARGS} ${REINPLACE_CMD} -e 's/make /gmake /g;\ + s|/usr/local|%%PREFIX%%|g;s|/usr|%%PREFIX%%|g;s|%%PREFIX%%|${PREFIX}|g' + +# fuzpath: FBReader zlibrary libzl .include diff --git a/deskutils/fbreader/distinfo b/deskutils/fbreader/distinfo index 33de92d0c049..e479c1f6ebb9 100644 --- a/deskutils/fbreader/distinfo +++ b/deskutils/fbreader/distinfo @@ -1,3 +1,3 @@ -MD5 (fbreader-sources-0.8.4a.tgz) = f9d538511dd3a0ab3545cd21282bc397 -SHA256 (fbreader-sources-0.8.4a.tgz) = 71da7c05363eab0478190e7f95dec5e806ade15f94b36b1bc945e19cdc22a8ed -SIZE (fbreader-sources-0.8.4a.tgz) = 875271 +MD5 (fbreader-sources-0.8.5a.tgz) = 6b6345b20052002f3597ba756d2387ac +SHA256 (fbreader-sources-0.8.5a.tgz) = d58b07ab4e97b9f375f777a291129b5c2789c8b5eb8a88b04744ba6a12fffa2d +SIZE (fbreader-sources-0.8.5a.tgz) = 922881 diff --git a/deskutils/fbreader/files/patch-zlibrary__src__unix__iconv__IConvEncodingConverter.cpp b/deskutils/fbreader/files/patch-zlibrary__src__unix__iconv__IConvEncodingConverter.cpp index 694e9add27a8..82f3101f482b 100644 --- a/deskutils/fbreader/files/patch-zlibrary__src__unix__iconv__IConvEncodingConverter.cpp +++ b/deskutils/fbreader/files/patch-zlibrary__src__unix__iconv__IConvEncodingConverter.cpp @@ -1,5 +1,5 @@ ---- ./zlibrary/src/unix/iconv/IConvEncodingConverter.cpp.orig Tue Apr 17 22:53:30 2007 -+++ ./zlibrary/src/unix/iconv/IConvEncodingConverter.cpp Sat Apr 21 18:50:56 2007 +--- ./zlibrary/core/src/unix/iconv/IConvEncodingConverter.cpp.orig Tue Apr 17 22:53:30 2007 ++++ ./zlibrary/core/src/unix/iconv/IConvEncodingConverter.cpp Sat Apr 21 18:50:56 2007 @@ -87,7 +87,7 @@ char *out = (char*)dst.data() + oldLength; diff --git a/deskutils/fbreader/files/patch-zlibrary__src__unix__time__ZLUnixTime.cpp b/deskutils/fbreader/files/patch-zlibrary__src__unix__time__ZLUnixTime.cpp index a440ea27d048..5acfa049e9a6 100644 --- a/deskutils/fbreader/files/patch-zlibrary__src__unix__time__ZLUnixTime.cpp +++ b/deskutils/fbreader/files/patch-zlibrary__src__unix__time__ZLUnixTime.cpp @@ -1,5 +1,5 @@ ---- ./zlibrary/src/unix/time/ZLUnixTime.cpp.orig Tue Apr 17 22:53:30 2007 -+++ ./zlibrary/src/unix/time/ZLUnixTime.cpp Sat Apr 28 00:13:29 2007 +--- ./zlibrary/core/src/unix/time/ZLUnixTime.cpp.orig Tue Apr 17 22:53:30 2007 ++++ ./zlibrary/core/src/unix/time/ZLUnixTime.cpp Sat Apr 28 00:13:29 2007 @@ -18,21 +18,22 @@ * 02110-1301, USA. */ diff --git a/deskutils/fbreader/pkg-plist b/deskutils/fbreader/pkg-plist index a6eddec06dba..eb560199801c 100644 --- a/deskutils/fbreader/pkg-plist +++ b/deskutils/fbreader/pkg-plist @@ -1,4 +1,6 @@ bin/FBReader +lib/libzlcore.so.0 +lib/libzltext.so.0 share/FBReader/default/config.xml share/FBReader/default/external.xml share/FBReader/default/keymap.xml @@ -10,12 +12,12 @@ share/FBReader/formats/xhtml/xhtml-symbol.ent share/FBReader/help/MiniHelp.en.fb2 share/FBReader/help/MiniHelp.fr.fb2 share/FBReader/help/MiniHelp.ru.fb2 -share/FBReader/hyphenationPatterns.zip +share/FBReader/help/MiniHelp.uk.fb2 share/FBReader/resources/en.xml share/FBReader/resources/fr.xml share/FBReader/resources/ru.xml +share/FBReader/resources/uk.xml share/applications/FBReader.desktop -share/pixmaps/FBReader/TOCHANGE share/pixmaps/FBReader/addbook.png share/pixmaps/FBReader/bookinfo.png share/pixmaps/FBReader/books.png @@ -70,10 +72,13 @@ share/zlibrary/encodings/ISO-8859-9 share/zlibrary/encodings/KOI8-R share/zlibrary/encodings/windows-1251 share/zlibrary/encodings/windows-1252 +share/zlibrary/hyphenationPatterns.zip share/zlibrary/keynames-qt4.xml share/zlibrary/resources/en.xml share/zlibrary/resources/fr.xml share/zlibrary/resources/ru.xml +share/zlibrary/resources/uk.xml +share/zlibrary/ui/zlui-qt4.so @dirrm share/FBReader/default @dirrm share/FBReader/formats/html @dirrm share/FBReader/formats/xhtml @@ -84,5 +89,6 @@ share/zlibrary/resources/ru.xml @dirrm share/pixmaps/FBReader @dirrm share/zlibrary/encodings @dirrm share/zlibrary/resources +@dirrm share/zlibrary/ui @dirrm share/zlibrary @dirrmtry share/applications -- cgit