Date: Sun, 25 Jan 2009 04:43:19 +0300 (MSK) From: Yuri Pankov <yuri.pankov@gmail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/130961: [PATCH] deskutils/fbreader: update to 0.10.2, take maintainership Message-ID: <200901250143.n0P1hJV2059388@darklight.homeunix.org> Resent-Message-ID: <200901250150.n0P1o1Rg048156@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 130961 >Category: ports >Synopsis: [PATCH] deskutils/fbreader: update to 0.10.2, take maintainership >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sun Jan 25 01:50:00 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Yuri Pankov >Release: FreeBSD 8.0-CURRENT amd64 >Organization: >Environment: System: FreeBSD darklight.homeunix.org 8.0-CURRENT FreeBSD 8.0-CURRENT #0: Wed Dec 3 06:14:28 UTC >Description: - Update to 0.10.2 - Take maintainership - Use more conformant WITH_GTK2 knob for GTK2 UI - Depends on ports/130949 Removed file(s): - files/patch-zlibrary__src__unix__iconv__IConvEncodingConverter.cpp Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- fbreader-0.10.2.patch begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/deskutils/fbreader/Makefile,v retrieving revision 1.28 diff -u -r1.28 Makefile --- Makefile 7 Sep 2008 00:18:23 -0000 1.28 +++ Makefile 25 Jan 2009 01:35:37 -0000 @@ -6,53 +6,52 @@ # PORTNAME= fbreader -PORTVERSION= 0.8.15 +PORTVERSION= 0.10.2 DISTVERSIONPREFIX= sources- -PORTREVISION= 1 CATEGORIES= deskutils MASTER_SITES= http://www.fbreader.org/ CENKES EXTRACT_SUFX= .tgz -MAINTAINER= ports@FreeBSD.org +MAINTAINER= yuri.pankov@gmail.com COMMENT= Powerful e-book reader -LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 +LIB_DEPENDS= curl.5:${PORTSDIR}/ftp/curl \ + expat.6:${PORTSDIR}/textproc/expat2 \ + fribidi.0:${PORTSDIR}/converters/fribidi \ + linebreak.1:${PORTSDIR}/textproc/liblinebreak -USE_LDCONFIG= yes -.ifdef WITHOUT_QT -UI= gtk +.if defined(WITH_GTK2) +UI= gtk USE_GNOME= gtk20 .else -UI= qt4 +UI= qt4 USE_QT_VER= 4 QT_COMPONENTS= gui corelib moc LDFLAGS+= -L${QT_LIBDIR} .endif + USE_GMAKE= yes -CFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lcompat -MAKE_ENV+= TARGET_ARCH=desktop UI_TYPE=${UI} TARGET_STATUS=release \ - ROOTDIR=${WRKSRC} EXTERNALINCLUDE="-I${LOCALBASE}/include" \ - LDFLAGS="${LDFLAGS}" INSTALLDIR="${PREFIX}" LIBDIR=${PREFIX}/lib \ - BUILD_SHARED_LIBRARY=yes LD="${CXX}" -MAKE_ARGS+= MAKE=gmake LIBDIR=${PREFIX}/lib -WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} +USE_LDCONFIG= yes + INSTALL_TARGET= do_install PLIST_SUB= UI=${UI} -PORT_VERBS= FBReader zlibrary libzl +WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} + +CFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib +MAKE_ENV+= TARGET_ARCH=desktop UI_TYPE=${UI} TARGET_STATUS=release \ + ROOTDIR=${WRKSRC} INSTALLDIR=${PREFIX} LIBDIR=${PREFIX}/lib \ + LD="${CXX}" LDFLAGS="${LDFLAGS}" +MAKE_ARGS+= MAKE=${GMAKE} LIBDIR=${PREFIX}/lib post-patch: - @${REINPLACE_CMD} -e '/^LDFLAGS/s|=|+=|' ${WRKSRC}/makefiles/arch/*mk - @${REINPLACE_CMD} -e 's|-ldl||;/CORE_LIBS/s|$$| -liconv|'\ - ${WRKSRC}/makefiles/config.mk ${WRKSRC}/zlibrary/core/Makefile - @${REINPLACE_CMD} -e 's|libpng |libpng12 |'\ + @${REINPLACE_CMD} -e '/^CFLAGS/s,-pipe.*$$,${CFLAGS} -DDO_ICONV_CAST -DLIBICONV_PLUG,' \ + -e '/^CC/d;/^LD/d;/QTINCLUDE/s,-I.*$$,-I${QT_INCDIR},;s,libpng ,libpng12 ,' \ ${WRKSRC}/makefiles/arch/desktop.mk - @${REINPLACE_CMD} -e '/TARGET =/s|\.so\..*|.so.0|;s|$$[(]LIBDIR[)]|${PREFIX}/lib|'\ - ${WRKSRC}/zlibrary/[ct]*/Makefile - @${FIND} ${WRKSRC} -name Makefile -or -name \*.mk -or -name rules|\ - ${XARGS} ${REINPLACE_CMD} -e 's/make /gmake /g;s| @| |;\ - s|/usr/local|%%PREFIX%%|g;s|/usr|%%PREFIX%%|g;s|%%PREFIX%%|${PREFIX}|g;\ - /^CC =/d;/^LD =/d;s|-pipe||;s|-O3|${CFLAGS}|' - @${FIND} ${WRKSRC} -name '*.bak' -delete + @${REINPLACE_CMD} -e 's,-O3,,;s,-ldl,-liconv,' \ + ${WRKSRC}/makefiles/config.mk ${WRKSRC}/zlibrary/core/Makefile + @${REINPLACE_CMD} -e 's,/usr,${PREFIX},' ${WRKSRC}/fbreader/desktop/Makefile + @${FIND} ${WRKSRC} -name Makefile | ${XARGS} ${REINPLACE_CMD} \ + -e 's,make ,gmake ,' .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /home/ncvs/ports/deskutils/fbreader/distinfo,v retrieving revision 1.22 diff -u -r1.22 distinfo --- distinfo 28 Feb 2008 15:36:10 -0000 1.22 +++ distinfo 25 Jan 2009 01:35:37 -0000 @@ -1,3 +1,3 @@ -MD5 (fbreader-sources-0.8.15.tgz) = f2a14d1a5915b69046b54aa3761e2b66 -SHA256 (fbreader-sources-0.8.15.tgz) = 6f91a3d34ed15b2e42b46e03473d3b66377bf5b0b9b19cdfaa3a77125043025c -SIZE (fbreader-sources-0.8.15.tgz) = 1201103 +MD5 (fbreader-sources-0.10.2.tgz) = 0e38c9ee1b08c1dabfeff9a1e9f37e85 +SHA256 (fbreader-sources-0.10.2.tgz) = e62ccbdeb02c4c95228c9837783be65b6289825253d547d3eb0d7b562612f27e +SIZE (fbreader-sources-0.10.2.tgz) = 1599460 Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/deskutils/fbreader/pkg-plist,v retrieving revision 1.13 diff -u -r1.13 pkg-plist --- pkg-plist 28 Feb 2008 15:36:10 -0000 1.13 +++ pkg-plist 25 Jan 2009 01:35:37 -0000 @@ -1,18 +1,22 @@ bin/FBReader -lib/libzlcore.so.0 -lib/libzlcore.so.0.9 -lib/libzltext.so.0 -lib/libzltext.so.0.9 +lib/libzlcore.so.0.10 +lib/libzlcore.so.0.10.2 +lib/libzltext.so.0.10 +lib/libzltext.so.0.10.2 lib/zlibrary/ui/zlui-%%UI%%.so share/FBReader/default/config.xml share/FBReader/default/external.xml +share/FBReader/default/fullscreen_toolbar.xml share/FBReader/default/keymap.xml share/FBReader/default/styles.xml share/FBReader/default/toolbar.xml +share/FBReader/formats/fb2/FBReaderVersion.ent +share/FBReader/formats/fb2/fb2genres.xml share/FBReader/formats/html/html.ent share/FBReader/formats/xhtml/xhtml-lat1.ent share/FBReader/formats/xhtml/xhtml-special.ent share/FBReader/formats/xhtml/xhtml-symbol.ent +share/FBReader/help/MiniHelp.cs.fb2 share/FBReader/help/MiniHelp.en.fb2 share/FBReader/help/MiniHelp.fi.fb2 share/FBReader/help/MiniHelp.fr.fb2 @@ -21,6 +25,8 @@ share/FBReader/help/MiniHelp.ru.fb2 share/FBReader/help/MiniHelp.sv.fb2 share/FBReader/help/MiniHelp.uk.fb2 +share/FBReader/resources/ar.xml +share/FBReader/resources/cs.xml share/FBReader/resources/en.xml share/FBReader/resources/fi.xml share/FBReader/resources/fr.xml @@ -30,8 +36,12 @@ share/FBReader/resources/sv.xml share/FBReader/resources/uk.xml share/applications/FBReader.desktop +share/pixmaps/FBReader.png share/pixmaps/FBReader/addBook.png +share/pixmaps/FBReader/advancedSearchOnNetwork.png share/pixmaps/FBReader/bookInfo.png +share/pixmaps/FBReader/byAuthor.png +share/pixmaps/FBReader/byTag.png share/pixmaps/FBReader/fb2.png share/pixmaps/FBReader/findNext.png share/pixmaps/FBReader/findPrevious.png @@ -50,19 +60,30 @@ share/pixmaps/FBReader/search.png share/pixmaps/FBReader/showHelp.png share/pixmaps/FBReader/showLibrary.png +share/pixmaps/FBReader/showNetLibrary.png +share/pixmaps/FBReader/showReading.png share/pixmaps/FBReader/showRecent.png share/pixmaps/FBReader/tcr.png share/pixmaps/FBReader/toc.png share/pixmaps/FBReader/tree-authorinfo.png share/pixmaps/FBReader/tree-bookinfo.png -share/pixmaps/FBReader/tree-order.png -share/pixmaps/FBReader/tree-remove.png +share/pixmaps/FBReader/tree-download-epub.png +share/pixmaps/FBReader/tree-download-fb2.png +share/pixmaps/FBReader/tree-download-mobi.png +share/pixmaps/FBReader/tree-local-epub.png +share/pixmaps/FBReader/tree-local-fb2.png +share/pixmaps/FBReader/tree-local-mobi.png +share/pixmaps/FBReader/tree-open-in-browser.png +share/pixmaps/FBReader/tree-order-series.png +share/pixmaps/FBReader/tree-removebook.png +share/pixmaps/FBReader/tree-removetag.png +share/pixmaps/FBReader/tree-strut.png +share/pixmaps/FBReader/tree-taginfo.png share/pixmaps/FBReader/undo.png share/pixmaps/FBReader/unknown.png share/pixmaps/FBReader/upfolder.png share/pixmaps/FBReader/weasel.png share/pixmaps/FBReader/zipfolder.png -share/pixmaps/FBReader.png share/zlibrary/default/config.xml share/zlibrary/encodings/Big5 share/zlibrary/encodings/Encodings.xml @@ -89,6 +110,8 @@ share/zlibrary/hyphenationPatterns.zip share/zlibrary/keynames-%%UI%%.xml share/zlibrary/languagePatterns.zip +share/zlibrary/resources/ar.xml +share/zlibrary/resources/cs.xml share/zlibrary/resources/en.xml share/zlibrary/resources/fi.xml share/zlibrary/resources/fr.xml @@ -97,9 +120,11 @@ share/zlibrary/resources/ru.xml share/zlibrary/resources/sv.xml share/zlibrary/resources/uk.xml +share/zlibrary/unicode.xml.gz @dirrm lib/zlibrary/ui @dirrm lib/zlibrary @dirrm share/FBReader/default +@dirrm share/FBReader/formats/fb2 @dirrm share/FBReader/formats/html @dirrm share/FBReader/formats/xhtml @dirrm share/FBReader/formats @@ -111,4 +136,3 @@ @dirrm share/zlibrary/encodings @dirrm share/zlibrary/resources @dirrm share/zlibrary -@dirrmtry share/applications Index: files/patch-zlibrary__src__unix__iconv__IConvEncodingConverter.cpp =================================================================== RCS file: files/patch-zlibrary__src__unix__iconv__IConvEncodingConverter.cpp diff -N files/patch-zlibrary__src__unix__iconv__IConvEncodingConverter.cpp --- files/patch-zlibrary__src__unix__iconv__IConvEncodingConverter.cpp 18 Jul 2007 10:15:15 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,20 +0,0 @@ ---- ./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; - - iconvlabel: -- iconv(myIConverter, &in, &inSize, &out, &outSize); -+ iconv(myIConverter, (const char**)&in, &inSize, &out, &outSize); - if (inSize != 0) { - if (myBuffer.empty()) { - myBuffer.append(in, inSize); -@@ -126,7 +126,7 @@ - inSize = 1; - outSize = 3; - inBuffer[0] = i; -- iconv(myIConverter, &in, &inSize, &out, &outSize); -+ iconv(myIConverter, (const char**)&in, &inSize, &out, &outSize); - if (inSize == 0) { - ZLUnicodeUtil::Ucs2Char ch; - ZLUnicodeUtil::firstChar(ch, outBuffer); --- fbreader-0.10.2.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200901250143.n0P1hJV2059388>