Update to 10.68.02. Remove XOPEN_SOURCE SUBST now that it was

fixed upstream.

14.11.23 BJH  Release 10.68.02

              pambackground: fix bug: segfault or incorrect results in most
              cases.  Thanks Ludolf Holzheid (ludolf.holzheid@gmx.de).
              Introduced in Netpbm 10.37 (December 2006).

14.09.28 BJH  Release 10.68.01

              Windows build: fix universal build failure with "No rule to make
              ...icon.netpbm.oLINKERISCOMPILER...".  Broken in Netpbm 10.67
              (June 2014).

14.09.26 BJH  Release 10.68.00

              Split pgmcrater into pamcrater and pamshadedrelief.

              pnmconvol: add -bias .

              Remove pnmcomp, install a pnmcomp symlink for pamcomp.

              Fix incorrect option parsing when there are multiple common
              options (e.g. -plain -quiet).  Always broken.  (Possibility of
              specifying multiple common options that don't cause the program
              to ignore every other option (like -version) was new in Netpbm
              10.10 (October 2002).

              cameratopam: fix buffer overflow.  Always present.  (cameratopam
              was new in Netpbm 10.28 (June 2005)).

              cameratopam: fix incorrect output introduced in Netpbm 10.51
              (June 2010).

              ppmtopict: Fix unconditional crash.  Introduced in
              Netpbm 10.52 (September 2010).

              pcdovtoppm: Fix crash due to invalid operator == on some
              systems.  Always broken (pcdovtoppm was new sometime between
              Netpbm 9.25 (March 2002) and Netpbm 10.11 (Februrary 2010)).

              Build: change _XOPEN_SOURCE from 600 back to 500 in 7 files.  It
              was changed from 500 to 600 in Subversion revision 1731 in
              Netpbm 10.60 (September 2012) because that made a similar
              version of Netpbm compile on Mac OSX.  Without it, strdup did
              not get defined.  But this is apparently a bug in Mac OSX, since
              X/Open 500 does have strdup.  Furthermore, many other Netpbm
              files use strdup and apparently compile OK on Mac OSX without
              600.  Finally, we see today that Illumos system header files
              deliberately kill the compilation if the compiler is pre-C99 and
              _XOPEN_SOURCE is 600.  So we go back to 500 and if the problem
              on Mac OSX gets reported again, we will look more deeply.

              Build: change _XOPEN_SOURCE from 600 back to 500 in
              jpeg2ktopam.c and pamtojpeg2k.c.  It was changed from 500 to 600
              in Netpbm 10.41 (December 2007), reportedly to get int_fast32_t,
              etc. defined on AIX, but other files that use int_fast32_t
              don't have it today, so that must be wrong.  See above for the
              drawback of 600.

              Build: fix undefined symbols in fiasco converters with
              static libraries.

              Build: provide means of setting the default search path for
              rgb.txt color database via config.mk.

              Build: fix bug which prevents JBIG converters from building with
              internal JBIG library.  Introduced in 10.67.00.

              Build: fix bug which makes build of Ppmsvga fail (which is
              attempted only on a system with libvga).  Introduced in Netpbm
              10.63 (June 2013)

              Build: fix build failure in an environment that does not have
              __inline .  Introduced some time between Netpbm 10.26
              (January 2005) and Netpbm 10.35 (August 2006).

              Build: fix build failure on SCO OpenServer due to SIGURG not
              existing.  Broken in Netpbm 10.49 (December 2009).

              Build: Declare _XOPEN_SOURCE >= 500 in source files that use
              strdup.

              Build: fix compile failure due to use of reserved word
              'stdout'.

              Build with 'installosf': Fix crash due to invalid operator ==
              on some systems.

3 files changed, 14 insertions, 24 deletions

diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index 8dbe39aa90f..5fc2538b1f1 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.197 2014/11/23 14:38:34 gson Exp $
+# $NetBSD: Makefile,v 1.198 2014/11/23 16:12:10 wiz Exp $
 
-DISTNAME=	netpbm-10.67.05
-PKGREVISION=	5
+DISTNAME=	netpbm-10.68.02
 CATEGORIES=	graphics
 MASTER_SITES=	#
 # manually created from svn checkout of
@@ -12,7 +11,7 @@ MASTER_SITES=	#
 # svn checkout http://svn.code.sf.net/p/netpbm/code/userguide netpbm-userguide
 # cd netpbm-userguide && for i in *.html; do python2.7 ../netpbm/buildtools/makeman $i; done && cd ..
 # tar -cvzf /archive/distfiles/netpbm-docs-r${SVN_REVISION}.tar.gz netpbm-userguide/*.[0-9]
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} netpbm-docs-r2273${EXTRACT_SUFX}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} netpbm-docs-r2313${EXTRACT_SUFX}
 
 MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://netpbm.sourceforge.net/
@@ -47,17 +46,6 @@ SUBST_SED.rgb_txt+=	-e 's,/usr/share/netpbm/rgb.txt,${PREFIX}/share/netpbm/rgb.t
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "SunOS"
-SUBST_CLASSES+=		xopen
-SUBST_STAGE.xopen=	pre-configure
-SUBST_FILES.xopen=	converter/other/jpeg2000/jpeg2ktopam.c
-SUBST_FILES.xopen+=	converter/other/jpeg2000/pamtojpeg2k.c
-SUBST_FILES.xopen+=	buildtools/libopt.c
-SUBST_FILES.xopen+=	lib/libppmcolor.c lib/libpamcolor.c lib/libpm.c
-SUBST_FILES.xopen+=	lib/pmfileio.c lib/libpam.c lib/colorname.c
-SUBST_SED.xopen=	-e '/define.*_XOPEN_SOURCE/s/600/500/g'
-.endif
-
 # only used if NEED_RUNTIME_PATH is set, so set it unconditionally
 MAKE_FLAGS+=	NETPBMLIB_RUNTIME_PATH=${PREFIX}
 
diff --git a/graphics/netpbm/PLIST b/graphics/netpbm/PLIST
index 6a208ef9319..40507ecdd55 100644
--- a/graphics/netpbm/PLIST
+++ b/graphics/netpbm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2014/10/09 18:58:18 gson Exp $
+@comment $NetBSD: PLIST,v 1.13 2014/11/23 16:12:10 wiz Exp $
 bin/411toppm
 bin/anytopnm
 bin/asciitopgm
@@ -49,6 +49,7 @@ bin/pambackground
 bin/pambayer
 bin/pamchannel
 bin/pamcomp
+bin/pamcrater
 bin/pamcut
 bin/pamdeinterlace
 bin/pamdepth
@@ -79,6 +80,7 @@ bin/pamrgbatopng
 bin/pamrubber
 bin/pamscale
 bin/pamseq
+bin/pamshadedrelief
 bin/pamsharpmap
 bin/pamsharpness
 bin/pamsistoaglyph
@@ -379,7 +381,7 @@ include/netpbm/shhopt.h
 lib/libnetpbm.a
 lib/libnetpbm.so
 lib/libnetpbm.so.11
-lib/libnetpbm.so.11.67
+lib/libnetpbm.so.11.68
 man/man1/411toppm.1
 man/man1/anytopnm.1
 man/man1/asciitopgm.1
diff --git a/graphics/netpbm/distinfo b/graphics/netpbm/distinfo
index 7161e7cc2eb..9351f37f4c8 100644
--- a/graphics/netpbm/distinfo
+++ b/graphics/netpbm/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.95 2014/11/23 14:38:34 gson Exp $
+$NetBSD: distinfo,v 1.96 2014/11/23 16:12:10 wiz Exp $
 
-SHA1 (netpbm-10.67.05.tar.gz) = c08ce57d5a7bfb0c15d2840adca5ce1ac06c18a0
-RMD160 (netpbm-10.67.05.tar.gz) = 5b6644db4698babe5a7cd214cfacde1d13b38e9b
-Size (netpbm-10.67.05.tar.gz) = 2698862 bytes
-SHA1 (netpbm-docs-r2273.tar.gz) = 2931c87bbb2b3db9ac729f317b46972afeba7fb0
-RMD160 (netpbm-docs-r2273.tar.gz) = 31a0937cc3c650a0cea7b86771faabc86dbdeafb
-Size (netpbm-docs-r2273.tar.gz) = 447100 bytes
+SHA1 (netpbm-10.68.02.tar.gz) = 90fa87549dc7fb33bd7f9f29abad09fe99faf3e1
+RMD160 (netpbm-10.68.02.tar.gz) = 7567eb6c38f06ad89b995b9315deec91db94bfb0
+Size (netpbm-10.68.02.tar.gz) = 2703809 bytes
+SHA1 (netpbm-docs-r2313.tar.gz) = 8c36b17b1d2dca6ab7bd34666a8929b9ea665743
+RMD160 (netpbm-docs-r2313.tar.gz) = 03854f545c7c0f4c825ee08bc779b62da0ea05c3
+Size (netpbm-docs-r2313.tar.gz) = 447907 bytes
 SHA1 (patch-common.mk) = f590cc66e0fe6a07e848b9b46662bca350557bea
 SHA1 (patch-lib_Makefile) = 3f93bd24c53aa1f22aa43545d7ca5422af8e78ca
 SHA1 (patch-pm__config.in.h) = 9cb3084371be4b354832581d47d552bfe9ff1ce1