Update to 9.25:

Changes since 9.24:
Add pamdice, pnmnorm (replacing ppmnorm and pgmnorm), convert bmptoppm
to bmptopnm, and some bug fixes and enhancements.

1 files changed, 14 insertions, 23 deletions

diff --git a/graphics/netpbm/patches/patch-aa b/graphics/netpbm/patches/patch-aa
index 6b4f8d92b0f..0f8c4c434d0 100644
--- a/graphics/netpbm/patches/patch-aa
+++ b/graphics/netpbm/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.15 2002/03/14 22:21:42 wiz Exp $
+$NetBSD: patch-aa,v 1.16 2002/03/15 11:04:30 wiz Exp $
 
---- Makefile.config.in.orig	Sun Jan 13 20:37:46 2002
+--- Makefile.config.in.orig	Thu Mar 14 16:25:54 2002
 +++ Makefile.config.in
 @@ -33,7 +33,7 @@
  #Tru64 (= Digital Unix):
@@ -11,25 +11,16 @@ $NetBSD: patch-aa,v 1.15 2002/03/14 22:21:42 wiz Exp $
  
  # The linker.
  LD = $(CC)
-@@ -44,7 +44,7 @@
+@@ -52,7 +52,7 @@
  
  # MAKE is set automatically by Make to what was used to invoke Make.
  
--INSTALL = ginstall
-+#INSTALL = ginstall
+-INSTALL = $(SRCDIR)/buildtools/install.sh
++#INSTALL = $(SRCDIR)/buildtools/install.sh
  #Solaris:
  #INSTALL = /usr/ucb/install
  #Tru64:
-@@ -96,7 +96,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 -O3 -Wall -Wno-uninitialized
-+CFLAGS += -pedantic -Wall -Wno-uninitialized
- # On DEC Tru64 4.0F (at least), you need -DLONG_32 for ppmtompeg.
- #Tru64:
- #CFLAGS = -O2 -std1 -DLONG_32
-@@ -125,10 +125,10 @@
+@@ -137,10 +137,10 @@
  # the directory information in the executable at link time.
  
  # Solaris, SunOS, NetBSD:
@@ -43,7 +34,7 @@ $NetBSD: patch-aa,v 1.15 2002/03/14 22:21:42 wiz Exp $
  # Eunice users may want to use -noshare so that the executables can
  # run standalone:
  #LDFLAGS = -noshare
-@@ -144,9 +144,9 @@
+@@ -156,9 +156,9 @@
  
  ifeq ($(NEED_RUNTIME_PATH),Y)
  #If the linker is gcc (e.g. NetBSD):
@@ -55,7 +46,7 @@ $NetBSD: patch-aa,v 1.15 2002/03/14 22:21:42 wiz Exp $
  endif
  
  # Linker options for created Netpbm shared libraries.
-@@ -170,9 +170,9 @@
+@@ -182,9 +182,9 @@
  
  ifeq ($(NEED_RUNTIME_PATH),Y)
  #If the linker is gcc (e.g. NetBSD):
@@ -67,7 +58,7 @@ $NetBSD: patch-aa,v 1.15 2002/03/14 22:21:42 wiz Exp $
  endif
  
  # On older systems, you have to make shared libraries out of position
-@@ -192,7 +192,7 @@
+@@ -204,7 +204,7 @@
  CFLAGS_SHLIB = 
  # Solaris or SunOS with gcc, and NetBSD:
  #CFLAGS_SHLIB = -fpic
@@ -76,7 +67,7 @@ $NetBSD: patch-aa,v 1.15 2002/03/14 22:21:42 wiz Exp $
  # Sun compiler:
  #CFLAGS_SHLIB = -Kpic
  #CFLAGS_SHLIB = -KPIC
-@@ -210,11 +210,11 @@
+@@ -222,11 +222,11 @@
  # The TIFF library.  See above.  If you want to build the tiff
  # converters, you must have the tiff library already installed.
  
@@ -92,7 +83,7 @@ $NetBSD: patch-aa,v 1.15 2002/03/14 22:21:42 wiz Exp $
  # OSF, Tru64:
  #TIFFLIB_DIR = /usr/local1/DEC/lib
  #TIFFHDR_DIR = /usr/local1/DEC/include
-@@ -238,11 +238,11 @@
+@@ -250,11 +250,11 @@
  # JPEG stuff statically linked in, in which case you won't need 
  # JPEGLIB_DIR in order to build the Tiff converters.
  
@@ -108,7 +99,7 @@ $NetBSD: patch-aa,v 1.15 2002/03/14 22:21:42 wiz Exp $
  # OSF, Tru64:
  #JPEGLIB_DIR = /usr/local1/DEC/lib
  #JPEGHDR_DIR = /usr/local1/DEC/include
-@@ -257,11 +257,11 @@
+@@ -269,11 +269,11 @@
  # The PNG library.  See above.  If you want to build the PNG
  # converters you must have the PNG library already installed.
  
@@ -124,7 +115,7 @@ $NetBSD: patch-aa,v 1.15 2002/03/14 22:21:42 wiz Exp $
  # OSF/Tru64:
  #PNGLIB_DIR = /usr/local1/DEC/lib
  #PNGHDR_DIR = /usr/local1/DEC/include
-@@ -300,7 +300,7 @@
+@@ -317,7 +317,7 @@
  # network functions is the option in ppmtompeg to run it on multiple
  # computers simultaneously.
  
@@ -133,7 +124,7 @@ $NetBSD: patch-aa,v 1.15 2002/03/14 22:21:42 wiz Exp $
  # Solaris, SunOS:
  #NETWORKLD = -lsocket -lnsl
  # Don't build network functions:
-@@ -346,7 +346,7 @@
+@@ -364,7 +364,7 @@
  #INSTALL_PREFIX = /djgpp
  # Typical:
  #INSTALL_PREFIX = /usr/local/