Changes 10.18.12:

* Don't try to install pm_gamma (which does not exist in this level)
* pamflip: fix bug with random memory accesses due to signed/unsigned comparison

Changes 10.18.11:
* pnmtopng: fix bug with -transparent

Changes 10.18.10:
* Include pm_system.h, pm_gamma.h in install package
* Fix the ftell/ftello distinction for many platforms
* ppmtogif: Don't violate array bounds when GIF color map is larger
  than internal color map.
* yuvsplittoppm: Fix -ccir601 option
* ppmtomap: Change #/bin/sh to #!/bin/sh

Changes 10.18.9:
* ppmtobmp: Fix bug: Generates invalid bits per pixel (e.g. 3) when input
  image has small number of colors
* pbmtog3: fix buffer overrun when image > 1728 columns
* pnmtotiffcmyk:  Correct abs to fabs so -theta works
* sldtoppm: Correct abs to fabs
* pgmramp: Correct abs to fabs so -rectangle and -ellipse work
* pgmramp: Don't crash with -rectangle and height or width = 1
* pnmtojpeg: interpret "length" field in exif data as unsigned 16 bit
  instead of signed.
* ppmforge: Correct abs to fabs so the planet is more than 2 pixels wide

Changes 10.18.8:
* pnmrotate: fix bug: always crashes in memory free
* pnmrotate: remove debugging messages

Changes 10.18.7:
* ppmshadow: Fix crash in all invocations
* pnmquant: Fix bug wherein all options are rejected

Changes 10.18.6:
* Add default RPATHOPT = rpath setting to Makefile.config.in
* Add stdlib.h and pm_config.h to mallocvar.h
* lib/Makefile: $(LIBNETPBMSUFFIX) instead of .so
* fitstopnm: Don't produce maxval 0

Changes 10.18.5:
* pnmtopng: fix bug with array bounds violation with -alpha
  Usual symptom: "internal inconsistency" message

Changes 10.18.4:
* anytopnm: Remove "function" so it works on FreeBSD

Changes 10.18.3:
* Fix stack corruption in pXm_check() on systems that have both 32 and 64 bit
  file offsets

Changes 10.18.2:
* installnetpbm: don't crash on mkdir on old Perl
* bmptopnm: fix bug with BMPs that end prematurely

Changes 10.11.15:
* Bmptopnm goes into an infinite loop if you give it a BMP file that ends
  prematurely.  The bug is in the way the program interprets the return code
  from fread() in readrow().  You can get the fix from the 10.18.1-10.18.2 diff.
* xwdtopnm: Doesn't work with at least one direct color 24 bits-per-pixel
  xwd generated by Xfree86's Xwd.
* ppmquant does not choose the best set of colors.  pnmquant does, though.
* giftopnm doesn't understand GIFs with the same color both transparent and
  opaque.

pnmtopng -alpha fails with "internal inconsistency detected" message
Changes 10.11.14:
* pstopnm: fix bug in which Standard Input never works
* ppmtobmp: change 'char' to 'unsigned char' to work around a Solaris C library   bug
* ppmtobmp: handle maxval properly for maxval != 256 truecolor BMP

Changes 10.11.13:
* Explicitly set SCRIPTS make variable to null so environment
  variable of the same name doesn't screw things up.
* stamp_date: don't use LOGNAME as a variable (on AIX, you can't).
* configure: put space after -o in test compiles.
* ppmtompeg: adjust header files in parallel.c so it compiles on AIX

Changes 10.11.12:
* pnmpsnr: fix bug: Cr and Cb interchanged
* Fix crash in pnmstitch

Changes 10.11.10:
* Declare internal subroutines in pgmabel as 'static' so they don't conflict
  with some C libraries

Changes 10.11.9:
* pstopnm: fix bug: encapsulated postscript confused with regular postscript,
  so all pages get overlaid as one page

5 files changed, 39 insertions, 40 deletions

diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index fb1a49bfbe3..11fcea71b3f 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.91 2004/02/13 10:53:09 grant Exp $
+# $NetBSD: Makefile,v 1.92 2004/04/29 08:02:39 adam Exp $
 
-DISTNAME=	netpbm-10.11.8
-PKGREVISION=	1
+DISTNAME=	netpbm-10.18.12
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=netpbm/}
 EXTRACT_SUFX=	.tgz
@@ -12,9 +11,9 @@ COMMENT=	Toolkit for conversion of images between different formats
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_BUILDLINK3=	yes
-USE_GNU_TOOLS+=	lex make
-USE_PERL5=	yes
+USE_BUILDLINK3=		yes
+USE_GNU_TOOLS+=		lex make
+USE_PERL5=		yes
 
 INSTALL_TARGET=	install-dev install-run
 MAKE_ENV+=	INSTALL="${INSTALL}" STRIPFLAG="${_STRIPFLAG_INSTALL}" \
diff --git a/graphics/netpbm/distinfo b/graphics/netpbm/distinfo
index 8e837839b6a..f73cb328d90 100644
--- a/graphics/netpbm/distinfo
+++ b/graphics/netpbm/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.19 2004/03/22 15:52:35 wiz Exp $
+$NetBSD: distinfo,v 1.20 2004/04/29 08:02:39 adam Exp $
 
-SHA1 (netpbm-10.11.8.tgz) = ecfe6e59688bb3a44c178a6b6bfb923039c4229e
-Size (netpbm-10.11.8.tgz) = 1911118 bytes
-SHA1 (patch-aa) = 22de5096922df8353e8a42da59b9adb65afd6dd8
-SHA1 (patch-ab) = 2dfd877d04eb5fc92a1f1e4619a3324c37cc371a
+SHA1 (netpbm-10.18.12.tgz) = ba169ea2060e2f6fc46cfc87bc8e3256aec56f9e
+Size (netpbm-10.18.12.tgz) = 2090624 bytes
+SHA1 (patch-aa) = f16f261d0812550266a1a857c28966ec3356e5bb
+SHA1 (patch-ab) = 1a1acf71faea487fce9fb102509b0aab06950fb7
 SHA1 (patch-ac) = cd8bb4318828a9872cce2793635c4bc51272d199
-SHA1 (patch-ad) = 21c7cce58e010d9323bbfac514e7d0bd39f4723c
+SHA1 (patch-ad) = 0ca982f5ee83370b367025d5ddef74a984dc07fe
 SHA1 (patch-ae) = 8a46f8c0b1c0efe57533dba55d18459135e796ea
diff --git a/graphics/netpbm/patches/patch-aa b/graphics/netpbm/patches/patch-aa
index de60b5c9732..d41130e59f5 100644
--- a/graphics/netpbm/patches/patch-aa
+++ b/graphics/netpbm/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.26 2003/09/07 17:22:16 jschauma Exp $
+$NetBSD: patch-aa,v 1.27 2004/04/29 08:02:39 adam Exp $
 
---- Makefile.config.in.orig	Tue Oct 15 10:17:21 2002
-+++ Makefile.config.in	Sun Sep  7 12:39:12 2003
-@@ -33,7 +33,7 @@
+--- Makefile.config.in.orig	2004-01-13 23:12:28.000000000 +0000
++++ Makefile.config.in
+@@ -33,7 +33,7 @@ BUILD_FIASCO = Y
  #CC = gcc
  # Note that 'cc' is usually an alias for whatever is the main compiler
  # on a system, e.g. the GNU Compiler on Linux.
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.26 2003/09/07 17:22:16 jschauma Exp $
  
  # The linker.
  LD = $(CC)
-@@ -52,7 +52,7 @@
+@@ -70,7 +70,7 @@ LD_FOR_BUILD = $(LD)
  
  # MAKE is set automatically by Make to what was used to invoke Make.
  
@@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.26 2003/09/07 17:22:16 jschauma Exp $
  #Solaris:
  #INSTALL = /usr/ucb/install
  #Tru64:
-@@ -64,7 +64,7 @@
+@@ -82,7 +82,7 @@ INSTALL = $(SRCDIR)/buildtools/install.s
  
  # STRIPFLAG is the option you pass to the above install program to make it
  # strip unnecessary information out of binaries.
@@ -29,7 +29,7 @@ $NetBSD: patch-aa,v 1.26 2003/09/07 17:22:16 jschauma Exp $
  # If you don't want to strip the binaries, just leave it null:
  #STRIPFLAG = 
  
-@@ -83,7 +83,9 @@
+@@ -101,7 +101,9 @@ MANPAGE_FORMAT = nroff
  AR = ar
  RANLIB = ranlib
  # IRIX, SCO don't have Ranlib:
@@ -40,18 +40,18 @@ $NetBSD: patch-aa,v 1.26 2003/09/07 17:22:16 jschauma Exp $
  LEX = flex
  # Solaris:
  # LEX = flex -e
-@@ -131,7 +133,7 @@
- # Solaris, SunOS, NetBSD:
- #NEED_RUNTIME_PATH = Y
+@@ -151,7 +153,7 @@ EXE =
+   
+ # linker options.  
  
 -LDFLAGS =
 +#LDFLAGS =
  # Eunice users may want to use -noshare so that the executables can
  # run standalone:
  #LDFLAGS = -noshare
-@@ -171,6 +173,14 @@
- #AIX:
- #LDSHLIB = ???
+@@ -204,6 +206,14 @@ LDRELOC = NONE
+ #LDRELOC = ld -r
+ 
  
 +ifeq ($(OPSYS),SunOS)
 +LDSHLIB = -Wl,-B,dynamic,-G,-h,$(SONAME) 
@@ -64,7 +64,7 @@ $NetBSD: patch-aa,v 1.26 2003/09/07 17:22:16 jschauma Exp $
  # On older systems, you have to make shared libraries out of position
  # independent code, so you need -fpic or fPIC here.  (The rule is: if
  # -fpic works, use it.  If it bombs, go to fPIC).  On newer systems,
-@@ -188,11 +198,19 @@
+@@ -221,11 +231,19 @@ LDRELOC = NONE
  CFLAGS_SHLIB = 
  # Solaris or SunOS with gcc, and NetBSD:
  #CFLAGS_SHLIB = -fpic
@@ -85,7 +85,7 @@ $NetBSD: patch-aa,v 1.26 2003/09/07 17:22:16 jschauma Exp $
  # SHLIB_CLIB is the link option to include the C library in a shared library,
  # normally "-lc".  On typical systems, this serves no purpose.  On some,
  # though, it causes information about which C library to use to be recorded
-@@ -244,8 +262,8 @@
+@@ -294,8 +312,8 @@ TIFFHDR_DIR =
  #TIFFLIB = libtiff.so
  #TIFFHDR_DIR = /usr/include/libtiff
  #NetBSD:
@@ -96,7 +96,7 @@ $NetBSD: patch-aa,v 1.26 2003/09/07 17:22:16 jschauma Exp $
  # OSF, Tru64:
  #TIFFLIB = /usr/local1/DEC/lib/libtiff.so
  #TIFFHDR_DIR = /usr/local1/DEC/include
-@@ -273,8 +291,8 @@
+@@ -323,8 +341,8 @@ JPEGHDR_DIR =
  #JPEGLIB = libjpeg.so
  #JPEGHDR_DIR = /usr/include/jpeg
  # Netbsd:
@@ -107,7 +107,7 @@ $NetBSD: patch-aa,v 1.26 2003/09/07 17:22:16 jschauma Exp $
  # OSF, Tru64:
  #JPEGLIB = /usr/local1/DEC/libjpeg.so
  #JPEGHDR_DIR = /usr/local1/DEC/include
-@@ -297,8 +315,8 @@
+@@ -348,8 +366,8 @@ PNGVER = 
  #PNGLIB = libpng$(PNGVER).so
  #PNGHDR_DIR = /usr/include/libpng$(PNGVER)
  # NetBSD:
@@ -118,7 +118,7 @@ $NetBSD: patch-aa,v 1.26 2003/09/07 17:22:16 jschauma Exp $
  # OSF/Tru64:
  #PNGLIB = /usr/local1/DEC/lib/libpng$(PNGVER).so
  #PNGHDR_DIR = /usr/local1/DEC/include
-@@ -308,8 +326,8 @@
+@@ -359,8 +377,8 @@ PNGVER = 
  # NONE for the PNG library, it doesn't matter what you specify here --
  # it won't get used.
  
@@ -129,9 +129,9 @@ $NetBSD: patch-aa,v 1.26 2003/09/07 17:22:16 jschauma Exp $
  #ZLIB = libz.so
  
  # The JBIG lossless image compression library (aka JBIG-KIT):
-@@ -337,7 +355,7 @@
- # network functions is the option in ppmtompeg to run it on multiple
- # computers simultaneously.
+@@ -401,7 +419,7 @@ OMIT_NETWORK =
+ # built into the standard C library, so this can be null.  This is irrelevant
+ # if OMIT_NETWORK is "y".
  
 -NETWORKLD = 
 +#NETWORKLD = 
diff --git a/graphics/netpbm/patches/patch-ab b/graphics/netpbm/patches/patch-ab
index a4de893728f..de630b524fc 100644
--- a/graphics/netpbm/patches/patch-ab
+++ b/graphics/netpbm/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.13 2004/03/22 15:52:35 wiz Exp $
+$NetBSD: patch-ab,v 1.14 2004/04/29 08:02:39 adam Exp $
 
---- converter/other/Makefile.orig	Wed Jan  8 22:52:23 2003
+--- converter/other/Makefile.orig	2003-07-11 03:23:53.000000000 +0000
 +++ converter/other/Makefile
-@@ -94,6 +94,13 @@ HEADERLINKS = pm_config.h pm.h pbm.h pgm
+@@ -96,6 +96,13 @@ HEADERLINKS = pm_config.h pm.h pbm.h pgm
  
  include $(SRCDIR)/Makefile.common
  
diff --git a/graphics/netpbm/patches/patch-ad b/graphics/netpbm/patches/patch-ad
index d354deecabe..2f2d4d56c32 100644
--- a/graphics/netpbm/patches/patch-ad
+++ b/graphics/netpbm/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.13 2003/09/07 17:22:16 jschauma Exp $
+$NetBSD: patch-ad,v 1.14 2004/04/29 08:02:39 adam Exp $
 
---- converter/other/pstopnm.c.orig	Sat Sep  6 21:22:44 2003
-+++ converter/other/pstopnm.c	Sat Sep  6 21:22:36 2003
-@@ -7,7 +7,6 @@
+--- converter/other/pstopnm.c.orig	2003-10-18 18:04:43.000000000 +0000
++++ converter/other/pstopnm.c
+@@ -15,7 +15,6 @@
  -----------------------------------------------------------------------------*/
  
  #define _BSD_SOURCE 1   /* Make sure strdup() is in string.h */