Update to netpbm-9.5.

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

5 files changed, 50 insertions, 96 deletions

diff --git a/graphics/netpbm/patches/patch-aa b/graphics/netpbm/patches/patch-aa
index 8f9e6361d89..51ba95c85c5 100644
--- a/graphics/netpbm/patches/patch-aa
+++ b/graphics/netpbm/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.10 2000/06/05 00:36:31 wiz Exp $
+$NetBSD: patch-aa,v 1.11 2000/07/10 11:12:10 wiz Exp $
 
---- Makefile.config.orig	Thu Jun  1 19:17:32 2000
-+++ Makefile.config	Mon Jun  5 01:35:05 2000
+--- Makefile.config.orig	Thu Jun 22 19:48:03 2000
++++ Makefile.config	Sun Jul  9 23:54:46 2000
 @@ -29,8 +29,8 @@
  #
  # For cygwin, only static libraries work, so set STATICLIB = Y  .
@@ -13,7 +13,7 @@ $NetBSD: patch-aa,v 1.10 2000/06/05 00:36:31 wiz Exp $
  
  # The following are commands for the build process to use.  These values
  # do not get built into anything.
-@@ -39,14 +39,15 @@
+@@ -39,19 +39,20 @@
  #Tru64:
  #CC =		cc
  #CC =		gcc
@@ -29,27 +29,33 @@ $NetBSD: patch-aa,v 1.10 2000/06/05 00:36:31 wiz Exp $
  #LD = gcc 
 +LD = $(LIBTOOL) --mode=link $(CC)
  
- # Normally the man pages are installed using "install".  But via this
- # variable, you can use something else, for example a script that
-@@ -59,7 +60,7 @@
  # MAKE is set automatically by Make to what was used to invoke Make.
  SHELL =	/bin/sh
  
--INSTALL = install
-+INSTALL = install -c
+-INSTALL = ginstall
++#INSTALL = ginstall
  # Solaris:
  #INSTALL = /usr/ucb/install
  #Tru64:
-@@ -73,7 +74,7 @@
- 
- # C compiler options
+@@ -59,7 +60,7 @@
+ #OSF1:
+ #INSTALL = installosf
+ # ?
+-#INSTALL = install
++INSTALL = install -c
  
+ # Normally the man pages are installed using "install".  But via this
+ # variable, you can use something else, for example a script that
+@@ -79,7 +80,7 @@
+ # -ansi and -Werror should work too, but are not included
+ # by default because there's no point in daring the build to fail.
+ # -pedantic isn't a problem because it causes at worst a warning.
 -CFLAGS = -pedantic -O2 -Wall -Wno-uninitialized $(CDEBUG)
 +CFLAGS += -pedantic -Wall -Wno-uninitialized $(CDEBUG)
  # On DEC Tru64 4.0F (at least), you need -DLONG_32 for ppmtompeg.
  #Tru64:
  #CFLAGS = -O2 -std1 DLONG_32 $(CDEBUG)
-@@ -87,7 +88,7 @@
+@@ -93,7 +94,7 @@
    
  # linker options.  
  
@@ -58,7 +64,7 @@ $NetBSD: patch-aa,v 1.10 2000/06/05 00:36:31 wiz Exp $
  # Eunice users may want to use -noshare so that the executables can
  # run standalone:
  #LDFLAGS = -noshare
-@@ -139,11 +140,11 @@
+@@ -148,11 +149,11 @@
  # but otherwise will not.
  
  # Use the Tiff library included with Netpbm:
@@ -74,7 +80,7 @@ $NetBSD: patch-aa,v 1.10 2000/06/05 00:36:31 wiz Exp $
  # OSF, Tru64:
  #TIFFHDR_DIR = /usr/local1/DEC/include
  #TIFFLIB_DIR = /usr/local1/DEC/lib
-@@ -164,11 +165,11 @@
+@@ -173,11 +174,11 @@
  # at least JPEGLIB_DIR here, or the tiff converters will not build at
  # all.
  
@@ -90,7 +96,7 @@ $NetBSD: patch-aa,v 1.10 2000/06/05 00:36:31 wiz Exp $
  # OSF, Tru64:
  #JPEGLIB_DIR = /usr/local1/DEC/lib
  #JPEGHDR_DIR = /usr/local1/DEC/include
-@@ -186,11 +187,11 @@
+@@ -195,11 +196,11 @@
  # here.  If you do not have the PNG library, and still want to
  # successully build everything else, put NONE for these.
  
@@ -106,7 +112,7 @@ $NetBSD: patch-aa,v 1.10 2000/06/05 00:36:31 wiz Exp $
  # OSF/Tru64:
  #PNGLIB_DIR = /usr/local1/DEC/lib
  #PNGHDR_DIR = /usr/local1/DEC/include
-@@ -296,8 +297,8 @@
+@@ -305,8 +306,8 @@
  #be a rule in the makefiles to make whatever the fliename turns out to be.
  #Only .a and .so work.
  ifeq ($(STATICLIB),Y)
diff --git a/graphics/netpbm/patches/patch-ab b/graphics/netpbm/patches/patch-ab
index eff6db2c9f4..38ef014fdff 100644
--- a/graphics/netpbm/patches/patch-ab
+++ b/graphics/netpbm/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.7 2000/06/05 01:13:35 hubertf Exp $
+$NetBSD: patch-ab,v 1.8 2000/07/10 11:12:10 wiz Exp $
 
---- Makefile.common.orig	Thu Jun  1 19:38:14 2000
-+++ Makefile.common	Mon Jun  5 01:38:40 2000
+--- Makefile.common.orig	Fri Jun 30 21:59:36 2000
++++ Makefile.common	Sun Jul  9 23:51:05 2000
 @@ -67,7 +67,7 @@
  $(OBJECTS): %.o: %.c
  	$(CC) -c $(CFLAGS) $(INCLUDE) -o $@ $<
@@ -31,9 +31,9 @@ $NetBSD: patch-ab,v 1.7 2000/06/05 01:13:35 hubertf Exp $
 +lib$(LIBROOT).la: $(LIBOBJECTS) $(LIBOBJECTS_X)
 +	$(LIBTOOL) --mode=link $(CC) -rpath $(PREFIX)/lib -version-info $(MAJ):$(MIN) -o $@ $(LIBOBJECTS:.o=.lo) $(LIBOBJECTS_X:.o=.lo)
  
- # Some maintenance notes about $(INSTALL):  Some install programs can install
- # multiple files in one shot; others can take only one file at a time.  Some
-@@ -157,7 +155,7 @@
+ # Some maintenance notes about $(INSTALL): Some install programs can
+ # install multiple files in one shot; others can take only one file at
+@@ -163,7 +161,7 @@
  # Make and Install know that pbmmake.exe counts as pbmmake.
  	for x in $(BINARIES); \
  	do \
@@ -42,7 +42,7 @@ $NetBSD: patch-ab,v 1.7 2000/06/05 01:13:35 hubertf Exp $
  	done
  
  .PHONY: install.script
-@@ -208,8 +206,8 @@
+@@ -214,8 +212,8 @@
  # built.  If a previous make STATICLIB=N didn't build the static
  # library, the dependency here will do that.
  .PHONY: install.staticlib
@@ -53,7 +53,7 @@ $NetBSD: patch-ab,v 1.7 2000/06/05 01:13:35 hubertf Exp $
  
  .PHONY: install.lib.common
  ifeq ($(NETPBMLIBSUFFIX),so)
-@@ -223,7 +221,7 @@
+@@ -229,7 +227,7 @@
  
  .PHONY: clean.common
  clean.common:
diff --git a/graphics/netpbm/patches/patch-ae b/graphics/netpbm/patches/patch-ae
index 4f356ce5916..3fd66a724fc 100644
--- a/graphics/netpbm/patches/patch-ae
+++ b/graphics/netpbm/patches/patch-ae
@@ -1,13 +1,15 @@
-$NetBSD: patch-ae,v 1.5 2000/06/05 00:36:31 wiz Exp $
+$NetBSD: patch-ae,v 1.6 2000/07/10 11:12:10 wiz Exp $
 
---- pbm/pbmtoppa/Makefile.orig	Thu Jun  1 19:27:29 2000
-+++ pbm/pbmtoppa/Makefile	Mon Jun  5 01:44:49 2000
-@@ -15,7 +15,7 @@
- merge: pbmtoppa
+--- ppm/ppmtompeg/parallel.c.orig	Fri Jun 30 20:04:09 2000
++++ ppm/ppmtompeg/parallel.c	Mon Jul 10 00:37:49 2000
+@@ -70,10 +70,6 @@
+  *
+  */
  
- pbmtoppa: pbmtoppa.o ppa.o pbm.o cutswath.o $(NETPBMLIBS) $(LIBOPT)
--	$(CC) $(LDFLAGS) -o pbmtoppa pbmtoppa.o ppa.o pbm.o cutswath.o \
-+	$(LD) $(LDFLAGS) -o pbmtoppa pbmtoppa.o ppa.o pbm.o cutswath.o \
- 	  `$(LIBOPT) $(NETPBMLIBS)`
- 
- %.o: %.c
+-#define _POSIX_SOURCE
+-#define _POSIX_C_SOURCE 2
+-    /* This makes sure pclose() is in stdio.h */
+-
+ /*==============*
+  * HEADER FILES *
+  *==============*/
diff --git a/graphics/netpbm/patches/patch-af b/graphics/netpbm/patches/patch-af
deleted file mode 100644
index e52e2a41fee..00000000000
--- a/graphics/netpbm/patches/patch-af
+++ /dev/null
@@ -1,56 +0,0 @@
-$NetBSD: patch-af,v 1.5 2000/06/05 01:13:35 hubertf Exp $
-
---- GNUmakefile.orig	Mon Jun  5 01:55:19 2000
-+++ GNUmakefile	Mon Jun  5 01:55:47 2000
-@@ -79,21 +79,21 @@
- 
- .PHONY: install.bin
- install.bin:
--	mkinstalldirs $(INSTALLBINARIES)
-+	./mkinstalldirs $(INSTALLBINARIES)
- 	for i in $(SUBDIRS) ; do \
- 	    ( echo install.bin.$$i ; cd $$i ; $(MAKE) install.bin ); \
- 	done
- 
- .PHONY: install-merge
- install.merge:
--	mkinstalldirs $(INSTALLBINARIES)
-+	./mkinstalldirs $(INSTALLBINARIES)
- 	for i in $(SUBDIRS) ; do \
- 	    ( echo install.merge.$$i ; cd $$i ; $(MAKE) install.merge ); \
- 	done
- 
- .PHONY: install.lib
- install.lib:
--	mkinstalldirs $(INSTALLLIBS)
-+	./mkinstalldirs $(INSTALLLIBS)
- 	for i in $(SUBDIRS) ; do \
- 	    ( echo install.lib.$$i ; cd $$i ; $(MAKE) install.lib ); \
- 	done
-@@ -104,7 +104,7 @@
- 
- .PHONY: install.man
- install.man:
--	mkinstalldirs \
-+	./mkinstalldirs \
- 	    $(INSTALLMANUALS1) $(INSTALLMANUALS3) $(INSTALLMANUALS5)
- 	for i in $(SUBDIRS) ; do \
- 	    ( echo install.man.$$i ; cd $$i ; $(MAKE) install.man ); \
-@@ -115,7 +115,7 @@
- 
- .PHONY: install.hdr
- install.hdr:
--	mkinstalldirs $(INSTALLHDRS)
-+	./mkinstalldirs $(INSTALLHDRS)
- 	$(INSTALL) -c -m$(INSTALL_PERM_HDR) pbmplus.h $(INSTALLHDRS)
- 	$(INSTALL) -c -m$(INSTALL_PERM_HDR) shhopt/shhopt.h $(INSTALLHDRS)
- 	for i in $(SUBDIRS) ; do \
-@@ -128,7 +128,7 @@
- 
- .PHONY: install.staticlib
- install.staticlib:
--	mkinstalldirs $(INSTALLLIBS)
-+	./mkinstalldirs $(INSTALLLIBS)
- 	for i in $(SUBDIRS) ; do \
- 	    (echo install.staticlib.$$i; cd $$i; $(MAKE) install.staticlib ); \
- 	done
diff --git a/graphics/netpbm/patches/patch-ag b/graphics/netpbm/patches/patch-ag
index d2338c00cf9..afcc720addc 100644
--- a/graphics/netpbm/patches/patch-ag
+++ b/graphics/netpbm/patches/patch-ag
@@ -1,11 +1,13 @@
-$NetBSD: patch-ag,v 1.3 2000/06/24 01:49:03 dmcmahill Exp $
+$NetBSD: patch-ag,v 1.4 2000/07/10 11:12:11 wiz Exp $
 
---- pbmplus.h.orig	Fri May 26 14:50:50 2000
-+++ pbmplus.h	Fri Jun 23 21:42:25 2000
-@@ -52,5 +52,5 @@
+--- pbmplus.h.orig	Mon Jun 19 21:24:29 2000
++++ pbmplus.h	Sun Jul  9 23:51:24 2000
+@@ -51,7 +51,7 @@
+ #define RGB_DB1 "PBMplus_Dir:RGB.TXT"
  #define RGB_DB2 "PBMplus_Dir:RGB.TXT"
  #else
 -#define RGB_DB1 "/usr/lib/X11/rgb.txt"
 +#define RGB_DB1 "@X11BASE@/lib/X11/rgb.txt"
  #define RGB_DB2 "/usr/openwin/lib/rgb.txt"
  #endif
+