Changes 10.29:

Add ppmdraw.

Add pammixinterlace.  Thanks Bruce Guenter <bruceg@em.ca>.

Add pgmmedian.

Add pnmaddnoise.

pnmtopclxl: add -rendergray option.

pnmtopclxl: add -jobsetup option.

pstopnm: add -dSAFER Ghostscript option.

pnmcrop: add -margin option.

pnmcrop: add -borderfile option.

pnmnorm: add -luminosity (which was already default),
-colorvalue, and -saturation.

pnmtopng: Don't include any alpha info if supplied alpha mask
is all opaque.

ppmcie: Make white point mark more visible.

pamdice: Remove restriction of 100 slices in each direction.

pnmtopng: Fix bug: erroneous transparent pixels when supplied
alpha mask is all opaque.

Fix bytesToWordInt(): converts incorrectly on a machine that
has pointer size != word size and uses the general case code.

libnetpbm: fix basic pm_readlittleshort() bug introduced
in 10.27.  Affects mdatopbm, rawtopgm, lispmtopgm,
pcxtoppm, winicontoppm, bmptopnm, sirtopnm, xwdtopnm,
cameratopam.

pamlookup: fix universal crash.  Thanks "Colley, Anthony
W." <Anthony.Colley@ngc.com>

pbmtolj: fix bug from 10.28: crashes with a line which is
a multiple of 8 plus 7 pixels wide not counting white right
margin.

ppmtompeg: fix uname() rc test (sometimes > 0 is success).

6 files changed, 20 insertions, 41 deletions

diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index ed9d70e1653..b115a6707bd 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.121 2005/08/21 04:47:24 grant Exp $
+# $NetBSD: Makefile,v 1.122 2005/08/22 11:59:31 adam Exp $
 
-DISTNAME=	netpbm-10.28
+DISTNAME=	netpbm-10.29
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=netpbm/}
 EXTRACT_SUFX=	.tgz
diff --git a/graphics/netpbm/distinfo b/graphics/netpbm/distinfo
index 740d10c5570..8f86e83631d 100644
--- a/graphics/netpbm/distinfo
+++ b/graphics/netpbm/distinfo
@@ -1,13 +1,12 @@
-$NetBSD: distinfo,v 1.40 2005/08/21 04:47:24 grant Exp $
+$NetBSD: distinfo,v 1.41 2005/08/22 11:59:31 adam Exp $
 
-SHA1 (netpbm-10.28.tgz) = d7800fe932c8a44f21b109f794985209976a2ef3
-RMD160 (netpbm-10.28.tgz) = b369f54352e3a4bb1515fab61aeac016a6e9f2eb
-Size (netpbm-10.28.tgz) = 2324750 bytes
+SHA1 (netpbm-10.29.tgz) = 0733a0e1a7413e48eeb060aed1d1cc326e12ef8d
+RMD160 (netpbm-10.29.tgz) = c88d01b1106c7eb1f087d98a5570c0c61200d083
+Size (netpbm-10.29.tgz) = 2359729 bytes
 SHA1 (patch-aa) = 113be91facd060cd4b788db9df30d0f1f55d6bcb
-SHA1 (patch-ab) = ebab5f2ec96539058a8fbd79bf7867d1a49e02fd
+SHA1 (patch-ab) = 900c36d6ab145c807ecb3dec6b77ae2ad50d4dad
 SHA1 (patch-ac) = 07f109139bf30da22b05d00189cbb7b4a5f8f05a
 SHA1 (patch-ae) = 33a5be2843dd85b530f5e6ba496cd0380cd5edd1
-SHA1 (patch-af) = 46628beae66aae69db29d3e06d7d751e6a0f9e68
-SHA1 (patch-ag) = 155547027efb0390ac898c63bcec657fa311bbac
-SHA1 (patch-ah) = 85a73499bc3f675168fce521e738389f03ffde5a
+SHA1 (patch-af) = 82e366af1c8b644cf374706c2eb113c370447de9
+SHA1 (patch-ah) = e80a111a0e0253111fbadf115eeef3b659399ac0
 SHA1 (patch-ai) = 1d8c9585a08f96422f4180719ecc26e305929c62
diff --git a/graphics/netpbm/patches/patch-ab b/graphics/netpbm/patches/patch-ab
index 81a6b05723e..c57e1226830 100644
--- a/graphics/netpbm/patches/patch-ab
+++ b/graphics/netpbm/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.16 2005/02/17 11:36:01 adam Exp $
+$NetBSD: patch-ab,v 1.17 2005/08/22 11:59:31 adam Exp $
 
---- converter/other/Makefile.orig	2005-02-05 17:48:28.000000000 +0000
+--- converter/other/Makefile.orig	2005-08-06 16:41:07.000000000 +0000
 +++ converter/other/Makefile
-@@ -104,6 +104,13 @@ HEADERLINKS = pm_config.h pm.h pbm.h pgm
+@@ -109,6 +109,13 @@ HEADERLINKS = pm_config.h pm.h pbm.h pgm
  
  include $(SRCDIR)/Makefile.common
  
diff --git a/graphics/netpbm/patches/patch-af b/graphics/netpbm/patches/patch-af
index 007c907b652..20b8d4229eb 100644
--- a/graphics/netpbm/patches/patch-af
+++ b/graphics/netpbm/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.9 2005/08/06 14:07:07 salo Exp $
+$NetBSD: patch-af,v 1.10 2005/08/22 11:59:31 adam Exp $
 
---- converter/other/cameratopam/identify.c.orig	2005-04-11 16:24:15.000000000 +0000
-+++ converter/other/cameratopam/identify.c	2005-08-06 12:58:46.000000000 +0000
-@@ -22,7 +22,9 @@
+--- converter/other/cameratopam/identify.c.orig	2005-08-15 06:07:25.000000000 +0000
++++ converter/other/cameratopam/identify.c
+@@ -23,7 +23,9 @@
  
  static loadRawFn load_raw;
  
@@ -12,7 +12,7 @@ $NetBSD: patch-af,v 1.9 2005/08/06 14:07:07 salo Exp $
  /* This does the same as the function of the same name in the GNU C library */
  static const char *memmem (const char *haystack, size_t haystacklen,
                       const char *needle, size_t needlelen)
-@@ -33,6 +35,7 @@
+@@ -34,6 +36,7 @@ static const char *memmem (const char *h
        return c;
    return NULL;
  }
diff --git a/graphics/netpbm/patches/patch-ag b/graphics/netpbm/patches/patch-ag
deleted file mode 100644
index a86c8e8bb7d..00000000000
--- a/graphics/netpbm/patches/patch-ag
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ag,v 1.8 2005/08/06 14:07:07 salo Exp $
-
-Security fix for SA16184.  Patch from Debian.
-
---- converter/other/pstopnm.c.orig	2004-06-23 04:22:33.000000000 +0200
-+++ converter/other/pstopnm.c	2005-08-06 15:57:23.000000000 +0200
-@@ -704,11 +704,11 @@
-         pm_message("execing '%s' with args '%s' (arg 0), "
-                    "'%s', '%s', '%s', '%s', '%s', '%s', '%s'",
-                    ghostscriptProg, arg0,
--                   deviceopt, outfileopt, gopt, ropt, "-q", "-dNOPAUSE", "-");
-+                   deviceopt, outfileopt, gopt, ropt, "-q", "-dNOPAUSE", "-dSAFER", "-");
-     }
- 
-     execl(ghostscriptProg, arg0, deviceopt, outfileopt, gopt, ropt, "-q",
--          "-dNOPAUSE", "-", NULL);
-+          "-dNOPAUSE", "-dSAFER", "-", NULL);
-     
-     pm_error("execl() of Ghostscript ('%s') failed, errno=%d (%s)",
-              ghostscriptProg, errno, strerror(errno));
diff --git a/graphics/netpbm/patches/patch-ah b/graphics/netpbm/patches/patch-ah
index fccae0e638e..52e42b26a2b 100644
--- a/graphics/netpbm/patches/patch-ah
+++ b/graphics/netpbm/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.5 2005/08/21 04:47:24 grant Exp $
+$NetBSD: patch-ah,v 1.6 2005/08/22 11:59:31 adam Exp $
 
---- converter/other/cameratopam/camera.c.orig	2005-04-12 02:23:36.000000000 +1000
+--- converter/other/cameratopam/camera.c.orig	2005-08-15 06:12:51.000000000 +0000
 +++ converter/other/cameratopam/camera.c
-@@ -18,6 +18,10 @@
+@@ -22,6 +22,10 @@
  
  #include "camera.h"