1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-27 05:10:36 +00:00

deskutils/fbreader: upgrade to 0.99.6

- upgrade to 0.99.6
- use GitHub as MASTER_SITE
- use Options helpers

PR:		187819
Differential Revision:	https://reviews.freebsd.org/D1996
Submitted by:	myself
Approved by:	maintainer timeout (50 weeks)
Approved by:	koobs (mentor)
This commit is contained in:
Johannes Jost Meixner 2015-03-03 12:59:41 +00:00
parent d56b5f11c5
commit af1b0de06c
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=380359
3 changed files with 40 additions and 45 deletions

View File

@ -2,12 +2,8 @@
# $FreeBSD$
PORTNAME= fbreader
PORTVERSION= 0.99.4
DISTVERSIONPREFIX= sources-
PORTREVISION= 2
PORTVERSION= 0.99.6
CATEGORIES= deskutils
MASTER_SITES= http://www.fbreader.org/files/desktop/ \
http://old.fbreader.org/
MAINTAINER= fluffy@FreeBSD.org
COMMENT= Powerful e-book reader
@ -17,14 +13,18 @@ LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl \
libfribidi.so:${PORTSDIR}/converters/fribidi \
libunibreak.so:${PORTSDIR}/textproc/libunibreak
.if defined(WITH_GTK2)
UI= gtk
USE_GNOME= gtk20
.else
UI= qt4
USE_QT4= gui corelib imageformats network moc_build
LDFLAGS+= -L${QT_LIBDIR}
.endif
OPTIONS_SINGLE= GUI
OPTIONS_SINGLE_GUI= GTK2 QT4
OPTIONS_DEFAULT= QT4
OPTIONS_SUB= yes
USE_GITHUB= yes
GH_ACCOUNT= geometer
GH_PROJECT= FBReader
GH_COMMIT= 7abc80d
GH_TAGNAME= ${PORTVERSION}-freebsdport
.if defined(WITH_DEBUG)
STATUS= debug
@ -32,17 +32,22 @@ STATUS= debug
STATUS= release
.endif
USES= iconv gmake pkgconfig tar:tgz
USE_SQLITE= yes
USES= compiler iconv gmake pkgconfig tar:tgz
USE_LDCONFIG= yes
USE_SQLITE= 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
INSTALL_TARGET= do_install
PLIST_SUB= UI=${UI}
WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION}
CFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
MAKE_ENV+= TARGET_ARCH=desktop UI_TYPE=${UI} TARGET_STATUS=${STATUS} \
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
@ -53,6 +58,8 @@ post-patch:
${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 ,'

View File

@ -1,2 +1,2 @@
SHA256 (fbreader-sources-0.99.4.tgz) = 3d7c31d5ea314589d2a963290ad16f4d3d631a41e802b8b39f8be0c9f71eb8e9
SIZE (fbreader-sources-0.99.4.tgz) = 2345664
SHA256 (fbreader-0.99.6.tgz) = b1c9baac7281dce8eaa5e54c64e798ea00cfa1e4f9d712efed79a5cd6702c30c
SIZE (fbreader-0.99.6.tgz) = 24848140

View File

@ -1,13 +1,8 @@
bin/FBReader
lib/libzlcore.so
lib/libzlcore.so.0.99
lib/libzlcore.so.0.99.4
lib/libzltext.so
lib/libzltext.so.0.99
lib/libzltext.so.0.99.4
lib/libzlui.so
lib/libzlui.so.0.99
lib/libzlui.so.0.99.4
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
@ -20,6 +15,13 @@ 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
@ -27,7 +29,6 @@ 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.he.fb2
share/FBReader/help/MiniHelp.hu.fb2
share/FBReader/help/MiniHelp.id.fb2
share/FBReader/help/MiniHelp.it.fb2
@ -47,7 +48,6 @@ share/FBReader/resources/eo.xml
share/FBReader/resources/es.xml
share/FBReader/resources/fi.xml
share/FBReader/resources/fr.xml
share/FBReader/resources/he.xml
share/FBReader/resources/hu.xml
share/FBReader/resources/id.xml
share/FBReader/resources/it.xml
@ -63,12 +63,9 @@ share/applications/FBReader.desktop
share/pixmaps/FBReader.png
share/pixmaps/FBReader/addBook.png
share/pixmaps/FBReader/advancedSearchOnNetwork.png
share/pixmaps/FBReader/back_button.png
share/pixmaps/FBReader/back_button_disabled.png
share/pixmaps/FBReader/bookInfo.png
share/pixmaps/FBReader/booktree-author.png
share/pixmaps/FBReader/booktree-book.png
share/pixmaps/FBReader/booktree-catalog.png
share/pixmaps/FBReader/booktree-tag.png
share/pixmaps/FBReader/byAuthor.png
share/pixmaps/FBReader/byTag.png
@ -76,8 +73,6 @@ share/pixmaps/FBReader/fb2.png
share/pixmaps/FBReader/findNext.png
share/pixmaps/FBReader/findPrevious.png
share/pixmaps/FBReader/folder.png
share/pixmaps/FBReader/forward_button.png
share/pixmaps/FBReader/forward_button_disabled.png
share/pixmaps/FBReader/gotoHome.png
share/pixmaps/FBReader/html.png
share/pixmaps/FBReader/mobipocket.png
@ -87,21 +82,15 @@ share/pixmaps/FBReader/palm.png
share/pixmaps/FBReader/plucker.png
share/pixmaps/FBReader/preferences.png
share/pixmaps/FBReader/redo.png
share/pixmaps/FBReader/refresh-icon-1.png
share/pixmaps/FBReader/refresh-icon-2.png
share/pixmaps/FBReader/refresh-icon.svg
share/pixmaps/FBReader/rotate.png
share/pixmaps/FBReader/rtf.png
share/pixmaps/FBReader/search.png
share/pixmaps/FBReader/search_icon.png
share/pixmaps/FBReader/searchresult.png
share/pixmaps/FBReader/showHelp.png
share/pixmaps/FBReader/showLibrary.png
share/pixmaps/FBReader/showNetLibrary.png
share/pixmaps/FBReader/showNetworkLibrary.png
share/pixmaps/FBReader/showReading.png
share/pixmaps/FBReader/showRecent.png
share/pixmaps/FBReader/spinner.gif
share/pixmaps/FBReader/tcr.png
share/pixmaps/FBReader/toc.png
share/pixmaps/FBReader/undo.png
@ -109,6 +98,8 @@ 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
@ -133,7 +124,6 @@ share/zlibrary/encodings/KOI8-R
share/zlibrary/encodings/windows-1251
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/bg.xml
@ -144,7 +134,6 @@ share/zlibrary/resources/eo.xml
share/zlibrary/resources/es.xml
share/zlibrary/resources/fi.xml
share/zlibrary/resources/fr.xml
share/zlibrary/resources/he.xml
share/zlibrary/resources/hu.xml
share/zlibrary/resources/id.xml
share/zlibrary/resources/it.xml
@ -156,5 +145,4 @@ share/zlibrary/resources/sv.xml
share/zlibrary/resources/uk.xml
share/zlibrary/resources/vi.xml
share/zlibrary/resources/zh.xml
share/zlibrary/style.qss
share/zlibrary/unicode.xml.gz