[Midnightbsd-cvs] mports [15790] trunk/graphics/netpbm/pkg-plist: update netpbm
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Dec 28 09:20:02 EST 2013
Revision: 15790
http://svnweb.midnightbsd.org/mports/?rev=15790
Author: laffer1
Date: 2013-12-28 09:20:01 -0500 (Sat, 28 Dec 2013)
Log Message:
-----------
update netpbm
Modified Paths:
--------------
trunk/graphics/netpbm/Makefile
trunk/graphics/netpbm/distinfo
trunk/graphics/netpbm/files/Makefile.config.FreeBSD
trunk/graphics/netpbm/files/patch-GNUmakefile
trunk/graphics/netpbm/files/patch-Makefile.common
trunk/graphics/netpbm/files/patch-jpeg.c
trunk/graphics/netpbm/files/patch-lib-Makefile
trunk/graphics/netpbm/files/patch-lib-libpm.c
trunk/graphics/netpbm/files/patch-pm_config.in.h
trunk/graphics/netpbm/files/patch-pngtopnm.c
trunk/graphics/netpbm/files/patch-pnmtopng.c
trunk/graphics/netpbm/pkg-plist
Added Paths:
-----------
trunk/graphics/netpbm/files/patch-lib-libpbm3.c
trunk/graphics/netpbm/files/patch-lib-libsystem.c
trunk/graphics/netpbm/files/patch-lib-util-pm_c_util.h
trunk/graphics/netpbm/files/patch-pamrgbatopng.c
trunk/graphics/netpbm/files/patch-pngtxt.c
trunk/graphics/netpbm/files/patch-ppmquantall
trunk/graphics/netpbm/files/patch-ppmtompeg-Makefile
Removed Paths:
-------------
trunk/graphics/netpbm/files/patch-converter-other-pstopnm
trunk/graphics/netpbm/files/patch-editor-pnmquant
trunk/graphics/netpbm/files/patch-util-wordaccess.h
Property Changed:
----------------
trunk/graphics/netpbm/files/Makefile.config.FreeBSD
trunk/graphics/netpbm/files/patch-GNUmakefile
trunk/graphics/netpbm/files/patch-Makefile.common
trunk/graphics/netpbm/files/patch-jpeg.c
trunk/graphics/netpbm/files/patch-lib-Makefile
trunk/graphics/netpbm/files/patch-lib-libpm.c
trunk/graphics/netpbm/files/patch-pm_config.in.h
trunk/graphics/netpbm/files/patch-pngtopnm.c
trunk/graphics/netpbm/files/patch-pnmtopng.c
trunk/graphics/netpbm/pkg-descr
Modified: trunk/graphics/netpbm/Makefile
===================================================================
--- trunk/graphics/netpbm/Makefile 2013-12-28 03:46:45 UTC (rev 15789)
+++ trunk/graphics/netpbm/Makefile 2013-12-28 14:20:01 UTC (rev 15790)
@@ -1,77 +1,148 @@
# $MidnightBSD$
PORTNAME= netpbm
-PORTVERSION= ${NETPBM_PORTVERSION}
-PORTREVISION= 4
+PORTVERSION= 10.35.89
CATEGORIES= graphics
-MASTER_SITES= # defined later
-PKGNAMESUFFIX= ${NETPBM_SUFFIX}${PKGNAMESUFFIX2}
+MASTER_SITES= SF/netpbm/super_stable/${PORTVERSION} \
+ ${MASTER_SITE_FREEBSD_LOCAL:S/$/:man/}
+MASTER_SITE_SUBDIR= dinoex/:man
EXTRACT_SUFX= .tgz
-.if make(makesum) || defined(FETCH_ALL)
-DISTFILES= ${PORTNAME}-${STABLE_PORTVERSION}${EXTRACT_SUFX} \
- ${PORTNAME}-${DEVEL_PORTVERSION}${EXTRACT_SUFX}
-.endif
MAINTAINER= ports at MidnightBSD.org
-COMMENT= A toolkit for conversion of images between different formats
+COMMENT= Toolkit for conversion of images between different formats
+
LICENSE= other
-LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \
- jpeg.11:${PORTSDIR}/graphics/jpeg \
+FAKE_OPTS= trueprefix
+
+LIB_DEPENDS= tiff:${PORTSDIR}/graphics/tiff \
+ jpeg:${PORTSDIR}/graphics/jpeg \
png15:${PORTSDIR}/graphics/png \
- jbig.1:${PORTSDIR}/graphics/jbigkit
-# jasper.4:${PORTSDIR}/graphics/jasper
+ jbig:${PORTSDIR}/graphics/jbigkit \
+ jasper:${PORTSDIR}/graphics/jasper \
+ xml2:${PORTSDIR}/textproc/libxml2
+RUN_DEPENDS= bash:${PORTSDIR}/shells/bash
-MAKE_JOBS_UNSAFE= yes
-CONFLICTS= mgetty-1.*
-
-USE_PERL5= yes
-USE_GMAKE= yes
+USES= gmake perl5
+CFLAGS+= -DPNG_DEPSTRUCT= -Iutil
MAKE_ENV= LN="${LN}" RANLIB="${RANLIB}"
MAKEFILE= GNUmakefile
+MAKEFILE2= Makefile
INSTALL_TARGET= install.bin install.lib install.data install-dev
USE_LDCONFIG= yes
-MAN1= netpbm.1
+OPTIONS_DEFINE= X11 MANPAGES
+OPTIONS_SUB= yes
-STABLE_PORTVERSION= 10.26.63
-DEVEL_PORTVERSION= 10.31
-.if defined(WITH_NETPBM_DEVEL)
-MASTER_SITES= SF/netpbm/archive_of_old_release_system/${PORTVERSION}
-NETPBM_PORTVERSION= ${DEVEL_PORTVERSION}
-NETPBM_SUFFIX= -devel
-CONFLICTS+= netpbm-10.26.*
-LIB_DEPENDS+= xml2.5:${PORTSDIR}/textproc/libxml2
-PATCHDIR?= ${MASTERDIR}/../netpbm-devel/files
-CFLAGS+= -Iutil
-PLIST_SUB+= DEVEL=""
-.else
-MASTER_SITES= SF/netpbm/super_stable/${PORTVERSION}
-NETPBM_PORTVERSION= ${STABLE_PORTVERSION}
-CONFLICTS+= netpbm-devel-10.26.*
-PORTSCOUT= limit:^10\.26\.
-PLIST_SUB+= DEVEL="@comment "
+X11_USE= xorg=x11
+X11_MAKE_ENV= WITH_X11=yes
+
+.include <bsd.mport.options.mk>
+
+.include <bsd.port.pre.mk>
+
+.if ${PORT_OPTIONS:MMANPAGES} || make(makesum) || defined(FETCH_ALL)
+#DISTFILES+= netpbm-manpages-2013-03-09${EXTRACT_SUFX}:man
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX} netpbm-manpages-2013-03-09${EXTRACT_SUFX}:man
+
+# lifted from ${WRKSRC}/buildtools/Makefile.manpage
+HMAN1+= 411toppm.1 anytopnm.1 asciitopgm.1 atktopbm.1 bioradtopgm.1 \
+ bmptopnm.1 bmptoppm.1 brushtopbm.1 cmuwmtopbm.1 ddbugtopbm.1 \
+ escp2topbm.1 eyuvtoppm.1 fiascotopnm.1 fitstopnm.1 fstopgm.1 \
+ g3topbm.1 gemtopbm.1 gemtopnm.1 giftopnm.1 gouldtoppm.1 hdifftopam.1 \
+ hipstopgm.1 hpcdtoppm.1 icontopbm.1 ilbmtoppm.1 imgtoppm.1 \
+ infotopam.1 jbigtopnm.1 jpeg2ktopam.1 jpegtopnm.1 leaftoppm.1 \
+ lispmtopgm.1 macptopbm.1 mdatopbm.1 mgrtopbm.1 mrf.1 mrftopbm.1 \
+ mtvtoppm.1 neotoppm.1 palmtopnm.1 pamarith.1 pamchannel.1 pamcomp.1 \
+ pamcut.1 pamdeinterlace.1 pamdice.1 pamditherbw.1 pamedge.1 \
+ pamendian.1 pamfile.1 pamflip.1 pamfunc.1 pamgauss.1 pamlookup.1 \
+ pamoil.1 pamperspective.1 pampop9.1 pamscale.1 pamseq.1 pamsharpmap.1 \
+ pamsharpness.1 pamslice.1 pamstack.1 pamstereogram.1 pamstretch-gen.1 \
+ pamstretch.1 pamsummcol.1 pamsumm.1 pamtodjvurle.1 pamtohdiff.1 \
+ pamtohtmltbl.1 pamtojpeg2k.1 pamtopfm.1 pamtopnm.1 pamtotga.1 \
+ pamtouil.1 pbmclean.1 pbmlife.1 pbmmake.1 pbmmask.1 pbmpage.1 \
+ pbmpscale.1 pbmreduce.1 pbmtext.1 pbmtextps.1 pbmto10x.1 pbmto4425.1 \
+ pbmtoascii.1 pbmtoatk.1 pbmtobbnbg.1 pbmtocmuwm.1 pbmtodjvurle.1 \
+ pbmtoepsi.1 pbmtoepson.1 pbmtoescp2.1 pbmtog3.1 pbmtogem.1 pbmtogo.1 \
+ pbmtoicon.1 pbmtolj.1 pbmtoln03.1 pbmtolps.1 pbmtomacp.1 pbmtomda.1 \
+ pbmtomgr.1 pbmtomrf.1 pbmtonokia.1 pbmtopgm.1 pbmtopi3.1 pbmtopk.1 \
+ pbmtoplot.1 pbmtoppa.1 pbmtopsg3.1 pbmtoptx.1 pbmtowbmp.1 \
+ pbmtox10bm.1 pbmtoxbm.1 pbmtoybm.1 pbmtozinc.1 pbmupc.1 pc1toppm.1 \
+ pcdovtoppm.1 pcxtoppm.1 pfmtopam.1 pgmabel.1 pgmbentley.1 pgmcrater.1 \
+ pgmedge.1 pgmenhance.1 pgmhist.1 pgmkernel.1 pgmminkowski.1 \
+ pgmmorphconv.1 pgmnoise.1 pgmnorm.1 pgmoil.1 pgmramp.1 pgmslice.1 \
+ pgmtexture.1 pgmtofs.1 pgmtolispm.1 pgmtopbm.1 pgmtopgm.1 pgmtoppm.1 \
+ pi1toppm.1 pi3topbm.1 picttoppm.1 pjtoppm.1 pktopbm.1 pngtopnm.1 \
+ pnmalias.1 pnmarith.1 pnmcat.1 pnmcolormap.1 pnmcomp.1 pnmconvol.1 \
+ pnmcrop.1 pnmcut.1 pnmdepth.1 pnmfile.1 pnmgamma.1 pnmhisteq.1 \
+ pnmhistmap.1 pnmindex.1 pnminterp.1 pnminvert.1 pnmmargin.1 \
+ pnmmontage.1 pnmnlfilt.1 pnmnoraw.1 pnmnorm.1 pnmpad.1 pnmpaste.1 \
+ pnmpsnr.1 pnmquant.1 pnmremap.1 pnmrotate.1 pnmscalefixed.1 \
+ pnmscale.1 pnmshear.1 pnmsmooth.1 pnmsplit.1 pnmstitch.1 pnmtile.1 \
+ pnmtoddif.1 pnmtofiasco.1 pnmtofits.1 pnmtojbig.1 pnmtojpeg.1 \
+ pnmtopalm.1 pnmtopclxl.1 pnmtoplainpnm.1 pnmtopng.1 pnmtopnm.1 \
+ pnmtops.1 pnmtorast.1 pnmtorle.1 pnmtosgi.1 pnmtosir.1 \
+ pnmtotiffcmyk.1 pnmtotiff.1 pnmtoxwd.1 ppm3d.1 ppmbrighten.1 \
+ ppmchange.1 ppmcie.1 ppmcolormask.1 ppmdim.1 ppmdist.1 ppmdither.1 \
+ ppmfade.1 ppmflash.1 ppmforge.1 ppmglobe.1 ppmhist.1 ppmlabel.1 \
+ ppmmake.1 ppmmix.1 ppmnorm.1 ppmntsc.1 ppmpat.1 ppmquantall.1 \
+ ppmquant.1 ppmrainbow.1 ppmrelief.1 ppmrough.1 ppmshadow.1 \
+ ppmshift.1 ppmspread.1 ppmsvgalib.1 ppmtoacad.1 ppmtoarbtxt.1 \
+ ppmtobmp.1 ppmtoeyuv.1 ppmtogif.1 ppmtoicr.1 ppmtoilbm.1 ppmtojpeg.1 \
+ ppmtoleaf.1 ppmtolj.1 ppmtomitsu.1 ppmtompeg.1 ppmtoneo.1 ppmtopcx.1 \
+ ppmtopgm.1 ppmtopi1.1 ppmtopict.1 ppmtopj.1 ppmtopjxl.1 ppmtoppm.1 \
+ ppmtopuzz.1 ppmtorgb3.1 ppmtosixel.1 ppmtoterm.1 ppmtotga.1 \
+ ppmtouil.1 ppmtowinicon.1 ppmtoxpm.1 ppmtoyuv.1 ppmtoyuvsplit.1 \
+ ppmtv.1 ppmwheel.1 psidtopgm.1 pstopnm.1 qrttoppm.1 rasttopnm.1 \
+ rawtopgm.1 rawtoppm.1 rgb3toppm.1 rletopnm.1 sbigtopgm.1 sgitopnm.1 \
+ sirtopnm.1 sldtoppm.1 spctoppm.1 spottopgm.1 sputoppm.1 tgatoppm.1 \
+ thinkjettopbm.1 tifftopnm.1 vidtoppm.1 wbmptopbm.1 winicontoppm.1 \
+ xbmtopbm.1 ximtoppm.1 xpmtoppm.1 xvminitoppm.1 xwdtopnm.1 ybmtopbm.1 \
+ yuvsplittoppm.1 yuvtoppm.1 zeisstopnm.1
+.if ${PORT_OPTIONS:MX11}
+HMAN1+= pamx.1
.endif
+HMAN3= libnetpbm.3 libnetpbm_image.3 libnetpbm_ug.3 libpbm.3 \
+ libpgm.3 libpm.3 libpnm.3 libppm.3 libsystem.3 libtmpfile.3
+HMAN5= extendedopacity.5 pam.5 pbm.5 pgm.5 pnm.5 ppm.5
+.endif
pre-configure:
- @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
- -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
- ${WRKSRC}/pm_config.in.h
- @${REINPLACE_CMD} -e 's|<shhopt.h>|<pm_shhopt.h>|g' ${WRKSRC}/lib/pm.h
- @${REINPLACE_CMD} -e 's| jpeg2000||g' \
+ ${REINPLACE_CMD} -e 's|doc/USERDOC|${DOCSDIR}/USERDOC|g' \
+ ${WRKSRC}/doc/netpbm.1
+ ${REINPLACE_CMD} -e 's|%%PREFIX%%|${TRUE_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
- @${CP} ${FILESDIR}/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
+ ${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
+# This snippet is all it takes to make the port as of 10.35.80 MAKE_JOBS_SAFE:
+pre-build:
+ (cd ${BUILD_WRKSRC}/lib/util; if ! ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE2} ${_MAKE_JOBS} ${MAKE_ARGS} ${FAKE_MAKEARGS} ${ALL_TARGET}; then \
+ if [ x != x${BUILD_FAIL_MESSAGE} ] ; then \
+ ${ECHO_MSG} "===> Compilation failed unexpectedly."; \
+ (${ECHO_CMD} ${BUILD_FAIL_MESSAGE}) | ${FMT} 75 79 ; \
+ fi; \
+ ${FALSE}; \
+ fi)
+
post-install:
- @${ECHO_MSG} "===> Installing man pages..."
- @${REINPLACE_CMD} -e 's|doc/USERDOC|${DOCSDIR}/USERDOC|g' \
- ${WRKSRC}/doc/netpbm.1
- ${INSTALL_MAN} ${WRKSRC}/doc/netpbm.1 ${MANPREFIX}/man/man1
-.if !defined(NOPORTDOCS)
- @${MKDIR} ${DOCSDIR}
- ${INSTALL_DATA} ${WRKSRC}/doc/USERDOC ${DOCSDIR}/
+ ${INSTALL_DATA} ${WRKSRC}/lib/util/pm_c_util.h ${STAGEDIR}${PREFIX}/include/
+ ${INSTALL_MAN} ${WRKSRC}/doc/netpbm.1 ${STAGEDIR}${MANPREFIX}/man/man1/
+.if ${PORT_OPTIONS:MMANPAGES}
+ cd ${WRKDIR}/doc && ${INSTALL_MAN} ${HMAN1} ${STAGEDIR}${MANPREFIX}/man/man1/
+ cd ${WRKDIR}/doc && ${INSTALL_MAN} ${HMAN3} ${STAGEDIR}${MANPREFIX}/man/man3/
+ cd ${WRKDIR}/doc && ${INSTALL_MAN} ${HMAN5} ${STAGEDIR}${MANPREFIX}/man/man5/
.endif
+.if ${PORT_OPTIONS:MDOCS}
+ ${MKDIR} ${STAGEDIR}${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/doc/USERDOC ${STAGEDIR}${DOCSDIR}/
+.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Modified: trunk/graphics/netpbm/distinfo
===================================================================
--- trunk/graphics/netpbm/distinfo 2013-12-28 03:46:45 UTC (rev 15789)
+++ trunk/graphics/netpbm/distinfo 2013-12-28 14:20:01 UTC (rev 15790)
@@ -1,3 +1,4 @@
-SHA256 (netpbm-10.26.63.tgz) = 3d5e8665acf14ae9df721e3ec9ffe3794003e364a50841cd07d290d80f6f3e35
-RMD160 (netpbm-10.26.63.tgz) = 8f45f528551f8995eaaea2280dcdd5bed59e8b24
-SIZE (netpbm-10.26.63.tgz) = 2545739
+SHA256 (netpbm-10.35.89.tgz) = 139800273c5c4e8241577d96808467bc500bdbe6cd9d29ca03c696c60b265fd3
+SIZE (netpbm-10.35.89.tgz) = 2551127
+SHA256 (netpbm-manpages-2013-03-09.tgz) = 430a9c5becbc55e2fed832fa40d9fb050ac6ad426cbf39dc73af5d6be37f8cd6
+SIZE (netpbm-manpages-2013-03-09.tgz) = 1464320
Modified: trunk/graphics/netpbm/files/Makefile.config.FreeBSD
===================================================================
--- trunk/graphics/netpbm/files/Makefile.config.FreeBSD 2013-12-28 03:46:45 UTC (rev 15789)
+++ trunk/graphics/netpbm/files/Makefile.config.FreeBSD 2013-12-28 14:20:01 UTC (rev 15790)
@@ -1,33 +1,129 @@
-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 -sf
+
+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
+
+JASPERLIB = ${LOCALBASE}/lib/libjasper.so
+JASPERHDR_DIR = ${LOCALBASE}/include
+JASPERDEPLIBS =
+
+URTLIB = $(BUILDDIR)/urt/librle.a
URTHDR_DIR = $(SRCDIR)/urt
-JASPERHDR_DIR = ${LOCALBASE}/include
+
+ifdef WITH_X11
+X11LIB = ${LOCALBASE}/lib/libX11.so
+X11HDR_DIR = ${LOCALBASE}/include
+else
+X11LIB = NONE
+X11HDR_DIR =
+endif
+
LINUXSVGALIB = NONE
-LINUXSVGAHDR_DIR = NONE
+LINUXSVGAHDR_DIR =
+
+OMIT_NETWORK =
+
+NETWORKLD =
+
+VMS =
+
+DONT_HAVE_PROCESS_MGMT = N
+
+PKGDIR_DEFAULT = ${DESTDIR}${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}
+
Property changes on: trunk/graphics/netpbm/files/Makefile.config.FreeBSD
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/graphics/netpbm/files/patch-GNUmakefile
===================================================================
--- trunk/graphics/netpbm/files/patch-GNUmakefile 2013-12-28 03:46:45 UTC (rev 15789)
+++ trunk/graphics/netpbm/files/patch-GNUmakefile 2013-12-28 14:20:01 UTC (rev 15790)
@@ -1,11 +1,13 @@
---- 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 2012-05-25 06:01:31.000000000 +0200
+@@ -361,8 +361,8 @@
install.hdr: $(PKGDIR)/include
$(MAKE) -C lib -f $(SRCDIR)/lib/Makefile \
SRCDIR=$(SRCDIR) BUILDDIR=$(BUILDDIR) install.hdr
- $(INSTALL) -c -m $(INSTALL_PERM_HDR) \
+- $(BUILDDIR)/pm_config.h $(PKGDIR)/include
+ ${BSD_INSTALL_DATA} \
- $(SRCDIR)/pm_config.h $(PKGDIR)/include
++ $(BUILDDIR)/pm_config.h $(PKGDIR)/include/
ifeq ($(STATICLIB_TOO),y)
+ BUILD_STATIC = y
Property changes on: trunk/graphics/netpbm/files/patch-GNUmakefile
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/graphics/netpbm/files/patch-Makefile.common
===================================================================
--- trunk/graphics/netpbm/files/patch-Makefile.common 2013-12-28 03:46:45 UTC (rev 15789)
+++ trunk/graphics/netpbm/files/patch-Makefile.common 2013-12-28 14:20:01 UTC (rev 15790)
@@ -1,6 +1,15 @@
---- Makefile.common.orig Wed Oct 9 11:17:24 2002
-+++ Makefile.common Sat Oct 12 00:00:00 2002
-@@ -231,19 +231,19 @@
+--- Makefile.common.orig 2012-06-21 22:40:36.000000000 +0200
++++ Makefile.common 2012-06-23 16:48:15.000000000 +0200
+@@ -77,7 +77,7 @@
+ # because $(INCLUDES) also contains -I's for some local directories, which
+ # must go before -I importinc. It is too complex for the Super Stable series.
+ #
+-INCLUDES2 := $(INCLUDES) -I$(SRCDIR)/$(SUBDIR) -I. -I importinc
++INCLUDES2 := $(PREINCLUDES) -I$(SRCDIR)/$(SUBDIR) -I. -Iimportinc $(INCLUDES)
+
+ ifeq ($(NETPBMLIBTYPE),unixstatic)
+ NETPBMLIBFNAME = libnetpbm.$(STATICLIBSUFFIX)
+@@ -417,19 +417,19 @@
INSTALLBIN_TARGETS = $(BINARIES:%=%_installbin) netpbm_installbin
.PHONY: $(INSTALLBIN_TARGETS)
$(INSTALLBIN_TARGETS): $(PKGDIR)/bin
Property changes on: trunk/graphics/netpbm/files/patch-Makefile.common
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: trunk/graphics/netpbm/files/patch-converter-other-pstopnm
===================================================================
--- trunk/graphics/netpbm/files/patch-converter-other-pstopnm 2013-12-28 03:46:45 UTC (rev 15789)
+++ trunk/graphics/netpbm/files/patch-converter-other-pstopnm 2013-12-28 14:20:01 UTC (rev 15790)
@@ -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));
Deleted: trunk/graphics/netpbm/files/patch-editor-pnmquant
===================================================================
--- trunk/graphics/netpbm/files/patch-editor-pnmquant 2013-12-28 03:46:45 UTC (rev 15789)
+++ trunk/graphics/netpbm/files/patch-editor-pnmquant 2013-12-28 14:20:01 UTC (rev 15790)
@@ -1,40 +0,0 @@
---- 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 @@
- tell(INFH); # Avoids bogus "INFH is not referenced" warning
- }
- } else {
-- open(STDIN, "<", $infile)
-+ open(STDIN, "<" . $infile)
- or die("Unable to open input file '$infile'. Errno=$ERRNO");
- }
- }
-@@ -157,7 +159,7 @@
- $spreadOpt = "-spreadbrightness";
- }
-
-- open(STDOUT, ">", $mapfileSpec);
-+ open(STDOUT, ">" . $mapfileSpec);
-
- my $maprc = system("pnmcolormap", $ncolors, $averageOpt, $spreadOpt);
-
Modified: trunk/graphics/netpbm/files/patch-jpeg.c
===================================================================
--- trunk/graphics/netpbm/files/patch-jpeg.c 2013-12-28 03:46:45 UTC (rev 15789)
+++ trunk/graphics/netpbm/files/patch-jpeg.c 2013-12-28 14:20:01 UTC (rev 15790)
@@ -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;
Property changes on: trunk/graphics/netpbm/files/patch-jpeg.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/graphics/netpbm/files/patch-lib-Makefile
===================================================================
--- trunk/graphics/netpbm/files/patch-lib-Makefile 2013-12-28 03:46:45 UTC (rev 15789)
+++ trunk/graphics/netpbm/files/patch-lib-Makefile 2013-12-28 14:20:01 UTC (rev 15790)
@@ -1,8 +1,8 @@
---- 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))
+
@@ -9,9 +9,9 @@
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
Property changes on: trunk/graphics/netpbm/files/patch-lib-Makefile
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Added: trunk/graphics/netpbm/files/patch-lib-libpbm3.c
===================================================================
--- trunk/graphics/netpbm/files/patch-lib-libpbm3.c (rev 0)
+++ trunk/graphics/netpbm/files/patch-lib-libpbm3.c 2013-12-28 14:20:01 UTC (rev 15790)
@@ -0,0 +1,16 @@
+--- lib/libpbm3.c 2008-03-28 19:58:06.000000000 +0100
++++ lib/libpbm3.c 2011-12-18 11:55:05.000000000 +0100
+@@ -117,10 +117,10 @@
+ ) ];
+ */
+
+- typedef int v8qi __attribute__ ((mode(V8QI)));
+- typedef int di __attribute__ ((mode(DI)));
++ typedef char v8qi __attribute__ ((vector_size(8)));
++ typedef int di __attribute__ ((vector_size(8)));
+
+- di const zero64 = 0; /* to clear with PXOR */
++ di const zero64 = (di){0}; /* to clear with PXOR */
+
+ unsigned int col;
+
Modified: trunk/graphics/netpbm/files/patch-lib-libpm.c
===================================================================
--- trunk/graphics/netpbm/files/patch-lib-libpm.c 2013-12-28 03:46:45 UTC (rev 15789)
+++ trunk/graphics/netpbm/files/patch-lib-libpm.c 2013-12-28 14:20:01 UTC (rev 15790)
@@ -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;
Property changes on: trunk/graphics/netpbm/files/patch-lib-libpm.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Added: trunk/graphics/netpbm/files/patch-lib-libsystem.c
===================================================================
--- trunk/graphics/netpbm/files/patch-lib-libsystem.c (rev 0)
+++ trunk/graphics/netpbm/files/patch-lib-libsystem.c 2013-12-28 14:20:01 UTC (rev 15790)
@@ -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) {
Added: trunk/graphics/netpbm/files/patch-lib-util-pm_c_util.h
===================================================================
--- trunk/graphics/netpbm/files/patch-lib-util-pm_c_util.h (rev 0)
+++ trunk/graphics/netpbm/files/patch-lib-util-pm_c_util.h 2013-12-28 14:20:01 UTC (rev 15790)
@@ -0,0 +1,10 @@
+--- lib/util/pm_c_util.h.orig 2006-08-19 05:12:28.000000000 +0200
++++ lib/util/pm_c_util.h 2013-08-30 13:58:20.918173431 +0200
+@@ -50,6 +50,7 @@
+ #ifndef __cplusplus
+ #ifndef HAVE_BOOL
+ #define HAVE_BOOL 1
++ #undef bool
+ typedef int bool;
+ #endif
+ #ifndef true
Added: trunk/graphics/netpbm/files/patch-pamrgbatopng.c
===================================================================
--- trunk/graphics/netpbm/files/patch-pamrgbatopng.c (rev 0)
+++ trunk/graphics/netpbm/files/patch-pamrgbatopng.c 2013-12-28 14:20:01 UTC (rev 15790)
@@ -0,0 +1,8 @@
+--- converter/other/pamrgbatopng.c.orig 2006-08-19 05:12:28.000000000 +0200
++++ converter/other/pamrgbatopng.c 2012-04-24 22:20:00.000000000 +0200
+@@ -1,4 +1,5 @@
+ #include <png.h>
++#include <pngpriv.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <setjmp.h>
Modified: trunk/graphics/netpbm/files/patch-pm_config.in.h
===================================================================
--- trunk/graphics/netpbm/files/patch-pm_config.in.h 2013-12-28 03:46:45 UTC (rev 15789)
+++ trunk/graphics/netpbm/files/patch-pm_config.in.h 2013-12-28 14:20:01 UTC (rev 15790)
@@ -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"
Property changes on: trunk/graphics/netpbm/files/patch-pm_config.in.h
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Modified: trunk/graphics/netpbm/files/patch-pngtopnm.c
===================================================================
--- trunk/graphics/netpbm/files/patch-pngtopnm.c 2013-12-28 03:46:45 UTC (rev 15789)
+++ trunk/graphics/netpbm/files/patch-pngtopnm.c 2013-12-28 14:20:01 UTC (rev 15790)
@@ -1,53 +1,66 @@
---- converter/other/pngtopnm.c.orig 2004-04-04 02:18:34.000000000 +0200
-+++ converter/other/pngtopnm.c 2010-03-28 12:29:26.000000000 +0200
-@@ -494,7 +494,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;
-@@ -511,7 +511,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;
+--- converter/other/pngtopnm.c.orig 2011-11-25 01:15:46.000000000 +0100
++++ converter/other/pngtopnm.c 2012-04-24 22:15:14.000000000 +0200
+@@ -37,6 +37,7 @@
+ #include <math.h>
+ #include <float.h>
+ #include <png.h> /* includes zlib.h and setjmp.h */
++#include <pngpriv.h>
+ #define VERSION "2.37.4 (5 December 1999) +netpbm"
- case PNG_COLOR_TYPE_RGB: {
-@@ -519,11 +519,11 @@
- png_uint_16 const c3 = get_png_val(png_pixelP);
- setXel(&xelrow[col], c, c2, c3,
+ #include "pnm.h"
+@@ -44,7 +45,7 @@
+ #include "nstring.h"
+ #include "shhopt.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)
+@@ -489,7 +490,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;
+
+
+ /* There seems to be a problem here: you can't compare real
+@@ -582,8 +583,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;
+ }
+ }
+@@ -654,7 +655,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;
+ }
+@@ -892,7 +893,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);
}
-@@ -688,7 +688,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;
+@@ -921,7 +922,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);
}
-@@ -841,7 +841,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;
- }
+ break;
+
Property changes on: trunk/graphics/netpbm/files/patch-pngtopnm.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Added: trunk/graphics/netpbm/files/patch-pngtxt.c
===================================================================
--- trunk/graphics/netpbm/files/patch-pngtxt.c (rev 0)
+++ trunk/graphics/netpbm/files/patch-pngtxt.c 2013-12-28 14:20:01 UTC (rev 15790)
@@ -0,0 +1,10 @@
+--- converter/other/pngtxt.c.orig 2006-08-19 05:12:28.000000000 +0200
++++ converter/other/pngtxt.c 2012-04-24 22:12:39.000000000 +0200
+@@ -2,6 +2,7 @@
+ #include <string.h>
+ #include <stdio.h>
+ #include <png.h>
++#include <pngpriv.h>
+
+ #include "nstring.h"
+ #include "pngtxt.h"
Modified: trunk/graphics/netpbm/files/patch-pnmtopng.c
===================================================================
--- trunk/graphics/netpbm/files/patch-pnmtopng.c 2013-12-28 03:46:45 UTC (rev 15789)
+++ trunk/graphics/netpbm/files/patch-pnmtopng.c 2013-12-28 14:20:01 UTC (rev 15790)
@@ -1,6 +1,26 @@
---- converter/other/pnmtopng.c.orig 2007-07-04 05:26:21.000000000 +0200
-+++ converter/other/pnmtopng.c 2010-03-28 12:17:40.000000000 +0200
-@@ -1863,7 +1863,7 @@
+--- converter/other/pnmtopng.c.orig 2011-09-25 20:51:44.000000000 +0200
++++ converter/other/pnmtopng.c 2012-04-23 20:23:10.000000000 +0200
+@@ -61,7 +61,9 @@
+ #include <assert.h>
+ #include <string.h> /* strcat() */
+ #include <limits.h>
+-#include <png.h> /* includes zlib.h and setjmp.h */
++#include <png.h>
++#include <zlib.h>
++#include <pngpriv.h>
+ #include "pnm.h"
+ #include "pngtxt.h"
+ #include "shhopt.h"
+@@ -69,7 +71,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.47.04)
+@@ -2630,7 +2632,7 @@
info_ptr->num_palette = palette_size;
if (trans_size > 0) {
info_ptr->valid |= PNG_INFO_tRNS;
@@ -9,7 +29,7 @@
info_ptr->num_trans = trans_size; /* omit opaque values */
}
/* creating hIST chunk */
-@@ -1900,7 +1900,7 @@
+@@ -2667,7 +2669,7 @@
info_ptr->color_type == PNG_COLOR_TYPE_RGB) {
if (transparent > 0) {
info_ptr->valid |= PNG_INFO_tRNS;
@@ -18,7 +38,7 @@
xelToPngColor_16(transcolor, maxval, png_maxval);
}
} else {
-@@ -1912,10 +1912,10 @@
+@@ -2679,10 +2681,10 @@
if (info_ptr->valid && PNG_INFO_tRNS)
pm_message("Transparent color {gray, red, green, blue} = "
"{%d, %d, %d, %d}",
Property changes on: trunk/graphics/netpbm/files/patch-pnmtopng.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Added: trunk/graphics/netpbm/files/patch-ppmquantall
===================================================================
--- trunk/graphics/netpbm/files/patch-ppmquantall (rev 0)
+++ trunk/graphics/netpbm/files/patch-ppmquantall 2013-12-28 14:20:01 UTC (rev 15790)
@@ -0,0 +1,8 @@
+--- editor/ppmquantall.orig 2012-03-09 22:16:02.000000000 +0900
++++ editor/ppmquantall 2012-03-09 22:16:29.000000000 +0900
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/usr/local/bin/bash
+ #
+ # ppmquantall - run ppmquant on a bunch of files all at once, so they share
+ # a common colormap
Added: trunk/graphics/netpbm/files/patch-ppmtompeg-Makefile
===================================================================
--- trunk/graphics/netpbm/files/patch-ppmtompeg-Makefile (rev 0)
+++ trunk/graphics/netpbm/files/patch-ppmtompeg-Makefile 2013-12-28 14:20:01 UTC (rev 15790)
@@ -0,0 +1,12 @@
+--- converter/ppm/ppmtompeg/Makefile.orig 2008-12-07 02:58:20.000000000 +0100
++++ converter/ppm/ppmtompeg/Makefile 2011-05-11 06:01:02.000000000 +0200
+@@ -18,7 +18,8 @@
+ JPEGLIBX = $(JPEGLIB)
+ endif
+
+-INCLUDES = -I$(SRCDIR)/$(SUBDIR)/headers
++INCLUDES =
++PREINCLUDES = -I$(SRCDIR)/$(SUBDIR)/headers
+
+ ifneq ($(JPEGHDR_DIR),NONE)
+ ifneq ($(JPEGHDR_DIR)x,x)
Deleted: trunk/graphics/netpbm/files/patch-util-wordaccess.h
===================================================================
--- trunk/graphics/netpbm/files/patch-util-wordaccess.h 2013-12-28 03:46:45 UTC (rev 15789)
+++ trunk/graphics/netpbm/files/patch-util-wordaccess.h 2013-12-28 14:20:01 UTC (rev 15790)
@@ -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
Index: trunk/graphics/netpbm/pkg-descr
===================================================================
--- trunk/graphics/netpbm/pkg-descr 2013-12-28 03:46:45 UTC (rev 15789)
+++ trunk/graphics/netpbm/pkg-descr 2013-12-28 14:20:01 UTC (rev 15790)
Property changes on: trunk/graphics/netpbm/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/graphics/netpbm/pkg-plist
===================================================================
--- trunk/graphics/netpbm/pkg-plist 2013-12-28 03:46:45 UTC (rev 15789)
+++ trunk/graphics/netpbm/pkg-plist 2013-12-28 14:20:01 UTC (rev 15790)
@@ -6,7 +6,7 @@
bin/bmptopnm
bin/bmptoppm
bin/brushtopbm
-%%DEVEL%%bin/cameratopam
+bin/cameratopam
bin/cmuwmtopbm
bin/ddbugtopbm
bin/escp2topbm
@@ -31,7 +31,6 @@
bin/leaftoppm
bin/lispmtopgm
bin/macptopbm
-bin/manweb
bin/mdatopbm
bin/mgrtopbm
bin/mrftopbm
@@ -38,13 +37,14 @@
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
+bin/pamdepth
bin/pamdice
bin/pamditherbw
bin/pamedge
@@ -54,21 +54,21 @@
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
@@ -75,16 +75,20 @@
bin/pamstretch-gen
bin/pamsumm
bin/pamsummcol
-%%DEVEL%%bin/pamtilt
+bin/pamthreshold
+bin/pamtilt
bin/pamtodjvurle
-%%DEVEL%%bin/pamtofits
+bin/pamtofits
bin/pamtohdiff
bin/pamtohtmltbl
bin/pamtopfm
bin/pamtopnm
+bin/pamtosvg
bin/pamtotga
-%%DEVEL%%bin/pamtotiff
+bin/pamtotiff
bin/pamtouil
+bin/pamtoxvmini
+%%X11%%bin/pamx
bin/pbmclean
bin/pbmlife
bin/pbmmake
@@ -137,10 +141,13 @@
bin/pgmabel
bin/pgmbentley
bin/pgmcrater
+bin/pgmdeshadow
bin/pgmedge
bin/pgmenhance
bin/pgmhist
bin/pgmkernel
+bin/pgmmake
+bin/pgmmedian
bin/pgmminkowski
bin/pgmmorphconv
bin/pgmnoise
@@ -150,7 +157,6 @@
bin/pgmslice
bin/pgmtexture
bin/pgmtofs
-%%DEVEL%%bin/pgmmedian
bin/pgmtolispm
bin/pgmtopbm
bin/pgmtopgm
@@ -221,13 +227,13 @@
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
@@ -287,6 +293,7 @@
bin/rawtopgm
bin/rawtoppm
bin/rgb3toppm
+bin/rlatopam
bin/rletopnm
bin/sbigtopgm
bin/sgitopnm
@@ -295,6 +302,7 @@
bin/spctoppm
bin/spottopgm
bin/sputoppm
+bin/svgtopam
bin/tgatoppm
bin/thinkjettopbm
bin/tifftopnm
@@ -320,6 +328,7 @@
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
@@ -330,6 +339,316 @@
lib/libnetpbm.a
lib/libnetpbm.so
lib/libnetpbm.so.1
+%%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/bioradtopgm.1.gz
+%%MANPAGES%%man/man1/bmptopnm.1.gz
+%%MANPAGES%%man/man1/bmptoppm.1.gz
+%%MANPAGES%%man/man1/brushtopbm.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/fiascotopnm.1.gz
+%%MANPAGES%%man/man1/fitstopnm.1.gz
+%%MANPAGES%%man/man1/fstopgm.1.gz
+%%MANPAGES%%man/man1/g3topbm.1.gz
+%%MANPAGES%%man/man1/gemtopbm.1.gz
+%%MANPAGES%%man/man1/gemtopnm.1.gz
+%%MANPAGES%%man/man1/giftopnm.1.gz
+%%MANPAGES%%man/man1/gouldtoppm.1.gz
+%%MANPAGES%%man/man1/hdifftopam.1.gz
+%%MANPAGES%%man/man1/hipstopgm.1.gz
+%%MANPAGES%%man/man1/hpcdtoppm.1.gz
+%%MANPAGES%%man/man1/icontopbm.1.gz
+%%MANPAGES%%man/man1/ilbmtoppm.1.gz
+%%MANPAGES%%man/man1/imgtoppm.1.gz
+%%MANPAGES%%man/man1/infotopam.1.gz
+%%MANPAGES%%man/man1/jbigtopnm.1.gz
+%%MANPAGES%%man/man1/jpeg2ktopam.1.gz
+%%MANPAGES%%man/man1/jpegtopnm.1.gz
+%%MANPAGES%%man/man1/leaftoppm.1.gz
+%%MANPAGES%%man/man1/lispmtopgm.1.gz
+%%MANPAGES%%man/man1/macptopbm.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
+%%MANPAGES%%man/man1/palmtopnm.1.gz
+%%MANPAGES%%man/man1/pamarith.1.gz
+%%MANPAGES%%man/man1/pamchannel.1.gz
+%%MANPAGES%%man/man1/pamcomp.1.gz
+%%MANPAGES%%man/man1/pamcut.1.gz
+%%MANPAGES%%man/man1/pamdeinterlace.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/pamfile.1.gz
+%%MANPAGES%%man/man1/pamflip.1.gz
+%%MANPAGES%%man/man1/pamfunc.1.gz
+%%MANPAGES%%man/man1/pamgauss.1.gz
+%%MANPAGES%%man/man1/pamlookup.1.gz
+%%MANPAGES%%man/man1/pamoil.1.gz
+%%MANPAGES%%man/man1/pamperspective.1.gz
+%%MANPAGES%%man/man1/pampop9.1.gz
+%%MANPAGES%%man/man1/pamscale.1.gz
+%%MANPAGES%%man/man1/pamseq.1.gz
+%%MANPAGES%%man/man1/pamsharpmap.1.gz
+%%MANPAGES%%man/man1/pamsharpness.1.gz
+%%MANPAGES%%man/man1/pamslice.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/pamtodjvurle.1.gz
+%%MANPAGES%%man/man1/pamtohdiff.1.gz
+%%MANPAGES%%man/man1/pamtohtmltbl.1.gz
+%%MANPAGES%%man/man1/pamtojpeg2k.1.gz
+%%MANPAGES%%man/man1/pamtopfm.1.gz
+%%MANPAGES%%man/man1/pamtopnm.1.gz
+%%MANPAGES%%man/man1/pamtotga.1.gz
+%%MANPAGES%%man/man1/pamtouil.1.gz
+%%MANPAGES%%%%X11%%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/pbmpage.1.gz
+%%MANPAGES%%man/man1/pbmpscale.1.gz
+%%MANPAGES%%man/man1/pbmreduce.1.gz
+%%MANPAGES%%man/man1/pbmtext.1.gz
+%%MANPAGES%%man/man1/pbmtextps.1.gz
+%%MANPAGES%%man/man1/pbmto10x.1.gz
+%%MANPAGES%%man/man1/pbmto4425.1.gz
+%%MANPAGES%%man/man1/pbmtoascii.1.gz
+%%MANPAGES%%man/man1/pbmtoatk.1.gz
+%%MANPAGES%%man/man1/pbmtobbnbg.1.gz
+%%MANPAGES%%man/man1/pbmtocmuwm.1.gz
+%%MANPAGES%%man/man1/pbmtodjvurle.1.gz
+%%MANPAGES%%man/man1/pbmtoepsi.1.gz
+%%MANPAGES%%man/man1/pbmtoepson.1.gz
+%%MANPAGES%%man/man1/pbmtoescp2.1.gz
+%%MANPAGES%%man/man1/pbmtog3.1.gz
+%%MANPAGES%%man/man1/pbmtogem.1.gz
+%%MANPAGES%%man/man1/pbmtogo.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/pbmtomda.1.gz
+%%MANPAGES%%man/man1/pbmtomgr.1.gz
+%%MANPAGES%%man/man1/pbmtomrf.1.gz
+%%MANPAGES%%man/man1/pbmtonokia.1.gz
+%%MANPAGES%%man/man1/pbmtopgm.1.gz
+%%MANPAGES%%man/man1/pbmtopi3.1.gz
+%%MANPAGES%%man/man1/pbmtopk.1.gz
+%%MANPAGES%%man/man1/pbmtoplot.1.gz
+%%MANPAGES%%man/man1/pbmtoppa.1.gz
+%%MANPAGES%%man/man1/pbmtopsg3.1.gz
+%%MANPAGES%%man/man1/pbmtoptx.1.gz
+%%MANPAGES%%man/man1/pbmtowbmp.1.gz
+%%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/pcdovtoppm.1.gz
+%%MANPAGES%%man/man1/pcxtoppm.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
+%%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/pgmminkowski.1.gz
+%%MANPAGES%%man/man1/pgmmorphconv.1.gz
+%%MANPAGES%%man/man1/pgmnoise.1.gz
+%%MANPAGES%%man/man1/pgmnorm.1.gz
+%%MANPAGES%%man/man1/pgmoil.1.gz
+%%MANPAGES%%man/man1/pgmramp.1.gz
+%%MANPAGES%%man/man1/pgmslice.1.gz
+%%MANPAGES%%man/man1/pgmtexture.1.gz
+%%MANPAGES%%man/man1/pgmtofs.1.gz
+%%MANPAGES%%man/man1/pgmtolispm.1.gz
+%%MANPAGES%%man/man1/pgmtopbm.1.gz
+%%MANPAGES%%man/man1/pgmtopgm.1.gz
+%%MANPAGES%%man/man1/pgmtoppm.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/pngtopnm.1.gz
+%%MANPAGES%%man/man1/pnmalias.1.gz
+%%MANPAGES%%man/man1/pnmarith.1.gz
+%%MANPAGES%%man/man1/pnmcat.1.gz
+%%MANPAGES%%man/man1/pnmcolormap.1.gz
+%%MANPAGES%%man/man1/pnmcomp.1.gz
+%%MANPAGES%%man/man1/pnmconvol.1.gz
+%%MANPAGES%%man/man1/pnmcrop.1.gz
+%%MANPAGES%%man/man1/pnmcut.1.gz
+%%MANPAGES%%man/man1/pnmdepth.1.gz
+%%MANPAGES%%man/man1/pnmfile.1.gz
+%%MANPAGES%%man/man1/pnmgamma.1.gz
+%%MANPAGES%%man/man1/pnmhisteq.1.gz
+%%MANPAGES%%man/man1/pnmhistmap.1.gz
+%%MANPAGES%%man/man1/pnmindex.1.gz
+%%MANPAGES%%man/man1/pnminterp.1.gz
+%%MANPAGES%%man/man1/pnminvert.1.gz
+%%MANPAGES%%man/man1/pnmmargin.1.gz
+%%MANPAGES%%man/man1/pnmmontage.1.gz
+%%MANPAGES%%man/man1/pnmnlfilt.1.gz
+%%MANPAGES%%man/man1/pnmnoraw.1.gz
+%%MANPAGES%%man/man1/pnmnorm.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
+%%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/pnmshear.1.gz
+%%MANPAGES%%man/man1/pnmsmooth.1.gz
+%%MANPAGES%%man/man1/pnmsplit.1.gz
+%%MANPAGES%%man/man1/pnmstitch.1.gz
+%%MANPAGES%%man/man1/pnmtile.1.gz
+%%MANPAGES%%man/man1/pnmtoddif.1.gz
+%%MANPAGES%%man/man1/pnmtofiasco.1.gz
+%%MANPAGES%%man/man1/pnmtofits.1.gz
+%%MANPAGES%%man/man1/pnmtojbig.1.gz
+%%MANPAGES%%man/man1/pnmtojpeg.1.gz
+%%MANPAGES%%man/man1/pnmtopalm.1.gz
+%%MANPAGES%%man/man1/pnmtopclxl.1.gz
+%%MANPAGES%%man/man1/pnmtoplainpnm.1.gz
+%%MANPAGES%%man/man1/pnmtopng.1.gz
+%%MANPAGES%%man/man1/pnmtopnm.1.gz
+%%MANPAGES%%man/man1/pnmtops.1.gz
+%%MANPAGES%%man/man1/pnmtorast.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/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/ppmdim.1.gz
+%%MANPAGES%%man/man1/ppmdist.1.gz
+%%MANPAGES%%man/man1/ppmdither.1.gz
+%%MANPAGES%%man/man1/ppmfade.1.gz
+%%MANPAGES%%man/man1/ppmflash.1.gz
+%%MANPAGES%%man/man1/ppmforge.1.gz
+%%MANPAGES%%man/man1/ppmglobe.1.gz
+%%MANPAGES%%man/man1/ppmhist.1.gz
+%%MANPAGES%%man/man1/ppmlabel.1.gz
+%%MANPAGES%%man/man1/ppmmake.1.gz
+%%MANPAGES%%man/man1/ppmmix.1.gz
+%%MANPAGES%%man/man1/ppmnorm.1.gz
+%%MANPAGES%%man/man1/ppmntsc.1.gz
+%%MANPAGES%%man/man1/ppmpat.1.gz
+%%MANPAGES%%man/man1/ppmquantall.1.gz
+%%MANPAGES%%man/man1/ppmquant.1.gz
+%%MANPAGES%%man/man1/ppmrainbow.1.gz
+%%MANPAGES%%man/man1/ppmrelief.1.gz
+%%MANPAGES%%man/man1/ppmrough.1.gz
+%%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/ppmtoarbtxt.1.gz
+%%MANPAGES%%man/man1/ppmtobmp.1.gz
+%%MANPAGES%%man/man1/ppmtoeyuv.1.gz
+%%MANPAGES%%man/man1/ppmtogif.1.gz
+%%MANPAGES%%man/man1/ppmtoicr.1.gz
+%%MANPAGES%%man/man1/ppmtoilbm.1.gz
+%%MANPAGES%%man/man1/ppmtojpeg.1.gz
+%%MANPAGES%%man/man1/ppmtoleaf.1.gz
+%%MANPAGES%%man/man1/ppmtolj.1.gz
+%%MANPAGES%%man/man1/ppmtomitsu.1.gz
+%%MANPAGES%%man/man1/ppmtompeg.1.gz
+%%MANPAGES%%man/man1/ppmtoneo.1.gz
+%%MANPAGES%%man/man1/ppmtopcx.1.gz
+%%MANPAGES%%man/man1/ppmtopgm.1.gz
+%%MANPAGES%%man/man1/ppmtopi1.1.gz
+%%MANPAGES%%man/man1/ppmtopict.1.gz
+%%MANPAGES%%man/man1/ppmtopj.1.gz
+%%MANPAGES%%man/man1/ppmtopjxl.1.gz
+%%MANPAGES%%man/man1/ppmtoppm.1.gz
+%%MANPAGES%%man/man1/ppmtopuzz.1.gz
+%%MANPAGES%%man/man1/ppmtorgb3.1.gz
+%%MANPAGES%%man/man1/ppmtosixel.1.gz
+%%MANPAGES%%man/man1/ppmtoterm.1.gz
+%%MANPAGES%%man/man1/ppmtotga.1.gz
+%%MANPAGES%%man/man1/ppmtouil.1.gz
+%%MANPAGES%%man/man1/ppmtowinicon.1.gz
+%%MANPAGES%%man/man1/ppmtoxpm.1.gz
+%%MANPAGES%%man/man1/ppmtoyuv.1.gz
+%%MANPAGES%%man/man1/ppmtoyuvsplit.1.gz
+%%MANPAGES%%man/man1/ppmtv.1.gz
+%%MANPAGES%%man/man1/ppmwheel.1.gz
+%%MANPAGES%%man/man1/psidtopgm.1.gz
+%%MANPAGES%%man/man1/pstopnm.1.gz
+%%MANPAGES%%man/man1/qrttoppm.1.gz
+%%MANPAGES%%man/man1/rasttopnm.1.gz
+%%MANPAGES%%man/man1/rawtopgm.1.gz
+%%MANPAGES%%man/man1/rawtoppm.1.gz
+%%MANPAGES%%man/man1/rgb3toppm.1.gz
+%%MANPAGES%%man/man1/rletopnm.1.gz
+%%MANPAGES%%man/man1/sbigtopgm.1.gz
+%%MANPAGES%%man/man1/sgitopnm.1.gz
+%%MANPAGES%%man/man1/sirtopnm.1.gz
+%%MANPAGES%%man/man1/sldtoppm.1.gz
+%%MANPAGES%%man/man1/spctoppm.1.gz
+%%MANPAGES%%man/man1/spottopgm.1.gz
+%%MANPAGES%%man/man1/sputoppm.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/winicontoppm.1.gz
+%%MANPAGES%%man/man1/xbmtopbm.1.gz
+%%MANPAGES%%man/man1/ximtoppm.1.gz
+%%MANPAGES%%man/man1/xpmtoppm.1.gz
+%%MANPAGES%%man/man1/xvminitoppm.1.gz
+%%MANPAGES%%man/man1/xwdtopnm.1.gz
+%%MANPAGES%%man/man1/ybmtopbm.1.gz
+%%MANPAGES%%man/man1/yuvsplittoppm.1.gz
+%%MANPAGES%%man/man1/yuvtoppm.1.gz
+%%MANPAGES%%man/man1/zeisstopnm.1.gz
+%%MANPAGES%%man/man3/libnetpbm.3.gz
+%%MANPAGES%%man/man3/libnetpbm_image.3.gz
+%%MANPAGES%%man/man3/libnetpbm_ug.3.gz
+%%MANPAGES%%man/man3/libpbm.3.gz
+%%MANPAGES%%man/man3/libpgm.3.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/pgm.5.gz
+%%MANPAGES%%man/man5/pnm.5.gz
+%%MANPAGES%%man/man5/ppm.5.gz
%%DATADIR%%/palmcolor8.map
%%DATADIR%%/palmgray1.map
%%DATADIR%%/palmgray2.map
More information about the Midnightbsd-cvs
mailing list