Index: branches/2016Q3/deskutils/fbreader/Makefile =================================================================== --- branches/2016Q3/deskutils/fbreader/Makefile (revision 421500) +++ branches/2016Q3/deskutils/fbreader/Makefile (revision 421501) @@ -1,72 +1,70 @@ # Created by: Andrew Pantyukhin # $FreeBSD$ PORTNAME= fbreader PORTVERSION= 0.99.6 DISTVERSIONSUFFIX= -freebsdport PORTREVISION= 2 CATEGORIES= deskutils MAINTAINER= johannes@perceivon.net COMMENT= Powerful e-book reader LICENSE= GPLv2+ LIB_DEPENDS= libcurl.so:ftp/curl \ libexpat.so:textproc/expat2 \ libfribidi.so:converters/fribidi \ libunibreak.so:textproc/libunibreak USE_GITHUB= yes GH_ACCOUNT= geometer GH_PROJECT= FBReader .if defined(WITH_DEBUG) STATUS= debug .else STATUS= release .endif -USES= compiler gmake iconv pkgconfig sqlite tar:tgz +USES= compiler gmake iconv localbase pkgconfig sqlite tar:tgz USE_LDCONFIG= yes INSTALL_TARGET= do_install -CFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib MAKE_ENV+= TARGET_ARCH=desktop TARGET_STATUS=${STATUS} \ ROOTDIR=${WRKSRC} INSTALLDIR=${PREFIX} LIBDIR=${PREFIX}/lib \ LD="${CXX}" MAKE_ARGS+= MAKE=${MAKE_CMD} LIBDIR=${PREFIX}/lib OPTIONS_SINGLE= GUI OPTIONS_SINGLE_GUI= GTK2 QT4 OPTIONS_DEFAULT= QT4 OPTIONS_SUB= yes GTK2_USE= gnome=gtk20 GTK2_MAKE_ENV= UI_TYPE=gtk QT4_USE= qt4=gui,corelib,imageformats,network,moc_build QT4_LDFLAGS= -L${QT_LIBDIR} QT4_MAKE_ENV= UI_TYPE=qt4 post-patch: @${REINPLACE_CMD} -e '/^CC/d;/^LD/d;/QTINCLUDE/s,-I.*$$,-I${QT_INCDIR},' \ ${WRKSRC}/makefiles/arch/desktop.mk @${REINPLACE_CMD} -e 's,-O3,,;s,-ldl,${ICONV_LIB},' \ ${WRKSRC}/makefiles/config.mk ${WRKSRC}/zlibrary/core/Makefile @${REINPLACE_CMD} -e 's/-llinebreak/-lunibreak/g' ${WRKSRC}/zlibrary/text/Makefile @${REINPLACE_CMD} -e 's/-llinebreak/-lunibreak/g' ${WRKSRC}/makefiles/*.mk @${REINPLACE_CMD} -e 's,/usr,${PREFIX},' ${WRKSRC}/fbreader/desktop/Makefile @${FIND} ${WRKSRC} -name Makefile | ${XARGS} ${REINPLACE_CMD} \ -e 's,make ,gmake ,' pre-configure: # This cannot be done in post-patch because build dependencies are installed # after patching and they can pull in libiconv which can affect CFLAGS in # Mk/Uses/iconv.mk. @${REINPLACE_CMD} 's|^CFLAGS =.*$$|CFLAGS = ${CFLAGS}|' \ ${WRKSRC}/makefiles/arch/desktop.mk .include Index: branches/2016Q3/deskutils/fbreader/pkg-plist =================================================================== --- branches/2016Q3/deskutils/fbreader/pkg-plist (revision 421500) +++ branches/2016Q3/deskutils/fbreader/pkg-plist (revision 421501) @@ -1,149 +1,150 @@ bin/FBReader lib/libzlcore.so.0.14 lib/libzlcore.so.0.14.0 lib/libzltext.so.0.14 lib/libzltext.so.0.14.0 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/network/booksonboard.com.xml share/FBReader/network/certificates/litres.ru.crt share/FBReader/network/feedbooks.com.xml share/FBReader/network/litres.ru.xml share/FBReader/network/manybooks.net.xml share/FBReader/network/shucang.com.xml share/FBReader/network/smashwords.com.xml share/FBReader/help/MiniHelp.bg.fb2 share/FBReader/help/MiniHelp.cs.fb2 share/FBReader/help/MiniHelp.de.fb2 share/FBReader/help/MiniHelp.en.fb2 share/FBReader/help/MiniHelp.es.fb2 share/FBReader/help/MiniHelp.fi.fb2 share/FBReader/help/MiniHelp.fr.fb2 share/FBReader/help/MiniHelp.hu.fb2 share/FBReader/help/MiniHelp.id.fb2 share/FBReader/help/MiniHelp.it.fb2 share/FBReader/help/MiniHelp.lt.fb2 share/FBReader/help/MiniHelp.nl.fb2 share/FBReader/help/MiniHelp.ru.fb2 share/FBReader/help/MiniHelp.sv.fb2 share/FBReader/help/MiniHelp.uk.fb2 share/FBReader/help/MiniHelp.vi.fb2 share/FBReader/help/MiniHelp.zh.fb2 share/FBReader/resources/ar.xml share/FBReader/resources/bg.xml share/FBReader/resources/cs.xml share/FBReader/resources/de.xml share/FBReader/resources/en.xml share/FBReader/resources/eo.xml share/FBReader/resources/es.xml share/FBReader/resources/fi.xml share/FBReader/resources/fr.xml share/FBReader/resources/hu.xml share/FBReader/resources/id.xml share/FBReader/resources/it.xml share/FBReader/resources/lt.xml share/FBReader/resources/nl.xml share/FBReader/resources/pl.xml share/FBReader/resources/ru.xml share/FBReader/resources/sv.xml share/FBReader/resources/uk.xml share/FBReader/resources/vi.xml share/FBReader/resources/zh.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/booktree-author.png share/pixmaps/FBReader/booktree-book.png share/pixmaps/FBReader/booktree-tag.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 share/pixmaps/FBReader/folder.png share/pixmaps/FBReader/gotoHome.png share/pixmaps/FBReader/html.png share/pixmaps/FBReader/mobipocket.png share/pixmaps/FBReader/oeb.png share/pixmaps/FBReader/openreader.png share/pixmaps/FBReader/palm.png share/pixmaps/FBReader/plucker.png share/pixmaps/FBReader/preferences.png share/pixmaps/FBReader/redo.png share/pixmaps/FBReader/rotate.png share/pixmaps/FBReader/rtf.png share/pixmaps/FBReader/search.png share/pixmaps/FBReader/searchresult.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/undo.png share/pixmaps/FBReader/unknown.png share/pixmaps/FBReader/upfolder.png share/pixmaps/FBReader/weasel.png share/pixmaps/FBReader/zipfolder.png %%GTK2%%lib/zlibrary/ui/zlui-gtk.so %%QT4%%lib/zlibrary/ui/zlui-qt4.so share/zlibrary/default/config.xml share/zlibrary/encodings/Big5 share/zlibrary/encodings/Encodings.xml share/zlibrary/encodings/GBK share/zlibrary/encodings/IBM866 share/zlibrary/encodings/ISO-8859-1 share/zlibrary/encodings/ISO-8859-10 share/zlibrary/encodings/ISO-8859-11 share/zlibrary/encodings/ISO-8859-13 share/zlibrary/encodings/ISO-8859-14 share/zlibrary/encodings/ISO-8859-15 share/zlibrary/encodings/ISO-8859-16 share/zlibrary/encodings/ISO-8859-2 share/zlibrary/encodings/ISO-8859-3 share/zlibrary/encodings/ISO-8859-4 share/zlibrary/encodings/ISO-8859-5 share/zlibrary/encodings/ISO-8859-6 share/zlibrary/encodings/ISO-8859-7 share/zlibrary/encodings/ISO-8859-8 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 +%%GTK2%%share/zlibrary/keynames-gtk.xml +%%QT4%%share/zlibrary/keynames-qt4.xml share/zlibrary/languagePatterns.zip share/zlibrary/resources/ar.xml share/zlibrary/resources/bg.xml share/zlibrary/resources/cs.xml share/zlibrary/resources/de.xml share/zlibrary/resources/en.xml share/zlibrary/resources/eo.xml share/zlibrary/resources/es.xml share/zlibrary/resources/fi.xml share/zlibrary/resources/fr.xml share/zlibrary/resources/hu.xml share/zlibrary/resources/id.xml share/zlibrary/resources/it.xml share/zlibrary/resources/lt.xml share/zlibrary/resources/nl.xml share/zlibrary/resources/pl.xml share/zlibrary/resources/ru.xml share/zlibrary/resources/sv.xml share/zlibrary/resources/uk.xml share/zlibrary/resources/vi.xml share/zlibrary/resources/zh.xml share/zlibrary/unicode.xml.gz Index: branches/2016Q3 =================================================================== --- branches/2016Q3 (revision 421500) +++ branches/2016Q3 (revision 421501) Property changes on: branches/2016Q3 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r421500