diff options
| -rw-r--r-- | graphics/netpbm/Makefile | 12 | ||||
| -rw-r--r-- | graphics/netpbm/PLIST | 87 | ||||
| -rw-r--r-- | graphics/netpbm/buildlink.mk | 12 | ||||
| -rw-r--r-- | graphics/netpbm/distinfo | 18 | ||||
| -rw-r--r-- | graphics/netpbm/patches/patch-aa | 170 | ||||
| -rw-r--r-- | graphics/netpbm/patches/patch-ab | 64 | ||||
| -rw-r--r-- | graphics/netpbm/patches/patch-ac | 8 | ||||
| -rw-r--r-- | graphics/netpbm/patches/patch-ad | 16 | ||||
| -rw-r--r-- | graphics/netpbm/patches/patch-ae | 14 | ||||
| -rw-r--r-- | graphics/netpbm/patches/patch-ag | 13 | ||||
| -rw-r--r-- | graphics/netpbm/patches/patch-ah | 14 | ||||
| -rw-r--r-- | graphics/netpbm/patches/patch-ai | 14 | ||||
| -rw-r--r-- | graphics/netpbm/patches/patch-aj | 14 | ||||
| -rw-r--r-- | graphics/netpbm/patches/patch-ak | 14 |
14 files changed, 180 insertions, 290 deletions
diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile index fba2db70eec..03747f29908 100644 --- a/graphics/netpbm/Makefile +++ b/graphics/netpbm/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.59 2002/03/13 17:37:13 fredb Exp $ +# $NetBSD: Makefile,v 1.60 2002/03/14 22:21:42 wiz Exp $ -DISTNAME= netpbm-9.7 -PKGREVISION= 1 +DISTNAME= netpbm-9.24 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=netpbm/} EXTRACT_SUFX= .tgz @@ -12,7 +11,9 @@ COMMENT= toolkit for conversion of images between different formats USE_BUILDLINK_ONLY= yes USE_GMAKE= yes -USE_LIBTOOL= yes +USE_PERL5= yes + +REPLACE_PERL= pnm/pnmquant ppm/ppmfade ppm/ppmrainbow ppm/ppmshadow INSTALL_TARGET= install-dev install MAKE_ENV+= CC="${CC}" INSTALL="${INSTALL}" @@ -31,8 +32,7 @@ MAKE_ENV+= NETWORKLD="" .endif post-patch: - ${MV} -f ${WRKSRC}/pbmplus.h ${WRKSRC}/pbmplus.h.in - ${SED} -e "s;@X11BASE@;${X11BASE};g" ${WRKSRC}/pbmplus.h.in > ${WRKSRC}/pbmplus.h + ${CP} ${WRKSRC}/Makefile.config.in ${WRKSRC}/Makefile.config post-install: ${INSTALL_DATA} ${WRKSRC}/shhopt/shhopt.h ${PREFIX}/include diff --git a/graphics/netpbm/PLIST b/graphics/netpbm/PLIST index 9718a005b19..6298a94af79 100644 --- a/graphics/netpbm/PLIST +++ b/graphics/netpbm/PLIST @@ -1,4 +1,5 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:52:23 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/03/14 22:21:42 wiz Exp $ +bin/411toppm bin/anytopnm bin/asciitopgm bin/atktopbm @@ -28,7 +29,15 @@ bin/macptopbm bin/mdatopbm bin/mgrtopbm bin/mtvtoppm +bin/neotoppm +bin/palmtopnm +bin/pamchannel bin/pamcut +bin/pamdeinterlace +bin/pamfile +bin/pamoil +bin/pamstretch +bin/pamstretch-gen bin/pamtopnm bin/pbmclean bin/pbmlife @@ -56,11 +65,13 @@ bin/pbmtolps bin/pbmtomacp bin/pbmtomda bin/pbmtomgr +bin/pbmtonokia bin/pbmtopgm bin/pbmtopi3 bin/pbmtopk bin/pbmtoplot bin/pbmtoppa +bin/pbmtopsg3 bin/pbmtoptx bin/pbmtowbmp bin/pbmtox10bm @@ -68,6 +79,7 @@ bin/pbmtoxbm bin/pbmtoybm bin/pbmtozinc bin/pbmupc +bin/pcdindex bin/pcxtoppm bin/pgmbentley bin/pgmcrater @@ -77,7 +89,6 @@ bin/pgmhist bin/pgmkernel bin/pgmnoise bin/pgmnorm -bin/pgmoil bin/pgmramp bin/pgmslice bin/pgmtexture @@ -94,6 +105,7 @@ bin/pngtopnm bin/pnmalias bin/pnmarith bin/pnmcat +bin/pnmcolormap bin/pnmcomp bin/pnmconvol bin/pnmcrop @@ -107,24 +119,29 @@ bin/pnmhisteq bin/pnmhistmap bin/pnmindex bin/pnminterp -bin/pnminterp-gen bin/pnminvert bin/pnmmargin +bin/pnmmontage bin/pnmnlfilt bin/pnmnoraw bin/pnmpad bin/pnmpaste bin/pnmpsnr +bin/pnmquant +bin/pnmremap bin/pnmrotate bin/pnmscale +bin/pnmscalefixed bin/pnmshear -bin/pnmsplit bin/pnmsmooth +bin/pnmsplit bin/pnmtile bin/pnmtoddif bin/pnmtofiasco bin/pnmtofits bin/pnmtojbig +bin/pnmtojpeg +bin/pnmtopalm bin/pnmtoplainpnm bin/pnmtopng bin/pnmtops @@ -140,6 +157,7 @@ bin/ppmbrighten bin/ppmchange bin/ppmcie bin/ppmcolormask +bin/ppmcolors bin/ppmdim bin/ppmdist bin/ppmdither @@ -156,6 +174,7 @@ bin/ppmpat bin/ppmquant bin/ppmquantall bin/ppmqvga +bin/ppmrainbow bin/ppmrelief bin/ppmshadow bin/ppmshift @@ -168,8 +187,11 @@ bin/ppmtoicr bin/ppmtoilbm bin/ppmtojpeg bin/ppmtoleaf +bin/ppmtolj bin/ppmtomap bin/ppmtomitsu +bin/ppmtompeg +bin/ppmtoneo bin/ppmtopcx bin/ppmtopgm bin/ppmtopi1 @@ -181,8 +203,8 @@ bin/ppmtorgb3 bin/ppmtosixel bin/ppmtotga bin/ppmtouil -bin/ppmtoxpm bin/ppmtowinicon +bin/ppmtoxpm bin/ppmtoyuv bin/ppmtoyuvsplit bin/ppmtv @@ -202,6 +224,7 @@ bin/spctoppm bin/spottopgm bin/sputoppm bin/tgatoppm +bin/thinkjettopbm bin/tifftopnm bin/wbmptopbm bin/winicontoppm @@ -214,33 +237,38 @@ bin/ybmtopbm bin/yuvsplittoppm bin/yuvtoppm bin/zeisstopnm +include/pam.h +include/pammap.h include/pbm.h -include/pbmplus.h include/pgm.h +include/pm.h +include/pm_config.h include/pnm.h include/ppm.h include/ppmcmap.h +include/ppmfloyd.h include/shhopt.h lib/libpbm.a -lib/libpbm.la lib/libpbm.so lib/libpbm.so.9 -lib/libpbm.so.9.5 +lib/libpbm.so.9.23 lib/libpgm.a -lib/libpgm.la lib/libpgm.so lib/libpgm.so.9 -lib/libpgm.so.9.7 +lib/libpgm.so.9.19 lib/libpnm.a -lib/libpnm.la lib/libpnm.so lib/libpnm.so.9 -lib/libpnm.so.9.5 +lib/libpnm.so.9.23 lib/libppm.a -lib/libppm.la lib/libppm.so lib/libppm.so.9 -lib/libppm.so.9.7 +lib/libppm.so.9.16 +lib/palmcolor8.map +lib/palmgray1.map +lib/palmgray2.map +lib/palmgray4.map +man/man1/411toppm.1 man/man1/anytopnm.1 man/man1/asciitopgm.1 man/man1/atktopbm.1 @@ -253,7 +281,6 @@ man/man1/fiascotopnm.1 man/man1/fitstopnm.1 man/man1/fstopgm.1 man/man1/g3topbm.1 -man/man1/gemtopnm.1 man/man1/giftopnm.1 man/man1/gouldtoppm.1 man/man1/hipstopgm.1 @@ -269,7 +296,16 @@ man/man1/macptopbm.1 man/man1/mdatopbm.1 man/man1/mgrtopbm.1 man/man1/mtvtoppm.1 +man/man1/neotoppm.1 +man/man1/netpbm.1 +man/man1/palmtopnm.1 +man/man1/pamchannel.1 man/man1/pamcut.1 +man/man1/pamdeinterlace.1 +man/man1/pamfile.1 +man/man1/pamoil.1 +man/man1/pamstretch-gen.1 +man/man1/pamstretch.1 man/man1/pamtopnm.1 man/man1/pbmclean.1 man/man1/pbmlife.1 @@ -297,11 +333,13 @@ man/man1/pbmtolps.1 man/man1/pbmtomacp.1 man/man1/pbmtomda.1 man/man1/pbmtomgr.1 +man/man1/pbmtonokia.1 man/man1/pbmtopgm.1 man/man1/pbmtopi3.1 man/man1/pbmtopk.1 man/man1/pbmtoplot.1 man/man1/pbmtoppa.1 +man/man1/pbmtopsg3.1 man/man1/pbmtoptx.1 man/man1/pbmtowbmp.1 man/man1/pbmtox10bm.1 @@ -309,6 +347,7 @@ man/man1/pbmtoxbm.1 man/man1/pbmtoybm.1 man/man1/pbmtozinc.1 man/man1/pbmupc.1 +man/man1/pcdindex.1 man/man1/pcxtoppm.1 man/man1/pgmbentley.1 man/man1/pgmcrater.1 @@ -318,7 +357,6 @@ man/man1/pgmhist.1 man/man1/pgmkernel.1 man/man1/pgmnoise.1 man/man1/pgmnorm.1 -man/man1/pgmoil.1 man/man1/pgmramp.1 man/man1/pgmslice.1 man/man1/pgmtexture.1 @@ -335,6 +373,7 @@ man/man1/pngtopnm.1 man/man1/pnmalias.1 man/man1/pnmarith.1 man/man1/pnmcat.1 +man/man1/pnmcolormap.1 man/man1/pnmcomp.1 man/man1/pnmconvol.1 man/man1/pnmcrop.1 @@ -347,16 +386,18 @@ man/man1/pnmgamma.1 man/man1/pnmhisteq.1 man/man1/pnmhistmap.1 man/man1/pnmindex.1 -man/man1/pnminterp-gen.1 -man/man1/pnminterp.1 man/man1/pnminvert.1 man/man1/pnmmargin.1 +man/man1/pnmmontage.1 man/man1/pnmnlfilt.1 man/man1/pnmpad.1 man/man1/pnmpaste.1 man/man1/pnmpsnr.1 +man/man1/pnmquant.1 +man/man1/pnmremap.1 man/man1/pnmrotate.1 man/man1/pnmscale.1 +man/man1/pnmscalefixed.1 man/man1/pnmshear.1 man/man1/pnmsmooth.1 man/man1/pnmsplit.1 @@ -365,11 +406,13 @@ man/man1/pnmtoddif.1 man/man1/pnmtofiasco.1 man/man1/pnmtofits.1 man/man1/pnmtojbig.1 +man/man1/pnmtojpeg.1 +man/man1/pnmtopalm.1 man/man1/pnmtoplainpnm.1 man/man1/pnmtopng.1 man/man1/pnmtops.1 -man/man1/pnmtorle.1 man/man1/pnmtorast.1 +man/man1/pnmtorle.1 man/man1/pnmtosgi.1 man/man1/pnmtosir.1 man/man1/pnmtotiff.1 @@ -380,6 +423,7 @@ man/man1/ppmbrighten.1 man/man1/ppmchange.1 man/man1/ppmcie.1 man/man1/ppmcolormask.1 +man/man1/ppmcolors.1 man/man1/ppmdim.1 man/man1/ppmdist.1 man/man1/ppmdither.1 @@ -396,6 +440,7 @@ man/man1/ppmpat.1 man/man1/ppmquant.1 man/man1/ppmquantall.1 man/man1/ppmqvga.1 +man/man1/ppmrainbow.1 man/man1/ppmrelief.1 man/man1/ppmshadow.1 man/man1/ppmshift.1 @@ -406,11 +451,12 @@ man/man1/ppmtoeyuv.1 man/man1/ppmtogif.1 man/man1/ppmtoicr.1 man/man1/ppmtoilbm.1 -man/man1/ppmtojpeg.1 man/man1/ppmtoleaf.1 +man/man1/ppmtolj.1 man/man1/ppmtomap.1 man/man1/ppmtomitsu.1 man/man1/ppmtompeg.1 +man/man1/ppmtoneo.1 man/man1/ppmtopcx.1 man/man1/ppmtopgm.1 man/man1/ppmtopi1.1 @@ -443,6 +489,7 @@ man/man1/spctoppm.1 man/man1/spottopgm.1 man/man1/sputoppm.1 man/man1/tgatoppm.1 +man/man1/thinkjettopbm.1 man/man1/tifftopnm.1 man/man1/wbmptopbm.1 man/man1/winicontoppm.1 diff --git a/graphics/netpbm/buildlink.mk b/graphics/netpbm/buildlink.mk index 1370009e6ff..e5861e7ac7f 100644 --- a/graphics/netpbm/buildlink.mk +++ b/graphics/netpbm/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.6 2002/03/13 17:37:13 fredb Exp $ +# $NetBSD: buildlink.mk,v 1.7 2002/03/14 22:21:42 wiz Exp $ # # This Makefile fragment is included by packages that use netpbm. # @@ -17,17 +17,21 @@ NETPBM_BUILDLINK_MK= # defined .include "../../mk/bsd.buildlink.mk" -BUILDLINK_DEPENDS.netpbm?= netpbm>=9.7nb1 +BUILDLINK_DEPENDS.netpbm?= netpbm>=9.24 DEPENDS+= ${BUILDLINK_DEPENDS.netpbm}:../../graphics/netpbm EVAL_PREFIX+= BUILDLINK_PREFIX.netpbm=netpbm BUILDLINK_PREFIX.netpbm_DEFAULT= ${LOCALBASE} -BUILDLINK_FILES.netpbm= include/pbm.h -BUILDLINK_FILES.netpbm+= include/pbmplus.h +BUILDLINK_FILES.netpbm= include/pam.h +BUILDLINK_FILES.netpbm+= include/pammap.h +BUILDLINK_FILES.netpbm+= include/pbm.h BUILDLINK_FILES.netpbm+= include/pgm.h +BUILDLINK_FILES.netpbm+= include/pm.h +BUILDLINK_FILES.netpbm+= include/pm_config.h BUILDLINK_FILES.netpbm+= include/pnm.h BUILDLINK_FILES.netpbm+= include/ppm.h BUILDLINK_FILES.netpbm+= include/ppmcmap.h +BUILDLINK_FILES.netpbm+= include/ppmfloyd.h BUILDLINK_FILES.netpbm+= include/shhopt.h BUILDLINK_FILES.netpbm+= lib/libpbm.* BUILDLINK_FILES.netpbm+= lib/libpgm.* diff --git a/graphics/netpbm/distinfo b/graphics/netpbm/distinfo index a68aeb4d7c8..0dc098bdbcb 100644 --- a/graphics/netpbm/distinfo +++ b/graphics/netpbm/distinfo @@ -1,14 +1,6 @@ -$NetBSD: distinfo,v 1.4 2001/06/19 04:21:32 jlam Exp $ +$NetBSD: distinfo,v 1.5 2002/03/14 22:21:42 wiz Exp $ -SHA1 (netpbm-9.7.tgz) = 81b42fc267970777b0062cc01edb09907930a1c7 -Size (netpbm-9.7.tgz) = 1942307 bytes -SHA1 (patch-aa) = abd06daf5eef8116999469af06b3b275ec10c068 -SHA1 (patch-ab) = abc5ee8778d84a15d958014ed12a0fa56e649056 -SHA1 (patch-ac) = c61bdaa9b7516b81ad02ab55a9113bac8fe99b62 -SHA1 (patch-ad) = 2bb69d6408b76707d8501de88bb27df6da1fc0c7 -SHA1 (patch-ae) = 77754f2cdc8cd249dab18e1fe9841339ddc06f03 -SHA1 (patch-ag) = c488eba9a1afe542602828899cceb9ea9211d543 -SHA1 (patch-ah) = 833d3b4e4e451cdba0d538c5624ee5daa3d30f42 -SHA1 (patch-ai) = ffe8b5cb179262c3aa330ea3f485ff9fd76a049f -SHA1 (patch-aj) = 6b6ce88a8ce147d8c608810158c88b5279350640 -SHA1 (patch-ak) = 47d23287eaee1d54fe06a1b5dd065f529ca254b5 +SHA1 (netpbm-9.24.tgz) = 2be68df2cd18b55864856db1e331a7e01b9f06c9 +Size (netpbm-9.24.tgz) = 2022612 bytes +SHA1 (patch-aa) = 5980276d7afc92f5d3563f9e9faabb8545cdb453 +SHA1 (patch-ac) = 7f0dc80b174cca62955c51a5ee98056ef9cceb41 diff --git a/graphics/netpbm/patches/patch-aa b/graphics/netpbm/patches/patch-aa index 0843107510b..6b4f8d92b0f 100644 --- a/graphics/netpbm/patches/patch-aa +++ b/graphics/netpbm/patches/patch-aa @@ -1,92 +1,104 @@ -$NetBSD: patch-aa,v 1.14 2001/06/19 04:21:04 jlam Exp $ +$NetBSD: patch-aa,v 1.15 2002/03/14 22:21:42 wiz Exp $ ---- Makefile.config.orig Thu Jun 22 13:48:03 2000 -+++ Makefile.config Fri Jun 15 17:42:45 2001 -@@ -29,8 +29,8 @@ - # - # For cygwin, only static libraries work, so set STATICLIB = Y . - --STATICLIB = N --#STATICLIB = Y -+#STATICLIB = N -+STATICLIB = Y - - # The following are commands for the build process to use. These values - # do not get built into anything. -@@ -39,19 +39,20 @@ - #Tru64: - #CC = cc - #CC = gcc --CC = gcc -+#CC = gcc +--- Makefile.config.in.orig Sun Jan 13 20:37:46 2002 ++++ Makefile.config.in +@@ -33,7 +33,7 @@ + #Tru64 (= Digital Unix): + #CC = cc + #CC = gcc +-CC = gcc ++#CC = gcc # The linker. --LD = $(CC) -+#LD = $(CC) - #LD = ld - #Tru64: - #LD = cc - #LD = gcc -+LD = $(LIBTOOL) --mode=link $(CC) + LD = $(CC) +@@ -44,7 +44,7 @@ # MAKE is set automatically by Make to what was used to invoke Make. - SHELL = /bin/sh -INSTALL = ginstall +#INSTALL = ginstall - # Solaris: + #Solaris: #INSTALL = /usr/ucb/install #Tru64: -@@ -59,7 +60,7 @@ - #OSF1: - #INSTALL = installosf - # ? --#INSTALL = install -+#INSTALL = install -c - - # Normally the man pages are installed using "install". But via this - # variable, you can use something else, for example a script that -@@ -79,7 +80,7 @@ +@@ -96,7 +96,7 @@ # -ansi and -Werror should work too, but are not included # by default because there's no point in daring the build to fail. # -pedantic isn't a problem because it causes at worst a warning. --CFLAGS = -pedantic -O2 -Wall -Wno-uninitialized $(CDEBUG) -+CFLAGS += -pedantic -Wall -Wno-uninitialized $(CDEBUG) +-CFLAGS = -pedantic -O3 -Wall -Wno-uninitialized ++CFLAGS += -pedantic -Wall -Wno-uninitialized # On DEC Tru64 4.0F (at least), you need -DLONG_32 for ppmtompeg. #Tru64: - #CFLAGS = -O2 -std1 DLONG_32 $(CDEBUG) -@@ -93,7 +94,7 @@ - - # linker options. + #CFLAGS = -O2 -std1 -DLONG_32 +@@ -125,10 +125,10 @@ + # the directory information in the executable at link time. + + # Solaris, SunOS, NetBSD: +-NEED_RUNTIME_PATH = N +-#NEED_RUNTIME_PATH = Y ++#NEED_RUNTIME_PATH = N ++NEED_RUNTIME_PATH = Y -LDFLAGS = +#LDFLAGS = # Eunice users may want to use -noshare so that the executables can # run standalone: #LDFLAGS = -noshare -@@ -148,11 +149,11 @@ - # but otherwise will not. +@@ -144,9 +144,9 @@ + + ifeq ($(NEED_RUNTIME_PATH),Y) + #If the linker is gcc (e.g. NetBSD): +-#LDFLAGS += -Wl,--rpath,$(INSTALLLIBS) ++LDFLAGS += -Wl,--rpath,$(INSTALLLIBS) + #Any other linker: +-LDFLAGS += -R$(INSTALLLIBS) ++#LDFLAGS += -R$(INSTALLLIBS) + endif + + # Linker options for created Netpbm shared libraries. +@@ -170,9 +170,9 @@ - # Use the Tiff library included with Netpbm: --TIFFHDR_DIR = $(SRCDIR)/libtiff --TIFFLIB_DIR = $(SRCDIR)/libtiff -+#TIFFHDR_DIR = $(SRCDIR)/libtiff -+#TIFFLIB_DIR = $(SRCDIR)/libtiff + ifeq ($(NEED_RUNTIME_PATH),Y) + #If the linker is gcc (e.g. NetBSD): +-#LDSHLIB += -Wl,--rpath,$(INSTALLLIBS) ++LDSHLIB += -Wl,--rpath,$(INSTALLLIBS) + #Any other linker: +-LDSHLIB += -R$(INSTALLLIBS) ++#LDSHLIB += -R$(INSTALLLIBS) + endif + + # On older systems, you have to make shared libraries out of position +@@ -192,7 +192,7 @@ + CFLAGS_SHLIB = + # Solaris or SunOS with gcc, and NetBSD: + #CFLAGS_SHLIB = -fpic +-#CFLAGS_SHLIB = -fPIC ++CFLAGS_SHLIB = -fPIC + # Sun compiler: + #CFLAGS_SHLIB = -Kpic + #CFLAGS_SHLIB = -KPIC +@@ -210,11 +210,11 @@ + # The TIFF library. See above. If you want to build the tiff + # converters, you must have the tiff library already installed. + +-TIFFLIB_DIR = /usr/lib +-TIFFHDR_DIR = /usr/include/libtiff ++#TIFFLIB_DIR = /usr/lib ++#TIFFHDR_DIR = /usr/include/libtiff #NetBSD: --#TIFFHDR_DIR = $(LOCALBASE)/include -#TIFFLIB_DIR = $(LOCALBASE)/lib -+TIFFHDR_DIR = ${BUILDLINK_DIR}/include -+TIFFLIB_DIR = ${BUILDLINK_DIR}/lib +-#TIFFHDR_DIR = $(LOCALBASE)/include ++TIFFLIB_DIR = $(BUILDLINK_DIR)/lib ++TIFFHDR_DIR = $(BUILDLINK_DIR)/include # OSF, Tru64: - #TIFFHDR_DIR = /usr/local1/DEC/include #TIFFLIB_DIR = /usr/local1/DEC/lib -@@ -173,11 +174,11 @@ - # at least JPEGLIB_DIR here, or the tiff converters will not build at - # all. + #TIFFHDR_DIR = /usr/local1/DEC/include +@@ -238,11 +238,11 @@ + # JPEG stuff statically linked in, in which case you won't need + # JPEGLIB_DIR in order to build the Tiff converters. --JPEGLIB_DIR = /usr/lib/jpeg +-JPEGLIB_DIR = /usr/lib -JPEGHDR_DIR = /usr/include/jpeg -+#JPEGLIB_DIR = /usr/lib/jpeg ++#JPEGLIB_DIR = /usr/lib +#JPEGHDR_DIR = /usr/include/jpeg # Netbsd: -#JPEGLIB_DIR = ${LOCALBASE}/lib @@ -96,23 +108,23 @@ $NetBSD: patch-aa,v 1.14 2001/06/19 04:21:04 jlam Exp $ # OSF, Tru64: #JPEGLIB_DIR = /usr/local1/DEC/lib #JPEGHDR_DIR = /usr/local1/DEC/include -@@ -195,11 +196,11 @@ - # here. If you do not have the PNG library, and still want to - # successully build everything else, put NONE for these. +@@ -257,11 +257,11 @@ + # The PNG library. See above. If you want to build the PNG + # converters you must have the PNG library already installed. --PNGLIB_DIR = /lib +-PNGLIB_DIR = /usr/lib -PNGHDR_DIR = /usr/include/png -+#PNGLIB_DIR = /lib ++#PNGLIB_DIR = /usr/lib +#PNGHDR_DIR = /usr/include/png # NetBSD: -#PNGLIB_DIR = $(LOCALBASE)/lib -#PNGHDR_DIR = $(LOCALBASE)/include -+PNGLIB_DIR = ${BUILDLINK_DIR}/lib -+PNGHDR_DIR = ${BUILDLINK_DIR}/include ++PNGLIB_DIR = $(BUILDLINK_DIR)/lib ++PNGHDR_DIR = $(BUILDLINK_DIR)/include # OSF/Tru64: #PNGLIB_DIR = /usr/local1/DEC/lib #PNGHDR_DIR = /usr/local1/DEC/include -@@ -222,7 +223,7 @@ +@@ -300,7 +300,7 @@ # network functions is the option in ppmtompeg to run it on multiple # computers simultaneously. @@ -121,14 +133,12 @@ $NetBSD: patch-aa,v 1.14 2001/06/19 04:21:04 jlam Exp $ # Solaris, SunOS: #NETWORKLD = -lsocket -lnsl # Don't build network functions: -@@ -305,8 +306,8 @@ - #be a rule in the makefiles to make whatever the fliename turns out to be. - #Only .a and .so work. - ifeq ($(STATICLIB),Y) -- NETPBMLIBSUFFIX = a -- LIBTIFFSUFFIX = a -+ NETPBMLIBSUFFIX = la -+ LIBTIFFSUFFIX = la - else - NETPBMLIBSUFFIX = so - LIBTIFFSUFFIX = so +@@ -346,7 +346,7 @@ + #INSTALL_PREFIX = /djgpp + # Typical: + #INSTALL_PREFIX = /usr/local/ +-INSTALL_PREFIX = /usr/local/netpbm ++INSTALL_PREFIX = ${PREFIX} + + # Specify the directory where you want the executables. + # If you need scripts and binaries to be in different directories, you diff --git a/graphics/netpbm/patches/patch-ab b/graphics/netpbm/patches/patch-ab deleted file mode 100644 index bd577a3da35..00000000000 --- a/graphics/netpbm/patches/patch-ab +++ /dev/null @@ -1,64 +0,0 @@ -$NetBSD: patch-ab,v 1.9 2000/08/10 10:44:10 wiz Exp $ - ---- Makefile.common.orig Fri Aug 4 02:17:52 2000 -+++ Makefile.common Thu Aug 10 12:16:47 2000 -@@ -68,7 +68,7 @@ - # Note that the user may have configured -I options into CFLAGS. - $(CC) -c $(INCLUDE) $(CFLAGS) -o $@ $< - --LIBOPT = $(SRCDIR)/libopt -+LIBOPT = /bin/echo # XXX must exist, can't be ${ECHO} (shell builtin) - - # Rules for conventional single-object file executables - $(PORTBINARIES): %: %.o $(NETPBMLIBS) $(LIBOPT) -@@ -103,7 +103,7 @@ - - $(LIBOBJECTS): %.o: %.c - # Note that the user may have configured -I options into CFLAGS. -- $(CC) -c $(INCLUDE) $(CFLAGS) $(CFLAGS_SHLIB) -o $@ $< -+ $(LIBTOOL) $(CC) -c $(INCLUDE) $(CFLAGS) $(CFLAGS_SHLIB) $< - - SONAME = lib$(LIBROOT).so.$(MAJ) - -@@ -123,10 +123,8 @@ - `$(LIBOPT) $(LIBLIBS)` -lc - - # Static library. Unused by default, but with a small change to make files... --lib$(LIBROOT).a: $(LIBOBJECTS) $(LIBOBJECTS_X) -- -rm -f $@ -- ar rc $@ $(LIBOBJECTS) $(LIBOBJECTS_X) -- -ranlib $@ -+lib$(LIBROOT).la: $(LIBOBJECTS) $(LIBOBJECTS_X) -+ $(LIBTOOL) --mode=link $(CC) -rpath $(PREFIX)/lib -version-info $(MAJ):$(MIN) -o $@ $(LIBOBJECTS:.o=.lo) $(LIBOBJECTS_X:.o=.lo) - - # Some maintenance notes about $(INSTALL): Some install programs can - # install multiple files in one shot; others can take only one file at -@@ -169,7 +167,7 @@ - # Make and Install know that pbmmake.exe counts as pbmmake. - for x in $(BINARIES); \ - do \ -- $(INSTALL) -c -s -m $(INSTALL_PERM_BIN) $$x $(INSTALLBINARIES); \ -+ $(LIBTOOL) --mode=install $(INSTALL) -c -s -m $(INSTALL_PERM_BIN) $$x $(INSTALLBINARIES); \ - done - - .PHONY: install.script -@@ -222,8 +220,8 @@ - # built. So if you later do a make install.staticlib, the dependency - # here causes the static library to be built at that time. - .PHONY: install.staticlib --install.staticlib: lib$(LIBROOT).a -- $(INSTALL) -c -m $(INSTALL_PERM_LIBS) $< $(INSTALLLIBS)/$< -+install.staticlib: lib$(LIBROOT).la -+ $(LIBTOOL) --mode=install $(BSD_INSTALL_DATA) lib$(LIBROOT).la $(PREFIX)/lib - - .PHONY: install.lib.common - # install a shared library -@@ -235,7 +233,7 @@ - - .PHONY: clean.common - clean.common: -- -rm -f *.o *.o2 *.a *.so* *.cat *~ core *.core *.i *.s merge.h \ -+ -rm -f *.o *.o2 *.la *.so* *.cat *~ core *.core *.i *.s merge.h \ - $(BINARIES) $(MERGENAME) - - .PHONY: dep diff --git a/graphics/netpbm/patches/patch-ac b/graphics/netpbm/patches/patch-ac index 66813aba61d..187e8f1a273 100644 --- a/graphics/netpbm/patches/patch-ac +++ b/graphics/netpbm/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.7 2000/05/17 10:13:20 tron Exp $ +$NetBSD: patch-ac,v 1.8 2002/03/14 22:21:43 wiz Exp $ ---- shhopt/Makefile.orig Thu May 4 23:10:36 2000 -+++ shhopt/Makefile Wed May 17 10:23:21 2000 -@@ -61,7 +61,7 @@ +--- shhopt/Makefile.orig Sat May 19 20:39:03 2001 ++++ shhopt/Makefile +@@ -63,7 +63,7 @@ -L. -I. -L$(INSTLIBDIR) -I$(INSTINCDIR) -lshhopt .c.o: diff --git a/graphics/netpbm/patches/patch-ad b/graphics/netpbm/patches/patch-ad deleted file mode 100644 index 0f8365c7abe..00000000000 --- a/graphics/netpbm/patches/patch-ad +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ad,v 1.8 2000/05/17 10:13:20 tron Exp $ - ---- pnm/Makefile.orig Tue May 16 03:29:36 2000 -+++ pnm/Makefile Wed May 17 11:00:41 2000 -@@ -128,9 +128,9 @@ - - # The Tiff library references math functions. - tifftopnm pnmtotiff pnmtotiffcmyk: %: %.o \ -- $(NETPBMLIBS) $(TIFFLIB_DIR)/libtiff.$(LIBTIFFSUFFIX) $(LIBOPT) -+ $(NETPBMLIBS) $(LIBOPT) $(TIFFLIB_DEP) - $(LD) $(LDFLAGS) -o $@ $@.o `$(LIBOPT) $(NETPBMLIBS)` \ -- -L$(TIFFLIB_DIR) -ltiff $(JPEGLD) -lm $(CDEBUG) -+ -L$(TIFFLIB_DIR) -ltiff $(JPEGLD) -lm -lz $(CDEBUG) - - pngtopnm pnmtopng: %: %.o $(NETPBMLIBS) $(LIBOPT) - $(LD) $(LDFLAGS) -o $@ $@.o `$(LIBOPT) $(NETPBMLIBS)` \ diff --git a/graphics/netpbm/patches/patch-ae b/graphics/netpbm/patches/patch-ae deleted file mode 100644 index 3046ebd1761..00000000000 --- a/graphics/netpbm/patches/patch-ae +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ae,v 1.7 2000/08/10 10:44:10 wiz Exp $ - ---- ppm/ppmtompeg/parallel.c.orig Sat Jul 1 09:51:53 2000 -+++ ppm/ppmtompeg/parallel.c Thu Aug 10 12:14:53 2000 -@@ -70,9 +70,6 @@ - * - */ - --#define _POSIX_SOURCE --#define _POSIX_C_SOURCE 2 -- /* This makes sure pclose() is in stdio.h */ - /* On SunOS 5.6, netinet/in.h, via sys/vnode.h uses non-POSIX - typedefs, but when _POSIX_SOURCE is defined, it doesn't cause those - typedefs to be defined. In later releases, this is fixed. If we diff --git a/graphics/netpbm/patches/patch-ag b/graphics/netpbm/patches/patch-ag deleted file mode 100644 index afcc720addc..00000000000 --- a/graphics/netpbm/patches/patch-ag +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ag,v 1.4 2000/07/10 11:12:11 wiz Exp $ - ---- pbmplus.h.orig Mon Jun 19 21:24:29 2000 -+++ pbmplus.h Sun Jul 9 23:51:24 2000 -@@ -51,7 +51,7 @@ - #define RGB_DB1 "PBMplus_Dir:RGB.TXT" - #define RGB_DB2 "PBMplus_Dir:RGB.TXT" - #else --#define RGB_DB1 "/usr/lib/X11/rgb.txt" -+#define RGB_DB1 "@X11BASE@/lib/X11/rgb.txt" - #define RGB_DB2 "/usr/openwin/lib/rgb.txt" - #endif - diff --git a/graphics/netpbm/patches/patch-ah b/graphics/netpbm/patches/patch-ah deleted file mode 100644 index cc1914c68ab..00000000000 --- a/graphics/netpbm/patches/patch-ah +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ah,v 1.3 2001/01/10 14:07:21 bad Exp $ - ---- pnm/fiasco/codec/Makefile.orig Fri Jul 7 00:22:29 2000 -+++ pnm/fiasco/codec/Makefile Wed Jan 10 14:46:45 2001 -@@ -17,7 +17,8 @@ - all: libfiasco_codec.a - - libfiasco_codec.a: $(OBJECTS) -- ar -rc $@ $(OBJECTS) -+ $(AR) -rc $@ $(OBJECTS) -+ $(RANLIB) $@ - - .PHONY: clean - clean: clean.common diff --git a/graphics/netpbm/patches/patch-ai b/graphics/netpbm/patches/patch-ai deleted file mode 100644 index 633ea054e7a..00000000000 --- a/graphics/netpbm/patches/patch-ai +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ai,v 1.3 2001/01/10 14:07:22 bad Exp $ - ---- pnm/fiasco/input/Makefile.orig Fri Jul 7 00:22:51 2000 -+++ pnm/fiasco/input/Makefile Wed Jan 10 14:47:22 2001 -@@ -8,7 +8,8 @@ - all: libfiasco_input.a - - libfiasco_input.a: $(OBJECTS) -- ar -rc $@ $(OBJECTS) -+ $(AR) -rc $@ $(OBJECTS) -+ $(RANLIB) $@ - - .PHONY: clean - clean: clean.common diff --git a/graphics/netpbm/patches/patch-aj b/graphics/netpbm/patches/patch-aj deleted file mode 100644 index 77fff5bbfac..00000000000 --- a/graphics/netpbm/patches/patch-aj +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-aj,v 1.5 2001/01/10 14:07:22 bad Exp $ - ---- pnm/fiasco/lib/Makefile.orig Fri Jul 7 00:23:44 2000 -+++ pnm/fiasco/lib/Makefile Wed Jan 10 14:49:33 2001 -@@ -14,7 +14,8 @@ - all: libfiasco_lib.a - - libfiasco_lib.a: $(OBJECTS) -- ar -rc $@ $(OBJECTS) -+ $(AR) -rc $@ $(OBJECTS) -+ $(RANLIB) $@ - - .PHONY: clean - clean: clean.common diff --git a/graphics/netpbm/patches/patch-ak b/graphics/netpbm/patches/patch-ak deleted file mode 100644 index 9a082c1da5b..00000000000 --- a/graphics/netpbm/patches/patch-ak +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ak,v 1.3 2001/01/10 14:07:23 bad Exp $ - ---- pnm/fiasco/output/Makefile.orig Fri Jul 7 00:23:22 2000 -+++ pnm/fiasco/output/Makefile Wed Jan 10 14:50:07 2001 -@@ -8,7 +8,8 @@ - all: libfiasco_output.a - - libfiasco_output.a: $(OBJECTS) -- ar -rc $@ $(OBJECTS) -+ $(AR) -rc $@ $(OBJECTS) -+ $(RANLIB) $@ - - all: $(OBJECTS) - |