Date: Fri, 20 Sep 2002 15:47:52 -0700 (PDT) From: John Merryweather Cooper <coop9211@uidaho.edu> To: FreeBSD-gnats-submit@FreeBSD.org Cc: kris@obsecurity.org Subject: ports/43145: [MAINTAINER UPDATE] Fix build of port and update to 3.5.8 Message-ID: <200209202247.g8KMlq2H079607@pc016247.reshall.uidaho.edu>
next in thread | raw e-mail | index | archive | help
>Number: 43145 >Category: ports >Synopsis: [MAINTAINER UPDATE] Fix build of port and update to 3.5.8 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Fri Sep 20 15:50:01 PDT 2002 >Closed-Date: >Last-Modified: >Originator: John Merryweather Cooper >Release: FreeBSD 4.7-RC i386 >Organization: >Environment: System: FreeBSD PC016247.reshall.uidaho.edu 4.7-RC FreeBSD 4.7-RC #46: Wed Sep 18 15:57:56 PDT 2002 root@PC016247.reshall.uidaho.edu:/usr/obj/usr/src/sys/JOHNCOOP i386 >Description: Update my e-mail address, fix the compile failure, fix the install of the plugin, and update the port. :) >How-To-Repeat: N/A >Fix: --- update-djvulibre-3.5.8 begins here --- # This is a patch for djvulibre to update it to djvulibre-3.5.8 # # 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 # 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: # 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 'djvulibre/Makefile' 'djvulibre-3.5.8/Makefile' Index: ./Makefile --- ./Makefile Tue Mar 26 14:22:56 2002 +++ ./Makefile Fri Sep 20 15:28:38 2002 @@ -2,23 +2,22 @@ # Date Created: 20 July 1999 # Whom: Mikhail Teterin <mi@aldan.algebra.com> # -# $FreeBSD: ports/graphics/djvulibre/Makefile,v 1.10 2002/03/26 18:53:15 mi Exp $ +# $FreeBSD$ # 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 +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 @@ -26,18 +25,14 @@ 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: diff -u 'djvulibre/distinfo' 'djvulibre-3.5.8/distinfo' Index: ./distinfo --- ./distinfo Thu Feb 28 17:12:32 2002 +++ ./distinfo Fri Sep 20 14:41:28 2002 @@ -1 +1 @@ -MD5 (djvulibre-3.5.4.tar.gz) = d6e5cb5683c8b71867ef1b76c646e5ef +MD5 (djvulibre-3.5.8.tar.gz) = 2327716fac996f68f4d1baee1ba8a64b diff -u /dev/null 'djvulibre-3.5.8/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 Fri Sep 20 15:00:58 2002 @@ -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 -u 'djvulibre/pkg-plist' 'djvulibre-3.5.8/pkg-plist' Index: ./pkg-plist --- ./pkg-plist Thu Feb 28 17:12:32 2002 +++ ./pkg-plist Fri Sep 20 15:39:43 2002 @@ -15,7 +15,7 @@ bin/djvuserve bin/djvutxt lib/libdjvulibre3.so.5.4 -%%X11%%lib/netscape/plugins/nsdejavu.so +%%X11%%lib/mozilla/plugins/nsdejavu.so share/djvu/osi/Chinese_PRC/libdjvu++.xml share/djvu/osi/Chinese_PRC/messages.xml @dirrm share/djvu/osi/Chinese_PRC @@ -39,4 +39,5 @@ @dirrm share/djvu %%PORTDOCS%%share/doc/djvulibre/djvu2spec.djvu %%PORTDOCS%%share/doc/djvulibre/djvu3changes.txt -%%PORTDOCS%%@dirrm share/doc/djvulibre +%%PORTDOCS%%share/doc/djvulibre/lizard2002.djvu +%%PORTDOCS%%@dirrm share/doc/djvulibre #### End of Patch data #### #### ApplyPatch data follows #### # Data version : 1.0 # Date generated : Fri Sep 20 15:42:11 2002 # Generated by : makepatch 2.00 # Recurse directories : Yes # p 'Makefile' 1827 1032560918 0100644 # p 'distinfo' 64 1032558088 0100644 # c 'files/patch-gui::nsdejavu::Makefile.in' 0 1032559258 0100644 # p 'pkg-plist' 1066 1032561583 0100644 #### End of ApplyPatch data #### #### End of Patch kit [created: Fri Sep 20 15:42:11 2002] #### #### Checksum: 141 4716 39262 #### --- update-djvulibre-3.5.8 ends here --- >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200209202247.g8KMlq2H079607>