# WARNING: Not tested on -STABLE (tested on -CURRENT). # # To apply this patch: # STEP 1: Chdir to the source directory. # STEP 2: Run the 'applypatch' program with this patch file as input. # # If you do not have 'applypatch', it is part of the 'makepatch' package # that you can fetch from the Comprehensive Perl Archive Network: # http://www.perl.com/CPAN/authors/Johan_Vromans/makepatch-x.y.tar.gz # In the above URL, 'x' should be 2 or higher. # # To apply this patch without the use of 'applypatch': # STEP 1: Chdir to the source directory. # If you have a decent Bourne-type shell: # STEP 2: Run the shell with this file as input. # If you don't have such a shell, you may need to manually create/delete # the files as shown below. # STEP 3: Run the 'patch' program with this file as input. # # These are the commands needed to create/delete files/directories: # rm -f 'files/patch-aa' touch 'files/patch-gui_nsdejavu_Makefile.in' chmod 0644 'files/patch-gui_nsdejavu_Makefile.in' # # This command terminates the shell and need not be executed manually. exit # #### End of Preamble #### #### Patch data follows #### diff -u '/usr/ports/graphics/djvulibre/Makefile' '/usr/ports/local/djvulibre/Makefile' Index: ./Makefile --- ./Makefile Tue Jun 29 18:59:57 2004 +++ ./Makefile Wed Jul 7 00:36:25 2004 @@ -2,11 +2,11 @@ # Date Created: 20 July 1999 # Whom: Mikhail Teterin # -# $FreeBSD: ports/graphics/djvulibre/Makefile,v 1.24 2004/04/19 14:21:33 krion Exp $ +# $FreeBSD$ # 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 @@ 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 -u '/usr/ports/graphics/djvulibre/distinfo' '/usr/ports/local/djvulibre/distinfo' Index: ./distinfo --- ./distinfo Tue Jun 29 18:59:57 2004 +++ ./distinfo Tue Jul 6 22:35:57 2004 @@ -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 -u /dev/null '/usr/ports/local/djvulibre/files/patch-gui_nsdejavu_Makefile.in' Index: ./files/patch-gui_nsdejavu_Makefile.in --- ./files/patch-gui_nsdejavu_Makefile.in Wed Dec 31 16:00:00 1969 +++ ./files/patch-gui_nsdejavu_Makefile.in Tue Jul 6 23:00:05 2004 @@ -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 -u '/usr/ports/graphics/djvulibre/pkg-plist' '/usr/ports/local/djvulibre/pkg-plist' Index: ./pkg-plist --- ./pkg-plist Tue Jun 29 18:59:57 2004 +++ ./pkg-plist Wed Jul 7 00:32:25 2004 @@ -7,36 +7,51 @@ %%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 + #### End of Patch data #### #### ApplyPatch data follows #### # Data version : 1.0 # Date generated : Wed Jul 7 00:38:44 2004 # Generated by : makepatch 2.00 # Recurse directories : Yes # r 'files/patch-aa' 2368 0 # p 'Makefile' 1960 1089185785 0100644 # p 'distinfo' 106 1089178557 0100644 # c 'files/patch-gui_nsdejavu_Makefile.in' 0 1089180005 0100644 # p 'pkg-plist' 1049 1089185545 0100644 #### End of ApplyPatch data #### #### End of Patch kit [created: Wed Jul 7 00:38:44 2004] #### #### Checksum: 208 6698 12243 ####