diff options
| author | Kris Kennaway <kris@FreeBSD.org> | 2002-10-02 08:15:53 +0000 |
|---|---|---|
| committer | Kris Kennaway <kris@FreeBSD.org> | 2002-10-02 08:15:53 +0000 |
| commit | cdcb4c068feca4bffb207fa9a3e22ee1a93de916 (patch) | |
| tree | d278cf280dbf8bc856a3fe344c1daa75d6710ecc | |
| parent | Set USE_X_PREFIX=yes to fix build (diff) | |
Unbreak by updating to djvulibre 3.5.8. I hope I merged everything
correctly from the 3 different PRs :-)
PR: ports/43145, ports/43468, ports/43435
Submitted by: John Merryweather Cooper <coop9211@uidaho.edu> [1],
Lev A. Serebryakov <lev@serebryakov.spb.ru> [2],
Tilman Linneweh <tilman@arved.de> [3]
Notes
Notes:
svn path=/head/; revision=67294
| -rw-r--r-- | graphics/djvulibre/Makefile | 20 | ||||
| -rw-r--r-- | graphics/djvulibre/distinfo | 2 | ||||
| -rw-r--r-- | graphics/djvulibre/files/patch-gui::nsdejavu::Makefile.in | 11 | ||||
| -rw-r--r-- | graphics/djvulibre/pkg-plist | 5 |
4 files changed, 23 insertions, 15 deletions
diff --git a/graphics/djvulibre/Makefile b/graphics/djvulibre/Makefile index 321404093fc0..7a7fc6bf5114 100644 --- a/graphics/djvulibre/Makefile +++ b/graphics/djvulibre/Makefile @@ -6,41 +6,35 @@ # PORTNAME= djvulibre -PORTVERSION= 3.5.4 -PORTREVISION= 1 +PORTVERSION= 3.5.8 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= djvu -MAINTAINER= john_m_cooper@yahoo.com - -BROKEN= "Does not compile" +MAINTAINER= coop9211@uidaho.edu LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \ iconv.3:${PORTSDIR}/converters/libiconv .ifndef WITHOUT_X11 -USE_QT_VER= 2 -#LIB_DEPENDS+= qt2:${PORTSDIR}/x11-toolkits/qt23 +USE_X_PREFIX= yes +USE_QT_VER= 3 .else PKGNAMESUFFIX= -nox11 .endif +USE_PERL5= yes HAS_CONFIGURE= yes CONFIGURE_ENV= JPEG_CFLAGS=-I"${LOCALBASE}/include" \ JPEG_LIBS="-L${LOCALBASE}/lib -ljpeg" -CONFIGURE_ARGS= --enable-threads=posix --enable-shared # --enable-rpo +CONFIGURE_ARGS= --enable-threads=posix --enable-shared --prefix="${PREFIX}" .ifndef WITHOUT_X11 CONFIGURE_ENV+= CXX=${CXX} PTHREAD_CFLAGS=-pthread PTHREAD_LIBS=-pthread \ - MOC=${LOCALBASE}/bin/moc2 UIC=${LOCALBASE}/bin/uic \ - QT_CFLAGS=-I"${LOCALBASE}/include/qt2" \ - QT_LIBS="-L${LOCALBASE}/lib -lqt2" + QTLIBS="-L${X11BASE}/lib -lqt-mt" .else CONFIGURE_ARGS+=--disable-djview .endif -MAKE_ARGS+= -j2 - .if defined(LOCALBASE) && ${LOCALBASE} != "/usr/local" pre-configure: ${PERL} -pi -e 's,/usr/local,${LOCALBASE},g' `find ${WRKSRC} \ diff --git a/graphics/djvulibre/distinfo b/graphics/djvulibre/distinfo index 0212ec5dd01a..66a7e11d90b9 100644 --- a/graphics/djvulibre/distinfo +++ b/graphics/djvulibre/distinfo @@ -1 +1 @@ -MD5 (djvulibre-3.5.4.tar.gz) = d6e5cb5683c8b71867ef1b76c646e5ef +MD5 (djvulibre-3.5.8.tar.gz) = 2327716fac996f68f4d1baee1ba8a64b diff --git a/graphics/djvulibre/files/patch-gui::nsdejavu::Makefile.in b/graphics/djvulibre/files/patch-gui::nsdejavu::Makefile.in new file mode 100644 index 000000000000..1c880e6348dc --- /dev/null +++ b/graphics/djvulibre/files/patch-gui::nsdejavu::Makefile.in @@ -0,0 +1,11 @@ +--- gui/nsdejavu/Makefile.in.old Thu Jan 10 13:40:56 2002 ++++ gui/nsdejavu/Makefile.in Fri Sep 20 14:57:15 2002 +@@ -25,7 +25,7 @@ + datadir = @datadir@ + libdir = @libdir@ + mandir = @mandir@ +-plugindir = ${libdir}/netscape/plugins ++plugindir = ${libdir}/mozilla/plugins + + CC = @CC@ + CXX = @CXX@ diff --git a/graphics/djvulibre/pkg-plist b/graphics/djvulibre/pkg-plist index b42fb33e6eb0..2d80512b9b9e 100644 --- a/graphics/djvulibre/pkg-plist +++ b/graphics/djvulibre/pkg-plist @@ -15,7 +15,9 @@ bin/djvused bin/djvuserve bin/djvutxt lib/libdjvulibre3.so.5.4 -%%X11%%lib/netscape/plugins/nsdejavu.so +%%X11%%lib/mozilla/plugins/nsdejavu.so +%%X11%%@unexec rmdir %D/lib/mozilla/plugins 2>/dev/null || true +%%X11%%@unexec rmdir %D/lib/mozilla 2>/dev/null || true share/djvu/osi/Chinese_PRC/libdjvu++.xml share/djvu/osi/Chinese_PRC/messages.xml @dirrm share/djvu/osi/Chinese_PRC @@ -39,4 +41,5 @@ share/djvu/languages.xml @dirrm share/djvu %%PORTDOCS%%share/doc/djvulibre/djvu2spec.djvu %%PORTDOCS%%share/doc/djvulibre/djvu3changes.txt +%%PORTDOCS%%share/doc/djvulibre/lizard2002.djvu %%PORTDOCS%%@dirrm share/doc/djvulibre |