Update to 9.3.

Use USE_LIBTOOL instead of USE_PKGLIBTOOL.
Changes since 9.2:
o pnmfile: check for file size error.
o ppmhist: handle larger maxvals, image sizes
o xwdtopnm: Use color map with DirectColor to fix wrong color bug on
  some DirectColor xwds.
o xwdtopnm: Correct bug with 24/32 DirectColor LSBfirst xwds.
o Add pXmcheck() library function.
o Add leaftoppm and ppmtoleaf.  Thanks Bill O'Donnell.
o Add winicontoppm and ppmtowinicon.  Thanks Lee Benfield.
o Add pgmslice.  Thanks to Jos Dingjan.
o Include subset of RLE library in the package.
o stamp-date doesn't rely on whoami.
o Make file fixes to accomodate more install programs.
o Replace tmpnam() with mkstemp().
o Add pXm_init() into all programs that didn't have it.

7 files changed, 115 insertions, 90 deletions

diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index f38552668a9..529308640c6 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.40 2000/06/01 11:23:30 rh Exp $
+# $NetBSD: Makefile,v 1.41 2000/06/05 00:36:30 wiz Exp $
 
-DISTNAME=	netpbm-9.2
+DISTNAME=	netpbm-9.3
 CATEGORIES=	graphics
 MASTER_SITES=	http://download.sourceforge.net/netpbm/
 EXTRACT_SUFX=	.tgz
@@ -12,10 +12,9 @@ DEPENDS+=	tiff>=3.5.4:../../graphics/tiff
 DEPENDS+=	png>=1.0.6:../../graphics/png
 
 USE_GMAKE=	yes
-USE_PKGLIBTOOL=	yes
+USE_LIBTOOL=	yes
 
-INSTALL_TARGET=	install.dev install
-MAKE_ENV+=	ECHO="${ECHO}"
+INSTALL_TARGET=	install-dev install
 MAKEFILE=	GNUmakefile
 
 .include "../../mk/bsd.prefs.mk"
@@ -23,6 +22,12 @@ MAKEFILE=	GNUmakefile
 .if ${OPSYS} == NetBSD && ${MACHINE_ARCH} == arm32
 CFLAGS=
 .endif
+# 'echo' doesn't suffice for unknown reasons
+.if ${OPSYS} == NetBSD
+MAKE_ENV+=	ECHO="/bin/echo"
+.else
+MAKE_ENV+=	ECHO="${ECHO}"
+.endif
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/shhopt/shhopt.h ${PREFIX}/include
diff --git a/graphics/netpbm/files/md5 b/graphics/netpbm/files/md5
index 1b3ee30d434..a4b1d6ed8a9 100644
--- a/graphics/netpbm/files/md5
+++ b/graphics/netpbm/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.8 2000/05/17 10:13:20 tron Exp $
+$NetBSD: md5,v 1.9 2000/06/05 00:36:31 wiz Exp $
 
-MD5 (netpbm-9.2.tgz) = 11c7bcd42a4edca8f093e7996bf4dc97
+MD5 (netpbm-9.3.tgz) = bd50468014c62cdf5f1fdd48ffb9a10c
diff --git a/graphics/netpbm/files/patch-sum b/graphics/netpbm/files/patch-sum
index 3948b1daacf..71dd16ce042 100644
--- a/graphics/netpbm/files/patch-sum
+++ b/graphics/netpbm/files/patch-sum
@@ -1,6 +1,7 @@
-$NetBSD: patch-sum,v 1.4 2000/05/17 10:13:20 tron Exp $
+$NetBSD: patch-sum,v 1.5 2000/06/05 00:36:31 wiz Exp $
 
-MD5 (patch-aa) = 1ecdc727298b92ad9f83d8e705c41115
-MD5 (patch-ab) = 60d40ac6681e16242d9f1dd881850d7d
+MD5 (patch-aa) = 107218ef620bf64ee6df627a6073abe6
+MD5 (patch-ab) = ede58d1ea5e707aeff4ec2ab51455733
 MD5 (patch-ac) = 39721b5f833ab984a5a49a8cb11f4a84
 MD5 (patch-ad) = 6800c568c8aefaecb72cc5eeb34f10dd
+MD5 (patch-ae) = 2dad77b8f2f4f3a694b77f9e7f914b07
diff --git a/graphics/netpbm/patches/patch-aa b/graphics/netpbm/patches/patch-aa
index fbd865a20a5..8f9e6361d89 100644
--- a/graphics/netpbm/patches/patch-aa
+++ b/graphics/netpbm/patches/patch-aa
@@ -1,64 +1,71 @@
-$NetBSD: patch-aa,v 1.9 2000/05/17 10:13:20 tron Exp $
+$NetBSD: patch-aa,v 1.10 2000/06/05 00:36:31 wiz Exp $
 
---- Makefile.config.orig	Tue May  9 02:32:59 2000
-+++ Makefile.config	Wed May 17 11:34:31 2000
+--- Makefile.config.orig	Thu Jun  1 19:17:32 2000
++++ Makefile.config	Mon Jun  5 01:35:05 2000
 @@ -29,8 +29,8 @@
  #
  # For cygwin, only static libraries work, so set STATICLIB = Y  .
  
--#STATICLIB = Y
 -STATICLIB = N
-+STATICLIB = Y
+-#STATICLIB = Y
 +#STATICLIB = N
++STATICLIB = Y
  
  # The following are commands for the build process to use.  These values
  # do not get built into anything.
-@@ -38,12 +38,13 @@
- # The C compiler (including macro preprocessor)
+@@ -39,14 +39,15 @@
+ #Tru64:
  #CC =		cc
  #CC =		gcc
--CC =		gcc -fpcc-struct-return
-+#CC =		gcc -fpcc-struct-return
+-CC =		gcc
++#CC =		gcc
  
  # The linker.
+-LD = $(CC)
++#LD = $(CC)
  #LD = ld
+ #Tru64:
  #LD = cc
--LD = gcc 
-+#LD = gcc 
+ #LD = gcc 
 +LD = $(LIBTOOL) --mode=link $(CC)
  
  # Normally the man pages are installed using "install".  But via this
  # variable, you can use something else, for example a script that
-@@ -57,7 +58,7 @@
+@@ -59,7 +60,7 @@
+ # MAKE is set automatically by Make to what was used to invoke Make.
  SHELL =	/bin/sh
- # Solaris:
- #INSTALL = /usr/ucb/install
+ 
 -INSTALL = install
 +INSTALL = install -c
- AR= ar
- RANLIB=	ranlib
+ # Solaris:
+ #INSTALL = /usr/ucb/install
+ #Tru64:
+@@ -73,7 +74,7 @@
  
-@@ -66,7 +67,7 @@
+ # C compiler options
  
- # On DEC Tru64 4.0F (at least), you need -DLONG_32 for ppmtompeg.
- #CFLAGS = -O2 -std1 DLONG_32 $(CDEBUG)
 -CFLAGS = -pedantic -O2 -Wall -Wno-uninitialized $(CDEBUG)
 +CFLAGS += -pedantic -Wall -Wno-uninitialized $(CDEBUG)
+ # On DEC Tru64 4.0F (at least), you need -DLONG_32 for ppmtompeg.
+ #Tru64:
+ #CFLAGS = -O2 -std1 DLONG_32 $(CDEBUG)
+@@ -87,7 +88,7 @@
+   
+ # linker options.  
  
- # EXE is a suffix that the linker puts on any executable it generates.
- # In cygwin, this is .exe and most program deal with its existence without
-@@ -89,7 +90,7 @@
- #LDFLAGS = -R$(INSTALLLIBS)
- #If the linker is gcc (e.g. NetBSD):
- #LDFLAGS = -Wl,--rpath,$(INSTALLLIBS)
 -LDFLAGS =
 +#LDFLAGS =
- 
- # Linker options for created Netpbm shared libraries.
- 
-@@ -126,13 +127,13 @@
+ # Eunice users may want to use -noshare so that the executables can
+ # run standalone:
+ #LDFLAGS = -noshare
+@@ -139,11 +140,11 @@
  # but otherwise will not.
  
+ # Use the Tiff library included with Netpbm:
+-TIFFHDR_DIR = $(SRCDIR)/libtiff
+-TIFFLIB_DIR = $(SRCDIR)/libtiff
++#TIFFHDR_DIR = $(SRCDIR)/libtiff
++#TIFFLIB_DIR = $(SRCDIR)/libtiff
  #NetBSD:
 -#TIFFHDR_DIR = $(LOCALBASE)/include
 -#TIFFLIB_DIR = $(LOCALBASE)/lib
@@ -67,16 +74,14 @@ $NetBSD: patch-aa,v 1.9 2000/05/17 10:13:20 tron Exp $
  # OSF, Tru64:
  #TIFFHDR_DIR = /usr/local1/DEC/include
  #TIFFLIB_DIR = /usr/local1/DEC/lib
--TIFFHDR_DIR = $(SRCDIR)/libtiff
--TIFFLIB_DIR = $(SRCDIR)/libtiff
-+#TIFFHDR_DIR = $(SRCDIR)/libtiff
-+#TIFFLIB_DIR = $(SRCDIR)/libtiff
- 
- # Put the location of your JPEG library here.
- # If you want to build the jpeg converters or tiff
-@@ -151,8 +152,8 @@
+@@ -164,11 +165,11 @@
+ # at least JPEGLIB_DIR here, or the tiff converters will not build at
  # all.
  
+-JPEGLIB_DIR = /usr/lib/jpeg
+-JPEGHDR_DIR = /usr/include/jpeg
++#JPEGLIB_DIR = /usr/lib/jpeg
++#JPEGHDR_DIR = /usr/include/jpeg
  # Netbsd:
 -#JPEGLIB_DIR = ${LOCALBASE}/lib
 -#JPEGHDR_DIR = ${LOCALBASE}/include
@@ -85,20 +90,14 @@ $NetBSD: patch-aa,v 1.9 2000/05/17 10:13:20 tron Exp $
  # OSF, Tru64:
  #JPEGLIB_DIR = /usr/local1/DEC/lib
  #JPEGHDR_DIR = /usr/local1/DEC/include
-@@ -160,8 +161,8 @@
- #JPEGHDR_DIR = /usr/local/include
- #JPEGLIB_DIR = NONE
- #JPEGHDR_DIR = NONE
--JPEGLIB_DIR = /usr/lib/jpeg
--JPEGHDR_DIR = /usr/include/jpeg
-+#JPEGLIB_DIR = /usr/lib/jpeg
-+#JPEGHDR_DIR = /usr/include/jpeg
- 
- 
- # Put the location of your PNG library here.  If you want to build the
-@@ -171,8 +172,8 @@
+@@ -186,11 +187,11 @@
+ # here.  If you do not have the PNG library, and still want to
  # successully build everything else, put NONE for these.
  
+-PNGLIB_DIR = /lib
+-PNGHDR_DIR = /usr/include/png
++#PNGLIB_DIR = /lib
++#PNGHDR_DIR = /usr/include/png
  # NetBSD:
 -#PNGLIB_DIR = $(LOCALBASE)/lib
 -#PNGHDR_DIR = $(LOCALBASE)/include
@@ -107,18 +106,7 @@ $NetBSD: patch-aa,v 1.9 2000/05/17 10:13:20 tron Exp $
  # OSF/Tru64:
  #PNGLIB_DIR = /usr/local1/DEC/lib
  #PNGHDR_DIR = /usr/local1/DEC/include
-@@ -182,8 +183,8 @@
- # No PNG:
- #PNGLIB_DIR = NONE
- #PNGHDR_DIR = NONE
--PNGLIB_DIR = /lib
--PNGHDR_DIR = /usr/include/png
-+#PNGLIB_DIR = /lib
-+#PNGHDR_DIR = /usr/include/png
- 
- 
- # And the Utah Raster Toolkit (aka URT aka RLE) library:
-@@ -275,8 +276,8 @@
+@@ -296,8 +297,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 3d1b3ed0b23..feecaaa5e01 100644
--- a/graphics/netpbm/patches/patch-ab
+++ b/graphics/netpbm/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.5 2000/05/17 10:13:20 tron Exp $
+$NetBSD: patch-ab,v 1.6 2000/06/05 00:36:31 wiz Exp $
 
---- Makefile.common.orig	Tue May 16 03:14:14 2000
-+++ Makefile.common	Wed May 17 11:18:34 2000
+--- Makefile.common.orig	Thu Jun  1 19:38:14 2000
++++ Makefile.common	Mon Jun  5 01:38:40 2000
 @@ -67,7 +67,7 @@
  $(OBJECTS): %.o: %.c
  	$(CC) -c $(CFLAGS) $(INCLUDE) -o $@ $<
@@ -31,29 +31,29 @@ $NetBSD: patch-ab,v 1.5 2000/05/17 10:13:20 tron 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)
  
- # Before Netpbm 8.4, we did hard links instead of symbolic.  A user
- # requested symbolic, and I couldn't see a reason for hard (original reason
-@@ -146,7 +144,7 @@
- install.bin.common: $(BINARIES) install.script
- # Note that on Cygwin, the executables are actually pbmmake.exe, etc.
+ # 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 @@
  # Make and Install know that pbmmake.exe counts as pbmmake.
--	$(INSTALL) -s -m$(INSTALL_PERM_BIN) $(BINARIES) $(INSTALLBINARIES)
-+	$(LIBTOOL) --mode=install $(INSTALL) -s -m$(INSTALL_PERM_BIN) $(BINARIES) $(INSTALLBINARIES)
+ 	for x in $(BINARIES); \
+ 	do \
+-	   $(INSTALL) -c -s -m $(INSTALL_PERM_BIN) $$x $(INSTALLBINARIES); \
++	   $(LIBTOOL) --mode=install $(INSTALL) -c -s -m $(INSTALL_PERM_BIN) $$x $(INSTALLBINARIES); \
+ 	done
  
  .PHONY: install.script
- install.script: $(SCRIPTS)
-@@ -191,8 +189,8 @@
+@@ -208,8 +206,8 @@
  # built.  If a previous make STATICLIB=N didn't build the static
  # library, the dependency here will do that.
  .PHONY: install.staticlib
 -install.staticlib: lib$(LIBROOT).a
--	$(INSTALL) -m$(INSTALL_PERM_LIBS) $< $(INSTALLLIBS)/$<
+-	$(INSTALL) -c -m $(INSTALL_PERM_LIBS) $< $(INSTALLLIBS)/$<
 +install.staticlib: lib$(LIBROOT).la
 +	$(LIBTOOL) --mode=install $(BSD_INSTALL_DATA) lib$(LIBROOT).la $(PREFIX)/lib
  
  .PHONY: install.lib.common
  ifeq ($(NETPBMLIBSUFFIX),so)
-@@ -206,7 +204,7 @@
+@@ -223,7 +221,7 @@
  
  .PHONY: clean.common
  clean.common:
diff --git a/graphics/netpbm/patches/patch-ae b/graphics/netpbm/patches/patch-ae
new file mode 100644
index 00000000000..4f356ce5916
--- /dev/null
+++ b/graphics/netpbm/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.5 2000/06/05 00:36:31 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
+ 
+ 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
diff --git a/graphics/netpbm/pkg/PLIST b/graphics/netpbm/pkg/PLIST
index 94281e6c0c8..1a9432f8720 100644
--- a/graphics/netpbm/pkg/PLIST
+++ b/graphics/netpbm/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2000/05/17 18:41:22 tron Exp $
+@comment $NetBSD: PLIST,v 1.9 2000/06/05 00:36:32 wiz Exp $
 bin/anytopnm
 bin/asciitopgm
 bin/atktopbm
@@ -21,6 +21,7 @@ bin/ilbmtoppm
 bin/imgtoppm
 bin/jbigtopnm
 bin/jpegtopnm
+bin/leaftoppm
 bin/lispmtopgm
 bin/macptopbm
 bin/mdatopbm
@@ -74,6 +75,7 @@ bin/pgmnoise
 bin/pgmnorm
 bin/pgmoil
 bin/pgmramp
+bin/pgmslice
 bin/pgmtexture
 bin/pgmtofs
 bin/pgmtolispm
@@ -120,6 +122,7 @@ bin/pnmtoplainpnm
 bin/pnmtopng
 bin/pnmtops
 bin/pnmtorast
+bin/pnmtorle
 bin/pnmtosgi
 bin/pnmtosir
 bin/pnmtotiff
@@ -157,6 +160,7 @@ bin/ppmtogif
 bin/ppmtoicr
 bin/ppmtoilbm
 bin/ppmtojpeg
+bin/ppmtoleaf
 bin/ppmtomap
 bin/ppmtomitsu
 bin/ppmtopcx
@@ -171,6 +175,7 @@ bin/ppmtosixel
 bin/ppmtotga
 bin/ppmtouil
 bin/ppmtoxpm
+bin/ppmtowinicon
 bin/ppmtoyuv
 bin/ppmtoyuvsplit
 bin/ppmtv
@@ -181,6 +186,7 @@ bin/rasttopnm
 bin/rawtopgm
 bin/rawtoppm
 bin/rgb3toppm
+bin/rletopnm
 bin/sbigtopgm
 bin/sgitopnm
 bin/sirtopnm
@@ -190,6 +196,7 @@ bin/spottopgm
 bin/sputoppm
 bin/tgatoppm
 bin/tifftopnm
+bin/winicontoppm
 bin/xbmtopbm
 bin/ximtoppm
 bin/xpmtoppm
@@ -207,13 +214,17 @@ include/ppm.h
 include/ppmcmap.h
 include/shhopt.h
 lib/libpbm.a
-lib/libpbm.so.9.2
+lib/libpbm.la
+lib/libpbm.so.9.3
 lib/libpgm.a
-lib/libpgm.so.9.0
+lib/libpgm.la
+lib/libpgm.so.9.3
 lib/libpnm.a
-lib/libpnm.so.9.0
+lib/libpnm.la
+lib/libpnm.so.9.3
 lib/libppm.a
-lib/libppm.so.9.1
+lib/libppm.la
+lib/libppm.so.9.3
 man/man1/anytopnm.1
 man/man1/asciitopgm.1
 man/man1/atktopbm.1
@@ -235,6 +246,7 @@ man/man1/ilbmtoppm.1
 man/man1/imgtoppm.1
 man/man1/jbigtopnm.1
 man/man1/jpegtopnm.1
+man/man1/leaftoppm.1
 man/man1/lispmtopgm.1
 man/man1/macptopbm.1
 man/man1/mdatopbm.1
@@ -288,6 +300,7 @@ man/man1/pgmnoise.1
 man/man1/pgmnorm.1
 man/man1/pgmoil.1
 man/man1/pgmramp.1
+man/man1/pgmslice.1
 man/man1/pgmtexture.1
 man/man1/pgmtofs.1
 man/man1/pgmtolispm.1
@@ -332,6 +345,7 @@ man/man1/pnmtojbig.1
 man/man1/pnmtoplainpnm.1
 man/man1/pnmtopng.1
 man/man1/pnmtops.1
+man/man1/pnmtorle.1
 man/man1/pnmtorast.1
 man/man1/pnmtosgi.1
 man/man1/pnmtosir.1
@@ -370,6 +384,7 @@ man/man1/ppmtogif.1
 man/man1/ppmtoicr.1
 man/man1/ppmtoilbm.1
 man/man1/ppmtojpeg.1
+man/man1/ppmtoleaf.1
 man/man1/ppmtomap.1
 man/man1/ppmtomitsu.1
 man/man1/ppmtompeg.1
@@ -384,6 +399,7 @@ man/man1/ppmtorgb3.1
 man/man1/ppmtosixel.1
 man/man1/ppmtotga.1
 man/man1/ppmtouil.1
+man/man1/ppmtowinicon.1
 man/man1/ppmtoxpm.1
 man/man1/ppmtoyuv.1
 man/man1/ppmtoyuvsplit.1
@@ -395,6 +411,7 @@ man/man1/rasttopnm.1
 man/man1/rawtopgm.1
 man/man1/rawtoppm.1
 man/man1/rgb3toppm.1
+man/man1/rletopnm.1
 man/man1/sbigtopgm.1
 man/man1/sgitopnm.1
 man/man1/sirtopnm.1
@@ -404,6 +421,7 @@ man/man1/spottopgm.1
 man/man1/sputoppm.1
 man/man1/tgatoppm.1
 man/man1/tifftopnm.1
+man/man1/winicontoppm.1
 man/man1/xbmtopbm.1
 man/man1/ximtoppm.1
 man/man1/xpmtoppm.1