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.

6 files changed, 38 insertions, 42 deletions

diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index 03747f29908..14114c7b21d 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.60 2002/03/14 22:21:42 wiz Exp $
+# $NetBSD: Makefile,v 1.61 2002/03/15 11:04:29 wiz Exp $
 
-DISTNAME=	netpbm-9.24
+DISTNAME=	netpbm-9.25
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=netpbm/}
 EXTRACT_SUFX=	.tgz
diff --git a/graphics/netpbm/PLIST b/graphics/netpbm/PLIST
index 6298a94af79..b52d00a1bf0 100644
--- a/graphics/netpbm/PLIST
+++ b/graphics/netpbm/PLIST
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.2 2002/03/14 22:21:42 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/03/15 11:04:29 wiz Exp $
 bin/411toppm
 bin/anytopnm
 bin/asciitopgm
 bin/atktopbm
 bin/bioradtopgm
+bin/bmptopnm
 bin/bmptoppm
 bin/brushtopbm
 bin/cmuwmtopbm
@@ -34,6 +35,7 @@ bin/palmtopnm
 bin/pamchannel
 bin/pamcut
 bin/pamdeinterlace
+bin/pamdice
 bin/pamfile
 bin/pamoil
 bin/pamstretch
@@ -124,6 +126,7 @@ bin/pnmmargin
 bin/pnmmontage
 bin/pnmnlfilt
 bin/pnmnoraw
+bin/pnmnorm
 bin/pnmpad
 bin/pnmpaste
 bin/pnmpsnr
@@ -237,6 +240,7 @@ bin/ybmtopbm
 bin/yuvsplittoppm
 bin/yuvtoppm
 bin/zeisstopnm
+include/bitio.h
 include/pam.h
 include/pammap.h
 include/pbm.h
@@ -251,7 +255,7 @@ include/shhopt.h
 lib/libpbm.a
 lib/libpbm.so
 lib/libpbm.so.9
-lib/libpbm.so.9.23
+lib/libpbm.so.9.25
 lib/libpgm.a
 lib/libpgm.so
 lib/libpgm.so.9
@@ -259,11 +263,11 @@ lib/libpgm.so.9.19
 lib/libpnm.a
 lib/libpnm.so
 lib/libpnm.so.9
-lib/libpnm.so.9.23
+lib/libpnm.so.9.25
 lib/libppm.a
 lib/libppm.so
 lib/libppm.so.9
-lib/libppm.so.9.16
+lib/libppm.so.9.25
 lib/palmcolor8.map
 lib/palmgray1.map
 lib/palmgray2.map
@@ -273,7 +277,7 @@ man/man1/anytopnm.1
 man/man1/asciitopgm.1
 man/man1/atktopbm.1
 man/man1/bioradtopgm.1
-man/man1/bmptoppm.1
+man/man1/bmptopnm.1
 man/man1/brushtopbm.1
 man/man1/cmuwmtopbm.1
 man/man1/eyuvtoppm.1
@@ -302,6 +306,7 @@ man/man1/palmtopnm.1
 man/man1/pamchannel.1
 man/man1/pamcut.1
 man/man1/pamdeinterlace.1
+man/man1/pamdice.1
 man/man1/pamfile.1
 man/man1/pamoil.1
 man/man1/pamstretch-gen.1
@@ -356,7 +361,6 @@ man/man1/pgmenhance.1
 man/man1/pgmhist.1
 man/man1/pgmkernel.1
 man/man1/pgmnoise.1
-man/man1/pgmnorm.1
 man/man1/pgmramp.1
 man/man1/pgmslice.1
 man/man1/pgmtexture.1
@@ -390,6 +394,7 @@ man/man1/pnminvert.1
 man/man1/pnmmargin.1
 man/man1/pnmmontage.1
 man/man1/pnmnlfilt.1
+man/man1/pnmnorm.1
 man/man1/pnmpad.1
 man/man1/pnmpaste.1
 man/man1/pnmpsnr.1
@@ -434,7 +439,6 @@ man/man1/ppmhist.1
 man/man1/ppmlabel.1
 man/man1/ppmmake.1
 man/man1/ppmmix.1
-man/man1/ppmnorm.1
 man/man1/ppmntsc.1
 man/man1/ppmpat.1
 man/man1/ppmquant.1
diff --git a/graphics/netpbm/buildlink.mk b/graphics/netpbm/buildlink.mk
index e5861e7ac7f..2d9d612b73c 100644
--- a/graphics/netpbm/buildlink.mk
+++ b/graphics/netpbm/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.7 2002/03/14 22:21:42 wiz Exp $
+# $NetBSD: buildlink.mk,v 1.8 2002/03/15 11:04:29 wiz Exp $
 #
 # This Makefile fragment is included by packages that use netpbm.
 #
@@ -22,7 +22,8 @@ DEPENDS+=	${BUILDLINK_DEPENDS.netpbm}:../../graphics/netpbm
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.netpbm=netpbm
 BUILDLINK_PREFIX.netpbm_DEFAULT=	${LOCALBASE}
-BUILDLINK_FILES.netpbm=		include/pam.h
+BUILDLINK_FILES.netpbm=		include/bitio.h
+BUILDLINK_FILES.netpbm+=	include/pam.h
 BUILDLINK_FILES.netpbm+=	include/pammap.h
 BUILDLINK_FILES.netpbm+=	include/pbm.h
 BUILDLINK_FILES.netpbm+=	include/pgm.h
diff --git a/graphics/netpbm/distinfo b/graphics/netpbm/distinfo
index 0dc098bdbcb..e35c937eba8 100644
--- a/graphics/netpbm/distinfo
+++ b/graphics/netpbm/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2002/03/14 22:21:42 wiz Exp $
+$NetBSD: distinfo,v 1.6 2002/03/15 11:04:29 wiz Exp $
 
-SHA1 (netpbm-9.24.tgz) = 2be68df2cd18b55864856db1e331a7e01b9f06c9
-Size (netpbm-9.24.tgz) = 2022612 bytes
-SHA1 (patch-aa) = 5980276d7afc92f5d3563f9e9faabb8545cdb453
-SHA1 (patch-ac) = 7f0dc80b174cca62955c51a5ee98056ef9cceb41
+SHA1 (netpbm-9.25.tgz) = 9c7f6a98348a5f3d6e908b514f33498b2a9c359a
+Size (netpbm-9.25.tgz) = 2052922 bytes
+SHA1 (patch-aa) = b2102349b79b3575ae1f7f85e89b717ea169f8e3
+SHA1 (patch-ac) = c598c7c81d903ccfd0d95af6aa8b9ab72a16a56e
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/
diff --git a/graphics/netpbm/patches/patch-ac b/graphics/netpbm/patches/patch-ac
index 187e8f1a273..d0162692a2a 100644
--- a/graphics/netpbm/patches/patch-ac
+++ b/graphics/netpbm/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.8 2002/03/14 22:21:43 wiz Exp $
+$NetBSD: patch-ac,v 1.9 2002/03/15 11:04:30 wiz Exp $
 
---- shhopt/Makefile.orig	Sat May 19 20:39:03 2001
+--- shhopt/Makefile.orig	Tue Jan 29 04:49:21 2002
 +++ shhopt/Makefile
-@@ -63,7 +63,7 @@
+@@ -58,7 +58,7 @@
  		-L. -I. -L$(INSTLIBDIR) -I$(INSTINCDIR) -lshhopt
  
  .c.o: