Changes 10.32:

* Add rlatopam.
* Add pgmmake.
* bmptopnm: Understands RLE4/RLE8 compressed BMP.
* pnmgamma: Add -bt709tosrgb -srgbtobt709, -bt709tolinear,
  -lineartobt709, -gamma, -rgamma, -ggamma, -bgamma (gammma
  values were formerly specified as parameters).
* pnmgamma: Rename -cieramp to -bt709ramp.
* ppmdraw: work on multi-image streams.
* anytopnm: add mime time image/x-ms-bmp for BMP
* pamchannel: works on multi-image streams.
* pamstack: works on multi-image streams.
* Convert pnmdepth to pamdepth.  Add multi-image stream
  capability.
* pamcut: works on multi-image streams.
* pnmtops: allow -flate and -rle together.
* pnmtops: overhaul of -psfilter output.
* pnmrotate: fine adjustment to arithmetic (rounding,
  pixel quantization).
* pbmtopsg3: Put currentfile ... in exec block.
* pbmtopsg3: Add missing /EndOfBlock.
* pnmtops: Don't claim EPSF if using setpagedevice.
* giftopnm: do "reading image sequence N" message only if
  being verbose.
* ppmtobmp, bmptopnm: major speed improvement for PBM.
* other

6 files changed, 28 insertions, 66 deletions

diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index 1fd5e12cee3..8ef9643e644 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.132 2006/02/23 17:37:01 wiz Exp $
+# $NetBSD: Makefile,v 1.133 2006/02/27 22:01:16 adam Exp $
 
-DISTNAME=	netpbm-10.31
-PKGREVISION=	3
+DISTNAME=	netpbm-10.32
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=netpbm/}
 EXTRACT_SUFX=	.tgz
@@ -16,7 +15,7 @@ USE_TOOLS+=	bash:run gmake lex perl
 
 INSTALL_TARGET=	install-dev install-run
 MAKE_ENV+=	INSTALL=${INSTALL:Q} STRIPFLAG=${_STRIPFLAG_INSTALL:Q} \
-		pkgdir=${STAGEDIR:Q}
+		pkgdir=${STAGEDIR:Q} MACHINE=${MACHINE:Q}
 MAKEFILE=	GNUmakefile
 PLIST_SRC=	${WRKDIR}/PLIST_STAGE
 REPLACE_PERL+=	editor/ppmfade editor/ppmshadow editor/pnmquant \
diff --git a/graphics/netpbm/distinfo b/graphics/netpbm/distinfo
index dbbd1f1bd33..218a3b2231d 100644
--- a/graphics/netpbm/distinfo
+++ b/graphics/netpbm/distinfo
@@ -1,14 +1,12 @@
-$NetBSD: distinfo,v 1.51 2006/02/23 17:37:01 wiz Exp $
+$NetBSD: distinfo,v 1.52 2006/02/27 22:01:16 adam Exp $
 
-SHA1 (netpbm-10.31.tgz) = c85d5c439e2bb81a5c5f7a5ab1068391c553caaa
-RMD160 (netpbm-10.31.tgz) = abeb8b44ce3496f7b4127ca6e1a89bd11e5ef2bb
-Size (netpbm-10.31.tgz) = 2383586 bytes
-SHA1 (patch-aa) = 5b9202879ae7c0a3df776d06be5fc76b8bb95982
-SHA1 (patch-ab) = 86bc267115349c9ef52dc01b1ab425ad6d5e2193
+SHA1 (netpbm-10.32.tgz) = 731bd761a3c880afaa41d6eb92e282d6988a75ee
+RMD160 (netpbm-10.32.tgz) = 9050c6b2b9891745c07d0694a0188cd905c5b9f4
+Size (netpbm-10.32.tgz) = 2390874 bytes
+SHA1 (patch-aa) = 35a1a5f611ea54f4187f536e3c6d5ef52a28af9f
+SHA1 (patch-ab) = 894da433f184ead77e09d1d50b97a0096deb8b99
 SHA1 (patch-ac) = 07f109139bf30da22b05d00189cbb7b4a5f8f05a
 SHA1 (patch-ad) = b4a5833e18afd5a991aad897674386a3f00c3ee1
 SHA1 (patch-ae) = 33a5be2843dd85b530f5e6ba496cd0380cd5edd1
 SHA1 (patch-af) = 41c3506dcd267ce15d5b7e5ff9b0c1ee97b54e26
-SHA1 (patch-ag) = f291e9b45313c01b6aeeb2fc62cd9498e13baf72
 SHA1 (patch-ah) = f2a542983932edebee2110868e631b394f380b26
-SHA1 (patch-ai) = 7eb478ae8cfe535e540c031a4a67de77c1225eaa
diff --git a/graphics/netpbm/patches/patch-aa b/graphics/netpbm/patches/patch-aa
index 8b85122c41f..14309465732 100644
--- a/graphics/netpbm/patches/patch-aa
+++ b/graphics/netpbm/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.34 2006/01/16 15:17:02 adam Exp $
+$NetBSD: patch-aa,v 1.35 2006/02/27 22:01:16 adam Exp $
 
---- Makefile.config.in.orig	2005-12-10 18:19:13.000000000 +0100
+--- Makefile.config.in.orig	2006-01-03 01:15:17.000000000 +0100
 +++ Makefile.config.in
 @@ -24,7 +24,7 @@ DEFAULT_TARGET = nonmerge
  # and skip it on those systems unless you want to debug it and fix it.
@@ -51,7 +51,7 @@ $NetBSD: patch-aa,v 1.34 2006/01/16 15:17:02 adam Exp $
  # Solaris:
  # LEX = flex -e
  # Or just skip parts that need Lex:
-@@ -217,7 +219,7 @@ EXE =
+@@ -219,7 +221,7 @@ EXE =
  
  # Here, $(SONAME) resolves to the soname for the shared library being created.
  # The following are gcc options.  This works on GNU libc systems.
@@ -60,7 +60,7 @@ $NetBSD: patch-aa,v 1.34 2006/01/16 15:17:02 adam Exp $
  # You need -nostart instead of -shared on BeOS.  Though the BeOS compiler is
  # ostensibly gcc, it has the -nostart option, which is not mentioned in gcc
  # documentation and doesn't exist in at least one non-BeOS installation.
-@@ -250,6 +252,18 @@ LDRELOC = NONE
+@@ -252,6 +254,18 @@ LDRELOC = NONE
  #LDRELOC = ld --reloc
  #LDRELOC = ld -r
  
@@ -79,7 +79,7 @@ $NetBSD: patch-aa,v 1.34 2006/01/16 15:17:02 adam Exp $
  
  # On older systems, you have to make shared libraries out of position
  # independent code, so you need -fpic or fPIC here.  (The rule is: if
-@@ -272,11 +286,23 @@ LDRELOC = NONE
+@@ -274,11 +288,23 @@ LDRELOC = NONE
  CFLAGS_SHLIB = 
  # Solaris or SunOS with gcc, and NetBSD:
  #CFLAGS_SHLIB = -fpic
@@ -104,7 +104,7 @@ $NetBSD: patch-aa,v 1.34 2006/01/16 15:17:02 adam Exp $
  # SHLIB_CLIB is the link option to include the C library in a shared library,
  # normally "-lc".  On typical systems, this serves no purpose.  On some,
  # though, it causes information about which C library to use to be recorded
-@@ -345,8 +371,8 @@ TIFFHDR_DIR =
+@@ -347,8 +373,8 @@ TIFFHDR_DIR =
  #TIFFLIB = libtiff.so
  #TIFFHDR_DIR = /usr/include/libtiff
  #NetBSD:
@@ -115,7 +115,7 @@ $NetBSD: patch-aa,v 1.34 2006/01/16 15:17:02 adam Exp $
  # OSF, Tru64:
  #TIFFLIB = /usr/local1/DEC/lib/libtiff.so
  #TIFFHDR_DIR = /usr/local1/DEC/include
-@@ -376,8 +402,8 @@ JPEGHDR_DIR =
+@@ -378,8 +404,8 @@ JPEGHDR_DIR =
  #JPEGLIB = libjpeg.so
  #JPEGHDR_DIR = /usr/include/jpeg
  # Netbsd:
@@ -126,7 +126,7 @@ $NetBSD: patch-aa,v 1.34 2006/01/16 15:17:02 adam Exp $
  # OSF, Tru64:
  #JPEGLIB = /usr/local1/DEC/libjpeg.so
  #JPEGHDR_DIR = /usr/local1/DEC/include
-@@ -401,8 +427,8 @@ PNGVER = 
+@@ -403,8 +429,8 @@ PNGVER = 
  #PNGLIB = libpng$(PNGVER).so
  #PNGHDR_DIR = /usr/include/libpng$(PNGVER)
  # NetBSD:
@@ -137,7 +137,7 @@ $NetBSD: patch-aa,v 1.34 2006/01/16 15:17:02 adam Exp $
  # OSF/Tru64:
  #PNGLIB = /usr/local1/DEC/lib/libpng$(PNGVER).so
  #PNGHDR_DIR = /usr/local1/DEC/include
-@@ -412,8 +438,8 @@ PNGVER = 
+@@ -414,8 +440,8 @@ PNGVER = 
  # NONE for the PNG library, it doesn't matter what you specify here --
  # it won't get used.
  
@@ -148,7 +148,7 @@ $NetBSD: patch-aa,v 1.34 2006/01/16 15:17:02 adam Exp $
  #ZLIB = libz.so
  
  # The JBIG lossless image compression library (aka JBIG-KIT):
-@@ -422,8 +448,8 @@ JBIGLIB = $(BUILDDIR)/converter/other/jb
+@@ -424,8 +450,8 @@ JBIGLIB = $(BUILDDIR)/converter/other/jb
  JBIGHDR_DIR = $(SRCDIR)/converter/other/jbig
  
  # The Jasper JPEG-2000 image compression library (aka JasPer):
@@ -159,7 +159,7 @@ $NetBSD: patch-aa,v 1.34 2006/01/16 15:17:02 adam Exp $
  # JASPERDEPLIBS is the libraries (-l options or file names) on which
  # The Jasper library depends -- i.e. what you have to link into any
  # executable that links in the Jasper library.
-@@ -459,7 +485,7 @@ OMIT_NETWORK =
+@@ -461,7 +487,7 @@ OMIT_NETWORK =
  # built into the standard C library, so this can be null.  This is irrelevant
  # if OMIT_NETWORK is "y".
  
diff --git a/graphics/netpbm/patches/patch-ab b/graphics/netpbm/patches/patch-ab
index 0ca08971bf3..edb42533900 100644
--- a/graphics/netpbm/patches/patch-ab
+++ b/graphics/netpbm/patches/patch-ab
@@ -1,17 +1,17 @@
-$NetBSD: patch-ab,v 1.18 2006/01/16 15:17:02 adam Exp $
+$NetBSD: patch-ab,v 1.19 2006/02/27 22:01:16 adam Exp $
 
---- converter/other/Makefile.orig	2005-12-03 18:16:27.000000000 +0100
+--- converter/other/Makefile.orig	2006-02-25 20:15:20.000000000 +0100
 +++ converter/other/Makefile
-@@ -113,6 +113,13 @@ HEADERLINKS = pm_config.h pm_c_util.h \
+@@ -108,6 +108,13 @@ all:	$(BINARIES) $(SUBDIRS:%=%/all)
  
  include $(SRCDIR)/Makefile.common
  
-+# XXX sparc64 gcc 3.3.x toolchain bug means we must compile exif.o without
-+# optimisation
-+EXIF_CFLAGS=$(CFLAGS:-O2=)
++# XXX sparc64 gcc 3.3.x toolchain bug; compile exif.o without optimisation
++ifeq ($(MACHINE),sparc64)
 +exif.o: exif.c
-+	$(CC) -c -I$(SRCDIR)/$(SUBDIR) -I. $(INCLUDES) \
-+	    $(EXIF_CFLAGS) $(CADD) -o $@ $<
++	$(CC) -c $(INCLUDES2) -DNDEBUG \
++	    $(CPPFLAGS) $(CFLAGS:-O2=) $(CFLAGS_PERSONAL) $(CADD) -o $@ $<
++endif
 +
  ifeq ($(NEED_RUNTIME_PATH),Y)
    LIBOPTR = -runtime
diff --git a/graphics/netpbm/patches/patch-ag b/graphics/netpbm/patches/patch-ag
deleted file mode 100644
index 9f2f31a5eac..00000000000
--- a/graphics/netpbm/patches/patch-ag
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ag,v 1.12 2006/02/02 17:01:17 joerg Exp $
-
---- converter/other/pnmtopng.c.orig	2006-02-02 16:52:10.000000000 +0000
-+++ converter/other/pnmtopng.c
-@@ -267,7 +267,7 @@ parseCommandLine (int argc, char ** argv
-     unsigned int option_def_index;
- 
-     unsigned int alphaSpec, transparentSpec, backgroundSpec;
--    unsigned int textSpec, ztxtSpec, modtimeSpec, paletteSpec;
-+    unsigned int textSpec, ztxtSpec, paletteSpec;
-     unsigned int filterSpec;
- 
-     unsigned int nofilter, sub, up, avg, paeth, filter;
-@@ -296,7 +296,7 @@ parseCommandLine (int argc, char ** argv
-     OPTENT3(0, "ztxt",             OPT_STRING,    &cmdlineP->ztxt,
-             &ztxtSpec,             0);
-     OPTENT3(0, "modtime",          OPT_STRING,    &modtime,
--            &modtimeSpec,          0);
-+            &cmdlineP->modtimeSpec,          0);
-     OPTENT3(0, "palette",          OPT_STRING,    &cmdlineP->palette,
-             &paletteSpec,          0);
-     OPTENT3(0, "compression",      OPT_UINT,
diff --git a/graphics/netpbm/patches/patch-ai b/graphics/netpbm/patches/patch-ai
deleted file mode 100644
index 0c757176573..00000000000
--- a/graphics/netpbm/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.7 2006/02/23 17:37:01 wiz Exp $
-
---- converter/other/xwdtopnm.c.orig	2005-12-15 03:45:59.000000000 +0000
-+++ converter/other/xwdtopnm.c
-@@ -988,7 +988,7 @@ getpix(pixelReader * const rdrP) {
-                     (rdrP->itemBuffer >> nBitsToLeave) & bitsToTakeMask;
-             } else {
-                 bitsToTake = rdrP->itemBuffer & bitsToTakeMask;
--                bitsToTake >>= nBitsToTake;
-+                rdrP->itemBuffer >>= nBitsToTake;
-             }                
-             /* Shift the bits into the right end of the accumulator */
-             pixel <<= nBitsToTake;