update to 10.35.73

changes: many bugfixes, especially:
 xpmtoppm: fix wild pointer with color index > 127.
 which fixes a stack-based buffer overflow (CVE-2009-4274)

pkgsrc change: use a fixed PLIST instead of generating on install,
 helps to detect problems

26 files changed, 66 insertions, 501 deletions

diff --git a/graphics/netpbm/patches/patch-aa b/graphics/netpbm/patches/patch-aa
index 4b6ff715a5c..1ce5f7d7fe3 100644
--- a/graphics/netpbm/patches/patch-aa
+++ b/graphics/netpbm/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.39 2007/02/19 02:25:19 rillig Exp $
+$NetBSD: patch-aa,v 1.40 2010/02/19 18:25:44 drochner Exp $
 
---- Makefile.config.in.orig	2006-06-18 21:23:40.000000000 +0200
+--- Makefile.config.in.orig	2008-12-07 01:58:20.000000000 +0000
 +++ Makefile.config.in
 @@ -24,7 +24,7 @@ DEFAULT_TARGET = nonmerge
  # and skip it on those systems unless you want to debug it and fix it.
@@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.39 2007/02/19 02:25:19 rillig Exp $
  
  # The linker.
  LD = $(CC)
-@@ -99,7 +99,7 @@ CFLAGS_FOR_BUILD = $(CFLAGS)
+@@ -100,7 +100,7 @@ CFLAGS_FOR_BUILD = $(CFLAGS)
  
  # MAKE is set automatically by Make to what was used to invoke Make.
  
@@ -29,7 +29,7 @@ $NetBSD: patch-aa,v 1.39 2007/02/19 02:25:19 rillig Exp $
  #Solaris:
  #INSTALL = /usr/ucb/install
  #Tru64:
-@@ -111,7 +111,7 @@ INSTALL = $(SRCDIR)/buildtools/install.s
+@@ -112,7 +112,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.
@@ -38,20 +38,25 @@ $NetBSD: patch-aa,v 1.39 2007/02/19 02:25:19 rillig Exp $
  # If you don't want to strip the binaries, just leave it null:
  #STRIPFLAG = 
  
-@@ -130,8 +130,10 @@ MANPAGE_FORMAT = nroff
+@@ -131,13 +131,15 @@ MANPAGE_FORMAT = nroff
  AR = ar
  RANLIB = ranlib
  # IRIX, SCO don't have Ranlib:
 -#RANLIB = true
--LEX = flex
 +ifeq ($(OPSYS),IRIX)
 +RANLIB = ar rs
 +endif
+ 
+ # LEX is the beginning of a shell command that runs a Lex-like
+ # pattern matcher generator.  Null string means there isn't any such
+ # command.  That means the build will skip parts that need one.
+ 
+-LEX = flex
 +#LEX = flex
  # Solaris:
  # LEX = flex -e
- # Or just skip parts that need Lex:
-@@ -220,7 +222,7 @@ EXE =
+ # Windows Mingw:
+@@ -228,7 +230,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,7 +65,7 @@ $NetBSD: patch-aa,v 1.39 2007/02/19 02:25:19 rillig 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.
-@@ -253,6 +255,19 @@ LDRELOC = NONE
+@@ -261,6 +263,19 @@ LDRELOC = NONE
  #LDRELOC = ld --reloc
  #LDRELOC = ld -r
  
@@ -80,9 +85,9 @@ $NetBSD: patch-aa,v 1.39 2007/02/19 02:25:19 rillig 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
-@@ -275,11 +290,23 @@ LDRELOC = NONE
+@@ -283,11 +298,23 @@ LDRELOC = NONE
  CFLAGS_SHLIB = 
- # Solaris or SunOS with gcc, and NetBSD:
+ # Gcc:
  #CFLAGS_SHLIB = -fpic
 -#CFLAGS_SHLIB = -fPIC
 +CFLAGS_SHLIB = -fPIC
@@ -105,7 +110,7 @@ $NetBSD: patch-aa,v 1.39 2007/02/19 02:25:19 rillig 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
-@@ -348,8 +375,8 @@ TIFFHDR_DIR =
+@@ -356,8 +383,8 @@ TIFFHDR_DIR =
  #TIFFLIB = libtiff.so
  #TIFFHDR_DIR = /usr/include/libtiff
  #NetBSD:
@@ -116,7 +121,7 @@ $NetBSD: patch-aa,v 1.39 2007/02/19 02:25:19 rillig Exp $
  # OSF, Tru64:
  #TIFFLIB = /usr/local1/DEC/lib/libtiff.so
  #TIFFHDR_DIR = /usr/local1/DEC/include
-@@ -379,8 +406,8 @@ JPEGHDR_DIR =
+@@ -387,8 +414,8 @@ JPEGHDR_DIR =
  #JPEGLIB = libjpeg.so
  #JPEGHDR_DIR = /usr/include/jpeg
  # Netbsd:
@@ -127,8 +132,8 @@ $NetBSD: patch-aa,v 1.39 2007/02/19 02:25:19 rillig Exp $
  # OSF, Tru64:
  #JPEGLIB = /usr/local1/DEC/libjpeg.so
  #JPEGHDR_DIR = /usr/local1/DEC/include
-@@ -400,12 +427,12 @@ JPEGHDR_DIR =
- # option.
+@@ -415,12 +442,12 @@ JPEGHDR_DIR =
+ 
  PNGLIB = NONE
  PNGHDR_DIR =
 -PNGVER = 
@@ -139,13 +144,13 @@ $NetBSD: patch-aa,v 1.39 2007/02/19 02:25:19 rillig Exp $
 -#PNGLIB = $(LOCALBASE)/lib/libpng$(PNGVER).so
 -#PNGHDR_DIR = $(LOCALBASE)/include
 +PNGLIB = $(BUILDLINK_DIR)/lib/libpng$(PNGVER).so
-+PNGHDR_DIR = $(BUILDLINK_DIR)/include
++#PNGHDR_DIR = $(BUILDLINK_DIR)/include
  # OSF/Tru64:
  #PNGLIB = /usr/local1/DEC/lib/libpng$(PNGVER).so
  #PNGHDR_DIR = /usr/local1/DEC/include
-@@ -415,8 +442,8 @@ PNGVER = 
- # NONE for the PNG library, it doesn't matter what you specify here --
- # it won't get used.
+@@ -432,8 +459,8 @@ PNGVER = 
+ #
+ # If you have 'libpng-config' (see above), these are irrelevant.
  
 -ZLIB = NONE
 -ZHDR_DIR = 
@@ -154,7 +159,7 @@ $NetBSD: patch-aa,v 1.39 2007/02/19 02:25:19 rillig Exp $
  #ZLIB = libz.so
  
  # The JBIG lossless image compression library (aka JBIG-KIT):
-@@ -425,8 +452,8 @@ JBIGLIB = $(BUILDDIR)/converter/other/jb
+@@ -442,8 +469,8 @@ JBIGLIB = $(BUILDDIR)/converter/other/jb
  JBIGHDR_DIR = $(SRCDIR)/converter/other/jbig
  
  # The Jasper JPEG-2000 image compression library (aka JasPer):
@@ -165,7 +170,7 @@ $NetBSD: patch-aa,v 1.39 2007/02/19 02:25:19 rillig Exp $
  # JASPERDEPLIBS is the libraries (-l options or file names) on which
  # The Jasper library depends -- i.e. what you have to link into any
  # executable that links in the Jasper library.
-@@ -471,7 +498,7 @@ OMIT_NETWORK =
+@@ -488,7 +515,7 @@ OMIT_NETWORK =
  # built into the standard C library, so this can be null.  This is irrelevant
  # if OMIT_NETWORK is "y".
  
@@ -174,7 +179,7 @@ $NetBSD: patch-aa,v 1.39 2007/02/19 02:25:19 rillig Exp $
  # Solaris, SunOS:
  #NETWORKLD = -lsocket -lnsl
  # SCO:
-@@ -525,7 +552,7 @@ SUFFIXMANUALS5 = 5
+@@ -542,7 +569,7 @@ SUFFIXMANUALS5 = 5
  #Netpbm library functions.  The value is used only in make file tests.
  # "unixshared" means a unix-style shared library, typically named like 
  # libxyz.so.2.3
@@ -183,7 +188,7 @@ $NetBSD: patch-aa,v 1.39 2007/02/19 02:25:19 rillig Exp $
  # "unixstatic" means a unix-style static library, (like libxyz.a)
  #NETPBMLIBTYPE = unixstatic
  # "dll" means a Windows DLL shared library
-@@ -536,7 +563,7 @@ NETPBMLIBTYPE = unixshared
+@@ -553,7 +580,7 @@ NETPBMLIBTYPE = unixshared
  #NETPBMLIBSUFFIX is the suffix used on whatever kind of library is 
  #selected above.  All this is used for is to construct library names.
  #The make files never examine the actual value.
diff --git a/graphics/netpbm/patches/patch-ac b/graphics/netpbm/patches/patch-ac
deleted file mode 100644
index 8f3b5a56455..00000000000
--- a/graphics/netpbm/patches/patch-ac
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ac,v 1.17 2006/10/03 23:01:25 schwarz Exp $
-
---- lib/ppmdraw.h.orig	2006-09-26 21:01:00.000000000 +0200
-+++ lib/ppmdraw.h	2006-09-26 21:13:09.000000000 +0200
-@@ -59,7 +59,7 @@
- 
- 
- 
--typedef void ppmd_drawproc(pixel **, int, int, pixval, int, int, const void *);
-+typedef void ppmd_drawproc(pixel ** const, int const, int const, pixval const, int const, int const, const void *const);
- 
- ppmd_drawproc ppmd_point_drawproc;
- 
-@@ -274,7 +274,7 @@
-           int          const height, 
-           int          const angle, 
-           const char * const sArg, 
--          void (*drawprocP)(pixel**, int, int, pixval, int, int, const void*), 
-+	   ppmd_drawproc drawproc,
-     const void*  const clientdata);
- /* Draws the null-terminated string 's' left justified at the point
-    ('x', 'y').  The text will be 'height' pixels high and will be aligned on a
diff --git a/graphics/netpbm/patches/patch-af b/graphics/netpbm/patches/patch-af
deleted file mode 100644
index ad552e82f1e..00000000000
--- a/graphics/netpbm/patches/patch-af
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-af,v 1.12 2009/04/07 08:09:06 hasso Exp $
-
---- converter/other/cameratopam/identify.c.orig	2005-08-27 19:29:58.000000000 +0200
-+++ converter/other/cameratopam/identify.c
-@@ -23,7 +23,12 @@
- 
- static loadRawFn load_raw;
- 
-+#include <sys/param.h>
- 
-+#if !(defined(__GLIBC__) \
-+  || (defined(__NetBSD__) && (__NetBSD_Version__ >= 300000000)) \
-+  || (defined(__FreeBSD__) && (__FreeBSD_version >=  600000)) \
-+  || (defined(__DragonFly__) && (__DragonFly_version >= 200202)))
- /* This does the same as the function of the same name in the GNU C library */
- static const char *memmem (const char *haystack, size_t haystacklen,
-                      const char *needle, size_t needlelen)
-@@ -34,6 +38,7 @@ static const char *memmem (const char *h
-       return c;
-   return NULL;
- }
-+#endif
- 
- /*
-    Thanks to Adobe for providing these excellent CAM -> XYZ matrices!
diff --git a/graphics/netpbm/patches/patch-ag b/graphics/netpbm/patches/patch-ag
deleted file mode 100644
index c4ab4500f26..00000000000
--- a/graphics/netpbm/patches/patch-ag
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ag,v 1.18 2006/10/03 22:56:50 schwarz Exp $
-
---- lib/libppmd.c.orig	2006-10-03 17:51:58.000000000 +0200
-+++ lib/libppmd.c	2006-10-03 17:53:15.000000000 +0200
-@@ -688,7 +688,9 @@
- 
- 
- 
-+#ifndef SGI_IDO_CC
- static qsort_compare yx_compare;
-+#endif
- 
- static int
- yx_compare(const void * const c1Arg,
diff --git a/graphics/netpbm/patches/patch-ai b/graphics/netpbm/patches/patch-ai
deleted file mode 100644
index 808dca2189d..00000000000
--- a/graphics/netpbm/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.11 2006/10/03 22:56:50 schwarz Exp $
-
---- lib/pm.h.orig	2006-09-26 20:49:52.000000000 +0200
-+++ lib/pm.h	2006-09-26 19:53:11.000000000 +0200
-@@ -65,7 +65,7 @@
- #ifdef __GNUC__
- #define PM_GNU_PRINTF_ATTR(a,b) __attribute__ ((format (printf, a, b)))
- #else
--#define PM_GNU_PRINTF_ATTR
-+#define PM_GNU_PRINTF_ATTR(a,b)
- #endif
- 
- 
diff --git a/graphics/netpbm/patches/patch-aj b/graphics/netpbm/patches/patch-aj
deleted file mode 100644
index a195db29862..00000000000
--- a/graphics/netpbm/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.11 2006/10/03 22:56:50 schwarz Exp $
-
---- converter/ppm/sldtoppm.c.orig	2006-09-26 22:50:39.000000000 +0200
-+++ converter/ppm/sldtoppm.c	2006-09-26 22:50:58.000000000 +0200
-@@ -74,7 +74,7 @@
-                     void (*slflood) ARGS((struct spolygon *poly, int color)) ));
- static void slidefind ARGS((char *sname, int dironly, int ucasen));
- static void draw ARGS((struct svector *vec, int color));
--static void flood ARGS((struct spolygon *poly, int color));
-+static void flood ARGS((struct spolygon *const poly, int const color));
- 
- static int ixdots, iydots;        /* Screen size in dots */
- static FILE *slfile;              /* Slide file descriptor */
diff --git a/graphics/netpbm/patches/patch-ak b/graphics/netpbm/patches/patch-ak
deleted file mode 100644
index cadd4f7caeb..00000000000
--- a/graphics/netpbm/patches/patch-ak
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ak,v 1.7 2006/10/03 22:56:51 schwarz Exp $
-
---- converter/ppm/ppmtompeg/headers/frame.h.orig	2005-12-24 04:23:55.000000000 +0100
-+++ converter/ppm/ppmtompeg/headers/frame.h	2006-09-27 00:02:16.000000000 +0200
-@@ -131,17 +131,17 @@
-              int         const outsize_y);
- 
- 
--extern void	  Frame_Free _ANSI_ARGS_((MpegFrame *frame));
-+extern void	  Frame_Free _ANSI_ARGS_((MpegFrame * const frame));
- extern void	  Frame_Exit _ANSI_ARGS_((void));
- extern void	  Frame_AllocPPM _ANSI_ARGS_((MpegFrame * frame));
--extern void	  Frame_AllocYCC _ANSI_ARGS_((MpegFrame * mf));
--extern void	  Frame_AllocDecoded _ANSI_ARGS_((MpegFrame *frame,
--						  boolean makeReference));
--extern void	  Frame_AllocHalf _ANSI_ARGS_((MpegFrame *frame));
--extern void	  Frame_AllocBlocks _ANSI_ARGS_((MpegFrame *mf));
--extern void	  Frame_Resize _ANSI_ARGS_((MpegFrame *omf, MpegFrame *mf,
--					    int insize_x, int insize_y,
--					    int outsize_x, int outsize_y));
-+extern void	  Frame_AllocYCC _ANSI_ARGS_((MpegFrame * const mf));
-+extern void	  Frame_AllocDecoded _ANSI_ARGS_((MpegFrame * const frame,
-+						  boolean const makeReference));
-+extern void	  Frame_AllocHalf _ANSI_ARGS_((MpegFrame * const frame));
-+extern void	  Frame_AllocBlocks _ANSI_ARGS_((MpegFrame * const mf));
-+extern void	  Frame_Resize _ANSI_ARGS_((MpegFrame * const omf, MpegFrame * const mf,
-+					    int const insize_x, int const insize_y,
-+					    int const outsize_x, int const outsize_y));
- 
- 
- #endif /* FRAME_INCLUDED */
diff --git a/graphics/netpbm/patches/patch-al b/graphics/netpbm/patches/patch-al
deleted file mode 100644
index 42f39516154..00000000000
--- a/graphics/netpbm/patches/patch-al
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-al,v 1.3 2006/10/03 22:56:51 schwarz Exp $
-
---- ./converter/ppm/ppmtompeg/mheaders.c.orig	2006-09-30 16:44:28.000000000 +0200
-+++ ./converter/ppm/ppmtompeg/mheaders.c	2006-09-30 16:45:11.000000000 +0200
-@@ -293,7 +293,7 @@
- static void	GenMBType _ANSI_ARGS_((BitBucket *bb, uint32 pict_code_type,
- 		  uint32 mb_quant, uint32 motion_forw, uint32 motion_back,
- 		  uint32 mb_pattern, uint32 mb_intra));
--static void	GenMotionCode _ANSI_ARGS_((BitBucket *bb, int32 vector));
-+static void	GenMotionCode _ANSI_ARGS_((BitBucket * const bb, int32 const vector));
- static void	GenBlockPattern _ANSI_ARGS_((BitBucket *bb,
- 					     uint32 mb_pattern));
- 
diff --git a/graphics/netpbm/patches/patch-am b/graphics/netpbm/patches/patch-am
deleted file mode 100644
index 578e46df99c..00000000000
--- a/graphics/netpbm/patches/patch-am
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-am,v 1.3 2006/10/03 22:56:51 schwarz Exp $
-
---- converter/ppm/ppmtompeg/iframe.c.orig	2006-09-30 16:49:39.000000000 +0200
-+++ converter/ppm/ppmtompeg/iframe.c	2006-09-30 16:58:18.000000000 +0200
-@@ -136,14 +136,14 @@
- /*=====================*
-  * EXPORTED PROCEDURES *
-  *=====================*/
--extern void PrintItoIBitRate _ANSI_ARGS_((int numBits, int frameNum));
-+extern void PrintItoIBitRate _ANSI_ARGS_((int const numBits, int const frameNum));
- 
- /*===============================*
-  * INTERNAL PROCEDURE prototypes *
-  *===============================*/
- void AllocDctBlocks(void );
--int SetFCodeHelper (int sr);
--void CalcDistortion (MpegFrame *current, int y, int x);
-+int SetFCodeHelper (int const sr);
-+void CalcDistortion (MpegFrame * const current, int const y, int const x);
- 
- int
- SetFCodeHelper(int const SR) {
diff --git a/graphics/netpbm/patches/patch-an b/graphics/netpbm/patches/patch-an
deleted file mode 100644
index 6b055d36e3e..00000000000
--- a/graphics/netpbm/patches/patch-an
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-an,v 1.3 2006/10/03 22:56:51 schwarz Exp $
-
---- converter/ppm/ppmtompeg/headers/prototypes.h.orig	2006-09-30 16:51:04.000000000 +0200
-+++ converter/ppm/ppmtompeg/headers/prototypes.h	2006-09-30 17:01:04.000000000 +0200
-@@ -47,7 +47,7 @@
- void    ResetIFrameStats _ANSI_ARGS_((void));
- void
- SetPixelSearch(const char * const searchType);
--void    SetIQScale _ANSI_ARGS_((int qI));
-+void    SetIQScale _ANSI_ARGS_((int const qI));
- void    SetPQScale _ANSI_ARGS_((int qP));
- void    SetBQScale _ANSI_ARGS_((int qB));
- float   EstimateSecondsPerIFrame _ANSI_ARGS_((void));
-@@ -56,7 +56,7 @@
- void    SetGOPSize _ANSI_ARGS_((int size));
- void
- SetStatFileName(const char * const fileName);
--void    SetSlicesPerFrame _ANSI_ARGS_((int number));
-+void    SetSlicesPerFrame _ANSI_ARGS_((int const number));
- void    SetBlocksPerSlice _ANSI_ARGS_((void));
- 
- 
-@@ -64,7 +64,7 @@
- 
- void PPMtoYCC _ANSI_ARGS_((MpegFrame * mf));
- 
--void    MotionSearchPreComputation _ANSI_ARGS_((MpegFrame *frame));
-+void    MotionSearchPreComputation _ANSI_ARGS_((MpegFrame * const frame));
- 
- void    ComputeHalfPixelData _ANSI_ARGS_((MpegFrame *frame));
- void mp_validate_size _ANSI_ARGS_((int *x, int *y));
diff --git a/graphics/netpbm/patches/patch-ao b/graphics/netpbm/patches/patch-ao
index 0d266058c77..7ce566e0e33 100644
--- a/graphics/netpbm/patches/patch-ao
+++ b/graphics/netpbm/patches/patch-ao
@@ -1,7 +1,7 @@
-$NetBSD: patch-ao,v 1.3 2006/10/03 22:56:51 schwarz Exp $
+$NetBSD: patch-ao,v 1.4 2010/02/19 18:25:44 drochner Exp $
 
---- converter/ppm/ppmtompeg/headers/frames.h.orig	2006-10-03 17:41:32.000000000 +0200
-+++ converter/ppm/ppmtompeg/headers/frames.h	2006-10-03 17:45:50.000000000 +0200
+--- converter/ppm/ppmtompeg/headers/frames.h.orig	2006-10-18 18:29:13.000000000 +0000
++++ converter/ppm/ppmtompeg/headers/frames.h
 @@ -8,6 +8,8 @@
  #ifndef FRAMES_INCLUDED
  #define FRAMES_INCLUDED
@@ -11,12 +11,3 @@ $NetBSD: patch-ao,v 1.3 2006/10/03 22:56:51 schwarz Exp $
  /*==============*
   * HEADER FILES *
   *==============*/
-@@ -85,7 +87,7 @@
-   int fmotionX, fmotionY, bmotionX, bmotionY;
- } dct_data_type;
- 
--void    EncodeYDC _ANSI_ARGS_((int32 dc_term, int32 *pred_term, BitBucket *bb));
-+void    EncodeYDC _ANSI_ARGS_((int32 const dc_term, int32 * const pred_term, BitBucket * const bb));
- void
- EncodeCDC(int32       const dc_term,
-           int32     * const pred_term,
diff --git a/graphics/netpbm/patches/patch-ap b/graphics/netpbm/patches/patch-ap
deleted file mode 100644
index 550d982cacb..00000000000
--- a/graphics/netpbm/patches/patch-ap
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ap,v 1.3 2006/10/03 22:56:51 schwarz Exp $
-
---- converter/ppm/ppmtompeg/headers/mpeg.h.orig	2006-09-30 16:55:59.000000000 +0200
-+++ converter/ppm/ppmtompeg/headers/mpeg.h	2006-09-30 16:56:18.000000000 +0200
-@@ -90,7 +90,7 @@
- ReadDecodedRefFrame(MpegFrame *  const frameP, 
-                     unsigned int const frameNumber);
- 
--extern void	WriteDecodedFrame _ANSI_ARGS_((MpegFrame *frame));
-+extern void	WriteDecodedFrame _ANSI_ARGS_((MpegFrame * const frame));
- extern void	SetBitRateFileName _ANSI_ARGS_((char *fileName));
- extern void	SetFrameRate _ANSI_ARGS_((void));
- 
diff --git a/graphics/netpbm/patches/patch-aq b/graphics/netpbm/patches/patch-aq
deleted file mode 100644
index 25d5794daba..00000000000
--- a/graphics/netpbm/patches/patch-aq
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aq,v 1.3 2006/10/03 22:56:51 schwarz Exp $
-
---- converter/ppm/ppmtompeg/headers/parallel.h.orig	2006-09-30 17:03:27.000000000 +0200
-+++ converter/ppm/ppmtompeg/headers/parallel.h	2006-09-30 17:03:43.000000000 +0200
-@@ -86,7 +86,7 @@
- NoteFrameDone(int frameStart, int frameEnd);
- 
- void
--SetIOConvert(boolean separate);
-+SetIOConvert(boolean const separate);
- 
- void
- SetRemoteShell(const char * const shell);
diff --git a/graphics/netpbm/patches/patch-ar b/graphics/netpbm/patches/patch-ar
deleted file mode 100644
index b785ca190ed..00000000000
--- a/graphics/netpbm/patches/patch-ar
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ar,v 1.3 2006/10/03 22:56:51 schwarz Exp $
-
---- converter/other/pnmtojpeg.c.orig	2006-09-30 18:49:42.000000000 +0200
-+++ converter/other/pnmtojpeg.c	2006-09-30 18:50:38.000000000 +0200
-@@ -334,7 +334,7 @@
- compute_rescaling_array(JSAMPLE ** const rescale_p, const pixval maxval,
-                         const struct jpeg_compress_struct cinfo);
- static void
--convert_scanlines(struct jpeg_compress_struct *cinfo_p, FILE *input_file,
-+convert_scanlines(struct jpeg_compress_struct * const cinfo_p, FILE * const input_file,
-                   const pixval maxval, const int input_fmt,
-                   JSAMPLE xlate_table[]);
- 
diff --git a/graphics/netpbm/patches/patch-as b/graphics/netpbm/patches/patch-as
deleted file mode 100644
index 427178d4458..00000000000
--- a/graphics/netpbm/patches/patch-as
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-as,v 1.3 2006/10/03 22:56:51 schwarz Exp $
-
---- converter/other/pamtosvg/fit.c.orig	2006-09-30 19:02:50.000000000 +0200
-+++ converter/other/pamtosvg/fit.c	2006-09-30 19:06:43.000000000 +0200
-@@ -61,12 +61,12 @@
-                      at_exception_type * exception);
- static void filter (curve_type, fitting_opts_type *);
- static void find_vectors
--  (unsigned, pixel_outline_type, vector_type *, vector_type *, unsigned);
-+  (unsigned const, pixel_outline_type const, vector_type * const, vector_type * const, unsigned const);
- static float find_error (curve_type, spline_type, unsigned *,
-                at_exception_type * exception);
- static vector_type find_half_tangent (curve_type, bool start, unsigned *, unsigned);
- static void find_tangent (curve_type, bool, bool, unsigned);
--static void remove_knee_points (curve_type, bool);
-+static void remove_knee_points (curve_type const, bool const);
- static void set_initial_parameter_values (curve_type);
- static float distance (float_coord, float_coord);
- 
diff --git a/graphics/netpbm/patches/patch-at b/graphics/netpbm/patches/patch-at
deleted file mode 100644
index 33de8708680..00000000000
--- a/graphics/netpbm/patches/patch-at
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-at,v 1.3 2006/10/03 22:56:51 schwarz Exp $
-
---- converter/other/pamtosvg/curve.h.orig	2006-09-30 19:10:27.000000000 +0200
-+++ converter/other/pamtosvg/curve.h	2006-09-30 19:10:52.000000000 +0200
-@@ -83,7 +83,7 @@
-              pm_pixelcoord const p);
- 
- /* Like `append_pixel', for a point in real coordinates.  */
--extern void append_point (curve_type c, float_coord p);
-+extern void append_point (curve_type const c, float_coord const p);
- 
- /* Write some or all, respectively, of the curve C in human-readable
-    form to the log file, if logging is enabled.  */
diff --git a/graphics/netpbm/patches/patch-au b/graphics/netpbm/patches/patch-au
deleted file mode 100644
index 012d22cf773..00000000000
--- a/graphics/netpbm/patches/patch-au
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-au,v 1.3 2006/10/03 22:56:51 schwarz Exp $
-
---- generator/pamstereogram.c.orig	2006-10-03 17:54:39.000000000 +0200
-+++ generator/pamstereogram.c	2006-10-03 17:56:04.000000000 +0200
-@@ -299,7 +299,9 @@
- };
- 
- 
-+#ifndef SGI_IDO_CC
- static coord2Color randomColor;
-+#endif
- 
- static tuple
- randomColor(outGenerator * const outGenP,
-@@ -336,7 +338,9 @@
- 
- 
- 
-+#ifndef SGI_IDO_CC
- static outGenStateTerm termRandomColor;
-+#endif
- 
- static void
- termRandomColor(outGenerator * const outGenP) {
-@@ -402,7 +406,9 @@
- 
- 
- 
-+#ifndef SGI_IDO_CC
- static coord2Color patternPixel;
-+#endif
- 
- static tuple
- patternPixel(outGenerator * const outGenP,
-@@ -431,7 +437,9 @@
- 
- 
- 
-+#ifndef SGI_IDO_CC
- static outGenStateTerm termPatternPixel;
-+#endif
- 
- static void
- termPatternPixel(outGenerator * const outGenP) {
diff --git a/graphics/netpbm/patches/patch-av b/graphics/netpbm/patches/patch-av
deleted file mode 100644
index b3ff68b01d9..00000000000
--- a/graphics/netpbm/patches/patch-av
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-av,v 1.4 2006/10/03 23:01:25 schwarz Exp $
-
---- other/pnmcolormap.c.orig	2006-10-03 17:57:34.000000000 +0200
-+++ other/pnmcolormap.c	2006-10-03 17:58:12.000000000 +0200
-@@ -169,7 +169,9 @@
- typedef int qsort_comparison_fn(const void *, const void *);
-     /* A collation function to be used as argument to qsort() */
- 
-+#ifndef SGI_IDO_CC
- static qsort_comparison_fn compareplane;
-+#endif
- 
- static unsigned int compareplanePlane;
-     /* This is a parameter to compareplane().  We use this global variable
-@@ -189,7 +191,9 @@
- 
- 
- 
-+#ifndef SGI_IDO_CC
- static qsort_comparison_fn sumcompare;
-+#endif
- 
- static int
- sumcompare(const void * const b1, const void * const b2) {
diff --git a/graphics/netpbm/patches/patch-az b/graphics/netpbm/patches/patch-az
deleted file mode 100644
index 0c04ff3881e..00000000000
--- a/graphics/netpbm/patches/patch-az
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-az,v 1.4 2009/07/21 12:40:54 tnn Exp $
-
---- lib/libpbm3.c.orig	2004-12-13 19:42:39.000000000 +0100
-+++ lib/libpbm3.c
-@@ -14,7 +14,7 @@
- #include "libpbm.h"
- #include "bitreverse.h"
- 
--#if defined(__GNUC__) && (__GNUC__ >=3) && (__GNUC_MINOR__ >=1) && defined (__SSE__)
-+#if defined(__GNUC__) && (__GNUC__ >=3) && (__GNUC_MINOR__ >=1) && defined (__SSE__) && !(__GNUC__ == 4 && __GNUC_MINOR__ >= 3)
- /* intel MMX-SSE enhancement for pbm_writepbmowraw() */
- /* GCC only.  Turn on with -msse */
- 
diff --git a/graphics/netpbm/patches/patch-ba b/graphics/netpbm/patches/patch-ba
deleted file mode 100644
index b4dc83df842..00000000000
--- a/graphics/netpbm/patches/patch-ba
+++ /dev/null
@@ -1,61 +0,0 @@
-$NetBSD: patch-ba,v 1.5 2009/08/27 09:18:06 dholland Exp $
-
-Upstream patch to fix build with jpeg 7.
-
---- converter/ppm/ppmtompeg/jpeg.c	2009/07/24 02:59:59	959
-+++ converter/ppm/ppmtompeg/jpeg.c	2009/07/31 02:21:47	960
-@@ -53,6 +53,17 @@
- #define HEADER_SIZE 607   /*JFIF header size used on output images*/
- 
- 
-+static int
-+minDctVScaledSize(struct jpeg_decompress_struct const cinfo) {
-+
-+#if JPEG_LIB_VERSION >= 70
-+    return cinfo.min_DCT_v_scaled_size;
-+#else
-+    return cinfo.min_DCT_scaled_size;
-+#endif
-+}
-+
-+
- 
- /*=======================================================================*
-  *                                                                       *
-@@ -417,11 +428,7 @@
-      */
-   
-     /* set parameters for decompression */
--#ifdef JPEG4
--    cinfo.want_raw_output = TRUE;
--#else
-     cinfo.raw_data_out = TRUE;
--#endif
-     cinfo.out_color_space = JCS_YCbCr;
-   
-     /* calculate image output dimensions */
-@@ -467,11 +474,7 @@
-     /* Make an 8-row-high sample array that will go away when done
-        with image
-     */
--#ifdef JPEG4
--    buffer_height = 8;  /* could be 2, 4,8 rows high */
--#else
--    buffer_height = cinfo.max_v_samp_factor * cinfo.min_DCT_scaled_size;
--#endif
-+    buffer_height = cinfo.max_v_samp_factor * minDctVScaledSize(cinfo);
-   
-     for(cp=0,compptr = cinfo.comp_info;cp<cinfo.num_components;
-         cp++,compptr++) {
-@@ -495,11 +498,7 @@
- 
-     while (cinfo.output_scanline < cinfo.output_height) {
- 
--#ifdef JPEG4
--        (void) jpeg_read_raw_scanlines(&cinfo, scanarray, buffer_height);
--#else
-         (void) jpeg_read_raw_data(&cinfo, scanarray, buffer_height);
--#endif
- 
-         /* alter subsample ratio's if neccessary */
-         if ((h_samp[0]==2) && (h_samp[1]==1) && (h_samp[2]==1) &&
diff --git a/graphics/netpbm/patches/patch-ca b/graphics/netpbm/patches/patch-ca
deleted file mode 100644
index 88feddc8d97..00000000000
--- a/graphics/netpbm/patches/patch-ca
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ca,v 1.1 2006/05/10 17:19:00 jlam Exp $
-
---- converter/other/rlatopam.c.orig	2006-01-08 00:02:13.000000000 -0500
-+++ converter/other/rlatopam.c
-@@ -13,6 +13,7 @@
-  **/
- 
- 
-+#include <sys/types.h>
- #include <netinet/in.h>  /* For ntohs, htons */
- #include <string.h>
- #include <errno.h>
diff --git a/graphics/netpbm/patches/patch-da b/graphics/netpbm/patches/patch-da
index 2566b722cc5..36b4fb3c3ef 100644
--- a/graphics/netpbm/patches/patch-da
+++ b/graphics/netpbm/patches/patch-da
@@ -1,15 +1,15 @@
-$NetBSD: patch-da,v 1.1 2006/11/03 07:45:19 rillig Exp $
+$NetBSD: patch-da,v 1.2 2010/02/19 18:25:44 drochner Exp $
 
---- converter/other/jpeg2000/pamtojpeg2k.c.orig	Tue Oct 31 09:41:12 2006
-+++ converter/other/jpeg2000/pamtojpeg2k.c	Tue Oct 31 10:53:02 2006
-@@ -9,7 +9,11 @@
- *****************************************************************************/
+--- converter/other/jpeg2000/pamtojpeg2k.c.orig	2007-12-27 22:32:59.000000000 +0000
++++ converter/other/jpeg2000/pamtojpeg2k.c
+@@ -10,7 +10,11 @@
  
  #define _BSD_SOURCE 1    /* Make sure strdup() is in string.h */
+ /* Make sure strdup() is in string.h and int_fast32_t is in inttypes.h */
 +#ifdef __osf__
 +#define _OSF_SOURCE
 +#else
- #define _XOPEN_SOURCE 500  /* Make sure strdup() is in string.h */
+ #define _XOPEN_SOURCE 600
 +#endif /* __osf__ */
  #include <string.h>
  
diff --git a/graphics/netpbm/patches/patch-db b/graphics/netpbm/patches/patch-db
index 220427dcb6b..2825f6b099b 100644
--- a/graphics/netpbm/patches/patch-db
+++ b/graphics/netpbm/patches/patch-db
@@ -1,15 +1,15 @@
-$NetBSD: patch-db,v 1.1 2006/11/03 07:45:19 rillig Exp $
+$NetBSD: patch-db,v 1.2 2010/02/19 18:25:44 drochner Exp $
 
---- converter/other/jpeg2000/jpeg2ktopam.c.orig	Tue Oct 31 09:41:56 2006
-+++ converter/other/jpeg2000/jpeg2ktopam.c	Tue Oct 31 10:52:39 2006
-@@ -9,7 +9,11 @@
- *****************************************************************************/
+--- converter/other/jpeg2000/jpeg2ktopam.c.orig	2007-12-27 22:32:59.000000000 +0000
++++ converter/other/jpeg2000/jpeg2ktopam.c
+@@ -10,7 +10,11 @@
  
  #define _BSD_SOURCE 1      /* Make sure strdup() is in string.h */
+ /* Make sure strdup() is in string.h and int_fast32_t is in inttypes.h */
 +#ifdef __osf__
 +#define _OSF_SOURCE
 +#else
- #define _XOPEN_SOURCE 500  /* Make sure strdup() is in string.h */
+ #define _XOPEN_SOURCE 600
 +#endif /* __osf__ */
  #include <string.h>
  
diff --git a/graphics/netpbm/patches/patch-dd b/graphics/netpbm/patches/patch-dd
index 1b9e8ef2048..757dd009cc0 100644
--- a/graphics/netpbm/patches/patch-dd
+++ b/graphics/netpbm/patches/patch-dd
@@ -1,11 +1,11 @@
-$NetBSD: patch-dd,v 1.1 2006/11/03 07:45:19 rillig Exp $
+$NetBSD: patch-dd,v 1.2 2010/02/19 18:25:44 drochner Exp $
 
---- converter/other/cameratopam/cameratopam.c.orig	Tue Oct 31 09:55:51 2006
-+++ converter/other/cameratopam/cameratopam.c	Tue Oct 31 10:55:17 2006
-@@ -18,7 +18,11 @@
- */
- #include <time.h>
+--- converter/other/cameratopam/cameratopam.c.orig	2006-08-19 03:12:28.000000000 +0000
++++ converter/other/cameratopam/cameratopam.c
+@@ -8,7 +8,11 @@
  
+ 
+ #define _BSD_SOURCE 1   /* Make sure string.h contains strcasecmp() */
 +#ifdef __osf__
 +#define _OSF_SOURCE
 +#else
diff --git a/graphics/netpbm/patches/patch-ea b/graphics/netpbm/patches/patch-ea
deleted file mode 100644
index 80032f0df9a..00000000000
--- a/graphics/netpbm/patches/patch-ea
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-ea,v 1.1 2009/07/18 03:04:41 smb Exp $
-
---- converter/ppm/xvminitoppm.c.orig	2009-07-17 22:51:05.000000000 -0400
-+++ converter/ppm/xvminitoppm.c	2009-07-17 22:51:42.000000000 -0400
-@@ -52,7 +52,7 @@
- 
- 
- static void
--getline(FILE * const ifP,
-+get_line(FILE * const ifP,
-         char * const buf,
-         size_t const size) {
- 
-@@ -105,7 +105,7 @@
-     int rc;
-     bool endOfComments;
-     
--    getline(ifP, buf, sizeof(buf));
-+    get_line(ifP, buf, sizeof(buf));
- 
-     if (!STRNEQ(buf, "P7 332", 6))
-         pm_error("Input is not a XV thumbnail picture.  It does not "
-@@ -113,14 +113,14 @@
- 
-     endOfComments = FALSE;
-     while (!endOfComments) {
--        getline(ifP, buf, sizeof(buf));
-+        get_line(ifP, buf, sizeof(buf));
-         if (STRNEQ(buf, "#END_OF_COMMENTS", 16))
-             endOfComments = TRUE;
-         else if (STRNEQ(buf, "#BUILTIN", 8))
-             pm_error("This program does not know how to "
-                      "convert builtin XV thumbnail pictures");
-     }
--    getline(ifP, buf, sizeof(buf));
-+    get_line(ifP, buf, sizeof(buf));
-     rc = sscanf(buf, "%u %u %u", &cols, &rows, &maxval);
-     if (rc != 3)
-         pm_error("error parsing dimension info '%s'.  "
diff --git a/graphics/netpbm/patches/patch-ec b/graphics/netpbm/patches/patch-ec
new file mode 100644
index 00000000000..310f73e5752
--- /dev/null
+++ b/graphics/netpbm/patches/patch-ec
@@ -0,0 +1,17 @@
+$NetBSD: patch-ec,v 1.1 2010/02/19 18:25:44 drochner Exp $
+
+--- lib/libsystem.c.orig	2009-12-29 20:46:34.000000000 +0000
++++ lib/libsystem.c
+@@ -223,8 +223,11 @@ signalName(unsigned int const signalClas
+         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 "???";
+ }