Update "netpbm" package to version 9.2. There are too many changes and

bug fixes to list here. Main new features are shared libraries, JPEG and JBIG support.
author: tron <tron> 2000-05-17 10:13:19 +0000
committer: tron <tron> 2000-05-17 10:13:19 +0000
commit: 9c96e0ef27a97c8b0e6f0c1c6c4b44f60f787daa (patch)
tree: 8c097d4541c61f1fe5c6cdb8e6d29afa59e7b96c /graphics/netpbm
parent: e0f4be4b9cb3a0a014476fc6aef28f9bf809daf1 (diff)
download: pkgsrc-9c96e0ef27a97c8b0e6f0c1c6c4b44f60f787daa.tar.gz
35 files changed, 287 insertions, 4297 deletions
diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index 0247368c6a3..39ed666543f 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -1,31 +1,20 @@
-# $NetBSD: Makefile,v 1.35 2000/03/21 22:40:54 tron Exp $
-#
+# $NetBSD: Makefile,v 1.36 2000/05/17 10:13:19 tron Exp $
 
-DISTNAME=	netpbm
-PKGNAME=	netpbm-19940301
+DISTNAME=	netpbm-9.2
 CATEGORIES=	graphics
-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.37.3.tar.gz
+MASTER_SITES=	http://download.sourceforge.net/netpbm/
+EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	packages@netbsd.org
+MAINTAINER=	tron@netbsd.org
 
-DEPENDS+=	tiff-*:../../graphics/tiff
+DEPENDS+=	tiff>=3.5.4:../../graphics/tiff
 DEPENDS+=	png>=1.0.6:../../graphics/png
 
-WRKSRC=		${WRKDIR}/netpbm
-MAKE_ENV +=	PREFIX=${PREFIX} MANCP="${INSTALL_MAN}"
-NO_CONFIGURE=	yes
+USE_GMAKE=	yes
+USE_LIBTOOL=	yes
 
-post-extract:
-# move updates into source tree
-	cd ${WRKSRC}; \
-	${MV} ../*pcx*.? ppm; \
-	${MV} ../*rle*.? ../pnmtopng-2.37.3/*png*.? pnm;
-	${CHMOD} -R o+r ${WRKDIR}
+INSTALL_TARGET=	install.dev install
+MAKE_ENV+=	ECHO="${ECHO}"
+MAKEFILE=	GNUmakefile
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/netpbm/files/md5 b/graphics/netpbm/files/md5
index 3fee40aec8d..1b3ee30d434 100644
--- a/graphics/netpbm/files/md5
+++ b/graphics/netpbm/files/md5
@@ -1,6 +1,3 @@
-$NetBSD: md5,v 1.7 2000/01/04 02:05:45 wiz Exp $
+$NetBSD: md5,v 1.8 2000/05/17 10:13:20 tron Exp $
 
-MD5 (netpbm-1mar1994.tar.gz) = 55f505b09e69a5db8f08844435282dfb
-MD5 (pcxtoppm.tar.gz) = d9a37913ef2c2cd412b0e7f969487dc2
-MD5 (rletopnm.tar.gz) = c0488f9918f506bf6a8d09870d5d115f
-MD5 (pnmtopng-2.37.3.tar.gz) = 59cb2ca87d579b566debadc4033526f9
+MD5 (netpbm-9.2.tgz) = 11c7bcd42a4edca8f093e7996bf4dc97
diff --git a/graphics/netpbm/files/patch-sum b/graphics/netpbm/files/patch-sum
index e1085a06f61..3948b1daacf 100644
--- a/graphics/netpbm/files/patch-sum
+++ b/graphics/netpbm/files/patch-sum
@@ -1,33 +1,6 @@
-$NetBSD: patch-sum,v 1.3 1999/10/08 21:18:33 jlam Exp $
+$NetBSD: patch-sum,v 1.4 2000/05/17 10:13:20 tron Exp $
 
-MD5 (patch-aa) = f9d1403693276cc13314f7f7a2983de2
-MD5 (patch-ab) = a97db367123a6fbb1c6e0e1e2b46abcf
-MD5 (patch-ac) = d5dfa3451fa2f5edabbba9eb0793b628
-MD5 (patch-ad) = cb226e447396525f9c3ae59d6bce38e7
-MD5 (patch-ae) = 432af4eec9605e3b02158c6bda77a37b
-MD5 (patch-af) = 6a85d0d1f1c5fa3fae589efb4631696a
-MD5 (patch-ag) = 6361f7edc2aa8cb00efb3c4103c8e069
-MD5 (patch-ah) = 9ab8ef9eb515652495b37edeac873ab8
-MD5 (patch-ai) = ef30cc44cbeed0b94734e1786c8254c9
-MD5 (patch-aj) = da15e4b1c0978c8731d054f409de1317
-MD5 (patch-ak) = ed5a8f598d7d2646a47d4db9c9a4f911
-MD5 (patch-al) = f4173e292bbc8118042078328b345696
-MD5 (patch-am) = 15df0b536fbb0b95cc124cd4dbf03ffa
-MD5 (patch-an) = 371690a5859a84612d452fb7beac75c3
-MD5 (patch-ao) = f11ec2a211d0f497737be34f5b15ebcf
-MD5 (patch-ap) = 987d7eb8b3d33552cbc49800c9ea376e
-MD5 (patch-aq) = fe3d80277f96c8c1dc4a96f5313a0231
-MD5 (patch-ar) = f06193f79e3b9bacddfc7da561c847b9
-MD5 (patch-as) = b738229ebdae15ce7820b287addac304
-MD5 (patch-at) = 704345e8450c2048bf426526ad5103d2
-MD5 (patch-au) = 08f3e3637c4d3913175fa536db2c4751
-MD5 (patch-av) = 2451d573de9e731751c6d9176a6685d7
-MD5 (patch-aw) = 6270d57f14e70d88698219b12305b47c
-MD5 (patch-ax) = 79451a7aff64fcc17e04e75dcf1f87b2
-MD5 (patch-ay) = 646b54f49c5acdcd898686cd06a64a37
-MD5 (patch-az) = 0911eb29fe278dd2f9b956babad734f9
-MD5 (patch-ba) = 57b5cfce7399dfe53e98de3bcf62a835
-MD5 (patch-bb) = 1c97b5017c22382b160e49becdbc21b0
-MD5 (patch-bc) = 1ed41b101e3beca88a32db719e388ebd
-MD5 (patch-bd) = a7ab73f8d3ca8336ae0322959a008961
-MD5 (patch-be) = 3d7cf7b3910c10e00662698284bc5226
+MD5 (patch-aa) = 1ecdc727298b92ad9f83d8e705c41115
+MD5 (patch-ab) = 60d40ac6681e16242d9f1dd881850d7d
+MD5 (patch-ac) = 39721b5f833ab984a5a49a8cb11f4a84
+MD5 (patch-ad) = 6800c568c8aefaecb72cc5eeb34f10dd
diff --git a/graphics/netpbm/patches/patch-aa b/graphics/netpbm/patches/patch-aa
index 15c628dbf33..fbd865a20a5 100644
--- a/graphics/netpbm/patches/patch-aa
+++ b/graphics/netpbm/patches/patch-aa
@@ -1,121 +1,131 @@
-$NetBSD: patch-aa,v 1.8 1999/10/08 21:18:33 jlam Exp $
+$NetBSD: patch-aa,v 1.9 2000/05/17 10:13:20 tron Exp $
 
---- Makefile.orig	Wed Jan 26 06:47:35 1994
-+++ Makefile	Tue May  4 16:51:11 1999
-@@ -21,7 +21,7 @@
- #CC =		gcc -ansi -pedantic -fcombine-regs -fpcc-struct-return
- 
- # CONFIGURE: cc flags go here.
--CFLAGS =	-O
-+CFLAGS =	-O2
- #CFLAGS =	-g
- #CFLAGS =	-g -O
- 
-@@ -48,33 +48,36 @@
- # 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$(LOCALBASE)/include
-+TIFFLIB =	-Wl,-R$(LOCALBASE)/lib -L$(LOCALBASE)/lib -ltiff -ljpeg -lz
- 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
- # this define you can use something else, for example a script that calls
- # compress or pack. The ../mantocat is used on systems which use man pages
- # in the "cat" format.
--MANCP =			cp
-+MANCP =			install -c -m 0644
- #MANCP =		../mantocat
- 
-+INSTALLLIBS =		$(PREFIX)/lib
-+INSTALLDEFS =		$(PREFIX)/include
-+
- # CONFIGURE: Normally the Makefiles build and install separate binaries for
- # each program.  However, on some systems (especially those without shared
- # libraries) this can mean a lot of space.  In this case you might try
-@@ -87,10 +90,10 @@
+--- Makefile.config.orig	Tue May  9 02:32:59 2000
++++ Makefile.config	Wed May 17 11:34:31 2000
+@@ -29,8 +29,8 @@
  #
- # 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,10 +102,10 @@
- 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 ); \
-+	    ( echo "===> $$i" ; cd $$i ; $(MAKE) $(MFLAGS) 'CC=$(CC)' 'CFLAGS=$(CFLAGS)' 'TIFFDEF=$(TIFFDEF)' 'TIFFINC=$(TIFFINC)' 'TIFFLIB=$(TIFFLIB)' 'TIFFBINARIES=$(TIFFBINARIES)' 'TIFFOBJECTS=$(TIFFOBJECTS)' 'LDFLAGS=$(LDFLAGS)' binaries ); \
- 	done
- 
- merge:
-@@ -113,15 +116,20 @@
- 	done
- 
- install.bin:
--	-mkdir $(INSTALLBINARIES)
-+#	-mkdir $(INSTALLBINARIES)
-+#	-mkdir $(INSTALLLIBS)
-+#	-mkdir $(INSTALLDEFS)
-+	$(MANCP) pbmplus.h	$(INSTALLDEFS)
- 	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)' 'INSTALLBINARIES=$(INSTALLBINARIES)' 'INSTALLSCRIPTS=$(INSTALLSCRIPTS)' install.bin ); \
-+	    ( echo $$i ; cd $$i ; $(MAKE) $(MFLAGS) 'CC=$(CC)' 'CFLAGS=$(CFLAGS)' 'TIFFDEF=$(TIFFDEF)' 'TIFFINC=$(TIFFINC)' 'TIFFLIB=$(TIFFLIB)' 'TIFFBINARIES=$(TIFFBINARIES)' 'TIFFOBJECTS=$(TIFFOBJECTS)' 'LDFLAGS=$(LDFLAGS)' 'INSTALLBINARIES=$(INSTALLBINARIES)' 'INSTALLSCRIPTS=$(INSTALLSCRIPTS)' 'INSTALLLIBS=$(INSTALLLIBS)' 'INSTALLDEFS=$(INSTALLDEFS)' install.bin ); \
- 	done
- 
- install.merge:
--	-mkdir $(INSTALLBINARIES)
-+#	-mkdir $(INSTALLBINARIES)
-+#	-mkdir $(INSTALLLIBS)
-+#	-mkdir $(INSTALLDEFS)
- 	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)' 'INSTALLBINARIES=$(INSTALLBINARIES)' 'INSTALLSCRIPTS=$(INSTALLSCRIPTS)' install.merge ); \
-+	    ( echo $$i ; cd $$i ; $(MAKE) $(MFLAGS) 'CC=$(CC)' 'CFLAGS=$(CFLAGS)' 'TIFFDEF=$(TIFFDEF)' 'TIFFINC=$(TIFFINC)' 'TIFFLIB=$(TIFFLIB)' 'TIFFBINARIES=$(TIFFBINARIES)' 'TIFFOBJECTS=$(TIFFOBJECTS)' 'LDFLAGS=$(LDFLAGS)' 'INSTALLBINARIES=$(INSTALLBINARIES)' 'INSTALLSCRIPTS=$(INSTALLSCRIPTS)' 'INSTALLLIBS=$(INSTALLLIBS)' 'INSTALLDEFS=$(INSTALLDEFS)' install.merge ); \
- 	done
- 
- install.man:
-@@ -131,7 +139,7 @@
- 
- clean:
- 	rm -f *.shar *.shar? art.* *~
--	echo "" > compile.h
--	for i in $(SUBDIRS) libtiff ; do \
-+	rm -f compile.h ; echo "" > compile.h
-+	for i in $(SUBDIRS) ; do \
- 	    ( echo $$i ; cd $$i ; $(MAKE) $(MFLAGS) clean ); \
- 	done
+ # For cygwin, only static libraries work, so set STATICLIB = Y  .
+ 
+-#STATICLIB = Y
+-STATICLIB = N
++STATICLIB = Y
++#STATICLIB = N
+ 
+ # The following are commands for the build process to use.  These values
+ # do not get built into anything.
+@@ -38,12 +38,13 @@
+ # The C compiler (including macro preprocessor)
+ #CC =		cc
+ #CC =		gcc
+-CC =		gcc -fpcc-struct-return
++#CC =		gcc -fpcc-struct-return
+ 
+ # The linker.
+ #LD = ld
+ #LD = cc
+-LD = gcc 
++#LD = gcc 
++LD = $(LIBTOOL) --mode=link $(CC)
+ 
+ # Normally the man pages are installed using "install".  But via this
+ # variable, you can use something else, for example a script that
+@@ -57,7 +58,7 @@
+ SHELL =	/bin/sh
+ # Solaris:
+ #INSTALL = /usr/ucb/install
+-INSTALL = install
++INSTALL = install -c
+ AR= ar
+ RANLIB=	ranlib
+ 
+@@ -66,7 +67,7 @@
+ 
+ # On DEC Tru64 4.0F (at least), you need -DLONG_32 for ppmtompeg.
+ #CFLAGS = -O2 -std1 DLONG_32 $(CDEBUG)
+-CFLAGS = -pedantic -O2 -Wall -Wno-uninitialized $(CDEBUG)
++CFLAGS += -pedantic -Wall -Wno-uninitialized $(CDEBUG)
+ 
+ # EXE is a suffix that the linker puts on any executable it generates.
+ # In cygwin, this is .exe and most program deal with its existence without
+@@ -89,7 +90,7 @@
+ #LDFLAGS = -R$(INSTALLLIBS)
+ #If the linker is gcc (e.g. NetBSD):
+ #LDFLAGS = -Wl,--rpath,$(INSTALLLIBS)
+-LDFLAGS =
++#LDFLAGS =
+ 
+ # Linker options for created Netpbm shared libraries.
+ 
+@@ -126,13 +127,13 @@
+ # but otherwise will not.
+ 
+ #NetBSD:
+-#TIFFHDR_DIR = $(LOCALBASE)/include
+-#TIFFLIB_DIR = $(LOCALBASE)/lib
++TIFFHDR_DIR = $(LOCALBASE)/include
++TIFFLIB_DIR = $(LOCALBASE)/lib
+ # OSF, Tru64:
+ #TIFFHDR_DIR = /usr/local1/DEC/include
+ #TIFFLIB_DIR = /usr/local1/DEC/lib
+-TIFFHDR_DIR = $(SRCDIR)/libtiff
+-TIFFLIB_DIR = $(SRCDIR)/libtiff
++#TIFFHDR_DIR = $(SRCDIR)/libtiff
++#TIFFLIB_DIR = $(SRCDIR)/libtiff
+ 
+ # Put the location of your JPEG library here.
+ # If you want to build the jpeg converters or tiff
+@@ -151,8 +152,8 @@
+ # all.
+ 
+ # Netbsd:
+-#JPEGLIB_DIR = ${LOCALBASE}/lib
+-#JPEGHDR_DIR = ${LOCALBASE}/include
++JPEGLIB_DIR = ${LOCALBASE}/lib
++JPEGHDR_DIR = ${LOCALBASE}/include
+ # OSF, Tru64:
+ #JPEGLIB_DIR = /usr/local1/DEC/lib
+ #JPEGHDR_DIR = /usr/local1/DEC/include
+@@ -160,8 +161,8 @@
+ #JPEGHDR_DIR = /usr/local/include
+ #JPEGLIB_DIR = NONE
+ #JPEGHDR_DIR = NONE
+-JPEGLIB_DIR = /usr/lib/jpeg
+-JPEGHDR_DIR = /usr/include/jpeg
++#JPEGLIB_DIR = /usr/lib/jpeg
++#JPEGHDR_DIR = /usr/include/jpeg
+ 
+ 
+ # Put the location of your PNG library here.  If you want to build the
+@@ -171,8 +172,8 @@
+ # successully build everything else, put NONE for these.
+ 
+ # NetBSD:
+-#PNGLIB_DIR = $(LOCALBASE)/lib
+-#PNGHDR_DIR = $(LOCALBASE)/include
++PNGLIB_DIR = $(LOCALBASE)/lib
++PNGHDR_DIR = $(LOCALBASE)/include
+ # OSF/Tru64:
+ #PNGLIB_DIR = /usr/local1/DEC/lib
+ #PNGHDR_DIR = /usr/local1/DEC/include
+@@ -182,8 +183,8 @@
+ # No PNG:
+ #PNGLIB_DIR = NONE
+ #PNGHDR_DIR = NONE
+-PNGLIB_DIR = /lib
+-PNGHDR_DIR = /usr/include/png
++#PNGLIB_DIR = /lib
++#PNGHDR_DIR = /usr/include/png
+ 
+ 
+ # And the Utah Raster Toolkit (aka URT aka RLE) library:
+@@ -275,8 +276,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
diff --git a/graphics/netpbm/patches/patch-ab b/graphics/netpbm/patches/patch-ab
index d4967e9d50f..3d1b3ed0b23 100644
--- a/graphics/netpbm/patches/patch-ab
+++ b/graphics/netpbm/patches/patch-ab
@@ -1,27 +1,64 @@
-$NetBSD: patch-ab,v 1.4 1999/01/10 23:52:15 tron Exp $
+$NetBSD: patch-ab,v 1.5 2000/05/17 10:13:20 tron Exp $
 
---- pbmplus.h.orig	Tue Mar  1 10:46:36 1994
-+++ pbmplus.h	Mon Jan 11 00:33:32 1999
-@@ -119,10 +119,12 @@
- #ifndef VMS
- #include <unistd.h>
- #endif
-+#ifndef __NetBSD__
- extern int atoi();
- extern void exit();
- extern long time();
- extern int write();
-+#endif /* NetBSD */
- #endif
- 
- /* CONFIGURE: On most BSD systems, malloc() gets declared in stdlib.h, on
-@@ -275,5 +277,9 @@
- int vfprintf ARGS(( FILE* stream, char* format, va_list args ));
- #endif /*NEED_VFPRINTF*/
- 
-+#ifdef __NetBSD__
-+#include <errno.h>
-+#define A_STRERROR
-+#endif
- 
- #endif /*_PBMPLUS_H_*/
+--- Makefile.common.orig	Tue May 16 03:14:14 2000
++++ Makefile.common	Wed May 17 11:18:34 2000
+@@ -67,7 +67,7 @@
+ $(OBJECTS): %.o: %.c
+ 	$(CC) -c $(CFLAGS) $(INCLUDE) -o $@ $<
+ 
+-LIBOPT = $(SRCDIR)/libopt
++LIBOPT = $(ECHO)
+ 
+ # Rules for conventional single-object file executables
+ $(PORTBINARIES): %: %.o $(NETPBMLIBS) $(LIBOPT)
+@@ -97,7 +97,7 @@
+ # BUILDING NETPBM LIBRARIES
+ 
+ $(LIBOBJECTS): %.o: %.c
+-	$(CC) -c $(CFLAGS) $(CFLAGS_SHLIB) $(INCLUDE) -o $@ $<
++	$(LIBTOOL) $(CC) -c $(CFLAGS) $(CFLAGS_SHLIB) $(INCLUDE) $<
+ 
+ SONAME = lib$(LIBROOT).so.$(MAJ)
+ 
+@@ -117,10 +117,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)
+ 
+ # Before Netpbm 8.4, we did hard links instead of symbolic.  A user
+ # requested symbolic, and I couldn't see a reason for hard (original reason
+@@ -146,7 +144,7 @@
+ install.bin.common: $(BINARIES) install.script
+ # Note that on Cygwin, the executables are actually pbmmake.exe, etc.
+ # Make and Install know that pbmmake.exe counts as pbmmake.
+-	$(INSTALL) -s -m$(INSTALL_PERM_BIN) $(BINARIES) $(INSTALLBINARIES)
++	$(LIBTOOL) --mode=install $(INSTALL) -s -m$(INSTALL_PERM_BIN) $(BINARIES) $(INSTALLBINARIES)
+ 
+ .PHONY: install.script
+ install.script: $(SCRIPTS)
+@@ -191,8 +189,8 @@
+ # built.  If a previous make STATICLIB=N didn't build the static
+ # library, the dependency here will do that.
+ .PHONY: install.staticlib
+-install.staticlib: lib$(LIBROOT).a
+-	$(INSTALL) -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
+ ifeq ($(NETPBMLIBSUFFIX),so)
+@@ -206,7 +204,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 c62b5d8bc11..66813aba61d 100644
--- a/graphics/netpbm/patches/patch-ac
+++ b/graphics/netpbm/patches/patch-ac
@@ -1,116 +1,13 @@
-$NetBSD: patch-ac,v 1.6 1999/01/10 23:52:15 tron Exp $
+$NetBSD: patch-ac,v 1.7 2000/05/17 10:13:20 tron Exp $
 
---- pbm/Makefile.orig	Sat Nov 20 15:59:20 1993
-+++ pbm/Makefile	Mon Jan 11 00:18:43 1999
-@@ -10,28 +10,31 @@
- # implied warranty.
+--- shhopt/Makefile.orig	Thu May  4 23:10:36 2000
++++ shhopt/Makefile	Wed May 17 10:23:21 2000
+@@ -61,7 +61,7 @@
+ 		-L. -I. -L$(INSTLIBDIR) -I$(INSTINCDIR) -lshhopt
  
- # Default values, usually overridden by top-level Makefile.
--CC =		cc
-+CC =		gcc
- #CC =		gcc -ansi -pedantic -fcombine-regs -fpcc-struct-return
- #CFLAGS =	-O
--CFLAGS =	-g
-+CFLAGS =	-O2
- #CFLAGS =	-g -O
- TIFFDEF =       -DLIBTIFF
- #LDFLAGS =	-s
- LDFLAGS =	
--INSTALLBINARIES =	/usr/new/pbm
--INSTALLMANUALS1 =	/usr/man/man1
-+INSTALLBINARIES =	$(PREFIX)/bin
-+INSTALLMANUALS1 =	$(PREFIX)/man/man1
- SUFFIXMANUALS1 =	1
--INSTALLMANUALS3 =	/usr/man/man3
-+INSTALLMANUALS3 =	$(PREFIX)/man/man3
- SUFFIXMANUALS3 =	3
--INSTALLMANUALS5 =	/usr/man/man5
-+INSTALLMANUALS5 =	$(PREFIX)/man/man5
- SUFFIXMANUALS5 =	5
--MANCP =			cp
-+MANCP =			install -c -m 0644
-+INSTALLLIBS =		$(PREFIX)/lib
-+INSTALLDEFS =		$(PREFIX)/include
+ .c.o:
+-	$(CC) $(CCSHRD) -o $@ -c $(CCOPT) $<
++	$(LIBTOOL) $(CC) $(CCSHRD) -c $(CCOPT) $<
  
- SHELL =		/bin/sh
- INCLUDE =	-I..
- ALLCFLAGS =	$(CFLAGS) $(TIFFDEF) $(INCLUDE)
- LIBPBM =	libpbm.a
--DEFPBM =	pbm.h ../pbmplus.h
-+DEFPBM =	pbm.h
-+DEFPBMPLUS =	../pbmplus.h
- 
- PORTBINARIES =	atktopbm brushtopbm cmuwmtopbm g3topbm \
- 		icontopbm gemtopbm macptopbm mgrtopbm \
-@@ -67,18 +70,19 @@
- MANUALS5 =	pbm
- 
- 
--#all:		binaries
--all:		merge
--#install:	install.bin
--install:	install.merge
-+all:		binaries
-+#all:		merge
-+install:	install.bin
-+#install:	install.merge
- 
- 
- binaries:	$(BINARIES)
- 
- install.bin:	binaries
- 	cd $(INSTALLBINARIES) ; rm -f $(BINARIES)
--	cp $(BINARIES) $(INSTALLBINARIES)
--
-+	install -c -s -m 0755 $(BINARIES) $(INSTALLBINARIES)
-+	install -c -m 0644 $(LIBPBM) $(INSTALLLIBS)
-+	install -c -m 0644 $(DEFPBM) $(INSTALLDEFS)
- 
- merge:		pbmmerge
- pbmmerge:	pbmmerge.c $(OBJECTS) $(LIBPBM)
-@@ -107,15 +111,15 @@
- 	done
- 
- # Rule for plain programs.
--$(PORTBINARIES):	$(DEFPBM) $(LIBPBM)
-+$(PORTBINARIES):	$(DEFPBM) $(DEFPBMPLUS) $(LIBPBM)
- 	$(CC) $(ALLCFLAGS) $(LDFLAGS) -o $@ $@.c $(LIBPBM)
- 
- # Rule for math-dependent programs.
--$(MATHBINARIES):	$(DEFPBM) $(LIBPBM)
-+$(MATHBINARIES):	$(DEFPBM) $(DEFPBMPLUS) $(LIBPBM)
- 	$(CC) $(ALLCFLAGS) $(LDFLAGS) -o $@ $@.c -lm $(LIBPBM)
- 
- # Rule for objects.
--$(OBJECTS):	$(DEFPBM)
-+$(OBJECTS):	$(DEFPBM) $(DEFPBMPLUS)
- 	$(CC) $(ALLCFLAGS) "-Dmain=$*_main" -c $*.c
- 
- # And library.
-@@ -125,15 +129,15 @@
- 	ar rc $(LIBPBM) libpbm1.o libpbm2.o libpbm3.o libpbm4.o libpbm5.o
- 	-ranlib $(LIBPBM)
- 
--libpbm1.o:	$(DEFPBM) ../version.h ../compile.h libpbm.h libpbm1.c
-+libpbm1.o:	$(DEFPBM) $(DEFPBMPLUS) ../version.h ../compile.h libpbm.h libpbm1.c
- 	$(CC) $(ALLCFLAGS) -c libpbm1.c
--libpbm2.o:	$(DEFPBM) libpbm.h libpbm2.c
-+libpbm2.o:	$(DEFPBM) $(DEFPBMPLUS) libpbm.h libpbm2.c
- 	$(CC) $(ALLCFLAGS) -c libpbm2.c
--libpbm3.o:	$(DEFPBM) libpbm.h libpbm3.c
-+libpbm3.o:	$(DEFPBM) $(DEFPBMPLUS) libpbm.h libpbm3.c
- 	$(CC) $(ALLCFLAGS) -c libpbm3.c
--libpbm4.o:	$(DEFPBM) libpbm.h libpbm4.c
-+libpbm4.o:	$(DEFPBM) $(DEFPBMPLUS) libpbm.h libpbm4.c
- 	$(CC) $(ALLCFLAGS) -c libpbm4.c
--libpbm5.o:	$(DEFPBM) pbmfont.h libpbm5.c
-+libpbm5.o:	$(DEFPBM) $(DEFPBMPLUS) pbmfont.h libpbm5.c
- 	$(CC) $(ALLCFLAGS) -c libpbm5.c
- 
- # Other dependencies.
-@@ -184,4 +188,4 @@
- pbmtoepsi pbmtoepsi.o:		pbmtoepsi.c
- 
- clean:
--	-rm -f *.o *.a *.cat *~ core $(BINARIES) pbmmerge
-+	-rm -f *.o *.a *.cat *~ core *.core $(BINARIES) pbmmerge
+ depend dep:
+ 	$(CC) $(INCDIR) -MM *.c >depend
diff --git a/graphics/netpbm/patches/patch-ad b/graphics/netpbm/patches/patch-ad
index f9baf19cb7f..0f8365c7abe 100644
--- a/graphics/netpbm/patches/patch-ad
+++ b/graphics/netpbm/patches/patch-ad
@@ -1,13 +1,16 @@
-$NetBSD: patch-ad,v 1.7 1999/01/10 23:52:16 tron Exp $
+$NetBSD: patch-ad,v 1.8 2000/05/17 10:13:20 tron Exp $
 
---- pbm/libpbm1.c.orig	Mon Jan 10 18:37:22 1994
-+++ pbm/libpbm1.c	Sun Jan 10 23:48:40 1999
-@@ -132,7 +132,7 @@
-         if ( isupper( c1 ) )
-             c1 = tolower( c1 );
-         if ( isupper( c2 ) )
--            c1 = tolower( c2 );
-+            c2 = tolower( c2 );
-         if ( c1 != c2 )
-             return 0;
-         }
+--- 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 bdf0bd0553e..00000000000
--- a/graphics/netpbm/patches/patch-ae
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ae,v 1.3 1999/01/10 23:52:16 tron Exp $
-
---- pbm/pbmmerge.c.orig	Wed Nov  3 10:28:55 1993
-+++ pbm/pbmmerge.c	Sun Jan 10 23:48:40 1999
-@@ -29,6 +29,10 @@
- 	{
- 	++argv;
- 	--argc;
-+	if(!*argv)	{
-+		fprintf(stderr, "Usage: pbmmerge pbm_program_name [args ...]\n");
-+		exit(1);
-+		}
- 	goto again;
- 	}
- 
diff --git a/graphics/netpbm/patches/patch-af b/graphics/netpbm/patches/patch-af
deleted file mode 100644
index a0f762db9c7..00000000000
--- a/graphics/netpbm/patches/patch-af
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-af,v 1.3 1999/01/10 23:52:16 tron Exp $
-
---- pbm/pbmtext.c.orig	Wed Oct 27 08:27:04 1993
-+++ pbm/pbmtext.c	Sun Jan 10 23:48:40 1999
-@@ -105,10 +105,12 @@
-     else
- 	{ /* Read text from stdin. */
- 	lines = 0;
--	while ( gets( buf ) != NULL )
-+	while ( fgets( buf, sizeof(buf), stdin ) != NULL )
- 	    {
- 	    int l;
-+            char *nl = strchr(buf, '\n');
- 
-+            if (nl) *nl = 0;
- 	    fix_control_chars( buf );
- 	    l = strlen( buf );
- 	    if ( lines >= maxlines )
diff --git a/graphics/netpbm/patches/patch-ag b/graphics/netpbm/patches/patch-ag
deleted file mode 100644
index 7be2f305f7c..00000000000
--- a/graphics/netpbm/patches/patch-ag
+++ /dev/null
@@ -1,139 +0,0 @@
-$NetBSD: patch-ag,v 1.1 1999/01/10 23:52:16 tron Exp $
-
---- pbm/pbmto10x.c.orig	Mon Oct  4 10:10:42 1993
-+++ pbm/pbmto10x.c	Sun Jan 10 23:48:40 1999
-@@ -1,6 +1,6 @@
- /* pbmto10x.c - read a portable bitmap and produce a Gemini 10X printer file
- **
--** Copyright (C) 1990 by Ken Yap
-+** Copyright (C) 1990, 1994 by Ken Yap
- **
- ** Permission to use, copy, modify, and distribute this software and its
- ** documentation for any purpose and without fee is hereby granted, provided
-@@ -8,6 +8,8 @@
- ** copyright notice and this permission notice appear in supporting
- ** documentation.  This software is provided "as is" without express or
- ** implied warranty.
-+**
-+** Modified to shorten stripes and eliminate blank stripes. Dec 1994.
- */
- 
- #include "pbm.h"
-@@ -52,15 +54,40 @@
- }
- 
- static void
-+outstripe(stripe, sP, reschar)
-+	register char	*stripe, *sP;
-+	register int	reschar;
-+{
-+	register int	ncols;
-+
-+	/* scan backwards, removing empty columns */
-+	while (sP != stripe)
-+		if (*--sP != 0)
-+		{
-+			++sP;
-+			break;
-+		}
-+	ncols = sP - stripe;
-+	if (ncols > 0)
-+	{
-+		printf("\033%c%c%c", reschar, ncols % 256, ncols / 256);
-+		fwrite(stripe, sizeof(char), ncols, stdout);
-+	}
-+	putchar('\n');			/* flush buffer */
-+}
-+
-+static void
- res_60x72()
- {
- 	register int	i, item, npins, row, col;
- 	bit		*bitrows[LOW_RES_ROWS], *bP[LOW_RES_ROWS];
-+	char		*stripe, *sP;
- 
-+	stripe = malloc(cols);
- 	for (i = 0; i < LOW_RES_ROWS; ++i)
- 		bitrows[i] = pbm_allocrow(cols);
- 	printf("\033A\010");		/* '\n' = 8/72 */
--	for (row = 0; row < rows; row += LOW_RES_ROWS)
-+	for (row = 0, sP = stripe; row < rows; row += LOW_RES_ROWS, sP = stripe)
- 	{
- 		if (row + LOW_RES_ROWS <= rows)
- 			npins = LOW_RES_ROWS;
-@@ -68,17 +95,18 @@
- 			npins = rows - row;
- 		for (i = 0; i < npins; ++i)
- 			pbm_readpbmrow(ifp, bP[i] = bitrows[i], cols, format);
--		printf("\033K%c%c", cols % 256, cols / 256);
- 		for (col = 0; col < cols; ++col)
- 		{
- 			item = 0;
- 			for (i = 0; i < npins; ++i)
- 				if (*(bP[i]++) == PBM_BLACK)
- 					item |= 1 << (7 - i);
--			putchar(item);
-+			*sP++ = item;
- 		}
--		putchar('\n');
-+		outstripe(stripe, sP, 'K');
- 	}
-+	printf("\033@");
-+	free(stripe);
- }
- 
- static void
-@@ -86,11 +114,13 @@
- {
- 	register int	i, pin, item, npins, row, col;
- 	bit		*bitrows[HIGH_RES_ROWS], *bP[HIGH_RES_ROWS];
-+	char		*stripe, *sP;
- 
-+	stripe = malloc(cols);
- 	for (i = 0; i < HIGH_RES_ROWS; ++i)
- 		bitrows[i] = pbm_allocrow(cols);
--	putchar('\033'); putchar('3'); putchar('\0');
--	for (row = 0; row < rows; row += HIGH_RES_ROWS)
-+	printf("\0333\001");			/* \n = 1/144" */
-+	for (row = 0, sP = stripe; row < rows; row += HIGH_RES_ROWS, sP = stripe)
- 	{
- 		if (row + HIGH_RES_ROWS <= rows)
- 			npins = HIGH_RES_ROWS;
-@@ -98,7 +128,6 @@
- 			npins = rows - row;
- 		for (i = 0; i < npins; ++i)
- 			pbm_readpbmrow(ifp, bP[i] = bitrows[i], cols, format);
--		printf("\033L%c%c", cols % 256, cols / 256);
- 		for (col = 0; col < cols; ++col)
- 		{
- 			item = 0;
-@@ -106,11 +135,10 @@
- 			for (pin = i = 0; i < npins; i += 2, ++pin)
- 				if (*(bP[i]++) == PBM_BLACK)
- 					item |= 1 << (7 - pin);
--			putchar(item);
-+			*sP++ = item;
- 		}
--		putchar('\n');			/* flush buffer */
--		printf("\033J\001");		/* 1/144 down */
--		printf("\033L%c%c", cols % 256, cols / 256);
-+		outstripe(stripe, sP, 'L');
-+		sP = stripe;
- 		for (col = 0; col < cols; ++col)
- 		{
- 			item = 0;
-@@ -118,9 +146,11 @@
- 			for (i = 1, pin = 0; i < npins; i += 2, ++pin)
- 				if (*(bP[i]++) == PBM_BLACK)
- 					item |= 1 << (7 - pin);
--			putchar(item);
-+			*sP++ = item;
- 		}
--		putchar('\n');			/* flush buffer */
--		printf("\033J\017");		/* 15/144 down */
-+		outstripe(stripe, sP, 'L');
-+		printf("\033J\016");		/* 14/144 down, \n did 1/144 */
- 	}
-+	printf("\033@");
-+	free(stripe);
- }
diff --git a/graphics/netpbm/patches/patch-ah b/graphics/netpbm/patches/patch-ah
deleted file mode 100644
index 7b595a5cf6d..00000000000
--- a/graphics/netpbm/patches/patch-ah
+++ /dev/null
@@ -1,113 +0,0 @@
-$NetBSD: patch-ah,v 1.1 1999/01/10 23:52:16 tron Exp $
-
---- pgm/Makefile.orig	Fri Jan 28 11:14:02 1994
-+++ pgm/Makefile	Mon Jan 11 00:18:46 1999
-@@ -18,14 +18,16 @@
- #CFLAGS =	-g -O
- LDFLAGS =	-s
- #LDFLAGS =	
--INSTALLBINARIES =	/usr/new/pbm
--INSTALLMANUALS1 =	/usr/man/man1
-+INSTALLBINARIES =	$(PREFIX)/bin
-+INSTALLMANUALS1 =	$(PREFIX)/man/man1
- SUFFIXMANUALS1 =	1
--INSTALLMANUALS3 =	/usr/man/man3
-+INSTALLMANUALS3 =	$(PREFIX)/man/man3
- SUFFIXMANUALS3 =	3
--INSTALLMANUALS5 =	/usr/man/man5
-+INSTALLMANUALS5 =	$(PREFIX)/man/man5
- SUFFIXMANUALS5 =	5
--MANCP =			cp
-+MANCP =			install -c -m 0644
-+INSTALLLIBS =		$(PREFIX)/lib
-+INSTALLDEFS =		$(PREFIX)/include
- 
- PBMDIR =	../pbm
- INCLUDEPBM =	-I$(PBMDIR)
-@@ -37,12 +39,13 @@
- INCLUDE =	-I.. $(INCLUDEPBM)
- ALLCFLAGS =	$(CFLAGS) $(INCLUDE)
- LIBPGM =	libpgm.a
-+DEFPGM =	pgm.h
- 
- 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 \
-@@ -56,18 +59,19 @@
- MANUALS5 =	pgm
- 
- 
--#all:		binaries
--all:		merge
--#install:	install.bin
--install:	install.merge
-+all:		binaries
-+#all:		merge
-+install:	install.bin
-+#install:	install.merge
- 
- 
- binaries:	$(BINARIES)
- 
- install.bin:	binaries
- 	cd $(INSTALLBINARIES) ; rm -f $(BINARIES)
--	cp $(BINARIES) $(INSTALLBINARIES)
--
-+	install -c -s -m 0755 $(BINARIES) $(INSTALLBINARIES)
-+	install -c -m 0644 $(LIBPGM) $(INSTALLLIBS)
-+	install -c -m 0644 $(DEFPGM) $(INSTALLDEFS)
- 
- merge:		pgmmerge
- pgmmerge:	pgmmerge.c $(OBJECTS) $(LIBPGM) $(LIBPBM)
-@@ -97,15 +101,15 @@
- 
- 
- # Rule for plain programs.
--$(PORTBINARIES):	pgm.h $(DEFPBM) $(LIBPGM) $(LIBPBM)
-+$(PORTBINARIES):	$(DEFPGM) $(DEFPBM) $(LIBPGM) $(LIBPBM)
- 	$(CC) $(ALLCFLAGS) $(LDFLAGS) -o $@ $@.c $(LIBPGM) $(LIBPBM)
- 
- # Rule for math-dependent programs.
--$(MATHBINARIES):	pgm.h $(DEFPBM) $(LIBPGM) $(LIBPBM)
-+$(MATHBINARIES):	$(DEFPGM) $(DEFPBM) $(LIBPGM) $(LIBPBM)
- 	$(CC) $(ALLCFLAGS) $(LDFLAGS) -o $@ $@.c -lm $(LIBPGM) $(LIBPBM)
- 
- # Rule for objects.
--$(OBJECTS):	pgm.h $(DEFPBM)
-+$(OBJECTS):	$(DEFPGM) $(DEFPBM)
- 	$(CC) $(ALLCFLAGS) "-Dmain=$*_main" -c $*.c
- 
- # And libraries.
-@@ -117,9 +121,9 @@
- 	ar rc $(LIBPGM) libpgm1.o libpgm2.o
- 	-ranlib $(LIBPGM)
- 
--libpgm1.o:	pgm.h $(DEFPBM) libpgm.h libpgm1.c
-+libpgm1.o:	$(DEFPGM) $(DEFPBM) lib$(DEFPGM) libpgm1.c
- 	$(CC) $(ALLCFLAGS) -c libpgm1.c
--libpgm2.o:	pgm.h $(DEFPBM) libpgm.h libpgm2.c $(DEFLIBPBM)
-+libpgm2.o:	$(DEFPGM) $(DEFPBM) lib$(DEFPGM) libpgm2.c $(DEFLIBPBM)
- 	$(CC) $(ALLCFLAGS) -c libpgm2.c
- 
- # Other dependencies.
-@@ -134,7 +138,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
-@@ -148,4 +151,4 @@
- spottopgm spottopgm.o:		spottopgm.c
- 
- clean:
--	-rm -f *.o *.a *.cat *~ core $(BINARIES) pgmmerge
-+	-rm -f *.o *.a *.cat *~ core *.core $(BINARIES) pgmmerge
diff --git a/graphics/netpbm/patches/patch-ai b/graphics/netpbm/patches/patch-ai
deleted file mode 100644
index 2543f891b0d..00000000000
--- a/graphics/netpbm/patches/patch-ai
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ai,v 1.1 1999/01/10 23:52:16 tron Exp $
-
---- pgm/pgmmerge.c.orig	Fri Jan 28 11:17:38 1994
-+++ pgm/pgmmerge.c	Sun Jan 10 23:48:40 1999
-@@ -29,6 +29,10 @@
- 	{
- 	++argv;
- 	--argc;
-+	if(!*argv)	{
-+		fprintf(stderr, "Usage: pgmmerge pgm_program_name [args ...]\n");
-+		exit(1);
-+		}
- 	goto again;
- 	}
- 
diff --git a/graphics/netpbm/patches/patch-aj b/graphics/netpbm/patches/patch-aj
deleted file mode 100644
index a783b715f76..00000000000
--- a/graphics/netpbm/patches/patch-aj
+++ /dev/null
@@ -1,171 +0,0 @@
-$NetBSD: patch-aj,v 1.3 1999/10/08 21:18:34 jlam Exp $
-
---- pnm/Makefile.orig	Mon Jan 31 11:47:32 1994
-+++ pnm/Makefile	Fri Oct  8 13:33:59 1999
-@@ -10,27 +10,30 @@
- # implied warranty.
- 
- # Default values, usually overridden by top-level Makefile.
--#CC =		cc
--CC =		gcc -ansi -pedantic -fcombine-regs -fpcc-struct-return
-+CC =		gcc
-+#CC =		gcc -ansi -pedantic -fcombine-regs -fpcc-struct-return
- #CFLAGS =	-O
--CFLAGS =	-g
-+CFLAGS =	-O2
- #CFLAGS =	-g -O
- TIFFDEF =	-DLIBTIFF
--TIFFINC =       -I../libtiff
--TIFFLIB =       ../libtiff/libtiff.a
-+TIFFINC =       -I$(LOCALBASE)/include
-+TIFFLIB =       -Wl,-R$(LOCALBASE)/lib -L$(LOCALBASE)/lib -ltiff -ljpeg -lz
- TIFFBINARIES =  tifftopnm pnmtotiff
- TIFFOBJECTS =   tifftopnm.o pnmtotiff.o
--#LDFLAGS =	-s
--LDFLAGS =	
--INSTALLBINARIES =	/usr/new/pbm
-+PNGLIB =       -Wl,-R$(LOCALBASE)/lib -L$(LOCALBASE)/lib -lpng -lz
-+LDFLAGS =	-s
-+#LDFLAGS =	
-+INSTALLBINARIES =	$(PREFIX)/bin
- INSTALLSCRIPTS =	$(INSTALLBINARIES)
--INSTALLMANUALS1 =	/usr/man/man1
-+INSTALLMANUALS1 =	$(PREFIX)/man/man1
- SUFFIXMANUALS1 =	1
--INSTALLMANUALS3 =	/usr/man/man3
-+INSTALLMANUALS3 =	$(PREFIX)/man/man3
- SUFFIXMANUALS3 =	3
--INSTALLMANUALS5 =	/usr/man/man5
-+INSTALLMANUALS5 =	$(PREFIX)/man/man5
- SUFFIXMANUALS5 =	5
--MANCP =			cp
-+MANCP =			install -c -m 0644
-+INSTALLLIBS =		$(PREFIX)/lib
-+INSTALLDEFS =		$(PREFIX)/include
- 
- PPMDIR =	../ppm
- INCLUDEPPM =	-I$(PPMDIR)
-@@ -54,48 +57,52 @@
- INCLUDE =	-I.. $(INCLUDEPPM) $(INCLUDEPGM) $(INCLUDEPBM)
- ALLCFLAGS =	$(CFLAGS) $(INCLUDE) $(TIFFDEF) $(TIFFINC)
- LIBPNM =	libpnm.a
-+DEFPNM =	pnm.h
- 
- PORTBINARIES =	fitstopnm giftopnm \
- 		pnmalias pnmarith pnmcat pnmcomp pnmconvol pnmcrop \
- 		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 \
-+		pnmsmooth pnmhisteq
- MATHBINARIES =	pnmgamma pnmnlfilt pnmrotate pnmscale pnmshear
--BINARIES =      $(PORTBINARIES) $(MATHBINARIES) $(TIFFBINARIES)
--SCRIPTS =	anytopnm pnmindex pnmmargin pnmsmooth pstopnm
-+PNGBINARIES =	pngtopnm pnmtopng
-+BINARIES =      $(PORTBINARIES) $(MATHBINARIES) $(PNGBINARIES) $(TIFFBINARIES)
-+SCRIPTS =	anytopnm pnmindex pnmmargin pstopnm
- 
- PORTOBJECTS =	fitstopnm.o giftopnm.o \
- 		pnmalias.o pnmarith.o pnmcat.o pnmcomp.o pnmconvol.o pnmcrop.o \
- 		pnmcut.o pnmdepth.o pnmenlarge.o pnmfile.o pnmflip.o pnmhistmap.o \
--		pnminvert.o pnmnoraw.o pnmpad.o pnmpaste.o \
-+		pnmhisteq.o pnminvert.o pnmnoraw.o pnmpad.o pnmpaste.o\
- 		pnmtile.o pnmtoddif.o pnmtofits.o pnmtops.o pnmtorast.o \
- 		pnmtosgi.o pnmtosir.o pnmtoxwd.o \
- 		rasttopnm.o sgitopnm.o sirtopnm.o xwdtopnm.o zeisstopnm.o \
-+		pnmsmooth.o pnmhisteq.o \
- 		pnmgamma.o pnmnlfilt.o pnmrotate.o pnmscale.o pnmshear.o
--OBJECTS =	$(PORTOBJECTS) $(TIFFOBJECTS)
-+OBJECTS =	$(PORTOBJECTS)
- 
- MANUALS1 =	$(BINARIES) $(SCRIPTS)
- MANUALS3 =	libpnm
- MANUALS5 =	pnm
- 
- 
--#all:		binaries
--all:		merge
--#install:	install.bin
--install:	install.merge
-+all:		binaries
-+#all:		merge
-+install:	install.bin
-+#install:	install.merge
- 
- 
- binaries:	$(BINARIES)
- 
- install.bin:	binaries $(SCRIPTS)
- 	cd $(INSTALLBINARIES) ; rm -f $(BINARIES)
--	cp $(BINARIES) $(INSTALLBINARIES)
-+	install -c -s -m 0755 $(BINARIES) $(INSTALLBINARIES)
- 	cd $(INSTALLSCRIPTS) ; rm -f $(SCRIPTS)
--	cp $(SCRIPTS) $(INSTALLSCRIPTS)
--	cd $(INSTALLSCRIPTS) ; chmod +x $(SCRIPTS)
--
-+	install -c -m 0755 $(SCRIPTS) $(INSTALLSCRIPTS)
-+	install -c -m 0644 $(LIBPNM) $(INSTALLLIBS)
-+	install -c -m 0644 $(DEFPNM) $(INSTALLDEFS)
- 
- merge:		pnmmerge
- pnmmerge:	pnmmerge.c $(OBJECTS) $(LIBPNM) $(LIBPPM) $(LIBPGM) $(LIBPBM)
-@@ -128,16 +135,22 @@
- 
- 
- # Rules for plain programs.
--$(PORTBINARIES) $(TIFFBINARIES):	pnm.h $(DEFPPM) $(DEFPGM) $(DEFPBM) $(LIBPNM) $(LIBPPM) $(LIBPGM) $(LIBPBM) $(TIFFLIB)
--	$(CC) $(ALLCFLAGS) $(LDFLAGS) -o $@ $@.c $(LIBPNM) $(LIBPPM) $(LIBPGM) $(LIBPBM) $(TIFFLIB)
-+$(PORTBINARIES):	$(DEFPNM) $(DEFPPM) $(DEFPGM) $(DEFPBM) $(LIBPNM) $(LIBPPM) $(LIBPGM) $(LIBPBM)
-+	$(CC) $(ALLCFLAGS) $(LDFLAGS) -o $@ $@.c $(LIBPNM) $(LIBPPM) $(LIBPGM) $(LIBPBM)
-+
-+$(PNGBINARIES):	$(DEFPNM) $(DEFPPM) $(DEFPGM) $(DEFPBM) $(LIBPNM) $(LIBPPM) $(LIBPGM) $(LIBPBM)
-+	$(CC) $(ALLCFLAGS) $(LDFLAGS) -o $@ $@.c $(LIBPNM) $(LIBPPM) $(LIBPGM) $(LIBPBM) $(PNGLIB) -lm
-+
-+$(TIFFBINARIES):	$(DEFPNM) $(DEFPPM) $(DEFPGM) $(DEFPBM) $(LIBPNM) $(LIBPPM) $(LIBPGM) $(LIBPBM)
-+	$(CC) $(ALLCFLAGS) $(LDFLAGS) -o $@ $@.c $(LIBPNM) $(LIBPPM) $(LIBPGM) $(LIBPBM) $(TIFFLIB) -lm
- 
- # Rule for math-dependent programs.
--$(MATHBINARIES):        pnm.h $(DEFPPM) $(DEFPGM) $(DEFPBM) $(LIBPNM) \
-+$(MATHBINARIES):        $(DEFPNM) $(DEFPPM) $(DEFPGM) $(DEFPBM) $(LIBPNM) \
- 			$(LIBPPM) $(LIBPGM) $(LIBPBM)
- 	$(CC) $(ALLCFLAGS) $(LDFLAGS) -o $@ $@.c -lm $(LIBPNM) $(LIBPPM) $(LIBPGM) $(LIBPBM)
- 
- # Rule for objects.
--$(OBJECTS):	pnm.h $(DEFPPM) $(DEFPGM) $(DEFPBM)
-+$(OBJECTS):	$(DEFPNM) $(DEFPPM) $(DEFPGM) $(DEFPBM)
- 	$(CC) $(ALLCFLAGS) "-Dmain=$*_main" -c $*.c
- 
- # And libraries.
-@@ -153,15 +166,15 @@
- 	ar rc $(LIBPNM) libpnm1.o libpnm2.o libpnm3.o libpnm4.o
- 	-ranlib $(LIBPNM)
- 
--libpnm1.o:	pnm.h $(DEFPPM) $(DEFPGM) $(DEFPBM) libpnm1.c
-+libpnm1.o:	$(DEFPNM) $(DEFPPM) $(DEFPGM) $(DEFPBM) libpnm1.c
- 	$(CC) $(ALLCFLAGS) -c libpnm1.c
--libpnm2.o:	pnm.h $(DEFPPM) $(DEFPGM) $(DEFPBM) libpnm2.c $(DEFLIBPPM) \
-+libpnm2.o:	$(DEFPNM) $(DEFPPM) $(DEFPGM) $(DEFPBM) libpnm2.c $(DEFLIBPPM) \
- 		$(DEFLIBPGM) $(DEFLIBPBM)
- 	$(CC) $(ALLCFLAGS) -c libpnm2.c
--libpnm3.o:	pnm.h $(DEFPPM) $(DEFPGM) $(DEFPBM) libpnm3.c $(DEFLIBPPM) \
-+libpnm3.o:	$(DEFPNM) $(DEFPPM) $(DEFPGM) $(DEFPBM) libpnm3.c $(DEFLIBPPM) \
- 		$(DEFLIBPGM) $(DEFLIBPBM)
- 	$(CC) $(ALLCFLAGS) -c libpnm3.c
--libpnm4.o:	pnm.h $(DEFPPM) $(DEFPGM) $(DEFPBM) rast.h libpnm4.c
-+libpnm4.o:	$(DEFPNM) $(DEFPPM) $(DEFPGM) $(DEFPBM) rast.h libpnm4.c
- 	$(CC) $(ALLCFLAGS) -c libpnm4.c
- 
- # Other dependencies.
-@@ -202,6 +215,8 @@
- tifftopnm tifftopnm.o:		tifftopnm.c
- xwdtopnm xwdtopnm.o:		xwdtopnm.c x10wd.h x11wd.h
- zeisstopnm zeisstopnm.o:	zeisstopnm.c
-+pnmhisteq pnmhisteq.o:		pnmhisteq.c
-+pnmsmooth pnmsmooth.o:          pnmsmooth.c
- 
- clean:
--	-rm -f *.o *.a *.cat *~ core $(BINARIES) pnmmerge
-+	-rm -f *.o *.a *.cat *~ core *.core $(BINARIES) pnmmerge
diff --git a/graphics/netpbm/patches/patch-ak b/graphics/netpbm/patches/patch-ak
deleted file mode 100644
index b0cc8d54b40..00000000000
--- a/graphics/netpbm/patches/patch-ak
+++ /dev/null
@@ -1,52 +0,0 @@
-$NetBSD: patch-ak,v 1.1 1999/01/10 23:52:16 tron Exp $
-
---- pnm/anytopnm.orig	Mon Oct  4 10:11:29 1993
-+++ pnm/anytopnm	Sun Jan 10 23:48:40 1999
-@@ -53,7 +53,7 @@
- 	;;
- 
- 	*GIF* )
--	giftoppm "$file"
-+	giftopnm "$file"
- 	break
- 	;;
- 
-@@ -82,6 +82,15 @@
- 	break
- 	;;
- 
-+        *JPEG* | *JFIF* )
-+        djpeg "$file"
-+        ;;
-+
-+        *PNG* )
-+        pngtopnm "$file"
-+        break
-+        ;;
-+
- 	* )
- 	# Can't figure out the file type from the magic number,
- 	# try the extension.
-@@ -130,7 +139,7 @@
- 	    fitstopgm "$file"
- 	    ;;
- 	    *.gif | *.gif.* )
--	    giftoppm "$file"
-+	    giftopnm "$file"
- 	    ;;
- 	    *.iff | *.iff.* | *.ilbm | *.ilbm.* )
- 	    ilbmtoppm "$file"
-@@ -168,6 +177,13 @@
- 	    *.ybm | *.ybm.* | *.face | *.face.* )
- 	    ybmtopbm "$file"
- 	    ;;
-+            *.JPEG | *.jpeg | *.jpg | *.JPG )
-+            djpeg "$file"
-+            ;;
-+            *.png | *.PNG )
-+            pngtopnm "$file"
-+            break
-+            ;;
- 	    * )
- 	    echo "$0: unknown file type" 1>&2
- 	    exit 1
diff --git a/graphics/netpbm/patches/patch-al b/graphics/netpbm/patches/patch-al
deleted file mode 100644
index b2b74fbd244..00000000000
--- a/graphics/netpbm/patches/patch-al
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-al,v 1.1 1999/01/10 23:52:16 tron Exp $
-
---- pnm/pnmarith.1.orig	Mon Oct  4 10:11:34 1993
-+++ pnm/pnmarith.1	Sun Jan 10 23:48:40 1999
-@@ -4,7 +4,7 @@
- pnmarith - perform arithmetic on two portable anymaps
- .SH SYNOPSIS
- .B pnmarith
--.BR -add | -subtract | -multiply | -difference
-+.BR -add | -subtract | -multiply | -difference | -minimum | -maximum.
- .I pnmfile1 pnmfile2
- .SH DESCRIPTION
- Reads two portable anymaps as input.
diff --git a/graphics/netpbm/patches/patch-am b/graphics/netpbm/patches/patch-am
deleted file mode 100644
index 8523cce6698..00000000000
--- a/graphics/netpbm/patches/patch-am
+++ /dev/null
@@ -1,68 +0,0 @@
-$NetBSD: patch-am,v 1.1 1999/01/10 23:52:16 tron Exp $
-
---- pnm/pnmarith.c.orig	Wed Jan  5 11:04:53 1994
-+++ pnm/pnmarith.c	Sun Jan 10 23:48:40 1999
-@@ -29,7 +29,8 @@
-     xelval maxval1, maxval2, maxval3;
-     int argn, rows1, cols1, format1, rows2, cols2, format2, format3, row, col;
-     char function;
--    char* usage = "-add|-subtract|-multiply|-difference pnmfile1 pnmfile2";
-+    char* usage =
-+"-add|-subtract|-multiply|-difference|-minimum|-maximum pnmfile1 pnmfile2";
- 
- 
-     pnm_init( &argc, argv );
-@@ -48,6 +49,10 @@
- 	    function = '*';
- 	else if ( pm_keymatch( argv[argn], "-difference", 2 ) )
- 	    function = 'D';
-+	else if ( pm_keymatch( argv[argn], "-minimum", 2 ) )
-+	    function = 'N';
-+	else if ( pm_keymatch( argv[argn], "-maximum", 2 ) )
-+	    function = 'X';
- 	else
- 	    pm_usage( usage );
- 	++argn;
-@@ -112,7 +117,7 @@
- 	    pnm_promoteformatrow(
- 		xelrow2, cols1, maxval2, format2, maxval3, format3 );
- 
--        for ( col = 0, x1P = xelrow1, x2P = xelrow2;
-+	for ( col = 0, x1P = xelrow1, x2P = xelrow2;
- 	      col < cols1; ++col, ++x1P, ++x2P )
- 	    {
- 	    switch ( PNM_FORMAT_TYPE(format3) )
-@@ -153,6 +158,18 @@
- 		    b1 = (b1>b2)?(b1-b2):(b2-b1);
- 		    break;
- 
-+		    case 'N':
-+		    r1 = (r1>r2)?(r2):(r1);
-+		    g1 = (g1>g2)?(g2):(g1);
-+		    b1 = (b1>b2)?(b2):(b1);
-+		    break;
-+  
-+		    case 'X':
-+		    r1 = (r1>r2)?(r1):(r2);
-+		    g1 = (g1>g2)?(g1):(g2);
-+		    b1 = (b1>b2)?(b1):(b2);
-+		    break;
-+
- 		    default:
- 		    pm_error( "can't happen" );
- 		    }
-@@ -188,6 +205,14 @@
- 
- 		    case 'D':
- 		    g1 = (g1>g2)?(g1-g2):(g2-g1);
-+		    break;
-+
-+		    case 'N':
-+		    g1 = (g1>g2)?(g2):(g1);
-+		    break;
-+  
-+		    case 'X':
-+		    g1 = (g1>g2)?(g1):(g2);
- 		    break;
- 
- 		    default:
diff --git a/graphics/netpbm/patches/patch-an b/graphics/netpbm/patches/patch-an
deleted file mode 100644
index 02ccdc4b805..00000000000
--- a/graphics/netpbm/patches/patch-an
+++ /dev/null
@@ -1,1874 +0,0 @@
-$NetBSD: patch-an,v 1.1 1999/01/10 23:52:16 tron Exp $
-
---- pnm/pnmconvol.c.orig	Mon Oct  4 10:11:36 1993
-+++ pnm/pnmconvol.c	Sun Jan 10 23:48:40 1999
-@@ -1,5 +1,10 @@
- /* pnmconvol.c - general MxN convolution on a portable anymap
- **
-+** Version 2.0.1 January 30, 1995
-+**
-+** Major rewriting by Mike Burns
-+** Copyright (C) 1994, 1995 by Mike Burns (burns@chem.psu.edu)
-+**
- ** Copyright (C) 1989, 1991 by Jef Poskanzer.
- **
- ** Permission to use, copy, modify, and distribute this software and its
-@@ -10,31 +15,109 @@
- ** implied warranty.
- */
- 
-+/* Version 2.0.1 Changes
-+** ---------------------
-+** Fixed four lines that were improperly allocated as sizeof( float ) when they
-+** should have been sizeof( long ).
-+**
-+** Version 2.0 Changes
-+** -------------------
-+** Reduce run time by general optimizations and handling special cases of
-+** convolution matrices.  Program automatically determines if convolution 
-+** matrix is one of the types it can make use of so no extra command line
-+** arguments are necessary.
-+**
-+** Examples of convolution matrices for the special cases are
-+**
-+**    Mean       Horizontal    Vertical
-+**    x x x        x x x        x y z
-+**    x x x        y y y        x y z
-+**    x x x        z z z        x y z
-+**
-+** I don't know if the horizontal and vertical ones are of much use, but
-+** after working on the mean convolution, it gave me ideas for the other two.
-+**
-+** Some other compiler dependent optimizations
-+** -------------------------------------------
-+** Created separate functions as code was getting too large to put keep both
-+** PGM and PPM cases in same function and also because SWITCH statement in
-+** inner loop can take progressively more time the larger the size of the 
-+** convolution matrix.  GCC is affected this way.
-+**
-+** Removed use of MOD (%) operator from innermost loop by modifying manner in
-+** which the current xelbuf[] is chosen.
-+** 
-+*/
-+
- #include "pnm.h"
- 
-+/* Macros to verify that r,g,b values are within proper range */
-+
-+#define CHECK_GRAY \
-+    if ( tempgsum < 0L ) g = 0; \
-+    else if ( tempgsum > maxval ) g = maxval; \
-+    else g = tempgsum;
-+
-+#define CHECK_RED \
-+    if ( temprsum < 0L ) r = 0; \
-+    else if ( temprsum > maxval ) r = maxval; \
-+    else r = temprsum;
-+
-+#define CHECK_GREEN \
-+    if ( tempgsum < 0L ) g = 0; \
-+    else if ( tempgsum > maxval ) g = maxval; \
-+    else g = tempgsum;
-+
-+#define CHECK_BLUE \
-+    if ( tempbsum < 0L ) b = 0; \
-+    else if ( tempbsum > maxval ) b = maxval; \
-+    else b = tempbsum;
-+
-+
-+static int check_convolve_type ARGS((xel **cxels));
-+static void pgm_general_convolve ARGS((void));
-+static void ppm_general_convolve ARGS((void));
-+static void pgm_mean_convolve ARGS((void));
-+static void ppm_mean_convolve ARGS((void));
-+static void pgm_vertical_convolve ARGS((void));
-+static void ppm_vertical_convolve ARGS((void));
-+static void pgm_horizontal_convolve ARGS((void));
-+static void ppm_horizontal_convolve ARGS((void));
-+
-+#define TRUE	1
-+#define FALSE	0
-+
-+#define GENERAL_CONVOLVE	0
-+#define MEAN_CONVOLVE		1
-+#define HORIZONTAL_CONVOLVE	2
-+#define VERTICAL_CONVOLVE	3
-+
-+static FILE* ifp;
-+static float** rweights;
-+static float** gweights;
-+static float** bweights;
-+static int crows, ccols, ccolso2, crowso2;
-+static int cols, rows;
-+static xelval maxval;
-+static int format, newformat;
-+static float rmeanweight, gmeanweight, bmeanweight;
-+
- int
- main( argc, argv )
-     int argc;
-     char* argv[];
-     {
-     FILE* cifp;
--    FILE* ifp;
-     xel** cxels;
--    xel** xelbuf;
--    xel* outputrow;
--    xel x;
--    int argn, crows, ccols, cformat, ccolso2, crowso2;
--    int rows, cols, format, newformat, crow, row;
-+    int argn, cformat;
-+    int crow, row;
-     register int ccol, col;
--    xelval cmaxval, maxval;
-+    xelval cmaxval;
-     xelval g;
--    float** gweights;
-     float gsum;
--    xelval r, b;
--    float** rweights;
--    float** bweights;
-     float rsum, bsum;
-     char* usage = "<convolutionfile> [pnmfile]";
-+    int convolve_type;
- 
-     pnm_init( &argc, argv );
- 
-@@ -90,6 +173,7 @@
-             }
-         }
- 
-+
-     /* Set up the normalized weights. */
-     rweights = (float**) pm_allocarray( ccols, crows, sizeof(float) );
-     gweights = (float**) pm_allocarray( ccols, crows, sizeof(float) );
-@@ -115,6 +199,14 @@
- 		break;
- 		}
- 	    }
-+
-+    /* For mean_convolve routines.  All weights of a single color are the same
-+    ** so just grab any one of them.
-+    */
-+    rmeanweight = rweights[0][0];
-+    gmeanweight = gweights[0][0];
-+    bmeanweight = bweights[0][0];
-+
-     switch ( PNM_FORMAT_TYPE(format) )
- 	{
- 	case PPM_TYPE:
-@@ -131,11 +223,199 @@
- 	break;
- 	}
- 
-+    /* Handle certain special cases when runtime can be improved. */
-+
-+    convolve_type = check_convolve_type(cxels);
-+
-+    switch ( PNM_FORMAT_TYPE(format) )
-+	{
-+	case PPM_TYPE:
-+	switch (convolve_type)
-+	    {
-+	    case MEAN_CONVOLVE:
-+	    ppm_mean_convolve();
-+	    break;
-+
-+	    case HORIZONTAL_CONVOLVE:
-+	    ppm_horizontal_convolve();
-+	    break;
-+
-+	    case VERTICAL_CONVOLVE:
-+	    ppm_vertical_convolve();
-+	    break;
-+
-+	    default: /* GENERAL_CONVOLVE */
-+	    ppm_general_convolve();
-+	    break;  
-+	    }
-+	break;
-+
-+	default:
-+	switch (convolve_type)
-+	    {
-+	    case MEAN_CONVOLVE:
-+	    pgm_mean_convolve();
-+	    break;
-+
-+	    case HORIZONTAL_CONVOLVE:
-+	    pgm_horizontal_convolve();
-+	    break;
-+
-+	    case VERTICAL_CONVOLVE:
-+	    pgm_vertical_convolve();
-+	    break;
-+
-+	    default: /* GENERAL_CONVOLVE */
-+	    pgm_general_convolve();
-+	    break;  
-+	    }
-+	break;
-+	} /* PNM_TYPE */
-+
-+    pm_close( ifp );
-+    exit( 0 );
-+    }
-+
-+
-+
-+/* check_convolve_type
-+**
-+** Determine if the convolution matrix is one of the special cases that
-+** can be processed faster than the general form.
-+**
-+** Does not check for the case where one of the PPM colors can have differing 
-+** types.  Only handles cases where all PPM's are of the same special case.
-+*/
-+
-+static int
-+check_convolve_type (cxels)
-+    xel **cxels;
-+    {
-+    int convolve_type;
-+    int horizontal, vertical;
-+    int tempcxel, rtempcxel, gtempcxel, btempcxel;
-+    int crow, ccol;
-+
-+    switch ( PNM_FORMAT_TYPE(format) )
-+	{
-+	case PPM_TYPE:
-+	horizontal = TRUE;
-+	crow = 0;
-+	while ( horizontal && (crow < crows) )
-+	    {
-+	    ccol = 1;
-+	    rtempcxel = PPM_GETR(cxels[crow][0]);
-+	    gtempcxel = PPM_GETG(cxels[crow][0]);
-+	    btempcxel = PPM_GETB(cxels[crow][0]);
-+	    while ( horizontal && (ccol < ccols) )
-+		{
-+		if (( PPM_GETR(cxels[crow][ccol]) != rtempcxel ) |
-+		    ( PPM_GETG(cxels[crow][ccol]) != gtempcxel ) |
-+		    ( PPM_GETB(cxels[crow][ccol]) != btempcxel )) 
-+		    horizontal = FALSE;
-+		++ccol;
-+		}
-+	    ++crow;
-+	    }
-+
-+	vertical = TRUE;
-+	ccol = 0;
-+	while ( vertical && (ccol < ccols) )
-+	    {
-+	    crow = 1;
-+	    rtempcxel = PPM_GETR(cxels[0][ccol]);
-+	    gtempcxel = PPM_GETG(cxels[0][ccol]);
-+	    btempcxel = PPM_GETB(cxels[0][ccol]);
-+	    while ( vertical && (crow < crows) )
-+		{
-+		if (( PPM_GETR(cxels[crow][ccol]) != rtempcxel ) |
-+		    ( PPM_GETG(cxels[crow][ccol]) != gtempcxel ) |
-+		    ( PPM_GETB(cxels[crow][ccol]) != btempcxel ))
-+		    vertical = FALSE;
-+		++crow;
-+		}
-+	    ++ccol;
-+	    }
-+	break;
-+
-+	default:
-+	horizontal = TRUE;
-+	crow = 0;
-+	while ( horizontal && (crow < crows) )
-+	    {
-+	    ccol = 1;
-+	    tempcxel = PNM_GET1(cxels[crow][0]);
-+	    while ( horizontal && (ccol < ccols) )
-+		{
-+		if ( PNM_GET1(cxels[crow][ccol]) != tempcxel )
-+		    horizontal = FALSE;
-+		++ccol;
-+		}
-+	    ++crow;
-+	    }
-+
-+	vertical = TRUE;
-+	ccol = 0;
-+	while ( vertical && (ccol < ccols) )
-+	    {
-+	    crow = 1;
-+	    tempcxel = PNM_GET1(cxels[0][ccol]);
-+	    while ( vertical && (crow < crows) )
-+		{
-+		if ( PNM_GET1(cxels[crow][ccol]) != tempcxel )
-+		    vertical = FALSE;
-+		++crow;
-+		}
-+	    ++ccol;
-+	    }
-+	break;
-+	}
-+
-+    /* Which type do we have? */
-+    if ( horizontal && vertical )
-+	convolve_type = MEAN_CONVOLVE;
-+    else if ( horizontal )
-+	convolve_type = HORIZONTAL_CONVOLVE;
-+    else if ( vertical )
-+	convolve_type = VERTICAL_CONVOLVE;
-+    else
-+	convolve_type = GENERAL_CONVOLVE;
-+
-+    return (convolve_type);
-+    }
-+
-+
-+
-+
-+/* General PGM Convolution
-+**
-+** No useful redundancy in convolution matrix.
-+*/
-+
-+static void
-+pgm_general_convolve()
-+    {
-+    register int ccol, col;
-+    xel** xelbuf;
-+    xel* outputrow;
-+    xel x, y;
-+    xelval g;
-+    int row, crow;
-+    float gsum;
-+    xel **rowptr, *temprptr;
-+    int toprow, temprow;
-+    int i, irow;
-+    int leftcol;
-+    long tempgsum;
-+
-     /* Allocate space for one convolution-matrix's worth of rows, plus
-     ** a row output buffer. */
-     xelbuf = pnm_allocarray( cols, crows );
-     outputrow = pnm_allocrow( cols );
- 
-+    /* Allocate array of pointers to xelbuf */
-+    rowptr = (xel **) pnm_allocarray( 1, crows );
-+
-     pnm_writepnminit( stdout, cols, rows, maxval, newformat, 0 );
- 
-     /* Read in one convolution-matrix's worth of image, less one row. */
-@@ -155,65 +435,1470 @@
-     */
-     for ( ; row < rows; ++row )
- 	{
--	pnm_readpnmrow( ifp, xelbuf[row % crows], cols, maxval, format );
-+	toprow = row + 1;
-+	temprow = row % crows;
-+	pnm_readpnmrow( ifp, xelbuf[temprow], cols, maxval, format );
- 	if ( PNM_FORMAT_TYPE(format) != newformat )
- 	    pnm_promoteformatrow(
--		xelbuf[row % crows], cols, maxval, format, maxval, newformat );
-+		xelbuf[temprow], cols, maxval, format, maxval, newformat );
-+
-+	/* Arrange rowptr to eliminate the use of mod function to determine
-+	** which row of xelbuf is 0...crows.  Mod function can be very costly.
-+	*/
-+	temprow = toprow % crows;
-+	i = 0;
-+	for (irow = temprow; irow < crows; ++i, ++irow)
-+	    rowptr[i] = xelbuf[irow];
-+	for (irow = 0; irow < temprow; ++irow, ++i)
-+	    rowptr[i] = xelbuf[irow];
- 
- 	for ( col = 0; col < cols; ++col )
-+	    {
- 	    if ( col < ccolso2 || col >= cols - ccolso2 )
--		outputrow[col] = xelbuf[(row - crowso2) % crows][col];
-+		outputrow[col] = rowptr[crowso2][col];
- 	    else
- 		{
--                switch ( PNM_FORMAT_TYPE(format) )
--                    {
--                    case PPM_TYPE:
--		    rsum = gsum = bsum = 0.0;
--		    for ( crow = 0; crow < crows; ++crow )
--			for ( ccol = 0; ccol < ccols; ++ccol )
--			    {
--			    x = xelbuf[(row+1+crow) % crows][col-ccolso2+ccol];
--			    rsum += PPM_GETR( x ) * rweights[crow][ccol];
--			    gsum += PPM_GETG( x ) * gweights[crow][ccol];
--			    bsum += PPM_GETB( x ) * bweights[crow][ccol];
--			    }
--		    if ( rsum < 0.0 ) r = 0;
--		    else if ( rsum > maxval ) r = maxval;
--		    else r = rsum + 0.5;
--		    if ( gsum < 0.0 ) g = 0;
--		    else if ( gsum > maxval ) g = maxval;
--		    else g = gsum + 0.5;
--		    if ( bsum < 0.0 ) b = 0;
--		    else if ( bsum > maxval ) b = maxval;
--		    else b = bsum + 0.5;
--		    PPM_ASSIGN( outputrow[col], r, g, b );
--                    break;
--
--                    default:
--		    gsum = 0.0;
--		    for ( crow = 0; crow < crows; ++crow )
--			for ( ccol = 0; ccol < ccols; ++ccol )
--			    {
--			    x = xelbuf[(row+1+crow) % crows][col-ccolso2+ccol];
--			    gsum += PNM_GET1( x ) * gweights[crow][ccol];
--			    }
--		    if ( gsum < 0.0 ) g = 0;
--		    else if ( gsum > maxval ) g = maxval;
--		    else g = gsum + 0.5;
-+		leftcol = col - ccolso2;
-+		gsum = 0.0;
-+		for ( crow = 0; crow < crows; ++crow )
-+		    {
-+		    temprptr = rowptr[crow] + leftcol;
-+		    for ( ccol = 0; ccol < ccols; ++ccol )
-+			gsum += PNM_GET1( *(temprptr + ccol) )
-+			    * gweights[crow][ccol];
-+		    }
-+		    tempgsum = gsum + 0.5;
-+		    CHECK_GRAY;
- 		    PNM_ASSIGN1( outputrow[col], g );
--                    break;
--                    }
- 		}
-+	    }
-+	pnm_writepnmrow( stdout, outputrow, cols, maxval, newformat, 0 );
-+	}
-+
-+    /* Now write out the remaining unconvolved rows in xelbuf. */
-+    for ( irow = crowso2 + 1; irow < crows; ++irow )
-+	pnm_writepnmrow(
-+            stdout, rowptr[irow], cols, maxval, newformat, 0 );
-+
-+    pm_close( stdout );
-+    }
-+
-+
-+/* PGM Mean Convolution
-+**
-+** This is the common case where you just want the target pixel replaced with
-+** the average value of its neighbors.  This can work much faster than the
-+** general case because you can reduce the number of floating point operations
-+** that are required since all the weights are the same.  You will only need
-+** to multiply by the weight once, not for every pixel in the convolution
-+** matrix.
-+**
-+** This algorithm works by creating sums for each column of crows height for
-+** the whole width of the image.  Then add ccols column sums together to obtain
-+** the total sum of the neighbors and multiply that sum by the weight.  As you
-+** move right to left to calculate the next pixel, take the total sum you just
-+** generated, add in the value of the next column and subtract the value of the
-+** leftmost column.  Multiply that by the weight and that's it.  As you move
-+** down a row, calculate new column sums by using previous sum for that column
-+** and adding in pixel on current row and subtracting pixel in top row.
-+**
-+*/
-+
-+
-+static void
-+pgm_mean_convolve()
-+    {
-+    register int ccol, col;
-+    xel** xelbuf;
-+    xel* outputrow;
-+    xelval g;
-+    int row, crow;
-+    xel **rowptr, *temprptr;
-+    int leftcol;
-+    int i, irow;
-+    int toprow, temprow;
-+    int subrow, addrow;
-+    int subcol, addcol;
-+    long gisum;
-+    int tempcol, crowsp1;
-+    long tempgsum;
-+    long *gcolumnsum;
-+
-+    /* Allocate space for one convolution-matrix's worth of rows, plus
-+    ** a row output buffer.  MEAN uses an extra row. */
-+    xelbuf = pnm_allocarray( cols, crows + 1 );
-+    outputrow = pnm_allocrow( cols );
-+
-+    /* Allocate array of pointers to xelbuf. MEAN uses an extra row. */
-+    rowptr = (xel **) pnm_allocarray( 1, crows + 1);
-+
-+    /* Allocate space for intermediate column sums */
-+    gcolumnsum = (long *) pm_allocrow( cols, sizeof(long) );
-+    for ( col = 0; col < cols; ++col )
-+	gcolumnsum[col] = 0L;
-+
-+    pnm_writepnminit( stdout, cols, rows, maxval, newformat, 0 );
-+
-+    /* Read in one convolution-matrix's worth of image, less one row. */
-+    for ( row = 0; row < crows - 1; ++row )
-+	{
-+	pnm_readpnmrow( ifp, xelbuf[row], cols, maxval, format );
-+	if ( PNM_FORMAT_TYPE(format) != newformat )
-+	    pnm_promoteformatrow(
-+		xelbuf[row], cols, maxval, format, maxval, newformat );
-+	/* Write out just the part we're not going to convolve. */
-+	if ( row < crowso2 )
-+	    pnm_writepnmrow( stdout, xelbuf[row], cols, maxval, newformat, 0 );
-+	}
-+
-+    /* Do first real row only */
-+    subrow = crows;
-+    addrow = crows - 1;
-+    toprow = row + 1;
-+    temprow = row % crows;
-+    pnm_readpnmrow( ifp, xelbuf[temprow], cols, maxval, format );
-+    if ( PNM_FORMAT_TYPE(format) != newformat )
-+	pnm_promoteformatrow(
-+	    xelbuf[temprow], cols, maxval, format, maxval, newformat );
-+
-+    temprow = toprow % crows;
-+    i = 0;
-+    for (irow = temprow; irow < crows; ++i, ++irow)
-+	rowptr[i] = xelbuf[irow];
-+    for (irow = 0; irow < temprow; ++irow, ++i)
-+	rowptr[i] = xelbuf[irow];
-+
-+    gisum = 0L;
-+    for ( col = 0; col < cols; ++col )
-+	{
-+	if ( col < ccolso2 || col >= cols - ccolso2 )
-+	    outputrow[col] = rowptr[crowso2][col];
-+	else if ( col == ccolso2 )
-+	    {
-+	    leftcol = col - ccolso2;
-+	    for ( crow = 0; crow < crows; ++crow )
-+		{
-+		temprptr = rowptr[crow] + leftcol;
-+		for ( ccol = 0; ccol < ccols; ++ccol )
-+		    gcolumnsum[leftcol + ccol] += 
-+			PNM_GET1( *(temprptr + ccol) );
-+		}
-+	    for ( ccol = 0; ccol < ccols; ++ccol)
-+		gisum += gcolumnsum[leftcol + ccol];
-+	    tempgsum = (float) gisum * gmeanweight + 0.5;
-+	    CHECK_GRAY;
-+	    PNM_ASSIGN1( outputrow[col], g );
-+	    }
-+	else
-+	    {
-+	    /* Column numbers to subtract or add to isum */
-+	    subcol = col - ccolso2 - 1;
-+	    addcol = col + ccolso2;  
-+	    for ( crow = 0; crow < crows; ++crow )
-+		gcolumnsum[addcol] += PNM_GET1( rowptr[crow][addcol] );
-+	    gisum = gisum - gcolumnsum[subcol] + gcolumnsum[addcol];
-+	    tempgsum = (float) gisum * gmeanweight + 0.5;
-+	    CHECK_GRAY;
-+	    PNM_ASSIGN1( outputrow[col], g );
-+	    }
-+	}
-+    pnm_writepnmrow( stdout, outputrow, cols, maxval, newformat, 0 );
- 
-+    ++row;
-+    /* For all subsequent rows do it this way as the columnsums have been
-+    ** generated.  Now we can use them to reduce further calculations.
-+    */
-+    crowsp1 = crows + 1;
-+    for ( ; row < rows; ++row )
-+	{
-+	toprow = row + 1;
-+	temprow = row % (crows + 1);
-+	pnm_readpnmrow( ifp, xelbuf[temprow], cols, maxval, format );
-+	if ( PNM_FORMAT_TYPE(format) != newformat )
-+	    pnm_promoteformatrow(
-+		xelbuf[temprow], cols, maxval, format, maxval, newformat );
-+
-+	/* This rearrangement using crows+1 rowptrs and xelbufs will cause
-+	** rowptr[0..crows-1] to always hold active xelbufs and for 
-+	** rowptr[crows] to always hold the oldest (top most) xelbuf.
-+	*/
-+	temprow = (toprow + 1) % crowsp1;
-+	i = 0;
-+	for (irow = temprow; irow < crowsp1; ++i, ++irow)
-+	    rowptr[i] = xelbuf[irow];
-+	for (irow = 0; irow < temprow; ++irow, ++i)
-+	    rowptr[i] = xelbuf[irow];
-+
-+	gisum = 0L;
-+	for ( col = 0; col < cols; ++col )
-+	    {
-+	    if ( col < ccolso2 || col >= cols - ccolso2 )
-+		outputrow[col] = rowptr[crowso2][col];
-+	    else if ( col == ccolso2 )
-+		{
-+		leftcol = col - ccolso2;
-+		for ( ccol = 0; ccol < ccols; ++ccol )
-+		    {
-+		    tempcol = leftcol + ccol;
-+		    gcolumnsum[tempcol] = gcolumnsum[tempcol]
-+			- PNM_GET1( rowptr[subrow][ccol] )
-+			+ PNM_GET1( rowptr[addrow][ccol] );
-+		    gisum += gcolumnsum[tempcol];
-+		    }
-+		tempgsum = (float) gisum * gmeanweight + 0.5;
-+		CHECK_GRAY;
-+		PNM_ASSIGN1( outputrow[col], g );
-+		}
-+	    else
-+		{
-+		/* Column numbers to subtract or add to isum */
-+		subcol = col - ccolso2 - 1;
-+		addcol = col + ccolso2;  
-+		gcolumnsum[addcol] = gcolumnsum[addcol]
-+		    - PNM_GET1( rowptr[subrow][addcol] )
-+		    + PNM_GET1( rowptr[addrow][addcol] );
-+		gisum = gisum - gcolumnsum[subcol] + gcolumnsum[addcol];
-+		tempgsum = (float) gisum * gmeanweight + 0.5;
-+		CHECK_GRAY;
-+		PNM_ASSIGN1( outputrow[col], g );
-+		}
-+	    }
- 	pnm_writepnmrow( stdout, outputrow, cols, maxval, newformat, 0 );
- 	}
--    pm_close( ifp );
- 
-     /* Now write out the remaining unconvolved rows in xelbuf. */
--    for ( ; row < rows + crowso2; ++row )
-+    for ( irow = crowso2 + 1; irow < crows; ++irow )
- 	pnm_writepnmrow(
--            stdout, xelbuf[(row-crowso2) % crows], cols, maxval, newformat, 0 );
-+            stdout, rowptr[irow], cols, maxval, newformat, 0 );
-+
-+    pm_close( stdout );
-+    }
-+
-+
-+/* PGM Horizontal Convolution
-+**
-+** Similar idea to using columnsums of the Mean and Vertical convolution,
-+** but uses temporary sums of row values.  Need to multiply by weights crows
-+** number of times.  Each time a new line is started, must recalculate the
-+** initials rowsums for the newest row only.  Uses queue to still access
-+** previous row sums.
-+**
-+*/
-+
-+static void
-+pgm_horizontal_convolve()
-+    {
-+    register int ccol, col;
-+    xel** xelbuf;
-+    xel* outputrow;
-+    xel x;
-+    xelval g;
-+    int row, crow;
-+    xel **rowptr, *temprptr;
-+    int leftcol;
-+    int i, irow;
-+    int temprow;
-+    int subcol, addcol;
-+    float gsum;
-+    int addrow, subrow;
-+    long **growsum, **growsumptr;
-+    int crowsp1;
-+    long tempgsum;
-+
-+    /* Allocate space for one convolution-matrix's worth of rows, plus
-+    ** a row output buffer. */
-+    xelbuf = pnm_allocarray( cols, crows + 1 );
-+    outputrow = pnm_allocrow( cols );
-+
-+    /* Allocate array of pointers to xelbuf */
-+    rowptr = (xel **) pnm_allocarray( 1, crows + 1);
-+
-+    /* Allocate intermediate row sums.  HORIZONTAL uses an extra row. */
-+    /* crows current rows and 1 extra for newest added row.           */
-+    growsum = (long **) pm_allocarray( cols, crows + 1, sizeof(long) );
-+    growsumptr = (long **) pnm_allocarray( 1, crows + 1);
-+
-+    pnm_writepnminit( stdout, cols, rows, maxval, newformat, 0 );
-+
-+    /* Read in one convolution-matrix's worth of image, less one row. */
-+    for ( row = 0; row < crows - 1; ++row )
-+	{
-+	pnm_readpnmrow( ifp, xelbuf[row], cols, maxval, format );
-+	if ( PNM_FORMAT_TYPE(format) != newformat )
-+	    pnm_promoteformatrow(
-+		xelbuf[row], cols, maxval, format, maxval, newformat );
-+	/* Write out just the part we're not going to convolve. */
-+	if ( row < crowso2 )
-+	    pnm_writepnmrow( stdout, xelbuf[row], cols, maxval, newformat, 0 );
-+	}
-+
-+    /* First row only */
-+    temprow = row % crows;
-+    pnm_readpnmrow( ifp, xelbuf[temprow], cols, maxval, format );
-+    if ( PNM_FORMAT_TYPE(format) != newformat )
-+	pnm_promoteformatrow(
-+	    xelbuf[temprow], cols, maxval, format, maxval, newformat );
-+
-+    temprow = (row + 1) % crows;
-+    i = 0;
-+    for (irow = temprow; irow < crows; ++i, ++irow)
-+	rowptr[i] = xelbuf[irow];
-+    for (irow = 0; irow < temprow; ++irow, ++i)
-+	rowptr[i] = xelbuf[irow];
-+
-+    for ( crow = 0; crow < crows; ++crow )
-+	growsumptr[crow] = growsum[crow];
-+ 
-+    for ( col = 0; col < cols; ++col )
-+	{
-+	if ( col < ccolso2 || col >= cols - ccolso2 )
-+	    outputrow[col] = rowptr[crowso2][col];
-+	else if ( col == ccolso2 )
-+	    {
-+	    leftcol = col - ccolso2;
-+	    gsum = 0.0;
-+	    for ( crow = 0; crow < crows; ++crow )
-+		{
-+		temprptr = rowptr[crow] + leftcol;
-+		growsumptr[crow][leftcol] = 0L;
-+		for ( ccol = 0; ccol < ccols; ++ccol )
-+		    growsumptr[crow][leftcol] += 
-+		        PNM_GET1( *(temprptr + ccol) );
-+		gsum += growsumptr[crow][leftcol] * gweights[crow][0];
-+		}
-+	    tempgsum = gsum + 0.5;
-+	    CHECK_GRAY;
-+	    PNM_ASSIGN1( outputrow[col], g );
-+	    }
-+	else
-+	    {
-+	    gsum = 0.0;
-+	    leftcol = col - ccolso2;
-+	    subcol = col - ccolso2 - 1;
-+	    addcol = col + ccolso2;
-+	    for ( crow = 0; crow < crows; ++crow )
-+		{
-+		growsumptr[crow][leftcol] = growsumptr[crow][subcol]
-+		    - PNM_GET1( rowptr[crow][subcol] )
-+		    + PNM_GET1( rowptr[crow][addcol] );
-+		gsum += growsumptr[crow][leftcol] * gweights[crow][0];
-+		}
-+	    tempgsum = gsum + 0.5;
-+	    CHECK_GRAY;
-+	    PNM_ASSIGN1( outputrow[col], g );
-+	    }
-+        }
-+    pnm_writepnmrow( stdout, outputrow, cols, maxval, newformat, 0 );
-+
-+
-+    /* For all subsequent rows */
-+
-+    subrow = crows;
-+    addrow = crows - 1;
-+    crowsp1 = crows + 1;
-+    ++row;
-+    for ( ; row < rows; ++row )
-+	{
-+	temprow = row % crowsp1;
-+	pnm_readpnmrow( ifp, xelbuf[temprow], cols, maxval, format );
-+	if ( PNM_FORMAT_TYPE(format) != newformat )
-+	    pnm_promoteformatrow(
-+		xelbuf[temprow], cols, maxval, format, maxval, newformat );
-+
-+	temprow = (row + 2) % crowsp1;
-+	i = 0;
-+	for (irow = temprow; irow < crowsp1; ++i, ++irow)
-+	    {
-+	    rowptr[i] = xelbuf[irow];
-+	    growsumptr[i] = growsum[irow];
-+	    }
-+	for (irow = 0; irow < temprow; ++irow, ++i)
-+	    {
-+	    rowptr[i] = xelbuf[irow];
-+	    growsumptr[i] = growsum[irow];
-+	    }
-+
-+	for ( col = 0; col < cols; ++col )
-+	    {
-+	    if ( col < ccolso2 || col >= cols - ccolso2 )
-+		outputrow[col] = rowptr[crowso2][col];
-+	    else if ( col == ccolso2 )
-+		{
-+		gsum = 0.0;
-+		leftcol = col - ccolso2;
-+		growsumptr[addrow][leftcol] = 0L;
-+		for ( ccol = 0; ccol < ccols; ++ccol )
-+		    growsumptr[addrow][leftcol] += 
-+			PNM_GET1( rowptr[addrow][leftcol + ccol] );
-+		for ( crow = 0; crow < crows; ++crow )
-+		    gsum += growsumptr[crow][leftcol] * gweights[crow][0];
-+		tempgsum = gsum + 0.5;
-+		CHECK_GRAY;
-+		PNM_ASSIGN1( outputrow[col], g );
-+		}
-+	    else
-+		{
-+		gsum = 0.0;
-+		leftcol = col - ccolso2;
-+		subcol = col - ccolso2 - 1;
-+		addcol = col + ccolso2;  
-+		growsumptr[addrow][leftcol] = growsumptr[addrow][subcol]
-+		    - PNM_GET1( rowptr[addrow][subcol] )
-+		    + PNM_GET1( rowptr[addrow][addcol] );
-+		for ( crow = 0; crow < crows; ++crow )
-+		    gsum += growsumptr[crow][leftcol] * gweights[crow][0];
-+		tempgsum = gsum + 0.5;
-+		CHECK_GRAY;
-+		PNM_ASSIGN1( outputrow[col], g );
-+		}
-+	    }
-+	pnm_writepnmrow( stdout, outputrow, cols, maxval, newformat, 0 );
-+	}
-+
-+    /* Now write out the remaining unconvolved rows in xelbuf. */
-+    for ( irow = crowso2 + 1; irow < crows; ++irow )
-+	pnm_writepnmrow(
-+            stdout, rowptr[irow], cols, maxval, newformat, 0 );
-+
-+    pm_close( stdout );
-+    }
-+
-+
-+/* PGM Vertical Convolution
-+**
-+** Uses column sums as in Mean Convolution.
-+**
-+*/
-+
-+
-+static void
-+pgm_vertical_convolve()
-+    {
-+    register int ccol, col;
-+    xel** xelbuf;
-+    xel* outputrow;
-+    xelval g;
-+    int row, crow;
-+    xel **rowptr, *temprptr;
-+    int leftcol;
-+    int i, irow;
-+    int toprow, temprow;
-+    int subrow, addrow;
-+    int tempcol;
-+    float gsum;
-+    long *gcolumnsum;
-+    int crowsp1;
-+    int addcol;
-+    long tempgsum;
-+
-+    /* Allocate space for one convolution-matrix's worth of rows, plus
-+    ** a row output buffer. VERTICAL uses an extra row. */
-+    xelbuf = pnm_allocarray( cols, crows + 1 );
-+    outputrow = pnm_allocrow( cols );
-+
-+    /* Allocate array of pointers to xelbuf */
-+    rowptr = (xel **) pnm_allocarray( 1, crows + 1 );
-+
-+    /* Allocate space for intermediate column sums */
-+    gcolumnsum = (long *) pm_allocrow( cols, sizeof(long) );
-+    for ( col = 0; col < cols; ++col )
-+	gcolumnsum[col] = 0L;
-+
-+    pnm_writepnminit( stdout, cols, rows, maxval, newformat, 0 );
-+
-+    /* Read in one convolution-matrix's worth of image, less one row. */
-+    for ( row = 0; row < crows - 1; ++row )
-+	{
-+	pnm_readpnmrow( ifp, xelbuf[row], cols, maxval, format );
-+	if ( PNM_FORMAT_TYPE(format) != newformat )
-+	    pnm_promoteformatrow(
-+		xelbuf[row], cols, maxval, format, maxval, newformat );
-+	/* Write out just the part we're not going to convolve. */
-+	if ( row < crowso2 )
-+	    pnm_writepnmrow( stdout, xelbuf[row], cols, maxval, newformat, 0 );
-+	}
-+
-+    /* Now the rest of the image - read in the row at the end of
-+    ** xelbuf, and convolve and write out the row in the middle.
-+    */
-+    /* For first row only */
-+
-+    toprow = row + 1;
-+    temprow = row % crows;
-+    pnm_readpnmrow( ifp, xelbuf[temprow], cols, maxval, format );
-+    if ( PNM_FORMAT_TYPE(format) != newformat )
-+	pnm_promoteformatrow(
-+	    xelbuf[temprow], cols, maxval, format, maxval, newformat );
-+
-+    /* Arrange rowptr to eliminate the use of mod function to determine
-+    ** which row of xelbuf is 0...crows.  Mod function can be very costly.
-+    */
-+    temprow = toprow % crows;
-+    i = 0;
-+    for (irow = temprow; irow < crows; ++i, ++irow)
-+	rowptr[i] = xelbuf[irow];
-+    for (irow = 0; irow < temprow; ++irow, ++i)
-+	rowptr[i] = xelbuf[irow];
-+
-+    for ( col = 0; col < cols; ++col )
-+	{
-+	if ( col < ccolso2 || col >= cols - ccolso2 )
-+	    outputrow[col] = rowptr[crowso2][col];
-+	else if ( col == ccolso2 )
-+	    {
-+	    gsum = 0.0;
-+	    leftcol = col - ccolso2;
-+	    for ( crow = 0; crow < crows; ++crow )
-+		{
-+		temprptr = rowptr[crow] + leftcol;
-+		for ( ccol = 0; ccol < ccols; ++ccol )
-+		    gcolumnsum[leftcol + ccol] += 
-+			PNM_GET1( *(temprptr + ccol) );
-+		}
-+	    for ( ccol = 0; ccol < ccols; ++ccol)
-+		gsum += gcolumnsum[leftcol + ccol] * gweights[0][ccol];
-+	    tempgsum = gsum + 0.5;
-+	    CHECK_GRAY;
-+	    PNM_ASSIGN1( outputrow[col], g );
-+	    }
-+	else
-+	    {
-+	    gsum = 0.0;
-+	    leftcol = col - ccolso2;
-+	    addcol = col + ccolso2;  
-+	    for ( crow = 0; crow < crows; ++crow )
-+		gcolumnsum[addcol] += PNM_GET1( rowptr[crow][addcol] );
-+	    for ( ccol = 0; ccol < ccols; ++ccol )
-+		gsum += gcolumnsum[leftcol + ccol] * gweights[0][ccol];
-+	    tempgsum = gsum + 0.5;
-+	    CHECK_GRAY;
-+	    PNM_ASSIGN1( outputrow[col], g );
-+	    }
-+	}
-+    pnm_writepnmrow( stdout, outputrow, cols, maxval, newformat, 0 );
-+
-+    /* For all subsequent rows */
-+    subrow = crows;
-+    addrow = crows - 1;
-+    crowsp1 = crows + 1;
-+    ++row;
-+    for ( ; row < rows; ++row )
-+	{
-+	toprow = row + 1;
-+	temprow = row % (crows +1);
-+	pnm_readpnmrow( ifp, xelbuf[temprow], cols, maxval, format );
-+	if ( PNM_FORMAT_TYPE(format) != newformat )
-+	    pnm_promoteformatrow(
-+		xelbuf[temprow], cols, maxval, format, maxval, newformat );
-+
-+	/* Arrange rowptr to eliminate the use of mod function to determine
-+	** which row of xelbuf is 0...crows.  Mod function can be very costly.
-+	*/
-+	temprow = (toprow + 1) % crowsp1;
-+	i = 0;
-+	for (irow = temprow; irow < crowsp1; ++i, ++irow)
-+	    rowptr[i] = xelbuf[irow];
-+	for (irow = 0; irow < temprow; ++irow, ++i)
-+	    rowptr[i] = xelbuf[irow];
-+
-+	for ( col = 0; col < cols; ++col )
-+	    {
-+	    if ( col < ccolso2 || col >= cols - ccolso2 )
-+		outputrow[col] = rowptr[crowso2][col];
-+	    else if ( col == ccolso2 )
-+		{
-+		gsum = 0.0;
-+		leftcol = col - ccolso2;
-+		for ( ccol = 0; ccol < ccols; ++ccol )
-+		    {
-+		    tempcol = leftcol + ccol;
-+		    gcolumnsum[tempcol] = gcolumnsum[tempcol] 
-+			- PNM_GET1( rowptr[subrow][ccol] )
-+			+ PNM_GET1( rowptr[addrow][ccol] );
-+		    gsum = gsum + gcolumnsum[tempcol] * gweights[0][ccol];
-+		    }
-+		tempgsum = gsum + 0.5;
-+		CHECK_GRAY;
-+		PNM_ASSIGN1( outputrow[col], g );
-+		}
-+	    else
-+		{
-+		gsum = 0.0;
-+		leftcol = col - ccolso2;
-+		addcol = col + ccolso2;
-+		gcolumnsum[addcol] = gcolumnsum[addcol]
-+		    - PNM_GET1( rowptr[subrow][addcol] )
-+		    + PNM_GET1( rowptr[addrow][addcol] );
-+		for ( ccol = 0; ccol < ccols; ++ccol )
-+		    gsum += gcolumnsum[leftcol + ccol] * gweights[0][ccol];
-+		tempgsum = gsum + 0.5;
-+		CHECK_GRAY;
-+		PNM_ASSIGN1( outputrow[col], g );
-+		}
-+	    }
-+	pnm_writepnmrow( stdout, outputrow, cols, maxval, newformat, 0 );
-+	}
-+
-+    /* Now write out the remaining unconvolved rows in xelbuf. */
-+    for ( irow = crowso2 + 1; irow < crows; ++irow )
-+	pnm_writepnmrow(
-+            stdout, rowptr[irow], cols, maxval, newformat, 0 );
-+
-+    pm_close( stdout );
-+    }
-+
-+
-+
-+
-+/* PPM General Convolution Algorithm
-+**
-+** No redundancy in convolution matrix.  Just use brute force.
-+** See pgm_general_convolve() for more details.
-+*/
-+
-+static void
-+ppm_general_convolve()
-+    {
-+    register int ccol, col;
-+    xel** xelbuf;
-+    xel* outputrow;
-+    xel x, y;
-+    xelval r, g, b;
-+    int row, crow;
-+    float rsum, gsum, bsum;
-+    xel **rowptr, *temprptr;
-+    int toprow, temprow;
-+    int i, irow;
-+    int leftcol;
-+    long temprsum, tempgsum, tempbsum;
-+
-+    /* Allocate space for one convolution-matrix's worth of rows, plus
-+    ** a row output buffer. */
-+    xelbuf = pnm_allocarray( cols, crows );
-+    outputrow = pnm_allocrow( cols );
-+
-+    /* Allocate array of pointers to xelbuf */
-+    rowptr = (xel **) pnm_allocarray( 1, crows );
-+
-+    pnm_writepnminit( stdout, cols, rows, maxval, newformat, 0 );
-+
-+    /* Read in one convolution-matrix's worth of image, less one row. */
-+    for ( row = 0; row < crows - 1; ++row )
-+	{
-+	pnm_readpnmrow( ifp, xelbuf[row], cols, maxval, format );
-+	if ( PNM_FORMAT_TYPE(format) != newformat )
-+	    pnm_promoteformatrow(
-+		xelbuf[row], cols, maxval, format, maxval, newformat );
-+	/* Write out just the part we're not going to convolve. */
-+	if ( row < crowso2 )
-+	    pnm_writepnmrow( stdout, xelbuf[row], cols, maxval, newformat, 0 );
-+	}
-+
-+    /* Now the rest of the image - read in the row at the end of
-+    ** xelbuf, and convolve and write out the row in the middle.
-+    */
-+    for ( ; row < rows; ++row )
-+	{
-+	toprow = row + 1;
-+	temprow = row % crows;
-+	pnm_readpnmrow( ifp, xelbuf[temprow], cols, maxval, format );
-+	if ( PNM_FORMAT_TYPE(format) != newformat )
-+	    pnm_promoteformatrow(
-+		xelbuf[temprow], cols, maxval, format, maxval, newformat );
-+
-+	/* Arrange rowptr to eliminate the use of mod function to determine
-+	** which row of xelbuf is 0...crows.  Mod function can be very costly.
-+	*/
-+	temprow = toprow % crows;
-+	i = 0;
-+	for (irow = temprow; irow < crows; ++i, ++irow)
-+	    rowptr[i] = xelbuf[irow];
-+	for (irow = 0; irow < temprow; ++irow, ++i)
-+	    rowptr[i] = xelbuf[irow];
-+
-+	for ( col = 0; col < cols; ++col )
-+	    {
-+	    if ( col < ccolso2 || col >= cols - ccolso2 )
-+		outputrow[col] = rowptr[crowso2][col];
-+	    else
-+		{
-+		leftcol = col - ccolso2;
-+		rsum = gsum = bsum = 0.0;
-+		for ( crow = 0; crow < crows; ++crow )
-+		    {
-+		    temprptr = rowptr[crow] + leftcol;
-+		    for ( ccol = 0; ccol < ccols; ++ccol )
-+			{
-+			rsum += PPM_GETR( *(temprptr + ccol) )
-+			    * rweights[crow][ccol];
-+			gsum += PPM_GETG( *(temprptr + ccol) )
-+			    * gweights[crow][ccol];
-+			bsum += PPM_GETB( *(temprptr + ccol) )
-+			    * bweights[crow][ccol];
-+			}
-+		    }
-+		    temprsum = rsum + 0.5;
-+		    tempgsum = gsum + 0.5;
-+		    tempbsum = bsum + 0.5;
-+		    CHECK_RED;
-+		    CHECK_GREEN;
-+		    CHECK_BLUE;
-+		    PPM_ASSIGN( outputrow[col], r, g, b );
-+		}
-+	    }
-+	pnm_writepnmrow( stdout, outputrow, cols, maxval, newformat, 0 );
-+	}
-+
-+    /* Now write out the remaining unconvolved rows in xelbuf. */
-+    for ( irow = crowso2 + 1; irow < crows; ++irow )
-+	pnm_writepnmrow(
-+            stdout, rowptr[irow], cols, maxval, newformat, 0 );
-+
-+    pm_close( stdout );
-+    }
-+
-+
-+/* PPM Mean Convolution
-+**
-+** Same as pgm_mean_convolve() but for PPM.
-+**
-+*/
-+
-+static void
-+ppm_mean_convolve()
-+    {
-+    register int ccol, col;
-+    xel** xelbuf;
-+    xel* outputrow;
-+    xelval r, g, b;
-+    int row, crow;
-+    xel **rowptr, *temprptr;
-+    int leftcol;
-+    int i, irow;
-+    int toprow, temprow;
-+    int subrow, addrow;
-+    int subcol, addcol;
-+    long risum, gisum, bisum;
-+    float rsum, gsum, bsum;
-+    long temprsum, tempgsum, tempbsum;
-+    int tempcol, crowsp1;
-+    long *rcolumnsum, *gcolumnsum, *bcolumnsum;
-+
-+    /* Allocate space for one convolution-matrix's worth of rows, plus
-+    ** a row output buffer.  MEAN uses an extra row. */
-+    xelbuf = pnm_allocarray( cols, crows + 1 );
-+    outputrow = pnm_allocrow( cols );
-+
-+    /* Allocate array of pointers to xelbuf. MEAN uses an extra row. */
-+    rowptr = (xel **) pnm_allocarray( 1, crows + 1);
-+
-+    /* Allocate space for intermediate column sums */
-+    rcolumnsum = (long *) pm_allocrow( cols, sizeof(long) );
-+    gcolumnsum = (long *) pm_allocrow( cols, sizeof(long) );
-+    bcolumnsum = (long *) pm_allocrow( cols, sizeof(long) );
-+    for ( col = 0; col < cols; ++col )
-+	{
-+	rcolumnsum[col] = 0L;
-+	gcolumnsum[col] = 0L;
-+	bcolumnsum[col] = 0L;
-+	}
-+
-+    pnm_writepnminit( stdout, cols, rows, maxval, newformat, 0 );
-+
-+    /* Read in one convolution-matrix's worth of image, less one row. */
-+    for ( row = 0; row < crows - 1; ++row )
-+	{
-+	pnm_readpnmrow( ifp, xelbuf[row], cols, maxval, format );
-+	if ( PNM_FORMAT_TYPE(format) != newformat )
-+	    pnm_promoteformatrow(
-+		xelbuf[row], cols, maxval, format, maxval, newformat );
-+	/* Write out just the part we're not going to convolve. */
-+	if ( row < crowso2 )
-+	    pnm_writepnmrow( stdout, xelbuf[row], cols, maxval, newformat, 0 );
-+	}
-+
-+    /* Do first real row only */
-+    subrow = crows;
-+    addrow = crows - 1;
-+    toprow = row + 1;
-+    temprow = row % crows;
-+    pnm_readpnmrow( ifp, xelbuf[temprow], cols, maxval, format );
-+    if ( PNM_FORMAT_TYPE(format) != newformat )
-+	pnm_promoteformatrow(
-+	    xelbuf[temprow], cols, maxval, format, maxval, newformat );
-+
-+    temprow = toprow % crows;
-+    i = 0;
-+    for (irow = temprow; irow < crows; ++i, ++irow)
-+	rowptr[i] = xelbuf[irow];
-+    for (irow = 0; irow < temprow; ++irow, ++i)
-+	rowptr[i] = xelbuf[irow];
-+
-+    risum = 0L;
-+    gisum = 0L;
-+    bisum = 0L;
-+    for ( col = 0; col < cols; ++col )
-+	{
-+	if ( col < ccolso2 || col >= cols - ccolso2 )
-+	    outputrow[col] = rowptr[crowso2][col];
-+	else if ( col == ccolso2 )
-+	    {
-+	    leftcol = col - ccolso2;
-+	    for ( crow = 0; crow < crows; ++crow )
-+		{
-+		temprptr = rowptr[crow] + leftcol;
-+		for ( ccol = 0; ccol < ccols; ++ccol )
-+		    {
-+		    rcolumnsum[leftcol + ccol] += 
-+			PPM_GETR( *(temprptr + ccol) );
-+		    gcolumnsum[leftcol + ccol] += 
-+			PPM_GETG( *(temprptr + ccol) );
-+		    bcolumnsum[leftcol + ccol] += 
-+			PPM_GETB( *(temprptr + ccol) );
-+		    }
-+		}
-+	    for ( ccol = 0; ccol < ccols; ++ccol)
-+		{
-+		risum += rcolumnsum[leftcol + ccol];
-+		gisum += gcolumnsum[leftcol + ccol];
-+		bisum += bcolumnsum[leftcol + ccol];
-+		}
-+	    temprsum = (float) risum * rmeanweight + 0.5;
-+	    tempgsum = (float) gisum * gmeanweight + 0.5;
-+	    tempbsum = (float) bisum * bmeanweight + 0.5;
-+	    CHECK_RED;
-+	    CHECK_GREEN;
-+	    CHECK_BLUE;
-+	    PPM_ASSIGN( outputrow[col], r, g, b );
-+	    }
-+	else
-+	    {
-+	    /* Column numbers to subtract or add to isum */
-+	    subcol = col - ccolso2 - 1;
-+	    addcol = col + ccolso2;  
-+	    for ( crow = 0; crow < crows; ++crow )
-+		{
-+		rcolumnsum[addcol] += PPM_GETR( rowptr[crow][addcol] );
-+		gcolumnsum[addcol] += PPM_GETG( rowptr[crow][addcol] );
-+		bcolumnsum[addcol] += PPM_GETB( rowptr[crow][addcol] );
-+		}
-+	    risum = risum - rcolumnsum[subcol] + rcolumnsum[addcol];
-+	    gisum = gisum - gcolumnsum[subcol] + gcolumnsum[addcol];
-+	    bisum = bisum - bcolumnsum[subcol] + bcolumnsum[addcol];
-+	    temprsum = (float) risum * rmeanweight + 0.5;
-+	    tempgsum = (float) gisum * gmeanweight + 0.5;
-+	    tempbsum = (float) bisum * bmeanweight + 0.5;
-+	    CHECK_RED;
-+	    CHECK_GREEN;
-+	    CHECK_BLUE;
-+	    PPM_ASSIGN( outputrow[col], r, g, b );
-+	    }
-+	}
-+    pnm_writepnmrow( stdout, outputrow, cols, maxval, newformat, 0 );
-+
-+    ++row;
-+    /* For all subsequent rows do it this way as the columnsums have been
-+    ** generated.  Now we can use them to reduce further calculations.
-+    */
-+    crowsp1 = crows + 1;
-+    for ( ; row < rows; ++row )
-+	{
-+	toprow = row + 1;
-+	temprow = row % (crows + 1);
-+	pnm_readpnmrow( ifp, xelbuf[temprow], cols, maxval, format );
-+	if ( PNM_FORMAT_TYPE(format) != newformat )
-+	    pnm_promoteformatrow(
-+		xelbuf[temprow], cols, maxval, format, maxval, newformat );
-+
-+	/* This rearrangement using crows+1 rowptrs and xelbufs will cause
-+	** rowptr[0..crows-1] to always hold active xelbufs and for 
-+	** rowptr[crows] to always hold the oldest (top most) xelbuf.
-+	*/
-+	temprow = (toprow + 1) % crowsp1;
-+	i = 0;
-+	for (irow = temprow; irow < crowsp1; ++i, ++irow)
-+	    rowptr[i] = xelbuf[irow];
-+	for (irow = 0; irow < temprow; ++irow, ++i)
-+	    rowptr[i] = xelbuf[irow];
-+
-+	risum = 0L;
-+	gisum = 0L;
-+	bisum = 0L;
-+	for ( col = 0; col < cols; ++col )
-+	    {
-+	    if ( col < ccolso2 || col >= cols - ccolso2 )
-+		outputrow[col] = rowptr[crowso2][col];
-+	    else if ( col == ccolso2 )
-+		{
-+		leftcol = col - ccolso2;
-+		for ( ccol = 0; ccol < ccols; ++ccol )
-+		    {
-+		    tempcol = leftcol + ccol;
-+		    rcolumnsum[tempcol] = rcolumnsum[tempcol]
-+			- PPM_GETR( rowptr[subrow][ccol] )
-+			+ PPM_GETR( rowptr[addrow][ccol] );
-+		    risum += rcolumnsum[tempcol];
-+		    gcolumnsum[tempcol] = gcolumnsum[tempcol]
-+			- PPM_GETG( rowptr[subrow][ccol] )
-+			+ PPM_GETG( rowptr[addrow][ccol] );
-+		    gisum += gcolumnsum[tempcol];
-+		    bcolumnsum[tempcol] = bcolumnsum[tempcol]
-+			- PPM_GETB( rowptr[subrow][ccol] )
-+			+ PPM_GETB( rowptr[addrow][ccol] );
-+		    bisum += bcolumnsum[tempcol];
-+		    }
-+		temprsum = (float) risum * rmeanweight + 0.5;
-+		tempgsum = (float) gisum * gmeanweight + 0.5;
-+		tempbsum = (float) bisum * bmeanweight + 0.5;
-+		CHECK_RED;
-+		CHECK_GREEN;
-+		CHECK_BLUE;
-+		PPM_ASSIGN( outputrow[col], r, g, b );
-+		}
-+	    else
-+		{
-+		/* Column numbers to subtract or add to isum */
-+		subcol = col - ccolso2 - 1;
-+		addcol = col + ccolso2;  
-+		rcolumnsum[addcol] = rcolumnsum[addcol]
-+		    - PPM_GETR( rowptr[subrow][addcol] )
-+		    + PPM_GETR( rowptr[addrow][addcol] );
-+		risum = risum - rcolumnsum[subcol] + rcolumnsum[addcol];
-+		gcolumnsum[addcol] = gcolumnsum[addcol]
-+		    - PPM_GETG( rowptr[subrow][addcol] )
-+		    + PPM_GETG( rowptr[addrow][addcol] );
-+		gisum = gisum - gcolumnsum[subcol] + gcolumnsum[addcol];
-+		bcolumnsum[addcol] = bcolumnsum[addcol]
-+		    - PPM_GETB( rowptr[subrow][addcol] )
-+		    + PPM_GETB( rowptr[addrow][addcol] );
-+		bisum = bisum - bcolumnsum[subcol] + bcolumnsum[addcol];
-+		temprsum = (float) risum * rmeanweight + 0.5;
-+		tempgsum = (float) gisum * gmeanweight + 0.5;
-+		tempbsum = (float) bisum * bmeanweight + 0.5;
-+		CHECK_RED;
-+		CHECK_GREEN;
-+		CHECK_BLUE;
-+		PPM_ASSIGN( outputrow[col], r, g, b );
-+		}
-+	    }
-+	pnm_writepnmrow( stdout, outputrow, cols, maxval, newformat, 0 );
-+	}
-+
-+    /* Now write out the remaining unconvolved rows in xelbuf. */
-+    for ( irow = crowso2 + 1; irow < crows; ++irow )
-+	pnm_writepnmrow(
-+            stdout, rowptr[irow], cols, maxval, newformat, 0 );
-+
-+    pm_close( stdout );
-+    }
-+
-+
-+/* PPM Horizontal Convolution
-+**
-+** Same as pgm_horizontal_convolve()
-+**
-+**/
-+
-+static void
-+ppm_horizontal_convolve()
-+    {
-+    register int ccol, col;
-+    xel** xelbuf;
-+    xel* outputrow;
-+    xel x;
-+    xelval r, g, b;
-+    int row, crow;
-+    xel **rowptr, *temprptr;
-+    int leftcol;
-+    int i, irow;
-+    int temprow;
-+    int subcol, addcol;
-+    float rsum, gsum, bsum;
-+    int addrow, subrow;
-+    long **rrowsum, **rrowsumptr;
-+    long **growsum, **growsumptr;
-+    long **browsum, **browsumptr;
-+    int crowsp1;
-+    long temprsum, tempgsum, tempbsum;
-+
-+    /* Allocate space for one convolution-matrix's worth of rows, plus
-+    ** a row output buffer. */
-+    xelbuf = pnm_allocarray( cols, crows + 1 );
-+    outputrow = pnm_allocrow( cols );
-+
-+    /* Allocate array of pointers to xelbuf */
-+    rowptr = (xel **) pnm_allocarray( 1, crows + 1);
-+
-+    /* Allocate intermediate row sums.  HORIZONTAL uses an extra row */
-+    rrowsum = (long **) pm_allocarray( cols, crows + 1, sizeof(long) );
-+    rrowsumptr = (long **) pnm_allocarray( 1, crows + 1);
-+    growsum = (long **) pm_allocarray( cols, crows + 1, sizeof(long) );
-+    growsumptr = (long **) pnm_allocarray( 1, crows + 1);
-+    browsum = (long **) pm_allocarray( cols, crows + 1, sizeof(long) );
-+    browsumptr = (long **) pnm_allocarray( 1, crows + 1);
-+
-+    pnm_writepnminit( stdout, cols, rows, maxval, newformat, 0 );
-+
-+    /* Read in one convolution-matrix's worth of image, less one row. */
-+    for ( row = 0; row < crows - 1; ++row )
-+	{
-+	pnm_readpnmrow( ifp, xelbuf[row], cols, maxval, format );
-+	if ( PNM_FORMAT_TYPE(format) != newformat )
-+	    pnm_promoteformatrow(
-+		xelbuf[row], cols, maxval, format, maxval, newformat );
-+	/* Write out just the part we're not going to convolve. */
-+	if ( row < crowso2 )
-+	    pnm_writepnmrow( stdout, xelbuf[row], cols, maxval, newformat, 0 );
-+	}
-+
-+    /* First row only */
-+    temprow = row % crows;
-+    pnm_readpnmrow( ifp, xelbuf[temprow], cols, maxval, format );
-+    if ( PNM_FORMAT_TYPE(format) != newformat )
-+	pnm_promoteformatrow(
-+	    xelbuf[temprow], cols, maxval, format, maxval, newformat );
-+
-+    temprow = (row + 1) % crows;
-+    i = 0;
-+    for (irow = temprow; irow < crows; ++i, ++irow)
-+	rowptr[i] = xelbuf[irow];
-+    for (irow = 0; irow < temprow; ++irow, ++i)
-+	rowptr[i] = xelbuf[irow];
-+
-+    for ( crow = 0; crow < crows; ++crow )
-+	{
-+	rrowsumptr[crow] = rrowsum[crow];
-+	growsumptr[crow] = growsum[crow];
-+	browsumptr[crow] = browsum[crow];
-+	}
-+ 
-+    for ( col = 0; col < cols; ++col )
-+	{
-+	if ( col < ccolso2 || col >= cols - ccolso2 )
-+	    outputrow[col] = rowptr[crowso2][col];
-+	else if ( col == ccolso2 )
-+	    {
-+	    leftcol = col - ccolso2;
-+	    rsum = 0.0;
-+	    gsum = 0.0;
-+	    bsum = 0.0;
-+	    for ( crow = 0; crow < crows; ++crow )
-+		{
-+		temprptr = rowptr[crow] + leftcol;
-+		rrowsumptr[crow][leftcol] = 0L;
-+		growsumptr[crow][leftcol] = 0L;
-+		browsumptr[crow][leftcol] = 0L;
-+		for ( ccol = 0; ccol < ccols; ++ccol )
-+		    {
-+		    rrowsumptr[crow][leftcol] += 
-+		        PPM_GETR( *(temprptr + ccol) );
-+		    growsumptr[crow][leftcol] += 
-+		        PPM_GETG( *(temprptr + ccol) );
-+		    browsumptr[crow][leftcol] += 
-+		        PPM_GETB( *(temprptr + ccol) );
-+		    }
-+		rsum += rrowsumptr[crow][leftcol] * rweights[crow][0];
-+		gsum += growsumptr[crow][leftcol] * gweights[crow][0];
-+		bsum += browsumptr[crow][leftcol] * bweights[crow][0];
-+		}
-+	    temprsum = rsum + 0.5;
-+	    tempgsum = gsum + 0.5;
-+	    tempbsum = bsum + 0.5;
-+	    CHECK_RED;
-+	    CHECK_GREEN;
-+	    CHECK_BLUE;
-+	    PPM_ASSIGN( outputrow[col], r, g, b );
-+	    }
-+	else
-+	    {
-+	    rsum = 0.0;
-+	    gsum = 0.0;
-+	    bsum = 0.0;
-+	    leftcol = col - ccolso2;
-+	    subcol = col - ccolso2 - 1;
-+	    addcol = col + ccolso2;
-+	    for ( crow = 0; crow < crows; ++crow )
-+		{
-+		rrowsumptr[crow][leftcol] = rrowsumptr[crow][subcol]
-+		    - PPM_GETR( rowptr[crow][subcol] )
-+		    + PPM_GETR( rowptr[crow][addcol] );
-+		rsum += rrowsumptr[crow][leftcol] * rweights[crow][0];
-+		growsumptr[crow][leftcol] = growsumptr[crow][subcol]
-+		    - PPM_GETG( rowptr[crow][subcol] )
-+		    + PPM_GETG( rowptr[crow][addcol] );
-+		gsum += growsumptr[crow][leftcol] * gweights[crow][0];
-+		browsumptr[crow][leftcol] = browsumptr[crow][subcol]
-+		    - PPM_GETB( rowptr[crow][subcol] )
-+		    + PPM_GETB( rowptr[crow][addcol] );
-+		bsum += browsumptr[crow][leftcol] * bweights[crow][0];
-+		}
-+	    temprsum = rsum + 0.5;
-+	    tempgsum = gsum + 0.5;
-+	    tempbsum = bsum + 0.5;
-+	    CHECK_RED;
-+	    CHECK_GREEN;
-+	    CHECK_BLUE;
-+	    PPM_ASSIGN( outputrow[col], r, g, b );
-+	    }
-+        }
-+    pnm_writepnmrow( stdout, outputrow, cols, maxval, newformat, 0 );
-+
-+
-+    /* For all subsequent rows */
-+
-+    subrow = crows;
-+    addrow = crows - 1;
-+    crowsp1 = crows + 1;
-+    ++row;
-+    for ( ; row < rows; ++row )
-+	{
-+	temprow = row % crowsp1;
-+	pnm_readpnmrow( ifp, xelbuf[temprow], cols, maxval, format );
-+	if ( PNM_FORMAT_TYPE(format) != newformat )
-+	    pnm_promoteformatrow(
-+		xelbuf[temprow], cols, maxval, format, maxval, newformat );
-+
-+	temprow = (row + 2) % crowsp1;
-+	i = 0;
-+	for (irow = temprow; irow < crowsp1; ++i, ++irow)
-+	    {
-+	    rowptr[i] = xelbuf[irow];
-+	    rrowsumptr[i] = rrowsum[irow];
-+	    growsumptr[i] = growsum[irow];
-+	    browsumptr[i] = browsum[irow];
-+	    }
-+	for (irow = 0; irow < temprow; ++irow, ++i)
-+	    {
-+	    rowptr[i] = xelbuf[irow];
-+	    rrowsumptr[i] = rrowsum[irow];
-+	    growsumptr[i] = growsum[irow];
-+	    browsumptr[i] = browsum[irow];
-+	    }
-+
-+	for ( col = 0; col < cols; ++col )
-+	    {
-+	    if ( col < ccolso2 || col >= cols - ccolso2 )
-+		outputrow[col] = rowptr[crowso2][col];
-+	    else if ( col == ccolso2 )
-+		{
-+		rsum = 0.0;
-+		gsum = 0.0;
-+		bsum = 0.0;
-+		leftcol = col - ccolso2;
-+		rrowsumptr[addrow][leftcol] = 0L;
-+		growsumptr[addrow][leftcol] = 0L;
-+		browsumptr[addrow][leftcol] = 0L;
-+		for ( ccol = 0; ccol < ccols; ++ccol )
-+		    {
-+		    rrowsumptr[addrow][leftcol] += 
-+			PPM_GETR( rowptr[addrow][leftcol + ccol] );
-+		    growsumptr[addrow][leftcol] += 
-+			PPM_GETG( rowptr[addrow][leftcol + ccol] );
-+		    browsumptr[addrow][leftcol] += 
-+			PPM_GETB( rowptr[addrow][leftcol + ccol] );
-+		    }
-+		for ( crow = 0; crow < crows; ++crow )
-+		    {
-+		    rsum += rrowsumptr[crow][leftcol] * rweights[crow][0];
-+		    gsum += growsumptr[crow][leftcol] * gweights[crow][0];
-+		    bsum += browsumptr[crow][leftcol] * bweights[crow][0];
-+		    }
-+		temprsum = rsum + 0.5;
-+		tempgsum = gsum + 0.5;
-+		tempbsum = bsum + 0.5;
-+		CHECK_RED;
-+		CHECK_GREEN;
-+		CHECK_BLUE;
-+		PPM_ASSIGN( outputrow[col], r, g, b );
-+		}
-+	    else
-+		{
-+		rsum = 0.0;
-+		gsum = 0.0;
-+		bsum = 0.0;
-+		leftcol = col - ccolso2;
-+		subcol = col - ccolso2 - 1;
-+		addcol = col + ccolso2;  
-+		rrowsumptr[addrow][leftcol] = rrowsumptr[addrow][subcol]
-+		    - PPM_GETR( rowptr[addrow][subcol] )
-+		    + PPM_GETR( rowptr[addrow][addcol] );
-+		growsumptr[addrow][leftcol] = growsumptr[addrow][subcol]
-+		    - PPM_GETG( rowptr[addrow][subcol] )
-+		    + PPM_GETG( rowptr[addrow][addcol] );
-+		browsumptr[addrow][leftcol] = browsumptr[addrow][subcol]
-+		    - PPM_GETB( rowptr[addrow][subcol] )
-+		    + PPM_GETB( rowptr[addrow][addcol] );
-+		for ( crow = 0; crow < crows; ++crow )
-+		    {
-+		    rsum += rrowsumptr[crow][leftcol] * rweights[crow][0];
-+		    gsum += growsumptr[crow][leftcol] * gweights[crow][0];
-+		    bsum += browsumptr[crow][leftcol] * bweights[crow][0];
-+		    }
-+		temprsum = rsum + 0.5;
-+		tempgsum = gsum + 0.5;
-+		tempbsum = bsum + 0.5;
-+		CHECK_RED;
-+		CHECK_GREEN;
-+		CHECK_BLUE;
-+		PPM_ASSIGN( outputrow[col], r, g, b );
-+		}
-+	    }
-+	pnm_writepnmrow( stdout, outputrow, cols, maxval, newformat, 0 );
-+	}
-+
-+    /* Now write out the remaining unconvolved rows in xelbuf. */
-+    for ( irow = crowso2 + 1; irow < crows; ++irow )
-+	pnm_writepnmrow(
-+            stdout, rowptr[irow], cols, maxval, newformat, 0 );
-+
-+    pm_close( stdout );
-+    }
-+
-+
-+/* PPM Vertical Convolution
-+**
-+** Same as pgm_vertical_convolve()
-+**
-+*/
-+
-+static void
-+ppm_vertical_convolve()
-+    {
-+    register int ccol, col;
-+    xel** xelbuf;
-+    xel* outputrow;
-+    xelval r, g, b;
-+    int row, crow;
-+    xel **rowptr, *temprptr;
-+    int leftcol;
-+    int i, irow;
-+    int toprow, temprow;
-+    int subrow, addrow;
-+    int tempcol;
-+    float rsum, gsum, bsum;
-+    long *rcolumnsum, *gcolumnsum, *bcolumnsum;
-+    int crowsp1;
-+    int addcol;
-+    long temprsum, tempgsum, tempbsum;
-+
-+    /* Allocate space for one convolution-matrix's worth of rows, plus
-+    ** a row output buffer. VERTICAL uses an extra row. */
-+    xelbuf = pnm_allocarray( cols, crows + 1 );
-+    outputrow = pnm_allocrow( cols );
-+
-+    /* Allocate array of pointers to xelbuf */
-+    rowptr = (xel **) pnm_allocarray( 1, crows + 1 );
-+
-+    /* Allocate space for intermediate column sums */
-+    rcolumnsum = (long *) pm_allocrow( cols, sizeof(long) );
-+    gcolumnsum = (long *) pm_allocrow( cols, sizeof(long) );
-+    bcolumnsum = (long *) pm_allocrow( cols, sizeof(long) );
-+    for ( col = 0; col < cols; ++col )
-+	{
-+	rcolumnsum[col] = 0L;
-+	gcolumnsum[col] = 0L;
-+	bcolumnsum[col] = 0L;
-+	}
-+
-+    pnm_writepnminit( stdout, cols, rows, maxval, newformat, 0 );
-+
-+    /* Read in one convolution-matrix's worth of image, less one row. */
-+    for ( row = 0; row < crows - 1; ++row )
-+	{
-+	pnm_readpnmrow( ifp, xelbuf[row], cols, maxval, format );
-+	if ( PNM_FORMAT_TYPE(format) != newformat )
-+	    pnm_promoteformatrow(
-+		xelbuf[row], cols, maxval, format, maxval, newformat );
-+	/* Write out just the part we're not going to convolve. */
-+	if ( row < crowso2 )
-+	    pnm_writepnmrow( stdout, xelbuf[row], cols, maxval, newformat, 0 );
-+	}
-+
-+    /* Now the rest of the image - read in the row at the end of
-+    ** xelbuf, and convolve and write out the row in the middle.
-+    */
-+    /* For first row only */
-+
-+    toprow = row + 1;
-+    temprow = row % crows;
-+    pnm_readpnmrow( ifp, xelbuf[temprow], cols, maxval, format );
-+    if ( PNM_FORMAT_TYPE(format) != newformat )
-+	pnm_promoteformatrow(
-+	    xelbuf[temprow], cols, maxval, format, maxval, newformat );
-+
-+    /* Arrange rowptr to eliminate the use of mod function to determine
-+    ** which row of xelbuf is 0...crows.  Mod function can be very costly.
-+    */
-+    temprow = toprow % crows;
-+    i = 0;
-+    for (irow = temprow; irow < crows; ++i, ++irow)
-+	rowptr[i] = xelbuf[irow];
-+    for (irow = 0; irow < temprow; ++irow, ++i)
-+	rowptr[i] = xelbuf[irow];
-+
-+    for ( col = 0; col < cols; ++col )
-+	{
-+	if ( col < ccolso2 || col >= cols - ccolso2 )
-+	    outputrow[col] = rowptr[crowso2][col];
-+	else if ( col == ccolso2 )
-+	    {
-+	    rsum = 0.0;
-+	    gsum = 0.0;
-+	    bsum = 0.0;
-+	    leftcol = col - ccolso2;
-+	    for ( crow = 0; crow < crows; ++crow )
-+		{
-+		temprptr = rowptr[crow] + leftcol;
-+		for ( ccol = 0; ccol < ccols; ++ccol )
-+		    {
-+		    rcolumnsum[leftcol + ccol] += 
-+			PPM_GETR( *(temprptr + ccol) );
-+		    gcolumnsum[leftcol + ccol] += 
-+			PPM_GETG( *(temprptr + ccol) );
-+		    bcolumnsum[leftcol + ccol] += 
-+			PPM_GETB( *(temprptr + ccol) );
-+		    }
-+		}
-+	    for ( ccol = 0; ccol < ccols; ++ccol)
-+		{
-+		rsum += rcolumnsum[leftcol + ccol] * rweights[0][ccol];
-+		gsum += gcolumnsum[leftcol + ccol] * gweights[0][ccol];
-+		bsum += bcolumnsum[leftcol + ccol] * bweights[0][ccol];
-+		}
-+	    temprsum = rsum + 0.5;
-+	    tempgsum = gsum + 0.5;
-+	    tempbsum = bsum + 0.5;
-+	    CHECK_RED;
-+	    CHECK_GREEN;
-+	    CHECK_BLUE;
-+	    PPM_ASSIGN( outputrow[col], r, g, b );
-+	    }
-+	else
-+	    {
-+	    rsum = 0.0;
-+	    gsum = 0.0;
-+	    bsum = 0.0;
-+	    leftcol = col - ccolso2;
-+	    addcol = col + ccolso2;  
-+	    for ( crow = 0; crow < crows; ++crow )
-+		{
-+		rcolumnsum[addcol] += PPM_GETR( rowptr[crow][addcol] );
-+		gcolumnsum[addcol] += PPM_GETG( rowptr[crow][addcol] );
-+		bcolumnsum[addcol] += PPM_GETB( rowptr[crow][addcol] );
-+		}
-+	    for ( ccol = 0; ccol < ccols; ++ccol )
-+		{
-+		rsum += rcolumnsum[leftcol + ccol] * rweights[0][ccol];
-+		gsum += gcolumnsum[leftcol + ccol] * gweights[0][ccol];
-+		bsum += bcolumnsum[leftcol + ccol] * bweights[0][ccol];
-+		}
-+	    temprsum = rsum + 0.5;
-+	    tempgsum = gsum + 0.5;
-+	    tempbsum = bsum + 0.5;
-+	    CHECK_RED;
-+	    CHECK_GREEN;
-+	    CHECK_BLUE;
-+	    PPM_ASSIGN( outputrow[col], r, g, b );
-+	    }
-+	}
-+    pnm_writepnmrow( stdout, outputrow, cols, maxval, newformat, 0 );
-+
-+    /* For all subsequent rows */
-+    subrow = crows;
-+    addrow = crows - 1;
-+    crowsp1 = crows + 1;
-+    ++row;
-+    for ( ; row < rows; ++row )
-+	{
-+	toprow = row + 1;
-+	temprow = row % (crows +1);
-+	pnm_readpnmrow( ifp, xelbuf[temprow], cols, maxval, format );
-+	if ( PNM_FORMAT_TYPE(format) != newformat )
-+	    pnm_promoteformatrow(
-+		xelbuf[temprow], cols, maxval, format, maxval, newformat );
-+
-+	/* Arrange rowptr to eliminate the use of mod function to determine
-+	** which row of xelbuf is 0...crows.  Mod function can be very costly.
-+	*/
-+	temprow = (toprow + 1) % crowsp1;
-+	i = 0;
-+	for (irow = temprow; irow < crowsp1; ++i, ++irow)
-+	    rowptr[i] = xelbuf[irow];
-+	for (irow = 0; irow < temprow; ++irow, ++i)
-+	    rowptr[i] = xelbuf[irow];
-+
-+	for ( col = 0; col < cols; ++col )
-+	    {
-+	    if ( col < ccolso2 || col >= cols - ccolso2 )
-+		outputrow[col] = rowptr[crowso2][col];
-+	    else if ( col == ccolso2 )
-+		{
-+		rsum = 0.0;
-+		gsum = 0.0;
-+		bsum = 0.0;
-+		leftcol = col - ccolso2;
-+		for ( ccol = 0; ccol < ccols; ++ccol )
-+		    {
-+		    tempcol = leftcol + ccol;
-+		    rcolumnsum[tempcol] = rcolumnsum[tempcol] 
-+			- PPM_GETR( rowptr[subrow][ccol] )
-+			+ PPM_GETR( rowptr[addrow][ccol] );
-+		    rsum = rsum + rcolumnsum[tempcol] * rweights[0][ccol];
-+		    gcolumnsum[tempcol] = gcolumnsum[tempcol] 
-+			- PPM_GETG( rowptr[subrow][ccol] )
-+			+ PPM_GETG( rowptr[addrow][ccol] );
-+		    gsum = gsum + gcolumnsum[tempcol] * gweights[0][ccol];
-+		    bcolumnsum[tempcol] = bcolumnsum[tempcol] 
-+			- PPM_GETB( rowptr[subrow][ccol] )
-+			+ PPM_GETB( rowptr[addrow][ccol] );
-+		    bsum = bsum + bcolumnsum[tempcol] * bweights[0][ccol];
-+		    }
-+		temprsum = rsum + 0.5;
-+		tempgsum = gsum + 0.5;
-+		tempbsum = bsum + 0.5;
-+		CHECK_RED;
-+		CHECK_GREEN;
-+		CHECK_BLUE;
-+		PPM_ASSIGN( outputrow[col], r, g, b );
-+		}
-+	    else
-+		{
-+		rsum = 0.0;
-+		gsum = 0.0;
-+		bsum = 0.0;
-+		leftcol = col - ccolso2;
-+		addcol = col + ccolso2;
-+		rcolumnsum[addcol] = rcolumnsum[addcol]
-+		    - PPM_GETR( rowptr[subrow][addcol] )
-+		    + PPM_GETR( rowptr[addrow][addcol] );
-+		gcolumnsum[addcol] = gcolumnsum[addcol]
-+		    - PPM_GETG( rowptr[subrow][addcol] )
-+		    + PPM_GETG( rowptr[addrow][addcol] );
-+		bcolumnsum[addcol] = bcolumnsum[addcol]
-+		    - PPM_GETB( rowptr[subrow][addcol] )
-+		    + PPM_GETB( rowptr[addrow][addcol] );
-+		for ( ccol = 0; ccol < ccols; ++ccol )
-+		    {
-+		    rsum += rcolumnsum[leftcol + ccol] * rweights[0][ccol];
-+		    gsum += gcolumnsum[leftcol + ccol] * gweights[0][ccol];
-+		    bsum += bcolumnsum[leftcol + ccol] * bweights[0][ccol];
-+		    }
-+		temprsum = rsum + 0.5;
-+		tempgsum = gsum + 0.5;
-+		tempbsum = bsum + 0.5;
-+		CHECK_RED;
-+		CHECK_GREEN;
-+		CHECK_BLUE;
-+		PPM_ASSIGN( outputrow[col], r, g, b );
-+		}
-+	    }
-+	pnm_writepnmrow( stdout, outputrow, cols, maxval, newformat, 0 );
-+	}
-+
-+    /* Now write out the remaining unconvolved rows in xelbuf. */
-+    for ( irow = crowso2 + 1; irow < crows; ++irow )
-+	pnm_writepnmrow(
-+            stdout, rowptr[irow], cols, maxval, newformat, 0 );
- 
-     pm_close( stdout );
--    exit( 0 );
-     }
diff --git a/graphics/netpbm/patches/patch-ao b/graphics/netpbm/patches/patch-ao
deleted file mode 100644
index ffcb99a443b..00000000000
--- a/graphics/netpbm/patches/patch-ao
+++ /dev/null
@@ -1,166 +0,0 @@
-$NetBSD: patch-ao,v 1.1 1999/01/10 23:52:16 tron Exp $
-
---- pnm/pnmhisteq.1.orig	Sun Jan 10 23:48:41 1999
-+++ pnm/pnmhisteq.1	Sun Jan 10 23:48:41 1999
-@@ -0,0 +1,161 @@
-+.TH pnmhisteq 1 "19 March 1995"
-+.IX "pnmhisteq command"
-+.IX histogram
-+.SH NAME
-+pnmhisteq \- histogram equalise a portable anymap
-+.SH SYNOPSIS
-+.na
-+.B pnmhisteq
-+'ti 15
-+.RB [ \-gray ]
-+.RB [ \-rmap
-+.IR pgmfile ]
-+.RB [ \-wmap
-+.IR pgmfile ]
-+.RB [ \-verbose ]
-+.RI [ pnmfile ]
-+.ad
-+.SH DESCRIPTION
-+.B pnmhisteq
-+increases the contrast of a portable graymap or pixmap through the
-+technique of
-+.IR "histogram equalisation" [1].
-+A histogram of the luminance of pixels in the map is computed, from
-+which a transfer function is calculated which spreads out intensity levels
-+around histogram peaks and compresses them at troughs.  This has the
-+effect of using the available levels of intensity more efficiently and
-+thereby increases the detail visible in the image.
-+.PP
-+Mathematically, if
-+.I N[i]
-+is the number of pixels of luminosity
-+.I i
-+in the image and
-+.I T
-+is the total number of pixels, luminosity
-+.I j
-+is replaced by:
-+.PP
-+.NF
-+.vs 9p
-+         j
-+        ---
-+        \\
-+         \>   N[i] / T
-+        \/
-+        ---
-+        i=0
-+.vs
-+.FI
-+.PP
-+If you're processing a related set of images, for example frames of an
-+animation, it's generally best to apply the same intensity map to
-+every frame, since otherwise you'll get distracting frame-to-frame
-+changes in the brightness of objects.
-+.BR pnmhisteq 's
-+.B \-wmap
-+option
-+allows you to save, as a portable graymap, the luminosity map computed
-+from an image (usually a composite of the images you intend
-+to process created with
-+.BR pnmcat ).
-+Then, you can subsequently process each of the individual images using
-+the luminosity map saved in the file, supplied with the
-+.B \-rmap
-+option.
-+.SH OPTIONS
-+.TP 10
-+.B \-gray
-+When processing a pixmap, only gray pixels (those with identical red,
-+green, and blue values) are included in the histogram and modified
-+in the output image.  This is a special purpose option intended
-+for images where the actual data are gray scale, with
-+colour annotations you don't want modified.  Weather
-+satellite images that show continent outlines in colour are best
-+processed using this option.  The option has no effect when the input
-+is a graymap.
-+.TP
-+.BI \-rmap " mapfile"
-+Process the image using the luminosity map specified by the portable
-+graymap
-+.I mapfile.
-+The graymap, usually created by an earlier run of
-+.B pnmhisteq
-+with the 
-+.B \-wmap
-+option, contains a single row with number of columns equal to
-+the
-+.I maxval
-+(greatest intensity) of the image.  Each pixel in the image is
-+transformed by looking up its luminosity in the corresponding
-+column in the map file and changing it to the value
-+given by that column.
-+.TP
-+.BI \-wmap " mapfile"
-+Creates a portable graymap,
-+.I mapfile,
-+containing the luminosity map computed from the histogram of the
-+input image.  This map file can be read on subsequent runs of
-+.B pnmhisteq
-+with the
-+.B \-rmap
-+option, allowing a group of images to be processed with
-+an identical map.
-+.TP
-+.B \-verbose
-+Prints the histogram and luminosity map on standard error.
-+.PP
-+All flags can be abbreviated to their shortest unique prefix.
-+.SH BUGS
-+Histogram equalisation is effective for increasing the visible detail
-+in scientific imagery and in some continuous-tone pictures.  It is
-+often too drastic, however, for scanned halftone images, where it
-+does an excellent job of making halftone artifacts apparent.  You
-+might want to experiment with
-+.BR pgnnorm ,
-+.BR ppmnorm ,
-+and
-+.B pnmgamma
-+for more subtle contrast enhancement.
-+.PP
-+The luminosity map file supplied by the
-+.B \-rmap
-+option must have the same
-+.I maxval
-+as the input image.  This is always the case when the
-+map file was created by the
-+.B \-wmap
-+option of 
-+.BR pnmhisteq .
-+If this restriction causes a problem, simply adjust the
-+.I maxval
-+of the map with
-+.B pnmdepth
-+to agree with the input image.
-+.PP
-+If the input is a PBM file (on which histogram equalisation is an
-+identity operation), the only effect of passing the file through
-+.B pnmhisteq
-+will be the passage of time.
-+.SH "SEE ALSO"
-+.PD
-+.BR pgmnorm (1),
-+.BR pnm (5),
-+.BR pnmcat (1),
-+.BR pnmdepth (1),
-+.BR pnmgamma (1),
-+.BR pnmnorm (1)
-+.TP 5
-+[1]
-+Russ, John C.  The Image Processing Handbook.
-+Boca Raton: CRC Press, 1992.  Pages 105-110.
-+.ne 10
-+.SH AUTHOR
-+.ce 2
-+Copyright (C) 1995 by John Walker (kelvin@fourmilab.ch).
-+WWW home page: http://www.fourmilab.ch/
-+.PP
-+Permission to use, copy, modify, and distribute this software and its
-+documentation for any purpose and without fee is hereby granted,
-+without any conditions or restrictions.  This software is provided ``as
-+is'' without express or implied warranty.
diff --git a/graphics/netpbm/patches/patch-ap b/graphics/netpbm/patches/patch-ap
deleted file mode 100644
index 0c9d055b696..00000000000
--- a/graphics/netpbm/patches/patch-ap
+++ /dev/null
@@ -1,376 +0,0 @@
-$NetBSD: patch-ap,v 1.1 1999/01/10 23:52:16 tron Exp $
-
---- pnm/pnmhisteq.c.orig	Sun Jan 10 23:48:41 1999
-+++ pnm/pnmhisteq.c	Sun Jan 10 23:48:41 1999
-@@ -0,0 +1,371 @@
-+/*
-+			     pnmhisteq.c
-+
-+	       Equalise histogram for a PGM or PPM file
-+
-+   Options:	-gray:	  modify gray pixels only; leave colours unchanged
-+		-rmap fn: read luminosity map from PGM file fn
-+		-wmap wn: write luminosity map to PGM file fn
-+		-verbose: print histogram and luminosity map
-+
-+    Accepts PGM and PPM as input.  PBM input is allowed, but histogram
-+    equalisation does not modify a PBM file.
-+
-+	  by John Walker (kelvin@fourmilab.ch) -- March MVM.
-+	       WWW home page: http://www.fourmilab.ch/
-+
-+		  Copyright (C) 1995 by John Walker
-+
-+    Permission	to use, copy, modify, and distribute this software and
-+    its documentation for  any	purpose  and  without  fee  is	hereby
-+    granted, without any conditions or restrictions.  This software is
-+    provided "as is" without express or implied warranty.
-+
-+*/
-+
-+#include "pnm.h"
-+
-+/* Prototypes */
-+
-+static void hsv_rgb ARGS((double h, double s, double v,
-+			  double *r, double *g, double *b));
-+static void rgb_hsv ARGS((double r, double g, double b,
-+			  double *h, double *s, double *v));
-+
-+/*  HSV_RGB  --  Convert HSV colour specification to RGB  intensities.
-+		 Hue is specified as a	real  value  from  0  to  360,
-+		 Saturation  and  Intensity as reals from 0 to 1.  The
-+		 RGB components are returned as reals from 0 to 1. */
-+
-+static void hsv_rgb(h, s, v, r, g, b)
-+  double h, s, v;
-+  double *r, *g, *b;
-+{
-+    int i;
-+    double f, p, q, t;
-+
-+    if (s == 0) {
-+	*r = *g = *b = v;
-+    } else {
-+	if (h == 360.0) {
-+	    h = 0;
-+	}
-+	h /= 60.0;
-+
-+	i = h;
-+	f = h - i;
-+	p = v * (1.0 - s);
-+	q = v * (1.0 - (s * f));
-+	t = v * (1.0 - (s * (1.0 - f)));
-+	switch (i) {
-+
-+	    case 0:
-+		*r = v;
-+		*g = t;
-+		*b = p;
-+		break;
-+
-+	    case 1:
-+		*r = q;
-+		*g = v;
-+		*b = p;
-+		break;
-+
-+	    case 2:
-+		*r = p;
-+		*g = v;
-+		*b = t;
-+		break;
-+
-+	    case 3:
-+		*r = p;
-+		*g = q;
-+		*b = v;
-+		break;
-+
-+	    case 4:
-+		*r = t;
-+		*g = p;
-+		*b = v;
-+		break;
-+
-+	    case 5:
-+		*r = v;
-+		*g = p;
-+		*b = q;
-+		break;
-+	 }
-+    }
-+}
-+
-+/*  RGB_HSV  --  Map R, G, B intensities in the range from 0 to 1 into
-+		 Hue, Saturation,  and	Value:	Hue  from  0  to  360,
-+		 Saturation  from  0  to  1,  and  Value  from 0 to 1.
-+                 Special case: if Saturation is 0 (it's a  grey  scale
-+		 tone), Hue is undefined and is returned as -1.
-+
-+		 This follows Foley & van Dam, section 17.4.4. */
-+
-+static void rgb_hsv(r, g, b, h, s, v)
-+  double r, g, b;
-+  double *h, *s, *v;
-+{
-+    double imax = max(r, max(g, b)),
-+	   imin = min(r, min(g, b)),
-+	   rc, gc, bc;
-+
-+    *v = imax;
-+    if (imax != 0) {
-+	*s = (imax - imin) / imax;
-+    } else {
-+	*s = 0;
-+    }
-+
-+    if (*s == 0) {
-+	*h = -1;
-+    } else {
-+	rc = (imax - r) / (imax - imin);
-+	gc = (imax - g) / (imax - imin);
-+	bc = (imax - b) / (imax - imin);
-+	if (r == imax) {
-+	    *h = bc - gc;
-+	} else if (g == imax) {
-+	    *h = 2.0 + rc - bc;
-+	} else {
-+	    *h = 4.0 + gc - rc;
-+	}
-+	*h *= 60.0;
-+	if (*h < 0.0) {
-+	    *h += 360.0;
-+	}
-+    }
-+}
-+
-+int main(argc, argv)
-+  int argc;
-+  char *argv[];
-+{
-+    FILE *ifp;
-+    int argn = 1, i, j, verbose = 0, mono_only = 0;
-+    gray lmin, lmax;
-+    gray **lumamap;		      /* Luminosity map */
-+    long *lumahist;		      /* Histogram of luminosity values */
-+    int rows, hist_cols;	      /* Rows, columns of input image */
-+    xelval maxval;		      /* Maxval of input image */
-+    int format; 		      /* Format indicator (PBM/PGM/PPM) */
-+    xel** xels; 		      /* Pixel array */
-+    unsigned long pixels = 0, pixsum = 0, maxluma = 0;
-+    double lscale;
-+    xel *grayrow;
-+    pixel *pixrow;
-+    FILE *rmap = NULL, *wmap = NULL;
-+    char *usage = "[-gray] [-verbose] [-rmap pgmfile] [-wmap pgmfile] [pnmfile]";
-+
-+    pnm_init(&argc, argv);
-+
-+    /* Check for flags. */
-+
-+    while (argn < argc && argv[argn][0] == '-' && argv[argn][1] != '\0') {
-+        if (pm_keymatch(argv[argn], "-gray", 1)) {
-+	    mono_only = 1;
-+        } else if (pm_keymatch(argv[argn], "-verbose", 1)) {
-+	    verbose = 1;
-+        } else if (pm_keymatch(argv[argn], "-rmap", 1)) {
-+	    if (rmap != NULL) {
-+                pm_error("already specified an input map");
-+	    }
-+	    argn++;
-+            if (argn == argc || strcmp(argv[argn], "-") == 0) {
-+		pm_usage(usage);
-+	    }
-+	    rmap = pm_openr(argv[argn]);
-+        } else if (pm_keymatch(argv[argn], "-wmap", 1)) {
-+	    if (wmap != NULL) {
-+                pm_error("already specified an output map");
-+	    }
-+	    argn++;
-+	    if (argn == argc) {
-+		pm_usage(usage);
-+	    }
-+	    wmap = pm_openw(argv[argn]);
-+	} else {
-+	    pm_usage(usage);
-+	}
-+	argn++;
-+    }
-+
-+    if (--argc > argn) {
-+	pm_usage(usage);
-+    } else if (argc == argn) {
-+	ifp = pm_openr(argv[argn]);
-+    } else {
-+	ifp = stdin;
-+    }
-+
-+    xels = pnm_readpnm(ifp, &hist_cols, &rows, &maxval, &format);
-+    pm_close(ifp);
-+
-+    /* Allocate histogram and luminosity map arrays.  If the
-+       user has specified an input map file, read it in at
-+       this point. */
-+
-+    lumahist = (long *) pm_allocrow(maxval + 1, sizeof(long));
-+    bzero((char *) lumahist, (maxval + 1) * sizeof(long));
-+
-+    if (rmap == NULL) {
-+	lumamap = pgm_allocarray(maxval + 1, 1);
-+    } else {
-+	int rmcols, rmrows; 
-+	gray rmmaxv;
-+
-+	lumamap = pgm_readpgm(rmap, &rmcols, &rmrows, &rmmaxv);
-+	if (rmmaxv != maxval) {
-+            pm_error("maxval in map file (%d) different from input (%d)",
-+		rmmaxv, maxval);
-+	}
-+	if (rmrows != 1 || rmcols != rmmaxv) {
-+            pm_error("map size (%d by %d) wrong; must be (%d by 1)",
-+		rmcols, rmrows, maxval);
-+	}
-+    }
-+
-+    /* Scan the image and build the luminosity histogram.  If
-+       the input is a PPM, we calculate the luminosity of each
-+       pixel from its RGB components. */
-+
-+    lmin = maxval;
-+    lmax = 0;
-+    if (PNM_FORMAT_TYPE(format) == PGM_TYPE ||
-+	PNM_FORMAT_TYPE(format) == PBM_TYPE) {
-+
-+	/* Compute intensity histogram */
-+
-+	pixels = ((unsigned long) rows) * ((unsigned long) hist_cols);
-+	for (i = 0; i < rows; i++) {
-+	    xel *grayrow = xels[i];
-+	    for (j = 0; j < hist_cols; j++) {
-+		gray l = PNM_GET1(grayrow[j]);
-+		lmin = min(lmin, l);
-+		lmax = max(lmax, l);
-+		lumahist[l]++;
-+	    }
-+	}
-+    } else if (PNM_FORMAT_TYPE(format) == PPM_TYPE) {
-+	for (i = 0; i < rows; i++) {
-+	    pixel *pixrow = (pixel *) xels[i];
-+
-+	    for (j = 0; j < hist_cols; j++) {
-+		if (!mono_only ||
-+		    ((PPM_GETR(pixrow[j]) == PPM_GETG(pixrow[j])) &&
-+		     (PPM_GETR(pixrow[j]) == PPM_GETB(pixrow[j])))) {
-+		    gray l = (gray) PPM_LUMIN(pixrow[j]);
-+		    lmin = min(lmin, l);
-+		    lmax = max(lmax, l);
-+		    lumahist[l]++;
-+		    pixels++;
-+		}
-+	    }
-+	}
-+    } else {
-+        pm_error("unknown input format");
-+    }
-+
-+    /* The PGM and PPM branches rejoin here to calculate the
-+       luminosity mapping table which gives the histogram-equalised
-+       luminosity for each original luminosity. */
-+
-+    /* Calculate initial histogram equalisation curve. */
-+
-+    for (i = 0; i <= (int) maxval; i++) {
-+
-+	/* Yick.  If PGM_BIGGRAYS is defined (I thought they were little
-+	   guys, about four foot, with funny eyes...) the following
-+	   calculation can overflow a 32 bit long.  So, we do it in
-+	   floating point.  Since this happens only maxval times, the
-+	   inefficiency is trivial compared to the every-pixel code above
-+	   and below. */
-+
-+	lumamap[0][i] = (gray) (((((double) pixsum * maxval)) / pixels) + 0.5);
-+	if (lumahist[i] > 0) {
-+	    maxluma = i;
-+	}
-+	pixsum += lumahist[i];
-+    }
-+
-+    /* Normalise so that the brightest pixels are set to
-+       maxval. */
-+
-+    lscale = ((double) maxval) / ((lumahist[maxluma] > 0) ?
-+	     ((double) lumamap[0][maxluma]) : ((double) maxval));
-+    for (i = 0; i <= (int) maxval; i++) {
-+	lumamap[0][i] = (gray)
-+	    min(((long) maxval), ((long) (lumamap[0][i] * lscale + 0.5)));
-+    }
-+
-+    /* If requested, print the luminosity map and original histogram. */
-+
-+    if (verbose) {
-+	fprintf(stderr,
-+            "  Luminosity map    Number of\n Original    New     Pixels\n");
-+	for (i = 0; i <= (int) maxval; i++) {
-+	    if (lumahist[i] > 0) {
-+                fprintf(stderr,"%6d -> %6d  %8d\n", i,
-+			lumamap[0][i], lumahist[i]);
-+	    }
-+	}
-+    }
-+
-+    switch (PNM_FORMAT_TYPE(format)) {
-+	case PBM_TYPE:
-+	case PPM_TYPE:
-+	    for (i = 0; i < rows; i++) {
-+		pixrow = (pixel *) xels[i];
-+		for (j = 0; j < hist_cols; j++) {
-+		    if (!mono_only ||
-+			((PPM_GETR(pixrow[j]) == PPM_GETG(pixrow[j])) &&
-+			 (PPM_GETR(pixrow[j]) == PPM_GETB(pixrow[j])))) {
-+			double r, g, b, h, s, v;
-+			int iv;
-+
-+			r = (double) PPM_GETR(pixrow[j]) / ((double) maxval);
-+			g = (double) PPM_GETG(pixrow[j]) / ((double) maxval);
-+			b = (double) PPM_GETB(pixrow[j]) / ((double) maxval);
-+			rgb_hsv(r, g, b, &h, &s, &v);
-+			iv = (int) ((v * maxval) + 0.5);
-+
-+			if (iv > ((int) maxval)) {
-+			    iv = maxval;
-+			}
-+			v = ((double) lumamap[0][iv]) / ((double) maxval);
-+			if (v > 1.0) {
-+			    v = 1.0;
-+			}
-+			hsv_rgb(h, s, v, &r, &g, &b);
-+			PPM_ASSIGN(pixrow[j], (int) (r * maxval),
-+			    (int) (g * maxval), (int) (b * maxval));
-+		    }
-+		}
-+	    }
-+	    break;
-+
-+	case PGM_TYPE:
-+	    for (i = 0; i < rows; i++) {
-+		grayrow = xels[i];
-+		for (j = 0; j < hist_cols; j++) {
-+		    PNM_ASSIGN1(grayrow[j], lumamap[0][PNM_GET1(grayrow[j])]);
-+		}
-+	    }
-+	    break;
-+    }
-+
-+    pnm_writepnm(stdout, xels, hist_cols, rows, maxval, format, 0);
-+
-+    /* If requested, save the map as a PGM file. */
-+
-+    if (wmap != NULL) {
-+	pgm_writepgm(wmap, lumamap, maxval, 1, maxval, 0);
-+	fclose(wmap);
-+    }
-+
-+    return 0;
-+}
diff --git a/graphics/netpbm/patches/patch-aq b/graphics/netpbm/patches/patch-aq
deleted file mode 100644
index d8f0eb0edde..00000000000
--- a/graphics/netpbm/patches/patch-aq
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-aq,v 1.1 1999/01/10 23:52:16 tron Exp $
-
---- pnm/pnmmerge.c.orig	Mon Jan 31 12:31:47 1994
-+++ pnm/pnmmerge.c	Sun Jan 10 23:48:40 1999
-@@ -30,6 +30,10 @@
- 	{
- 	++argv;
- 	--argc;
-+	if(!*argv)	{
-+		fprintf(stderr, "Usage: pnmmerge pnm_program_name [args ...]\n");
-+		exit(1);
-+		}
- 	goto again;
- 	}
- 
-@@ -51,6 +55,7 @@
-     TRY("pnmgamma", pnmgamma_main);
-     TRY("pnminvert", pnminvert_main);
-     TRY("pnmhistmap", pnmhistmap_main);
-+    TRY("pnmhisteq", pnmhisteq_main);
-     TRY("pnmnlfilt", pnmnlfilt_main);
-     TRY("pnmnoraw", pnmnoraw_main);
-     TRY("pnmpaste", pnmpaste_main);
-@@ -76,6 +81,7 @@
- #endif /*LIBTIFF*/
-     TRY("xwdtopnm", xwdtopnm_main);
-     TRY("zeisstopnm", zeisstopnm_main);
-+    TRY("pnmsmooth", pnmsmooth_main);
- 
-     (void) fprintf(
- 	stderr, "pnmmerge: \"%s\" is an unknown PNM program!\n", cp );
diff --git a/graphics/netpbm/patches/patch-ar b/graphics/netpbm/patches/patch-ar
deleted file mode 100644
index 347cd4cba40..00000000000
--- a/graphics/netpbm/patches/patch-ar
+++ /dev/null
@@ -1,54 +0,0 @@
-$NetBSD: patch-ar,v 1.1 1999/01/10 23:52:17 tron Exp $
-
---- pnm/pnmsmooth.1.orig	Mon Oct  4 10:11:56 1993
-+++ pnm/pnmsmooth.1	Sun Jan 10 23:48:40 1999
-@@ -1,25 +1,42 @@
--.TH pnmsmooth 1 "13 January 1991"
-+.TH pnmsmooth 1 "4 December 1994"
- .IX pnmsmooth
- .SH NAME
- pnmsmooth - smooth out an image
- .SH SYNOPSIS
- .B pnmsmooth
-+.RB [ -size
-+.IR width
-+.IR height ]
-+.RB [ -dump
-+.IR dumpfile ]
- .RI [ pnmfile ]
- .SH DESCRIPTION
- Smooths out an image by replacing each pixel with the
--average of its nine immediate neighbors.
-+average of its width X height neighbors.
- .IX smoothing
- .IX anti-aliasing
--It is implemented as a simple script using
-+It is implemented as a C progam that generates a PGM convolution matrix
-+and then invokes
- .IR pnmconvol .
- .IX pnmconvol
-+.SH OPTIONS
-+.TP
-+.B -size width height
-+Specifies the size of the convolution matrix.  
-+Default size is a 3x3 matrix.
-+Width and height sizes must be odd.  
-+Maximum size of convolution matrix is limited by the maximum value for a 
-+pixel such that (width * height * 2) must not exceed the maximum pixel value.
-+.TP
-+.B -dump dumpfile
-+Generates and saves the convolution file only.
-+Use of this option does not invoke pnmconvol.
- .SH "SEE ALSO"
- pnmconvol(1), pnm(5)
--.SH BUGS
--It's a script.
--Scripts are not portable to non-Unix environments.
--.SH AUTHOR
-+.SH AUTHORS
- Copyright (C) 1989, 1991 by Jef Poskanzer.
-+.br
-+Converted from script to C program December 1994 by Mike Burns (burns@chem.psu.edu).
- .\" Permission to use, copy, modify, and distribute this software and its
- .\" documentation for any purpose and without fee is hereby granted, provided
- .\" that the above copyright notice appear in all copies and that both that
diff --git a/graphics/netpbm/patches/patch-as b/graphics/netpbm/patches/patch-as
deleted file mode 100644
index 71800b1e807..00000000000
--- a/graphics/netpbm/patches/patch-as
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-as,v 1.1 1999/01/10 23:52:17 tron Exp $
-
---- pnm/pnmsmooth.README.orig	Sun Jan 10 23:48:41 1999
-+++ pnm/pnmsmooth.README	Sun Jan 10 23:48:41 1999
-@@ -0,0 +1,21 @@
-+README for pnmsmooth.c 2.0
-+
-+This is a replacement for the pnmsmooth script that is distributed with
-+pbmplus/netpbm.  This version of pnmsmooth is written as a C program rather
-+than a shell script.  It accepts command line arguments to specify a size 
-+other than 3x3 for the convolution matrix and an argument for dumping the 
-+resultant convolution matrix as a PGM file.  By default it uses the same 3x3
-+matrix size as the pnmsmooth script and can be used as a direct replacement.
-+
-+Also included are an updated man page and a patch file to update the Imakefile
-+in the pnm directory.  You may want to apply the patches by hand if you have
-+already modified the Imakefile to add other new programs.   You will then
-+have to remake the Makefiles and then type 'make all' in the pnm directory.
-+
-+- Mike
-+
-+----------------------------------------------------------------------------
-+Mike Burns                                              System Administrator
-+burns@chem.psu.edu                                   Department of Chemistry
-+(814) 863-2123                             The Pennsylvania State University
-+
diff --git a/graphics/netpbm/patches/patch-at b/graphics/netpbm/patches/patch-at
deleted file mode 100644
index 3902cb6b144..00000000000
--- a/graphics/netpbm/patches/patch-at
+++ /dev/null
@@ -1,176 +0,0 @@
-$NetBSD: patch-at,v 1.1 1999/01/10 23:52:17 tron Exp $
-
---- pnm/pnmsmooth.c.orig	Sun Jan 10 23:48:41 1999
-+++ pnm/pnmsmooth.c	Sun Jan 10 23:48:41 1999
-@@ -0,0 +1,171 @@
-+/* pnmsmooth.c - smooth out an image by replacing each pixel with the 
-+**               average of its width x height neighbors.
-+**
-+** Version 2.0   December 5, 1994
-+**
-+** Copyright (C) 1994 by Mike Burns (burns@chem.psu.edu)
-+**
-+** Permission to use, copy, modify, and distribute this software and its
-+** documentation for any purpose and without fee is hereby granted, provided
-+** that the above copyright notice appear in all copies and that both that
-+** copyright notice and this permission notice appear in supporting
-+** documentation.  This software is provided "as is" without express or
-+** implied warranty.
-+*/
-+
-+/* Version 2.0 - December 5, 1994
-+** ------------------------------
-+** Rewrote as a C program that accepts a few options instead of a shell 
-+** script with no options.
-+**
-+*/
-+
-+#include "pnm.h"
-+#include <sys/wait.h>
-+
-+#define TRUE    1
-+#define FALSE   0
-+
-+int
-+main( argc, argv )
-+    int argc;
-+    char* argv[];
-+    {
-+    FILE *cofp;
-+    char *tempfn;
-+    char *pnmfn;
-+    int argn;
-+    int col, row;
-+    int format, forceplain;
-+    int cols, rows;
-+    int newmaxval;		/* normally xelval, but want int here */
-+    xelval g;
-+    xel *outputrow;
-+    int pid, status;
-+    int DUMPFLAG = FALSE;
-+    char *usage = "[-size width height] [-dump dumpfile] [pnmfile]";
-+
-+    pnm_init( &argc, argv );
-+
-+    /* set up defaults */
-+    cols = 3;
-+    rows = 3;
-+    format = PGM_FORMAT;
-+    forceplain = 1;
-+    pnmfn = (char *) 0;		/* initialize to NULL just in case */
-+
-+    argn = 1;
-+    while ( argn < argc && argv[argn][0] == '-' && argv[argn][1] != '\0' )
-+	{
-+	if ( pm_keymatch( argv[argn], "-size", 2 ) )
-+	    {
-+	    ++argn;
-+	    if ( argn+1 >= argc )
-+		{
-+		pm_message( "incorrect number of arguments for -size option" );
-+		pm_usage( usage );
-+		}
-+	    else if ( argv[argn][0] == '-' || argv[argn+1][0] == '-' )
-+		{
-+		pm_message( "invalid arguments to -size option: %s %s", 
-+		    argv[argn], argv[argn+1] );
-+		pm_usage( usage );
-+		}
-+	    if ( (cols = atoi(argv[argn])) == 0 )
-+		pm_error( "invalid width size specification: %s", argv[argn] );
-+	    ++argn;
-+	    if ( (rows = atoi(argv[argn])) == 0 )
-+		pm_error( "invalid height size specification: %s",argv[argn] );
-+	    if ( cols % 2 != 1 || rows % 2 != 1 )
-+		pm_error( "the convolution matrix must have an odd number of rows and columns" );
-+	    }
-+	else if ( pm_keymatch( argv[argn], "-dump", 2 ) )
-+	    {
-+	    ++argn;
-+	    if ( argn >= argc )
-+		{
-+		pm_message( "missing argument to -dump option" );
-+		pm_usage( usage );
-+		}
-+	    else if ( argv[argn][0] == '-' )
-+		{
-+		pm_message( "invalid argument to -dump option: %s", 
-+		    argv[argn] );
-+		pm_usage( usage );
-+		}
-+	    cofp = pm_openw( argv[argn] );
-+	    DUMPFLAG = TRUE;
-+	    }
-+	else
-+	    pm_usage( usage );
-+	++argn;
-+	}
-+
-+    /* Only get file name if given on command line to pass through to 
-+    ** pnmconvol.  If filename is coming from stdin, pnmconvol will read it.
-+    */
-+    if ( argn < argc )
-+	{
-+	pnmfn = argv[argn];
-+	++argn;
-+	}
-+
-+    if ( argn != argc )
-+	pm_usage( usage );
-+
-+
-+    if ( !DUMPFLAG )
-+	{
-+	if ( (tempfn = tmpnam((char *) 0)) == NULL )
-+	    pm_error( "could not create temporary file name" );
-+	if ( (cofp = pm_openw(tempfn)) == NULL )
-+	    pm_error( "could not create temporary convolution file" );
-+	}
-+
-+    /* Generate mean value for all pixels in convolution matrix. */
-+    g = rows * cols + 1;
-+
-+    /* Make sure newmaxval is not larger than PNM_MAXMAXVAL or else
-+    ** newmaxval will overrun its defined data size and become garbage.
-+    */
-+    newmaxval = ( rows * cols ) * 2;
-+    if ( newmaxval > PNM_MAXMAXVAL )
-+	pm_error( "generated maxval is too large: %d", newmaxval );
-+
-+    pnm_writepnminit( cofp, cols, rows, newmaxval, format, forceplain );
-+    outputrow = pnm_allocrow( cols );
-+
-+    for ( row = 0; row < rows; ++ row )
-+	{
-+	for ( col = 0; col < cols; ++col )
-+	    PNM_ASSIGN1( outputrow[col], g );
-+	pnm_writepnmrow( cofp, outputrow, cols, newmaxval, format, forceplain );
-+	}
-+    pm_close( cofp );
-+    pnm_freerow( outputrow );
-+
-+    /* If we're only going to dump the file, now is the time to stop. */
-+    if ( DUMPFLAG )
-+	exit( 0 );
-+
-+    /* fork a child process */
-+    if ( (pid = fork()) < 0 )
-+	pm_error( "fork" );
-+
-+    /* child process executes following code */
-+    if ( pid == 0 )
-+	{
-+	/* If pnmfile name is not given on command line, then pnmfn will be
-+	** (char *) 0 and the arglist will terminate there.
-+	*/
-+	execlp( "pnmconvol", "pnmconvol", tempfn, pnmfn, (char *) 0 );
-+	pm_error( "error executing pnmconvol command" );
-+	}
-+
-+    /* wait for child to finish */
-+    while ( wait(&status) != pid )
-+	;
-+
-+    unlink( tempfn );
-+    exit( 0 );
-+    }
diff --git a/graphics/netpbm/patches/patch-au b/graphics/netpbm/patches/patch-au
deleted file mode 100644
index fef00e98404..00000000000
--- a/graphics/netpbm/patches/patch-au
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-au,v 1.1 1999/01/10 23:52:17 tron Exp $
-
---- pnm/pnmsmooth.orig.orig	Sun Jan 10 23:48:41 1999
-+++ pnm/pnmsmooth.orig	Sun Jan 10 23:48:41 1999
-@@ -0,0 +1,20 @@
-+#!/bin/sh
-+#
-+# pnmsmooth - smooth out an image by replacing each xel with the
-+#             average of its nine immediate neighbors
-+
-+tmp=/tmp/psm.$$
-+rm -f $tmp
-+
-+cat > $tmp << MOO
-+P2
-+3 3
-+18
-+10 10 10
-+10 10 10
-+10 10 10
-+MOO
-+
-+pnmconvol $tmp ${1+"$@"}
-+
-+rm -f $tmp
diff --git a/graphics/netpbm/patches/patch-av b/graphics/netpbm/patches/patch-av
deleted file mode 100644
index b2f9e253197..00000000000
--- a/graphics/netpbm/patches/patch-av
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-av,v 1.1 1999/01/10 23:52:17 tron Exp $
-
---- pnm/pnmtotiff.c.orig	Thu Jan 27 17:59:25 1994
-+++ pnm/pnmtotiff.c	Sun Jan 10 23:48:40 1999
-@@ -196,6 +196,7 @@
- 	    samplesperpixel = 1;
- 	    bitspersample = pm_maxvaltobits( maxval );
- 	    photometric = PHOTOMETRIC_MINISBLACK;
-+	    i = 8 / bitspersample;
- 	    bytesperrow = ( cols + i - 1 ) / i;
- 	    }
- 	else
-@@ -276,20 +277,20 @@
- 		for ( col = 0, xP = xels[row], tP = buf;
- 		      col < cols; ++col, ++xP )
- 		    {
--		    register unsigned char s;
-+		    register xelval s;
- 
- 		    s = PPM_GETR( *xP );
- 		    if ( maxval != 255 )
--			s = (long) s * 255 / maxval;
--		    *tP++ = s;
-+			s = s * 255 / maxval;
-+		    *tP++ = (unsigned char)s;
- 		    s = PPM_GETG( *xP );
- 		    if ( maxval != 255 )
--			s = (long) s * 255 / maxval;
--		    *tP++ = s;
-+			s = s * 255 / maxval;
-+		    *tP++ = (unsigned char)s;
- 		    s = PPM_GETB( *xP );
- 		    if ( maxval != 255 )
--			s = (long) s * 255 / maxval;
--		    *tP++ = s;
-+			s = s * 255 / maxval;
-+		    *tP++ = (unsigned char)s;
- 		    }
- 		}
- 	    else
diff --git a/graphics/netpbm/patches/patch-aw b/graphics/netpbm/patches/patch-aw
deleted file mode 100644
index 8e5a8d770ef..00000000000
--- a/graphics/netpbm/patches/patch-aw
+++ /dev/null
@@ -1,115 +0,0 @@
-$NetBSD: patch-aw,v 1.1 1999/01/10 23:52:17 tron Exp $
-
---- pnm/tifftopnm.c.orig	Mon Oct  4 10:12:01 1993
-+++ pnm/tifftopnm.c	Sun Jan 10 23:48:40 1999
-@@ -54,7 +54,7 @@
-     int headerdump;
-     register u_char sample;
-     register int bitsleft;
--    unsigned short bps, spp, photomet;
-+    unsigned short bps, spp, photomet, planarconfig;
-     unsigned short* redcolormap;
-     unsigned short* greencolormap;
-     unsigned short* bluecolormap;
-@@ -101,6 +101,13 @@
- 	spp = 1;
-     if ( ! TIFFGetField( tif, TIFFTAG_PHOTOMETRIC, &photomet ) )
- 	pm_error( "error getting photometric" );
-+    if( spp > 1 ){
-+	if ( ! TIFFGetField( tif, TIFFTAG_PLANARCONFIG, &planarconfig ) )
-+	    pm_error( "error getting planarconfig" );
-+    }else{
-+	planarconfig = PLANARCONFIG_CONTIG;
-+    }
-+
- 
-     switch ( spp )
- 	{
-@@ -114,6 +121,18 @@
- 	    "can only handle 1-channel gray scale or 1- or 3-channel color" );
- 	}
- 
-+    switch( planarconfig )
-+	{
-+	case PLANARCONFIG_CONTIG:
-+	    break;
-+	case PLANARCONFIG_SEPARATE:
-+	    if( photomet != PHOTOMETRIC_RGB )
-+		pm_error( "can only handle separate planes with RGB data" );
-+	    break;
-+	default:
-+	    pm_error("Unrecongnized PLANARCONFIG tag!\n");
-+	}
-+
-     (void) TIFFGetField( tif, TIFFTAG_IMAGEWIDTH, &cols );
-     (void) TIFFGetField( tif, TIFFTAG_IMAGELENGTH, &rows );
- 
-@@ -259,20 +278,54 @@
- 	    break;
- 
- 	    case PHOTOMETRIC_RGB:
--	    for ( col = 0; col < cols; ++col, ++xP )
--		{
--		register xelval r, g, b;
--
--		NEXTSAMPLE
--		r = sample;
--		NEXTSAMPLE
--		g = sample;
--		NEXTSAMPLE
--		b = sample;
--		if ( spp == 4 )
--		    NEXTSAMPLE		/* skip alpha channel */
--		PPM_ASSIGN( *xP, r, g, b );
--		}
-+	    if( planarconfig == PLANARCONFIG_CONTIG ){
-+		for ( col = 0; col < cols; ++col, ++xP )
-+		    {
-+		    register xelval r, g, b;
-+
-+		    NEXTSAMPLE
-+		    r = sample;
-+		    NEXTSAMPLE
-+		    g = sample;
-+		    NEXTSAMPLE
-+		    b = sample;
-+		    if ( spp == 4 )
-+		        NEXTSAMPLE /* skip alpha channel */
-+		    PPM_ASSIGN( *xP, r, g, b );
-+		    }
-+	    }else{
-+		/* First clear the value and assign the reds */
-+		for ( col = 0; col < cols; ++col, ++xP )
-+		    {
-+			NEXTSAMPLE
-+			PPM_ASSIGN( *xP, 0, 0, 0 );
-+			PPM_PUTR( *xP, sample );
-+		    }
-+
-+		/* Next the greens */
-+		if ( TIFFReadScanline( tif, buf, row, 1 ) < 0 )
-+		    pm_error( "bad data read on green line %d", row );
-+		xP = xelrow;
-+		inP = buf;
-+		bitsleft = 8;
-+		for ( col = 0; col < cols; ++col, ++xP )
-+		    {
-+			NEXTSAMPLE
-+			PPM_PUTG( *xP, sample );
-+		    }
-+
-+		/* And finally the blues */
-+		if ( TIFFReadScanline( tif, buf, row, 2 ) < 0 )
-+		    pm_error( "bad data read on green line %d", row );
-+		xP = xelrow;
-+		inP = buf;
-+		bitsleft = 8;
-+		for ( col = 0; col < cols; ++col, ++xP )
-+		    {
-+			NEXTSAMPLE
-+			PPM_PUTB( *xP, sample );
-+		    }
-+	    }		
- 	    break;
- 
- 	    default:
diff --git a/graphics/netpbm/patches/patch-ax b/graphics/netpbm/patches/patch-ax
deleted file mode 100644
index cad3dd691a6..00000000000
--- a/graphics/netpbm/patches/patch-ax
+++ /dev/null
@@ -1,124 +0,0 @@
-$NetBSD: patch-ax,v 1.1 1999/01/10 23:52:17 tron Exp $
-
---- ppm/Makefile.orig	Mon Jan 31 17:44:34 1994
-+++ ppm/Makefile	Mon Jan 11 00:18:52 1999
-@@ -10,22 +10,24 @@
- # implied warranty.
- 
- # Default values, usually overridden by top-level Makefile.
--#CC =		cc
--CC =		gcc -ansi -pedantic -fcombine-regs -fpcc-struct-return
-+CC =		gcc
-+#CC =		gcc -ansi -pedantic -fcombine-regs -fpcc-struct-return
- #CFLAGS =	-O
--CFLAGS =	-g
-+CFLAGS =	-O2
- #CFLAGS =	-g -O
--#LDFLAGS =	-s
--LDFLAGS =	
--INSTALLBINARIES =	/usr/new/pbm
-+LDFLAGS =	-s
-+#LDFLAGS =	
-+INSTALLBINARIES =	$(PREFIX)/bin
- INSTALLSCRIPTS =	$(INSTALLBINARIES)
--INSTALLMANUALS1 =	/usr/man/mann
-+INSTALLMANUALS1 =	$(PREFIX)/man/man1
- SUFFIXMANUALS1 =	1
--INSTALLMANUALS3 =	/usr/man/mann
-+INSTALLMANUALS3 =	$(PREFIX)/man/man3
- SUFFIXMANUALS3 =	3
--INSTALLMANUALS5 =	/usr/man/mann
-+INSTALLMANUALS5 =	$(PREFIX)/man/man5
- SUFFIXMANUALS5 =	5
--MANCP =			cp
-+MANCP =			install -c -m 0644
-+INSTALLLIBS =		$(PREFIX)/lib
-+INSTALLDEFS =		$(PREFIX)/include
- 
- PGMDIR =	../pgm
- INCLUDEPGM =	-I$(PGMDIR)
-@@ -43,6 +45,7 @@
- INCLUDE =	-I.. $(INCLUDEPGM) $(INCLUDEPBM)
- ALLCFLAGS =	$(CFLAGS) $(INCLUDE)
- LIBPPM =	libppm.a
-+DEFPPM =	ppm.h
- 
- PORTBINARIES =	bmptoppm gouldtoppm hpcdtoppm ilbmtoppm imgtoppm \
- 		mtvtoppm pcxtoppm pgmtoppm pi1toppm picttoppm \
-@@ -85,21 +88,21 @@
- MANUALS5 =	ppm
- 
- 
--#all:		binaries
--all:		merge
--#install:	install.bin
--install:	install.merge
-+all:		binaries
-+#all:		merge
-+install:	install.bin
-+#install:	install.merge
- 
- 
- binaries:	$(BINARIES)
- 
- install.bin:	binaries $(SCRIPTS)
- 	cd $(INSTALLBINARIES) ; rm -f $(BINARIES)
--	cp $(BINARIES) $(INSTALLBINARIES)
-+	install -c -s -m 0755 $(BINARIES) $(INSTALLBINARIES)
- 	cd $(INSTALLSCRIPTS) ; rm -f $(SCRIPTS)
--	cp $(SCRIPTS) $(INSTALLSCRIPTS)
--	cd $(INSTALLSCRIPTS) ; chmod +x $(SCRIPTS)
--
-+	install -c -m 0755 $(SCRIPTS) $(INSTALLSCRIPTS)
-+	install -c -m 0644 $(LIBPPM) $(INSTALLLIBS)
-+	install -c -m 0644 $(DEFPPM) $(INSTALLDEFS)
- 
- merge:		ppmmerge
- ppmmerge:	ppmmerge.c $(OBJECTS) $(LIBPPM) $(LIBPGM) $(LIBPBM)
-@@ -132,15 +135,15 @@
- 
- 
- # Rule for plain programs.
--$(PORTBINARIES):	ppm.h $(DEFPGM) $(DEFPBM) $(LIBPPM) $(LIBPGM) $(LIBPBM)
-+$(PORTBINARIES):	$(DEFPPM) $(DEFPGM) $(DEFPBM) $(LIBPPM) $(LIBPGM) $(LIBPBM)
- 	$(CC) $(ALLCFLAGS) $(LDFLAGS) -o $@ $@.c $(LIBPPM) $(LIBPGM) $(LIBPBM)
- 
- # Rule for math-dependent programs.
--$(MATHBINARIES):	ppm.h $(DEFPGM) $(DEFPBM) $(LIBPPM) $(LIBPGM) $(LIBPBM)
-+$(MATHBINARIES):	$(DEFPPM) $(DEFPGM) $(DEFPBM) $(LIBPPM) $(LIBPGM) $(LIBPBM)
- 	$(CC) $(ALLCFLAGS) $(LDFLAGS) -o $@ $@.c -lm $(LIBPPM) $(LIBPGM) $(LIBPBM)
- 
- # Rule for objects.
--$(OBJECTS):	ppm.h $(DEFPGM) $(DEFPBM)
-+$(OBJECTS):	$(DEFPPM) $(DEFPGM) $(DEFPBM)
- 	$(CC) $(ALLCFLAGS) "-Dmain=$*_main" -c $*.c
- 
- # And libraries.
-@@ -155,16 +158,16 @@
- 	libppm5.o bitio.o
- 	-ranlib $(LIBPPM)
- 
--libppm1.o:	ppm.h $(DEFPGM) $(DEFPBM) libppm.h libppm1.c
-+libppm1.o:	$(DEFPPM) $(DEFPGM) $(DEFPBM) libppm.h libppm1.c
- 	$(CC) $(ALLCFLAGS) -c libppm1.c
--libppm2.o:	ppm.h $(DEFPGM) $(DEFPBM) libppm.h libppm2.c $(DEFLIBPGM) \
-+libppm2.o:	$(DEFPPM) $(DEFPGM) $(DEFPBM) libppm.h libppm2.c $(DEFLIBPGM) \
- 		$(DEFLIBPBM)
- 	$(CC) $(ALLCFLAGS) -c libppm2.c
--libppm3.o:	ppm.h $(DEFPGM) $(DEFPBM) ppmcmap.h libppm.h libppm3.c
-+libppm3.o:	$(DEFPPM) $(DEFPGM) $(DEFPBM) ppmcmap.h libppm.h libppm3.c
- 	$(CC) $(ALLCFLAGS) -c libppm3.c
--libppm4.o:	ppm.h $(DEFPGM) $(DEFPBM) libppm4.c
-+libppm4.o:	$(DEFPPM) $(DEFPGM) $(DEFPBM) libppm4.c
- 	$(CC) $(ALLCFLAGS) -c libppm4.c
--libppm5.o:	ppm.h $(DEFPGM) $(DEFPBM) ppmdraw.h libppm5.c
-+libppm5.o:	$(DEFPPM) $(DEFPGM) $(DEFPBM) ppmdraw.h libppm5.c
- 	$(CC) $(ALLCFLAGS) -c libppm5.c
- bitio.o:	../pbmplus.h bitio.c
- 	$(CC) $(ALLCFLAGS) -c bitio.c
-@@ -235,4 +238,4 @@
- yuvsplittoppm yuvsplittoppm.o:	yuvsplittoppm.c
- 
- clean:
--	-rm -f *.o *.a *.cat *~ core $(BINARIES) ppmmerge
-+	-rm -f *.o *.a *.cat *~ core *.core $(BINARIES) ppmmerge
diff --git a/graphics/netpbm/patches/patch-ay b/graphics/netpbm/patches/patch-ay
deleted file mode 100644
index 6f966cf8cdf..00000000000
--- a/graphics/netpbm/patches/patch-ay
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ay,v 1.1 1999/01/10 23:52:17 tron Exp $
-
---- ppm/ppm.5.orig	Mon Oct  4 10:12:19 1993
-+++ ppm/ppm.5	Sun Jan 10 23:48:41 1999
-@@ -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),
diff --git a/graphics/netpbm/patches/patch-az b/graphics/netpbm/patches/patch-az
deleted file mode 100644
index fda081072d7..00000000000
--- a/graphics/netpbm/patches/patch-az
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-az,v 1.1 1999/01/10 23:52:17 tron Exp $
-
---- ppm/ppmmerge.c.orig	Mon Jan 31 17:44:31 1994
-+++ ppm/ppmmerge.c	Sun Jan 10 23:48:41 1999
-@@ -29,6 +29,10 @@
- 	{
- 	++argv;
- 	--argc;
-+	if(!*argv)	{
-+		fprintf(stderr, "Usage: ppmmerge ppm_program_name [args ...]\n");
-+		exit(1);
-+		}
- 	goto again;
- 	}
- 
diff --git a/graphics/netpbm/patches/patch-ba b/graphics/netpbm/patches/patch-ba
deleted file mode 100644
index b44305fd3d1..00000000000
--- a/graphics/netpbm/patches/patch-ba
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ba,v 1.3 1999/01/10 23:52:17 tron Exp $
-
---- ppm/ppmtogif.1.orig	Fri Nov 12 10:18:30 1993
-+++ ppm/ppmtogif.1	Sun Jan 10 23:48:41 1999
-@@ -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".
diff --git a/graphics/netpbm/patches/patch-bb b/graphics/netpbm/patches/patch-bb
deleted file mode 100644
index e978ebcbe86..00000000000
--- a/graphics/netpbm/patches/patch-bb
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bb,v 1.3 1999/01/10 23:52:17 tron Exp $
-
---- ppm/ppmtoicr.1.orig	Mon Oct  4 10:12:38 1993
-+++ ppm/ppmtoicr.1	Sun Jan 10 23:48:41 1999
-@@ -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
diff --git a/graphics/netpbm/patches/patch-bc b/graphics/netpbm/patches/patch-bc
deleted file mode 100644
index 8b2e798b9f3..00000000000
--- a/graphics/netpbm/patches/patch-bc
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-bc,v 1.3 1999/01/10 23:52:17 tron Exp $
-
---- ppm/ppmtoxpm.1.orig	Mon Jan 31 12:49:48 1994
-+++ ppm/ppmtoxpm.1	Sun Jan 10 23:48:41 1999
-@@ -8,20 +8,20 @@
- Produces X11 pixmap  (version 3) as output which
- can be loaded directly by the XPM library.
- .PP
--The \fB-name\fP option allows one to specify the prefix string which is printed
-+The \fB-name\f option allows one to specify the prefix string which is printed
- in the resulting XPM output.  If not specified, will default to the
- filename (without extension) of the <ppmfile> argument.
--If \fB-name\fP is not specified and <ppmfile>
-+If \fB-name\f is not specified and <ppmfile>
- is not specified (i.e. piped input), the prefix string will default to
- the string "noname".
- .PP
--The \fB-rgb\fP option allows one to specify an X11 rgb text file for the
-+The \fB-rgb\f option allows one to specify an X11 rgb text file for the
- lookup of color name mnemonics.  This rgb text file is typically the
- /usr/lib/X11/rgb.txt of the MIT X11 distribution, but any file using the
- same format may be used.  When specified and
- a RGB value from the ppm input matches a RGB value from the <rgb-textfile>,
- then the corresponding color name mnemonic is printed in the XPM's colormap.
--If \fB-rgb\fP is not specified, or if the RGB values don't match, then the color
-+If \fB-rgb\f is not specified, or if the RGB values don't match, then the color
- will be printed with the #RGB, #RRGGBB, #RRRGGGBBB, or #RRRRGGGGBBBB
- hexadecimal format.
- .PP
diff --git a/graphics/netpbm/patches/patch-bd b/graphics/netpbm/patches/patch-bd
deleted file mode 100644
index 38cbb0b5da1..00000000000
--- a/graphics/netpbm/patches/patch-bd
+++ /dev/null
@@ -1,213 +0,0 @@
-$NetBSD: patch-bd,v 1.3 1999/01/10 23:52:17 tron Exp $
-
---- ppm/ppmtoxpm.c.orig	Mon Jan 31 08:44:41 1994
-+++ ppm/ppmtoxpm.c	Sun Jan 10 23:48:41 1999
-@@ -27,11 +27,25 @@
- **    
- **  - lowercase conversion of RGB names def'ed out,
- **    considered harmful.
-+**
-+** Michael Pall (pall@rz.uni-karlsruhe.de) - 29 Nov 93:
-+**  - Use the algorithm from xpm-lib for pixel encoding
-+**    (base 93 not base 28 -> saves a lot of space for colorful xpms)
- */
- 
-+#include <stdio.h>
-+#include <ctype.h>
- #include "ppm.h"
- #include "ppmcmap.h"
- 
-+#if defined(SYSV) || defined(SVR4)
-+#include <string.h>
-+#ifndef index
-+#define index strchr
-+#endif
-+#else					/* SYSV */
-+#include <strings.h>
-+#endif					/* SYSV */
- 
- /* Max number of colors allowed in ppm input. */
- #define MAXCOLORS    256
-@@ -39,15 +53,19 @@
- /* Max number of rgb mnemonics allowed in rgb text file. */
- #define MAX_RGBNAMES 1024
- 
--/* Lower bound and upper bound of character-pixels printed in XPM output.
--   Be careful, don't want the character '"' in this range. */
--/*#define LOW_CHAR  '#'  <-- minimum ascii character allowed */
--/*#define HIGH_CHAR '~'  <-- maximum ascii character allowed */
--#define LOW_CHAR  '`'
--#define HIGH_CHAR 'z'
-+#define MAXPRINTABLE 92			/* number of printable ascii chars
-+					 * minus \ and " for string compat
-+					 * and ? to avoid ANSI trigraphs. */
-+
-+static char *printable =
-+" .XoO+@#$%&*=-;:>,<1234567890qwertyuipasdfghjklzxcvbnmMNBVCZ\
-+ASDFGHJKLPIUYTREWQ!~^/()_`'][{}|";
-+
- 
- #define max(a,b) ((a) > (b) ? (a) : (b))
- 
-+void read_rgb_names();			/* forward reference */
-+void gen_cmap();			/* forward reference */
- 
- typedef struct {			/* rgb values and ascii names (from
- 					 * rgb text file) */
-@@ -62,17 +80,8 @@
- 					 * mnemonic or #rgb value */
- }      cixel_map;
- 
--
--/* prototypes/forward reference */
--static void   read_rgb_names ARGS((char *, rgb_names *, int *));
--static char * gen_numstr ARGS((int, int, int));
--static void   gen_cmap ARGS((colorhist_vector, int, pixval, int, rgb_names *, int, cixel_map *, int *));
--
--
- pixel **pixels;
- 
--
--int
- main(argc, argv)
-     int argc;
-     char *argv[];
-@@ -88,11 +97,11 @@
- 
-     /* Used for rgb value -> rgb mnemonic mapping */
-     int map_rgb_names = 0;
--    rgb_names *rgbn;    /* rgb_names rgbn[MAX_RGBNAMES]; */
-+    rgb_names rgbn[MAX_RGBNAMES];
-     int rgbn_max;
- 
-     /* Used for rgb value -> character-pixel string mapping */
--    cixel_map *cmap;    /* cixel_map cmap[MAXCOLORS]; */
-+    cixel_map cmap[MAXCOLORS];
-     int charspp;			/* chars per pixel */
- 
-     char out_name[100], rgb_fname[100], *cp;
-@@ -188,17 +197,9 @@
-      * If a rgb text file was specified, read in the rgb mnemonics. Does not
-      * return if fatal error occurs. 
-      */
--    rgbn = (rgb_names *) malloc(MAX_RGBNAMES * sizeof(rgb_names));
--    if (rgbn == (rgb_names *) NULL)
--	pm_error("out of memory");
--
-     if (map_rgb_names)
- 	read_rgb_names(rgb_fname, rgbn, &rgbn_max);
- 
--    cmap = (cixel_map *)malloc(ncolors * sizeof(cixel_map));
--    if (cmap == (cixel_map *) NULL)
--	pm_error("out of memory");
-- 
-     /* Now generate the character-pixel colormap table. */
-     gen_cmap(chv, ncolors, maxval, map_rgb_names, rgbn, rgbn_max,
- 	     cmap, &charspp);
-@@ -231,12 +232,12 @@
- /* This routine reads a rgb text file.  It stores the rgb values (0->65535)
-    and the rgb mnemonics (malloc'ed) into the "rgbn" array.  Returns the
-    number of entries stored in "rgbn_max". */
--static
- void
- read_rgb_names(rgb_fname, rgbn, rgbn_max)
-     char *rgb_fname;
--    rgb_names *rgbn;
--    int *rgbn_max;
-+    rgb_names rgbn[MAX_RGBNAMES];
-+int *rgbn_max;
-+
- {
-     FILE *rgbf;
-     int i, items, red, green, blue;
-@@ -303,16 +304,16 @@
- }					/* read_rgb_names */
- 
- /*---------------------------------------------------------------------------*/
--/* Given a number and a base, (base == HIGH_CHAR-LOW_CHAR+1), this routine
-+/* Given a number and a base (MAXPRINTABLE), this routine
-    prints the number into a malloc'ed string and returns it.  The length of
-    the string is specified by "digits".  The ascii characters of the printed
--   number range from LOW_CHAR to HIGH_CHAR.  The string is LOW_CHAR filled,
--   (e.g. if LOW_CHAR==0, HIGH_CHAR==1, digits==5, i=3, routine would return
--   the malloc'ed string "00011"). */
--static
-+   number range from printable[0] to printable[MAXPRINTABLE].  The string is
-+   printable[0] filled, (e.g. if printable[0]==0, printable[1]==1,
-+   MAXPRINTABLE==2, digits==5, i=3, routine would return the malloc'ed
-+   string "00011"). */
- char *
--gen_numstr(i, base, digits)
--    int i, base, digits;
-+gen_numstr(i, digits)
-+    int i, digits;
- {
-     char *str, *p;
-     int d;
-@@ -325,9 +326,9 @@
-     p = str + digits;
-     *p-- = '\0';			/* nul terminate string */
-     while (p >= str) {
--	d = i % base;
--	i /= base;
--	*p-- = (char) ((int) LOW_CHAR + d);
-+	d = i % MAXPRINTABLE;
-+	i /= MAXPRINTABLE;
-+	*p-- = printable[d];
-     }
- 
-     return str;
-@@ -336,7 +337,6 @@
- 
- /*---------------------------------------------------------------------------*/
- /* This routine generates the character-pixel colormap table. */
--static
- void
- gen_cmap(chv, ncolors, maxval, map_rgb_names, rgbn, rgbn_max,
- 	 cmap, charspp)
-@@ -348,16 +348,16 @@
- 					 * == unsigned short) */
-     int map_rgb_names;			/* == 1 if mapping rgb values to rgb
- 					 * mnemonics */
--    rgb_names *rgbn;                    /* rgb mnemonics from rgb text file */
-+    rgb_names rgbn[MAX_RGBNAMES];	/* rgb mnemonics from rgb text file */
- int rgbn_max;				/* number of rgb mnemonics in table */
- 
- /* output: */
--cixel_map *cmap;                        /* pixel strings and ascii rgb
-+cixel_map cmap[MAXCOLORS];		/* pixel strings and ascii rgb
- 					 * colors */
- int *charspp;				/* characters per pixel */
- 
- {
--    int i, j, base, cpp, mval, red, green, blue, r, g, b, matched;
-+    int i, j, cpp, mval, red, green, blue, r, g, b, matched;
-     char *str;
- 
-     /*
-@@ -365,9 +365,8 @@
-      * to be forced to link with libm.a, so using a division loop rather
-      * than a log function. 
-      */
--    base = (int) HIGH_CHAR - (int) LOW_CHAR + 1;
-     for (cpp = 0, j = ncolors; j; cpp++)
--	j /= base;
-+	j /= MAXPRINTABLE;
-     *charspp = cpp;
- 
-     /*
-@@ -392,10 +391,11 @@
- 
- 	/*
- 	 * The character-pixel string is simply a printed number in base
--	 * "base" where the digits of the number range from LOW_CHAR to
--	 * HIGH_CHAR and the printed length of the number is "cpp". 
-+	 * MAXPRINTABLE where the digits of the number range from
-+	 * printable[0] .. printable[MAXPRINTABLE-1] and the printed length
-+	 * of the number is "cpp". 
- 	 */
--	cmap[i].cixel = gen_numstr(i, base, cpp);
-+	cmap[i].cixel = gen_numstr(i, cpp);
- 
- 	/* Fetch the rgb value of the current colormap entry. */
- 	red = PPM_GETR(chv[i].color);
diff --git a/graphics/netpbm/patches/patch-be b/graphics/netpbm/patches/patch-be
deleted file mode 100644
index be45b21fd72..00000000000
--- a/graphics/netpbm/patches/patch-be
+++ /dev/null
@@ -1,53 +0,0 @@
-$NetBSD: patch-be,v 1.3 1999/01/10 23:52:17 tron Exp $
-
---- ppm/xpmtoppm.c.orig	Mon Jan 31 08:42:05 1994
-+++ ppm/xpmtoppm.c	Sun Jan 10 23:48:41 1999
-@@ -30,9 +30,8 @@
- 
- #include "ppm.h"
- 
--static void ReadXPMFile ARGS((FILE *stream, int *widthP, int *heightP,
--    int *ncolorsP, int *chars_per_pixelP, pixel **colorsP, int **dataP));
--static void getline ARGS((char *line, int size, FILE *stream));
-+void ReadXPMFile();
-+static void getline();
- 
- /* number of xpmColorKeys */
- #define NKEYS 5
-@@ -46,7 +45,27 @@
-  "c",					/* key #5: color visual */
- };
- 
--int
-+#ifdef NEED_STRSTR
-+/* for systems which do not provide it */
-+static char *
-+strstr(s1, s2)
-+    char *s1, *s2;
-+{
-+    int ls2 = strlen(s2);
-+
-+    if (ls2 == 0)
-+	return (s1);
-+    while (strlen(s1) >= ls2) {
-+	if (strncmp(s1, s2, ls2) == 0)
-+	    return (s1);
-+	s1++;
-+    }
-+    return (0);
-+}
-+
-+#endif
-+
-+void
- main(argc, argv)
-     int argc;
-     char *argv[];
-@@ -89,7 +108,6 @@
- 
- #define MAX_LINE 2048
- 
--static
- void
- ReadXPMFile(stream, widthP, heightP, ncolorsP,
- 	    chars_per_pixelP, colorsP, dataP)
diff --git a/graphics/netpbm/pkg/PLIST b/graphics/netpbm/pkg/PLIST
index 24df753a439..e305656366f 100644
--- a/graphics/netpbm/pkg/PLIST
+++ b/graphics/netpbm/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 1999/06/03 20:55:56 christos Exp $
+@comment $NetBSD: PLIST,v 1.7 2000/05/17 10:13:24 tron Exp $
 bin/anytopnm
 bin/asciitopgm
 bin/atktopbm
@@ -6,10 +6,12 @@ bin/bioradtopgm
 bin/bmptoppm
 bin/brushtopbm
 bin/cmuwmtopbm
+bin/eyuvtoppm
 bin/fitstopnm
 bin/fstopgm
 bin/g3topbm
 bin/gemtopbm
+bin/gemtopnm
 bin/giftopnm
 bin/gouldtoppm
 bin/hipstopgm
@@ -17,14 +19,18 @@ bin/hpcdtoppm
 bin/icontopbm
 bin/ilbmtoppm
 bin/imgtoppm
+bin/jbigtopnm
+bin/jpegtopnm
 bin/lispmtopgm
 bin/macptopbm
+bin/mdatopbm
 bin/mgrtopbm
 bin/mtvtoppm
 bin/pbmclean
 bin/pbmlife
 bin/pbmmake
 bin/pbmmask
+bin/pbmpage
 bin/pbmpscale
 bin/pbmreduce
 bin/pbmtext
@@ -44,11 +50,13 @@ bin/pbmtolj
 bin/pbmtoln03
 bin/pbmtolps
 bin/pbmtomacp
+bin/pbmtomda
 bin/pbmtomgr
 bin/pbmtopgm
 bin/pbmtopi3
 bin/pbmtopk
 bin/pbmtoplot
+bin/pbmtoppa
 bin/pbmtoptx
 bin/pbmtox10bm
 bin/pbmtoxbm
@@ -92,6 +100,8 @@ bin/pnmgamma
 bin/pnmhisteq
 bin/pnmhistmap
 bin/pnmindex
+bin/pnminterp
+bin/pnminterp-gen
 bin/pnminvert
 bin/pnmmargin
 bin/pnmnlfilt
@@ -105,23 +115,29 @@ bin/pnmsmooth
 bin/pnmtile
 bin/pnmtoddif
 bin/pnmtofits
+bin/pnmtojbig
+bin/pnmtoplainpnm
 bin/pnmtopng
 bin/pnmtops
 bin/pnmtorast
-bin/pnmtorle
 bin/pnmtosgi
 bin/pnmtosir
 bin/pnmtotiff
+bin/pnmtotiffcmyk
 bin/pnmtoxwd
 bin/ppm3d
 bin/ppmbrighten
 bin/ppmchange
+bin/ppmcie
+bin/ppmcolormask
 bin/ppmdim
 bin/ppmdist
 bin/ppmdither
+bin/ppmfade
 bin/ppmflash
 bin/ppmforge
 bin/ppmhist
+bin/ppmlabel
 bin/ppmmake
 bin/ppmmix
 bin/ppmnorm
@@ -131,13 +147,16 @@ bin/ppmquant
 bin/ppmquantall
 bin/ppmqvga
 bin/ppmrelief
+bin/ppmshadow
 bin/ppmshift
 bin/ppmspread
 bin/ppmtoacad
 bin/ppmtobmp
+bin/ppmtoeyuv
 bin/ppmtogif
 bin/ppmtoicr
 bin/ppmtoilbm
+bin/ppmtojpeg
 bin/ppmtomap
 bin/ppmtomitsu
 bin/ppmtopcx
@@ -154,6 +173,7 @@ bin/ppmtouil
 bin/ppmtoxpm
 bin/ppmtoyuv
 bin/ppmtoyuvsplit
+bin/ppmtv
 bin/psidtopgm
 bin/pstopnm
 bin/qrttoppm
@@ -161,7 +181,7 @@ bin/rasttopnm
 bin/rawtopgm
 bin/rawtoppm
 bin/rgb3toppm
-bin/rletopnm
+bin/sbigtopgm
 bin/sgitopnm
 bin/sirtopnm
 bin/sldtoppm
@@ -179,15 +199,20 @@ bin/ybmtopbm
 bin/yuvsplittoppm
 bin/yuvtoppm
 bin/zeisstopnm
-include/pbmplus.h
 include/pbm.h
+include/pbmplus.h
 include/pgm.h
 include/pnm.h
 include/ppm.h
+include/ppmcmap.h
 lib/libpbm.a
+lib/libpbm.so.9.2
 lib/libpgm.a
+lib/libpgm.so.9.0
 lib/libpnm.a
+lib/libpnm.so.9.0
 lib/libppm.a
+lib/libppm.so.9.1
 man/man1/anytopnm.1
 man/man1/asciitopgm.1
 man/man1/atktopbm.1
@@ -195,10 +220,11 @@ man/man1/bioradtopgm.1
 man/man1/bmptoppm.1
 man/man1/brushtopbm.1
 man/man1/cmuwmtopbm.1
+man/man1/eyuvtoppm.1
 man/man1/fitstopnm.1
 man/man1/fstopgm.1
 man/man1/g3topbm.1
-man/man1/gemtopbm.1
+man/man1/gemtopnm.1
 man/man1/giftopnm.1
 man/man1/gouldtoppm.1
 man/man1/hipstopgm.1
@@ -206,14 +232,18 @@ man/man1/hpcdtoppm.1
 man/man1/icontopbm.1
 man/man1/ilbmtoppm.1
 man/man1/imgtoppm.1
+man/man1/jbigtopnm.1
+man/man1/jpegtopnm.1
 man/man1/lispmtopgm.1
 man/man1/macptopbm.1
+man/man1/mdatopbm.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/pbmpage.1
 man/man1/pbmpscale.1
 man/man1/pbmreduce.1
 man/man1/pbmtext.1
@@ -233,11 +263,13 @@ man/man1/pbmtolj.1
 man/man1/pbmtoln03.1
 man/man1/pbmtolps.1
 man/man1/pbmtomacp.1
+man/man1/pbmtomda.1
 man/man1/pbmtomgr.1
 man/man1/pbmtopgm.1
 man/man1/pbmtopi3.1
 man/man1/pbmtopk.1
 man/man1/pbmtoplot.1
+man/man1/pbmtoppa.1
 man/man1/pbmtoptx.1
 man/man1/pbmtox10bm.1
 man/man1/pbmtoxbm.1
@@ -281,10 +313,11 @@ 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/pnmnlfilt.1
-man/man1/pnmnoraw.1
 man/man1/pnmpad.1
 man/man1/pnmpaste.1
 man/man1/pnmrotate.1
@@ -294,23 +327,29 @@ man/man1/pnmsmooth.1
 man/man1/pnmtile.1
 man/man1/pnmtoddif.1
 man/man1/pnmtofits.1
+man/man1/pnmtojbig.1
+man/man1/pnmtoplainpnm.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/pnmtotiffcmyk.1
 man/man1/pnmtoxwd.1
 man/man1/ppm3d.1
 man/man1/ppmbrighten.1
 man/man1/ppmchange.1
+man/man1/ppmcie.1
+man/man1/ppmcolormask.1
 man/man1/ppmdim.1
 man/man1/ppmdist.1
 man/man1/ppmdither.1
+man/man1/ppmfade.1
 man/man1/ppmflash.1
 man/man1/ppmforge.1
 man/man1/ppmhist.1
+man/man1/ppmlabel.1
 man/man1/ppmmake.1
 man/man1/ppmmix.1
 man/man1/ppmnorm.1
@@ -320,15 +359,19 @@ man/man1/ppmquant.1
 man/man1/ppmquantall.1
 man/man1/ppmqvga.1
 man/man1/ppmrelief.1
+man/man1/ppmshadow.1
 man/man1/ppmshift.1
 man/man1/ppmspread.1
 man/man1/ppmtoacad.1
 man/man1/ppmtobmp.1
+man/man1/ppmtoeyuv.1
 man/man1/ppmtogif.1
 man/man1/ppmtoicr.1
 man/man1/ppmtoilbm.1
+man/man1/ppmtojpeg.1
 man/man1/ppmtomap.1
 man/man1/ppmtomitsu.1
+man/man1/ppmtompeg.1
 man/man1/ppmtopcx.1
 man/man1/ppmtopgm.1
 man/man1/ppmtopi1.1
@@ -343,6 +386,7 @@ man/man1/ppmtouil.1
 man/man1/ppmtoxpm.1
 man/man1/ppmtoyuv.1
 man/man1/ppmtoyuvsplit.1
+man/man1/ppmtv.1
 man/man1/psidtopgm.1
 man/man1/pstopnm.1
 man/man1/qrttoppm.1
@@ -350,7 +394,7 @@ man/man1/rasttopnm.1
 man/man1/rawtopgm.1
 man/man1/rawtoppm.1
 man/man1/rgb3toppm.1
-man/man1/rletopnm.1
+man/man1/sbigtopgm.1
 man/man1/sgitopnm.1
 man/man1/sirtopnm.1
 man/man1/sldtoppm.1
author	tron <tron>	2000-05-17 10:13:19 +0000
committer	tron <tron>	2000-05-17 10:13:19 +0000
commit	9c96e0ef27a97c8b0e6f0c1c6c4b44f60f787daa (patch)
tree	8c097d4541c61f1fe5c6cdb8e6d29afa59e7b96c /graphics/netpbm
parent	e0f4be4b9cb3a0a014476fc6aef28f9bf809daf1 (diff)
download	pkgsrc-9c96e0ef27a97c8b0e6f0c1c6c4b44f60f787daa.tar.gz