Changes 10.26.1:

* pamcomp: fix bug that duplicates last row of overlay image.
* pamcut: fix bug that fills the rightmost column with black.
* pnmtopalm: fix bug with -offset option.
* ppmforge: fix bug: crash due to wild pointer with -night.

Changes 10.26:
* pnmhistmap: Add -dots, -nmax, -red, -green, -blue, -lval,
  -rval, -height, and -width options.
* pnmnorm: accept -wpercent and -wvalue (or -bpercent and -bvalue)
  together.  Thanks Gregg Townsend <gmt@CS.Arizona.EDU>.
* xwdtopnm: Add -headerdump option.
* pnmtoxwd: Include 256 color color maps in direct color instead
  of zero.  Zero has a weird effect.
* pamtotga: recognize RGB_ALPHA instead of RGBA.
* palmtopnm: fix bug in determination of compression type.
* palmtopnm: fix bug in handling of multi-image streams.
* pnmtopalm: fix bugs in computation of nextDepthOffset.
* pamtotga: fix TGA pixel size for TGA with alpha.  Don't do
  colormap if input has transparency.
* pamtotga: fix crash due to uninitialized "id" field in TGA header.
* pbm_writepbmrow(): Fix bug in MMX/SSE code that causes segmentation fault.
* pnmhistmap: Fix bug: doesn't work with maxval != 255.
* pbmtext: fix crash with code point > 127.
* ppmtompeg: major cleanup.
* pnmtopng: fix "internal error" and crash bug with -transparent.
* pnmtoxwd: fix endianness on littleendian machines.
* pnmtoxwd: fix bug: doesn't work if you specify an option.
* jpegtopnm: fix bug: -dumpexif all wrong.
* jpegtopnm: fix bug: newline written to stdout instead of stderr with -dumpexif.
* Add missing 'col' declaration so -msse compile works.
* pcdovtoppm: fix syntax error
* pnmtojbig/jbigtopnm: add newline to "usage" message.
* pamperspective: fix bugs with -frame_include, etc.
* build: Jeg2k programs build properly with newer Jasper library.
* build: Fix bug: "no rule to build xxx.so" with external
* Jasper or Jbig library.
* Add NAME and DESCRIPTION section to pointer man pages.

6 files changed, 35 insertions, 47 deletions

diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index 521c8f7cf00..7290575f448 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.103 2005/01/07 13:28:21 adam Exp $
+# $NetBSD: Makefile,v 1.104 2005/01/18 14:16:20 adam Exp $
 
-DISTNAME=	netpbm-10.18.18
+DISTNAME=	netpbm-10.26.1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=netpbm/}
 EXTRACT_SUFX=	.tgz
diff --git a/graphics/netpbm/distinfo b/graphics/netpbm/distinfo
index c1b3db9516f..31aa2f7e14f 100644
--- a/graphics/netpbm/distinfo
+++ b/graphics/netpbm/distinfo
@@ -1,11 +1,8 @@
-$NetBSD: distinfo,v 1.29 2005/01/07 13:28:21 adam Exp $
+$NetBSD: distinfo,v 1.30 2005/01/18 14:16:20 adam Exp $
 
-SHA1 (netpbm-10.18.18.tgz) = 3a018296b4a3db5a2b2504a71b5f127edbbbd021
-Size (netpbm-10.18.18.tgz) = 2099609 bytes
-SHA1 (patch-aa) = 12c16032ce7dba683783d0b1fe3f9e85e7d11019
-SHA1 (patch-ab) = 1a1acf71faea487fce9fb102509b0aab06950fb7
-SHA1 (patch-ac) = cd8bb4318828a9872cce2793635c4bc51272d199
-SHA1 (patch-ad) = 0ca982f5ee83370b367025d5ddef74a984dc07fe
-SHA1 (patch-ae) = 8a46f8c0b1c0efe57533dba55d18459135e796ea
-SHA1 (patch-af) = 838211acc8a49aac1f5badbad74a9711735558a4
-SHA1 (patch-ag) = 13840ccb78b51bd690d6b86c1a799d21d0239598
+SHA1 (netpbm-10.26.1.tgz) = b4f131e42ae956fcac85b9256f0240420cad88ae
+Size (netpbm-10.26.1.tgz) = 2537086 bytes
+SHA1 (patch-aa) = c00953d99ec744d5330f901407379a19e14c457b
+SHA1 (patch-ab) = 0806c633454ba17c593b4b3ad380468681cd85ce
+SHA1 (patch-ac) = 07f109139bf30da22b05d00189cbb7b4a5f8f05a
+SHA1 (patch-ae) = 33a5be2843dd85b530f5e6ba496cd0380cd5edd1
diff --git a/graphics/netpbm/patches/patch-aa b/graphics/netpbm/patches/patch-aa
index 6341d1c3192..3e965192906 100644
--- a/graphics/netpbm/patches/patch-aa
+++ b/graphics/netpbm/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.28 2004/10/21 20:45:52 tv Exp $
+$NetBSD: patch-aa,v 1.29 2005/01/18 14:16:20 adam Exp $
 
---- Makefile.config.in.orig	Tue Jan 13 18:12:28 2004
+--- Makefile.config.in.orig	2004-10-16 19:53:17.000000000 +0000
 +++ Makefile.config.in
 @@ -33,7 +33,7 @@ BUILD_FIASCO = Y
  #CC = gcc
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.28 2004/10/21 20:45:52 tv Exp $
  
  # The linker.
  LD = $(CC)
-@@ -70,7 +70,7 @@ LD_FOR_BUILD = $(LD)
+@@ -86,7 +86,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.28 2004/10/21 20:45:52 tv Exp $
  #Solaris:
  #INSTALL = /usr/ucb/install
  #Tru64:
-@@ -82,7 +82,7 @@ INSTALL = $(SRCDIR)/buildtools/install.s
+@@ -98,7 +98,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.28 2004/10/21 20:45:52 tv Exp $
  # If you don't want to strip the binaries, just leave it null:
  #STRIPFLAG = 
  
-@@ -101,8 +101,10 @@ MANPAGE_FORMAT = nroff
+@@ -117,8 +117,10 @@ MANPAGE_FORMAT = nroff
  AR = ar
  RANLIB = ranlib
  # IRIX, SCO don't have Ranlib:
@@ -42,16 +42,7 @@ $NetBSD: patch-aa,v 1.28 2004/10/21 20:45:52 tv Exp $
  # Solaris:
  # LEX = flex -e
  # Or just skip parts that need Lex:
-@@ -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
-@@ -174,7 +176,7 @@ LDFLAGS =
+@@ -204,7 +206,7 @@ EXE =
  
  # Here, $(SONAME) resolves to the soname for the shared library being created.
  # The following are gcc options.  This works on GNU libc systems.
@@ -60,8 +51,8 @@ $NetBSD: patch-aa,v 1.28 2004/10/21 20:45:52 tv Exp $
  # You need -nostart instead of -shared on BeOS.  Though the BeOS compiler is
  # ostensibly gcc, it has the -nostart option, which is not mentioned in gcc
  # documentation and doesn't exist in at least one non-BeOS installation.
-@@ -203,6 +205,18 @@ LDRELOC = NONE
- #LDRELOC = ld --relocateable
+@@ -237,6 +239,18 @@ LDRELOC = NONE
+ #LDRELOC = ld --reloc
  #LDRELOC = ld -r
  
 +ifeq ($(OPSYS),SunOS)
@@ -79,7 +70,7 @@ $NetBSD: patch-aa,v 1.28 2004/10/21 20:45:52 tv 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
-@@ -221,11 +235,23 @@ LDRELOC = NONE
+@@ -255,11 +269,23 @@ LDRELOC = NONE
  CFLAGS_SHLIB = 
  # Solaris or SunOS with gcc, and NetBSD:
  #CFLAGS_SHLIB = -fpic
@@ -104,7 +95,7 @@ $NetBSD: patch-aa,v 1.28 2004/10/21 20:45:52 tv 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
-@@ -294,8 +320,8 @@ TIFFHDR_DIR =
+@@ -328,8 +354,8 @@ TIFFHDR_DIR =
  #TIFFLIB = libtiff.so
  #TIFFHDR_DIR = /usr/include/libtiff
  #NetBSD:
@@ -115,7 +106,7 @@ $NetBSD: patch-aa,v 1.28 2004/10/21 20:45:52 tv Exp $
  # OSF, Tru64:
  #TIFFLIB = /usr/local1/DEC/lib/libtiff.so
  #TIFFHDR_DIR = /usr/local1/DEC/include
-@@ -323,8 +349,8 @@ JPEGHDR_DIR =
+@@ -357,8 +383,8 @@ JPEGHDR_DIR =
  #JPEGLIB = libjpeg.so
  #JPEGHDR_DIR = /usr/include/jpeg
  # Netbsd:
@@ -126,7 +117,7 @@ $NetBSD: patch-aa,v 1.28 2004/10/21 20:45:52 tv Exp $
  # OSF, Tru64:
  #JPEGLIB = /usr/local1/DEC/libjpeg.so
  #JPEGHDR_DIR = /usr/local1/DEC/include
-@@ -348,8 +374,8 @@ PNGVER = 
+@@ -382,8 +408,8 @@ PNGVER = 
  #PNGLIB = libpng$(PNGVER).so
  #PNGHDR_DIR = /usr/include/libpng$(PNGVER)
  # NetBSD:
@@ -137,7 +128,7 @@ $NetBSD: patch-aa,v 1.28 2004/10/21 20:45:52 tv Exp $
  # OSF/Tru64:
  #PNGLIB = /usr/local1/DEC/lib/libpng$(PNGVER).so
  #PNGHDR_DIR = /usr/local1/DEC/include
-@@ -359,8 +385,8 @@ PNGVER = 
+@@ -393,8 +419,8 @@ PNGVER = 
  # NONE for the PNG library, it doesn't matter what you specify here --
  # it won't get used.
  
@@ -148,7 +139,7 @@ $NetBSD: patch-aa,v 1.28 2004/10/21 20:45:52 tv Exp $
  #ZLIB = libz.so
  
  # The JBIG lossless image compression library (aka JBIG-KIT):
-@@ -401,7 +427,7 @@ OMIT_NETWORK =
+@@ -435,7 +461,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 de630b524fc..0b92d769030 100644
--- a/graphics/netpbm/patches/patch-ab
+++ b/graphics/netpbm/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.14 2004/04/29 08:02:39 adam Exp $
+$NetBSD: patch-ab,v 1.15 2005/01/18 14:16:20 adam Exp $
 
---- converter/other/Makefile.orig	2003-07-11 03:23:53.000000000 +0000
+--- converter/other/Makefile.orig	2004-10-16 20:53:14.000000000 +0000
 +++ converter/other/Makefile
-@@ -96,6 +96,13 @@ HEADERLINKS = pm_config.h pm.h pbm.h pgm
+@@ -98,6 +98,13 @@ HEADERLINKS = pm_config.h pm.h pbm.h pgm
  
  include $(SRCDIR)/Makefile.common
  
diff --git a/graphics/netpbm/patches/patch-ac b/graphics/netpbm/patches/patch-ac
index 6f688709b92..46afb83e0e2 100644
--- a/graphics/netpbm/patches/patch-ac
+++ b/graphics/netpbm/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.13 2003/03/18 12:11:57 tron Exp $
+$NetBSD: patch-ac,v 1.14 2005/01/18 14:16:20 adam Exp $
 
---- converter/ppm/ppmtompeg/param.c-orig	Fri Aug 31 16:49:01 2001
-+++ converter/ppm/ppmtompeg/param.c	Sat Mar 23 19:20:02 2002
-@@ -11,13 +11,6 @@
+--- converter/ppm/ppmtompeg/param.c.orig	2004-12-03 05:05:39.000000000 +0000
++++ converter/ppm/ppmtompeg/param.c
+@@ -7,13 +7,6 @@
  
  /* COPYRIGHT INFORMATION IS AT THE END OF THIS FILE */
  
diff --git a/graphics/netpbm/patches/patch-ae b/graphics/netpbm/patches/patch-ae
index b41bd836956..8a8d0649a0e 100644
--- a/graphics/netpbm/patches/patch-ae
+++ b/graphics/netpbm/patches/patch-ae
@@ -1,9 +1,9 @@
-$NetBSD: patch-ae,v 1.9 2003/09/07 17:22:16 jschauma Exp $
+$NetBSD: patch-ae,v 1.10 2005/01/18 14:16:20 adam Exp $
 
---- generator/pbmtextps.c.orig	Sat Sep  6 23:31:49 2003
-+++ generator/pbmtextps.c	Sat Sep  6 23:32:23 2003
-@@ -13,7 +13,6 @@
-  * PostScript is a registered trademark of Adobe Systems International.
+--- generator/pbmtextps.c.orig	2003-10-08 02:39:27.000000000 +0000
++++ generator/pbmtextps.c
+@@ -15,7 +15,6 @@
+  * Additions by Bryan Henderson contributed to public domain by author.
   *
   */
 -#define _XOPEN_SOURCE   /* Make sure popen() is in stdio.h */