Update to 9.1

PR:		18437
Submitted by:	KATO Tsuguru <tkato@prontomail.ne.jp>

20 files changed, 440 insertions, 530 deletions

diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index 4f6ab862ecd0..0cc8b6e7512a 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	netpbm
-PORTVERSION=	8.4
+PORTVERSION=	9.1
 CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR=	apps/graphics/convert
+MASTER_SITES=	http://download.sourceforge.net/netpbm/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
@@ -19,38 +18,40 @@ LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
 		png.3:${PORTSDIR}/graphics/png
 
 USE_GMAKE=	yes
+MAKEFILE=	GNUmakefile
 ALL_TARGET=	merge
 INSTALL_TARGET=	install-merge
 
 MAN1=	anytopnm.1 asciitopgm.1 atktopbm.1 bioradtopgm.1 bmptoppm.1 \
 	brushtopbm.1 cmuwmtopbm.1 eyuvtoppm.1 fitstopnm.1 fstopgm.1 g3topbm.1 \
-	gemtopbm.1 giftopnm.1 gouldtoppm.1 hipstopgm.1 hpcdtoppm.1 \
+	gemtopnm.1 giftopnm.1 gouldtoppm.1 hipstopgm.1 hpcdtoppm.1 \
 	icontopbm.1 ilbmtoppm.1 imgtoppm.1 jpegtopnm.1 lispmtopgm.1 \
-	macptopbm.1 mgrtopbm.1 mtvtoppm.1 pbmclean.1 pbmlife.1 pbmmake.1 \
-	pbmmask.1 pbmpscale.1 pbmreduce.1 pbmtext.1 pbmto10x.1 pbmto4425.1 \
-	pbmtoascii.1 pbmtoatk.1 pbmtobbnbg.1 pbmtocmuwm.1 pbmtoepsi.1 \
-	pbmtoepson.1 pbmtog3.1 pbmtogem.1 pbmtogo.1 pbmtoicon.1 pbmtolj.1 \
-	pbmtoln03.1 pbmtolps.1 pbmtomacp.1 pbmtomgr.1 pbmtopgm.1 pbmtopi3.1 \
-	pbmtopk.1 pbmtoplot.1 pbmtoptx.1 pbmtox10bm.1 pbmtoxbm.1 pbmtoybm.1 \
-	pbmtozinc.1 pbmupc.1 pcxtoppm.1 pgmbentley.1 pgmcrater.1 pgmedge.1 \
-	pgmenhance.1 pgmhist.1 pgmkernel.1 pgmnoise.1 pgmnorm.1 pgmoil.1 \
-	pgmramp.1 pgmtexture.1 pgmtofs.1 pgmtolispm.1 pgmtopbm.1 pgmtoppm.1 \
-	pi1toppm.1 pi3topbm.1 picttoppm.1 pjtoppm.1 pktopbm.1 pngtopnm.1 \
-	pnmalias.1 pnmarith.1 pnmcat.1 pnmcomp.1 pnmconvol.1 pnmcrop.1 \
-	pnmcut.1 pnmdepth.1 pnmenlarge.1 pnmfile.1 pnmflip.1 pnmgamma.1 \
-	pnmhisteq.1 pnmhistmap.1 pnmindex.1 pnminvert.1 pnmmargin.1 \
-	pnmnlfilt.1 pnmpad.1 pnmpaste.1 pnmrotate.1 pnmscale.1 pnmshear.1 \
-	pnmsmooth.1 pnmtile.1 pnmtoddif.1 pnmtofits.1 pnmtoplainpnm.1 \
-	pnmtopng.1 pnmtops.1 pnmtorast.1 pnmtosgi.1 pnmtosir.1 pnmtotiff.1 \
-	pnmtotiffcmyk.1 pnmtoxwd.1 ppm3d.1 ppmbrighten.1 ppmchange.1 ppmcie.1 \
-	ppmdim.1 ppmdist.1 ppmdither.1 ppmfade.1 ppmflash.1 ppmforge.1 \
-	ppmhist.1 ppmlabel.1 ppmmake.1 ppmmix.1 ppmnorm.1 ppmntsc.1 ppmpat.1 \
-	ppmquant.1 ppmquantall.1 ppmqvga.1 ppmrelief.1 ppmshadow.1 ppmshift.1 \
+	macptopbm.1 mdatopbm.1 mgrtopbm.1 mtvtoppm.1 pbmclean.1 pbmlife.1 \
+	pbmmake.1 pbmmask.1 pbmpscale.1 pbmpage.1 pbmreduce.1 pbmtext.1 \
+	pbmto10x.1 pbmto4425.1 pbmtoascii.1 pbmtoatk.1 pbmtobbnbg.1 \
+	pbmtocmuwm.1 pbmtoepsi.1 pbmtoepson.1 pbmtog3.1 pbmtogem.1 pbmtogo.1 \
+	pbmtoicon.1 pbmtolj.1 pbmtoln03.1 pbmtolps.1 pbmtomacp.1 pbmtomda.1 \
+	pbmtomgr.1 pbmtopgm.1 pbmtopi3.1 pbmtopk.1 pbmtoplot.1 pbmtoptx.1 \
+	pbmtox10bm.1 pbmtoxbm.1 pbmtoybm.1 pbmtozinc.1 pbmupc.1 pcxtoppm.1 \
+	pgmbentley.1 pgmcrater.1 pgmedge.1 pgmenhance.1 pgmhist.1 pgmkernel.1 \
+	pgmnoise.1 pgmnorm.1 pgmoil.1 pgmramp.1 pgmtexture.1 pgmtofs.1 \
+	pgmtolispm.1 pgmtopbm.1 pgmtoppm.1 pi1toppm.1 pi3topbm.1 picttoppm.1 \
+	pjtoppm.1 pktopbm.1 pngtopnm.1 pnmalias.1 pnmarith.1 pnmcat.1 \
+	pnmcomp.1 pnmconvol.1 pnmcrop.1 pnmcut.1 pnmdepth.1 pnmenlarge.1 \
+	pnmfile.1 pnmflip.1 pnmgamma.1 pnmhisteq.1 pnmhistmap.1 pnmindex.1 \
+	pnminvert.1 pnmmargin.1 pnmnlfilt.1 pnmpad.1 pnmpaste.1 pnmrotate.1 \
+	pnmscale.1 pnmshear.1 pnmsmooth.1 pnmtile.1 pnmtoddif.1 pnmtofits.1 \
+	pnmtoplainpnm.1 pnmtopng.1 pnmtops.1 pnmtorast.1 pnmtosgi.1 \
+	pnmtosir.1 pnmtotiff.1 pnmtotiffcmyk.1 pnmtoxwd.1 ppm3d.1 \
+	ppmbrighten.1 ppmchange.1 ppmcie.1 ppmcolormask.1 ppmdim.1 ppmdist.1 \
+	ppmdither.1 ppmfade.1 ppmflash.1 ppmforge.1 ppmhist.1 ppmlabel.1 \
+	ppmmake.1 ppmmix.1 ppmnorm.1 ppmntsc.1 ppmpat.1 ppmquant.1 \
+	ppmquantall.1 ppmqvga.1 ppmrelief.1 ppmshadow.1 ppmshift.1 \
 	ppmspread.1 ppmtoacad.1 ppmtobmp.1 ppmtoeyuv.1 ppmtogif.1 ppmtoicr.1 \
 	ppmtojpeg.1 ppmtoilbm.1 ppmtomap.1 ppmtomitsu.1 ppmtopcx.1 ppmtopgm.1 \
 	ppmtopi1.1 ppmtopict.1 ppmtopj.1 ppmtopjxl.1 ppmtopuzz.1 ppmtorgb3.1 \
 	ppmtosixel.1 ppmtotga.1 ppmtouil.1 ppmtoxpm.1 ppmtoyuv.1 \
-	ppmtoyuvsplit.1 psidtopgm.1 pstopnm.1 qrttoppm.1 rasttopnm.1 \
+	ppmtoyuvsplit.1 ppmtv.1 psidtopgm.1 pstopnm.1 qrttoppm.1 rasttopnm.1 \
 	rawtopgm.1 rawtoppm.1 rgb3toppm.1 sbigtopgm.1 sgitopnm.1 sirtopnm.1 \
 	sldtoppm.1 spctoppm.1 spottopgm.1 sputoppm.1 tgatoppm.1 tifftopnm.1 \
 	xbmtopbm.1 ximtoppm.1 xpmtoppm.1 xvminitoppm.1 xwdtopnm.1 ybmtopbm.1 \
diff --git a/graphics/netpbm/distinfo b/graphics/netpbm/distinfo
index 995ec8236263..7f25008636ab 100644
--- a/graphics/netpbm/distinfo
+++ b/graphics/netpbm/distinfo
@@ -1 +1 @@
-MD5 (netpbm-8.4.tgz) = e20d941cd36bc3af737f7c3cf79a8169
+MD5 (netpbm-9.1.tgz) = c2e8d85c371e4511aaf94f5da2d0afa0
diff --git a/graphics/netpbm/files/patch-aj b/graphics/netpbm/files/patch-aj
index 0c4acf838a2b..a2cb1fb0755f 100644
--- a/graphics/netpbm/files/patch-aj
+++ b/graphics/netpbm/files/patch-aj
@@ -1,6 +1,6 @@
---- pbmplus.h.orig	Tue Apr  4 02:34:36 2000
-+++ pbmplus.h	Sat Apr 15 08:00:00 2000
-@@ -24,6 +24,9 @@
+--- pbmplus.h.orig	Sat May  6 16:37:46 2000
++++ pbmplus.h	Mon May  8 00:00:00 2000
+@@ -25,6 +25,9 @@
  #include <errno.h>
  #endif
  #endif
@@ -10,7 +10,7 @@
  
  #if defined(USG) || defined(SVR4) || defined(VMS) || defined(__SVR4)
  #define SYSV
-@@ -34,7 +37,7 @@
+@@ -35,7 +38,7 @@
  ** and if you run on an Amiga, set AMIGA. If your compiler is ANSI C, you're
  ** probably better off setting SYSV - all it affects is string handling.
  */
@@ -19,43 +19,24 @@
  /* #define SYSV */
  /* #define MSDOS */
  /* #define AMIGA */
-@@ -46,7 +49,7 @@
- ** hex and decimal forms to specify colors (see ppm/pgmtoppm.1 for details).
+@@ -50,7 +53,7 @@
+    might be already set right now.  I couldn't figure out how, so I changed
+    their meanings and they are now set unconditionally.  -Bryan 00.05.03.
  */
- #ifndef RGB_DB
--#define RGB_DB "/usr/lib/X11/rgb"
-+#define RGB_DB "%%X11BASE%%/lib/X11/rgb"
- /*#define RGB_DB "/usr/openwin/lib/rgb.txt"*/
+-#define RGB_DB1 "/usr/lib/X11/rgb.txt"
++#define RGB_DB1 "%%X11BASE%%/lib/X11/rgb.txt"
+ #define RGB_DB2 "/usr/openwin/lib/rgb.txt"
  #ifdef VMS
- #define RGB_DB "PBMplus_Dir:RGB.TXT"
-@@ -117,6 +120,7 @@
- #ifndef VMS
- #include <unistd.h>
- #endif
-+#if !(defined(BSD) && (BSD >= 199306))
- extern int atoi();
- extern void exit();
- #ifndef __osf__
-@@ -124,6 +128,7 @@
- extern int write();
- #endif
- #endif
-+#endif
- 
- /* CONFIGURE: On most BSD systems, malloc() gets declared in stdlib.h, on
- ** system V, it gets declared in malloc.h. On some systems, malloc.h
-@@ -264,40 +269,6 @@
+ #define RGB_DB1 "PBMplus_Dir:RGB.TXT"
+@@ -286,37 +289,6 @@
+ int pm_writelittleshort ARGS(( FILE* out, short s ));
  int pm_readlittlelong ARGS(( FILE* in, long* lP ));
  int pm_writelittlelong ARGS(( FILE* out, long l ));
- 
 -
--/* Command line option parsing */
--#include "pbmplus.h"
--/* Shhopt is Sverre Huseby's command line parsing package, which makes
--   writing command parsing code quick and error free.  Some of the Netpbm
--   programs use it.
+-/* By making this <> instead of "", we avoid making shhopt.h a dependency
+-   of every program in the package when we do make dep.
 -*/
--#include "shhopt.h"
+-#include <shhopt.h>
 -
 -void pm_optParseOptions(int *argc, char *argv[],
 -                        optStruct opt[], int allowNegNum);
diff --git a/graphics/netpbm/files/patch-ay b/graphics/netpbm/files/patch-ay
index 348cefca96ca..eb200a8a4f64 100644
--- a/graphics/netpbm/files/patch-ay
+++ b/graphics/netpbm/files/patch-ay
@@ -1,15 +1,6 @@
---- pnm/pnmtotiffcmyk.c.orig	Fri Mar 24 09:17:16 2000
-+++ pnm/pnmtotiffcmyk.c	Sat Apr  1 12:00:00 2000
-@@ -57,7 +57,7 @@
- 
- #include "pnm.h"
- #include <math.h>
--#ifdef __osf__
-+#if defined(__osf__) || defined(__FreeBSD__)
- #include <float.h>
- #endif
- #include <limits.h>
-@@ -69,7 +69,9 @@
+--- pnm/pnmtotiffcmyk.c.orig	Wed Apr 26 13:25:15 2000
++++ pnm/pnmtotiffcmyk.c	Mon May  8 00:00:00 2000
+@@ -71,7 +71,9 @@
  #define VERSION 1.01
  
  /* beware - these evaluate more than once */
diff --git a/graphics/netpbm/files/patch-ba b/graphics/netpbm/files/patch-ba
index 9ecb6166ec66..e8a3f0690ea1 100644
--- a/graphics/netpbm/files/patch-ba
+++ b/graphics/netpbm/files/patch-ba
@@ -1,39 +1,58 @@
---- Makefile.orig	Sat Mar 25 02:47:02 2000
-+++ Makefile	Sat Apr  1 12:00:00 2000
+--- GNUmakefile.orig	Sat May  6 19:14:26 2000
++++ GNUmakefile	Mon May  8 00:00:00 2000
 @@ -30,7 +30,7 @@
  SRCDIR = .
  include $(SRCDIR)/Makefile.config
  
--SUBDIRS =	pbm pgm ppm pnm ppmtompeg
+-SUBDIRS =	pbm pgm ppm pnm ppmtompeg pbmtoppa
 +SUBDIRS =	pbm pgm ppm pnm
  
  # Note that the Tiff library, from the libtiff subdirectory, only gets built
  # if you specify the homegrown libtiff as $(TIFFLIB), in which case it is
-@@ -57,7 +57,10 @@
- 	./stamp-date
+@@ -57,8 +57,8 @@
+ 	$(SRCDIR)/stamp-date
  
  .PHONY: install
 -install: install.bin install.lib install.man 
+-install-merge: install.merge install.lib install.man
 +install: install.bin install.lib install.man install.hdr
-+
-+.PHONY: install-merge
 +install-merge: install.merge install.lib install.man install.hdr
  
  .PHONY: merge
  merge:  compile.h
-@@ -72,8 +75,8 @@
+@@ -68,21 +68,21 @@
+ 
+ .PHONY: install.bin
+ install.bin:
+-	$(INSTALL) -d -mu=rwx,go=rx $(INSTALLBINARIES)
++	-mkdir -p $(INSTALLBINARIES)
+ 	for i in $(SUBDIRS) ; do \
  	    ( echo install.bin.$$i ; cd $$i ; $(MAKE) install.bin ); \
  	done
  
 -.PHONY: install-merge
--install-merge:
 +.PHONY: install.merge
-+install.merge:
- 	-mkdir -p $(INSTALLBINARIES)
+ install.merge:
+-	$(INSTALL) -d -mu=rwx,go=rx $(INSTALLBINARIES)
++	-mkdir -p $(INSTALLBINARIES)
  	for i in $(SUBDIRS) ; do \
  	    ( echo install.merge.$$i ; cd $$i ; $(MAKE) install.merge ); \
-@@ -97,6 +100,13 @@
- 	-mkdir -p $(INSTALLMANUALS5)
+ 	done
+ 
+ .PHONY: install.lib
+ install.lib:
+-	$(INSTALL) -d -mu=rwx,go=rx $(INSTALLLIBS)
++	-mkdir -p $(INSTALLLIBS)
+ 	for i in $(SUBDIRS) ; do \
+ 	    ( echo install.lib.$$i ; cd $$i ; $(MAKE) install.lib ); \
+ 	done
+@@ -93,10 +93,17 @@
+ 
+ .PHONY: install.man
+ install.man:
+-	$(INSTALL) -d -mu=rwx,go=rx \
++	-mkdir -p \
+ 	    $(INSTALLMANUALS1) $(INSTALLMANUALS3) $(INSTALLMANUALS5)
  	for i in $(SUBDIRS) ; do \
  	    ( echo install.man.$$i ; cd $$i ; $(MAKE) install.man ); \
 +	done
diff --git a/graphics/netpbm/files/patch-bb b/graphics/netpbm/files/patch-bb
index dac21971085d..b6949010a281 100644
--- a/graphics/netpbm/files/patch-bb
+++ b/graphics/netpbm/files/patch-bb
@@ -1,6 +1,18 @@
---- Makefile.common.orig	Tue Apr  4 04:54:35 2000
-+++ Makefile.common	Sat Apr  8 12:00:00 2000
-@@ -47,7 +47,7 @@
+--- Makefile.common.orig	Sat May  6 19:03:55 2000
++++ Makefile.common	Mon May  8 00:00:00 2000
+@@ -56,9 +56,9 @@
+ #   directories in which to resolve inclusions by C files.
+ 
+ # Rule for objects.
+-$(OBJECTS): %.o: %.c
++$(OBJECTS) $(LIBOBJECTS): %.o: %.c
+ 	$(CC) -c $(CFLAGS) $(INCLUDE) -o $@ $<
+-$(LIBOBJECTS): %.o: %.c
++$(LIBSOBJECTS): %.so: %.c
+ 	$(CC) -c $(CFLAGS) $(CFLAGS_SHLIB) $(INCLUDE) -o $@ $<
+ 
+ $(MERGE_OBJECTS): %.o2: %.c
+@@ -68,7 +68,7 @@
  	$(CC) $(CFLAGS) -Wno-implicit -c -o $@ $<
  
  $(MERGENAME): $(MERGENAME).o $(MERGE_OBJECTS) $(NETPBMLIBS) 
@@ -9,72 +21,88 @@
  
  # 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
-@@ -56,31 +56,27 @@
+@@ -77,27 +77,26 @@
  install.merge: $(MERGENAME) $(NOMERGEBINARIES) install.script
- 	cd $(INSTALLBINARIES) ; rm -f $(BINARIES)
+ 	cd $(INSTALLBINARIES) ; rm -f $(BINARIES) $(MERGE_ALIASES)
  ifneq ($(MERGENAME)x,x)
--	cp $(MERGENAME) $(INSTALLBINARIES)
--	strip $(INSTALLBINARIES)/$(MERGENAME)
+-	$(INSTALL) -s -m$(INSTALL_PERM_BIN) $(MERGENAME) $(INSTALLBINARIES)
 +	${BSD_INSTALL_PROGRAM} $(MERGENAME) $(INSTALLBINARIES)
  	cd $(INSTALLBINARIES) ; \
  	   for i in $(BINARIES) $(MERGE_ALIASES) ; \
--             do ln -s $(MERGENAME) $$i ; \
-+             do ln -sf $(MERGENAME) $$i ; \
+-             do ln -s $(MERGENAME)$(EXE) $$i ; \
++             do ln -sf $(MERGENAME)$(EXE) $$i ; \
               done
  endif
  ifneq ($(NOMERGEBINARIES)x,x)
- 	cd $(INSTALLBINARIES) ; rm -f $(NOMERGEBINARIES)
--	cp $(NOMERGEBINARIES) $(INSTALLBINARIES)
--	cd $(INSTALLBINARIES) ; strip $(NOMERGEBINARIES)
+-	$(INSTALL) -s -m$(INSTALL_PERM_BIN) \
+-	  $(NOMERGEBINARIES) $(INSTALLBINARIES)
 +	${BSD_INSTALL_PROGRAM} $(NOMERGEBINARIES) $(INSTALLBINARIES)
  endif
  
  .PHONY: install.bin.common
  install.bin.common: $(BINARIES) install.script
- 	cd $(INSTALLBINARIES) ; rm -f $(BINARIES)
--	cp $(BINARIES) $(INSTALLBINARIES)
--	cd $(INSTALLBINARIES) ; strip $(BINARIES)
+ # 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)
 +	${BSD_INSTALL_PROGRAM} $(BINARIES) $(INSTALLBINARIES)
  
  .PHONY: install.script
  install.script: $(SCRIPTS)
  ifneq ($(SCRIPTS)x,x)
- 	cd $(INSTALLSCRIPTS) ; rm -f $(SCRIPTS)
--	cp $(SCRIPTS) $(INSTALLSCRIPTS)
--	cd $(INSTALLSCRIPTS) ; chmod +x $(SCRIPTS)
+-	$(INSTALL) -m$(INSTALL_PERM_BIN) $(SCRIPTS) $(INSTALLSCRIPTS)
 +	${BSD_INSTALL_SCRIPT} $(SCRIPTS) $(INSTALLSCRIPTS)
  endif
  
  .PHONY: install.man
-@@ -111,13 +107,12 @@
+@@ -127,43 +126,28 @@
+ # compile programs that use the Netpbm libraries.  Alternatively, you may
  # prefer not to "install" them, but just to access the Netpbm source
  # directory when you compile your programs.
- 	cd $(INSTALLHDRS) ; rm -f $(INTERFACE_HEADERS)
--	cp $(INTERFACE_HEADERS) $(INSTALLHDRS)
+-	$(INSTALL) -m$(INSTALL_PERM_HDR) \
+-	  $(INTERFACE_HEADERS) $(INSTALLHDRS)
 +	${BSD_INSTALL_DATA} $(INTERFACE_HEADERS) $(INSTALLHDRS)
  
--lib$(LIBROOT).so: lib$(LIBROOT).so.$(MAJ).$(MIN)
--	ln -sf lib$(LIBROOT).so.$(MAJ).$(MIN) $@
--lib$(LIBROOT).so.$(MAJ).$(MIN): $(LIBOBJECTS) $(LIBLIBS)
+ # The libxxx.so link is needed to link the executables.
+-lib$(LIBROOT).so: lib$(LIBROOT).so.$(MAJ)
++lib$(LIBROOT).so: lib$(LIBROOT).so.$(MAJ) lib$(LIBROOT).a
+ 	rm -f $@
+-	ln -s $< $@
+-# The libxxx.so.MAJ link is only needed to test the programs without
+-# installing the libraries (in that case, you also need to direct the 
+-# dynamic linker to the source directories, e.g. set LD_LIBRARY_PATH).
+-lib$(LIBROOT).so.$(MAJ): lib$(LIBROOT).so.$(MAJ).$(MIN)
+-	rm -f $@
+-	ln -s $< $@
+-lib$(LIBROOT).so.$(MAJ).$(MIN): $(LIBOBJECTS) $(LIBOBJECTS_X) $(LIBLIBS)
 -	$(LD) $(LDSHLIB) -Wl,-soname,lib$(LIBROOT).so.$(MAJ) -o $@ \
--          $(LIBOBJECTS) $(LIBLIBS) -lc
-+lib$(LIBROOT).so: lib$(LIBROOT).so.$(MAJ)
-+	ln -sf lib$(LIBROOT).so.$(MAJ) $@
-+lib$(LIBROOT).so.$(MAJ): lib$(LIBROOT).a $(LIBSOBJECTS) $(LIBLIBS)
-+	$(LD) $(LDSHLIB) -Wl,-soname,$@ -o $@ $(LIBSOBJECTS) $(LIBLIBS)
+-          $(LIBOBJECTS) $(LIBOBJECTS_X) $(LIBLIBS) -lc
++	ln -sf $< $@
++lib$(LIBROOT).so.$(MAJ): $(LIBSOBJECTS) $(LIBLIBS)
++	$(LD) $(LDSHLIB) -Wl,-soname,$@ -o $@ $(LIBSOBJECTS)
  
- lib$(LIBROOT).a: $(LIBOBJECTS)
+ # Static library.  Unused by default, but with a small change to make files...
+-lib$(LIBROOT).a: $(LIBOBJECTS) $(LIBOBJECTS_X)
++lib$(LIBROOT).a: $(LIBOBJECTS)
  	-rm -f $@
-@@ -126,11 +121,11 @@
+-	ar rc $@ $(LIBOBJECTS) $(LIBOBJECTS_X)
++	ar rc $@ $(LIBOBJECTS)
+ 	-ranlib $@
  
  
  .PHONY: install.lib.common
+-ifeq ($(NETPBMLIBSUFFIX),so)
+-# install a shared library
 -install.lib.common: lib$(LIBROOT).so.$(MAJ).$(MIN) 
 -	cd $(INSTALLLIBS) ; rm -f lib$(LIBROOT).so.$(MAJ).*
--	cp $< $(INSTALLLIBS)
--	cd $(INSTALLLIBS) ; ln -sf $< lib$(LIBROOT).so
--	cd $(INSTALLLIBS) ; ln -sf $< lib$(LIBROOT).so.$(MAJ)
-+install.lib.common: lib$(LIBROOT).a lib$(LIBROOT).so
+-	$(INSTALL) -m$(INSTALL_PERM_LIBD) $< $(INSTALLLIBS)
+-	cd $(INSTALLLIBS) ; rm -f lib$(LIBROOT).so; ln -s $< lib$(LIBROOT).so
+-	cd $(INSTALLLIBS) ; rm -f; ln -s $< lib$(LIBROOT).so.$(MAJ)
+-else
+-# install a static library
+-install.lib.common: lib$(LIBROOT).a
+-	$(INSTALL) -m$(INSTALL_PERM_LIBS) $< $(INSTALLLIBS)/$<
+-endif
++install.lib.common: lib$(LIBROOT).so lib$(LIBROOT).a
 +	cd $(INSTALLLIBS) ; rm -f lib$(LIBROOT).*
 +	${BSD_INSTALL_DATA} lib$(LIBROOT).a $(INSTALLLIBS)
 +	${BSD_INSTALL_DATA} lib$(LIBROOT).so.$(MAJ) $(INSTALLLIBS)
diff --git a/graphics/netpbm/files/patch-bc b/graphics/netpbm/files/patch-bc
index a44c39fea28d..2daf66ab170b 100644
--- a/graphics/netpbm/files/patch-bc
+++ b/graphics/netpbm/files/patch-bc
@@ -1,59 +1,60 @@
---- Makefile.config.orig	Sat Mar 25 02:39:40 2000
-+++ Makefile.config	Sat Apr  1 12:00:00 2000
-@@ -29,12 +29,12 @@
+--- Makefile.config.orig	Sat May  6 17:47:58 2000
++++ Makefile.config	Mon May  8 00:00:00 2000
+@@ -34,12 +34,12 @@
  # The C compiler (including macro preprocessor)
  #CC =		cc
  #CC =		gcc
 -CC =		gcc -fpcc-struct-return
 +CC ?=		gcc -fpcc-struct-return
  
- # The linker
+ # The linker.
  #LD = ld
  #LD = cc
 -LD = gcc 
-+LD = ${CC} 
++LD = ${CC}
  
- # Normally the man pages are installed using "cp".  But via this
+ # Normally the man pages are installed using "install".  But via this
  # variable, you can use something else, for example a script that
-@@ -42,11 +42,11 @@
+@@ -47,7 +47,7 @@
  # systems which use man pages in the "cat" format.
  
  #MANCP = $(SRCDIR)/mantocat
--MANCP =	cp
+-MANCP =	$(INSTALL) -m$(INSTALL_PERM_MAN)
 +MANCP =	${BSD_INSTALL_MAN}
  
+ # MAKE is set automatically by Make to what was used to invoke Make.
  SHELL =	/bin/sh
--MAKE = make
--INSTALL = install
-+MAKE ?= make
-+INSTALL ?= install
- AR= ar
- RANLIB=	ranlib
+@@ -60,7 +60,7 @@
  
-@@ -54,7 +54,7 @@
- # C compiler options
- 
- #CFLAGS = -O2 -std1 $(CDEBUG)
+ # 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 -O2 -Wall -Wno-uninitialized $(CDEBUG)
-   
- # linker options.  Eunice users may want to use -noshare so that
- # the executables can run standalone.
-@@ -81,8 +81,10 @@
++CFLAGS += $(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
+@@ -96,7 +96,7 @@
+ # On older systems, you have to make shared libraries out of position 
+ # independent code, so you need -fpic here.  SunOS requires this.
+ #CFLAG_SHLIB = -fpic
+-CFLAG_SHLIB = 
++CFLAGS_SHLIB = -fPIC -DPIC
  
- #TIFFINC_DIR = /usr/local1/DEC/include
+ # The netpbm package contains a version of the Tiff library,
+ # libtiff.  If you want to use your own, fill in the appropriate paths
+@@ -114,8 +114,8 @@
+ # 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
-+TIFFINC_DIR = ${LOCALBASE}/include
++TIFFHDR_DIR = ${LOCALBASE}/include
 +TIFFLIB_DIR = ${LOCALBASE}/lib
  
  # Put the location of your JPEG library here.
  # If you want to build the jpeg converters or tiff
-@@ -104,16 +106,16 @@
- #JPEGHDR_DIR = /usr/local1/DEC/include
+@@ -139,8 +139,8 @@
+ #JPEGHDR_DIR = /usr/local/include
  #JPEGLIB_DIR = NONE
  #JPEGHDR_DIR = NONE
 -JPEGLIB_DIR = /usr/lib/jpeg
@@ -62,8 +63,9 @@
 +JPEGHDR_DIR = ${LOCALBASE}/include
  
  
- #PNGLIB_DIR = /usr/local1/DEC/lib
- #PNGHDR_DIR = /usr/local1/DEC/include
+ # Put the location of your PNG library here.  If you want to build the
+@@ -161,8 +161,8 @@
+ # No PNG:
  #PNGLIB_DIR = NONE
  #PNGHDR_DIR = NONE
 -PNGLIB_DIR = /lib
@@ -72,13 +74,4 @@
 +PNGHDR_DIR = ${LOCALBASE}/include
  
  
- # The following variables are used only by 'make install' (and the
-@@ -124,7 +126,7 @@
- # you're spreading Netpbm across your system, use "/".
- 
- #INSTALL_PREFIX = /usr/local1/DEC/packages/netpbm
--INSTALL_PREFIX = /usr/local/netpbm
-+INSTALL_PREFIX = ${PREFIX}
- 
- # Specify the directory where you want the executables.
- # If you need scripts and binaries to be in different directories, you
+ # And the Utah Raster Toolkit (aka URT aka RLE) library:
diff --git a/graphics/netpbm/files/patch-bd b/graphics/netpbm/files/patch-bd
index 6a78139afbe5..01f3242bb105 100644
--- a/graphics/netpbm/files/patch-bd
+++ b/graphics/netpbm/files/patch-bd
@@ -1,40 +1,39 @@
---- pbm/Makefile.orig	Fri Mar 24 07:43:30 2000
-+++ pbm/Makefile	Sat Apr  1 12:00:00 2000
-@@ -4,7 +4,7 @@
- include $(SRCDIR)/Makefile.config
- 
- 
--INCLUDE = -I$(SRCDIR)
-+INCLUDE = -I$(SRCDIR) -I$(SRCDIR)/shhopt
- 
+--- pbm/Makefile.orig	Sat May  6 16:16:53 2000
++++ pbm/Makefile	Mon May  8 00:00:00 2000
+@@ -9,11 +9,12 @@
  # Shared library naming
  LIBROOT = pbm
-@@ -14,6 +14,7 @@
+ LIBPBM = lib$(LIBROOT).$(NETPBMLIBSUFFIX)
+-MAJ = 9
++MAJ = 1
+ MIN = 1
  
- LIBLIBS = $(SRCDIR)/shhopt/libshhopt.a
+ LIBLIBS = 
  NETPBMLIBS = $(LIBPBM)
 +NETPBMLD = -L. -lpbm
  
  PORTBINARIES =	atktopbm brushtopbm cmuwmtopbm g3topbm \
- 		icontopbm gemtopbm macptopbm mgrtopbm \
-@@ -35,6 +36,7 @@
- MERGE_OBJECTS = $(patsubst %,%.o2, $(BINARIES))
+ 		icontopbm macptopbm mdatopbm mgrtopbm \
+@@ -36,8 +37,7 @@
  
- LIBOBJECTS = libpbm1.o libpbm2.o libpbm3.o libpbm4.o libpbm5.o
-+LIBSOBJECTS = libpbm1.so libpbm2.so libpbm3.so libpbm4.so libpbm5.so
+ # Library objects to be built and linked by Makefile.common:
+ LIBOBJECTS = libpbm1.o libpbm2.o libpbm3.o libpbm4.o libpbm5.o 
+-# Library objects to be linked but not built by Makefile.common:
+-LIBOBJECTS_X = $(SRCDIR)/shhopt/shhopt.o
++LIBSOBJECTS = libpbm1.so libpbm2.so libpbm3.so libpbm4.so libpbm5.so 
  
  MANUALS1 =	$(BINARIES)
  MANUALS3 =	libpbm
-@@ -42,7 +44,7 @@
+@@ -45,7 +45,7 @@
  
  MERGENAME = pbmmerge
  
 -INTERFACE_HEADERS = pbm.h
-+INTERFACE_HEADERS = pbm.h ../pbmplus.h
++INTERFACE_HEADERS = pbm.h $(SRCDIR)/pbmplus.h
  
  .PHONY: all
  all:		$(BINARIES)
-@@ -52,15 +54,18 @@
+@@ -55,11 +55,11 @@
  
  # Rules for plain programs.
  $(PORTBINARIES): %: %.o $(NETPBMLIBS)
@@ -46,12 +45,17 @@
 -	$(LD) $(LDFLAGS) -o $@ $@.o -lm $(NETPBMLIBS) $(CDEBUG)
 +	$(LD) $(LDFLAGS) -o $@ $@.o -lm $(NETPBMLD) $(CDEBUG)
  
- # Rule for objects.
- $(OBJECTS) $(LIBOBJECTS): %.o: %.c
- 	$(CC) -c $(CFLAGS) $(INCLUDE) -o $@ $<
-+
-+$(LIBSOBJECTS): %.so: %.c
-+	$(CC) -c -fpic -DPIC $(CFLAGS) $(INCLUDE) -o $@ $<
- 
- $(MERGE_OBJECTS): %.o2: %.c
- 	$(CC) -c $(CFLAGS) $(INCLUDE) "-Dmain=$*_main" -o $@ $<
+ .PHONY: install.bin
+ install.bin: install.bin.common
+@@ -72,11 +72,6 @@
+ # Don't use $(SRCDIR) in the target below because Makefile.dep doesn't !
+ ../compile.h: 
+ 	$(MAKE) -C $(SRCDIR) compile.h
+-
+-$(SRCDIR)/shhopt/shhopt.o:
+-	cd ../shhopt; $(MAKE) shhopt.o
+-$(SRCDIR)/shhopt/libshhopt.a:
+-	cd ../shhopt; $(MAKE) libshhopt.a
+ 
+ .PHONY: clean
+ clean:
diff --git a/graphics/netpbm/files/patch-be b/graphics/netpbm/files/patch-be
index 97416720f17d..8421fafebc62 100644
--- a/graphics/netpbm/files/patch-be
+++ b/graphics/netpbm/files/patch-be
@@ -1,11 +1,16 @@
---- pgm/Makefile.orig	Fri Mar 24 07:43:44 2000
-+++ pgm/Makefile	Sat Apr  1 12:00:00 2000
-@@ -10,9 +10,10 @@
- INCLUDEPBM = -I$(PBMDIR)
- LIBPBM = libpbm.so
+--- pgm/Makefile.orig	Sat May  6 12:01:47 2000
++++ pgm/Makefile	Mon May  8 00:00:00 2000
+@@ -3,7 +3,7 @@
  
--INCLUDE = -I$(SRCDIR) $(INCLUDEPBM)
-+INCLUDE = -I$(SRCDIR) $(INCLUDEPBM) -I$(SRCDIR)/shhopt 
+ LIBROOT = pgm
+ LIBPGM = lib$(LIBROOT).$(NETPBMLIBSUFFIX)
+-MAJ = 9
++MAJ = 1
+ MIN = 0
+ 
+ PBMDIR = $(SRCDIR)/pbm
+@@ -13,6 +13,7 @@
+ INCLUDE = -I$(SRCDIR) $(INCLUDEPBM) -I$(SRCDIR)/shhopt
  
  NETPBMLIBS = $(LIBPGM) $(PBMDIR)/$(LIBPBM)
 +NETPBMLD = -L. -lpgm -L$(PBMDIR) -lpbm
@@ -20,7 +25,7 @@
  
  MANUALS1 =	$(BINARIES)
  MANUALS3 =	libpgm
-@@ -42,22 +44,25 @@
+@@ -42,11 +44,11 @@
  
  # Rules for plain programs.
  $(PORTBINARIES): %: %.o $(NETPBMLIBS)
@@ -32,20 +37,5 @@
 -	$(LD) $(LDFLAGS) -o $@ $@.o -lm $(NETPBMLIBS) $(CDEBUG)
 +	$(LD) $(LDFLAGS) -o $@ $@.o -lm $(NETPBMLD) $(CDEBUG)
  
- # Rule for objects.
- $(OBJECTS) $(LIBOBJECTS): %.o: %.c
- 	$(CC) -c $(CFLAGS) $(INCLUDE) -o $@ $<
- 
-+$(LIBSOBJECTS): %.so: %.c
-+	$(CC) -c -fpic -DPIC $(CFLAGS) $(INCLUDE) -o $@ $<
-+
- $(MERGE_OBJECTS): %.o2: %.c
- 	$(CC) -c $(CFLAGS) $(INCLUDE) "-Dmain=$*_main" -o $@ $<
- 
  # And libraries.
  $(PBMDIR)/$(LIBPBM): FORCE
--	cd $(PBMDIR) ; make $(LIBPBM)
-+	cd $(PBMDIR) ; $(MAKE) $(LIBPBM)
- 
- .PHONY: install.bin
- install.bin: install.bin.common
diff --git a/graphics/netpbm/files/patch-bf b/graphics/netpbm/files/patch-bf
index 533a0a58da51..72be1e8e6322 100644
--- a/graphics/netpbm/files/patch-bf
+++ b/graphics/netpbm/files/patch-bf
@@ -1,43 +1,47 @@
---- pnm/Makefile.orig	Tue Apr  4 04:38:37 2000
-+++ pnm/Makefile	Sat Apr 15 08:00:00 2000
-@@ -32,6 +32,8 @@
+--- pnm/Makefile.orig	Sat May  6 19:03:54 2000
++++ pnm/Makefile	Mon May  8 00:00:00 2000
+@@ -3,7 +3,7 @@
  
+ LIBROOT = pnm
+ LIBPNM = lib$(LIBROOT).$(NETPBMLIBSUFFIX)
+-MAJ = 9
++MAJ = 1
+ MIN = 0
+ 
+ PPMDIR = $(SRCDIR)/ppm
+@@ -36,6 +36,8 @@
+ # The order of these libraries is important for static library build
  NETPBMLIBS = $(LIBPNM) \
-            $(PBMDIR)/$(LIBPBM) $(PGMDIR)/$(LIBPGM) $(PPMDIR)/$(LIBPPM)
+            $(PPMDIR)/$(LIBPPM) $(PGMDIR)/$(LIBPGM) $(PBMDIR)/$(LIBPBM) 
 +NETPBMLD = -L. -lpnm \
-+           -L$(PBMDIR) -lpbm -L$(PGMDIR) -lpgm -L$(PPMDIR) -lppm
- LIBLIBS =  $(PBMDIR)/$(LIBPBM) $(PGMDIR)/$(LIBPGM) $(PPMDIR)/$(LIBPPM)
++           -L$(PPMDIR) -lppm -L$(PGMDIR) -lpgm -L$(PBMDIR) -lpbm
+ LIBLIBS =  $(PPMDIR)/$(LIBPPM) $(PGMDIR)/$(LIBPGM) $(PBMDIR)/$(LIBPBM) 
  
  ifeq ($(JPEGLIB_DIR),NONE)
-@@ -89,6 +91,7 @@
+@@ -102,6 +104,8 @@
  MERGE_OBJECTS = $(patsubst %,%.o2, $(PORTBINARIES) $(MATHBINARIES))
  
  LIBOBJECTS = libpnm1.o libpnm2.o libpnm3.o libpnm4.o
 +LIBSOBJECTS = libpnm1.so libpnm2.so libpnm3.so libpnm4.so
++LIBOBJECTS_X = $(SRCDIR)/shhopt/libshhopt.a
  
  MANUALS1 = $(BINARIES) $(SCRIPTS)
  MANUALS3 = libpnm
-@@ -103,45 +106,49 @@
- PHONY: merge
- merge:    $(MERGENAME) $(NOMERGEBINARIES)
- 
--tifftopnm pnmtotiff:  %: %.o $(NETPBMLIBS) $(TIFFLIB_DIR)/libtiff.so 
--	$(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLIBS) -L$(TIFFLIB_DIR) -ltiff \
--	  $(JPEGLD) $(CDEBUG)
-+tifftopnm: %: %.o $(NETPBMLIBS) $(TIFFLIB_DIR)/libtiff.so 
-+	$(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLD) ../shhopt/libshhopt.a \
-+	  -lm -L$(TIFFLIB_DIR) -ltiff $(JPEGLD) $(CDEBUG)
+@@ -126,27 +130,28 @@
  
--pnmtotiffcmyk: %: %.o $(NETPBMLIBS) $(TIFFLIB_DIR)/libtiff.so
+ # The Tiff library references math functions.
+ tifftopnm pnmtotiff pnmtotiffcmyk: %: %.o \
+-  $(NETPBMLIBS) $(TIFFLIB_DIR)/libtiff.$(LIBTIFFSUFFIX)
 -	$(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLIBS) -lm -L$(TIFFLIB_DIR) -ltiff \
-+pnmtotiff pnmtotiffcmyk: %: %.o $(NETPBMLIBS) $(TIFFLIB_DIR)/libtiff.so
+-	  $(JPEGLD) $(CDEBUG)
++  $(NETPBMLIBS) $(TIFFLIB_DIR)/libtiff.$(LIBTIFFSUFFIX) $(LIBOBJECTS_X)
 +	$(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLD) -lm -L$(TIFFLIB_DIR) -ltiff \
- 	  $(JPEGLD) $(CDEBUG)
++	  $(LIBOBJECTS_X) $(JPEGLD) $(CDEBUG)
  
  # Rules for plain programs.
  $(PORTBINARIES): %: %.o $(NETPBMLIBS) 
 -	$(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLIBS) $(CDEBUG)
-+	$(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLD) $(CDEBUG) 
++	$(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLD) $(CDEBUG)
  
  # Rule for math-dependent programs.
  $(MATHBINARIES): %: %.o $(NETPBMLIBS)
@@ -49,34 +53,25 @@
 +	$(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLD) \
  	  -L$(PNGLIB_DIR) -lpng -lz -lm $(CDEBUG)
  
- jpegtopnm: %: %.o $(NETPBMLIBS)
--	$(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLIBS) $(JPEGLD) -lm $(CDEBUG)
-+	$(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLD) ../shhopt/libshhopt.a \
-+	  $(JPEGLD) -lm $(CDEBUG)
- 
- # Rule for objects.
- $(OBJECTS) $(LIBOBJECTS): %.o: %.c
- 	$(CC) -c $(CFLAGS) $(INCLUDE) -o $@ $<
+-jpegtopnm: %: %.o $(NETPBMLIBS)
+-	$(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLIBS) $(JPEGLD)  $(CDEBUG)
++jpegtopnm: %: %.o $(NETPBMLIBS) $(LIBOBJECTS_X)
++	$(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLD) \
++	  $(LIBOBJECTS_X) $(JPEGLD) $(CDEBUG)
  
-+$(LIBSOBJECTS): %.so: %.c
-+	$(CC) -c -fpic -DPIC $(CFLAGS) $(INCLUDE) -o $@ $<
-+
- $(MERGE_OBJECTS): %.o2: %.c
- 	$(CC) -c $(CFLAGS) $(INCLUDE) "-Dmain=$*_main" -o $@ $<
+ rletopnm pnmtorle: %: %.o $(NETPBMLIBS)
+-	$(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLIBS) \
++	$(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLD) \
+ 	  -L$(URTLIB_DIR) -lrle $(CDEBUG)
  
  # And libraries.
- $(PBMDIR)/$(LIBPBM): FORCE
--	cd $(PBMDIR) ; make $(LIBPBM)
-+	cd $(PBMDIR) ; $(MAKE) $(LIBPBM)
- $(PGMDIR)/$(LIBPGM): FORCE
--	cd $(PGMDIR) ; make $(LIBPGM)
-+	cd $(PGMDIR) ; $(MAKE) $(LIBPGM)
- $(PPMDIR)/$(LIBPPM): FORCE
--	cd $(PPMDIR) ; make $(LIBPPM)
-+	cd $(PPMDIR) ; $(MAKE) $(LIBPPM)
- $(TIFFDIR)/$(LIBTIFF): FORCE
--	cd $(TIFFDIR) ; make $(LIBTIFF)
-+	cd $(TIFFDIR) ; $(MAKE) $(LIBTIFF)
+@@ -173,6 +178,9 @@
  
- include $(SRCDIR)/Makefile.common
+ .PHONY: install.lib
+ install.lib: install.lib.common
++
++$(SRCDIR)/shhopt/libshhopt.a:
++	cd ../shhopt; $(MAKE) libshhopt.a
  
+ .PHONY: clean
+ clean:
diff --git a/graphics/netpbm/files/patch-bg b/graphics/netpbm/files/patch-bg
index 87b21255dd36..ca7b74c90719 100644
--- a/graphics/netpbm/files/patch-bg
+++ b/graphics/netpbm/files/patch-bg
@@ -1,24 +1,32 @@
---- ppm/Makefile.orig	Tue Apr  4 04:53:40 2000
-+++ ppm/Makefile	Sat Apr 15 08:00:00 2000
-@@ -19,8 +19,15 @@
+--- ppm/Makefile.orig	Sat May  6 12:57:43 2000
++++ ppm/Makefile	Mon May  8 00:00:00 2000
+@@ -3,7 +3,7 @@
+ 
+ LIBROOT = ppm
+ LIBPPM = lib$(LIBROOT).$(NETPBMLIBSUFFIX)
+-MAJ = 9
++MAJ = 1
+ MIN = 1
+ 
+ PGMDIR = $(SRCDIR)/pgm
+@@ -19,12 +19,13 @@
  endif
  
  NETPBMLIBS = $(LIBPPM) $(PBMDIR)/$(LIBPBM) $(PGMDIR)/$(LIBPGM)
 +NETPBMLD = -L. -lppm -L$(PBMDIR) -lpbm -L$(PGMDIR) -lpgm
  LIBLIBS = $(PBMDIR)/$(LIBPBM) $(PGMDIR)/$(LIBPGM)
  
-+ifeq ($(JPEGLIB_DIR),NONE)
-+  JPEGLD =
-+else
-+  JPEGLD = -L$(JPEGLIB_DIR) -ljpeg
-+endif     
-+
  PORTBINARIES =	bmptoppm eyuvtoppm gouldtoppm hpcdtoppm ilbmtoppm imgtoppm \
  		mtvtoppm pcxtoppm pgmtoppm pi1toppm picttoppm \
  		pjtoppm \
-@@ -34,12 +41,13 @@
+-		ppm3d ppmbrighten ppmchange ppmcolormask \
++		ppm3d ppmbrighten ppmchange \
+ 		ppmdim ppmdist ppmdither \
+ 		ppmflash ppmhist ppmmake ppmmix ppmnorm \
+ 		ppmquant ppmrelief ppmshift ppmspread ppmtoacad \
+@@ -34,19 +35,20 @@
  		ppmtotga ppmtouil ppmtoxpm ppmtoyuv \
- 		ppmtoyuvsplit \
+ 		ppmtoyuvsplit ppmtv \
  		qrttoppm rawtoppm rgb3toppm sldtoppm spctoppm \
 -		sputoppm tgatoppm ximtoppm xpmtoppm xvminitoppm \
 +		sputoppm xpmtoppm xvminitoppm \
@@ -27,19 +35,28 @@
  # We don't build vidtoppm by default, because it requires special libraries
  # and there is no known requirement for vidtoppm.
  
-+NOMERGEBINARIES = tgatoppm ximtoppm
++NOMERGEBINARIES = ppmcolormask ppmntsc tgatoppm ximtoppm
  ifneq ($(JPEGLIB_DIR), NONE)
    ifneq ($(JPEGHDR_DIR), NONE)
        NOMERGEBINARIES += ppmtojpeg
-@@ -55,6 +63,7 @@
+   endif
+ endif
+ 
+-MATHBINARIES = ppmcie ppmforge ppmlabel ppmntsc ppmpat ppmqvga ppmtomap
++MATHBINARIES = ppmcie ppmforge ppmlabel ppmpat ppmqvga ppmtomap
+ BINARIES = $(PORTBINARIES) $(NOMERGEBINARIES) $(MATHBINARIES)
+ SCRIPTS = ppmquantall ppmshadow ppmfade
+ 
+@@ -55,6 +57,8 @@
  MERGE_OBJECTS = $(patsubst %,%.o2, $(PORTBINARIES) $(MATHBINARIES))
  
  LIBOBJECTS = libppm1.o libppm2.o libppm3.o libppm4.o libppm5.o bitio.o
 +LIBSOBJECTS = libppm1.so libppm2.so libppm3.so libppm4.so libppm5.so bitio.so
++LIBOBJECTS_X = $(SRCDIR)/shhopt/libshhopt.a
  
  MANUALS1 = $(BINARIES) $(SCRIPTS)
  MANUALS3 = libppm
-@@ -62,7 +71,7 @@
+@@ -62,7 +66,7 @@
  
  MERGENAME= ppmmerge
  
@@ -48,7 +65,7 @@
  
  .PHONY: all
  all:        $(BINARIES)
-@@ -72,29 +81,35 @@
+@@ -72,16 +76,23 @@
  
  # Rules for plain programs.
  $(PORTBINARIES): %: %.o $(NETPBMLIBS)
@@ -60,35 +77,30 @@
  $(MATHBINARIES): %: %.o $(NETPBMLIBS)
 -	$(LD) $(LDFLAGS) -o $@ $@.o -lm $(NETPBMLIBS) $(CDEBUG)
 +	$(LD) $(LDFLAGS) -o $@ $@.o -lm $(NETPBMLD) $(CDEBUG)
++
++ppmcolormask tgatoppm ximtoppm: %: %.o $(NETPBMLIBS) $(LIBOBJECTS_X)
++	$(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLD) \
++	  $(LIBOBJECTS_X) $(CDEBUG)
++
++ppmntsc: %: %.o $(NETPBMLIBS) $(LIBOBJECTS_X)
++	$(LD) $(LDFLAGS) -o $@ $@.o -lm $(NETPBMLD) \
++	  $(LIBOBJECTS_X) $(CDEBUG)
  
--ppmtojpeg: %: %.o $(NETPBMLIBS)
+ ppmtojpeg: %: %.o $(NETPBMLIBS)
 -	$(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLIBS) \
--	  -L $(JPEGLIB_DIR) -ljpeg $(CDEBUG)
-+tgatoppm ximtoppm: %: %.o $(NETPBMLIBS) ../shhopt/libshhopt.a
-+	$(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLD) ../shhopt/libshhopt.a \
-+	  $(CDEBUG)
-+
-+ppmtojpeg: %: %.o $(NETPBMLIBS) ../shhopt/libshhopt.a
-+	$(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLD) ../shhopt/libshhopt.a \
-+	  $(JPEGLD) $(CDEBUG)
+-	  -L$(JPEGLIB_DIR) -ljpeg $(CDEBUG)
++	$(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLD) \
++	  $(LIBOBJECTS_X) -L$(JPEGLIB_DIR) -ljpeg $(CDEBUG)
  
- # Rule for objects.
- $(OBJECTS) $(LIBOBJECTS): %.o: %.c
- 	$(CC) -c $(CFLAGS) $(INCLUDE) -o $@ $<
+ # And libraries.
+ $(PBMDIR)/$(LIBPBM): FORCE
+@@ -96,6 +107,9 @@
+ install.lib: install.lib.common
  
-+$(LIBSOBJECTS): %.so: %.c
-+	$(CC) -c -fpic -DPIC $(CFLAGS) $(INCLUDE) -o $@ $<
+ include $(SRCDIR)/Makefile.common
 +
- $(MERGE_OBJECTS): %.o2: %.c
- 	$(CC) -c $(CFLAGS) $(INCLUDE) "-Dmain=$*_main" -o $@ $<
++$(SRCDIR)/shhopt/libshhopt.a:
++	cd ../shhopt; $(MAKE) libshhopt.a
  
- # And libraries.
- $(PBMDIR)/$(LIBPBM): FORCE
--	cd $(PBMDIR) ; make $(LIBPBM)
-+	cd $(PBMDIR) ; $(MAKE) $(LIBPBM)
- $(PGMDIR)/$(LIBPGM): FORCE
--	cd $(PGMDIR) ; make $(LIBPGM)
-+	cd $(PGMDIR) ; $(MAKE) $(LIBPGM)
- 
- .PHONY: install.bin
- install.bin: install.bin.common
+ .PHONY: clean
+ clean:
diff --git a/graphics/netpbm/files/patch-bk b/graphics/netpbm/files/patch-bk
index ee96595bbca3..1898c58c30cb 100644
--- a/graphics/netpbm/files/patch-bk
+++ b/graphics/netpbm/files/patch-bk
@@ -1,9 +1,19 @@
---- pbm/libpbm1.c.orig	Tue Apr  4 02:32:49 2000
-+++ pbm/libpbm1.c	Sat Apr 15 08:00:00 2000
-@@ -141,17 +141,6 @@
-     }
- 
+--- pbm/libpbm1.c.orig	Sat May  6 16:33:57 2000
++++ pbm/libpbm1.c	Mon May  8 00:00:00 2000
+@@ -14,7 +14,6 @@
+ #include "version.h"
+ #include "../compile.h"
+ #include "libpbm.h"
+-#include "shhopt.h"
  
+ #if __STDC__
+ #include <stdarg.h>
+@@ -141,17 +140,6 @@
+         }
+     return 1;
+     }
+-
+-
 -/* Wrapper for Shhopt, to get it into the shared library */
 -
 -void 
@@ -13,8 +23,6 @@
 -    optParseOptions(argc, argv, opt, allowNegNum);
 -
 -}
--
--
- /* Log base two hacks. */
  
- int
+ 
+ /* Log base two hacks. */
diff --git a/graphics/netpbm/files/patch-bl b/graphics/netpbm/files/patch-bl
index 053d1704028a..fd696ce1088d 100644
--- a/graphics/netpbm/files/patch-bl
+++ b/graphics/netpbm/files/patch-bl
@@ -1,14 +1,6 @@
---- pnm/jpegtopnm.c.orig	Tue Apr  4 03:09:33 2000
-+++ pnm/jpegtopnm.c	Sat Apr 15 08:00:00 2000
-@@ -31,6 +31,7 @@
- #include <stdio.h>
- #include <errno.h>
- #include <jpeglib.h>
-+#include "shhopt.h"
- #include "pnm.h"
- 
- #define EXIT_WARNING 2  /* Goes with EXIT_FAILURE, EXIT_SUCCESS in stdlib.h */
-@@ -100,12 +101,22 @@
+--- pnm/jpegtopnm.c.orig	Sun Apr  9 07:46:08 2000
++++ pnm/jpegtopnm.c	Mon May  8 00:00:00 2000
+@@ -112,12 +112,22 @@
      char ** const argv_parse = malloc(argc*sizeof(char *));
      /* argv, except we modify it as we parse */
  
@@ -31,3 +23,12 @@
  
      /* Set the defaults */
      cmdline_p->verbose = FALSE;
+@@ -130,7 +140,7 @@
+     argc_parse = argc;
+     for (i=0; i < argc; i++) argv_parse[i] = argv[i];
+ 
+-    pm_optParseOptions(&argc_parse, argv_parse, option_def, 0);
++    optParseOptions(&argc_parse, argv_parse, option_def, 0);
+     /* Uses and sets argc_parse, argv_parse and all of *cmdline_p. */
+ 
+     if (argc_parse - 1 == 0)
diff --git a/graphics/netpbm/files/patch-bo b/graphics/netpbm/files/patch-bo
index 518c022487fe..8debb4d8af99 100644
--- a/graphics/netpbm/files/patch-bo
+++ b/graphics/netpbm/files/patch-bo
@@ -1,14 +1,6 @@
---- ppm/ppmtojpeg.c.orig	Tue Apr  4 02:33:00 2000
-+++ ppm/ppmtojpeg.c	Sat Apr 15 08:00:00 2000
-@@ -29,6 +29,7 @@
- #include <errno.h>
- #include <stdio.h>
- #include <jpeglib.h>
-+#include "shhopt.h"
- #include "ppm.h"
- 
- #define EXIT_WARNING 2   /* Goes with EXIT_SUCCESS, EXIT_FAILURE in stdlib.h */
-@@ -324,6 +325,15 @@
+--- ppm/ppmtojpeg.c.orig	Sun Apr  9 07:44:01 2000
++++ ppm/ppmtojpeg.c	Mon May  8 00:00:00 2000
+@@ -325,6 +325,15 @@
      char ** const argv_parse = malloc(argc*sizeof(char *));
      /* argv, except we modify it as we parse */
  
@@ -24,7 +16,7 @@
      option_def_index = 0;   /* incremented by OPTENTRY */
      OPTENTRY(0, "verbose",     OPT_FLAG,   &cmdline_p->verbose,        0);
      OPTENTRY(0, "quality",     OPT_UINT,   &cmdline_p->quality,        0);
-@@ -343,6 +353,7 @@
+@@ -344,6 +353,7 @@
      OPTENTRY(0, "optimize",    OPT_FLAG,   &cmdline_p->optimize,       0);
      OPTENTRY(0, "optimise",    OPT_FLAG,   &cmdline_p->optimize,       0);
      OPTENTRY(0, "restart",     OPT_STRING, &restart,                   0);
@@ -32,7 +24,7 @@
  
      /* Set the defaults */
      cmdline_p->verbose = FALSE;
-@@ -366,7 +377,7 @@
+@@ -367,7 +377,7 @@
      argc_parse = argc;
      for (i=0; i < argc; i++) argv_parse[i] = argv[i];
  
diff --git a/graphics/netpbm/files/patch-bp b/graphics/netpbm/files/patch-bp
index 0058d45925c1..142001ac73a8 100644
--- a/graphics/netpbm/files/patch-bp
+++ b/graphics/netpbm/files/patch-bp
@@ -1,14 +1,6 @@
---- ppm/tgatoppm.c.orig	Tue Apr  4 03:08:32 2000
-+++ ppm/tgatoppm.c	Sat Apr 15 08:00:00 2000
-@@ -13,6 +13,7 @@
- */
- 
- #include <string.h>
-+#include "shhopt.h"
- #include "ppm.h"
- #include "pgm.h"
- #include "tga.h"
-@@ -431,16 +432,26 @@
+--- ppm/tgatoppm.c.orig	Sun Apr  9 09:10:36 2000
++++ ppm/tgatoppm.c	Mon May  8 00:00:00 2000
+@@ -426,16 +426,26 @@
           */
      unsigned int option_def_index;
  
diff --git a/graphics/netpbm/files/patch-bq b/graphics/netpbm/files/patch-bq
index 1fdc152d1c5e..3e4da4edf82c 100644
--- a/graphics/netpbm/files/patch-bq
+++ b/graphics/netpbm/files/patch-bq
@@ -1,14 +1,6 @@
---- ppm/ximtoppm.c.orig	Tue Apr  4 03:09:06 2000
-+++ ppm/ximtoppm.c	Sat Apr 15 08:00:00 2000
-@@ -11,6 +11,7 @@
- */
- 
- #include <string.h>
-+#include "shhopt.h"
- #include "ppm.h"
- #include "xim.h"
- 
-@@ -418,13 +419,23 @@
+--- ppm/ximtoppm.c.orig	Sun Apr  9 07:44:31 2000
++++ ppm/ximtoppm.c	Mon May  8 00:00:00 2000
+@@ -419,13 +419,23 @@
           */
      unsigned int option_def_index;
  
diff --git a/graphics/netpbm/files/patch-br b/graphics/netpbm/files/patch-br
new file mode 100644
index 000000000000..7334b3d9d9ee
--- /dev/null
+++ b/graphics/netpbm/files/patch-br
@@ -0,0 +1,35 @@
+--- ppm/ppmcolormask.c.orig	Fri Apr 14 16:06:33 2000
++++ ppm/ppmcolormask.c	Mon May  8 00:00:00 2000
+@@ -4,6 +4,7 @@
+ #include <string.h>
+ #include "ppm.h"
+ #include "pbm.h"
++#include "shhopt.h"
+ 
+ static struct cmdline_info {
+     /* All the information the user supplied in the command line,
+@@ -84,13 +85,23 @@
+          */
+     unsigned int option_def_index;
+ 
++    /* Create the OptStruct structure describing our options */
++    #define OPTENTRY(shortvalue,longvalue,typevalue,outputvalue,flagvalue) {\
++      option_def[option_def_index].shortName = (shortvalue); \
++      option_def[option_def_index].longName = (longvalue); \
++      option_def[option_def_index].type = (typevalue); \
++      option_def[option_def_index].arg = (outputvalue); \
++      option_def[option_def_index].flags = (flagvalue); \
++      option_def_index++; \
++      }
+     option_def_index = 0;   /* incremented by OPTENTRY */
+     OPTENTRY('v', "verbose",    OPT_FLAG,   &cmdline_p->verbose,        0);
++    option_def[option_def_index].type = OPT_END;
+ 
+     /* Set the defaults */
+     cmdline_p->verbose = 0;
+ 
+-    pm_optParseOptions(&argc, argv, option_def, 0);
++    optParseOptions(&argc, argv, option_def, 0);
+         /* Uses and sets argc, argv, and all of *cmdline_p. */
+ 
+     if (argc - 1 == 0)
diff --git a/graphics/netpbm/files/patch-bs b/graphics/netpbm/files/patch-bs
new file mode 100644
index 000000000000..f23e6e7b2346
--- /dev/null
+++ b/graphics/netpbm/files/patch-bs
@@ -0,0 +1,43 @@
+--- ppm/ppmntsc.c.orig	Sat Apr 22 08:44:59 2000
++++ ppm/ppmntsc.c	Mon May  8 00:00:00 2000
+@@ -42,6 +42,7 @@
+ #include <math.h>
+ #include <string.h>
+ #include "ppm.h"
++#include "shhopt.h"
+ 
+ #define TRUE 1
+ #define FALSE 0
+@@ -440,6 +441,15 @@
+     unsigned int option_def_index;
+     int legalonly, illegalonly, correctedonly;
+ 
++    /* Create the OptStruct structure describing our options */
++    #define OPTENTRY(shortvalue,longvalue,typevalue,outputvalue,flagvalue) {\
++      option_def[option_def_index].shortName = (shortvalue); \
++      option_def[option_def_index].longName = (longvalue); \
++      option_def[option_def_index].type = (typevalue); \
++      option_def[option_def_index].arg = (outputvalue); \
++      option_def[option_def_index].flags = (flagvalue); \
++      option_def_index++; \
++      }
+     option_def_index = 0;   /* incremented by OPTENTRY */
+     OPTENTRY('v', "verbose",        OPT_FLAG,   &cmdline_p->verbose,        0);
+     OPTENTRY('V', "debug",          OPT_FLAG,   &cmdline_p->debug,          0);
+@@ -447,6 +457,7 @@
+     OPTENTRY('l', "legalonly",      OPT_FLAG,   &legalonly,                 0);
+     OPTENTRY('i', "illegalonly",    OPT_FLAG,   &illegalonly,               0);
+     OPTENTRY('c', "correctedonly",  OPT_FLAG,   &correctedonly,             0);
++    option_def[option_def_index].type = OPT_END;
+ 
+     /* Set the defaults */
+     cmdline_p->verbose = FALSE;
+@@ -454,7 +465,7 @@
+     cmdline_p->pal = FALSE;
+     legalonly = illegalonly = correctedonly = FALSE;
+ 
+-    pm_optParseOptions(&argc, argv, option_def, 0);
++    optParseOptions(&argc, argv, option_def, 0);
+         /* Uses and sets argc, argv, and all of *cmdline_p. */
+ 
+     if (argc - 1 == 0)
diff --git a/graphics/netpbm/pkg-descr b/graphics/netpbm/pkg-descr
index a78213e8cc7a..b5fbdcccea46 100644
--- a/graphics/netpbm/pkg-descr
+++ b/graphics/netpbm/pkg-descr
@@ -7,177 +7,4 @@ 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
+WWW: http://netpbm.sourceforge.net/
diff --git a/graphics/netpbm/pkg-plist b/graphics/netpbm/pkg-plist
index bef287d6c90a..bf6c837b77cb 100644
--- a/graphics/netpbm/pkg-plist
+++ b/graphics/netpbm/pkg-plist
@@ -10,6 +10,7 @@ bin/fitstopnm
 bin/fstopgm
 bin/g3topbm
 bin/gemtopbm
+bin/gemtopnm
 bin/giftopnm
 bin/gouldtoppm
 bin/hipstopgm
@@ -20,6 +21,7 @@ bin/imgtoppm
 bin/jpegtopnm
 bin/lispmtopgm
 bin/macptopbm
+bin/mdatopbm
 bin/mgrtopbm
 bin/mtvtoppm
 bin/pbmclean
@@ -27,6 +29,7 @@ bin/pbmlife
 bin/pbmmake
 bin/pbmmask
 bin/pbmmerge
+bin/pbmpage
 bin/pbmpscale
 bin/pbmreduce
 bin/pbmtext
@@ -46,6 +49,7 @@ bin/pbmtolj
 bin/pbmtoln03
 bin/pbmtolps
 bin/pbmtomacp
+bin/pbmtomda
 bin/pbmtomgr
 bin/pbmtopgm
 bin/pbmtopi3
@@ -122,6 +126,7 @@ bin/ppm3d
 bin/ppmbrighten
 bin/ppmchange
 bin/ppmcie
+bin/ppmcolormask
 bin/ppmdim
 bin/ppmdist
 bin/ppmdither
@@ -166,6 +171,7 @@ bin/ppmtouil
 bin/ppmtoxpm
 bin/ppmtoyuv
 bin/ppmtoyuvsplit
+bin/ppmtv
 bin/psidtopgm
 bin/pstopnm
 bin/qrttoppm