Update to more current version;

fixes PR 4737 by Matthias Scheler <tron@lyssa.owl.de>.

10 files changed, 344 insertions, 711 deletions

diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index 16a3ee13b60..788481405ab 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -1,30 +1,29 @@
-# $NetBSD: Makefile,v 1.7 1997/12/15 00:52:26 hubertf Exp $
+# $NetBSD: Makefile,v 1.8 1997/12/31 03:34:45 hubertf Exp $
 # New ports collection makefile for:	netpbm
 # Version required:	1mar1994
-# Date created:		?
-# Whom:			jmz (original)
+# Date created:		20 December 1997
+# Whom:			jmz (original), asami@FreeBSD.ORG, tron
 #
-# FreeBSD Id: Makefile,v 1.8 1996/11/18 11:28:55 asami Exp
 #
 
 DISTNAME=	netpbm
 PKGNAME=	netpbm-94.3.1
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://ftp.x.org/R5contrib/
-DISTFILES=	netpbm-1mar1994.tar.gz
+MASTER_SITES=	ftp://ftp.wustl.edu//graphics/graphics/packages/NetPBM/ \
+		ftp://ftp.informatik.uni-oldenburg.de/pub/netpbm/ \
+		ftp://ftp.informatik.uni-oldenburg.de/pub/grafik/png/applications/
+DISTFILES=	netpbm-1mar1994.tar.gz \
+		pcxtoppm.tar.gz \
+		rletopnm.tar.gz \
+		pnmtopng-2.36.tar.gz
 
-MAINTAINER=	asami@FreeBSD.ORG
+LIB_DEPENDS=	jpeg\\.7\\.:${PORTSDIR}/graphics/jpeg \
+		png\\.0\\.96:${PORTSDIR}/graphics/png \
+		tiff\\.3\\.:${PORTSDIR}/graphics/tiff
 
-LIB_DEPENDS=	tiff\\.3\\.:${PORTSDIR}/graphics/tiff
+WRKSRC=		${WRKDIR}/netpbm
+MAKE_ENV +=	PREFIX=${PREFIX}
 
-USE_IMAKE=	yes
-
-OPSYS!=		uname -s
-
-.if (${OPSYS} == "NetBSD")
-
-MAKE_ENV +=	COMPRESSMANCMD="${GZIP_CMD}"
-MANCOMPRESSED=	yes
 MAN1=	atktopbm.1 g3topbm.1 brushtopbm.1 cmuwmtopbm.1 \
 	icontopbm.1 gemtopbm.1 macptopbm.1 mgrtopbm.1 \
 	pbmclean.1 pbmlife.1 pbmmake.1 pbmmask.1 \
@@ -63,9 +62,10 @@ MAN1=	atktopbm.1 g3topbm.1 brushtopbm.1 cmuwmtopbm.1 \
 	pnmcrop.1 pnmcut.1 pnmdepth.1 pnmenlarge.1 \
 	pnmfile.1 pnmflip.1 pnmhistmap.1 pnminvert.1 \
 	pnmnlfilt.1 pnmnoraw.1 pnmpad.1 pnmpaste.1 \
-	pnmscale.1 pnmtile.1 pnmtoddif.1 pnmtofits.1 \
-	pnmtops.1 pnmtorast.1 pnmtosgi.1 pnmtosir.1 \
-	pnmtoxwd.1 rasttopnm.1 sgitopnm.1 sirtopnm.1 \
+	pnmscale.1 pnmtile.1 pngtopnm.1 pnmtoddif.1 \
+	pnmtofits.1 pnmtopng.1 pnmtops.1 pnmtorast.1 \
+	pnmtorle.1 pnmtosgi.1 pnmtosir.1 pnmtoxwd.1 \
+	rasttopnm.1 rletopnm.1 sgitopnm.1 sirtopnm.1 \
 	xwdtopnm.1 zeisstopnm.1 pnmgamma.1 pnmrotate.1 \
 	pnmshear.1 anytopnm.1 pnmindex.1 pnmmargin.1 \
 	pnmsmooth.1 tifftopnm.1 pnmtotiff.1
@@ -73,12 +73,11 @@ MAN3=	libpbm.3 libpgm.3 libppm.3 libpnm.3
 MAN5=	pbm.5 pgm.5 ppm.5 pnm.5
 
 post-extract:
-	chmod -R +w ${WRKSRC}
-
-pre-configure:
-	for f in `find ${WRKSRC} -type f -print|xargs grep -l '/usr/local'`; do \
-		${SED} -e 's:/usr/local:'${LOCALBASE}':g' < $$f > $$f.pdone && mv $$f.pdone $$f; \
-	done
-.endif
+# make sure our TIFF library is used
+	rm -rf ${WRKSRC}/libtiff
+# move updates into source tree
+	cd ${WRKSRC};\
+	${MV} ../*pcx*.? ppm;\
+	${MV} ../*rle*.? ../*png*.? pnm
 
 .include <bsd.port.mk>
diff --git a/graphics/netpbm/files/md5 b/graphics/netpbm/files/md5
index 23f74891d91..f5ff98daba0 100644
--- a/graphics/netpbm/files/md5
+++ b/graphics/netpbm/files/md5
@@ -1 +1,5 @@
 MD5 (netpbm-1mar1994.tar.gz) = 55f505b09e69a5db8f08844435282dfb
+MD5 (hpcdtoppm.0.6.tar.gz) = 4f8992730ba42c693096e35cf5e5012f
+MD5 (pcxtoppm.tar.gz) = d9a37913ef2c2cd412b0e7f969487dc2
+MD5 (rletopnm.tar.gz) = c0488f9918f506bf6a8d09870d5d115f
+MD5 (pnmtopng-2.36.tar.gz) = 37258ecb340f58784faef72f280b1b9f
diff --git a/graphics/netpbm/patches/patch-aa b/graphics/netpbm/patches/patch-aa
index 5b5668169bc..00f6f2eb8a0 100644
--- a/graphics/netpbm/patches/patch-aa
+++ b/graphics/netpbm/patches/patch-aa
@@ -1,91 +1,59 @@
-*** Imakefile.orig	Mon Dec 13 13:01:21 1993
---- Imakefile	Wed Sep 21 21:26:49 1994
-***************
-*** 22,64 ****
-  #endif
-  
-  all::
-!       stamp-date
-  
-  MakeSubdirs($(SUBDIRS))
-  DependSubdirs($(SUBDIRS))
-  
-  World::
-!         @echo ""
-!         @echo "Building PBMPLUS"
-!         @echo ""
-!         @date
-!         @echo ""
-  	$(MAKE) $(MFLAGS) Makefiles
-!         $(MAKE) $(MFLAGS) clean
-!         $(MAKE) $(MFLAGS) includes
-!         $(MAKE) $(MFLAGS) depend
-!         $(MAKE) $(MFLAGS)
-!         @echo ""
-!         @date
-!         @echo ""
-!         @echo "Full build of PBMPLUS complete."
-!         @echo ""
-  
-  Everything::
-!         @echo ""
-!         @echo "Rebuilding PBMPLUS"
-!         @echo ""
-!         @date
-!         @echo ""
-!         $(MAKE) $(MFLAGS) Makefiles
-!         $(MAKE) $(MFLAGS) includes
-!         $(MAKE) $(MFLAGS) depend
-!         $(MAKE) $(MFLAGS)
-!         @echo ""
-!         @date
-!         @echo ""
-!         @echo "Rebuild of PBMPLUS complete."
-!         @echo ""
-  
-  #if InstallIncludes
-  InstallMultipleFlags(pbmplus.h,$(PBMPLUSDIR)$(PBMPLUSINCDIR),$(INSTINCFLAGS))
---- 22,64 ----
-  #endif
-  
-  all::
-! 	./stamp-date
-  
-  MakeSubdirs($(SUBDIRS))
-  DependSubdirs($(SUBDIRS))
-  
-  World::
-! 	@echo ""
-! 	@echo "Building PBMPLUS"
-! 	@echo ""
-! 	@date
-! 	@echo ""
-  	$(MAKE) $(MFLAGS) Makefiles
-! 	$(MAKE) $(MFLAGS) clean
-! 	$(MAKE) $(MFLAGS) includes
-! 	$(MAKE) $(MFLAGS) depend
-! 	$(MAKE) $(MFLAGS)
-! 	@echo ""
-! 	@date
-! 	@echo ""
-! 	@echo "Full build of PBMPLUS complete."
-! 	@echo ""
-  
-  Everything::
-! 	@echo ""
-! 	@echo "Rebuilding PBMPLUS"
-! 	@echo ""
-! 	@date
-! 	@echo ""
-! 	$(MAKE) $(MFLAGS) Makefiles
-! 	$(MAKE) $(MFLAGS) includes
-! 	$(MAKE) $(MFLAGS) depend
-! 	$(MAKE) $(MFLAGS)
-! 	@echo ""
-! 	@date
-! 	@echo ""
-! 	@echo "Rebuild of PBMPLUS complete."
-! 	@echo ""
-  
-  #if InstallIncludes
-  InstallMultipleFlags(pbmplus.h,$(PBMPLUSDIR)$(PBMPLUSINCDIR),$(INSTINCFLAGS))
+--- Makefile.orig	Wed Jan 26 12:47:35 1994
++++ Makefile	Sat Dec 20 22:54:14 1997
+@@ -48,24 +48,24 @@
+ # By the way, you must have at least version 2.4 of libtiff.  Earlier
+ # versions will not work.
+ TIFFDEF =	-DLIBTIFF
+-TIFFINC =	-I../libtiff
+-TIFFLIB =	../libtiff/libtiff.a
++TIFFINC =	-I$(PREFIX)/include
++TIFFLIB =	-L$(PREFIX)/lib -ltiff -ljpeg
+ TIFFBINARIES =	tifftopnm pnmtotiff
+ TIFFOBJECTS =	tifftopnm.o pnmtotiff.o
+ 
+ # CONFIGURE: Define the directory that you want the binaries copied to.
+ # If you need scripts and binaries to be in different directories, you
+ # can set that up too.
+-INSTALLBINARIES =	/usr/local/netpbm
++INSTALLBINARIES =	$(PREFIX)/bin
+ INSTALLSCRIPTS =	$(INSTALLBINARIES)
+ 
+ # CONFIGURE: Define the directories that you want the manual sources copied to,
+ # plus the suffix you want them to have.
+-INSTALLMANUALS1 =	/usr/local/man/man1
++INSTALLMANUALS1 =	$(PREFIX)/man/man1
+ SUFFIXMANUALS1 =	1
+-INSTALLMANUALS3 =	/usr/local/man/man3
++INSTALLMANUALS3 =	$(PREFIX)/man/man3
+ SUFFIXMANUALS3 =	3
+-INSTALLMANUALS5 =	/usr/local/man/man5
++INSTALLMANUALS5 =	$(PREFIX)/man/man5
+ SUFFIXMANUALS5 =	5
+ 
+ # CONFIGURE: Normally the man pages are installed using "cp".  By changing
+@@ -87,10 +87,10 @@
+ #
+ # Note that if you make a "merge", the executables don't get created
+ # until you do the install.
+-#all:		binaries
+-#install:	install.bin install.man
+-all:		merge
+-install:	install.merge install.man
++all:		binaries
++install:	install.bin install.man
++#all:		merge
++#install:	install.merge install.man
+ 
+ # End of configurable definitions.
+ 
+@@ -99,8 +99,8 @@
+ SUBDIRS =	pbm pgm ppm pnm
+ 
+ binaries:
+-	./stamp-date
+-	( echo "libtiff" ; cd libtiff ; make )
++#	./stamp-date
++#	( echo "libtiff" ; cd libtiff ; make )
+ 	for i in $(SUBDIRS) ; do \
+ 	    ( echo $$i ; cd $$i ; $(MAKE) $(MFLAGS) 'CC=$(CC)' 'CFLAGS=$(CFLAGS)' 'TIFFDEF=$(TIFFDEF)' 'TIFFINC=$(TIFFINC)' 'TIFFLIB=$(TIFFLIB)' 'TIFFBINARIES=$(TIFFBINARIES)' 'TIFFOBJECTS=$(TIFFOBJECTS)' 'LDFLAGS=$(LDFLAGS)' binaries ); \
+ 	done
diff --git a/graphics/netpbm/patches/patch-ab b/graphics/netpbm/patches/patch-ab
index 8d463f7cd31..6d72865d43e 100644
--- a/graphics/netpbm/patches/patch-ab
+++ b/graphics/netpbm/patches/patch-ab
@@ -1,19 +1,23 @@
-*** pbm/libpbm1.c.orig	Mon Jan 10 09:37:22 1994
---- pbm/libpbm1.c	Fri Oct 14 17:01:15 1994
-***************
-*** 332,338 ****
-      char* reason;
-      {
-  #ifndef A_STRERROR
-!     extern char* sys_errlist[];
-  #endif /* A_STRERROR */
-      extern int errno;
-      char* e;
---- 332,338 ----
-      char* reason;
-      {
-  #ifndef A_STRERROR
-! /*    extern char* sys_errlist[]; */
-  #endif /* A_STRERROR */
-      extern int errno;
-      char* e;
+--- pgm/Makefile.orig	Fri Jan 28 11:14:02 1994
++++ pgm/Makefile	Sat Dec 20 22:51:17 1997
+@@ -39,10 +39,10 @@
+ LIBPGM =	libpgm.a
+ 
+ PORTBINARIES =	asciitopgm bioradtopgm fstopgm hipstopgm \
+-		lispmtopgm pbmtopgm pgmbentley pgmenhance pgmhist pgmkernel \
++		lispmtopgm pbmtopgm pgmbentley pgmenhance pgmhist \
+ 		pgmnoise pgmnorm pgmoil pgmramp pgmtofs pgmtolispm \
+ 		pgmtopbm psidtopgm spottopgm
+-MATHBINARIES =	pgmcrater pgmedge pgmtexture rawtopgm
++MATHBINARIES =	pgmcrater pgmedge pgmtexture rawtopgm pgmkernel
+ BINARIES =	$(PORTBINARIES) $(MATHBINARIES)
+ 
+ OBJECTS =	asciitopgm.o bioradtopgm.o fstopgm.o hipstopgm.o \
+@@ -134,7 +134,6 @@
+ pgmedge pgmedge.o:		pgmedge.c
+ pgmenhance pgmenhance.o:	pgmenhance.c
+ pgmhist pgmhist.o:		pgmhist.c
+-pgmkernel pgmkernel.o:		pgmkernel.c
+ pgmnoise pgmnoise.o:		pgmnoise.c
+ pgmnorm pgmnorm.o:		pgmnorm.c
+ pgmoil pgmoil.o:		pgmoil.c
diff --git a/graphics/netpbm/patches/patch-ac b/graphics/netpbm/patches/patch-ac
index 513dcda80eb..7825d1dd817 100644
--- a/graphics/netpbm/patches/patch-ac
+++ b/graphics/netpbm/patches/patch-ac
@@ -1,28 +1,41 @@
-*** pbm/pbmtext.c~	Wed Oct 27 08:27:04 1993
---- pbm/pbmtext.c	Thu Nov 24 23:59:38 1994
-***************
-*** 105,114 ****
-      else
-  	{ /* Read text from stdin. */
-  	lines = 0;
-! 	while ( gets( buf ) != NULL )
-  	    {
-  	    int l;
-  
-  	    fix_control_chars( buf );
-  	    l = strlen( buf );
-  	    if ( lines >= maxlines )
---- 105,117 ----
-      else
-  	{ /* Read text from stdin. */
-  	lines = 0;
-! 	while ( fgets( buf , 5000, stdin) != NULL )
-  	    {
-  	    int l;
-+ 	    char *nl = strchr (buf, '\n');
-  
-+ 	    if (nl)
-+ 		*nl = 0;
-  	    fix_control_chars( buf );
-  	    l = strlen( buf );
-  	    if ( lines >= maxlines )
+--- pnm/Makefile.orig	Mon Jan 31 17:47:32 1994
++++ pnm/Makefile	Wed Dec 31 04:14:11 1997
+@@ -60,10 +60,11 @@
+ 		pnmcut pnmdepth pnmenlarge pnmfile pnmflip pnmhistmap \
+ 		pnminvert pnmnoraw pnmpad pnmpaste \
+ 		pnmtile pnmtoddif pnmtofits pnmtops pnmtorast \
+-		pnmtosgi pnmtosir pnmtoxwd \
+-		rasttopnm sgitopnm sirtopnm xwdtopnm zeisstopnm
++		pnmtorle pnmtosgi pnmtosir pnmtoxwd \
++		rasttopnm rletopnm sgitopnm sirtopnm xwdtopnm zeisstopnm
+ MATHBINARIES =	pnmgamma pnmnlfilt pnmrotate pnmscale pnmshear
+-BINARIES =      $(PORTBINARIES) $(MATHBINARIES) $(TIFFBINARIES)
++PNGBINARIES =	pngtopnm pnmtopng
++BINARIES =      $(PORTBINARIES) $(MATHBINARIES) $(PNGBINARIES) $(TIFFBINARIES)
+ SCRIPTS =	anytopnm pnmindex pnmmargin pnmsmooth pstopnm
+ 
+ PORTOBJECTS =	fitstopnm.o giftopnm.o \
+@@ -74,7 +75,7 @@
+ 		pnmtosgi.o pnmtosir.o pnmtoxwd.o \
+ 		rasttopnm.o sgitopnm.o sirtopnm.o xwdtopnm.o zeisstopnm.o \
+ 		pnmgamma.o pnmnlfilt.o pnmrotate.o pnmscale.o pnmshear.o
+-OBJECTS =	$(PORTOBJECTS) $(TIFFOBJECTS)
++OBJECTS =	$(PORTOBJECTS)
+ 
+ MANUALS1 =	$(BINARIES) $(SCRIPTS)
+ MANUALS3 =	libpnm
+@@ -128,7 +129,13 @@
+ 
+ 
+ # Rules for plain programs.
+-$(PORTBINARIES) $(TIFFBINARIES):	pnm.h $(DEFPPM) $(DEFPGM) $(DEFPBM) $(LIBPNM) $(LIBPPM) $(LIBPGM) $(LIBPBM) $(TIFFLIB)
++$(PORTBINARIES):	pnm.h $(DEFPPM) $(DEFPGM) $(DEFPBM) $(LIBPNM) $(LIBPPM) $(LIBPGM) $(LIBPBM)
++	$(CC) $(ALLCFLAGS) $(LDFLAGS) -o $@ $@.c $(LIBPNM) $(LIBPPM) $(LIBPGM) $(LIBPBM)
++
++$(PNGBINARIES):	pnm.h $(DEFPPM) $(DEFPGM) $(DEFPBM) $(LIBPNM) $(LIBPPM) $(LIBPGM) $(LIBPBM)
++	$(CC) $(ALLCFLAGS) $(LDFLAGS) -o $@ $@.c $(LIBPNM) $(LIBPPM) $(LIBPGM) $(LIBPBM) -L/usr/pkg/lib -lpng -lz
++
++$(TIFFBINARIES):	pnm.h $(DEFPPM) $(DEFPGM) $(DEFPBM) $(LIBPNM) $(LIBPPM) $(LIBPGM) $(LIBPBM)
+ 	$(CC) $(ALLCFLAGS) $(LDFLAGS) -o $@ $@.c $(LIBPNM) $(LIBPPM) $(LIBPGM) $(LIBPBM) $(TIFFLIB)
+ 
+ # Rule for math-dependent programs.
diff --git a/graphics/netpbm/patches/patch-ad b/graphics/netpbm/patches/patch-ad
deleted file mode 100644
index bb908cab0da..00000000000
--- a/graphics/netpbm/patches/patch-ad
+++ /dev/null
@@ -1,256 +0,0 @@
---- ./pnm/Imakefile.org	Sun Feb  5 22:37:44 1995
-+++ ./pnm/Imakefile	Sun Feb  5 22:37:46 1995
-@@ -20,7 +20,7 @@
- #if BuildLibTiff
-    CURRENTLIBS = $(LIBTIFF) $(LIBPNM) $(LIBPPM) $(LIBPGM) $(LIBPBM)
- CURRENTDEPLIBS = $(DEPLIBTIFF) $(DEPLIBPNM) $(DEPLIBPPM) $(DEPLIBPGM) $(DEPLIBPBM)
--     INCLUDES  = -I.. -I$(PBMDIR) -I$(PGMDIR) -I$(PPMDIR) -I$(TIFFDIR)
-+     INCLUDES  = -I.. -I$(PBMDIR) -I$(PGMDIR) -I$(PPMDIR) -I$(TIFFINCDIR)
-        DEFINES = -DLIBTIFF
-          MERGE = pnmmerge
-       TIFFMAN1 = tifftopnm.1 pnmtotiff.1
-@@ -60,6 +60,7 @@
- 		 pnmtoddif.c pnmtofits.c pnmtops.c pnmtorast.c pnmtosgi.c \
- 		 pnmtosir.c pnmtoxwd.c \
- 		 rasttopnm.c sgitopnm.c sirtopnm.c xwdtopnm.c zeisstopnm.c \
-+		 pnmgamma.c pnmrotate.c pnmshear.c \
- 		 $(TIFFSRCS)
- 
-           OBJS = fitstopnm.o giftopnm.o \
-@@ -70,6 +71,7 @@
- 		 pnmtoddif.o pnmtofits.o pnmtops.o pnmtorast.o pnmtosgi.o \
- 		 pnmtosir.o pnmtoxwd.o \
- 		 rasttopnm.o sgitopnm.o sirtopnm.o xwdtopnm.o zeisstopnm.o \
-+		 pnmgamma.o pnmrotate.o pnmshear.o \
- 		 $(TIFFOBJS)
- 
-           BINS = fitstopnm giftopnm \
-@@ -80,6 +82,7 @@
- 		 pnmtoddif pnmtofits pnmtops pnmtorast pnmtosgi \
- 		 pnmtosir pnmtoxwd \
- 		 rasttopnm sgitopnm sirtopnm xwdtopnm zeisstopnm \
-+		 pnmgamma pnmrotate pnmshear \
- 		 $(TIFFBINS)
- 
- includes:: anytopnm.script pnmindex.script pnmmargin.script pnmsmooth.script \
-@@ -168,9 +168,9 @@
- #endif
- 
- #if InstallManuals
--InstallMultipleMan($(MAN1),$(PBMPLUSDIR)$(PBMPLUSMANDIR)/man1)
--InstallMultipleMan($(MAN3),$(PBMPLUSDIR)$(PBMPLUSMANDIR)/man3)
--InstallMultipleMan($(MAN5),$(PBMPLUSDIR)$(PBMPLUSMANDIR)/man5)
-+InstallMultipleManSuff($(MAN1),$(PBMPLUSDIR)$(PBMPLUSMANDIR)/man1,1)
-+InstallMultipleManSuff($(MAN3),$(PBMPLUSDIR)$(PBMPLUSMANDIR)/man3,3)
-+InstallMultipleManSuff($(MAN5),$(PBMPLUSDIR)$(PBMPLUSMANDIR)/man5,5)
- #endif
- 
- #if InstallLibraries
---- ./Imakefile.org	Sun Feb  5 22:36:43 1995
-+++ ./Imakefile	Sun Feb  5 22:37:45 1995
-@@ -16,7 +16,7 @@
- #define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)'
- 
- #if BuildLibTiff
--SUBDIRS = TiffDir PbmDir PgmDir PpmDir PnmDir
-+SUBDIRS = PbmDir PgmDir PpmDir PnmDir
- #else
- SUBDIRS = PbmDir PgmDir PpmDir PnmDir
- #endif
---- Pbmplus.tmpl.orig	Mon Oct  4 02:13:09 1993
-+++ Pbmplus.tmpl	Sun Feb  5 23:34:38 1995
- /* Imake template and rules for PBMPLUS
-  *
-  * Copyright (C) 1991 Rainer Klute
-@@ -28,6 +28,10 @@
-  * By the way, you must have at least version 2.4 of libtiff.  Earlier
-  * versions will not work.
-  */
-+/*
-+ * Note: I changed this file and some Imakefiles to use the installed
-+ * libtiff in /usr/local instad FreeBSD. - Satoshi
-+ */
- #ifndef BuildLibTiff
- #define BuildLibTiff     YES
- #endif
-@@ -43,10 +47,10 @@
- #define InstallManuals   YES
- #endif
- #ifndef InstallLibraries
--#define InstallLibraries NO
-+#define InstallLibraries YES
- #endif
- #ifndef InstallIncludes
--#define InstallIncludes  NO
-+#define InstallIncludes  YES
- #endif
- 
- /* CONFIGURE: Normally the Imakefiles build and install separate binaries for
-@@ -63,7 +67,7 @@
-  * until you do the install.
-  */
- #ifndef InstallMerged
--#define InstallMerged NO
-+#define InstallMerged YES
- #endif
- 
- 
-@@ -75,7 +79,7 @@
- #define PbmplusBinDir $(BINDIR)
- #endif
- #ifndef PbmplusManDir
--#define PbmplusManDir $(MANDIR)
-+#define PbmplusManDir $(MANPATH)
- #endif
- #ifndef PbmplusLibDir
- #define PbmplusLibDir $(USRLIBDIR)
-@@ -100,7 +104,10 @@
- #define PnmDir TOPDIR/pnm
- #endif
- #ifndef TiffDir
--#define TiffDir TOPDIR/libtiff
-+#define TiffDir /usr/local/lib
-+#endif
-+#ifndef TiffIncDir
-+#define TiffIncDir /usr/local/include
- #endif
- 
- /* Libraries: */
-@@ -117,7 +124,7 @@
- #define LibPnm $(PNMDIR)/libpnm.a
- #endif
- #ifndef LibTiff
--#define LibTiff $(TIFFDIR)/libtiff.a
-+#define LibTiff -L$(TIFFDIR) -ltiff
- #endif
- 
- /* Dependency libraries: */
-@@ -134,7 +141,7 @@
- #define DepLibPnm LibPnm
- #endif
- #ifndef DepLibTiff
--#define DepLibTiff LibTiff
-+#define DepLibTiff $(TIFFDIR)/libtiff.a
- #endif
- 
-    PBMPLUSDIR = PbmplusDir
-@@ -148,6 +155,7 @@
-        PPMDIR = PpmDir
-        PNMDIR = PnmDir
-       TIFFDIR = TiffDir
-+   TIFFINCDIR = TiffIncDir
- 
-        LIBPBM = LibPbm
-        LIBPGM = LibPgm
-@@ -166,7 +174,7 @@
- #define InstallPbmplusPrograms(list,dest,flags)                             @@\
- install:: list                                                              @@\
- 	MakeDir($(DESTDIR)dest)                                             @@\
--	@case '${MFLAGS}' in *[i]*) set +e;; esac; \                        @@\
-+	@case '${MFLAGS}' in *[i]*) set +e;; esac;                          @@\
- 	for i in list; do \                                                 @@\
- 		(set -x; cd $(DESTDIR)dest; $(RM) $$i;  \                   @@\
- 		$(LN) $(MERGE) $$i); \                                      @@\
-@@ -181,14 +189,14 @@
- #endif /* NormalPbmplusProgramTarget */
- 
- #ifndef NormalPbmplusMathProgramTarget
--#define NormalPbmplusMathProgramTarget(program) \                           @@\
-+#define NormalPbmplusMathProgramTarget(program)                             @@\
- NormalPbmplusProgramTarget(program)
- #endif /* NormalPbmplusMathProgramTarget */
- 
- #else
- 
- #ifndef NormalPbmplusProgramTarget
--#define NormalPbmplusProgramTarget(program) \                               @@\
-+#define NormalPbmplusProgramTarget(program)                                 @@\
- NormalProgramTarget(program,program.o,$(CURRENTDEPLIBS),$(CURRENTLIBS),)
- #endif /* NormalPbmplusProgramTarget */
- 
-@@ -201,7 +209,7 @@
- #define InstallPbmplusPrograms(list,dest,flags)                             @@\
- install:: list                                                              @@\
- 	MakeDir($(DESTDIR)dest)                                             @@\
--	@case '${MFLAGS}' in *[i]*) set +e;; esac; \                        @@\
-+	@case '${MFLAGS}' in *[i]*) set +e;; esac;                          @@\
- 	for i in list; do \                                                 @@\
- 		(set -x; $(RM) $(DESTDIR)dest/$$i; \                        @@\
- 		$(INSTALL) -c flags $$i $(DESTDIR)dest); \                  @@\
-@@ -217,3 +223,18 @@
- #endif /* InstallPbmplusPrograms */
- 
- #endif /* InstallMerged */
-+
-+#ifndef InstallMultipleManSuff 
-+#define InstallMultipleManSuff(list,dest,suff)                              @@\
-+install.man:: list                                                      @@\
-+	MakeDir($(DESTDIR)dest)                                         @@\
-+	@case '${MFLAGS}' in *[i]*) set +e;; esac; \                    @@\
-+	for i in list; do \                                             @@\
-+		(set -x; \                                              @@\
-+		MNAME=`echo $$i | cut -f1 -d.`; \                       @@\
-+		$(RM) $(DESTDIR)dest/$${MNAME}*; \                      @@\
-+		$(INSTALL) -c $(INSTMANFLAGS) $$i \                     @@\
-+		  $(DESTDIR)dest/$${MNAME}.suff; \                      @@\
-+		$(COMPRESSMANCMD) $(DESTDIR)dest/$${MNAME}.suff); \     @@\
-+	done
-+#endif
---- ./pbm/Imakefile.org	Wed Nov  3 01:31:55 1993
-+++ ./pbm/Imakefile	Mon Feb  6 00:16:49 1995
-@@ -142,9 +142,9 @@
- #endif
- 
- #if InstallManuals
--InstallMultipleMan($(MAN1),$(PBMPLUSDIR)$(PBMPLUSMANDIR)/man1)
--InstallMultipleMan($(MAN3),$(PBMPLUSDIR)$(PBMPLUSMANDIR)/man3)
--InstallMultipleMan($(MAN5),$(PBMPLUSDIR)$(PBMPLUSMANDIR)/man5)
-+InstallMultipleManSuff($(MAN1),$(PBMPLUSDIR)$(PBMPLUSMANDIR)/man1,1)
-+InstallMultipleManSuff($(MAN3),$(PBMPLUSDIR)$(PBMPLUSMANDIR)/man3,3)
-+InstallMultipleManSuff($(MAN5),$(PBMPLUSDIR)$(PBMPLUSMANDIR)/man5,5)
- #endif
- 
- #if InstallLibraries
---- ./pgm/Imakefile.org	Mon Feb 21 01:14:01 1994
-+++ ./pgm/Imakefile	Mon Feb  6 00:17:04 1995
-@@ -99,9 +99,9 @@
- #endif
- 
- #if InstallManuals
--InstallMultipleMan($(MAN1),$(PBMPLUSDIR)$(PBMPLUSMANDIR)/man1)
--InstallMultipleMan($(MAN3),$(PBMPLUSDIR)$(PBMPLUSMANDIR)/man3)
--InstallMultipleMan($(MAN5),$(PBMPLUSDIR)$(PBMPLUSMANDIR)/man5)
-+InstallMultipleManSuff($(MAN1),$(PBMPLUSDIR)$(PBMPLUSMANDIR)/man1,1)
-+InstallMultipleManSuff($(MAN3),$(PBMPLUSDIR)$(PBMPLUSMANDIR)/man3,3)
-+InstallMultipleManSuff($(MAN5),$(PBMPLUSDIR)$(PBMPLUSMANDIR)/man5,5)
- #endif
- 
- #if InstallLibraries
---- ./ppm/Imakefile.org	Mon Jan 31 08:44:33 1994
-+++ ./ppm/Imakefile	Mon Feb  6 00:17:24 1995
-@@ -184,9 +184,9 @@
- #endif
- 
- #if InstallManuals
--InstallMultipleMan($(MAN1),$(PBMPLUSDIR)$(PBMPLUSMANDIR)/man1)
--InstallMultipleMan($(MAN3),$(PBMPLUSDIR)$(PBMPLUSMANDIR)/man3)
--InstallMultipleMan($(MAN5),$(PBMPLUSDIR)$(PBMPLUSMANDIR)/man5)
-+InstallMultipleManSuff($(MAN1),$(PBMPLUSDIR)$(PBMPLUSMANDIR)/man1,1)
-+InstallMultipleManSuff($(MAN3),$(PBMPLUSDIR)$(PBMPLUSMANDIR)/man3,3)
-+InstallMultipleManSuff($(MAN5),$(PBMPLUSDIR)$(PBMPLUSMANDIR)/man5,5)
- #endif
- 
- #if InstallLibraries
---- pbm/libpbm1.c	1997/10/15 15:28:18	1.1
-+++ pbm/libpbm1.c	1997/10/15 15:28:44
-@@ -20,6 +20,10 @@
- #include <varargs.h>
- #endif /*__STDC__*/
- 
-+#ifdef __NetBSD__
-+#include <errno.h>
-+#endif
-+
- 
- /* Variable-sized arrays. */
- 
diff --git a/graphics/netpbm/patches/patch-ae b/graphics/netpbm/patches/patch-ae
deleted file mode 100644
index 9faa76fa212..00000000000
--- a/graphics/netpbm/patches/patch-ae
+++ /dev/null
@@ -1,68 +0,0 @@
---- ./pnm/anytopnm.org	Mon Oct  4 02:11:29 1993
-+++ ./pnm/anytopnm	Sat Aug 12 15:05:58 1995
-@@ -53,7 +53,7 @@
- 	;;
- 
- 	*GIF* )
--	giftoppm "$file"
-+	giftopnm "$file"
- 	break
- 	;;
- 
-@@ -130,7 +130,7 @@
- 	    fitstopgm "$file"
- 	    ;;
- 	    *.gif | *.gif.* )
--	    giftoppm "$file"
-+	    giftopnm "$file"
- 	    ;;
- 	    *.iff | *.iff.* | *.ilbm | *.ilbm.* )
- 	    ilbmtoppm "$file"
---- ./ppm/ppm.5.org	Mon Oct  4 02:12:19 1993
-+++ ./ppm/ppm.5	Sat Aug 12 15:06:18 1995
-@@ -73,7 +73,7 @@
- it will automatically fall back on the slower but more general plain
- format.
- .SH "SEE ALSO"
--giftoppm(1), gouldtoppm(1), ilbmtoppm(1), imgtoppm(1), mtvtoppm(1),
-+giftopnm(1), gouldtoppm(1), ilbmtoppm(1), imgtoppm(1), mtvtoppm(1),
- pcxtoppm(1), pgmtoppm(1), pi1toppm(1), picttoppm(1), pjtoppm(1), qrttoppm(1),
- rawtoppm(1), rgb3toppm(1), sldtoppm(1), spctoppm(1), sputoppm(1), tgatoppm(1),
- ximtoppm(1), xpmtoppm(1), yuvtoppm(1),
---- ./ppm/ppmtoicr.1.org	Mon Oct  4 02:12:38 1993
-+++ ./ppm/ppmtoicr.1	Sat Aug 12 15:06:36 1995
-@@ -83,7 +83,7 @@
- the displayed image by a factor of 2, and
- run-length encode the data:
- .nf
--    giftoppm giffile | ppmtoicr -w giffile -r -e 2
-+    giftopnm giffile | ppmtoicr -w giffile -r -e 2
- .fi
- .SH BUGS
- .PP
---- ./ppm/ppmtogif.1.org	Sat Aug 12 15:08:41 1995
-+++ ./ppm/ppmtogif.1	Sat Aug 12 15:06:51 1995
-@@ -54,7 +54,7 @@
- .PP
- All flags can be abbreviated to their shortest unique prefix.
- .SH "SEE ALSO"
--giftoppm(1), ppmquant(1), ppm(5)
-+giftopnm(1), ppmquant(1), ppm(5)
- .SH AUTHOR
- Based on GIFENCOD by David Rowley <mgardi@watdcsu.waterloo.edu>.
- Lempel-Ziv compression based on "compress".
---- pnm/pnmarith.c~	Wed Jan  5 04:04:53 1994
-+++ pnm/pnmarith.c	Mon Aug 19 14:20:21 1996
-@@ -142,9 +142,9 @@
- 		    break;
- 
- 		    case '*':
--		    r1 = r1 * r2 / maxval3;
--		    g1 = g1 * g2 / maxval3;
--		    b1 = b1 * b2 / maxval3;
-+		    r1 = (unsigned) r1 * r2 / maxval3;
-+		    g1 = (unsigned)g1 * g2 / maxval3;
-+		    b1 =(unsigned) b1 * b2 / maxval3;
- 		    break;
- 
- 		    case 'D':
diff --git a/graphics/netpbm/patches/patch-af b/graphics/netpbm/patches/patch-af
deleted file mode 100644
index b05c4cdf61f..00000000000
--- a/graphics/netpbm/patches/patch-af
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./pnm/pnmmerge.c.org	Mon Jan 31 03:31:47 1994
-+++ ./pnm/pnmmerge.c	Tue Jun  3 01:16:17 1997
-@@ -53,6 +53,7 @@
-     TRY("pnmhistmap", pnmhistmap_main);
-     TRY("pnmnlfilt", pnmnlfilt_main);
-     TRY("pnmnoraw", pnmnoraw_main);
-+    TRY("pnmpad", pnmpad_main);
-     TRY("pnmpaste", pnmpaste_main);
-     TRY("pnmrotate", pnmrotate_main);
-     TRY("pnmscale", pnmscale_main);
diff --git a/graphics/netpbm/pkg/PLIST b/graphics/netpbm/pkg/PLIST
index a8688f6596f..1327dd88426 100644
--- a/graphics/netpbm/pkg/PLIST
+++ b/graphics/netpbm/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 1997/11/06 10:00:01 agc Exp $
+@comment $NetBSD: PLIST,v 1.3 1997/12/31 03:34:57 hubertf Exp $
 bin/anytopnm
 bin/asciitopgm
 bin/atktopbm
@@ -25,7 +25,6 @@ bin/pbmclean
 bin/pbmlife
 bin/pbmmake
 bin/pbmmask
-bin/pbmmerge
 bin/pbmpscale
 bin/pbmreduce
 bin/pbmtext
@@ -63,7 +62,6 @@ bin/pgmedge
 bin/pgmenhance
 bin/pgmhist
 bin/pgmkernel
-bin/pgmmerge
 bin/pgmnoise
 bin/pgmnorm
 bin/pgmoil
@@ -78,6 +76,7 @@ bin/pi3topbm
 bin/picttoppm
 bin/pjtoppm
 bin/pktopbm
+bin/pngtopnm
 bin/pnmalias
 bin/pnmarith
 bin/pnmcat
@@ -94,7 +93,6 @@ bin/pnmhistmap
 bin/pnmindex
 bin/pnminvert
 bin/pnmmargin
-bin/pnmmerge
 bin/pnmnlfilt
 bin/pnmnoraw
 bin/pnmpad
@@ -106,8 +104,10 @@ bin/pnmsmooth
 bin/pnmtile
 bin/pnmtoddif
 bin/pnmtofits
+bin/pnmtopng
 bin/pnmtops
 bin/pnmtorast
+bin/pnmtorle
 bin/pnmtosgi
 bin/pnmtosir
 bin/pnmtotiff
@@ -122,7 +122,6 @@ bin/ppmflash
 bin/ppmforge
 bin/ppmhist
 bin/ppmmake
-bin/ppmmerge
 bin/ppmmix
 bin/ppmnorm
 bin/ppmntsc
@@ -161,6 +160,7 @@ bin/rasttopnm
 bin/rawtopgm
 bin/rawtoppm
 bin/rgb3toppm
+bin/rletopnm
 bin/sgitopnm
 bin/sirtopnm
 bin/sldtoppm
@@ -178,194 +178,190 @@ bin/ybmtopbm
 bin/yuvsplittoppm
 bin/yuvtoppm
 bin/zeisstopnm
-include/pbm.h
-include/pbmplus.h
-include/pgm.h
-include/pnm.h
-include/ppm.h
-lib/libpbm.a
-lib/libpgm.a
-lib/libpnm.a
-lib/libppm.a
-man/man1/anytopnm.1.gz
-man/man1/asciitopgm.1.gz
-man/man1/atktopbm.1.gz
-man/man1/bioradtopgm.1.gz
-man/man1/bmptoppm.1.gz
-man/man1/brushtopbm.1.gz
-man/man1/cmuwmtopbm.1.gz
-man/man1/fitstopnm.1.gz
-man/man1/fstopgm.1.gz
-man/man1/g3topbm.1.gz
-man/man1/gemtopbm.1.gz
-man/man1/giftopnm.1.gz
-man/man1/gouldtoppm.1.gz
-man/man1/hipstopgm.1.gz
-man/man1/hpcdtoppm.1.gz
-man/man1/icontopbm.1.gz
-man/man1/ilbmtoppm.1.gz
-man/man1/imgtoppm.1.gz
-man/man1/lispmtopgm.1.gz
-man/man1/macptopbm.1.gz
-man/man1/mgrtopbm.1.gz
-man/man1/mtvtoppm.1.gz
-man/man1/pbmclean.1.gz
-man/man1/pbmlife.1.gz
-man/man1/pbmmake.1.gz
-man/man1/pbmmask.1.gz
-man/man1/pbmpscale.1.gz
-man/man1/pbmreduce.1.gz
-man/man1/pbmtext.1.gz
-man/man1/pbmto10x.1.gz
-man/man1/pbmto4425.1.gz
-man/man1/pbmtoascii.1.gz
-man/man1/pbmtoatk.1.gz
-man/man1/pbmtobbnbg.1.gz
-man/man1/pbmtocmuwm.1.gz
-man/man1/pbmtoepsi.1.gz
-man/man1/pbmtoepson.1.gz
-man/man1/pbmtog3.1.gz
-man/man1/pbmtogem.1.gz
-man/man1/pbmtogo.1.gz
-man/man1/pbmtoicon.1.gz
-man/man1/pbmtolj.1.gz
-man/man1/pbmtoln03.1.gz
-man/man1/pbmtolps.1.gz
-man/man1/pbmtomacp.1.gz
-man/man1/pbmtomgr.1.gz
-man/man1/pbmtopgm.1.gz
-man/man1/pbmtopi3.1.gz
-man/man1/pbmtopk.1.gz
-man/man1/pbmtoplot.1.gz
-man/man1/pbmtoptx.1.gz
-man/man1/pbmtox10bm.1.gz
-man/man1/pbmtoxbm.1.gz
-man/man1/pbmtoybm.1.gz
-man/man1/pbmtozinc.1.gz
-man/man1/pbmupc.1.gz
-man/man1/pcxtoppm.1.gz
-man/man1/pgmbentley.1.gz
-man/man1/pgmcrater.1.gz
-man/man1/pgmedge.1.gz
-man/man1/pgmenhance.1.gz
-man/man1/pgmhist.1.gz
-man/man1/pgmkernel.1.gz
-man/man1/pgmnoise.1.gz
-man/man1/pgmnorm.1.gz
-man/man1/pgmoil.1.gz
-man/man1/pgmramp.1.gz
-man/man1/pgmtexture.1.gz
-man/man1/pgmtofs.1.gz
-man/man1/pgmtolispm.1.gz
-man/man1/pgmtopbm.1.gz
-man/man1/pgmtoppm.1.gz
-man/man1/pi1toppm.1.gz
-man/man1/pi3topbm.1.gz
-man/man1/picttoppm.1.gz
-man/man1/pjtoppm.1.gz
-man/man1/pktopbm.1.gz
-man/man1/pnmalias.1.gz
-man/man1/pnmarith.1.gz
-man/man1/pnmcat.1.gz
-man/man1/pnmcomp.1.gz
-man/man1/pnmconvol.1.gz
-man/man1/pnmcrop.1.gz
-man/man1/pnmcut.1.gz
-man/man1/pnmdepth.1.gz
-man/man1/pnmenlarge.1.gz
-man/man1/pnmfile.1.gz
-man/man1/pnmflip.1.gz
-man/man1/pnmgamma.1.gz
-man/man1/pnmhistmap.1.gz
-man/man1/pnmindex.1.gz
-man/man1/pnminvert.1.gz
-man/man1/pnmmargin.1.gz
-man/man1/pnmnlfilt.1.gz
-man/man1/pnmnoraw.1.gz
-man/man1/pnmpad.1.gz
-man/man1/pnmpaste.1.gz
-man/man1/pnmrotate.1.gz
-man/man1/pnmscale.1.gz
-man/man1/pnmshear.1.gz
-man/man1/pnmsmooth.1.gz
-man/man1/pnmtile.1.gz
-man/man1/pnmtoddif.1.gz
-man/man1/pnmtofits.1.gz
-man/man1/pnmtops.1.gz
-man/man1/pnmtorast.1.gz
-man/man1/pnmtosgi.1.gz
-man/man1/pnmtosir.1.gz
-man/man1/pnmtotiff.1.gz
-man/man1/pnmtoxwd.1.gz
-man/man1/ppm3d.1.gz
-man/man1/ppmbrighten.1.gz
-man/man1/ppmchange.1.gz
-man/man1/ppmdim.1.gz
-man/man1/ppmdist.1.gz
-man/man1/ppmdither.1.gz
-man/man1/ppmflash.1.gz
-man/man1/ppmforge.1.gz
-man/man1/ppmhist.1.gz
-man/man1/ppmmake.1.gz
-man/man1/ppmmix.1.gz
-man/man1/ppmnorm.1.gz
-man/man1/ppmntsc.1.gz
-man/man1/ppmpat.1.gz
-man/man1/ppmquant.1.gz
-man/man1/ppmquantall.1.gz
-man/man1/ppmqvga.1.gz
-man/man1/ppmrelief.1.gz
-man/man1/ppmshift.1.gz
-man/man1/ppmspread.1.gz
-man/man1/ppmtoacad.1.gz
-man/man1/ppmtobmp.1.gz
-man/man1/ppmtogif.1.gz
-man/man1/ppmtoicr.1.gz
-man/man1/ppmtoilbm.1.gz
-man/man1/ppmtomap.1.gz
-man/man1/ppmtomitsu.1.gz
-man/man1/ppmtopcx.1.gz
-man/man1/ppmtopgm.1.gz
-man/man1/ppmtopi1.1.gz
-man/man1/ppmtopict.1.gz
-man/man1/ppmtopj.1.gz
-man/man1/ppmtopjxl.1.gz
-man/man1/ppmtopuzz.1.gz
-man/man1/ppmtorgb3.1.gz
-man/man1/ppmtosixel.1.gz
-man/man1/ppmtotga.1.gz
-man/man1/ppmtouil.1.gz
-man/man1/ppmtoxpm.1.gz
-man/man1/ppmtoyuv.1.gz
-man/man1/ppmtoyuvsplit.1.gz
-man/man1/psidtopgm.1.gz
-man/man1/qrttoppm.1.gz
-man/man1/rasttopnm.1.gz
-man/man1/rawtopgm.1.gz
-man/man1/rawtoppm.1.gz
-man/man1/rgb3toppm.1.gz
-man/man1/sgitopnm.1.gz
-man/man1/sirtopnm.1.gz
-man/man1/sldtoppm.1.gz
-man/man1/spctoppm.1.gz
-man/man1/spottopgm.1.gz
-man/man1/sputoppm.1.gz
-man/man1/tgatoppm.1.gz
-man/man1/tifftopnm.1.gz
-man/man1/xbmtopbm.1.gz
-man/man1/ximtoppm.1.gz
-man/man1/xpmtoppm.1.gz
-man/man1/xvminitoppm.1.gz
-man/man1/xwdtopnm.1.gz
-man/man1/ybmtopbm.1.gz
-man/man1/yuvsplittoppm.1.gz
-man/man1/yuvtoppm.1.gz
-man/man1/zeisstopnm.1.gz
-man/man3/libpbm.3.gz
-man/man3/libpgm.3.gz
-man/man3/libpnm.3.gz
-man/man3/libppm.3.gz
-man/man5/pbm.5.gz
-man/man5/pgm.5.gz
-man/man5/pnm.5.gz
-man/man5/ppm.5.gz
+man/man1/anytopnm.1
+man/man1/asciitopgm.1
+man/man1/atktopbm.1
+man/man1/bioradtopgm.1
+man/man1/bmptoppm.1
+man/man1/brushtopbm.1
+man/man1/cmuwmtopbm.1
+man/man1/fitstopnm.1
+man/man1/fstopgm.1
+man/man1/g3topbm.1
+man/man1/gemtopbm.1
+man/man1/giftopnm.1
+man/man1/gouldtoppm.1
+man/man1/hipstopgm.1
+man/man1/hpcdtoppm.1
+man/man1/icontopbm.1
+man/man1/ilbmtoppm.1
+man/man1/imgtoppm.1
+man/man1/lispmtopgm.1
+man/man1/macptopbm.1
+man/man1/mgrtopbm.1
+man/man1/mtvtoppm.1
+man/man1/pbmclean.1
+man/man1/pbmlife.1
+man/man1/pbmmake.1
+man/man1/pbmmask.1
+man/man1/pbmpscale.1
+man/man1/pbmreduce.1
+man/man1/pbmtext.1
+man/man1/pbmto10x.1
+man/man1/pbmto4425.1
+man/man1/pbmtoascii.1
+man/man1/pbmtoatk.1
+man/man1/pbmtobbnbg.1
+man/man1/pbmtocmuwm.1
+man/man1/pbmtoepsi.1
+man/man1/pbmtoepson.1
+man/man1/pbmtog3.1
+man/man1/pbmtogem.1
+man/man1/pbmtogo.1
+man/man1/pbmtoicon.1
+man/man1/pbmtolj.1
+man/man1/pbmtoln03.1
+man/man1/pbmtolps.1
+man/man1/pbmtomacp.1
+man/man1/pbmtomgr.1
+man/man1/pbmtopgm.1
+man/man1/pbmtopi3.1
+man/man1/pbmtopk.1
+man/man1/pbmtoplot.1
+man/man1/pbmtoptx.1
+man/man1/pbmtox10bm.1
+man/man1/pbmtoxbm.1
+man/man1/pbmtoybm.1
+man/man1/pbmtozinc.1
+man/man1/pbmupc.1
+man/man1/pcxtoppm.1
+man/man1/pgmbentley.1
+man/man1/pgmcrater.1
+man/man1/pgmedge.1
+man/man1/pgmenhance.1
+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/pgmtexture.1
+man/man1/pgmtofs.1
+man/man1/pgmtolispm.1
+man/man1/pgmtopbm.1
+man/man1/pgmtoppm.1
+man/man1/pi1toppm.1
+man/man1/pi3topbm.1
+man/man1/picttoppm.1
+man/man1/pjtoppm.1
+man/man1/pktopbm.1
+man/man1/pngtopnm.1
+man/man1/pnmalias.1
+man/man1/pnmarith.1
+man/man1/pnmcat.1
+man/man1/pnmcomp.1
+man/man1/pnmconvol.1
+man/man1/pnmcrop.1
+man/man1/pnmcut.1
+man/man1/pnmdepth.1
+man/man1/pnmenlarge.1
+man/man1/pnmfile.1
+man/man1/pnmflip.1
+man/man1/pnmgamma.1
+man/man1/pnmhistmap.1
+man/man1/pnmindex.1
+man/man1/pnminvert.1
+man/man1/pnmmargin.1
+man/man1/pnmnlfilt.1
+man/man1/pnmnoraw.1
+man/man1/pnmpad.1
+man/man1/pnmpaste.1
+man/man1/pnmrotate.1
+man/man1/pnmscale.1
+man/man1/pnmshear.1
+man/man1/pnmsmooth.1
+man/man1/pnmtile.1
+man/man1/pnmtoddif.1
+man/man1/pnmtofits.1
+man/man1/pnmtopng.1
+man/man1/pnmtops.1
+man/man1/pnmtorast.1
+man/man1/pnmtorle.1
+man/man1/pnmtosgi.1
+man/man1/pnmtosir.1
+man/man1/pnmtotiff.1
+man/man1/pnmtoxwd.1
+man/man1/ppm3d.1
+man/man1/ppmbrighten.1
+man/man1/ppmchange.1
+man/man1/ppmdim.1
+man/man1/ppmdist.1
+man/man1/ppmdither.1
+man/man1/ppmflash.1
+man/man1/ppmforge.1
+man/man1/ppmhist.1
+man/man1/ppmmake.1
+man/man1/ppmmix.1
+man/man1/ppmnorm.1
+man/man1/ppmntsc.1
+man/man1/ppmpat.1
+man/man1/ppmquant.1
+man/man1/ppmquantall.1
+man/man1/ppmqvga.1
+man/man1/ppmrelief.1
+man/man1/ppmshift.1
+man/man1/ppmspread.1
+man/man1/ppmtoacad.1
+man/man1/ppmtobmp.1
+man/man1/ppmtogif.1
+man/man1/ppmtoicr.1
+man/man1/ppmtoilbm.1
+man/man1/ppmtomap.1
+man/man1/ppmtomitsu.1
+man/man1/ppmtopcx.1
+man/man1/ppmtopgm.1
+man/man1/ppmtopi1.1
+man/man1/ppmtopict.1
+man/man1/ppmtopj.1
+man/man1/ppmtopjxl.1
+man/man1/ppmtopuzz.1
+man/man1/ppmtorgb3.1
+man/man1/ppmtosixel.1
+man/man1/ppmtotga.1
+man/man1/ppmtouil.1
+man/man1/ppmtoxpm.1
+man/man1/ppmtoyuv.1
+man/man1/ppmtoyuvsplit.1
+man/man1/psidtopgm.1
+man/man1/pstopnm.1
+man/man1/qrttoppm.1
+man/man1/rasttopnm.1
+man/man1/rawtopgm.1
+man/man1/rawtoppm.1
+man/man1/rgb3toppm.1
+man/man1/rletopnm.1
+man/man1/sgitopnm.1
+man/man1/sirtopnm.1
+man/man1/sldtoppm.1
+man/man1/spctoppm.1
+man/man1/spottopgm.1
+man/man1/sputoppm.1
+man/man1/tgatoppm.1
+man/man1/tifftopnm.1
+man/man1/xbmtopbm.1
+man/man1/ximtoppm.1
+man/man1/xpmtoppm.1
+man/man1/xvminitoppm.1
+man/man1/xwdtopnm.1
+man/man1/ybmtopbm.1
+man/man1/yuvsplittoppm.1
+man/man1/yuvtoppm.1
+man/man1/zeisstopnm.1
+man/man3/libpbm.3
+man/man3/libpgm.3
+man/man3/libpnm.3
+man/man3/libppm.3
+man/man5/pbm.5
+man/man5/pgm.5
+man/man5/pnm.5
+man/man5/ppm.5
diff --git a/graphics/netpbm/scripts/configure b/graphics/netpbm/scripts/configure
deleted file mode 100644
index 0fa234aa567..00000000000
--- a/graphics/netpbm/scripts/configure
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-cd $WRKSRC || exit 1;
-H=libtiff/tiffconf.h
-
-chmod +w $H || exit 1
-echo "#define MMAP_SUPPORT" >> $H || exit 1
-
-mv Pbmplus.tmpl Pbmplus.tmpl.orig || exit 1;
-cat >Pbmplus.tmpl<<EOF
-#define PbmplusBinDir $PREFIX/bin
-#define PbmplusManDir $PREFIX/man
-#define PbmplusLibDir $PREFIX/lib
-#define PbmplusIncDir $PREFIX/include
-EOF
-cat Pbmplus.tmpl.orig >> Pbmplus.tmpl
-exit 0