aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--deskutils/fbreader/Makefile55
-rw-r--r--deskutils/fbreader/distinfo6
-rw-r--r--deskutils/fbreader/files/patch-zlibrary__src__unix__iconv__IConvEncodingConverter.cpp20
-rw-r--r--deskutils/fbreader/pkg-plist40
4 files changed, 62 insertions, 59 deletions
diff --git a/deskutils/fbreader/Makefile b/deskutils/fbreader/Makefile
index b4f474423fad..960ce144bbc8 100644
--- a/deskutils/fbreader/Makefile
+++ b/deskutils/fbreader/Makefile
@@ -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>
diff --git a/deskutils/fbreader/distinfo b/deskutils/fbreader/distinfo
index d7e89c0cf0c6..ad5ce28127a8 100644
--- a/deskutils/fbreader/distinfo
+++ b/deskutils/fbreader/distinfo
@@ -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
diff --git a/deskutils/fbreader/files/patch-zlibrary__src__unix__iconv__IConvEncodingConverter.cpp b/deskutils/fbreader/files/patch-zlibrary__src__unix__iconv__IConvEncodingConverter.cpp
deleted file mode 100644
index 82f3101f482b..000000000000
--- a/deskutils/fbreader/files/patch-zlibrary__src__unix__iconv__IConvEncodingConverter.cpp
+++ /dev/null
@@ -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);
diff --git a/deskutils/fbreader/pkg-plist b/deskutils/fbreader/pkg-plist
index 27016e0d9f31..aedc4ff342b1 100644
--- a/deskutils/fbreader/pkg-plist
+++ b/deskutils/fbreader/pkg-plist
@@ -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.it.fb2
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/ru.xml
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/rtf.png
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/encodings/windows-1252
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/it.xml
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 @@ share/zlibrary/resources/uk.xml
@dirrm share/zlibrary/encodings
@dirrm share/zlibrary/resources
@dirrm share/zlibrary
-@dirrmtry share/applications
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 15:15:48 +0000