diff options
| -rw-r--r-- | graphics/djvulibre/Makefile | 21 | ||||
| -rw-r--r-- | graphics/djvulibre/distinfo | 4 | ||||
| -rw-r--r-- | graphics/djvulibre/files/patch-aa | 69 | ||||
| -rw-r--r-- | graphics/djvulibre/files/patch-gui_nsdejavu_Makefile.in | 21 | ||||
| -rw-r--r-- | graphics/djvulibre/pkg-plist | 45 |
5 files changed, 65 insertions, 95 deletions
diff --git a/graphics/djvulibre/Makefile b/graphics/djvulibre/Makefile index ddf821e9fd83..e5d9c2594641 100644 --- a/graphics/djvulibre/Makefile +++ b/graphics/djvulibre/Makefile @@ -6,7 +6,7 @@ # PORTNAME= djvulibre -PORTVERSION= 3.5.12 +PORTVERSION= 3.5.13 CATEGORIES= graphics www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= djvu @@ -14,26 +14,29 @@ MASTER_SITE_SUBDIR= djvu MAINTAINER= coop9211@uidaho.edu COMMENT= DjVu viewers, encoders, browser plugin, and utilities -LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg - .ifndef WITHOUT_X11 USE_X_PREFIX= yes USE_QT_VER= 3 +LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg .else PKGNAMESUFFIX= -nox11 +LIB_DEPENDS+= tiff.4:${PORTSDIR}/graphics/tiff .endif USE_ICONV= yes -USE_PERL5= yes +USE_PERL5_BUILD=yes HAS_CONFIGURE= yes -CONFIGURE_ENV= JPEG_CFLAGS=-I"${LOCALBASE}/include" \ - JPEG_LIBS="-L${LOCALBASE}/lib -ljpeg" -CONFIGURE_ARGS= --enable-threads=posix --enable-shared --prefix="${PREFIX}" +INSTALLS_SHLIB= yes +CONFIGURE_ENV= JPEG_CFLAGS="-I${LOCALBASE}/include" \ + JPEG_LIBS="-L${LOCALBASE}/lib -ljpeg" \ + TIFF_CFLAGS="-I${LOCALBASE}/include" \ + TIFF_LIBS="-L${LOCALBASE}/lib -ltiff" +CONFIGURE_ARGS= --enable-threads=pthread --enable-shared --prefix="${PREFIX}" .ifndef WITHOUT_X11 CONFIGURE_ENV+= CXX=${CXX} \ - PTHREAD_CFLAGS=-pthread \ - PTHREAD_LIBS=-pthread \ + PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ + PTHREAD_LIBS="${PTHREAD_LIBS}" \ QTLIBS="-L${X11BASE}/lib -lqt-mt" .else CONFIGURE_ARGS+=--disable-djview diff --git a/graphics/djvulibre/distinfo b/graphics/djvulibre/distinfo index ae172a5b95c1..250c5afadc7c 100644 --- a/graphics/djvulibre/distinfo +++ b/graphics/djvulibre/distinfo @@ -1,2 +1,2 @@ -MD5 (djvulibre-3.5.12.tar.gz) = 4adeb92beb8295aa330b9c6b042ba02d -SIZE (djvulibre-3.5.12.tar.gz) = 1298191 +MD5 (djvulibre-3.5.13.tar.gz) = 5df02ba314ce32b95f4ee18e4b863441 +SIZE (djvulibre-3.5.13.tar.gz) = 1452616 diff --git a/graphics/djvulibre/files/patch-aa b/graphics/djvulibre/files/patch-aa deleted file mode 100644 index afb87672c1b6..000000000000 --- a/graphics/djvulibre/files/patch-aa +++ /dev/null @@ -1,69 +0,0 @@ -diff -ur gui/djview/Makefile.in.ori gui/djview/Makefile.in ---- gui/djview/Makefile.in.ori Fri Jan 24 14:02:11 2003 -+++ gui/djview/Makefile.in Fri Aug 1 14:59:13 2003 -@@ -50,7 +50,10 @@ - X_CFLAGS = @X_CFLAGS@ - - LIBDJVU_A = ${top_builddir}/libdjvu/libdjvulibre.a --LIBDJVU_SO = ${top_builddir}/libdjvu/libdjvulibre-${PACKAGE_VERSION}.so -+LIBDJVU_SO = ${top_builddir}/libdjvu/libdjvulibre${PACKAGE_VERSION:R:R}.so.${PACKAGE_VERSION:R:E} -+.if defined(OBJFORMAT) && ${OBJFORMAT} == "aout" -+LIBDJVU_SO:= ${LIBDJVU_SO}.${PACKAGE_VERSION:E} -+.endif - @SHARED_YES@LIBDJVU = -Wl,-rpath,${libdir} ${LIBDJVU_SO} - @SHARED_NO@LIBDJVU = ${LIBDJVU_A} - -diff -ur gui/nsdejavu/Makefile.in.ori gui/nsdejavu/Makefile.in ---- gui/nsdejavu/Makefile.in.ori Fri Aug 1 16:55:31 2003 -+++ gui/nsdejavu/Makefile.in Fri Aug 1 16:56:55 2003 -@@ -25,7 +25,7 @@ - datadir = @datadir@ - libdir = @libdir@ - mandir = @mandir@ --plugindir = ${libdir}/netscape/plugins -+plugindir = ${libdir}/browser_plugins - - CC = @CC@ - CXX = @CXX@ -@@ -40,7 +40,7 @@ - OPTS = @OPTS@ - NSDEJAVU = @NSDEJAVU@ - NSDEJAVU_FLAGS = @NSDEJAVU_FLAGS@ --NSDEJAVU_LIBS = @NSDEJAVU_LIBS@ -+NSDEJAVU_LIBS = @NSDEJAVU_LIBS@ -lXt - NSDEJAVU_LINK = @NSDEJAVU_LINK@ - - INCS = \ -diff -ur libdjvu/Makefile.in.ori libdjvu/Makefile.in ---- libdjvu/Makefile.in.ori Mon Jan 6 14:10:43 2003 -+++ libdjvu/Makefile.in Fri Aug 1 14:59:12 2003 -@@ -44,7 +44,11 @@ - THREAD_CFLAGS = @THREAD_CFLAGS@ - - LIBDJVU_A = libdjvulibre.a --LIBDJVU_SO = libdjvulibre-${PACKAGE_VERSION}.so -+LIBDJVU_SO:= libdjvulibre${PACKAGE_VERSION:R:R}.so.${PACKAGE_VERSION:R:E} -+.if defined(OBJFORMAT) && ${OBJFORMAT} == "aout" -+LIBDJVU_SO:= ${LIBDJVU_SO}.${PACKAGE_VERSION:E} -+.endif -+ - - @SHARED_YES@CXXPICFLAGS = -fPIC -DPIC - @SHARED_NO@CXXPICFLAGS = -diff -ur tools/Makefile.in.ori tools/Makefile.in ---- tools/Makefile.in.ori Mon Jan 6 14:10:47 2003 -+++ tools/Makefile.in Fri Aug 1 14:59:13 2003 -@@ -44,7 +44,11 @@ - THREAD_CFLAGS = @THREAD_CFLAGS@ - - LIBDJVU_A = ${top_builddir}/libdjvu/libdjvulibre.a --LIBDJVU_SO = ${top_builddir}/libdjvu/libdjvulibre-${PACKAGE_VERSION}.so -+LIBDJVU_SO = ${top_builddir}/libdjvu/libdjvulibre${PACKAGE_VERSION:R:R}.so.${PACKAGE_VERSION:R:E} -+.if defined(OBJFORMAT) && ${OBJFORMAT} == "aout" -+LIBDJVU_SO:= ${LIBDJVU_SO}.${PACKAGE_VERSION:E} -+.endif -+ - - @SHARED_YES@LIBDJVU = -Wl,-rpath,${libdir} ${LIBDJVU_SO} - @SHARED_NO@LIBDJVU = ${LIBDJVU_A} - 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..3f864ec98f2a --- /dev/null +++ b/graphics/djvulibre/files/patch-gui_nsdejavu_Makefile.in @@ -0,0 +1,21 @@ +diff -ur gui/nsdejavu/Makefile.in.ori gui/nsdejavu/Makefile.in +--- gui/nsdejavu/Makefile.in.ori Fri Aug 1 16:55:31 2003 ++++ gui/nsdejavu/Makefile.in Fri Aug 1 16:56:55 2003 +@@ -25,7 +25,7 @@ + datadir = @datadir@ + libdir = @libdir@ + mandir = @mandir@ +-plugindir = ${libdir}/netscape/plugins ++plugindir = ${libdir}/browser_plugins + + CC = @CC@ + CXX = @CXX@ +@@ -40,7 +40,7 @@ + OPTS = @OPTS@ + NSDEJAVU = @NSDEJAVU@ + NSDEJAVU_FLAGS = @NSDEJAVU_FLAGS@ +-NSDEJAVU_LIBS = @NSDEJAVU_LIBS@ ++NSDEJAVU_LIBS = @NSDEJAVU_LIBS@ -lXt + NSDEJAVU_LINK = @NSDEJAVU_LINK@ + + INCS = \ diff --git a/graphics/djvulibre/pkg-plist b/graphics/djvulibre/pkg-plist index 1253c47dc78b..44775608637e 100644 --- a/graphics/djvulibre/pkg-plist +++ b/graphics/djvulibre/pkg-plist @@ -7,36 +7,51 @@ bin/ddjvu %%X11%%bin/djview bin/djvm bin/djvmcvt +bin/djvudigital bin/djvudump bin/djvuextract bin/djvumake bin/djvups bin/djvused bin/djvuserve +bin/djvutoxml bin/djvutxt +bin/djvuxmlparser %%X11%%lib/browser_plugins/nsdejavu.so -lib/libdjvulibre3.so.5 +lib/libdjvulibre-3.5.13.so share/djvu/languages.xml -share/djvu/osi/Chinese_PRC/libdjvu++.xml -share/djvu/osi/Chinese_PRC/messages.xml -@dirrm share/djvu/osi/Chinese_PRC -share/djvu/osi/de_DE/libdjvu++.xml -share/djvu/osi/de_DE/messages.xml -@dirrm share/djvu/osi/de_DE +%%X11%%share/djvu/osi/de/djview.qm +share/djvu/osi/de/libdjvu++.xml +share/djvu/osi/de/messages.xml +%%X11%%share/djvu/osi/de/qt.qm share/djvu/osi/en/djvutools-reference.xml share/djvu/osi/en/libdjvu++.xml share/djvu/osi/en/messages.xml share/djvu/osi/en/unixgui-shared.xml share/djvu/osi/en/unixgui-viewer.xml -@dirrm share/djvu/osi/en -share/djvu/osi/fr_FR/libdjvu++.xml -share/djvu/osi/fr_FR/messages.xml -@dirrm share/djvu/fr_FR -share/djvu/osi/ja_JP/libdjvu++.xml -share/djvu/osi/ja_JP/messages.xml -@dirrm share/djvu/ja_JP -@dirrm share/djvu +%%X11%%share/djvu/osi/fr/djview.qm +share/djvu/osi/fr/libdjvu++.xml +share/djvu/osi/fr/messages.xml +%%X11%%share/djvu/osi/fr/qt.qm +%%X11%%share/djvu/osi/ja/djview.qm +share/djvu/osi/ja/libdjvu++.xml +share/djvu/osi/ja/messages.xml +%%X11%%share/djvu/osi/ja/qt.qm +share/djvu/osi/zh/libdjvu++.xml +share/djvu/osi/zh/messages.xml +share/djvu/pubtext/DjVuMessages.dtd +share/djvu/pubtext/DjVuOCR.dtd +share/djvu/pubtext/DjVuXML-s.dtd %%PORTDOCS%%%%DOCSDIR%%/djvu2spec.djvu %%PORTDOCS%%%%DOCSDIR%%/djvu3changes.txt %%PORTDOCS%%%%DOCSDIR%%/lizard2002.djvu %%PORTDOCS%%@dirrm %%DOCSDIR%% +@dirrm share/djvu/pubtext +@dirrm share/djvu/osi/zh +@dirrm share/djvu/osi/ja +@dirrm share/djvu/osi/fr +@dirrm share/djvu/osi/en +@dirrm share/djvu/osi/de +@dirrm share/djvu/osi +@dirrm share/djvu + |