Changes 10.26.3:

* pnmremap: fix rounding error where map maxval is small
  and unequal to image maxval.
* ppmtompeg: fix compile failures on "no parallel" builds
  and where prototypes don't match definitions in bitio.c.

Changes 10.26.2:
* Build: handle zlib prerequisite of tiff library.
* giftopnm: fix crash with input that has bogus color indices
  in the raster.
* giftopnm: fix crash with input that has a bogus minimum code
  length field.
* pnmtopalm: fix padding with -offset.
* pnmtopalm: fix compressed images.  use 0 compressed size
  field - not totally correct, but passable.
* palmtopnm: fix incorrect handling of some combinations of
  PALM_IS_COMPRESSED flag and compression type field.
* palmtopnm: fix totally broken RLE and scanline compression.
* palmtopnm: fix wrong check for disallowed combination of
  -transparent and -rendition.

4 files changed, 16 insertions, 16 deletions

diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index 7e601c0064b..543772f5f52 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.105 2005/01/24 20:48:05 tv Exp $
+# $NetBSD: Makefile,v 1.106 2005/02/17 11:36:01 adam Exp $
 
-DISTNAME=	netpbm-10.26.1
+DISTNAME=	netpbm-10.26.3
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=netpbm/}
 EXTRACT_SUFX=	.tgz
diff --git a/graphics/netpbm/distinfo b/graphics/netpbm/distinfo
index 31aa2f7e14f..c65cea3804b 100644
--- a/graphics/netpbm/distinfo
+++ b/graphics/netpbm/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.30 2005/01/18 14:16:20 adam Exp $
+$NetBSD: distinfo,v 1.31 2005/02/17 11:36:01 adam Exp $
 
-SHA1 (netpbm-10.26.1.tgz) = b4f131e42ae956fcac85b9256f0240420cad88ae
-Size (netpbm-10.26.1.tgz) = 2537086 bytes
-SHA1 (patch-aa) = c00953d99ec744d5330f901407379a19e14c457b
-SHA1 (patch-ab) = 0806c633454ba17c593b4b3ad380468681cd85ce
+SHA1 (netpbm-10.26.3.tgz) = 88c6b0c8b4c86a3ba888a964549daadc794336eb
+Size (netpbm-10.26.3.tgz) = 2537558 bytes
+SHA1 (patch-aa) = f3f7861b0e0e3f812861643afe916c40277f4944
+SHA1 (patch-ab) = ebab5f2ec96539058a8fbd79bf7867d1a49e02fd
 SHA1 (patch-ac) = 07f109139bf30da22b05d00189cbb7b4a5f8f05a
 SHA1 (patch-ae) = 33a5be2843dd85b530f5e6ba496cd0380cd5edd1
diff --git a/graphics/netpbm/patches/patch-aa b/graphics/netpbm/patches/patch-aa
index 3e965192906..ec8a0e5a3b4 100644
--- a/graphics/netpbm/patches/patch-aa
+++ b/graphics/netpbm/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.29 2005/01/18 14:16:20 adam Exp $
+$NetBSD: patch-aa,v 1.30 2005/02/17 11:36:01 adam Exp $
 
---- Makefile.config.in.orig	2004-10-16 19:53:17.000000000 +0000
+--- Makefile.config.in.orig	2005-01-13 03:50:04.000000000 +0000
 +++ Makefile.config.in
 @@ -33,7 +33,7 @@ BUILD_FIASCO = Y
  #CC = gcc
@@ -106,7 +106,7 @@ $NetBSD: patch-aa,v 1.29 2005/01/18 14:16:20 adam Exp $
  # OSF, Tru64:
  #TIFFLIB = /usr/local1/DEC/lib/libtiff.so
  #TIFFHDR_DIR = /usr/local1/DEC/include
-@@ -357,8 +383,8 @@ JPEGHDR_DIR =
+@@ -359,8 +385,8 @@ JPEGHDR_DIR =
  #JPEGLIB = libjpeg.so
  #JPEGHDR_DIR = /usr/include/jpeg
  # Netbsd:
@@ -117,7 +117,7 @@ $NetBSD: patch-aa,v 1.29 2005/01/18 14:16:20 adam Exp $
  # OSF, Tru64:
  #JPEGLIB = /usr/local1/DEC/libjpeg.so
  #JPEGHDR_DIR = /usr/local1/DEC/include
-@@ -382,8 +408,8 @@ PNGVER = 
+@@ -384,8 +410,8 @@ PNGVER = 
  #PNGLIB = libpng$(PNGVER).so
  #PNGHDR_DIR = /usr/include/libpng$(PNGVER)
  # NetBSD:
@@ -128,7 +128,7 @@ $NetBSD: patch-aa,v 1.29 2005/01/18 14:16:20 adam Exp $
  # OSF/Tru64:
  #PNGLIB = /usr/local1/DEC/lib/libpng$(PNGVER).so
  #PNGHDR_DIR = /usr/local1/DEC/include
-@@ -393,8 +419,8 @@ PNGVER = 
+@@ -395,8 +421,8 @@ PNGVER = 
  # NONE for the PNG library, it doesn't matter what you specify here --
  # it won't get used.
  
@@ -139,7 +139,7 @@ $NetBSD: patch-aa,v 1.29 2005/01/18 14:16:20 adam Exp $
  #ZLIB = libz.so
  
  # The JBIG lossless image compression library (aka JBIG-KIT):
-@@ -435,7 +461,7 @@ OMIT_NETWORK =
+@@ -437,7 +463,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 0b92d769030..81a6b05723e 100644
--- a/graphics/netpbm/patches/patch-ab
+++ b/graphics/netpbm/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.15 2005/01/18 14:16:20 adam Exp $
+$NetBSD: patch-ab,v 1.16 2005/02/17 11:36:01 adam Exp $
 
---- converter/other/Makefile.orig	2004-10-16 20:53:14.000000000 +0000
+--- converter/other/Makefile.orig	2005-02-05 17:48:28.000000000 +0000
 +++ converter/other/Makefile
-@@ -98,6 +98,13 @@ HEADERLINKS = pm_config.h pm.h pbm.h pgm
+@@ -104,6 +104,13 @@ HEADERLINKS = pm_config.h pm.h pbm.h pgm
  
  include $(SRCDIR)/Makefile.common