Update to version 9.2.

PR:		ports/18676
Submitted by:	KATO Tsuguru <tkato@prontomail.ne.jp>

11 files changed, 300 insertions, 294 deletions

diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index 0cc8b6e..26c8dab 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	netpbm
-PORTVERSION=	9.1
+PORTVERSION=	9.2
 CATEGORIES=	graphics
 MASTER_SITES=	http://download.sourceforge.net/netpbm/
 EXTRACT_SUFX=	.tgz
@@ -14,8 +14,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 
 LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
-		jpeg.9:${PORTSDIR}/graphics/jpeg \
-		png.3:${PORTSDIR}/graphics/png
+		jpeg.9:${PORTSDIR}/graphics/jpeg
 
 USE_GMAKE=	yes
 MAKEFILE=	GNUmakefile
@@ -36,13 +35,13 @@ MAN1=	anytopnm.1 asciitopgm.1 atktopbm.1 bioradtopgm.1 bmptoppm.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 \
+	pjtoppm.1 pktopbm.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 pnminterp.1 \
+	pnminterp-gen.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 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 \
@@ -59,9 +58,6 @@ MAN1=	anytopnm.1 asciitopgm.1 atktopbm.1 bioradtopgm.1 bmptoppm.1 \
 MAN3=	libpbm.3 libpgm.3 libpnm.3 libppm.3
 MAN5=	pbm.5 pgm.5 pnm.5 ppm.5
 
-post-extract:
-	@find ${WRKSRC} -name Makefile.depend -delete
-
 post-patch:
 	@${PERL} -pi -e "s|%%X11BASE%%|${X11BASE}|g" ${WRKSRC}/pbmplus.h
 
diff --git a/graphics/netpbm/distinfo b/graphics/netpbm/distinfo
index 7f25008..3fd145b 100644
--- a/graphics/netpbm/distinfo
+++ b/graphics/netpbm/distinfo
@@ -1 +1 @@
-MD5 (netpbm-9.1.tgz) = c2e8d85c371e4511aaf94f5da2d0afa0
+MD5 (netpbm-9.2.tgz) = 11c7bcd42a4edca8f093e7996bf4dc97
diff --git a/graphics/netpbm/files/patch-aj b/graphics/netpbm/files/patch-aj
index a2cb1fb..ac1d118 100644
--- a/graphics/netpbm/files/patch-aj
+++ b/graphics/netpbm/files/patch-aj
@@ -1,5 +1,5 @@
---- pbmplus.h.orig	Sat May  6 16:37:46 2000
-+++ pbmplus.h	Mon May  8 00:00:00 2000
+--- pbmplus.h.orig	Mon May  8 05:00:47 2000
++++ pbmplus.h	Sat May 20 00:00:00 2000
 @@ -25,6 +25,9 @@
  #include <errno.h>
  #endif
@@ -19,16 +19,16 @@
  /* #define SYSV */
  /* #define MSDOS */
  /* #define AMIGA */
-@@ -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.
- */
+@@ -54,7 +57,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"
- #ifdef VMS
- #define RGB_DB1 "PBMplus_Dir:RGB.TXT"
-@@ -286,37 +289,6 @@
+ #endif
+ 
+@@ -285,37 +288,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 ));
diff --git a/graphics/netpbm/files/patch-ba b/graphics/netpbm/files/patch-ba
index e8a3f06..2494b2a 100644
--- a/graphics/netpbm/files/patch-ba
+++ b/graphics/netpbm/files/patch-ba
@@ -1,26 +1,17 @@
---- 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
+--- GNUmakefile.orig	Tue May 16 10:15:34 2000
++++ GNUmakefile	Sat May 20 00:00:00 2000
+@@ -68,8 +68,8 @@
  
--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,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
-+install-merge: install.merge install.lib install.man install.hdr
++install: install.bin install.lib install.man install.dev
++install-merge: install.merge install.lib install.man install.dev
  
  .PHONY: merge
  merge:  compile.h
-@@ -68,21 +68,21 @@
+@@ -79,21 +79,21 @@
  
  .PHONY: install.bin
  install.bin:
@@ -30,8 +21,7 @@
  	    ( echo install.bin.$$i ; cd $$i ; $(MAKE) install.bin ); \
  	done
  
--.PHONY: install-merge
-+.PHONY: install.merge
+ .PHONY: install-merge
  install.merge:
 -	$(INSTALL) -d -mu=rwx,go=rx $(INSTALLBINARIES)
 +	-mkdir -p $(INSTALLBINARIES)
@@ -46,7 +36,7 @@
  	for i in $(SUBDIRS) ; do \
  	    ( echo install.lib.$$i ; cd $$i ; $(MAKE) install.lib ); \
  	done
-@@ -93,10 +93,17 @@
+@@ -104,7 +104,7 @@
  
  .PHONY: install.man
  install.man:
@@ -55,13 +45,23 @@
  	    $(INSTALLMANUALS1) $(INSTALLMANUALS3) $(INSTALLMANUALS5)
  	for i in $(SUBDIRS) ; do \
  	    ( echo install.man.$$i ; cd $$i ; $(MAKE) install.man ); \
-+	done
-+
-+.PHONY: install.hdr
-+install.hdr:
+@@ -115,8 +115,8 @@
+ 
+ .PHONY: install.hdr
+ install.hdr:
+-	$(INSTALL) -d -mu=rwx,go=rx $(INSTALLHDRS)
+-	$(INSTALL) -m$(INSTALL_PERM_HDR) pbmplus.h $(INSTALLHDRS)
 +	-mkdir -p $(INSTALLHDRS)
-+	for i in $(SUBDIRS) ; do \
-+	    ( echo install.hdr.$$i ; cd $$i ; $(MAKE) install.hdr ); \
++	${BSD_INSTALL_DATA} pbmplus.h $(INSTALLHDRS)
+ 	for i in $(SUBDIRS) ; do \
+ 	    ( echo install.hdr.$$i ; cd $$i ; $(MAKE) install.hdr ); \
  	done
+@@ -127,7 +127,7 @@
  
- .PHONY: clean
+ .PHONY: install.staticlib
+ install.staticlib:
+-	$(INSTALL) -d -mu=rwx,go=rx $(INSTALLLIBS)
++	-mkdir -p $(INSTALLLIBS)
+ 	for i in $(SUBDIRS) ; do \
+ 	    (echo install.staticlib.$$i; cd $$i; $(MAKE) install.staticlib ); \
+ 	done
diff --git a/graphics/netpbm/files/patch-bb b/graphics/netpbm/files/patch-bb
index b694901..a056b46 100644
--- a/graphics/netpbm/files/patch-bb
+++ b/graphics/netpbm/files/patch-bb
@@ -1,34 +1,47 @@
---- 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.
+--- Makefile.common.orig	Tue May 16 10:14:14 2000
++++ Makefile.common	Sat May 20 00:00:00 2000
+@@ -97,24 +97,20 @@
+ # BUILDING NETPBM LIBRARIES
  
- # Rule for objects.
--$(OBJECTS): %.o: %.c
-+$(OBJECTS) $(LIBOBJECTS): %.o: %.c
- 	$(CC) -c $(CFLAGS) $(INCLUDE) -o $@ $<
--$(LIBOBJECTS): %.o: %.c
+ $(LIBOBJECTS): %.o: %.c
++	$(CC) -c $(CFLAGS) $(INCLUDE) -o $@ $<
++
 +$(LIBSOBJECTS): %.so: %.c
  	$(CC) -c $(CFLAGS) $(CFLAGS_SHLIB) $(INCLUDE) -o $@ $<
  
- $(MERGE_OBJECTS): %.o2: %.c
-@@ -68,7 +68,7 @@
- 	$(CC) $(CFLAGS) -Wno-implicit -c -o $@ $<
+-SONAME = lib$(LIBROOT).so.$(MAJ)
++SONAME = lib$(LIBROOT).so.$(SOVER)
  
- $(MERGENAME): $(MERGENAME).o $(MERGE_OBJECTS) $(NETPBMLIBS) 
--	$(LD) $(LDFLAGS) -o $@ $< $(MERGE_OBJECTS) -lm $(NETPBMLIBS)
-+	$(LD) $(LDFLAGS) -o $@ $< $(MERGE_OBJECTS) -lm $(NETPBMLD)
+ # The libxxx.so link is needed to link the executables.
+-lib$(LIBROOT).so: $(SONAME)
+-	rm -f $@
+-	ln -s $< $@
+-# The $(SONAME) 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).
+-$(SONAME): lib$(LIBROOT).so.$(MAJ).$(MIN)
++lib$(LIBROOT).so: $(SONAME) lib$(LIBROOT).a
+ 	rm -f $@
+-	ln -s $< $@
+-lib$(LIBROOT).so.$(MAJ).$(MIN): $(LIBOBJECTS) $(LIBOBJECTS_X) $(LIBLIBS) \
+-                                $(LIBOPT)
+-	$(LD) $(LDSHLIB) -o $@ $(LIBOBJECTS) $(LIBOBJECTS_X) \
+-          `$(LIBOPT) $(LIBLIBS)` -lc
++	ln -sf $< $@
++$(SONAME): $(LIBSOBJECTS) $(LIBOBJECTS_X) $(LIBLIBS) $(LIBOPT)
++	$(LD) $(LDSHLIB) -o $@ $(LIBSOBJECTS) $(LIBOBJECTS_X) \
++          `$(LIBOPT) $(LIBLIBS)`
  
- # 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
-@@ -77,27 +77,26 @@
- install.merge: $(MERGENAME) $(NOMERGEBINARIES) install.script
+ # Static library.  Unused by default, but with a small change to make files...
+ lib$(LIBROOT).a: $(LIBOBJECTS) $(LIBOBJECTS_X)
+@@ -129,15 +125,14 @@
+ install.merge.common: $(MERGENAME) $(NOMERGEBINARIES) install.script
  	cd $(INSTALLBINARIES) ; rm -f $(BINARIES) $(MERGE_ALIASES)
  ifneq ($(MERGENAME)x,x)
 -	$(INSTALL) -s -m$(INSTALL_PERM_BIN) $(MERGENAME) $(INSTALLBINARIES)
 +	${BSD_INSTALL_PROGRAM} $(MERGENAME) $(INSTALLBINARIES)
  	cd $(INSTALLBINARIES) ; \
- 	   for i in $(BINARIES) $(MERGE_ALIASES) ; \
+ 	   for i in $(MERGEBINARIES) $(MERGE_ALIASES) ; \
 -             do ln -s $(MERGENAME)$(EXE) $$i ; \
 +             do ln -sf $(MERGENAME)$(EXE) $$i ; \
               done
@@ -39,7 +52,8 @@
 +	${BSD_INSTALL_PROGRAM} $(NOMERGEBINARIES) $(INSTALLBINARIES)
  endif
  
- .PHONY: install.bin.common
+ # INSTALLING
+@@ -146,12 +141,12 @@
  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.
@@ -53,8 +67,8 @@
 +	${BSD_INSTALL_SCRIPT} $(SCRIPTS) $(INSTALLSCRIPTS)
  endif
  
- .PHONY: install.man
-@@ -127,43 +126,28 @@
+ .PHONY: install.man.common
+@@ -181,8 +176,7 @@
  # 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.
@@ -62,51 +76,27 @@
 -	  $(INTERFACE_HEADERS) $(INSTALLHDRS)
 +	${BSD_INSTALL_DATA} $(INTERFACE_HEADERS) $(INSTALLHDRS)
  
- # 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) $(LIBOBJECTS_X) $(LIBLIBS) -lc
-+	ln -sf $< $@
-+lib$(LIBROOT).so.$(MAJ): $(LIBSOBJECTS) $(LIBLIBS)
-+	$(LD) $(LDSHLIB) -Wl,-soname,$@ -o $@ $(LIBSOBJECTS)
- 
- # 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 $@
--	ar rc $@ $(LIBOBJECTS) $(LIBOBJECTS_X)
-+	ar rc $@ $(LIBOBJECTS)
- 	-ranlib $@
- 
+ # Install a static library 
+ #
+@@ -192,16 +186,15 @@
+ # library, the dependency here will do that.
+ .PHONY: install.staticlib
+ install.staticlib: lib$(LIBROOT).a
+-	$(INSTALL) -m$(INSTALL_PERM_LIBS) $< $(INSTALLLIBS)/$<
++	${BSD_INSTALL_DATA} $< $(INSTALLLIBS)
  
  .PHONY: install.lib.common
--ifeq ($(NETPBMLIBSUFFIX),so)
--# install a shared library
+ ifeq ($(NETPBMLIBSUFFIX),so)
+ # install a shared library
 -install.lib.common: lib$(LIBROOT).so.$(MAJ).$(MIN) 
 -	cd $(INSTALLLIBS) ; rm -f lib$(LIBROOT).so.$(MAJ).*
 -	$(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)
-+	ln -sf lib$(LIBROOT).so.$(MAJ) $(INSTALLLIBS)/lib$(LIBROOT).so
+-	cd $(INSTALLLIBS) ; rm -f $(SONAME); ln -s $< $(SONAME)
++install.lib.common: $(SONAME)
++	cd $(INSTALLLIBS) ; rm -f lib$(LIBROOT).so.*
++	${BSD_INSTALL_DATA} $< $(INSTALLLIBS)
++	cd $(INSTALLLIBS) ; rm -f lib$(LIBROOT).so; ln -sf $< lib$(LIBROOT).so
+ endif
  
- .PHONY: dep
- dep Makefile.depend:
+ .PHONY: clean.common
diff --git a/graphics/netpbm/files/patch-bc b/graphics/netpbm/files/patch-bc
index 2daf66a..b57484e 100644
--- a/graphics/netpbm/files/patch-bc
+++ b/graphics/netpbm/files/patch-bc
@@ -1,6 +1,6 @@
---- Makefile.config.orig	Sat May  6 17:47:58 2000
-+++ Makefile.config	Mon May  8 00:00:00 2000
-@@ -34,12 +34,12 @@
+--- Makefile.config.orig	Tue May  9 09:32:59 2000
++++ Makefile.config	Sat May 20 00:00:00 2000
+@@ -38,12 +38,12 @@
  # The C compiler (including macro preprocessor)
  #CC =		cc
  #CC =		gcc
@@ -15,7 +15,7 @@
  
  # Normally the man pages are installed using "install".  But via this
  # variable, you can use something else, for example a script that
-@@ -47,7 +47,7 @@
+@@ -51,7 +51,7 @@
  # systems which use man pages in the "cat" format.
  
  #MANCP = $(SRCDIR)/mantocat
@@ -24,7 +24,7 @@
  
  # MAKE is set automatically by Make to what was used to invoke Make.
  SHELL =	/bin/sh
-@@ -60,7 +60,7 @@
+@@ -66,7 +66,7 @@
  
  # On DEC Tru64 4.0F (at least), you need -DLONG_32 for ppmtompeg.
  #CFLAGS = -O2 -std1 DLONG_32 $(CDEBUG)
@@ -33,45 +33,67 @@
  
  # 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 = 
+@@ -113,7 +113,7 @@
+ 
+ #CFLAGS_SHLIB = -fpic
+ #CFLAGS_SHLIB = -fPIC
+-CFLAGS_SHLIB = 
 +CFLAGS_SHLIB = -fPIC -DPIC
  
  # 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 @@
+@@ -126,13 +126,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 = ${LOCALBASE}/include
-+TIFFLIB_DIR = ${LOCALBASE}/lib
++#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
-@@ -139,8 +139,8 @@
+@@ -151,8 +151,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 +160,8 @@
  #JPEGHDR_DIR = /usr/local/include
  #JPEGLIB_DIR = NONE
  #JPEGHDR_DIR = NONE
 -JPEGLIB_DIR = /usr/lib/jpeg
 -JPEGHDR_DIR = /usr/include/jpeg
-+JPEGLIB_DIR = ${LOCALBASE}/lib
-+JPEGHDR_DIR = ${LOCALBASE}/include
++#JPEGLIB_DIR = /usr/lib/jpeg
++#JPEGHDR_DIR = /usr/include/jpeg
  
  
  # Put the location of your PNG library here.  If you want to build the
-@@ -161,8 +161,8 @@
+@@ -180,10 +180,10 @@
+ #PNGLIB_DIR = /usr/local/lib
+ #PNGHDR_DIR = /usr/local/include
  # No PNG:
- #PNGLIB_DIR = NONE
- #PNGHDR_DIR = NONE
+-#PNGLIB_DIR = NONE
+-#PNGHDR_DIR = NONE
 -PNGLIB_DIR = /lib
 -PNGHDR_DIR = /usr/include/png
-+PNGLIB_DIR = ${LOCALBASE}/lib
-+PNGHDR_DIR = ${LOCALBASE}/include
++PNGLIB_DIR = NONE
++PNGHDR_DIR = NONE
++#PNGLIB_DIR = /lib
++#PNGHDR_DIR = /usr/include/png
  
  
  # 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 01f3242..cf765b6 100644
--- a/graphics/netpbm/files/patch-bd
+++ b/graphics/netpbm/files/patch-bd
@@ -1,20 +1,22 @@
---- pbm/Makefile.orig	Sat May  6 16:16:53 2000
-+++ pbm/Makefile	Mon May  8 00:00:00 2000
-@@ -9,11 +9,12 @@
+--- pbm/Makefile.orig	Tue May 16 10:01:33 2000
++++ pbm/Makefile	Sat May 20 00:00:00 2000
+@@ -4,13 +4,12 @@
+ include $(SRCDIR)/Makefile.config
+ 
+ 
+-INCLUDE = -I$(SRCDIR) -I$(SRCDIR)/shhopt
++INCLUDE = -I$(SRCDIR)
+ 
  # Shared library naming
  LIBROOT = pbm
  LIBPBM = lib$(LIBROOT).$(NETPBMLIBSUFFIX)
 -MAJ = 9
-+MAJ = 1
- MIN = 1
+-MIN = 2
++SOVER = 1
  
  LIBLIBS = 
  NETPBMLIBS = $(LIBPBM)
-+NETPBMLD = -L. -lpbm
- 
- PORTBINARIES =	atktopbm brushtopbm cmuwmtopbm g3topbm \
- 		icontopbm macptopbm mdatopbm mgrtopbm \
-@@ -36,8 +37,7 @@
+@@ -37,8 +36,7 @@
  
  # Library objects to be built and linked by Makefile.common:
  LIBOBJECTS = libpbm1.o libpbm2.o libpbm3.o libpbm4.o libpbm5.o 
@@ -24,38 +26,44 @@
  
  MANUALS1 =	$(BINARIES)
  MANUALS3 =	libpbm
-@@ -45,7 +45,7 @@
- 
- MERGENAME = pbmmerge
- 
--INTERFACE_HEADERS = pbm.h
-+INTERFACE_HEADERS = pbm.h $(SRCDIR)/pbmplus.h
+@@ -50,26 +48,21 @@
  
  .PHONY: all
  all:		$(BINARIES)
-@@ -55,11 +55,11 @@
- 
- # Rules for plain programs.
- $(PORTBINARIES): %: %.o $(NETPBMLIBS)
--	$(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLIBS) $(CDEBUG)
-+	$(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLD) $(CDEBUG)
+-	$(MAKE) -C pbmtoppa all
  
- # Rule for math-dependent programs.
- $(MATHBINARIES): %: %.o $(NETPBMLIBS)
--	$(LD) $(LDFLAGS) -o $@ $@.o -lm $(NETPBMLIBS) $(CDEBUG)
-+	$(LD) $(LDFLAGS) -o $@ $@.o -lm $(NETPBMLD) $(CDEBUG)
+ .PHONY: merge
+ merge: $(MERGENAME)
+-	$(MAKE) -C pbmtoppa all
  
  .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 !
+-	$(MAKE) -C pbmtoppa install.bin
+ 
+ .PHONY: install.merge
+ install.merge: install.merge.common
+-	$(MAKE) -C pbmtoppa install.bin
+ 
+ .PHONY: install.lib
+ install.lib: install.lib.common
+ 
+ .PHONY: install.man
+ install.man: install.man.common
+-	$(MAKE) -C pbmtoppa install.man
+ 
+ include $(SRCDIR)/Makefile.common
+ 
+@@ -77,13 +70,7 @@
  ../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:
+ clean: clean.common
+-	$(MAKE) -C pbmtoppa clean
+ 
+ FORCE:
diff --git a/graphics/netpbm/files/patch-be b/graphics/netpbm/files/patch-be
index 8421faf..dc8d9ac 100644
--- a/graphics/netpbm/files/patch-be
+++ b/graphics/netpbm/files/patch-be
@@ -1,41 +1,27 @@
---- pgm/Makefile.orig	Sat May  6 12:01:47 2000
-+++ pgm/Makefile	Mon May  8 00:00:00 2000
-@@ -3,7 +3,7 @@
+--- pgm/Makefile.orig	Sat May 13 09:36:06 2000
++++ pgm/Makefile	Sat May 20 00:00:00 2000
+@@ -3,14 +3,13 @@
  
  LIBROOT = pgm
  LIBPGM = lib$(LIBROOT).$(NETPBMLIBSUFFIX)
 -MAJ = 9
-+MAJ = 1
- MIN = 0
+-MIN = 0
++SOVER = 1
  
  PBMDIR = $(SRCDIR)/pbm
-@@ -13,6 +13,7 @@
- INCLUDE = -I$(SRCDIR) $(INCLUDEPBM) -I$(SRCDIR)/shhopt
+ INCLUDEPBM = -I$(PBMDIR)
+ LIBPBM = libpbm.$(NETPBMLIBSUFFIX)
+ 
+-INCLUDE = -I$(SRCDIR) $(INCLUDEPBM) -I$(SRCDIR)/shhopt
++INCLUDE = -I$(SRCDIR) $(INCLUDEPBM)
  
  NETPBMLIBS = $(LIBPGM) $(PBMDIR)/$(LIBPBM)
-+NETPBMLD = -L. -lpgm -L$(PBMDIR) -lpbm
  LIBLIBS = $(PBMDIR)/$(LIBPBM)
- 
- PORTBINARIES =	asciitopgm bioradtopgm fstopgm hipstopgm \
-@@ -26,6 +27,7 @@
- MERGE_OBJECTS = $(patsubst %,%.o2, $(BINARIES))
+@@ -27,6 +26,7 @@
+ MERGE_OBJECTS = $(patsubst %,%.o2, $(MERGEBINARIES))
  
  LIBOBJECTS = libpgm1.o libpgm2.o
 +LIBSOBJECTS = libpgm1.so libpgm2.so
  
  MANUALS1 =	$(BINARIES)
  MANUALS3 =	libpgm
-@@ -42,11 +44,11 @@
- 
- # Rules for plain programs.
- $(PORTBINARIES): %: %.o $(NETPBMLIBS)
--	$(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLIBS) $(CDEBUG)
-+	$(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLD) $(CDEBUG)
- 
- # Rule for math-dependent programs.
- $(MATHBINARIES): %: %.o $(NETPBMLIBS)
--	$(LD) $(LDFLAGS) -o $@ $@.o -lm $(NETPBMLIBS) $(CDEBUG)
-+	$(LD) $(LDFLAGS) -o $@ $@.o -lm $(NETPBMLD) $(CDEBUG)
- 
- # And libraries.
- $(PBMDIR)/$(LIBPBM): FORCE
diff --git a/graphics/netpbm/files/patch-bf b/graphics/netpbm/files/patch-bf
index 72be1e8..f145ac4 100644
--- a/graphics/netpbm/files/patch-bf
+++ b/graphics/netpbm/files/patch-bf
@@ -1,77 +1,81 @@
---- pnm/Makefile.orig	Sat May  6 19:03:54 2000
-+++ pnm/Makefile	Mon May  8 00:00:00 2000
-@@ -3,7 +3,7 @@
+--- pnm/Makefile.orig	Tue May 16 10:29:36 2000
++++ pnm/Makefile	Sat May 20 00:00:00 2000
+@@ -3,8 +3,7 @@
  
  LIBROOT = pnm
  LIBPNM = lib$(LIBROOT).$(NETPBMLIBSUFFIX)
 -MAJ = 9
-+MAJ = 1
- MIN = 0
+-MIN = 0
++SOVER = 1
  
  PPMDIR = $(SRCDIR)/ppm
-@@ -36,6 +36,8 @@
- # The order of these libraries is important for static library build
- NETPBMLIBS = $(LIBPNM) \
-            $(PPMDIR)/$(LIBPPM) $(PGMDIR)/$(LIBPGM) $(PBMDIR)/$(LIBPBM) 
-+NETPBMLD = -L. -lpnm \
-+           -L$(PPMDIR) -lppm -L$(PGMDIR) -lpgm -L$(PBMDIR) -lpbm
- LIBLIBS =  $(PPMDIR)/$(LIBPPM) $(PGMDIR)/$(LIBPGM) $(PBMDIR)/$(LIBPBM) 
- 
- ifeq ($(JPEGLIB_DIR),NONE)
-@@ -102,6 +104,8 @@
- MERGE_OBJECTS = $(patsubst %,%.o2, $(PORTBINARIES) $(MATHBINARIES))
+ LIBPPM = libppm.$(NETPBMLIBSUFFIX)
+@@ -102,6 +101,8 @@
+ MERGE_OBJECTS = $(patsubst %,%.o2, $(MERGEBINARIES))
  
  LIBOBJECTS = libpnm1.o libpnm2.o libpnm3.o libpnm4.o
 +LIBSOBJECTS = libpnm1.so libpnm2.so libpnm3.so libpnm4.so
-+LIBOBJECTS_X = $(SRCDIR)/shhopt/libshhopt.a
++LIBSHHOPT = $(SRCDIR)/shhopt/libshhopt.a
  
  MANUALS1 = $(BINARIES) $(SCRIPTS)
  MANUALS3 = libpnm
-@@ -126,27 +130,28 @@
+@@ -113,10 +114,8 @@
+ 
+ .PHONY: all
+ all:      $(BINARIES)
+-	$(MAKE) -C jbig all
+ PHONY: merge
+ merge:    $(MERGENAME) $(NOMERGEBINARIES)
+-	$(MAKE) -C jbig all
+ 
+ ifeq ($(TIFFLIB_DIR),$(TIFFDIR))
+ # We're using the internal Tiff library, so make sure it's built
+@@ -127,18 +126,18 @@
+ endif
  
  # 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 \
--	  $(JPEGLD) $(CDEBUG)
-+  $(NETPBMLIBS) $(TIFFLIB_DIR)/libtiff.$(LIBTIFFSUFFIX) $(LIBOBJECTS_X)
-+	$(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLD) -lm -L$(TIFFLIB_DIR) -ltiff \
-+	  $(LIBOBJECTS_X) $(JPEGLD) $(CDEBUG)
- 
- # Rules for plain programs.
- $(PORTBINARIES): %: %.o $(NETPBMLIBS) 
--	$(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLIBS) $(CDEBUG)
-+	$(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLD) $(CDEBUG)
- 
- # Rule for math-dependent programs.
- $(MATHBINARIES): %: %.o $(NETPBMLIBS)
--	$(LD) $(LDFLAGS) -o $@ $@.o -lm $(NETPBMLIBS) $(CDEBUG)
-+	$(LD) $(LDFLAGS) -o $@ $@.o -lm $(NETPBMLD) $(CDEBUG)
- 
- pngtopnm pnmtopng: %: %.o $(NETPBMLIBS)
--	$(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLIBS) \
-+	$(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLD) \
+-tifftopnm pnmtotiff pnmtotiffcmyk: %: %.o \
+-  $(NETPBMLIBS) $(TIFFLIB_DIR)/libtiff.$(LIBTIFFSUFFIX) $(LIBOPT)
++tifftopnm pnmtotiff pnmtotiffcmyk: %: %.o $(NETPBMLIBS) $(LIBOPT) \
++	$(TIFFLIB_DIR)/libtiff.$(LIBTIFFSUFFIX) $(LIBSHHOPT)
+ 	$(LD) $(LDFLAGS) -o $@ $@.o `$(LIBOPT) $(NETPBMLIBS)` \
+-	  -L$(TIFFLIB_DIR) -ltiff $(JPEGLD) -lm $(CDEBUG)
++	  -L$(TIFFLIB_DIR) -ltiff $(JPEGLD) -lm $(LIBSHHOPT) $(CDEBUG)
+ 
+ pngtopnm pnmtopng: %: %.o $(NETPBMLIBS) $(LIBOPT)
+ 	$(LD) $(LDFLAGS) -o $@ $@.o `$(LIBOPT) $(NETPBMLIBS)` \
  	  -L$(PNGLIB_DIR) -lpng -lz -lm $(CDEBUG)
  
--jpegtopnm: %: %.o $(NETPBMLIBS)
--	$(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLIBS) $(JPEGLD)  $(CDEBUG)
-+jpegtopnm: %: %.o $(NETPBMLIBS) $(LIBOBJECTS_X)
-+	$(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLD) \
-+	  $(LIBOBJECTS_X) $(JPEGLD) $(CDEBUG)
+-jpegtopnm: %: %.o $(NETPBMLIBS) $(LIBOPT)
++jpegtopnm: %: %.o $(NETPBMLIBS) $(LIBOPT) $(LIBSHHOPT)
+ 	$(LD) $(LDFLAGS) -o $@ $@.o `$(LIBOPT) $(NETPBMLIBS)` $(JPEGLD) \
+-	   $(CDEBUG)
++	  $(LIBSHHOPT) $(CDEBUG)
  
- rletopnm pnmtorle: %: %.o $(NETPBMLIBS)
--	$(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLIBS) \
-+	$(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLD) \
- 	  -L$(URTLIB_DIR) -lrle $(CDEBUG)
+ rletopnm pnmtorle: %: %.o $(NETPBMLIBS) $(LIBOPT)
+ 	$(LD) $(LDFLAGS) -o $@ $@.o `$(LIBOPT) $(NETPBMLIBS)` \
+@@ -165,22 +164,20 @@
+ # backward compatibility: program used to be gemtopbm
+ 	rm -f $(INSTALLBINARIES)/gemtopbm
+ 	ln -s $(INSTALLBINARIES)/gemtopnm$(EXE) $(INSTALLBINARIES)/gemtopbm
+-	$(MAKE) -C jbig install.bin
  
- # And libraries.
-@@ -173,6 +178,9 @@
+ .PHONY: install.merge
+ install.merge: install.merge.common
+-	$(MAKE) -C jbig install.bin
  
  .PHONY: install.lib
  install.lib: install.lib.common
-+
+ 
+ .PHONY: install.man
+ install.man: install.man.common
+-	$(MAKE) -C jbig install.man
+ 
 +$(SRCDIR)/shhopt/libshhopt.a:
 +	cd ../shhopt; $(MAKE) libshhopt.a
  
  .PHONY: clean
- clean:
+ clean: clean.common
+-	$(MAKE) -C jbig clean
+ 
+ FORCE:
diff --git a/graphics/netpbm/files/patch-bg b/graphics/netpbm/files/patch-bg
index ca7b74c..d8b21ec 100644
--- a/graphics/netpbm/files/patch-bg
+++ b/graphics/netpbm/files/patch-bg
@@ -1,21 +1,16 @@
---- ppm/Makefile.orig	Sat May  6 12:57:43 2000
-+++ ppm/Makefile	Mon May  8 00:00:00 2000
-@@ -3,7 +3,7 @@
+--- ppm/Makefile.orig	Tue May 16 10:30:30 2000
++++ ppm/Makefile	Sat May 20 00:00:00 2000
+@@ -3,8 +3,7 @@
  
  LIBROOT = ppm
  LIBPPM = lib$(LIBROOT).$(NETPBMLIBSUFFIX)
 -MAJ = 9
-+MAJ = 1
- MIN = 1
+-MIN = 1
++SOVER = 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)
- 
+ LIBPGM = libpgm.$(NETPBMLIBSUFFIX)
+@@ -24,7 +23,7 @@
  PORTBINARIES =	bmptoppm eyuvtoppm gouldtoppm hpcdtoppm ilbmtoppm imgtoppm \
  		mtvtoppm pcxtoppm pgmtoppm pi1toppm picttoppm \
  		pjtoppm \
@@ -24,7 +19,7 @@
  		ppmdim ppmdist ppmdither \
  		ppmflash ppmhist ppmmake ppmmix ppmnorm \
  		ppmquant ppmrelief ppmshift ppmspread ppmtoacad \
-@@ -34,19 +35,20 @@
+@@ -34,12 +33,13 @@
  		ppmtotga ppmtouil ppmtoxpm ppmtoyuv \
  		ppmtoyuvsplit ppmtv \
  		qrttoppm rawtoppm rgb3toppm sldtoppm spctoppm \
@@ -39,68 +34,74 @@
  ifneq ($(JPEGLIB_DIR), NONE)
    ifneq ($(JPEGHDR_DIR), NONE)
        NOMERGEBINARIES += ppmtojpeg
-   endif
- endif
+@@ -48,7 +48,7 @@
+ 
+ MERGEBINARIES = $(PORTBINARIES) $(MATHBINARIES)
  
 -MATHBINARIES = ppmcie ppmforge ppmlabel ppmntsc ppmpat ppmqvga ppmtomap
 +MATHBINARIES = ppmcie ppmforge ppmlabel ppmpat ppmqvga ppmtomap
- BINARIES = $(PORTBINARIES) $(NOMERGEBINARIES) $(MATHBINARIES)
+ BINARIES = $(MERGEBINARIES) $(NOMERGEBINARIES) 
  SCRIPTS = ppmquantall ppmshadow ppmfade
  
-@@ -55,6 +57,8 @@
- MERGE_OBJECTS = $(patsubst %,%.o2, $(PORTBINARIES) $(MATHBINARIES))
+@@ -57,6 +57,8 @@
+ MERGE_OBJECTS = $(patsubst %,%.o2, $(MERGEBINARIES))
  
  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
++LIBSHHOPT = $(SRCDIR)/shhopt/libshhopt.a
  
  MANUALS1 = $(BINARIES) $(SCRIPTS)
  MANUALS3 = libppm
-@@ -62,7 +66,7 @@
+@@ -64,18 +66,24 @@
  
  MERGENAME= ppmmerge
  
--INTERFACE_HEADERS = ppm.h
+-INTERFACE_HEADERS = ppm.h ppmcmap.h
 +INTERFACE_HEADERS = ppm.h ppmcmap.h ppmdraw.h
  
  .PHONY: all
  all:        $(BINARIES)
-@@ -72,16 +76,23 @@
- 
- # Rules for plain programs.
- $(PORTBINARIES): %: %.o $(NETPBMLIBS)
--	$(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLIBS) \
--	  $(CDEBUG)
-+	$(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLD) $(CDEBUG)
- 
- # Rule for math-dependent programs.
- $(MATHBINARIES): %: %.o $(NETPBMLIBS)
--	$(LD) $(LDFLAGS) -o $@ $@.o -lm $(NETPBMLIBS) $(CDEBUG)
-+	$(LD) $(LDFLAGS) -o $@ $@.o -lm $(NETPBMLD) $(CDEBUG)
+-	$(MAKE) -C ppmtompeg all
+ .PHONY: merge
+ merge:      $(MERGENAME) $(NOMERGEBINARIES)
+-	$(MAKE) -C ppmtompeg all
+ 
+-ppmtojpeg: %: %.o $(NETPBMLIBS) $(LIBOPT)
++ppmcolormask tgatoppm ximtoppm: %: %.o $(NETPBMLIBS) $(LIBOPT) $(LIBSHHOPT)
+ 	$(LD) $(LDFLAGS) -o $@ $@.o `$(LIBOPT) $(NETPBMLIBS)` \
+-	  -L$(JPEGLIB_DIR) -ljpeg $(CDEBUG)
++	  $(LIBSHHOPT) $(CDEBUG)
 +
-+ppmcolormask tgatoppm ximtoppm: %: %.o $(NETPBMLIBS) $(LIBOBJECTS_X)
-+	$(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLD) \
-+	  $(LIBOBJECTS_X) $(CDEBUG)
++ppmntsc: %: %.o $(NETPBMLIBS) $(LIBOPT) $(LIBSHHOPT)
++	$(LD) $(LDFLAGS) -o $@ $@.o `$(LIBOPT) $(NETPBMLIBS)` \
++	  -lm $(LIBSHHOPT) $(CDEBUG)
 +
-+ppmntsc: %: %.o $(NETPBMLIBS) $(LIBOBJECTS_X)
-+	$(LD) $(LDFLAGS) -o $@ $@.o -lm $(NETPBMLD) \
-+	  $(LIBOBJECTS_X) $(CDEBUG)
- 
- ppmtojpeg: %: %.o $(NETPBMLIBS)
--	$(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLIBS) \
--	  -L$(JPEGLIB_DIR) -ljpeg $(CDEBUG)
-+	$(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLD) \
-+	  $(LIBOBJECTS_X) -L$(JPEGLIB_DIR) -ljpeg $(CDEBUG)
++ppmtojpeg: %: %.o $(NETPBMLIBS) $(LIBOPT) $(LIBSHHOPT)
++	$(LD) $(LDFLAGS) -o $@ $@.o `$(LIBOPT) $(NETPBMLIBS)` \
++	  -L$(JPEGLIB_DIR) -ljpeg $(LIBSHHOPT) $(CDEBUG)
  
  # And libraries.
  $(PBMDIR)/$(LIBPBM): FORCE
-@@ -96,6 +107,9 @@
+@@ -88,19 +96,19 @@
+ 
+ .PHONY: install.merge
+ install.merge: install.merge.common
+-	$(MAKE) -C ppmtompeg install.bin
+ 
+ .PHONY: install.lib
  install.lib: install.lib.common
  
+ .PHONY: install.man
+ install.man: install.man.common
+-	$(MAKE) -C ppmtompeg install.man
+ 
  include $(SRCDIR)/Makefile.common
-+
+ 
 +$(SRCDIR)/shhopt/libshhopt.a:
 +	cd ../shhopt; $(MAKE) libshhopt.a
- 
++
  .PHONY: clean
- clean:
+ clean: clean.common
+-	$(MAKE) -C ppmtompeg clean
+ 
+ FORCE:
diff --git a/graphics/netpbm/pkg-plist b/graphics/netpbm/pkg-plist
index bf6c837..5705ed7 100644
--- a/graphics/netpbm/pkg-plist
+++ b/graphics/netpbm/pkg-plist
@@ -9,7 +9,6 @@ bin/eyuvtoppm
 bin/fitstopnm
 bin/fstopgm
 bin/g3topbm
-bin/gemtopbm
 bin/gemtopnm
 bin/giftopnm
 bin/gouldtoppm
@@ -83,7 +82,6 @@ bin/pi3topbm
 bin/picttoppm
 bin/pjtoppm
 bin/pktopbm
-bin/pngtopnm
 bin/pnmalias
 bin/pnmarith
 bin/pnmcat
@@ -99,6 +97,8 @@ bin/pnmgamma
 bin/pnmhisteq
 bin/pnmhistmap
 bin/pnmindex
+bin/pnminterp
+bin/pnminterp-gen
 bin/pnminvert
 bin/pnmmargin
 bin/pnmmerge
@@ -114,7 +114,6 @@ bin/pnmtile
 bin/pnmtoddif
 bin/pnmtofits
 bin/pnmtoplainpnm
-bin/pnmtopng
 bin/pnmtops
 bin/pnmtorast
 bin/pnmtosgi