aboutsummaryrefslogtreecommitdiff
path: root/deskutils
diff options
context:
space:
mode:
authorAndrew Pantyukhin <sat@FreeBSD.org>2007-08-07 09:43:14 +0000
committerAndrew Pantyukhin <sat@FreeBSD.org>2007-08-07 09:43:14 +0000
commit689c89972e672800003dfea8ce3b70d42aafaa50 (patch)
tree55018d5eb6f69751b4036132ee81f5e686346e33 /deskutils
parent736f594e373d80892d86be42a67bfeaa32ef0d15 (diff)
downloadports-689c89972e672800003dfea8ce3b70d42aafaa50.tar.gz
ports-689c89972e672800003dfea8ce3b70d42aafaa50.zip
Notes
Diffstat (limited to 'deskutils')
-rw-r--r--deskutils/fbreader/Makefile14
-rw-r--r--deskutils/fbreader/distinfo6
-rw-r--r--deskutils/fbreader/pkg-plist5
3 files changed, 14 insertions, 11 deletions
diff --git a/deskutils/fbreader/Makefile b/deskutils/fbreader/Makefile
index 7a489967ac57..221969983238 100644
--- a/deskutils/fbreader/Makefile
+++ b/deskutils/fbreader/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fbreader
DISTVERSIONPREFIX= sources-
-DISTVERSION= 0.8.5a
+DISTVERSION= 0.8.6
CATEGORIES= deskutils
MASTER_SITES= http://www.fbreader.org/ CENKES
EXTRACT_SUFX= .tgz
@@ -27,8 +27,8 @@ 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=yes
-MAKE_ARGS+= MAKE=gmake
+ BUILD_SHARED_LIBRARY=yes LD="${CXX}"
+MAKE_ARGS+= MAKE=gmake LIBDIR=${PREFIX}/lib
WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION}
INSTALL_TARGET= do_install
@@ -38,9 +38,11 @@ post-patch:
${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'
+ @${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
# fuzpath: FBReader zlibrary libzl
diff --git a/deskutils/fbreader/distinfo b/deskutils/fbreader/distinfo
index e479c1f6ebb9..0d0f594df2b9 100644
--- a/deskutils/fbreader/distinfo
+++ b/deskutils/fbreader/distinfo
@@ -1,3 +1,3 @@
-MD5 (fbreader-sources-0.8.5a.tgz) = 6b6345b20052002f3597ba756d2387ac
-SHA256 (fbreader-sources-0.8.5a.tgz) = d58b07ab4e97b9f375f777a291129b5c2789c8b5eb8a88b04744ba6a12fffa2d
-SIZE (fbreader-sources-0.8.5a.tgz) = 922881
+MD5 (fbreader-sources-0.8.6.tgz) = 7ea4b1fe0e9cb000e34cbd7c6680653b
+SHA256 (fbreader-sources-0.8.6.tgz) = 0ecebca64fd010c63085c326bc9c677467cbb5272a732552072bd22f9d746363
+SIZE (fbreader-sources-0.8.6.tgz) = 890404
diff --git a/deskutils/fbreader/pkg-plist b/deskutils/fbreader/pkg-plist
index eb560199801c..5558bc336ee5 100644
--- a/deskutils/fbreader/pkg-plist
+++ b/deskutils/fbreader/pkg-plist
@@ -1,6 +1,7 @@
bin/FBReader
lib/libzlcore.so.0
lib/libzltext.so.0
+lib/zlibrary/ui/zlui-qt4.so
share/FBReader/default/config.xml
share/FBReader/default/external.xml
share/FBReader/default/keymap.xml
@@ -78,7 +79,8 @@ 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 lib/zlibrary/ui
+@dirrm lib/zlibrary
@dirrm share/FBReader/default
@dirrm share/FBReader/formats/html
@dirrm share/FBReader/formats/xhtml
@@ -89,6 +91,5 @@ share/zlibrary/ui/zlui-qt4.so
@dirrm share/pixmaps/FBReader
@dirrm share/zlibrary/encodings
@dirrm share/zlibrary/resources
-@dirrm share/zlibrary/ui
@dirrm share/zlibrary
@dirrmtry share/applications