svn commit: r451378 - in head: astro/xplanet graphics/netpbm graphics/netpbm/files graphics/ppminfo graphics/ppminfo/files graphics/tumble graphics/urt multimedia/subtitleripper palm/imgvtopgm palm...

Tobias Kortkamp tobik at FreeBSD.org
Fri Oct 6 11:18:38 UTC 2017 

Author: tobik
Date: Fri Oct  6 11:18:35 2017
New Revision: 451378
URL: https://svnweb.freebsd.org/changeset/ports/451378

Log:
  graphics/netpbm: Update to 10.80.00
  
  - This moves netpbm to the advanced release series, which brings the
    port closer to what is available on OpenBSD, Fedora, Arch Linux,
    openSUSE, etc. and will let us get rid of patches for supporting
    newer libpng versions.
  - The advanced release series is only available via an SVN checkout.
    Add two maintenance targets netpbm-version-check and netpbm-fetch
    to make fetching them easier.  To generate release tarballs the sources
    are then tagged and committed to https://github.com/t6/netpbm
  - Add STATIC option for linking all programs statically to allow running them
    in small chroots
  - Add option to disable adding a Perl run dependency.  Only a fraction
    of all programs need it.  Some are compatibility shims for newer
    programs which should be used instead.  The following programs require
    Perl: pamfixtrunc pbmtox10bm pgmcrater pnmflip pnmquant pnmquantall ppmfade
    ppmquant ppmrainbow ppmshadow
  - Disable building svgtopam by default.  It's the only program that
    requires libxml2 and is obsolete according to the author.
  - Install manpages by default
  - Allow running of the test suite via `make test`
  - Headers have been moved to ${LOCALBASE}/include/netpbm.  Fix ports
    that expect them to be in ${LOCALBASE}/include
  
  Changes:	https://raw.githubusercontent.com/t6/netpbm/v10.80.00/doc/HISTORY
  PR:		219982
  Reviewed by:	mat
  Exp-run by:	antoine
  Differential Revision:	https://reviews.freebsd.org/D11157

Added:
  head/graphics/netpbm/files/config.mk   (contents, props changed)
  head/graphics/netpbm/files/patch-lib_libpm.c   (contents, props changed)
  head/graphics/ppminfo/files/
  head/graphics/ppminfo/files/patch-pi.c   (contents, props changed)
Deleted:
  head/graphics/netpbm/files/Makefile.config.FreeBSD
  head/graphics/netpbm/files/patch-GNUmakefile
  head/graphics/netpbm/files/patch-Makefile.common
  head/graphics/netpbm/files/patch-jpeg.c
  head/graphics/netpbm/files/patch-lib-Makefile
  head/graphics/netpbm/files/patch-lib-libpbm3.c
  head/graphics/netpbm/files/patch-lib-libpm.c
  head/graphics/netpbm/files/patch-lib-libsystem.c
  head/graphics/netpbm/files/patch-lib-util-pm_c_util.h
  head/graphics/netpbm/files/patch-pamrgbatopng.c
  head/graphics/netpbm/files/patch-pm_config.in.h
  head/graphics/netpbm/files/patch-pngtopnm.c
  head/graphics/netpbm/files/patch-pngtxt.c
  head/graphics/netpbm/files/patch-pngtxt.h
  head/graphics/netpbm/files/patch-pnmtopng.c
  head/graphics/netpbm/files/patch-ppmquantall
  head/graphics/netpbm/files/patch-ppmquantall.csh
  head/graphics/netpbm/files/patch-ppmtompeg-Makefile
Modified:
  head/astro/xplanet/Makefile
  head/graphics/netpbm/Makefile
  head/graphics/netpbm/distinfo
  head/graphics/netpbm/pkg-descr
  head/graphics/netpbm/pkg-plist
  head/graphics/ppminfo/Makefile
  head/graphics/tumble/Makefile
  head/graphics/urt/Makefile
  head/multimedia/subtitleripper/Makefile
  head/palm/imgvtopgm/Makefile
  head/palm/ppmtoTbmp/Makefile

Modified: head/astro/xplanet/Makefile
==============================================================================
--- head/astro/xplanet/Makefile	Fri Oct  6 11:16:42 2017	(r451377)
+++ head/astro/xplanet/Makefile	Fri Oct  6 11:18:35 2017	(r451378)
@@ -3,7 +3,7 @@
 
 PORTNAME=	xplanet
 PORTVERSION=	1.3.0
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	astro geography
 MASTER_SITES=	SF
 
@@ -11,11 +11,11 @@ MAINTAINER=	novel at FreeBSD.org
 COMMENT=	Draw pictures of the earth textured by an image
 
 GNU_CONFIGURE=	yes
-USES=		iconv
+USES=		iconv localbase
 USE_XORG=	xt xscrnsaver
 CONFIGURE_ARGS=	--with-map-extension=jpg
-CPPFLAGS+=	-I${LOCALBASE}/include
-LIBS+=		-L${LOCALBASE}/lib -lm
+CPPFLAGS+=	-I${LOCALBASE}/include/netpbm
+LIBS+=		-lm
 
 OPTIONS_DEFINE=	FREETYPE PANGO GIF JPEG PNG PNM TIFF
 OPTIONS_DEFAULT=	FREETYPE PANGO GIF JPEG PNG PNM TIFF

Modified: head/graphics/netpbm/Makefile
==============================================================================
--- head/graphics/netpbm/Makefile	Fri Oct  6 11:16:42 2017	(r451377)
+++ head/graphics/netpbm/Makefile	Fri Oct  6 11:18:35 2017	(r451378)
@@ -2,71 +2,147 @@
 # $FreeBSD$
 
 PORTNAME=	netpbm
-PORTVERSION=	10.35.98
+DISTVERSIONPREFIX=	v
+DISTVERSION=	10.80.00
 CATEGORIES=	graphics
-MASTER_SITES=	SF/netpbm/super_stable/${PORTVERSION} \
-		LOCAL/dinoex/:man
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	tobik at FreeBSD.org
 COMMENT=	Toolkit for conversion of images between different formats
 
-LIB_DEPENDS=	libtiff.so:graphics/tiff \
-		libpng.so:graphics/png \
-		libjbig.so:graphics/jbigkit \
-		libjasper.so:graphics/jasper \
-		libxml2.so:textproc/libxml2
+LICENSE=	IJG GPLv2 LGPL21 MIT PD
+LICENSE_COMB=	multi
+LICENSE_NAME_IJG=	Independent JPEG Group License
+LICENSE_FILE_IJG=	${WRKSRC}/doc/copyright_summary
+LICENSE_PERMS_IJG=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-USES=		gmake jpeg perl5 shebangfix tar:tgz
-SHEBANG_FILES=	editor/pnmflip editor/pnmquant editor/ppmfade \
-		editor/ppmquant editor/ppmshadow generator/ppmrainbow
-MAKEFILE=	GNUmakefile
-MAKE_ENV=	LN="${LN}" RANLIB="${RANLIB}"
-INSTALL_TARGET=	install.bin install.lib install.data install-dev
+TEST_DEPENDS=	bash:shells/bash
+
+# The port follows the advanced release series.  Upstream does not
+# create tarballs for them, so we have to roll our own.  See
+# http://netpbm.sourceforge.net/getting_netpbm.php.  To checkout the
+# sources yourself see the netpbm-version-check and netpbm-fetch
+# targets below.  The sources are then pushed to t6/netpbm and tagged
+# on GitHub.
+USES=		ghostscript:test gmake perl5 shebangfix
+USE_GITHUB=	yes
+GH_ACCOUNT=	t6
 USE_LDCONFIG=	yes
-MAKE_JOBS_UNSAFE=	yes
+USE_PERL5=	build test
 
-CFLAGS+=	-DPNG_DEPSTRUCT= -Iutil
+SHEBANG_FILES=	buildtools/makeman editor/pnmflip editor/pnmquant \
+		editor/ppmfade editor/ppmquant editor/ppmshadow \
+		generator/ppmrainbow converter/pbm/pbmtox10bm \
+		test/Execute-Tests test/*.test test/Available-Testprog
 
-OPTIONS_DEFINE=	X11 MANPAGES DOCS
-OPTIONS_SUB=	yes
+MAKEFILE=	GNUmakefile
+INSTALL_TARGET=	install.bin install.lib install.data install.hdr \
+		install.staticlib
+MAKE_ARGS=	pkgdir=${STAGEDIR}${PREFIX} \
+		BINMODE=${BINMODE} \
+		SHAREMODE=${SHAREMODE} \
+		DATAMODE=${_SHAREMODE} \
+		DIRMODE=755 \
+		MANMODE=${MANMODE} \
+		DATADIR=${DATADIR}
+TEST_ARGS=	pkgdir="${STAGEDIR}${PREFIX}" \
+		resultdir="${WRKDIR}/tests" \
+		RGBDEF="${STAGEDIR}${PREFIX}/share/netpbm/rgb.txt"
+TEST_TARGET=	check
 
-X11_USE=	xorg=x11
-X11_MAKE_ENV=	WITH_X11=yes
+# tiff-flate-lzw-roundtrip's checksums are different on FreeBSD so the
+# test fails.  The resulting and intermediary images look fine in
+# spite of this.
+DISABLED_TESTS=	all-in-place tiff-flate-lzw-roundtrip ppmgauss \
+		palm-roundtrip pamtopdbimg
 
-MANPAGES_DISTFILES=	netpbm-manpages-2013-03-09${EXTRACT_SUFX}:man
+OPTIONS_DEFAULT=	MANPAGES PERL
+OPTIONS_DEFINE=	MANPAGES PERL STATIC SVGTOPAM X11
+OPTIONS_SUB=	yes
 
-post-extract-X11-off:
-	@-${RM} ${WRKDIR}/doc/pamx.1 # only relevant for MANPAGES=on
+MANPAGES_GH_TUPLE=	t6:netpbm-userguide:r2996:userguide
+MANPAGES_USES=		python:build,2.7
+PERL_USE=		PERL5=run
+STATIC_BUILD_DEPENDS=	tiff>0:graphics/tiff \
+			png>0:graphics/png \
+			jbigkit>0:graphics/jbigkit \
+			jasper>0:graphics/jasper
+STATIC_LIB_DEPENDS_OFF=	libtiff.so:graphics/tiff \
+			libpng.so:graphics/png \
+			libjbig.so:graphics/jbigkit \
+			libjasper.so:graphics/jasper
+STATIC_USES=		jpeg:build
+STATIC_USES_OFF=	jpeg
+SVGTOPAM_DESC=		Build svgtopam
+SVGTOPAM_USE=		GNOME=libxml2
+SVGTOPAM_VARS_OFF=	DISABLED_TESTS+=svgtopam
+X11_USE=		XORG=x11,xcb,xau,xdmcp
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|doc/USERDOC|${DOCSDIR}/USERDOC|g' \
-		${WRKSRC}/doc/netpbm.1
-	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
-		-e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
-		${WRKSRC}/pm_config.in.h
-	@${REINPLACE_CMD} -e 's|^SCRIPTS =.*|SCRIPTS =|' ${WRKSRC}/GNUmakefile
-	@${REINPLACE_CMD} -e 's|<shhopt.h>|<pm_shhopt.h>|g' ${WRKSRC}/lib/pm.h
-	@${REINPLACE_CMD} -e 's| jpeg2000||g' \
-		${WRKSRC}/converter/other/Makefile
+	@${REINPLACE_CMD} -e 's|misc|share/netpbm|g' ${WRKSRC}/common.mk
+	@${REINPLACE_CMD} -e 's|$$(PKGDIR)/link|$$(PKGDIR)/lib|g' \
+		-e 's|pkg-config|false|g' \
+		${WRKSRC}/GNUmakefile ${WRKSRC}/lib/Makefile
+.for test in ${DISABLED_TESTS}
+	@${REINPLACE_CMD} -e '/${test}/d' ${WRKSRC}/test/Test-Order
+.endfor
 
+post-patch-STATIC-on:
+	@${REINPLACE_CMD} 's|$$(LD)|$$(LD) -static|g' ${WRKSRC}/common.mk
+
+# Disable building svgtopam by default.  It is the only program that
+# requires libxml2 and it is not useful in this day and age according
+# to the author.  See the top of converter/other/svgtopam.c for more
+# details.
+post-patch-SVGTOPAM-off:
+	@${REINPLACE_CMD} '/svgtopam/d' ${WRKSRC}/converter/other/Makefile
+
+post-patch-X11-off:
+	@${REINPLACE_CMD} '/pamx/d' ${WRKSRC}/other/Makefile
+
 do-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
-	cd ${WRKSRC} && buildtools/stamp-date > ${WRKSRC}/lib/compile.h
+	@${CAT} ${WRKSRC}/config.mk.in ${FILESDIR}/config.mk > ${WRKSRC}/config.mk
 
+post-build-MANPAGES-on:
+	@cd ${WRKSRC_userguide} && ${WRKSRC}/buildtools/makeman *.html
+	@cd ${WRKSRC_userguide} && ${MV} index.1 netpbm.1
+# Remove broken manpages
+	@cd ${WRKSRC_userguide} && ${RM} directory.1 liberror.1 \
+		libnetpbm_dir.1 libsystem.3 libtmpfile.3 libtmpfilefd.3 \
+		ppmsvgalib.1 vidtoppm.1 extendedopacity.5
+
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/lib/util/pm_c_util.h ${STAGEDIR}${PREFIX}/include/
-	${INSTALL_MAN} ${WRKSRC}/doc/netpbm.1 ${STAGEDIR}${PREFIX}/man/man1/
+	@cd ${STAGEDIR}${PREFIX}/lib && ${LN} -sf libnetpbm.so.11 libnetpbm.so
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libnetpbm.so
+	@${RM} ${STAGEDIR}${PREFIX}/bin/manweb
+	${INSTALL_DATA} ${WRKSRC}/lib/util/pm_c_util.h ${WRKSRC}/pm_config.h \
+		${STAGEDIR}${PREFIX}/include/netpbm
 
 post-install-MANPAGES-on:
-	${INSTALL_MAN} ${WRKDIR}/doc/*.1 ${STAGEDIR}${PREFIX}/man/man1/
-	${INSTALL_MAN} ${WRKDIR}/doc/*.3 ${STAGEDIR}${PREFIX}/man/man3/
-	${INSTALL_MAN} ${WRKDIR}/doc/*.5 ${STAGEDIR}${PREFIX}/man/man5/
+	${INSTALL_MAN} ${WRKSRC_userguide}/*.1 ${STAGEDIR}${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC_userguide}/*.3 ${STAGEDIR}${PREFIX}/man/man3
+	${INSTALL_MAN} ${WRKSRC_userguide}/*.5 ${STAGEDIR}${PREFIX}/man/man5
 
-post-install-DOCS-on:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/USERDOC ${STAGEDIR}${DOCSDIR}/
+.if defined(DEVELOPER)
+# A lot of this is stolen from the netpbm OpenBSD port
+NETPBM_REPO=	https://svn.code.sf.net/p/netpbm/code
+NETPBM_SERIES=	advanced
+
+netpbm-version-check:
+	@REV=`svnlite info ${NETPBM_REPO}/${NETPBM_SERIES}/version.mk | sed -n 's/Last Changed Rev: //p'`; \
+	VERSION=`(svnlite cat -r$$REV ${NETPBM_REPO}/${NETPBM_SERIES}/version.mk; \
+			echo 'all:'; \
+			echo '	@printf "%02d.%02d.%02d" \'; \
+			echo '		$${NETPBM_MAJOR_RELEASE} \' ; \
+			echo '		$${NETPBM_MINOR_RELEASE} \' ; \
+			echo '		$${NETPBM_POINT_RELEASE} \' ; \
+		) | make -f -`; \
+	case `pkg version -t ${PORTVERSION} $$VERSION` in \
+		'>') echo "Port version is greater than latest release $$VERSION"; exit 1 ;; \
+		'<') echo "Run 'make NETPBM_REV=$$REV netpbm-fetch' to download netpbm $$VERSION" ;; \
+	esac
+
+netpbm-fetch:
+	@svnlite export --force -r${NETPBM_REV} ${NETPBM_REPO}/${NETPBM_SERIES} netpbm-r${NETPBM_REV}
+.endif
 
 .include <bsd.port.mk>

Modified: head/graphics/netpbm/distinfo
==============================================================================
--- head/graphics/netpbm/distinfo	Fri Oct  6 11:16:42 2017	(r451377)
+++ head/graphics/netpbm/distinfo	Fri Oct  6 11:18:35 2017	(r451378)
@@ -1,4 +1,5 @@
-SHA256 (netpbm-10.35.98.tgz) = 0b396f3e6495892a1da6785bcf2e1cde693ffdbef1fb1f44d60486880212825a
-SIZE (netpbm-10.35.98.tgz) = 2560129
-SHA256 (netpbm-manpages-2013-03-09.tgz) = 430a9c5becbc55e2fed832fa40d9fb050ac6ad426cbf39dc73af5d6be37f8cd6
-SIZE (netpbm-manpages-2013-03-09.tgz) = 1464320
+TIMESTAMP = 1506804540
+SHA256 (t6-netpbm-v10.80.00_GH0.tar.gz) = a066b36aab18fcb1601aa192872b0282bf74dba65ab7cfdfd13cb0a2a4bb8148
+SIZE (t6-netpbm-v10.80.00_GH0.tar.gz) = 2774451
+SHA256 (t6-netpbm-userguide-r2996_GH0.tar.gz) = a8d5ec3e74cea12f55a797ac0fe5a0f79d9adf578fa2762a7b569e2f1aaa105b
+SIZE (t6-netpbm-userguide-r2996_GH0.tar.gz) = 715558

Added: head/graphics/netpbm/files/config.mk
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/netpbm/files/config.mk	Fri Oct  6 11:18:35 2017	(r451378)
@@ -0,0 +1,33 @@
+# $FreeBSD$
+CFLAGS_SHLIB += -fPIC
+DEFAULT_TARGET = nonmerge
+INSTALL_PERM_BIN =  $(BINMODE)
+INSTALL_PERM_DATA = $(DATAMODE)
+INSTALL_PERM_HDR =  $(DATAMODE)
+INSTALL_PERM_LIBD = $(DIRMODE)
+INSTALL_PERM_LIBS = $(SHAREMODE)
+INSTALL_PERM_MAN =  $(MANMODE)
+JASPERHDR_DIR = $(LOCALBASE)/include
+JASPERLIB = -L$(LOCALBASE)/lib -ljasper -ljpeg
+JBIGHDR_DIR = $(LOCALBASE)/include
+JBIGLIB = -L$(LOCALBASE)/lib -ljbig
+JPEGHDR_DIR = $(LOCALBASE)/include
+JPEGLIB = -L$(LOCALBASE)/lib -ljpeg
+LINKERISCOMPILER = Y
+NETPBMLIBSUFFIX = so
+NETPBMLIBTYPE = unixshared
+NETPBM_DOCURL = http://netpbm.sourceforge.net/doc/
+PNGHDR_DIR = $(LOCALBASE)/include
+PNGLIB = -L$(LOCALBASE)/lib -lpng
+RGB_DB_PATH = $(DATADIR)/rgb.txt:$(LOCALBASE)/lib/X11/rgb.txt
+STATICLIB_TOO = Y
+TIFFHDR_DIR = $(LOCALBASE)/include
+TIFFLIB = -L$(LOCALBASE)/lib -ltiff -llzma -ljbig
+X11HDR_DIR = $(LOCALBASE)/include
+X11LIB = -L$(LOCALBASE)/lib -lX11 -lxcb -lXau -lXdmcp
+ZLIB = -lz
+# Don't use pkg-config.  It leads to all sorts of "fun" results when
+# trying to link netpbm's programs statically.  This is only an issue
+# when building the port outside of Poudriere/Synth.
+PKG_CONFIG = false
+PNGVER = PKGCONFIG_NO_THANKS

Added: head/graphics/netpbm/files/patch-lib_libpm.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/netpbm/files/patch-lib_libpm.c	Fri Oct  6 11:18:35 2017	(r451378)
@@ -0,0 +1,19 @@
+--- lib/libpm.c.orig	2017-06-10 22:23:50 UTC
++++ lib/libpm.c
+@@ -18,6 +17,7 @@
+ #include <unistd.h>
+ #include <stdio.h>
+ #include <stdarg.h>
++#include <stdlib.h>
+ #include <string.h>
+ #include <errno.h>
+ #include <setjmp.h>
+@@ -824,7 +824,7 @@ pm_arg0toprogname(const char arg0[]) {
+ unsigned int
+ pm_randseed(void) {
+ 
+-    return time(NULL) ^ getpid();
++    return arc4random();
+ 
+ }
+ 

Modified: head/graphics/netpbm/pkg-descr
==============================================================================
--- head/graphics/netpbm/pkg-descr	Fri Oct  6 11:16:42 2017	(r451377)
+++ head/graphics/netpbm/pkg-descr	Fri Oct  6 11:18:35 2017	(r451378)
@@ -1,10 +1,10 @@
-Netpbm is a toolkit for conversion of images between a variety of
-different formats, as well as to allow a few basic image operations.
-Netpbm is based on the widely spread Pbmplus package (release: 10 Dec
-91).  On top of that, a lot of improvements and additions have been
-made. After the latest release of Pbmplus, a lot of additional filters
-have been circulating on the net. The aim of Netpbm was, to collect
-these and to turn them into a package. This work has been performed by
-a group of programmers all over the world.
+Netpbm is a toolkit for manipulation of graphic images, including
+conversion of images between a variety of different formats.  There
+are over 300 separate tools in the package including converters for
+about 100 graphics formats.
+
+Examples of supported image manipulations: Shrinking an image by 10%;
+Cutting the top half off of an image; Making a mirror image; Creating
+a sequence of images that fade from one image to another.
 
 WWW: http://netpbm.sourceforge.net/

Modified: head/graphics/netpbm/pkg-plist
==============================================================================
--- head/graphics/netpbm/pkg-plist	Fri Oct  6 11:16:42 2017	(r451377)
+++ head/graphics/netpbm/pkg-plist	Fri Oct  6 11:18:35 2017	(r451378)
@@ -2,11 +2,13 @@ bin/411toppm
 bin/anytopnm
 bin/asciitopgm
 bin/atktopbm
+bin/avstopam
 bin/bioradtopgm
 bin/bmptopnm
 bin/bmptoppm
 bin/brushtopbm
 bin/cameratopam
+bin/cistopbm
 bin/cmuwmtopbm
 bin/ddbugtopbm
 bin/escp2topbm
@@ -27,6 +29,7 @@ bin/ilbmtoppm
 bin/imgtoppm
 bin/infotopam
 bin/jbigtopnm
+bin/jpeg2ktopam
 bin/jpegtopnm
 bin/leaftoppm
 bin/lispmtopgm
@@ -39,9 +42,11 @@ bin/neotoppm
 bin/palmtopnm
 bin/pamaddnoise
 bin/pamarith
+bin/pambackground
 bin/pambayer
 bin/pamchannel
 bin/pamcomp
+bin/pamcrater
 bin/pamcut
 bin/pamdeinterlace
 bin/pamdepth
@@ -50,7 +55,10 @@ bin/pamditherbw
 bin/pamedge
 bin/pamendian
 bin/pamenlarge
+bin/pamexec
 bin/pamfile
+bin/pamfix
+%%PERL%%bin/pamfixtrunc
 bin/pamflip
 bin/pamfunc
 bin/pamgauss
@@ -58,15 +66,21 @@ bin/pamgradient
 bin/pamlookup
 bin/pammasksharpen
 bin/pammixinterlace
+bin/pammosaicknit
 bin/pamoil
+bin/pampaintspill
 bin/pamperspective
 bin/pampick
 bin/pampop9
+bin/pamrecolor
 bin/pamrgbatopng
+bin/pamrubber
 bin/pamscale
 bin/pamseq
+bin/pamshadedrelief
 bin/pamsharpmap
 bin/pamsharpness
+bin/pamsistoaglyph
 bin/pamslice
 bin/pamsplit
 bin/pamstack
@@ -75,24 +89,40 @@ bin/pamstretch
 bin/pamstretch-gen
 bin/pamsumm
 bin/pamsummcol
+bin/pamtable
 bin/pamthreshold
 bin/pamtilt
+bin/pamtoavs
 bin/pamtodjvurle
 bin/pamtofits
+bin/pamtogif
 bin/pamtohdiff
 bin/pamtohtmltbl
+bin/pamtojpeg2k
+bin/pamtompfont
+bin/pamtooctaveimg
+bin/pamtopam
+bin/pamtopdbimg
 bin/pamtopfm
+bin/pamtopng
 bin/pamtopnm
+bin/pamtosrf
 bin/pamtosvg
 bin/pamtotga
 bin/pamtotiff
 bin/pamtouil
+bin/pamtowinicon
 bin/pamtoxvmini
+bin/pamundice
+bin/pamunlookup
+bin/pamvalidate
+bin/pamwipeout
 %%X11%%bin/pamx
 bin/pbmclean
 bin/pbmlife
 bin/pbmmake
 bin/pbmmask
+bin/pbmminkowski
 bin/pbmpage
 bin/pbmpscale
 bin/pbmreduce
@@ -103,6 +133,7 @@ bin/pbmto4425
 bin/pbmtoascii
 bin/pbmtoatk
 bin/pbmtobbnbg
+bin/pbmtocis
 bin/pbmtocmuwm
 bin/pbmtodjvurle
 bin/pbmtoepsi
@@ -111,6 +142,7 @@ bin/pbmtoescp2
 bin/pbmtog3
 bin/pbmtogem
 bin/pbmtogo
+bin/pbmtoibm23xx
 bin/pbmtoicon
 bin/pbmtolj
 bin/pbmtoln03
@@ -128,8 +160,9 @@ bin/pbmtoplot
 bin/pbmtoppa
 bin/pbmtopsg3
 bin/pbmtoptx
+bin/pbmtosunicon
 bin/pbmtowbmp
-bin/pbmtox10bm
+%%PERL%%bin/pbmtox10bm
 bin/pbmtoxbm
 bin/pbmtoybm
 bin/pbmtozinc
@@ -137,10 +170,11 @@ bin/pbmupc
 bin/pc1toppm
 bin/pcdovtoppm
 bin/pcxtoppm
+bin/pdbimgtopam
 bin/pfmtopam
 bin/pgmabel
 bin/pgmbentley
-bin/pgmcrater
+%%PERL%%bin/pgmcrater
 bin/pgmdeshadow
 bin/pgmedge
 bin/pgmenhance
@@ -161,11 +195,14 @@ bin/pgmtolispm
 bin/pgmtopbm
 bin/pgmtopgm
 bin/pgmtoppm
+bin/pgmtosbig
+bin/pgmtost4
 bin/pi1toppm
 bin/pi3topbm
 bin/picttoppm
 bin/pjtoppm
 bin/pktopbm
+bin/pngtopam
 bin/pngtopnm
 bin/pnmalias
 bin/pnmarith
@@ -178,7 +215,7 @@ bin/pnmcut
 bin/pnmdepth
 bin/pnmenlarge
 bin/pnmfile
-bin/pnmflip
+%%PERL%%bin/pnmflip
 bin/pnmgamma
 bin/pnmhisteq
 bin/pnmhistmap
@@ -186,6 +223,7 @@ bin/pnmindex
 bin/pnminterp
 bin/pnminvert
 bin/pnmmargin
+bin/pnmmercator
 bin/pnmmontage
 bin/pnmnlfilt
 bin/pnmnoraw
@@ -193,7 +231,8 @@ bin/pnmnorm
 bin/pnmpad
 bin/pnmpaste
 bin/pnmpsnr
-bin/pnmquant
+%%PERL%%bin/pnmquant
+%%PERL%%bin/pnmquantall
 bin/pnmremap
 bin/pnmrotate
 bin/pnmscale
@@ -234,7 +273,7 @@ bin/ppmdist
 bin/ppmdither
 bin/ppmdmkfont
 bin/ppmdraw
-bin/ppmfade
+%%PERL%%bin/ppmfade
 bin/ppmflash
 bin/ppmforge
 bin/ppmglobe
@@ -245,20 +284,21 @@ bin/ppmmix
 bin/ppmnorm
 bin/ppmntsc
 bin/ppmpat
-bin/ppmquant
+%%PERL%%bin/ppmquant
 bin/ppmquantall
-bin/ppmrainbow
+%%PERL%%bin/ppmrainbow
 bin/ppmrelief
 bin/ppmrough
-bin/ppmshadow
+%%PERL%%bin/ppmshadow
 bin/ppmshift
 bin/ppmspread
 bin/ppmtoacad
+bin/ppmtoapplevol
 bin/ppmtoarbtxt
+bin/ppmtoascii
 bin/ppmtobmp
 bin/ppmtoeyuv
 bin/ppmtogif
-bin/pbmtoibm23xx
 bin/ppmtoicr
 bin/ppmtoilbm
 bin/ppmtojpeg
@@ -278,8 +318,9 @@ bin/ppmtoppm
 bin/ppmtopuzz
 bin/ppmtorgb3
 bin/ppmtosixel
-bin/ppmtotga
+bin/ppmtospu
 bin/ppmtoterm
+bin/ppmtotga
 bin/ppmtouil
 bin/ppmtowinicon
 bin/ppmtoxpm
@@ -303,11 +344,15 @@ bin/sldtoppm
 bin/spctoppm
 bin/spottopgm
 bin/sputoppm
-bin/svgtopam
+bin/srftopam
+bin/st4topgm
+bin/sunicontopnm
+%%SVGTOPAM%%bin/svgtopam
 bin/tgatoppm
 bin/thinkjettopbm
 bin/tifftopnm
 bin/wbmptopbm
+bin/winicontopam
 bin/winicontoppm
 bin/xbmtopbm
 bin/ximtoppm
@@ -317,41 +362,49 @@ bin/xwdtopnm
 bin/ybmtopbm
 bin/yuvsplittoppm
 bin/yuvtoppm
+bin/yuy2topam
 bin/zeisstopnm
-include/bitio.h
-include/colorname.h
-include/mallocvar.h
-include/nstring.h
-include/shhopt.h
-include/pam.h
-include/pammap.h
-include/pbm.h
-include/pbmfont.h
-include/pgm.h
-include/pm.h
-include/pm_c_util.h
-include/pm_config.h
-include/pm_gamma.h
-include/pm_system.h
-include/pnm.h
-include/ppm.h
-include/ppmcmap.h
-include/ppmfloyd.h
+include/netpbm/colorname.h
+include/netpbm/mallocvar.h
+include/netpbm/pam.h
+include/netpbm/pamdraw.h
+include/netpbm/pammap.h
+include/netpbm/pbm.h
+include/netpbm/pbmfont.h
+include/netpbm/pgm.h
+include/netpbm/pm.h
+include/netpbm/pm_c_util.h
+include/netpbm/pm_config.h
+include/netpbm/pm_gamma.h
+include/netpbm/pm_system.h
+include/netpbm/pnm.h
+include/netpbm/ppm.h
+include/netpbm/ppmcmap.h
+include/netpbm/ppmdfont.h
+include/netpbm/ppmdraw.h
+include/netpbm/ppmfloyd.h
+include/netpbm/runlength.h
+include/netpbm/shhopt.h
 lib/libnetpbm.a
 lib/libnetpbm.so
-lib/libnetpbm.so.1
+lib/libnetpbm.so.11
+lib/libnetpbm.so.11.80
 %%MANPAGES%%man/man1/411toppm.1.gz
 %%MANPAGES%%man/man1/anytopnm.1.gz
 %%MANPAGES%%man/man1/asciitopgm.1.gz
 %%MANPAGES%%man/man1/atktopbm.1.gz
+%%MANPAGES%%man/man1/avstopam.1.gz
 %%MANPAGES%%man/man1/bioradtopgm.1.gz
 %%MANPAGES%%man/man1/bmptopnm.1.gz
 %%MANPAGES%%man/man1/bmptoppm.1.gz
 %%MANPAGES%%man/man1/brushtopbm.1.gz
+%%MANPAGES%%man/man1/cameratopam.1.gz
+%%MANPAGES%%man/man1/cistopbm.1.gz
 %%MANPAGES%%man/man1/cmuwmtopbm.1.gz
 %%MANPAGES%%man/man1/ddbugtopbm.1.gz
 %%MANPAGES%%man/man1/escp2topbm.1.gz
 %%MANPAGES%%man/man1/eyuvtoppm.1.gz
+%%MANPAGES%%man/man1/faxformat.1.gz
 %%MANPAGES%%man/man1/fiascotopnm.1.gz
 %%MANPAGES%%man/man1/fitstopnm.1.gz
 %%MANPAGES%%man/man1/fstopgm.1.gz
@@ -373,55 +426,98 @@ lib/libnetpbm.so.1
 %%MANPAGES%%man/man1/leaftoppm.1.gz
 %%MANPAGES%%man/man1/lispmtopgm.1.gz
 %%MANPAGES%%man/man1/macptopbm.1.gz
+%%MANPAGES%%man/man1/manweb.1.gz
 %%MANPAGES%%man/man1/mdatopbm.1.gz
 %%MANPAGES%%man/man1/mgrtopbm.1.gz
 %%MANPAGES%%man/man1/mrf.1.gz
 %%MANPAGES%%man/man1/mrftopbm.1.gz
 %%MANPAGES%%man/man1/mtvtoppm.1.gz
 %%MANPAGES%%man/man1/neotoppm.1.gz
-man/man1/netpbm.1.gz
+%%MANPAGES%%man/man1/netpbm.1.gz
 %%MANPAGES%%man/man1/palmtopnm.1.gz
+%%MANPAGES%%man/man1/pamaddnoise.1.gz
 %%MANPAGES%%man/man1/pamarith.1.gz
+%%MANPAGES%%man/man1/pambackground.1.gz
+%%MANPAGES%%man/man1/pambayer.1.gz
 %%MANPAGES%%man/man1/pamchannel.1.gz
 %%MANPAGES%%man/man1/pamcomp.1.gz
+%%MANPAGES%%man/man1/pamcrater.1.gz
 %%MANPAGES%%man/man1/pamcut.1.gz
 %%MANPAGES%%man/man1/pamdeinterlace.1.gz
+%%MANPAGES%%man/man1/pamdepth.1.gz
 %%MANPAGES%%man/man1/pamdice.1.gz
 %%MANPAGES%%man/man1/pamditherbw.1.gz
 %%MANPAGES%%man/man1/pamedge.1.gz
 %%MANPAGES%%man/man1/pamendian.1.gz
+%%MANPAGES%%man/man1/pamenlarge.1.gz
+%%MANPAGES%%man/man1/pamexec.1.gz
 %%MANPAGES%%man/man1/pamfile.1.gz
+%%MANPAGES%%man/man1/pamfix.1.gz
+%%PERL%%%%MANPAGES%%man/man1/pamfixtrunc.1.gz
 %%MANPAGES%%man/man1/pamflip.1.gz
 %%MANPAGES%%man/man1/pamfunc.1.gz
 %%MANPAGES%%man/man1/pamgauss.1.gz
+%%MANPAGES%%man/man1/pamgradient.1.gz
 %%MANPAGES%%man/man1/pamlookup.1.gz
+%%MANPAGES%%man/man1/pammasksharpen.1.gz
+%%MANPAGES%%man/man1/pammixinterlace.1.gz
+%%MANPAGES%%man/man1/pammosaicknit.1.gz
 %%MANPAGES%%man/man1/pamoil.1.gz
+%%MANPAGES%%man/man1/pampaintspill.1.gz
 %%MANPAGES%%man/man1/pamperspective.1.gz
+%%MANPAGES%%man/man1/pampick.1.gz
 %%MANPAGES%%man/man1/pampop9.1.gz
+%%MANPAGES%%man/man1/pamrecolor.1.gz
+%%MANPAGES%%man/man1/pamrgbatopng.1.gz
+%%MANPAGES%%man/man1/pamrubber.1.gz
 %%MANPAGES%%man/man1/pamscale.1.gz
 %%MANPAGES%%man/man1/pamseq.1.gz
+%%MANPAGES%%man/man1/pamshadedrelief.1.gz
 %%MANPAGES%%man/man1/pamsharpmap.1.gz
 %%MANPAGES%%man/man1/pamsharpness.1.gz
+%%MANPAGES%%man/man1/pamsistoaglyph.1.gz
 %%MANPAGES%%man/man1/pamslice.1.gz
+%%MANPAGES%%man/man1/pamsplit.1.gz
 %%MANPAGES%%man/man1/pamstack.1.gz
 %%MANPAGES%%man/man1/pamstereogram.1.gz
 %%MANPAGES%%man/man1/pamstretch-gen.1.gz
 %%MANPAGES%%man/man1/pamstretch.1.gz
-%%MANPAGES%%man/man1/pamsummcol.1.gz
 %%MANPAGES%%man/man1/pamsumm.1.gz
+%%MANPAGES%%man/man1/pamsummcol.1.gz
+%%MANPAGES%%man/man1/pamtable.1.gz
+%%MANPAGES%%man/man1/pamthreshold.1.gz
+%%MANPAGES%%man/man1/pamtilt.1.gz
+%%MANPAGES%%man/man1/pamtoavs.1.gz
 %%MANPAGES%%man/man1/pamtodjvurle.1.gz
+%%MANPAGES%%man/man1/pamtofits.1.gz
+%%MANPAGES%%man/man1/pamtogif.1.gz
 %%MANPAGES%%man/man1/pamtohdiff.1.gz
 %%MANPAGES%%man/man1/pamtohtmltbl.1.gz
 %%MANPAGES%%man/man1/pamtojpeg2k.1.gz
+%%MANPAGES%%man/man1/pamtompfont.1.gz
+%%MANPAGES%%man/man1/pamtooctaveimg.1.gz
+%%MANPAGES%%man/man1/pamtopam.1.gz
+%%MANPAGES%%man/man1/pamtopdbimg.1.gz
 %%MANPAGES%%man/man1/pamtopfm.1.gz
+%%MANPAGES%%man/man1/pamtopng.1.gz
 %%MANPAGES%%man/man1/pamtopnm.1.gz
+%%MANPAGES%%man/man1/pamtosrf.1.gz
+%%MANPAGES%%man/man1/pamtosvg.1.gz
 %%MANPAGES%%man/man1/pamtotga.1.gz
+%%MANPAGES%%man/man1/pamtotiff.1.gz
 %%MANPAGES%%man/man1/pamtouil.1.gz
-%%MANPAGES%%%%X11%%man/man1/pamx.1.gz
+%%MANPAGES%%man/man1/pamtowinicon.1.gz
+%%MANPAGES%%man/man1/pamtoxvmini.1.gz
+%%MANPAGES%%man/man1/pamundice.1.gz
+%%MANPAGES%%man/man1/pamunlookup.1.gz
+%%MANPAGES%%man/man1/pamvalidate.1.gz
+%%MANPAGES%%man/man1/pamwipeout.1.gz
+%%X11%%%%MANPAGES%%man/man1/pamx.1.gz
 %%MANPAGES%%man/man1/pbmclean.1.gz
 %%MANPAGES%%man/man1/pbmlife.1.gz
 %%MANPAGES%%man/man1/pbmmake.1.gz
 %%MANPAGES%%man/man1/pbmmask.1.gz
+%%MANPAGES%%man/man1/pbmminkowski.1.gz
 %%MANPAGES%%man/man1/pbmpage.1.gz
 %%MANPAGES%%man/man1/pbmpscale.1.gz
 %%MANPAGES%%man/man1/pbmreduce.1.gz
@@ -432,6 +528,7 @@ man/man1/netpbm.1.gz
 %%MANPAGES%%man/man1/pbmtoascii.1.gz
 %%MANPAGES%%man/man1/pbmtoatk.1.gz
 %%MANPAGES%%man/man1/pbmtobbnbg.1.gz
+%%MANPAGES%%man/man1/pbmtocis.1.gz
 %%MANPAGES%%man/man1/pbmtocmuwm.1.gz
 %%MANPAGES%%man/man1/pbmtodjvurle.1.gz
 %%MANPAGES%%man/man1/pbmtoepsi.1.gz
@@ -440,11 +537,13 @@ man/man1/netpbm.1.gz
 %%MANPAGES%%man/man1/pbmtog3.1.gz
 %%MANPAGES%%man/man1/pbmtogem.1.gz
 %%MANPAGES%%man/man1/pbmtogo.1.gz
+%%MANPAGES%%man/man1/pbmtoibm23xx.1.gz
 %%MANPAGES%%man/man1/pbmtoicon.1.gz
 %%MANPAGES%%man/man1/pbmtolj.1.gz
 %%MANPAGES%%man/man1/pbmtoln03.1.gz
 %%MANPAGES%%man/man1/pbmtolps.1.gz
 %%MANPAGES%%man/man1/pbmtomacp.1.gz
+%%MANPAGES%%man/man1/pbmtomatrixorbital.1.gz
 %%MANPAGES%%man/man1/pbmtomda.1.gz
 %%MANPAGES%%man/man1/pbmtomgr.1.gz
 %%MANPAGES%%man/man1/pbmtomrf.1.gz
@@ -456,23 +555,29 @@ man/man1/netpbm.1.gz
 %%MANPAGES%%man/man1/pbmtoppa.1.gz
 %%MANPAGES%%man/man1/pbmtopsg3.1.gz
 %%MANPAGES%%man/man1/pbmtoptx.1.gz
+%%MANPAGES%%man/man1/pbmtosunicon.1.gz
 %%MANPAGES%%man/man1/pbmtowbmp.1.gz
-%%MANPAGES%%man/man1/pbmtox10bm.1.gz
+%%PERL%%%%MANPAGES%%man/man1/pbmtox10bm.1.gz
 %%MANPAGES%%man/man1/pbmtoxbm.1.gz
 %%MANPAGES%%man/man1/pbmtoybm.1.gz
 %%MANPAGES%%man/man1/pbmtozinc.1.gz
 %%MANPAGES%%man/man1/pbmupc.1.gz
 %%MANPAGES%%man/man1/pc1toppm.1.gz
+%%MANPAGES%%man/man1/pcdindex.1.gz
 %%MANPAGES%%man/man1/pcdovtoppm.1.gz
 %%MANPAGES%%man/man1/pcxtoppm.1.gz
+%%MANPAGES%%man/man1/pdbimgtopam.1.gz
 %%MANPAGES%%man/man1/pfmtopam.1.gz
 %%MANPAGES%%man/man1/pgmabel.1.gz
 %%MANPAGES%%man/man1/pgmbentley.1.gz
-%%MANPAGES%%man/man1/pgmcrater.1.gz
+%%PERL%%%%MANPAGES%%man/man1/pgmcrater.1.gz
+%%MANPAGES%%man/man1/pgmdeshadow.1.gz
 %%MANPAGES%%man/man1/pgmedge.1.gz
 %%MANPAGES%%man/man1/pgmenhance.1.gz
 %%MANPAGES%%man/man1/pgmhist.1.gz
 %%MANPAGES%%man/man1/pgmkernel.1.gz
+%%MANPAGES%%man/man1/pgmmake.1.gz
+%%MANPAGES%%man/man1/pgmmedian.1.gz
 %%MANPAGES%%man/man1/pgmminkowski.1.gz
 %%MANPAGES%%man/man1/pgmmorphconv.1.gz
 %%MANPAGES%%man/man1/pgmnoise.1.gz
@@ -486,11 +591,14 @@ man/man1/netpbm.1.gz
 %%MANPAGES%%man/man1/pgmtopbm.1.gz
 %%MANPAGES%%man/man1/pgmtopgm.1.gz
 %%MANPAGES%%man/man1/pgmtoppm.1.gz
+%%MANPAGES%%man/man1/pgmtosbig.1.gz
+%%MANPAGES%%man/man1/pgmtost4.1.gz
 %%MANPAGES%%man/man1/pi1toppm.1.gz
 %%MANPAGES%%man/man1/pi3topbm.1.gz
 %%MANPAGES%%man/man1/picttoppm.1.gz
 %%MANPAGES%%man/man1/pjtoppm.1.gz
 %%MANPAGES%%man/man1/pktopbm.1.gz
+%%MANPAGES%%man/man1/pngtopam.1.gz
 %%MANPAGES%%man/man1/pngtopnm.1.gz
 %%MANPAGES%%man/man1/pnmalias.1.gz
 %%MANPAGES%%man/man1/pnmarith.1.gz
@@ -501,7 +609,9 @@ man/man1/netpbm.1.gz
 %%MANPAGES%%man/man1/pnmcrop.1.gz
 %%MANPAGES%%man/man1/pnmcut.1.gz
 %%MANPAGES%%man/man1/pnmdepth.1.gz
+%%MANPAGES%%man/man1/pnmenlarge.1.gz
 %%MANPAGES%%man/man1/pnmfile.1.gz
+%%PERL%%%%MANPAGES%%man/man1/pnmflip.1.gz
 %%MANPAGES%%man/man1/pnmgamma.1.gz
 %%MANPAGES%%man/man1/pnmhisteq.1.gz
 %%MANPAGES%%man/man1/pnmhistmap.1.gz
@@ -509,6 +619,7 @@ man/man1/netpbm.1.gz
 %%MANPAGES%%man/man1/pnminterp.1.gz
 %%MANPAGES%%man/man1/pnminvert.1.gz
 %%MANPAGES%%man/man1/pnmmargin.1.gz
+%%MANPAGES%%man/man1/pnmmercator.1.gz
 %%MANPAGES%%man/man1/pnmmontage.1.gz
 %%MANPAGES%%man/man1/pnmnlfilt.1.gz
 %%MANPAGES%%man/man1/pnmnoraw.1.gz
@@ -516,11 +627,12 @@ man/man1/netpbm.1.gz
 %%MANPAGES%%man/man1/pnmpad.1.gz
 %%MANPAGES%%man/man1/pnmpaste.1.gz
 %%MANPAGES%%man/man1/pnmpsnr.1.gz
-%%MANPAGES%%man/man1/pnmquant.1.gz
+%%PERL%%%%MANPAGES%%man/man1/pnmquant.1.gz
+%%PERL%%%%MANPAGES%%man/man1/pnmquantall.1.gz
 %%MANPAGES%%man/man1/pnmremap.1.gz
 %%MANPAGES%%man/man1/pnmrotate.1.gz
-%%MANPAGES%%man/man1/pnmscalefixed.1.gz
 %%MANPAGES%%man/man1/pnmscale.1.gz
+%%MANPAGES%%man/man1/pnmscalefixed.1.gz
 %%MANPAGES%%man/man1/pnmshear.1.gz
 %%MANPAGES%%man/man1/pnmsmooth.1.gz
 %%MANPAGES%%man/man1/pnmsplit.1.gz
@@ -541,18 +653,23 @@ man/man1/netpbm.1.gz
 %%MANPAGES%%man/man1/pnmtorle.1.gz
 %%MANPAGES%%man/man1/pnmtosgi.1.gz
 %%MANPAGES%%man/man1/pnmtosir.1.gz
-%%MANPAGES%%man/man1/pnmtotiffcmyk.1.gz
 %%MANPAGES%%man/man1/pnmtotiff.1.gz
+%%MANPAGES%%man/man1/pnmtotiffcmyk.1.gz
 %%MANPAGES%%man/man1/pnmtoxwd.1.gz
 %%MANPAGES%%man/man1/ppm3d.1.gz
 %%MANPAGES%%man/man1/ppmbrighten.1.gz
 %%MANPAGES%%man/man1/ppmchange.1.gz
 %%MANPAGES%%man/man1/ppmcie.1.gz
 %%MANPAGES%%man/man1/ppmcolormask.1.gz
+%%MANPAGES%%man/man1/ppmcolors.1.gz
+%%MANPAGES%%man/man1/ppmdcfont.1.gz
+%%MANPAGES%%man/man1/ppmddumpfont.1.gz
 %%MANPAGES%%man/man1/ppmdim.1.gz
 %%MANPAGES%%man/man1/ppmdist.1.gz
 %%MANPAGES%%man/man1/ppmdither.1.gz
-%%MANPAGES%%man/man1/ppmfade.1.gz
+%%MANPAGES%%man/man1/ppmdmkfont.1.gz
+%%MANPAGES%%man/man1/ppmdraw.1.gz
+%%PERL%%%%MANPAGES%%man/man1/ppmfade.1.gz
 %%MANPAGES%%man/man1/ppmflash.1.gz
 %%MANPAGES%%man/man1/ppmforge.1.gz
 %%MANPAGES%%man/man1/ppmglobe.1.gz
@@ -563,17 +680,18 @@ man/man1/netpbm.1.gz
 %%MANPAGES%%man/man1/ppmnorm.1.gz
 %%MANPAGES%%man/man1/ppmntsc.1.gz
 %%MANPAGES%%man/man1/ppmpat.1.gz
+%%PERL%%%%MANPAGES%%man/man1/ppmquant.1.gz
 %%MANPAGES%%man/man1/ppmquantall.1.gz
-%%MANPAGES%%man/man1/ppmquant.1.gz
-%%MANPAGES%%man/man1/ppmrainbow.1.gz
+%%PERL%%%%MANPAGES%%man/man1/ppmrainbow.1.gz
 %%MANPAGES%%man/man1/ppmrelief.1.gz
 %%MANPAGES%%man/man1/ppmrough.1.gz
-%%MANPAGES%%man/man1/ppmshadow.1.gz
+%%PERL%%%%MANPAGES%%man/man1/ppmshadow.1.gz
 %%MANPAGES%%man/man1/ppmshift.1.gz
 %%MANPAGES%%man/man1/ppmspread.1.gz
-%%MANPAGES%%man/man1/ppmsvgalib.1.gz
 %%MANPAGES%%man/man1/ppmtoacad.1.gz
+%%MANPAGES%%man/man1/ppmtoapplevol.1.gz
 %%MANPAGES%%man/man1/ppmtoarbtxt.1.gz
+%%MANPAGES%%man/man1/ppmtoascii.1.gz
 %%MANPAGES%%man/man1/ppmtobmp.1.gz
 %%MANPAGES%%man/man1/ppmtoeyuv.1.gz
 %%MANPAGES%%man/man1/ppmtogif.1.gz
@@ -582,6 +700,7 @@ man/man1/netpbm.1.gz
 %%MANPAGES%%man/man1/ppmtojpeg.1.gz
 %%MANPAGES%%man/man1/ppmtoleaf.1.gz
 %%MANPAGES%%man/man1/ppmtolj.1.gz
+%%MANPAGES%%man/man1/ppmtomap.1.gz
 %%MANPAGES%%man/man1/ppmtomitsu.1.gz
 %%MANPAGES%%man/man1/ppmtompeg.1.gz
 %%MANPAGES%%man/man1/ppmtoneo.1.gz
@@ -595,6 +714,7 @@ man/man1/netpbm.1.gz
 %%MANPAGES%%man/man1/ppmtopuzz.1.gz
 %%MANPAGES%%man/man1/ppmtorgb3.1.gz
 %%MANPAGES%%man/man1/ppmtosixel.1.gz
+%%MANPAGES%%man/man1/ppmtospu.1.gz
 %%MANPAGES%%man/man1/ppmtoterm.1.gz
 %%MANPAGES%%man/man1/ppmtotga.1.gz
 %%MANPAGES%%man/man1/ppmtouil.1.gz
@@ -611,6 +731,7 @@ man/man1/netpbm.1.gz
 %%MANPAGES%%man/man1/rawtopgm.1.gz
 %%MANPAGES%%man/man1/rawtoppm.1.gz
 %%MANPAGES%%man/man1/rgb3toppm.1.gz
+%%MANPAGES%%man/man1/rlatopam.1.gz
 %%MANPAGES%%man/man1/rletopnm.1.gz
 %%MANPAGES%%man/man1/sbigtopgm.1.gz
 %%MANPAGES%%man/man1/sgitopnm.1.gz
@@ -619,11 +740,16 @@ man/man1/netpbm.1.gz
 %%MANPAGES%%man/man1/spctoppm.1.gz
 %%MANPAGES%%man/man1/spottopgm.1.gz
 %%MANPAGES%%man/man1/sputoppm.1.gz
+%%MANPAGES%%man/man1/srftopam.1.gz
+%%MANPAGES%%man/man1/st4topgm.1.gz
+%%MANPAGES%%man/man1/sunicontopnm.1.gz
+%%SVGTOPAM%%%%MANPAGES%%man/man1/svgtopam.1.gz
 %%MANPAGES%%man/man1/tgatoppm.1.gz
 %%MANPAGES%%man/man1/thinkjettopbm.1.gz
 %%MANPAGES%%man/man1/tifftopnm.1.gz
-%%MANPAGES%%man/man1/vidtoppm.1.gz
 %%MANPAGES%%man/man1/wbmptopbm.1.gz
+%%MANPAGES%%man/man1/winicon.1.gz
+%%MANPAGES%%man/man1/winicontopam.1.gz
 %%MANPAGES%%man/man1/winicontoppm.1.gz
 %%MANPAGES%%man/man1/xbmtopbm.1.gz
 %%MANPAGES%%man/man1/ximtoppm.1.gz
@@ -633,8 +759,12 @@ man/man1/netpbm.1.gz
 %%MANPAGES%%man/man1/ybmtopbm.1.gz
 %%MANPAGES%%man/man1/yuvsplittoppm.1.gz
 %%MANPAGES%%man/man1/yuvtoppm.1.gz
+%%MANPAGES%%man/man1/yuy2topam.1.gz
 %%MANPAGES%%man/man1/zeisstopnm.1.gz
+%%MANPAGES%%man/man3/libmaketmpfile.3.gz
+%%MANPAGES%%man/man3/libmaketmpfilefd.3.gz
 %%MANPAGES%%man/man3/libnetpbm.3.gz
+%%MANPAGES%%man/man3/libnetpbm_draw.3.gz
 %%MANPAGES%%man/man3/libnetpbm_image.3.gz
 %%MANPAGES%%man/man3/libnetpbm_ug.3.gz
 %%MANPAGES%%man/man3/libpbm.3.gz
@@ -642,11 +772,9 @@ man/man1/netpbm.1.gz
 %%MANPAGES%%man/man3/libpm.3.gz
 %%MANPAGES%%man/man3/libpnm.3.gz
 %%MANPAGES%%man/man3/libppm.3.gz
-%%MANPAGES%%man/man3/libsystem.3.gz
-%%MANPAGES%%man/man3/libtmpfile.3.gz
-%%MANPAGES%%man/man5/extendedopacity.5.gz
 %%MANPAGES%%man/man5/pam.5.gz
 %%MANPAGES%%man/man5/pbm.5.gz
+%%MANPAGES%%man/man5/pfm.5.gz
 %%MANPAGES%%man/man5/pgm.5.gz
 %%MANPAGES%%man/man5/pnm.5.gz
 %%MANPAGES%%man/man5/ppm.5.gz
@@ -656,4 +784,3 @@ man/man1/netpbm.1.gz
 %%DATADIR%%/palmgray4.map
 %%DATADIR%%/pcxstd.ppm
 %%DATADIR%%/rgb.txt
-%%PORTDOCS%%%%DOCSDIR%%/USERDOC

Modified: head/graphics/ppminfo/Makefile
==============================================================================
--- head/graphics/ppminfo/Makefile	Fri Oct  6 11:16:42 2017	(r451377)
+++ head/graphics/ppminfo/Makefile	Fri Oct  6 11:18:35 2017	(r451378)
@@ -3,7 +3,7 @@
 
 PORTNAME=	ppminfo
 PORTVERSION=	0.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.vanheusden.com/ppminfo/ CENKES
 
@@ -12,10 +12,9 @@ COMMENT=	Shows details of a ppm file
 
 LIB_DEPENDS=	libnetpbm.so:graphics/netpbm
 
-USES=		ncurses tar:tgz
+USES=		localbase:ldflags ncurses tar:tgz
 PLIST_FILES=	bin/${PORTNAME}
-CFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+CFLAGS+=	-I${LOCALBASE}/include/netpbm
 
 post-patch:
 	@${REINPLACE_CMD} 's|min(|MIN(|;s|max(|MAX(|' ${WRKSRC}/pi.c

Added: head/graphics/ppminfo/files/patch-pi.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/ppminfo/files/patch-pi.c	Fri Oct  6 11:18:35 2017	(r451378)
@@ -0,0 +1,11 @@
+--- pi.c.orig	2007-08-06 18:51:13 UTC
++++ pi.c
+@@ -1,6 +1,7 @@
+ #include <stdio.h>
+ #include <math.h>
+ #include <unistd.h>
++#include <sys/param.h>
+ #include <ppm.h>
+ 
+ #include "error.h"

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

More information about the svn-ports-all mailing list