[pkgsrc/trunk]: pkgsrc/graphics/netpbm Fix bug in xwdtopnm. Patch from Bryan ...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/554600819aa2
branches:  trunk
changeset: 508669:554600819aa2
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Thu Feb 23 17:37:01 2006 +0000

description:
Fix bug in xwdtopnm. Patch from Bryan Henderson via Jukka Salmi
on tech-pkg. Bump PKGREVISION.

diffstat:

 graphics/netpbm/Makefile         |   4 ++--
 graphics/netpbm/distinfo         |   3 ++-
 graphics/netpbm/patches/patch-ai |  13 +++++++++++++
 3 files changed, 17 insertions(+), 3 deletions(-)

diffs (44 lines):

diff -r 371b5c454afb -r 554600819aa2 graphics/netpbm/Makefile
--- a/graphics/netpbm/Makefile  Thu Feb 23 17:36:33 2006 +0000
+++ b/graphics/netpbm/Makefile  Thu Feb 23 17:37:01 2006 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.131 2006/02/14 21:57:44 adam Exp $
+# $NetBSD: Makefile,v 1.132 2006/02/23 17:37:01 wiz Exp $
 
 DISTNAME=      netpbm-10.31
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    graphics
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=netpbm/}
 EXTRACT_SUFX=  .tgz
diff -r 371b5c454afb -r 554600819aa2 graphics/netpbm/distinfo
--- a/graphics/netpbm/distinfo  Thu Feb 23 17:36:33 2006 +0000
+++ b/graphics/netpbm/distinfo  Thu Feb 23 17:37:01 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.50 2006/02/14 21:57:44 adam Exp $
+$NetBSD: distinfo,v 1.51 2006/02/23 17:37:01 wiz Exp $
 
 SHA1 (netpbm-10.31.tgz) = c85d5c439e2bb81a5c5f7a5ab1068391c553caaa
 RMD160 (netpbm-10.31.tgz) = abeb8b44ce3496f7b4127ca6e1a89bd11e5ef2bb
@@ -11,3 +11,4 @@
 SHA1 (patch-af) = 41c3506dcd267ce15d5b7e5ff9b0c1ee97b54e26
 SHA1 (patch-ag) = f291e9b45313c01b6aeeb2fc62cd9498e13baf72
 SHA1 (patch-ah) = f2a542983932edebee2110868e631b394f380b26
+SHA1 (patch-ai) = 7eb478ae8cfe535e540c031a4a67de77c1225eaa
diff -r 371b5c454afb -r 554600819aa2 graphics/netpbm/patches/patch-ai
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/netpbm/patches/patch-ai  Thu Feb 23 17:37:01 2006 +0000
@@ -0,0 +1,13 @@
+$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;