Update to 10.67.04, integrating last two pkgsrc patches.

Add a second tarball consisting of the html-to-man converted documenation,
and overwrite dummy man pages with those.

Changes in 10.67.04:

14.09.04 BJH  Release 10.67.04

              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: fix compile failure due to use of reserved word
              'stdout'.

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

              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.

5 files changed, 78 insertions, 76 deletions

diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index 495ce53320e..0d6156a13f1 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -1,13 +1,17 @@
-# $NetBSD: Makefile,v 1.189 2014/09/08 21:22:28 wiz Exp $
+# $NetBSD: Makefile,v 1.190 2014/09/08 21:51:25 wiz Exp $
 
-DISTNAME=	netpbm-10.67.03
+DISTNAME=	netpbm-10.67.04
 CATEGORIES=	graphics
 MASTER_SITES=	#
 # manually created from svn checkout of
 # svn checkout http://svn.code.sf.net/p/netpbm/code/advanced netpbm
 # tar --exclude netpbm/.svn/\* -cvzf /archive/distfiles/netpbm-$VERSION.tar.gz netpbm
 # where VERSION comes from reading netpbm/doc/HISTORY
-EXTRACT_SUFX=	.tgz
+# for the documentation:
+# 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}
 
 MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://netpbm.sourceforge.net/
@@ -52,7 +56,7 @@ SUBST_CLASSES+=		rgb_txt
 SUBST_STAGE.rgb_txt=	post-patch
 SUBST_MESSAGE.rgb_txt=	Configure RGB_TXT
 SUBST_FILES.rgb_txt=	pm_config.in.h
-SUBST_SED.rgb_txt+=	-e 's,@@PREFIX@@,${PREFIX},'
+SUBST_SED.rgb_txt+=	-e 's,/usr/share/netpbm/rgb.txt,${PREFIX}/share/netpbm/rgb.txt,'
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -93,6 +97,9 @@ post-install:
 	${CHOWN} -R ${BINOWN}:${BINGRP} . &&			\
 	pax -rwpppm . ${DESTDIR}${PREFIX}
 	${RM} -fr ${STAGEDIR}
+	${INSTALL_DATA} ${WRKDIR}/netpbm-userguide/*.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_DATA} ${WRKDIR}/netpbm-userguide/*.3 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man3
+	${INSTALL_DATA} ${WRKDIR}/netpbm-userguide/*.5 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5
 
 .include "../../graphics/jasper/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
diff --git a/graphics/netpbm/PLIST b/graphics/netpbm/PLIST
index 19f697d40cd..11bff37045a 100644
--- a/graphics/netpbm/PLIST
+++ b/graphics/netpbm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2014/09/08 21:22:28 wiz Exp $
+@comment $NetBSD: PLIST,v 1.10 2014/09/08 21:51:25 wiz Exp $
 bin/411toppm
 bin/anytopnm
 bin/asciitopgm
@@ -380,34 +380,44 @@ man/man1/atktopbm.1
 man/man1/avstopam.1
 man/man1/bioradtopgm.1
 man/man1/bmptopnm.1
+man/man1/bmptoppm.1
 man/man1/brushtopbm.1
 man/man1/cameratopam.1
 man/man1/cistopbm.1
 man/man1/cmuwmtopbm.1
 man/man1/ddbugtopbm.1
+man/man1/directory.1
 man/man1/escp2topbm.1
 man/man1/eyuvtoppm.1
+man/man1/faxformat.1
 man/man1/fiascotopnm.1
 man/man1/fitstopnm.1
 man/man1/fstopgm.1
 man/man1/g3topbm.1
+man/man1/gemtopbm.1
 man/man1/gemtopnm.1
 man/man1/giftopnm.1
 man/man1/gouldtoppm.1
 man/man1/hdifftopam.1
 man/man1/hipstopgm.1
 man/man1/hpcdtoppm.1
+man/man1/icontopbm.1
 man/man1/ilbmtoppm.1
 man/man1/imgtoppm.1
+man/man1/index.1
 man/man1/infotopam.1
 man/man1/jbigtopnm.1
 man/man1/jpeg2ktopam.1
+man/man1/jpegtopnm.1
 man/man1/leaftoppm.1
+man/man1/liberror.1
+man/man1/libnetpbm_dir.1
 man/man1/lispmtopgm.1
 man/man1/macptopbm.1
 man/man1/manweb.1
 man/man1/mdatopbm.1
 man/man1/mgrtopbm.1
+man/man1/mrf.1
 man/man1/mrftopbm.1
 man/man1/mtvtoppm.1
 man/man1/neotoppm.1
@@ -418,6 +428,7 @@ man/man1/pambackground.1
 man/man1/pambayer.1
 man/man1/pamchannel.1
 man/man1/pamcomp.1
+man/man1/pamcrater.1
 man/man1/pamcut.1
 man/man1/pamdeinterlace.1
 man/man1/pamdepth.1
@@ -448,6 +459,7 @@ man/man1/pamrgbatopng.1
 man/man1/pamrubber.1
 man/man1/pamscale.1
 man/man1/pamseq.1
+man/man1/pamshadedrelief.1
 man/man1/pamsharpmap.1
 man/man1/pamsharpness.1
 man/man1/pamsistoaglyph.1
@@ -477,12 +489,14 @@ man/man1/pamtopnm.1
 man/man1/pamtosrf.1
 man/man1/pamtosvg.1
 man/man1/pamtotga.1
+man/man1/pamtotiff.1
 man/man1/pamtouil.1
 man/man1/pamtowinicon.1
 man/man1/pamtoxvmini.1
 man/man1/pamundice.1
 man/man1/pamvalidate.1
 man/man1/pamwipeout.1
+man/man1/pamx.1
 man/man1/pbmclean.1
 man/man1/pbmlife.1
 man/man1/pbmmake.1
@@ -508,6 +522,7 @@ man/man1/pbmtog3.1
 man/man1/pbmtogem.1
 man/man1/pbmtogo.1
 man/man1/pbmtoibm23xx.1
+man/man1/pbmtoicon.1
 man/man1/pbmtolj.1
 man/man1/pbmtoln03.1
 man/man1/pbmtolps.1
@@ -532,6 +547,7 @@ man/man1/pbmtoybm.1
 man/man1/pbmtozinc.1
 man/man1/pbmupc.1
 man/man1/pc1toppm.1
+man/man1/pcdindex.1
 man/man1/pcdovtoppm.1
 man/man1/pcxtoppm.1
 man/man1/pdbimgtopam.1
@@ -540,6 +556,7 @@ man/man1/pgmabel.1
 man/man1/pgmbentley.1
 man/man1/pgmcrater.1
 man/man1/pgmdeshadow.1
+man/man1/pgmedge.1
 man/man1/pgmenhance.1
 man/man1/pgmhist.1
 man/man1/pgmkernel.1
@@ -548,7 +565,10 @@ man/man1/pgmmedian.1
 man/man1/pgmminkowski.1
 man/man1/pgmmorphconv.1
 man/man1/pgmnoise.1
+man/man1/pgmnorm.1
+man/man1/pgmoil.1
 man/man1/pgmramp.1
+man/man1/pgmslice.1
 man/man1/pgmtexture.1
 man/man1/pgmtofs.1
 man/man1/pgmtolispm.1
@@ -561,22 +581,30 @@ man/man1/picttoppm.1
 man/man1/pjtoppm.1
 man/man1/pktopbm.1
 man/man1/pngtopam.1
+man/man1/pngtopnm.1
 man/man1/pnmalias.1
+man/man1/pnmarith.1
 man/man1/pnmcat.1
 man/man1/pnmcolormap.1
 man/man1/pnmcomp.1
 man/man1/pnmconvol.1
 man/man1/pnmcrop.1
+man/man1/pnmcut.1
+man/man1/pnmdepth.1
+man/man1/pnmenlarge.1
+man/man1/pnmfile.1
 man/man1/pnmflip.1
 man/man1/pnmgamma.1
 man/man1/pnmhisteq.1
 man/man1/pnmhistmap.1
 man/man1/pnmindex.1
+man/man1/pnminterp.1
 man/man1/pnminvert.1
 man/man1/pnmmargin.1
 man/man1/pnmmercator.1
 man/man1/pnmmontage.1
 man/man1/pnmnlfilt.1
+man/man1/pnmnoraw.1
 man/man1/pnmnorm.1
 man/man1/pnmpad.1
 man/man1/pnmpaste.1
@@ -585,23 +613,30 @@ man/man1/pnmquant.1
 man/man1/pnmquantall.1
 man/man1/pnmremap.1
 man/man1/pnmrotate.1
+man/man1/pnmscale.1
 man/man1/pnmscalefixed.1
 man/man1/pnmshear.1
 man/man1/pnmsmooth.1
+man/man1/pnmsplit.1
 man/man1/pnmstitch.1
 man/man1/pnmtile.1
 man/man1/pnmtoddif.1
 man/man1/pnmtofiasco.1
+man/man1/pnmtofits.1
 man/man1/pnmtojbig.1
+man/man1/pnmtojpeg.1
 man/man1/pnmtopalm.1
 man/man1/pnmtopclxl.1
 man/man1/pnmtoplainpnm.1
 man/man1/pnmtopng.1
+man/man1/pnmtopnm.1
 man/man1/pnmtops.1
 man/man1/pnmtorast.1
 man/man1/pnmtorle.1
 man/man1/pnmtosgi.1
 man/man1/pnmtosir.1
+man/man1/pnmtotiff.1
+man/man1/pnmtotiffcmyk.1
 man/man1/pnmtoxwd.1
 man/man1/ppm3d.1
 man/man1/ppmbrighten.1
@@ -624,15 +659,18 @@ man/man1/ppmhist.1
 man/man1/ppmlabel.1
 man/man1/ppmmake.1
 man/man1/ppmmix.1
+man/man1/ppmnorm.1
 man/man1/ppmntsc.1
 man/man1/ppmpat.1
 man/man1/ppmquant.1
+man/man1/ppmquantall.1
 man/man1/ppmrainbow.1
 man/man1/ppmrelief.1
 man/man1/ppmrough.1
 man/man1/ppmshadow.1
 man/man1/ppmshift.1
 man/man1/ppmspread.1
+man/man1/ppmsvgalib.1
 man/man1/ppmtoacad.1
 man/man1/ppmtoapplevol.1
 man/man1/ppmtoarbtxt.1
@@ -642,6 +680,7 @@ man/man1/ppmtoeyuv.1
 man/man1/ppmtogif.1
 man/man1/ppmtoicr.1
 man/man1/ppmtoilbm.1
+man/man1/ppmtojpeg.1
 man/man1/ppmtoleaf.1
 man/man1/ppmtolj.1
 man/man1/ppmtomap.1
@@ -660,6 +699,8 @@ man/man1/ppmtorgb3.1
 man/man1/ppmtosixel.1
 man/man1/ppmtospu.1
 man/man1/ppmtoterm.1
+man/man1/ppmtotga.1
+man/man1/ppmtouil.1
 man/man1/ppmtowinicon.1
 man/man1/ppmtoxpm.1
 man/man1/ppmtoyuv.1
@@ -687,7 +728,10 @@ man/man1/sunicontopnm.1
 man/man1/svgtopam.1
 man/man1/tgatoppm.1
 man/man1/thinkjettopbm.1
+man/man1/tifftopnm.1
+man/man1/vidtoppm.1
 man/man1/wbmptopbm.1
+man/man1/winicon.1
 man/man1/winicontopam.1
 man/man1/winicontoppm.1
 man/man1/xbmtopbm.1
@@ -699,9 +743,24 @@ man/man1/ybmtopbm.1
 man/man1/yuvsplittoppm.1
 man/man1/yuvtoppm.1
 man/man1/zeisstopnm.1
+man/man3/libmaketmpfile.3
+man/man3/libmaketmpfilefd.3
 man/man3/libnetpbm.3
+man/man3/libnetpbm_draw.3
+man/man3/libnetpbm_image.3
+man/man3/libnetpbm_ug.3
+man/man3/libpbm.3
+man/man3/libpgm.3
+man/man3/libpm.3
+man/man3/libpnm.3
+man/man3/libppm.3
+man/man3/libsystem.3
+man/man3/libtmpfile.3
+man/man3/libtmpfilefd.3
+man/man5/extendedopacity.5
 man/man5/pam.5
 man/man5/pbm.5
+man/man5/pfm.5
 man/man5/pgm.5
 man/man5/pnm.5
 man/man5/ppm.5
diff --git a/graphics/netpbm/distinfo b/graphics/netpbm/distinfo
index 6de12589e7c..bf4c7be4069 100644
--- a/graphics/netpbm/distinfo
+++ b/graphics/netpbm/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.91 2014/09/08 21:22:28 wiz Exp $
+$NetBSD: distinfo,v 1.92 2014/09/08 21:51:25 wiz Exp $
 
-SHA1 (netpbm-10.67.03.tgz) = b22dfa9f18e336e9e3999058c3458c49cc0e1ef4
-RMD160 (netpbm-10.67.03.tgz) = bca7cd6ed349ec455c16ab8c3884e464cfcf709d
-Size (netpbm-10.67.03.tgz) = 2698057 bytes
-SHA1 (patch-buildtools_installosf) = 03f6bf84e9f8294c0b33d2f8789d74d6fd58b768
-SHA1 (patch-converter_other_pstopnm.c) = fde8c6da48a419867e5aed4cb1210d4ec1157b26
+SHA1 (netpbm-10.67.04.tar.gz) = dae87919b39dec434fd1df721d3ad41ad8dd7459
+RMD160 (netpbm-10.67.04.tar.gz) = 05e5bafae424df0baa50b8dda968c508efc30b27
+Size (netpbm-10.67.04.tar.gz) = 2698831 bytes
+SHA1 (netpbm-docs-r2273.tar.gz) = 2931c87bbb2b3db9ac729f317b46972afeba7fb0
+RMD160 (netpbm-docs-r2273.tar.gz) = 31a0937cc3c650a0cea7b86771faabc86dbdeafb
+Size (netpbm-docs-r2273.tar.gz) = 447100 bytes
diff --git a/graphics/netpbm/patches/patch-buildtools_installosf b/graphics/netpbm/patches/patch-buildtools_installosf
deleted file mode 100644
index 024a895593d..00000000000
--- a/graphics/netpbm/patches/patch-buildtools_installosf
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-buildtools_installosf,v 1.1 2014/09/08 21:22:29 wiz Exp $
-
-Fix unportable test(1) operator.
-
---- buildtools/installosf.orig	2014-09-01 21:22:24.000000000 +0000
-+++ buildtools/installosf
-@@ -17,7 +17,7 @@ while [ $# -gt 0 ]; do
-     elif [ "$1" = "-m" ]; then 
-         shift
-         PERMISSIONS=$1
--    elif [ ${SOURCE_FILE}x == x ]; then
-+    elif [ ${SOURCE_FILE}x = x ]; then
-         SOURCE_FILE=$1
-     else
-         TARGET_DIR=$1
diff --git a/graphics/netpbm/patches/patch-converter_other_pstopnm.c b/graphics/netpbm/patches/patch-converter_other_pstopnm.c
deleted file mode 100644
index 27cabe33491..00000000000
--- a/graphics/netpbm/patches/patch-converter_other_pstopnm.c
+++ /dev/null
@@ -1,50 +0,0 @@
-$NetBSD: patch-converter_other_pstopnm.c,v 1.1 2014/09/08 21:22:29 wiz Exp $
-
-stdout is a special word.
-Fix some whitespace issues while here.
-
---- converter/other/pstopnm.c.orig	2014-09-01 21:22:30.000000000 +0000
-+++ converter/other/pstopnm.c
-@@ -79,7 +79,7 @@ struct CmdlineInfo {
-     unsigned int ysize;  /* zero means unspecified */
-     unsigned int dpi;    /* zero means unspecified */
-     enum Orientation orientation;
--    unsigned int stdout;
-+    unsigned int istdout;
-     unsigned int textalphabits;
- };
- 
-@@ -114,9 +114,9 @@ parseCommandLine(int argc, char ** argv,
-     OPTENT3(0, "urx",        OPT_FLOAT, &urx, &urxSpec,                  0);
-     OPTENT3(0, "ury",        OPT_FLOAT, &ury, &urySpec,                  0);
-     OPTENT3(0, "nocrop",     OPT_FLAG,  NULL, &cmdlineP->nocrop,         0);
--    OPTENT3(0, "pbm",        OPT_FLAG,  NULL, &pbmOpt ,                  0);
-+    OPTENT3(0, "pbm",        OPT_FLAG,  NULL, &pbmOpt,                   0);
-     OPTENT3(0, "pgm",        OPT_FLAG,  NULL, &pgmOpt,                   0);
--    OPTENT3(0, "ppm",        OPT_FLAG,  NULL, &ppmOpt,                  0);
-+    OPTENT3(0, "ppm",        OPT_FLAG,  NULL, &ppmOpt,                   0);
-     OPTENT3(0, "verbose",    OPT_FLAG,  NULL, &cmdlineP->verbose,        0);
-     OPTENT3(0, "xborder",    OPT_FLOAT, &cmdlineP->xborder, NULL,        0);
-     OPTENT3(0, "xmax",       OPT_UINT,  &cmdlineP->xmax, &xmaxSpec,      0);
-@@ -125,9 +125,9 @@ parseCommandLine(int argc, char ** argv,
-     OPTENT3(0, "ymax",       OPT_UINT,  &cmdlineP->ymax, &ymaxSpec,      0);
-     OPTENT3(0, "ysize",      OPT_UINT,  &cmdlineP->ysize, &ysizeSpec,    0);
-     OPTENT3(0, "dpi",        OPT_UINT,  &cmdlineP->dpi, &dpiSpec,        0);
--    OPTENT3(0, "portrait",   OPT_FLAG,  NULL, &portraitOpt,             0);
--    OPTENT3(0, "landscape",  OPT_FLAG,  NULL, &landscapeOpt,            0);
--    OPTENT3(0, "stdout",     OPT_FLAG,  NULL, &cmdlineP->stdout,         0);
-+    OPTENT3(0, "portrait",   OPT_FLAG,  NULL, &portraitOpt,              0);
-+    OPTENT3(0, "landscape",  OPT_FLAG,  NULL, &landscapeOpt,             0);
-+    OPTENT3(0, "stdout",     OPT_FLAG,  NULL, &cmdlineP->istdout,        0);
-     OPTENT3(0, "textalphabits", OPT_UINT,
-             &cmdlineP->textalphabits,  &textalphabitsSpec, 0);
- 
-@@ -664,7 +664,7 @@ computeOutfileArg(struct CmdlineInfo con
- -----------------------------------------------------------------------------*/
-     const char * retval;  /* malloc'ed */
- 
--    if (cmdline.stdout)
-+    if (cmdline.istdout)
-         retval = strdup("-");
-     else if (streq(cmdline.inputFileName, "-"))
-         retval = strdup("-");