summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgson <gson>2014-10-09 18:58:18 +0000
committergson <gson>2014-10-09 18:58:18 +0000
commit2c0bb319f420df9094b287ca14e4466d0d1e9a45 (patch)
tree08047b22e49bb8ef37acabedd65430a05aa864c6
parentc0f41381b490be7a7b62e43ac2be6058c27c13cd (diff)
downloadpkgsrc-2c0bb319f420df9094b287ca14e4466d0d1e9a45.tar.gz
Configure netpbm with tiff and zlib support so that pamtotiff,
pnmtotiff, pnmtotiffcmyk, and tifftopnm once again get built. They have been temporarily absent since the update to 10.67.03.
-rw-r--r--graphics/netpbm/Makefile9
-rw-r--r--graphics/netpbm/PLIST6
2 files changed, 12 insertions, 3 deletions
diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index 751245e8837..88778e892d5 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.194 2014/09/29 18:16:41 gson Exp $
+# $NetBSD: Makefile,v 1.195 2014/10/09 18:58:18 gson Exp $
DISTNAME= netpbm-10.67.05
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= graphics
MASTER_SITES= #
# manually created from svn checkout of
@@ -81,6 +81,10 @@ post-extract:
${ECHO} "CFLAGS_SHLIB = -fPIC" >> ${WRKSRC}/config.mk
${ECHO} "JPEGLIB = ${BUILDLINK_PREFIX.jpeg}/lib/libjpeg.so" >> ${WRKSRC}/config.mk
${ECHO} "JPEGHDR_DIR = ${BUILDLINK_PREFIX.jpeg}/include" >> ${WRKSRC}/config.mk
+ ${ECHO} "TIFFLIB = ${BUILDLINK_PREFIX.tiff}/lib/libtiff.so" >> ${WRKSRC}/config.mk
+ ${ECHO} "TIFFHDR_DIR = ${BUILDLINK_PREFIX.tiff}/include" >> ${WRKSRC}/config.mk
+ ${ECHO} "ZLIB = ${BUILDLINK_PREFIX.zlib}/lib/libz.so" >> ${WRKSRC}/config.mk
+ ${ECHO} "ZHDR_DIR = ${BUILDLINK_PREFIX.zlib}/include" >> ${WRKSRC}/config.mk
.if ${OPSYS} == "Darwin"
${ECHO} 'LDSHLIB=-dynamiclib -install_name $$(PREFIX)/lib/libnetpbm.$$(MAJ).dylib -compatibility_version $$(MAJ) -current_version $$(MAJ).$$(MIN)' >> ${WRKSRC}/config.mk
.endif
@@ -101,6 +105,7 @@ post-install:
${INSTALL_DATA} ${WRKDIR}/netpbm-userguide/*.3 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man3
${INSTALL_DATA} ${WRKDIR}/netpbm-userguide/*.5 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5
+.include "../../devel/zlib/buildlink3.mk"
.include "../../graphics/jasper/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
.include "../../graphics/tiff/buildlink3.mk"
diff --git a/graphics/netpbm/PLIST b/graphics/netpbm/PLIST
index a215242b441..6a208ef9319 100644
--- a/graphics/netpbm/PLIST
+++ b/graphics/netpbm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2014/09/19 08:42:47 wiz Exp $
+@comment $NetBSD: PLIST,v 1.12 2014/10/09 18:58:18 gson Exp $
bin/411toppm
bin/anytopnm
bin/asciitopgm
@@ -108,6 +108,7 @@ bin/pamtopnm
bin/pamtosrf
bin/pamtosvg
bin/pamtotga
+bin/pamtotiff
bin/pamtouil
bin/pamtowinicon
bin/pamtoxvmini
@@ -251,6 +252,8 @@ bin/pnmtorast
bin/pnmtorle
bin/pnmtosgi
bin/pnmtosir
+bin/pnmtotiff
+bin/pnmtotiffcmyk
bin/pnmtoxwd
bin/ppm3d
bin/ppmbrighten
@@ -340,6 +343,7 @@ bin/sunicontopnm
bin/svgtopam
bin/tgatoppm
bin/thinkjettopbm
+bin/tifftopnm
bin/wbmptopbm
bin/winicontopam
bin/winicontoppm