- update to 10.35.80

14 files changed, 238 insertions, 215 deletions

diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index 0478e2d6c21c..f1f1c08ec039 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -6,16 +6,12 @@
 #
 
 PORTNAME=	netpbm
-PORTVERSION=	${NETPBM_PORTVERSION}
-PORTREVISION=	4
+PORTVERSION=	10.35.80
+PORTREVISION=	2
 CATEGORIES=	graphics
-MASTER_SITES=	# defined later
+MASTER_SITES=	SF/netpbm/super_stable/${PORTVERSION}
 PKGNAMESUFFIX=	${NETPBM_SUFFIX}${PKGNAMESUFFIX2}
 EXTRACT_SUFX=	.tgz
-.if make(makesum) || defined(FETCH_ALL)
-DISTFILES=	${PORTNAME}-${STABLE_PORTVERSION}${EXTRACT_SUFX} \
-		${PORTNAME}-${DEVEL_PORTVERSION}${EXTRACT_SUFX}
-.endif
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	A toolkit for conversion of images between different formats
@@ -24,13 +20,15 @@ LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
 		jpeg.11:${PORTSDIR}/graphics/jpeg \
 		png.6:${PORTSDIR}/graphics/png \
 		jbig.1:${PORTSDIR}/graphics/jbigkit \
-		jasper.4:${PORTSDIR}/graphics/jasper
+		jasper.4:${PORTSDIR}/graphics/jasper \
+		xml2.5:${PORTSDIR}/textproc/libxml2
 
 MAKE_JOBS_UNSAFE=	yes
 
 USE_PERL5=	yes
 USE_GMAKE=	yes
-CFLAGS+=	-DPNG_DEPSTRUCT=
+USE_XORG=	x11
+CFLAGS+=	-DPNG_DEPSTRUCT= -Iutil
 MAKE_ENV=	LN="${LN}" RANLIB="${RANLIB}"
 MAKEFILE=	GNUmakefile
 INSTALL_TARGET=	install.bin install.lib install.data install-dev
@@ -38,27 +36,6 @@ USE_LDCONFIG=	yes
 
 MAN1=		netpbm.1
 
-STABLE_PORTVERSION=	10.26.64
-DEVEL_PORTVERSION=	10.35.80
-.if defined(WITH_NETPBM_DEVEL)
-MASTER_SITES=	SF/netpbm/super_stable/${DEVEL_PORTVERSION}
-NETPBM_PORTVERSION=	${DEVEL_PORTVERSION}
-PORTREVISION=	1
-NETPBM_SUFFIX=	-devel
-#CONFLICTS+=	netpbm-10.26.*
-LIB_DEPENDS+=	xml2.5:${PORTSDIR}/textproc/libxml2
-PATCHDIR?=	${MASTERDIR}/../netpbm-devel/files
-USE_XORG=	x11
-CFLAGS+=	-Iutil
-PLIST_SUB+=	DEVEL=""
-.else
-MASTER_SITES=	SF/netpbm/super_stable/${PORTVERSION}
-NETPBM_PORTVERSION=	${STABLE_PORTVERSION}
-CONFLICTS+=	netpbm-devel-10.35.*
-PORTSCOUT=	limit:^10\.26\.
-PLIST_SUB+=	DEVEL="@comment "
-.endif
-
 pre-configure:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
 		 -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
@@ -69,9 +46,7 @@ pre-configure:
 	@${CP} ${PATCHDIR}/Makefile.config.FreeBSD ${WRKSRC}/Makefile.config
 	@${LN} -sf ${WRKSRC}/lib/util/shhopt.h ${WRKSRC}/lib/util/pm_shhopt.h
 	@${LN} -sf ${WRKSRC}/lib/util/nstring.h ${WRKSRC}/lib/util/pm_nstring.h
-.if defined(WITH_NETPBM_DEVEL)
 	cd ${WRKSRC} && buildtools/stamp-date > ${WRKSRC}/lib/compile.h
-.endif
 
 post-install:
 	@${ECHO_MSG} "===>  Installing man pages..."
diff --git a/graphics/netpbm/files/Makefile.config.FreeBSD b/graphics/netpbm/files/Makefile.config.FreeBSD
index 7d89a0d2704f..8aecf913ab5c 100644
--- a/graphics/netpbm/files/Makefile.config.FreeBSD
+++ b/graphics/netpbm/files/Makefile.config.FreeBSD
@@ -1,33 +1,124 @@
-DEFAULT_TARGET = nomerge
+# This is a make file inclusion, to be included in all the Netpbm make
+# files.
+
+DEFAULT_TARGET = nonmerge
+
 BUILD_FIASCO = Y
-LD = ${CC}
-CC_FOR_BUILD = ${CC}
-LD_FOR_BUILD = ${CC}
-SYMLINK = ${LN} -sf
-LDFLAGS = -Wl,--rpath,$(NETPBMLIB_RUNTIME_DIR)
+
+LD = $(CC)
+
+LINKERISCOMPILER=Y
+
+LINKER_CAN_DO_EXPLICIT_LIBRARY=N
+
+INTTYPES_H = <inttypes.h>
+
+HAVE_INT64 = Y
+
+CC_FOR_BUILD = $(CC)
+LD_FOR_BUILD = $(LD)
+CFLAGS_FOR_BUILD = $(CFLAGS)
+
+INSTALL = $(SRCDIR)/buildtools/install.sh
+
+STRIPFLAG = -s
+
+SYMLINK = ln -s
+
+MANPAGE_FORMAT = nroff
+
+AR = ar
+RANLIB = ranlib
+
+LEX = flex
+
+EXE =
+
 LDSHLIB = -shared -Wl,-soname,$(SONAME)
-CFLAGS_SHLIB = -fpic -DPIC
+
+LDRELOC = NONE
+
+CFLAGS_SHLIB = 
+
+SHLIB_CLIB = -lc
+SHLIB_CLIB =
+
+NEED_RUNTIME_PATH = N
+
+RPATHOPTNAME = -rpath
+
+NETPBMLIB_RUNTIME_PATH = 
+
 TIFFLIB = ${LOCALBASE}/lib/libtiff.so
 TIFFHDR_DIR = ${LOCALBASE}/include
+
+TIFFLIB_NEEDS_JPEG = Y
+TIFFLIB_NEEDS_Z = Y
+
 JPEGLIB = ${LOCALBASE}/lib/libjpeg.so
 JPEGHDR_DIR = ${LOCALBASE}/include
+
 PNGLIB = ${LOCALBASE}/lib/libpng.so
 PNGHDR_DIR = ${LOCALBASE}/include
+PNGVER =
+
 ZLIB = /usr/lib/libz.so
 ZHDR_DIR = /usr/include
+
 JBIGLIB = ${LOCALBASE}/lib/libjbig.so
 JBIGHDR_DIR = ${LOCALBASE}/include
-URTLIB =  $(BUILDDIR)/urt/librle.a
-URTHDR_DIR = $(SRCDIR)/urt
+
+JASPERLIB =  ${LOCALBASE}/lib/libjasper.so
 JASPERHDR_DIR = ${LOCALBASE}/include
+JASPERDEPLIBS =
+
+URTLIB = $(BUILDDIR)/urt/librle.a
+URTHDR_DIR = $(SRCDIR)/urt
+
+X11LIB = ${LOCALBASE}/lib/libX11.so
+X11HDR_DIR = ${LOCALBASE}/include
+
 LINUXSVGALIB = NONE
-LINUXSVGAHDR_DIR = NONE
+LINUXSVGAHDR_DIR = 
+
+OMIT_NETWORK =
+
+NETWORKLD = 
+
+VMS = 
+
+DONT_HAVE_PROCESS_MGMT = N
+
+PKGDIR_DEFAULT = ${PREFIX}
+
+PKGMANDIR = man
+
+SUFFIXMANUALS1 = 1
+SUFFIXMANUALS3 = 3
+SUFFIXMANUALS5 = 5
+
 NETPBMLIBTYPE = unixshared
+
 NETPBMLIBSUFFIX = so
+
 STATICLIB_TOO = y
+
 STATICLIBSUFFIX = a
+
 SHLIBPREFIXLIST = lib
+
 NETPBMSHLIBPREFIX = $(firstword $(SHLIBPREFIXLIST))
-NETPBMLIB_RUNTIME_DIR = ${PREFIX}/lib
+
+DLLVER =
+
+NETPBM_DOCURL = http://netpbm.sourceforge.net/doc/
+
+DEFAULT_TARGET = nonmerge
+NETPBMLIBTYPE=unixshared
+NETPBMLIBSUFFIX=so
+STATICLIB_TOO=y
+LINKERISCOMPILER = Y
+CFLAGS_SHLIB += -fPIC -I..
+LDFLAGS+= -L${LOCALBASE}/lib
 SOVER = 1
-pkgdir = ${PREFIX}
+
diff --git a/graphics/netpbm/files/patch-GNUmakefile b/graphics/netpbm/files/patch-GNUmakefile
index cee197cb978b..6601316b1dfa 100644
--- a/graphics/netpbm/files/patch-GNUmakefile
+++ b/graphics/netpbm/files/patch-GNUmakefile
@@ -1,11 +1,11 @@
---- GNUmakefile.orig	Fri Jun 14 11:57:11 2002
-+++ GNUmakefile	Tue Jun 18 00:00:00 2002
-@@ -236,7 +236,7 @@
+--- GNUmakefile.orig	2008-09-27 03:37:09.000000000 +0200
++++ GNUmakefile	2010-05-21 10:33:07.000000000 +0200
+@@ -361,7 +361,7 @@
  install.hdr: $(PKGDIR)/include
  	$(MAKE) -C lib -f $(SRCDIR)/lib/Makefile \
  	    SRCDIR=$(SRCDIR) BUILDDIR=$(BUILDDIR) install.hdr
 -	$(INSTALL) -c -m $(INSTALL_PERM_HDR) \
 +	${BSD_INSTALL_DATA} \
- 	    $(SRCDIR)/pm_config.h $(PKGDIR)/include
+ 	    $(BUILDDIR)/pm_config.h $(PKGDIR)/include
  
  ifeq ($(STATICLIB_TOO),y)
diff --git a/graphics/netpbm/files/patch-converter-other-pstopnm b/graphics/netpbm/files/patch-converter-other-pstopnm
deleted file mode 100644
index 23626cd1a634..000000000000
--- a/graphics/netpbm/files/patch-converter-other-pstopnm
+++ /dev/null
@@ -1,19 +0,0 @@
---- converter/other/pstopnm.c.orig	Wed Jun 23 04:22:33 2004
-+++ converter/other/pstopnm.c	Fri Aug 12 07:57:41 2005
-@@ -702,13 +702,13 @@
- 
-     if (verbose) {
-         pm_message("execing '%s' with args '%s' (arg 0), "
--                   "'%s', '%s', '%s', '%s', '%s', '%s', '%s'",
-+                   "'%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s",
-                    ghostscriptProg, arg0,
--                   deviceopt, outfileopt, gopt, ropt, "-q", "-dNOPAUSE", "-");
-+                   deviceopt, outfileopt, gopt, ropt, "-q", "-dNOPAUSE", "-dSAFER", "-");
-     }
- 
-     execl(ghostscriptProg, arg0, deviceopt, outfileopt, gopt, ropt, "-q",
--          "-dNOPAUSE", "-", NULL);
-+          "-dNOPAUSE", "-dSAFER", "-", NULL);
-     
-     pm_error("execl() of Ghostscript ('%s') failed, errno=%d (%s)",
-              ghostscriptProg, errno, strerror(errno));
diff --git a/graphics/netpbm/files/patch-editor-pnmquant b/graphics/netpbm/files/patch-editor-pnmquant
index f61ca961c530..3a0f3f2579fd 100644
--- a/graphics/netpbm/files/patch-editor-pnmquant
+++ b/graphics/netpbm/files/patch-editor-pnmquant
@@ -1,26 +1,6 @@
---- editor/pnmquant.orig	Sun Feb 19 22:03:42 2006
-+++ editor/pnmquant	Mon Feb 20 09:41:57 2006
-@@ -15,7 +15,9 @@
- use Getopt::Long;
- use File::Temp "tempfile";
- #use Fcntl ":seek";  # not available in Perl 5.00503
--use Fcntl ":seek";
-+use Fcntl;
-+use POSIX qw(SEEK_SET SEEK_CUR SEEK_END);
-+
- 
- my ($TRUE, $FALSE) = (1,0);
- 
-@@ -57,7 +59,7 @@
-     my $infile;
-     my $ncolors = $ARGV[0];
-     
--    if (!($ncolors =~ m{ ^[[:digit:]]+$ }x ) || $ncolors == 0) {
-+    if (!($ncolors =~ m{ ^[\d]+$ }x ) || $ncolors == 0) {
-         print(STDERR 
-               "Number of colors argument '$ncolors' is not a positive " .
-               "integer.\n");
-@@ -116,7 +118,7 @@
+--- editor/pnmquant.orig	2006-08-19 05:12:28.000000000 +0200
++++ editor/pnmquant	2010-05-21 10:37:10.000000000 +0200
+@@ -149,7 +149,7 @@
              tell(INFH);  # Avoids bogus "INFH is not referenced" warning
          }
      } else {
@@ -29,12 +9,12 @@
              or die("Unable to open input file '$infile'.  Errno=$ERRNO");
      }
  }
-@@ -157,7 +159,7 @@
-         $spreadOpt = "-spreadbrightness";
+@@ -194,7 +194,7 @@
+         push(@options, '-quiet');
      }
  
 -    open(STDOUT, ">", $mapfileSpec);
 +    open(STDOUT, ">" . $mapfileSpec);
  
-     my $maprc = system("pnmcolormap", $ncolors, $averageOpt, $spreadOpt);
+     my $maprc = system("pnmcolormap", $ncolors, @options);
  
diff --git a/graphics/netpbm/files/patch-jpeg.c b/graphics/netpbm/files/patch-jpeg.c
index 9722be16d2ea..d1fc4252f4c2 100644
--- a/graphics/netpbm/files/patch-jpeg.c
+++ b/graphics/netpbm/files/patch-jpeg.c
@@ -1,11 +1,11 @@
---- converter/ppm/ppmtompeg/jpeg.c.orig	2002-10-17 16:49:49.000000000 +0200
-+++ converter/ppm/ppmtompeg/jpeg.c	2009-07-07 09:29:29.000000000 +0200
-@@ -481,7 +481,7 @@
+--- converter/ppm/ppmtompeg/jpeg.c.orig	2005-11-10 04:53:40.000000000 +0100
++++ converter/ppm/ppmtompeg/jpeg.c	2009-07-07 10:51:13.000000000 +0200
+@@ -469,7 +469,7 @@
  #ifdef JPEG4
-   buffer_height = 8;  /* could be 2, 4,8 rows high */
+     buffer_height = 8;  /* could be 2, 4,8 rows high */
  #else
--  buffer_height = cinfo.max_v_samp_factor * cinfo.min_DCT_scaled_size;
-+  buffer_height = cinfo.max_v_samp_factor * cinfo.min_DCT_v_scaled_size;
+-    buffer_height = cinfo.max_v_samp_factor * cinfo.min_DCT_scaled_size;
++    buffer_height = cinfo.max_v_samp_factor * cinfo.min_DCT_v_scaled_size;
  #endif
    
-   for(cp=0,compptr = cinfo.comp_info;cp<cinfo.num_components;
+     for(cp=0,compptr = cinfo.comp_info;cp<cinfo.num_components;
diff --git a/graphics/netpbm/files/patch-lib-Makefile b/graphics/netpbm/files/patch-lib-Makefile
index a523767f3c46..4ed3dec176b2 100644
--- a/graphics/netpbm/files/patch-lib-Makefile
+++ b/graphics/netpbm/files/patch-lib-Makefile
@@ -1,17 +1,17 @@
---- lib/Makefile.orig	2007-12-13 17:23:52.000000000 +0100
-+++ lib/Makefile	2008-01-13 16:43:41.000000000 +0100
-@@ -35,6 +35,8 @@
+--- lib/Makefile.orig	2009-09-18 21:04:37.000000000 +0200
++++ lib/Makefile	2010-05-21 10:36:08.000000000 +0200
+@@ -42,6 +42,8 @@
  # Library objects to be linked but not built by Makefile.common:
- LIBOBJECTS_X = util/shhopt.o util/nstring.o
+ LIBOBJECTS_X = util/shhopt.o util/nstring.o util/filename.o
  
 +SHLIBOBJECTS = $(patsubst %.o, %.lo, $(LIBOBJECTS))
 +
  MANUALS3 = libnetpbm
  MANUALS5 = pbm pgm ppm pnm pam
  
-@@ -76,13 +78,17 @@
+@@ -80,13 +82,17 @@
  
- $(LIBOBJECTS): %.o: %.c $(HEADERLINKS)
+ $(LIBOBJECTS): %.o: %.c importinc
  # Note that the user may have configured -I options into CFLAGS.
 +	$(CC) -c $(INCLUDES) -DNDEBUG $(CFLAGS) \
 +	  $(CFLAGS_PERSONAL) $(CADD) -o $@ $<
@@ -28,7 +28,7 @@
  
  ifeq ($(NETPBMLIBTYPE),irixshared)
  # The libxxx.so link is needed to link the executables.
-@@ -107,12 +113,9 @@
+@@ -113,11 +119,8 @@
  # The $(SONAME) link is needed only to test the programs without
  # installing the libraries (in that case, you also need to direct the 
  # dynamic linker to the source directories, e.g. set LD_LIBRARY_PATH).
@@ -37,14 +37,12 @@
 -	$(SYMLINK) $< $@
 -libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).$(MIN): $(LIBOBJECTS) $(LIBOBJECTS_X)
 -	$(LD) $(LDSHLIB) -o $@ $(LIBOBJECTS) $(LIBOBJECTS_X) \
--          $(SHLIB_CLIB) -lm $(LADD)
 +$(SONAME): $(SHLIBOBJECTS) $(LIBOBJECTS_X)
 +	$(LD) $(LDSHLIB) -o $@ $(SHLIBOBJECTS) $(LIBOBJECTS_X) \
-+	  $(SHLIB_CLIB) $(MATHLIB) $(LADD)
+           $(SHLIB_CLIB) -lm $(LADD)
  endif
  
- ifeq ($(NETPBMLIBTYPE),dll)
-@@ -189,13 +192,10 @@
+@@ -205,13 +208,10 @@
  .PHONY: install.lib
  ifeq ($(NETPBMLIBTYPE),unixshared)
  # install a Unix-style shared library
@@ -62,7 +60,7 @@
  endif
  ifeq ($(NETPBMLIBTYPE),dll)
  #install a Windows DLL shared library
-@@ -225,23 +225,23 @@
+@@ -241,23 +241,23 @@
  # directory when you compile your programs.
  
  %_installhdr: $(PKGDIR)/include
diff --git a/graphics/netpbm/files/patch-lib-libpm.c b/graphics/netpbm/files/patch-lib-libpm.c
index a39128efa590..7c805f039462 100644
--- a/graphics/netpbm/files/patch-lib-libpm.c
+++ b/graphics/netpbm/files/patch-lib-libpm.c
@@ -1,6 +1,6 @@
---- lib/libpm.c~	Sun Nov 21 03:55:27 2004
-+++ lib/libpm.c	Sat Mar 19 12:39:00 2005
-@@ -617,7 +617,7 @@
+--- lib/libpm.c.orig	2006-08-19 05:12:28.000000000 +0200
++++ lib/libpm.c	2010-05-21 10:37:10.000000000 +0200
+@@ -669,7 +669,7 @@
  pm_openr(const char * const name) {
      FILE* f;
  
@@ -9,7 +9,7 @@
          f = stdin;
      else {
  #ifndef VMS
-@@ -639,7 +639,7 @@
+@@ -691,7 +691,7 @@
  pm_openw(const char * const name) {
      FILE* f;
  
diff --git a/graphics/netpbm/files/patch-lib-libsystem.c b/graphics/netpbm/files/patch-lib-libsystem.c
new file mode 100644
index 000000000000..57bb33db76b3
--- /dev/null
+++ b/graphics/netpbm/files/patch-lib-libsystem.c
@@ -0,0 +1,16 @@
+--- lib/libsystem.c.orig	2010-03-24 03:06:41.000000000 +0100
++++ lib/libsystem.c	2010-05-25 07:31:25.000000000 +0200
+@@ -154,6 +154,13 @@
+ }
+ 
+ 
++#ifndef SIGRTMIN
++#define SIGRTMIN 65
++#endif
++#ifndef SIGRTMAX
++#define SIGRTMAX 126
++#endif
++
+ 
+ static const char *
+ signalName(unsigned int const signalClass) {
diff --git a/graphics/netpbm/files/patch-pm_config.in.h b/graphics/netpbm/files/patch-pm_config.in.h
index 21e6d984c5b4..1ccdafc6a9c2 100644
--- a/graphics/netpbm/files/patch-pm_config.in.h
+++ b/graphics/netpbm/files/patch-pm_config.in.h
@@ -1,5 +1,5 @@
---- pm_config.in.h.orig	Sat Jul 24 04:40:06 2004
-+++ pm_config.in.h	Tue Aug 17 16:53:30 2004
+--- pm_config.in.h.orig	2006-10-18 20:29:13.000000000 +0200
++++ pm_config.in.h	2010-05-21 10:37:50.000000000 +0200
 @@ -15,6 +15,10 @@
  
  **************************************************************************/
@@ -11,12 +11,12 @@
  #if defined(USG) || defined(SVR4) || defined(VMS) || defined(__SVR4)
  #define SYSV
  #endif
-@@ -99,9 +103,9 @@
+@@ -67,9 +71,9 @@
  #define RGB_DB2 "PBMplus_Dir:RGB.TXT"
  #define RGB_DB3 "PBMplus_Dir:RGB.TXT"
  #else
 -#define RGB_DB1 "/usr/lib/X11/rgb.txt"
--#define RGB_DB2 "/usr/openwin/lib/rgb.txt"
+-#define RGB_DB2 "/usr/share/X11/rgb.txt"
 -#define RGB_DB3 "/usr/X11R6/lib/X11/rgb.txt"
 +#define RGB_DB1 "%%PREFIX%%/share/netpbm/rgb.txt"
 +#define RGB_DB2 "%%LOCALBASE%%/share/netpbm/rgb.txt"
diff --git a/graphics/netpbm/files/patch-pngtopnm.c b/graphics/netpbm/files/patch-pngtopnm.c
index 22d1bc11e42c..b5387857e1b2 100644
--- a/graphics/netpbm/files/patch-pngtopnm.c
+++ b/graphics/netpbm/files/patch-pngtopnm.c
@@ -1,6 +1,6 @@
---- converter/other/pngtopnm.c.orig	2009-08-01 21:35:54.000000000 +0200
-+++ converter/other/pngtopnm.c	2010-05-21 10:04:14.000000000 +0200
-@@ -43,7 +43,7 @@
+--- converter/other/pngtopnm.c.orig	2009-09-03 17:34:36.000000000 +0200
++++ converter/other/pngtopnm.c	2010-05-21 11:24:05.000000000 +0200
+@@ -44,7 +44,7 @@
  #include "nstring.h"
  #include "shhopt.h"
  
@@ -9,54 +9,50 @@
  #error Your PNG library (<png.h>) is incompatible with this Netpbm source code.
  #error You need either an older PNG library (older than 1.4)
  #error newer Netpbm source code (at least 10.48)
-@@ -500,7 +500,7 @@
-             case PNG_COLOR_TYPE_GRAY:
-                 setXel(&xelrow[col], c, c, c,
-                        ((info_ptr->valid & PNG_INFO_tRNS) &&
--                        (c == gamma_correct(info_ptr->trans_values.gray,
-+                        (c == gamma_correct(info_ptr->trans_color.gray,
-                                             totalgamma))) ?
-                        0 : maxval);
-                 break;
-@@ -517,7 +517,7 @@
-                        info_ptr->palette[c].blue,
-                        (info_ptr->valid & PNG_INFO_tRNS) &&
-                        c < info_ptr->num_trans ?
--                       info_ptr->trans[c] : maxval);
-+                       info_ptr->trans_alpha[c] : maxval);
-                 break;
+@@ -482,7 +482,7 @@
+     bool retval;
+ 
+     if (info_ptr->valid & PNG_INFO_tRNS) {
+-        const png_color_16 * const transColorP = &info_ptr->trans_values;
++        const png_color_16 * const transColorP = &info_ptr->trans_color;
+     
  
-             case PNG_COLOR_TYPE_RGB: {
-@@ -525,11 +525,11 @@
-                 png_uint_16 const c3 = get_png_val(png_pixelP);
-                 setXel(&xelrow[col], c, c2, c3,
+         /* There seems to be a problem here: you can't compare real
+@@ -575,8 +575,8 @@
+             for (i = 0, foundGray = FALSE;
+                  i < info_ptr->num_trans && !foundGray;
+                  ++i) {
+-                if (info_ptr->trans[i] != 0 &&
+-                    info_ptr->trans[i] != maxval) {
++                if (info_ptr->trans_alpha[i] != 0 &&
++                    info_ptr->trans_alpha[i] != maxval) {
+                     foundGray = TRUE;
+                 }
+             }
+@@ -647,7 +647,7 @@
+                 unsigned int i;
+                 trans_mix = TRUE;
+                 for (i = 0; i < info_ptr->num_trans; ++i)
+-                    if (info_ptr->trans[i] != 0 && info_ptr->trans[i] != 255) {
++                    if (info_ptr->trans_alpha[i] != 0 && info_ptr->trans_alpha[i] != 255) {
+                         trans_mix = FALSE;
+                         break;
+                     }
+@@ -885,7 +885,7 @@
+                 setXel(&xelrow[col], fgColor, bgColor, alpha_handling,
                         ((info_ptr->valid & PNG_INFO_tRNS) &&
--                        (c == gamma_correct(info_ptr->trans_values.red,
-+                        (c == gamma_correct(info_ptr->trans_color.red,
-                                             totalgamma)) &&
--                        (c2 == gamma_correct(info_ptr->trans_values.green,
-+                        (c2 == gamma_correct(info_ptr->trans_color.green,
-                                              totalgamma)) &&
--                        (c3 == gamma_correct(info_ptr->trans_values.blue,
-+                        (c3 == gamma_correct(info_ptr->trans_color.blue,
-                                              totalgamma))) ?
+                         (fgColor.r == 
+-                         gamma_correct(info_ptr->trans_values.gray,
++                         gamma_correct(info_ptr->trans_color.gray,
+                                        totalgamma))) ?
                         0 : maxval);
              }
-@@ -694,7 +694,7 @@
-             (info_ptr->valid & PNG_INFO_tRNS)) {
-           trans_mix = TRUE;
-           for (i = 0 ; i < info_ptr->num_trans ; i++)
--            if (info_ptr->trans[i] != 0 && info_ptr->trans[i] != 255) {
-+            if (info_ptr->trans_alpha[i] != 0 && info_ptr->trans_alpha[i] != 255) {
-               trans_mix = FALSE;
-               break;
-             }
-@@ -847,7 +847,7 @@
-         pnm_type = PBM_TYPE;
-         if (info_ptr->valid & PNG_INFO_tRNS) {
-           for (i = 0 ; i < info_ptr->num_trans ; i++) {
--            if (info_ptr->trans[i] != 0 && info_ptr->trans[i] != maxval) {
-+            if (info_ptr->trans_alpha[i] != 0 && info_ptr->trans_alpha[i] != maxval) {
-               pnm_type = PGM_TYPE;
-               break;
+@@ -914,7 +914,7 @@
+                 setXel(&xelrow[col], fgColor, bgColor, alpha_handling,
+                        (info_ptr->valid & PNG_INFO_tRNS) &&
+                        index < info_ptr->num_trans ?
+-                       info_ptr->trans[index] : maxval);
++                       info_ptr->trans_alpha[index] : maxval);
              }
+             break;
+                 
diff --git a/graphics/netpbm/files/patch-pnmtopng.c b/graphics/netpbm/files/patch-pnmtopng.c
index 2ba6453629af..14ed8ff7c123 100644
--- a/graphics/netpbm/files/patch-pnmtopng.c
+++ b/graphics/netpbm/files/patch-pnmtopng.c
@@ -1,15 +1,15 @@
---- converter/other/pnmtopng.c.orig	2009-08-01 21:31:33.000000000 +0200
-+++ converter/other/pnmtopng.c	2010-05-21 09:59:36.000000000 +0200
-@@ -63,7 +63,7 @@
- #include "mallocvar.h"
+--- converter/other/pnmtopng.c.orig	2009-09-03 17:34:36.000000000 +0200
++++ converter/other/pnmtopng.c	2010-05-21 10:45:59.000000000 +0200
+@@ -69,7 +69,7 @@
  #include "nstring.h"
+ #include "version.h"
  
 -#if PNG_LIBPNG_VER >= 10400
 +#if 0
  #error Your PNG library (<png.h>) is incompatible with this Netpbm source code.
  #error You need either an older PNG library (older than 1.4)
  #error newer Netpbm source code (at least 10.48)
-@@ -1869,7 +1869,7 @@
+@@ -2611,7 +2611,7 @@
      info_ptr->num_palette = palette_size;
      if (trans_size > 0) {
          info_ptr->valid |= PNG_INFO_tRNS;
@@ -18,7 +18,7 @@
          info_ptr->num_trans = trans_size;   /* omit opaque values */
      }
      /* creating hIST chunk */
-@@ -1906,7 +1906,7 @@
+@@ -2648,7 +2648,7 @@
          info_ptr->color_type == PNG_COLOR_TYPE_RGB) {
          if (transparent > 0) {
              info_ptr->valid |= PNG_INFO_tRNS;
@@ -27,7 +27,7 @@
                  xelToPngColor_16(transcolor, maxval, png_maxval);
          }
      } else {
-@@ -1918,10 +1918,10 @@
+@@ -2660,10 +2660,10 @@
          if (info_ptr->valid && PNG_INFO_tRNS) 
              pm_message("Transparent color {gray, red, green, blue} = "
                         "{%d, %d, %d, %d}",
diff --git a/graphics/netpbm/files/patch-util-wordaccess.h b/graphics/netpbm/files/patch-util-wordaccess.h
deleted file mode 100644
index d6aa282f7c9d..000000000000
--- a/graphics/netpbm/files/patch-util-wordaccess.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- lib/util/wordaccess.h.orig	Thu Jul 22 17:01:52 2004
-+++ lib/util/wordaccess.h	Thu Aug 19 12:12:27 2004
-@@ -47,7 +47,11 @@
-   #if BITS_PER_WORD == 32
-     typedef uint32n wordint;
-   #else
-+   #if BITS_PER_WORD == 64
-+    typedef uint32n wordint;
-+   #else
-     #error "Don't know how to deal with this value of BITS_PER_WORD"
-+   #endif
-   #endif
- #else
-   /* We can't do any fancy word-based stuff, but we can still fake it
diff --git a/graphics/netpbm/pkg-plist b/graphics/netpbm/pkg-plist
index ff884373ab39..d15d5c9b9211 100644
--- a/graphics/netpbm/pkg-plist
+++ b/graphics/netpbm/pkg-plist
@@ -6,7 +6,7 @@ bin/bioradtopgm
 bin/bmptopnm
 bin/bmptoppm
 bin/brushtopbm
-%%DEVEL%%bin/cameratopam
+bin/cameratopam
 bin/cmuwmtopbm
 bin/ddbugtopbm
 bin/escp2topbm
@@ -38,14 +38,14 @@ bin/mrftopbm
 bin/mtvtoppm
 bin/neotoppm
 bin/palmtopnm
-%%DEVEL%%bin/pamaddnoise
+bin/pamaddnoise
 bin/pamarith
-%%DEVEL%%bin/pambayer
+bin/pambayer
 bin/pamchannel
 bin/pamcomp
 bin/pamcut
 bin/pamdeinterlace
-%%DEVEL%%bin/pamdepth
+bin/pamdepth
 bin/pamdice
 bin/pamditherbw
 bin/pamedge
@@ -55,41 +55,41 @@ bin/pamfile
 bin/pamflip
 bin/pamfunc
 bin/pamgauss
-%%DEVEL%%bin/pamgradient
+bin/pamgradient
 bin/pamlookup
 bin/pammasksharpen
-%%DEVEL%%bin/pammixinterlace
+bin/pammixinterlace
 bin/pamoil
 bin/pamperspective
-%%DEVEL%%bin/pampick
+bin/pampick
 bin/pampop9
-%%DEVEL%%bin/pamrgbatopng
+bin/pamrgbatopng
 bin/pamscale
 bin/pamseq
 bin/pamsharpmap
 bin/pamsharpness
 bin/pamslice
-%%DEVEL%%bin/pamsplit
+bin/pamsplit
 bin/pamstack
 bin/pamstereogram
 bin/pamstretch
 bin/pamstretch-gen
 bin/pamsumm
 bin/pamsummcol
-%%DEVEL%%bin/pamthreshold
-%%DEVEL%%bin/pamtilt
+bin/pamthreshold
+bin/pamtilt
 bin/pamtodjvurle
-%%DEVEL%%bin/pamtofits
+bin/pamtofits
 bin/pamtohdiff
 bin/pamtohtmltbl
 bin/pamtopfm
 bin/pamtopnm
-%%DEVEL%%bin/pamtosvg
+bin/pamtosvg
 bin/pamtotga
-%%DEVEL%%bin/pamtotiff
+bin/pamtotiff
 bin/pamtouil
-%%DEVEL%%bin/pamtoxvmini
-%%DEVEL%%bin/pamx
+bin/pamtoxvmini
+bin/pamx
 bin/pbmclean
 bin/pbmlife
 bin/pbmmake
@@ -142,13 +142,13 @@ bin/pfmtopam
 bin/pgmabel
 bin/pgmbentley
 bin/pgmcrater
-%%DEVEL%%bin/pgmdeshadow
+bin/pgmdeshadow
 bin/pgmedge
 bin/pgmenhance
 bin/pgmhist
 bin/pgmkernel
-%%DEVEL%%bin/pgmmake
-%%DEVEL%%bin/pgmmedian
+bin/pgmmake
+bin/pgmmedian
 bin/pgmminkowski
 bin/pgmmorphconv
 bin/pgmnoise
@@ -228,13 +228,13 @@ bin/ppmchange
 bin/ppmcie
 bin/ppmcolormask
 bin/ppmcolors
-%%DEVEL%%bin/ppmdcfont
-%%DEVEL%%bin/ppmddumpfont
+bin/ppmdcfont
+bin/ppmddumpfont
 bin/ppmdim
 bin/ppmdist
 bin/ppmdither
-%%DEVEL%%bin/ppmdmkfont
-%%DEVEL%%bin/ppmdraw
+bin/ppmdmkfont
+bin/ppmdraw
 bin/ppmfade
 bin/ppmflash
 bin/ppmforge
@@ -294,7 +294,7 @@ bin/rasttopnm
 bin/rawtopgm
 bin/rawtoppm
 bin/rgb3toppm
-%%DEVEL%%bin/rlatopam
+bin/rlatopam
 bin/rletopnm
 bin/sbigtopgm
 bin/sgitopnm
@@ -303,7 +303,7 @@ bin/sldtoppm
 bin/spctoppm
 bin/spottopgm
 bin/sputoppm
-%%DEVEL%%bin/svgtopam
+bin/svgtopam
 bin/tgatoppm
 bin/thinkjettopbm
 bin/tifftopnm