Update to netpbm-9.5.

Fixes pkg/8949.
Changes:
o Extend formats to allow multiple images per file.  Add -allimages
  option to pnmfile.  Add pnmsplit.  Extend pnmtops.
o Add pbmtowbmp, wbmptopbm.  Thanks Terje Sannum.
o ppmtobmp: Add 24 bit (truecolor) capability.
o pnmcut: easier, more expressive syntax for specifying what to cut.
o pnminterp: handle maxval != 255, convert to use Netpbm libraries.
o Translate pstopnm from Csh to C, eliminate dependency on the 'bc'
  program.
o Fix bug in tiff library build which caused null soname.
o Add optParseopt2() to shhopt.a so you can use long options with one
  hyphen instead of two.
o giftopnm: fix bug with variable used before set.  Fix bug (coding
  error -- 0=>i).  Unknown impact.
o bmptoppm: fix bug with 24 bit (truecolor) Windows BMPs.
o xwdtopnm: fix one more bug with bits_per_item <> bits_per_pixel.
o Fix ppmtompeg build bug with static libraries.
o Make build clean with gcc -ansi (albeit with some files that need
  extensions declaring the _BSD_SOURCE etc.).
o Rebase pnmtopng, pngtopnm on Pnmtopng 2.37.4.
o pbmtolj: fix bug where blank lines get discarded.  Thanks Charles
  Howes.
o ppmtompeg: fix bug with "PNM" format files with maxval != 255. Get
  rid of built-in PPM file parsing.
o Fix 'make install' where mkinstalldirs is not found.
o Fix bug where rle_global.c would not compile with GNU C Library 2.

10 files changed, 73 insertions, 286 deletions

diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index 3c1be508f19..a127a70bdbc 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.44 2000/06/24 01:48:08 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.45 2000/07/10 11:12:09 wiz Exp $
 
-DISTNAME=	netpbm-9.3
+DISTNAME=	netpbm-${VERS}
 CATEGORIES=	graphics
 MASTER_SITES=	http://download.sourceforge.net/netpbm/
 EXTRACT_SUFX=	.tgz
@@ -17,6 +17,9 @@ USE_LIBTOOL=	yes
 INSTALL_TARGET=	install-dev install
 MAKEFILE=	GNUmakefile
 
+VERS=		9.5
+PLIST_SUBST+=	VERS=${VERS}
+
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == NetBSD && ${MACHINE_ARCH} == arm32
diff --git a/graphics/netpbm/files/md5 b/graphics/netpbm/files/md5
index a4b1d6ed8a9..02effb473a8 100644
--- a/graphics/netpbm/files/md5
+++ b/graphics/netpbm/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.9 2000/06/05 00:36:31 wiz Exp $
+$NetBSD: md5,v 1.10 2000/07/10 11:12:10 wiz Exp $
 
-MD5 (netpbm-9.3.tgz) = bd50468014c62cdf5f1fdd48ffb9a10c
+MD5 (netpbm-9.5.tgz) = 978920c632ab4e9a4e5e4ae94dd86fe6
diff --git a/graphics/netpbm/files/patch-sum b/graphics/netpbm/files/patch-sum
index 540856100f9..3299ff7721d 100644
--- a/graphics/netpbm/files/patch-sum
+++ b/graphics/netpbm/files/patch-sum
@@ -1,9 +1,8 @@
-$NetBSD: patch-sum,v 1.7 2000/06/24 01:48:09 dmcmahill Exp $
+$NetBSD: patch-sum,v 1.8 2000/07/10 11:12:10 wiz Exp $
 
-MD5 (patch-aa) = 107218ef620bf64ee6df627a6073abe6
-MD5 (patch-ab) = 680cc823889179a80874989811f798a0
+MD5 (patch-aa) = 5b4d1d6972ea98e8185ac9c3c64a9ddf
+MD5 (patch-ab) = f0c923b676f378fc6f2ca55f7160d742
 MD5 (patch-ac) = 39721b5f833ab984a5a49a8cb11f4a84
 MD5 (patch-ad) = 6800c568c8aefaecb72cc5eeb34f10dd
-MD5 (patch-ae) = 2dad77b8f2f4f3a694b77f9e7f914b07
-MD5 (patch-af) = 6530b564c630af7eedecf54224956f23
-MD5 (patch-ag) = 3088e6375b6ea010ceff7c5faefa77fd
+MD5 (patch-ae) = 989347bdabe0650ed7d41c3703dc9bab
+MD5 (patch-ag) = 9b74942dc6e9d1e26fce2ff3bfdfe720
diff --git a/graphics/netpbm/patches/patch-aa b/graphics/netpbm/patches/patch-aa
index 8f9e6361d89..51ba95c85c5 100644
--- a/graphics/netpbm/patches/patch-aa
+++ b/graphics/netpbm/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.10 2000/06/05 00:36:31 wiz Exp $
+$NetBSD: patch-aa,v 1.11 2000/07/10 11:12:10 wiz Exp $
 
---- Makefile.config.orig	Thu Jun  1 19:17:32 2000
-+++ Makefile.config	Mon Jun  5 01:35:05 2000
+--- Makefile.config.orig	Thu Jun 22 19:48:03 2000
++++ Makefile.config	Sun Jul  9 23:54:46 2000
 @@ -29,8 +29,8 @@
  #
  # For cygwin, only static libraries work, so set STATICLIB = Y  .
@@ -13,7 +13,7 @@ $NetBSD: patch-aa,v 1.10 2000/06/05 00:36:31 wiz Exp $
  
  # The following are commands for the build process to use.  These values
  # do not get built into anything.
-@@ -39,14 +39,15 @@
+@@ -39,19 +39,20 @@
  #Tru64:
  #CC =		cc
  #CC =		gcc
@@ -29,27 +29,33 @@ $NetBSD: patch-aa,v 1.10 2000/06/05 00:36:31 wiz Exp $
  #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
-@@ -59,7 +60,7 @@
  # MAKE is set automatically by Make to what was used to invoke Make.
  SHELL =	/bin/sh
  
--INSTALL = install
-+INSTALL = install -c
+-INSTALL = ginstall
++#INSTALL = ginstall
  # Solaris:
  #INSTALL = /usr/ucb/install
  #Tru64:
-@@ -73,7 +74,7 @@
- 
- # C compiler options
+@@ -59,7 +60,7 @@
+ #OSF1:
+ #INSTALL = installosf
+ # ?
+-#INSTALL = install
++INSTALL = install -c
  
+ # Normally the man pages are installed using "install".  But via this
+ # variable, you can use something else, for example a script that
+@@ -79,7 +80,7 @@
+ # -ansi and -Werror should work too, but are not included
+ # by default because there's no point in daring the build to fail.
+ # -pedantic isn't a problem because it causes at worst a warning.
 -CFLAGS = -pedantic -O2 -Wall -Wno-uninitialized $(CDEBUG)
 +CFLAGS += -pedantic -Wall -Wno-uninitialized $(CDEBUG)
  # On DEC Tru64 4.0F (at least), you need -DLONG_32 for ppmtompeg.
  #Tru64:
  #CFLAGS = -O2 -std1 DLONG_32 $(CDEBUG)
-@@ -87,7 +88,7 @@
+@@ -93,7 +94,7 @@
    
  # linker options.  
  
@@ -58,7 +64,7 @@ $NetBSD: patch-aa,v 1.10 2000/06/05 00:36:31 wiz Exp $
  # Eunice users may want to use -noshare so that the executables can
  # run standalone:
  #LDFLAGS = -noshare
-@@ -139,11 +140,11 @@
+@@ -148,11 +149,11 @@
  # but otherwise will not.
  
  # Use the Tiff library included with Netpbm:
@@ -74,7 +80,7 @@ $NetBSD: patch-aa,v 1.10 2000/06/05 00:36:31 wiz Exp $
  # OSF, Tru64:
  #TIFFHDR_DIR = /usr/local1/DEC/include
  #TIFFLIB_DIR = /usr/local1/DEC/lib
-@@ -164,11 +165,11 @@
+@@ -173,11 +174,11 @@
  # at least JPEGLIB_DIR here, or the tiff converters will not build at
  # all.
  
@@ -90,7 +96,7 @@ $NetBSD: patch-aa,v 1.10 2000/06/05 00:36:31 wiz Exp $
  # OSF, Tru64:
  #JPEGLIB_DIR = /usr/local1/DEC/lib
  #JPEGHDR_DIR = /usr/local1/DEC/include
-@@ -186,11 +187,11 @@
+@@ -195,11 +196,11 @@
  # here.  If you do not have the PNG library, and still want to
  # successully build everything else, put NONE for these.
  
@@ -106,7 +112,7 @@ $NetBSD: patch-aa,v 1.10 2000/06/05 00:36:31 wiz Exp $
  # OSF/Tru64:
  #PNGLIB_DIR = /usr/local1/DEC/lib
  #PNGHDR_DIR = /usr/local1/DEC/include
-@@ -296,8 +297,8 @@
+@@ -305,8 +306,8 @@
  #be a rule in the makefiles to make whatever the fliename turns out to be.
  #Only .a and .so work.
  ifeq ($(STATICLIB),Y)
diff --git a/graphics/netpbm/patches/patch-ab b/graphics/netpbm/patches/patch-ab
index eff6db2c9f4..38ef014fdff 100644
--- a/graphics/netpbm/patches/patch-ab
+++ b/graphics/netpbm/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.7 2000/06/05 01:13:35 hubertf Exp $
+$NetBSD: patch-ab,v 1.8 2000/07/10 11:12:10 wiz Exp $
 
---- Makefile.common.orig	Thu Jun  1 19:38:14 2000
-+++ Makefile.common	Mon Jun  5 01:38:40 2000
+--- Makefile.common.orig	Fri Jun 30 21:59:36 2000
++++ Makefile.common	Sun Jul  9 23:51:05 2000
 @@ -67,7 +67,7 @@
  $(OBJECTS): %.o: %.c
  	$(CC) -c $(CFLAGS) $(INCLUDE) -o $@ $<
@@ -31,9 +31,9 @@ $NetBSD: patch-ab,v 1.7 2000/06/05 01:13:35 hubertf Exp $
 +lib$(LIBROOT).la: $(LIBOBJECTS) $(LIBOBJECTS_X)
 +	$(LIBTOOL) --mode=link $(CC) -rpath $(PREFIX)/lib -version-info $(MAJ):$(MIN) -o $@ $(LIBOBJECTS:.o=.lo) $(LIBOBJECTS_X:.o=.lo)
  
- # Some maintenance notes about $(INSTALL):  Some install programs can install
- # multiple files in one shot; others can take only one file at a time.  Some
-@@ -157,7 +155,7 @@
+ # Some maintenance notes about $(INSTALL): Some install programs can
+ # install multiple files in one shot; others can take only one file at
+@@ -163,7 +161,7 @@
  # Make and Install know that pbmmake.exe counts as pbmmake.
  	for x in $(BINARIES); \
  	do \
@@ -42,7 +42,7 @@ $NetBSD: patch-ab,v 1.7 2000/06/05 01:13:35 hubertf Exp $
  	done
  
  .PHONY: install.script
-@@ -208,8 +206,8 @@
+@@ -214,8 +212,8 @@
  # built.  If a previous make STATICLIB=N didn't build the static
  # library, the dependency here will do that.
  .PHONY: install.staticlib
@@ -53,7 +53,7 @@ $NetBSD: patch-ab,v 1.7 2000/06/05 01:13:35 hubertf Exp $
  
  .PHONY: install.lib.common
  ifeq ($(NETPBMLIBSUFFIX),so)
-@@ -223,7 +221,7 @@
+@@ -229,7 +227,7 @@
  
  .PHONY: clean.common
  clean.common:
diff --git a/graphics/netpbm/patches/patch-ae b/graphics/netpbm/patches/patch-ae
index 4f356ce5916..3fd66a724fc 100644
--- a/graphics/netpbm/patches/patch-ae
+++ b/graphics/netpbm/patches/patch-ae
@@ -1,13 +1,15 @@
-$NetBSD: patch-ae,v 1.5 2000/06/05 00:36:31 wiz Exp $
+$NetBSD: patch-ae,v 1.6 2000/07/10 11:12:10 wiz Exp $
 
---- pbm/pbmtoppa/Makefile.orig	Thu Jun  1 19:27:29 2000
-+++ pbm/pbmtoppa/Makefile	Mon Jun  5 01:44:49 2000
-@@ -15,7 +15,7 @@
- merge: pbmtoppa
+--- ppm/ppmtompeg/parallel.c.orig	Fri Jun 30 20:04:09 2000
++++ ppm/ppmtompeg/parallel.c	Mon Jul 10 00:37:49 2000
+@@ -70,10 +70,6 @@
+  *
+  */
  
- pbmtoppa: pbmtoppa.o ppa.o pbm.o cutswath.o $(NETPBMLIBS) $(LIBOPT)
--	$(CC) $(LDFLAGS) -o pbmtoppa pbmtoppa.o ppa.o pbm.o cutswath.o \
-+	$(LD) $(LDFLAGS) -o pbmtoppa pbmtoppa.o ppa.o pbm.o cutswath.o \
- 	  `$(LIBOPT) $(NETPBMLIBS)`
- 
- %.o: %.c
+-#define _POSIX_SOURCE
+-#define _POSIX_C_SOURCE 2
+-    /* This makes sure pclose() is in stdio.h */
+-
+ /*==============*
+  * HEADER FILES *
+  *==============*/
diff --git a/graphics/netpbm/patches/patch-af b/graphics/netpbm/patches/patch-af
deleted file mode 100644
index e52e2a41fee..00000000000
--- a/graphics/netpbm/patches/patch-af
+++ /dev/null
@@ -1,56 +0,0 @@
-$NetBSD: patch-af,v 1.5 2000/06/05 01:13:35 hubertf Exp $
-
---- GNUmakefile.orig	Mon Jun  5 01:55:19 2000
-+++ GNUmakefile	Mon Jun  5 01:55:47 2000
-@@ -79,21 +79,21 @@
- 
- .PHONY: install.bin
- install.bin:
--	mkinstalldirs $(INSTALLBINARIES)
-+	./mkinstalldirs $(INSTALLBINARIES)
- 	for i in $(SUBDIRS) ; do \
- 	    ( echo install.bin.$$i ; cd $$i ; $(MAKE) install.bin ); \
- 	done
- 
- .PHONY: install-merge
- install.merge:
--	mkinstalldirs $(INSTALLBINARIES)
-+	./mkinstalldirs $(INSTALLBINARIES)
- 	for i in $(SUBDIRS) ; do \
- 	    ( echo install.merge.$$i ; cd $$i ; $(MAKE) install.merge ); \
- 	done
- 
- .PHONY: install.lib
- install.lib:
--	mkinstalldirs $(INSTALLLIBS)
-+	./mkinstalldirs $(INSTALLLIBS)
- 	for i in $(SUBDIRS) ; do \
- 	    ( echo install.lib.$$i ; cd $$i ; $(MAKE) install.lib ); \
- 	done
-@@ -104,7 +104,7 @@
- 
- .PHONY: install.man
- install.man:
--	mkinstalldirs \
-+	./mkinstalldirs \
- 	    $(INSTALLMANUALS1) $(INSTALLMANUALS3) $(INSTALLMANUALS5)
- 	for i in $(SUBDIRS) ; do \
- 	    ( echo install.man.$$i ; cd $$i ; $(MAKE) install.man ); \
-@@ -115,7 +115,7 @@
- 
- .PHONY: install.hdr
- install.hdr:
--	mkinstalldirs $(INSTALLHDRS)
-+	./mkinstalldirs $(INSTALLHDRS)
- 	$(INSTALL) -c -m$(INSTALL_PERM_HDR) pbmplus.h $(INSTALLHDRS)
- 	$(INSTALL) -c -m$(INSTALL_PERM_HDR) shhopt/shhopt.h $(INSTALLHDRS)
- 	for i in $(SUBDIRS) ; do \
-@@ -128,7 +128,7 @@
- 
- .PHONY: install.staticlib
- install.staticlib:
--	mkinstalldirs $(INSTALLLIBS)
-+	./mkinstalldirs $(INSTALLLIBS)
- 	for i in $(SUBDIRS) ; do \
- 	    (echo install.staticlib.$$i; cd $$i; $(MAKE) install.staticlib ); \
- 	done
diff --git a/graphics/netpbm/patches/patch-ag b/graphics/netpbm/patches/patch-ag
index d2338c00cf9..afcc720addc 100644
--- a/graphics/netpbm/patches/patch-ag
+++ b/graphics/netpbm/patches/patch-ag
@@ -1,11 +1,13 @@
-$NetBSD: patch-ag,v 1.3 2000/06/24 01:49:03 dmcmahill Exp $
+$NetBSD: patch-ag,v 1.4 2000/07/10 11:12:11 wiz Exp $
 
---- pbmplus.h.orig	Fri May 26 14:50:50 2000
-+++ pbmplus.h	Fri Jun 23 21:42:25 2000
-@@ -52,5 +52,5 @@
+--- pbmplus.h.orig	Mon Jun 19 21:24:29 2000
++++ pbmplus.h	Sun Jul  9 23:51:24 2000
+@@ -51,7 +51,7 @@
+ #define RGB_DB1 "PBMplus_Dir:RGB.TXT"
  #define RGB_DB2 "PBMplus_Dir:RGB.TXT"
  #else
 -#define RGB_DB1 "/usr/lib/X11/rgb.txt"
 +#define RGB_DB1 "@X11BASE@/lib/X11/rgb.txt"
  #define RGB_DB2 "/usr/openwin/lib/rgb.txt"
  #endif
+ 
diff --git a/graphics/netpbm/pkg/DESCR b/graphics/netpbm/pkg/DESCR
index a78213e8cc7..9a52269f408 100644
--- a/graphics/netpbm/pkg/DESCR
+++ b/graphics/netpbm/pkg/DESCR
@@ -6,178 +6,3 @@ made. After the latest release of Pbmplus, a lot of additional filters
 have been circulating on the net. The aim of Netpbm was, to collect
 these and to turn them into a package. This work has been performed by
 a group of programmers all over the world.
-
-anytopnm - attempt to convert an unknown type of image file to a portable anymap
-asciitopgm - convert ASCII graphics into a portable graymap
-atktopbm - convert Andrew Toolkit raster object to portable bitmap
-bioradtopgm - convert a Biorad confocal file into a portable graymap
-bmptoppm - convert a BMP file into a portable pixmap
-brushtopbm - convert a doodle brush file into a portable bitmap
-cmuwmtopbm - convert a CMU window manager bitmap into a portable bitmap
-fitstopnm - convert a FITS file into a portable anymap
-fstopgm - convert a Usenix FaceSaver(tm) file into a portable graymap
-g3topbm - convert a Group 3 fax file into a portable bitmap
-gemtopbm - convert a GEM .img file into a portable bitmap
-giftopnm - convert a GIF file into a portable anymap
-gouldtoppm - convert Gould scanner file into a portable pixmap
-hipstopgm - convert a HIPS file into a portable graymap
-hpcdtoppm v0.3 - convert a Photo-CD file into a portable pixmap
-icontopbm - convert a Sun icon into a portable bitmap
-ilbmtoppm - convert an ILBM file into a portable pixmap
-imgtoppm - convert an Img-whatnot file into a portable pixmap
-lispmtopgm - convert a Lisp Machine bitmap file into pgm format
-macptopbm - convert a MacPaint file into a portable bitmap
-mgrtopbm - convert a MGR bitmap into a portable bitmap
-mtvtoppm - convert output from the MTV or PRT ray tracers into a portable pixmap
-pbmclean - flip isolated pixels in portable bitmap
-pbmlife - apply Conway's rules of Life to a portable bitmap
-pbmmake - create a blank bitmap of a specified size
-pbmmask - create a mask bitmap from a regular bitmap
-pbmpscale - enlarge a portable bitmap with edge smoothing
-pbmreduce - read a portable bitmap and reduce it N times
-pbmtext - render text into a bitmap
-pbmto10x - convert a portable bitmap into Gemini 10X printer graphics
-pbmto4425 - Display PBM images on an AT&T 4425 terminal
-pbmtoascii - convert a portable bitmap into ASCII graphics
-pbmtoatk - convert portable bitmap to Andrew Toolkit raster object
-pbmtobg - convert a portable bitmap into BitGraph graphics
-pbmtocmuwm - convert a portable bitmap into a CMU window manager bitmap
-pbmtoepsi - convert a portable bitmap into an encapsulated PostScript
-pbmtoepson - convert a portable bitmap into Epson printer graphics
-pbmtog3 - convert a portable bitmap into a Group 3 fax file
-pbmtogem - convert a portable bitmap into a GEM .img file
-pbmtogo - convert a portable bitmap into compressed GraphOn graphics
-pbmtoicon - convert a portable bitmap into a Sun icon
-pbmtolj - convert a portable bitmap into HP LaserJet format
-pbmtoln03 - convert protable bitmap to DEC LN03+ Sixel output
-pbmtolps - convert portable bitmap to PostScript
-pbmtomacp - convert a portable bitmap into a MacPaint file
-pbmtomgr - convert a portable bitmap into a MGR bitmap
-pbmtopgm - convert portable bitmap to portable graymap by averaging areas
-pbmtopi3 - convert a portable bitmap into an Atari Degas .pi3 file 
-pbmtopk - convert a portable bitmap into a packed (PK) format font
-pbmtoplot - convert a portable bitmap into a Unix plot(5) file
-pbmtoptx - convert a portable bitmap into Printronix printer graphics
-pbmtox10bm - convert a portable bitmap into an X10 bitmap
-pbmtoxbm - convert a portable bitmap into an X11 bitmap
-pgmtoybm - convert a portable bitmap into a Bennet Yee "face" file
-pbmtozinc - convert a portable bitmap into a Zinc bitmap
-pbmupc - create a Universal Product Code bitmap
-pcxtoppm - convert a PCX file into a portable pixmap
-pgmbentley - Bentleyize a portable graymap
-pgmcrater - create cratered terrain by fractal forgery
-pgmedge - edge-detect a portable graymap
-pgmenhance - edge-enhance a portable graymap
-pgmhist - print a histogram of the values in a portable graymap
-pgmkernel - generate a convolution kernel
-pgmnoise - create a graymap made up of white noise
-pgmnorm - normalize the contrast in a portable graymap
-pgmoil - turn a portable graymap into an oil painting
-pgmramp - generate a grayscale ramp
-pgmtexture - calculate textural features on a portable graymap
-pgmtofs - convert portable graymap to Usenix FaceSaver(tm) format
-pgmtolispm - convert a portable graymap into Lisp Machine format
-pgmtopbm - convert a portable graymap into a portable bitmap
-pgmtoppm - colorize a portable graymap into a portable pixmap
-pi1toppm - convert an Atari Degas .pi1 into a portable pixmap
-pi3topbm - convert an Atari Degas .pi3 file into a portable bitmap
-picttoppm - convert a Macintosh PICT file into a portable pixmap
-pjtoppm - convert an HP PaintJet file to a portable pixmap
-pktopbm - convert packed (PK) format font into portable bitmap(s)
-pnmalias - antialias a portable anyumap.
-pnmarith - perform arithmetic on two portable anymaps
-pnmcat - concatenate portable anymaps
-pnmcomp - composite two portable anymap files together
-pnmconvol - general MxN convolution on a portable anymap
-pnmcrop - crop a portable anymap
-pnmcut - cut a rectangle out of a portable anymap
-pnmdepth - change the maxval in a portable anymap
-pnmenlarge - read a portable anymap and enlarge it N times
-pnmfile - describe a portable anymap
-pnmflip - perform one or more flip operations on a portable anymap
-pnmgamma - perform gamma correction on a portable anymap
-pnmhistmap - draw a histogram for a PGM or PPM file
-pnmindex - build a visual index of a bunch of anymaps
-pnminvert - invert a portable anymap
-pnmmargin - add a border to a portable anymap
-pnmnlfilt - non-linear filters: smooth, alpha trim mean, optimal
-pnmnoraw - force a portable anymap into plain format
-pnmpad - add borders to portable anymap
-pnmpaste - paste a rectangle into a portable anymap
-pnmrotate - rotate a portable anymap by some angle
-pnmscale - scale a portable anymap
-pnmshear - shear a portable anymap by some angle
-pnmsmooth - smooth out an image
-pnmtile - replicate a portable anymap into a specified size
-pnmtoddif - Convert a portable anymap to DDIF format
-pnmtofits - convert a portable anymap into FITS format
-pnmtops - convert portable anymap to PostScript
-pnmtorast - convert a portable pixmap into a Sun rasterfile
-pnmtosgi - convert a portable anymap to a SGI image file
-pnmtosir - convert a portable anymap into a Solitaire format
-pnmtotiff - convert a a portable anymap into a TIFF file
-pnmtoxwd - convert a portable anymap into an X11 window dump
-ppm3d - convert two portable pixmap into a red/blue 3d glasses pixmap
-ppmbrighten - change an images Saturation and Value from an HSV map
-ppmchange - change all pixels of one color to another in a portable pixmap
-ppmdim - dim a portable pixmap down to total blackness
-ppmdist - simplistic grayscale assignment for machine generated, color images
-ppmdither - ordered dither for color images
-ppmflash - brighten a picture up to complete white-out
-ppmforge - fractal forgeries of clouds, planets, and starry skies
-ppmhist - print a histogram of a portable pixmap
-ppmmake - create a pixmap of a specified size and color
-ppmmix - blend together two portable pixmaps
-ppmnorm - normalize the contrast in a portable pixmap
-ppmntsc - make a portable pixmap look like taken from an American TV
-ppmpat - make a pretty pixmap
-ppmquant - quantize the colors in a portable pixmap down to a specified number
-ppmquantall - run ppmquant on a bunch of files all at once, so they share a common colormap
-ppmqvga - 8 plane quantization
-ppmrelief - run a Laplacian relief filter on a portable pixmap
-ppmshift - shift lines of a portable pixmap left or right by a random amount
-ppmspread - displace a portable pixmap's pixels by a random amount
-ppmtoacad - convert portable pixmap to AutoCAD database or slide
-ppmtobmp - convert a portable pixmap into a BMP file
-ppmtogif - convert a portable pixmap into a GIF file
-ppmtoicr - convert a portable pixmap into NCSA ICR format 
-ppmtoilbm - convert a portable pixmap into an ILBM file
-ppmtomap - extract all colors from a portable pixmap
-ppmtomitsu - convert a portable pixmap to a Mitsubishi S340-10 file
-ppmtopcx - convert a portable pixmap into a PCX file
-ppmtopgm - convert a portable pixmap into a portable graymap
-ppmtopi1 - convert a portable pixmap into an Atari Degas .pi1 file
-ppmtopict - convert a portable pixmap into a Macintosh PICT file
-ppmtopj - convert a portable pixmap to an HP PaintJet file
-ppmtopjxl - convert a portable pixmap into an HP PaintJet XL PCL file
-ppmtopuzz - convert a portable pixmap into an X11 "puzzle" file
-ppmtorgb3 - separate a portable pixmap into three portable graymaps
-ppmtosixel - convert a portable pixmap into DEC sixel format
-ppmtotga - convert portable pixmap into a TrueVision Targa file
-ppmtouil - convert a portable pixmap into a Motif UIL icon file
-ppmtoxpm - convert a portable pixmap into an X11 pixmap
-ppmtoyuv - convert a portable pixmap into an Abekas YUV file
-ppmtoyuvsplit - convert a portable pixmap into 3 subsampled raw YUV files
-psidtopgm - convert PostScript "image" data into a portable graymap
-qrttoppm - convert output from the QRT ray tracer into a portable pixmap
-rasttopnm - convert a Sun rasterfile into a portable anymap
-rawtopgm - convert raw grayscale bytes into a portable graymap
-rawtoppm - convert raw RGB bytes into a portable pixmap
-rgb3toppm - combine three portable graymaps into one portable pixmap
-sgitopnm - convert a SGI image file to a portable anymap
-sirtopnm - convert a Solitaire file into a portable anymap
-sldtoppm - convert an AutoCAD slide file into a portable pixmap
-spctoppm - convert an Atari compressed Spectrum file into a portable pixmap
-spottopgm - convert SPOT satellite images to Portable Greymap format
-sputoppm - convert an Atari uncompressed Spectrum file into a portable pixmap
-tgatoppm - convert TrueVision Targa file into a portable pixmap
-tifftopnm - convert a TIFF file into a portable anymap
-xbmtopbm - convert an X11 or X10 bitmap into a portable bitmap
-ximtoppm - convert an Xim file into a portable pixmap
-xpmtoppm - convert an X11 pixmap into a portable pixmap
-xvminitoppm - convert a XV "thumbnail" picture to PPM
-xwdtopnm - convert a X11 or X10 window dump file into a portable anymap
-ybmtopbm - convert a Bennet Yee "face" file into a portable bitmap
-yuvplittoppm - convert a Y- an U- and a V-file into a portable pixmap.
-yuvtoppm - convert Abekas YUV bytes into a portable pixmap
-zeisstopnm - convert a Zeiss confocal file into a portable anymap
diff --git a/graphics/netpbm/pkg/PLIST b/graphics/netpbm/pkg/PLIST
index 1a9432f8720..041a1ca9088 100644
--- a/graphics/netpbm/pkg/PLIST
+++ b/graphics/netpbm/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2000/06/05 00:36:32 wiz Exp $
+@comment $NetBSD: PLIST,v 1.10 2000/07/10 11:12:11 wiz Exp $
 bin/anytopnm
 bin/asciitopgm
 bin/atktopbm
@@ -59,6 +59,7 @@ bin/pbmtopk
 bin/pbmtoplot
 bin/pbmtoppa
 bin/pbmtoptx
+bin/pbmtowbmp
 bin/pbmtox10bm
 bin/pbmtoxbm
 bin/pbmtoybm
@@ -113,6 +114,7 @@ bin/pnmpaste
 bin/pnmrotate
 bin/pnmscale
 bin/pnmshear
+bin/pnmsplit
 bin/pnmsmooth
 bin/pnmtile
 bin/pnmtoddif
@@ -196,6 +198,7 @@ bin/spottopgm
 bin/sputoppm
 bin/tgatoppm
 bin/tifftopnm
+bin/wbmptopbm
 bin/winicontoppm
 bin/xbmtopbm
 bin/ximtoppm
@@ -215,16 +218,16 @@ include/ppmcmap.h
 include/shhopt.h
 lib/libpbm.a
 lib/libpbm.la
-lib/libpbm.so.9.3
+lib/libpbm.so.${VERS}
 lib/libpgm.a
 lib/libpgm.la
-lib/libpgm.so.9.3
+lib/libpgm.so.${VERS}
 lib/libpnm.a
 lib/libpnm.la
-lib/libpnm.so.9.3
+lib/libpnm.so.${VERS}
 lib/libppm.a
 lib/libppm.la
-lib/libppm.so.9.3
+lib/libppm.so.${VERS}
 man/man1/anytopnm.1
 man/man1/asciitopgm.1
 man/man1/atktopbm.1
@@ -284,6 +287,7 @@ man/man1/pbmtopk.1
 man/man1/pbmtoplot.1
 man/man1/pbmtoppa.1
 man/man1/pbmtoptx.1
+man/man1/pbmtowbmp.1
 man/man1/pbmtox10bm.1
 man/man1/pbmtoxbm.1
 man/man1/pbmtoybm.1
@@ -338,6 +342,7 @@ man/man1/pnmrotate.1
 man/man1/pnmscale.1
 man/man1/pnmshear.1
 man/man1/pnmsmooth.1
+man/man1/pnmsplit.1
 man/man1/pnmtile.1
 man/man1/pnmtoddif.1
 man/man1/pnmtofits.1
@@ -421,6 +426,7 @@ man/man1/spottopgm.1
 man/man1/sputoppm.1
 man/man1/tgatoppm.1
 man/man1/tifftopnm.1
+man/man1/wbmptopbm.1
 man/man1/winicontoppm.1
 man/man1/xbmtopbm.1
 man/man1/ximtoppm.1