Changes 10.35.76:

* Pnmtopng:  -libversion doesn't report level of linked libz.
  It was a modularity violation and caused build failures on
  Mac OS X, because Pnmtopng per se doesn't know about libz --
  it's used by libpng.
* Build: don't fail due to SIGRTMIN, SIGRTMAX being undefined.

Changes 10.35.75:
* palmtopnm: fix for pixel size 16.
* pamscale: fix -reduce.  Introduced in 10.27.
* configure: default to 'none' for Svgalib if it doesn't appear to
  be installed (per 'ldconfig').  Ported from 10.38, released March 2007.

Changes 10.35.74:
* pbmtext: don't crash when font file contains a blank line.
  Fail cleanly.
* ppmtoilbm: fix arithmetic overflow with image dimension
  represented as 16 bit integer.
* pbmpage: fix garbage output.
* pnmhistmap: Fix crash with -width.  Always broken.
* Build: don't fail due to SIGPWR being undefined.

6 files changed, 31 insertions, 59 deletions

diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index 2d017eab5aa..d9d83d90a9e 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.166 2010/06/13 22:44:39 wiz Exp $
+# $NetBSD: Makefile,v 1.167 2010/07/13 06:08:23 adam Exp $
 
-DISTNAME=	netpbm-10.35.73
-PKGREVISION=	1
+DISTNAME=	netpbm-10.35.76
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=netpbm/}
 EXTRACT_SUFX=	.tgz
diff --git a/graphics/netpbm/distinfo b/graphics/netpbm/distinfo
index 86be28b372c..5cb0c530c49 100644
--- a/graphics/netpbm/distinfo
+++ b/graphics/netpbm/distinfo
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.75 2010/06/13 22:44:39 wiz Exp $
+$NetBSD: distinfo,v 1.76 2010/07/13 06:08:23 adam Exp $
 
-SHA1 (netpbm-10.35.73.tgz) = e498fcedbc88c618e69163cdb9fa782178a1645e
-RMD160 (netpbm-10.35.73.tgz) = b4507ac7897227bf0fb8addceb9a14c9f4601ee8
-Size (netpbm-10.35.73.tgz) = 2548185 bytes
+SHA1 (netpbm-10.35.76.tgz) = e59f9f4046502a174b5baa75897bc65b8944e6ea
+RMD160 (netpbm-10.35.76.tgz) = c1af800f8e7578de294842ef755e09a58c41f700
+Size (netpbm-10.35.76.tgz) = 2546974 bytes
 SHA1 (patch-aa) = fb94fb43c4c63113e9c720ea399a5cecb2c79977
-SHA1 (patch-ab) = 7781c51e9a8cc9de953540a04e19303244ef8d57
+SHA1 (patch-ab) = 4d6508ad837d455ea3f8ebaa704f33f9e089f6e0
 SHA1 (patch-ac) = d7e23b2b905c6f9c6114e17b16fcce3eadb29b56
 SHA1 (patch-ad) = b4a5833e18afd5a991aad897674386a3f00c3ee1
 SHA1 (patch-ae) = 33a5be2843dd85b530f5e6ba496cd0380cd5edd1
 SHA1 (patch-af) = 7ac8b5a431cd007ccc23ea337194a5c542ff0a54
-SHA1 (patch-ah) = f2a542983932edebee2110868e631b394f380b26
+SHA1 (patch-ah) = 10d7e7f59a0d7c857531db872cd35dc02a048ba1
 SHA1 (patch-ao) = b4307205f605d4c9c8f11c00e1a633960b33b2d3
 SHA1 (patch-aw) = bd890324e95fa7bb893d9d5cdab9d5a33dcff777
 SHA1 (patch-ax) = d50e56191192b4caf423ed081581868bb1a63de8
@@ -19,6 +19,5 @@ SHA1 (patch-da) = 8ae329469bf0bd55b671dffeb4253b8d14621f5c
 SHA1 (patch-db) = 23a05e54043ee84a0b7ec507a383d5cd8adfcca5
 SHA1 (patch-dc) = 8ed1365dccf5abb0e158a4f7a65749ff5b244ef3
 SHA1 (patch-dd) = 2acbcffeef96fd8b0419e60fa44a1eaf9f4b291b
-SHA1 (patch-eb) = 5c3dfac08038fce372fabc7c526081bb8051e908
-SHA1 (patch-ec) = 47290b162eac9be6744d8406c7ccc6efebaee1fc
+SHA1 (patch-eb) = 8af326d4be7e280764843ce213672186fce3f9a8
 SHA1 (patch-ppmdraw) = d901a690f8f21a1af940129d1edef509b369ea1a
diff --git a/graphics/netpbm/patches/patch-ab b/graphics/netpbm/patches/patch-ab
index 9fc0b3adc93..ead4350d688 100644
--- a/graphics/netpbm/patches/patch-ab
+++ b/graphics/netpbm/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.20 2006/06/25 06:35:58 adam Exp $
+$NetBSD: patch-ab,v 1.21 2010/07/13 06:08:23 adam Exp $
 
---- converter/other/Makefile.orig	2006-05-28 01:16:09.000000000 +0200
+--- converter/other/Makefile.orig	2009-09-18 19:04:37.000000000 +0000
 +++ converter/other/Makefile
-@@ -126,6 +126,13 @@ all:	$(BINARIES) $(SUBDIRS:%=%/all)
+@@ -135,6 +135,13 @@ all:	$(BINARIES) $(SUBDIRS:%=%/all)
  
  include $(SRCDIR)/Makefile.common
  
diff --git a/graphics/netpbm/patches/patch-ah b/graphics/netpbm/patches/patch-ah
index 7247749994c..41dbd34bf04 100644
--- a/graphics/netpbm/patches/patch-ah
+++ b/graphics/netpbm/patches/patch-ah
@@ -1,6 +1,6 @@
-$NetBSD: patch-ah,v 1.10 2006/02/04 12:23:55 markd Exp $
+$NetBSD: patch-ah,v 1.11 2010/07/13 06:08:23 adam Exp $
 
---- converter/other/cameratopam/camera.c.orig	2005-12-04 07:06:50.000000000 +1300
+--- converter/other/cameratopam/camera.c.orig	2006-08-19 03:12:28.000000000 +0000
 +++ converter/other/cameratopam/camera.c
 @@ -2,6 +2,7 @@
      /* Make sure strcasecmp is in string.h */
@@ -10,7 +10,7 @@ $NetBSD: patch-ah,v 1.10 2006/02/04 12:23:55 markd Exp $
  
  #include <stdlib.h>
  #include <string.h>
-@@ -25,6 +26,10 @@
+@@ -24,6 +25,10 @@
  
  #include "camera.h"
  
diff --git a/graphics/netpbm/patches/patch-eb b/graphics/netpbm/patches/patch-eb
index 5e177baab8f..0cdb2fe278f 100644
--- a/graphics/netpbm/patches/patch-eb
+++ b/graphics/netpbm/patches/patch-eb
@@ -1,8 +1,8 @@
-$NetBSD: patch-eb,v 1.1 2009/07/18 03:04:41 smb Exp $
+$NetBSD: patch-eb,v 1.2 2010/07/13 06:08:23 adam Exp $
 
---- converter/ppm/xpmtoppm.c.orig	2009-07-17 22:51:13.000000000 -0400
-+++ converter/ppm/xpmtoppm.c	2009-07-17 22:51:33.000000000 -0400
-@@ -121,7 +121,7 @@
+--- converter/ppm/xpmtoppm.c.orig	2009-12-29 20:46:34.000000000 +0000
++++ converter/ppm/xpmtoppm.c
+@@ -121,7 +121,7 @@ static bool backup;
  
  
  static void
@@ -11,7 +11,7 @@ $NetBSD: patch-eb,v 1.1 2009/07/18 03:04:41 smb Exp $
          size_t const size,
          FILE * const stream) {
  /*----------------------------------------------------------------------------
-@@ -139,7 +139,7 @@
+@@ -139,7 +139,7 @@ getline(char * const line,
     Exit program if the line doesn't fit in the buffer.
  -----------------------------------------------------------------------------*/
      if (size > sizeof(lastInputLine))
@@ -20,7 +20,7 @@ $NetBSD: patch-eb,v 1.1 2009/07/18 03:04:41 smb Exp $
                   "which is out of bounds");
  
      if (backup) {
-@@ -355,7 +355,7 @@
+@@ -355,7 +355,7 @@ readXpm3Header(FILE * const stream, int 
                 int * const transparentP) {
  /*----------------------------------------------------------------------------
    Read the header of the XPM file on stream 'stream'.  Assume the
@@ -29,7 +29,7 @@ $NetBSD: patch-eb,v 1.1 2009/07/18 03:04:41 smb Exp $
    file and it is a Version 3 XPM file.  Leave the stream positioned
    after the header.
  
-@@ -386,25 +386,25 @@
+@@ -386,25 +386,25 @@ readXpm3Header(FILE * const stream, int 
      *widthP = *heightP = *ncolorsP = *chars_per_pixelP = -1;
  
      /* Read the XPM signature comment */
@@ -60,7 +60,7 @@ $NetBSD: patch-eb,v 1.1 2009/07/18 03:04:41 smb Exp $
      }
      if (sscanf(line, "\"%d %d %d %d\",", widthP, heightP,
                 ncolorsP, chars_per_pixelP) != 4)
-@@ -438,10 +438,10 @@
+@@ -438,10 +438,10 @@ readXpm3Header(FILE * const stream, int 
          *transparentP = -1;  /* initial value */
  
          for (seqNum = 0; seqNum < *ncolorsP; seqNum++) {
@@ -73,7 +73,7 @@ $NetBSD: patch-eb,v 1.1 2009/07/18 03:04:41 smb Exp $
              
              interpretXpm3ColorTableLine(line, seqNum, *chars_per_pixelP, 
                                          *colorsP, *ptabP, transparentP);
-@@ -456,7 +456,7 @@
+@@ -456,7 +456,7 @@ readXpm1Header(FILE * const stream, int 
                 pixel ** const colorsP, int ** const ptabP) {
  /*----------------------------------------------------------------------------
    Read the header of the XPM file on stream 'stream'.  Assume the
@@ -82,7 +82,7 @@ $NetBSD: patch-eb,v 1.1 2009/07/18 03:04:41 smb Exp $
    file and it is a Version 1 XPM file.  Leave the stream positioned
    after the header.
    
-@@ -475,7 +475,7 @@
+@@ -476,7 +476,7 @@ readXpm1Header(FILE * const stream, int 
      /* Read the initial defines. */
      processedStaticChar = FALSE;
      while (!processedStaticChar) {
@@ -91,7 +91,7 @@ $NetBSD: patch-eb,v 1.1 2009/07/18 03:04:41 smb Exp $
  
          if (sscanf(line, "#define %s %d", str1, &v) == 2) {
              char *t1;
-@@ -523,7 +523,7 @@
+@@ -524,7 +524,7 @@ readXpm1Header(FILE * const stream, int 
      /* If there's a monochrome color table, skip it. */
      if (!strncmp(t1, "mono", 4)) {
          for (;;) {
@@ -100,7 +100,7 @@ $NetBSD: patch-eb,v 1.1 2009/07/18 03:04:41 smb Exp $
              if (!strncmp(line, "static char", 11))
                  break;
          }
-@@ -546,7 +546,7 @@
+@@ -547,7 +547,7 @@ readXpm1Header(FILE * const stream, int 
  
      /* Read color table. */
      for (i = 0; i < *ncolorsP; ++i) {
@@ -109,7 +109,7 @@ $NetBSD: patch-eb,v 1.1 2009/07/18 03:04:41 smb Exp $
  
          if ((t1 = strchr(line, '"')) == NULL)
              pm_error("D error scanning color table");
-@@ -582,7 +582,7 @@
+@@ -583,7 +583,7 @@ readXpm1Header(FILE * const stream, int 
         "static char ...").
      */
      for (;;) {
@@ -118,7 +118,7 @@ $NetBSD: patch-eb,v 1.1 2009/07/18 03:04:41 smb Exp $
          if (strncmp(line, "static char", 11) == 0)
              break;
      }
-@@ -686,7 +686,7 @@
+@@ -687,7 +687,7 @@ ReadXPMFile(FILE * const stream, int * c
      backup = FALSE;
  
      /* Read the header line */
@@ -127,7 +127,7 @@ $NetBSD: patch-eb,v 1.1 2009/07/18 03:04:41 smb Exp $
      backup = TRUE;  /* back up so next read reads this line again */
      
      rc = sscanf(line, "/* %s */", str1);
-@@ -706,7 +706,7 @@
+@@ -707,7 +707,7 @@ ReadXPMFile(FILE * const stream, int * c
          pm_error("Could not get %d bytes of memory for image", totalpixels);
      cursor = *dataP;
      maxcursor = *dataP + totalpixels - 1;
@@ -136,7 +136,7 @@ $NetBSD: patch-eb,v 1.1 2009/07/18 03:04:41 smb Exp $
          /* read next line (first line may not always start with comment) */
      while (cursor <= maxcursor) {
          if (strncmp(line, "/*", 2) == 0) {
-@@ -716,7 +716,7 @@
+@@ -717,7 +717,7 @@ ReadXPMFile(FILE * const stream, int * c
                               ncolors, ptab, &cursor, maxcursor);
          }
          if (cursor <= maxcursor)
diff --git a/graphics/netpbm/patches/patch-ec b/graphics/netpbm/patches/patch-ec
deleted file mode 100644
index c7a2b0870ee..00000000000
--- a/graphics/netpbm/patches/patch-ec
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ec,v 1.2 2010/03/28 12:36:35 drochner Exp $
-
---- lib/libsystem.c.orig	2009-12-29 20:46:34.000000000 +0000
-+++ lib/libsystem.c
-@@ -216,15 +216,20 @@ signalName(unsigned int const signalClas
-             return "SIGWINCH";
-         case SIGIO:
-             return "SIGIO";
-+#if defined(SIGPWR)
-         case SIGPWR:
-             return "SIGPWR";
-+#endif
-         case SIGSYS:
-             return "SIGSYS";
-         default:
-             return "???";
-         }
--    } else if ((int)signalClass >= SIGRTMIN && (int)signalClass <= SIGRTMAX)
-+    }
-+#if 0
-+    else if ((int)signalClass >= SIGRTMIN && (int)signalClass <= SIGRTMAX)
-         return "SIGRTxxx";
-+#endif
-     else
-         return "???";
- }