Add patches for some issues from the known-bugs page, including

one that should fix PR 33347 by martijn (build on amd64).

Bump PKGREVISION.

5 files changed, 56 insertions, 3 deletions

diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index 8b61714dc46..c06cd0db7d6 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.140 2006/04/19 20:52:29 wiz Exp $
+# $NetBSD: Makefile,v 1.141 2006/05/14 16:39:05 wiz Exp $
 
 DISTNAME=	netpbm-10.33
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=netpbm/}
 EXTRACT_SUFX=	.tgz
diff --git a/graphics/netpbm/distinfo b/graphics/netpbm/distinfo
index f90a6850d1e..6bcbf5bee2d 100644
--- a/graphics/netpbm/distinfo
+++ b/graphics/netpbm/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.56 2006/05/10 17:19:00 jlam Exp $
+$NetBSD: distinfo,v 1.57 2006/05/14 16:39:05 wiz Exp $
 
 SHA1 (netpbm-10.33.tgz) = ed1023fc8b5e15db274495b860f2f80df309454e
 RMD160 (netpbm-10.33.tgz) = 7721314f9ef27f22a6bb034ca9e3577cff2984e5
@@ -9,5 +9,8 @@ SHA1 (patch-ac) = 07f109139bf30da22b05d00189cbb7b4a5f8f05a
 SHA1 (patch-ad) = b4a5833e18afd5a991aad897674386a3f00c3ee1
 SHA1 (patch-ae) = 33a5be2843dd85b530f5e6ba496cd0380cd5edd1
 SHA1 (patch-af) = 41c3506dcd267ce15d5b7e5ff9b0c1ee97b54e26
+SHA1 (patch-ag) = 9565c0e777cbbbd4974000695c05044a2433f0c8
 SHA1 (patch-ah) = f2a542983932edebee2110868e631b394f380b26
+SHA1 (patch-ai) = ef03877b12769ccf624454b29539ae8b5fab550f
+SHA1 (patch-aj) = 771b2de6e9b32ad3c5d305411533cec5ac7c74c4
 SHA1 (patch-ca) = b63be9bd38dd182949edf3b892608b72d13c1fa0
diff --git a/graphics/netpbm/patches/patch-ag b/graphics/netpbm/patches/patch-ag
new file mode 100644
index 00000000000..3df0b2fad69
--- /dev/null
+++ b/graphics/netpbm/patches/patch-ag
@@ -0,0 +1,19 @@
+$NetBSD: patch-ag,v 1.16 2006/05/14 16:39:05 wiz Exp $
+
+--- converter/ppm/picttoppm.c.orig	2005-12-22 08:51:46.000000000 +0000
++++ converter/ppm/picttoppm.c
+@@ -1715,12 +1715,12 @@ unpackbits(struct Rect* const bounds, 
+         rowBytes = rowBytesArg & 0x7fff;
+     else
+         rowBytes = rowBytesArg;
+-    if (rowBytes == 0)
+-        rowBytes = pixwidth;
+ 
+     stage = "unpacking packbits";
+ 
+     pixwidth = bounds->right - bounds->left;
++    if (rowBytes == 0)
++        rowBytes = pixwidth;
+ 
+     pkpixsize = 1;
+     if (pixelSize == 16) {
diff --git a/graphics/netpbm/patches/patch-ai b/graphics/netpbm/patches/patch-ai
new file mode 100644
index 00000000000..c153af95c85
--- /dev/null
+++ b/graphics/netpbm/patches/patch-ai
@@ -0,0 +1,18 @@
+$NetBSD: patch-ai,v 1.9 2006/05/14 16:39:05 wiz Exp $
+
+--- converter/ppm/ppmtogif.c.orig	2006-02-15 19:46:41.000000000 +0000
++++ converter/ppm/ppmtogif.c
+@@ -705,11 +705,9 @@ output(code_int const code) {
+        if we want to use the compressor more than once per invocation
+        (e.g. we want to create a multi-image gif).
+     */
+-    static unsigned long curAccum;
+-    static int curBits;
++    static unsigned long curAccum = 0;
++    static int curBits = 0;
+ 
+-    curBits = 0;  /* initial value */
+-    curAccum = 0;  /* initial value */
+     curAccum &= masks[curBits];
+ 
+     if (curBits > 0)
diff --git a/graphics/netpbm/patches/patch-aj b/graphics/netpbm/patches/patch-aj
new file mode 100644
index 00000000000..a24f270554f
--- /dev/null
+++ b/graphics/netpbm/patches/patch-aj
@@ -0,0 +1,13 @@
+$NetBSD: patch-aj,v 1.9 2006/05/14 16:39:05 wiz Exp $
+
+--- lib/Makefile.orig	2006-03-18 20:17:20.000000000 +0000
++++ lib/Makefile
+@@ -184,7 +184,7 @@ standardppmdfont.c:standard.ppmdfont
+ compile.h:
+ 	$(SRCDIR)/buildtools/stamp-date >$@ || rm $@
+ 
+-util/shhopt.o util/nstring.o: FORCE
++util/shhopt.o util/nstring.o util/filename.o: FORCE
+ 	@if [ ! -d $(dir $@) ] ; then mkdir $(dir $@) ; fi
+ 	$(MAKE) -C $(dir $@) -f $(SRCDIR)/$(SUBDIR)/$(dir $@)Makefile \
+ 		SRCDIR=$(SRCDIR) BUILDDIR=$(BUILDDIR) $(notdir $@)