summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authortron <tron>2003-03-21 08:30:48 +0000
committertron <tron>2003-03-21 08:30:48 +0000
commitf11116ca69a42f56b994b2d93d55639ec4917001 (patch)
treeeed3452d08203de41a446a34a6419a53caf51b70 /graphics
parent2a7349a6415da9084e50c532b1c58933b02bfb72 (diff)
downloadpkgsrc-f11116ca69a42f56b994b2d93d55639ec4917001.tar.gz
Fix "zlib" configuration in "Makefile.common" so that PNG tools get built.
Bump package revision to reflect this change. This patch was contributed by Christopher Richards in PR pkg/20809.
Diffstat (limited to 'graphics')
-rw-r--r--graphics/netpbm/Makefile3
-rw-r--r--graphics/netpbm/distinfo4
-rw-r--r--graphics/netpbm/patches/patch-aa13
3 files changed, 16 insertions, 4 deletions
diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index 92a52e221fb..ea87cd980b5 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.67 2003/03/18 12:11:55 tron Exp $
+# $NetBSD: Makefile,v 1.68 2003/03/21 08:30:48 tron Exp $
DISTNAME= netpbm-10.11.6
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=netpbm/}
EXTRACT_SUFX= .tgz
diff --git a/graphics/netpbm/distinfo b/graphics/netpbm/distinfo
index 42fe69a9f0b..c09caf6c608 100644
--- a/graphics/netpbm/distinfo
+++ b/graphics/netpbm/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.12 2003/03/18 12:11:56 tron Exp $
+$NetBSD: distinfo,v 1.13 2003/03/21 08:30:48 tron Exp $
SHA1 (netpbm-10.11.6.tgz) = acda105f98695998659e519255e3b366fbb6121b
Size (netpbm-10.11.6.tgz) = 1910873 bytes
-SHA1 (patch-aa) = f1f305a3a5b3297ebc881e6135f3db064c59782e
+SHA1 (patch-aa) = f37a0da740cbec8cf5e998dd4c3448c65c21b526
SHA1 (patch-ac) = cd8bb4318828a9872cce2793635c4bc51272d199
diff --git a/graphics/netpbm/patches/patch-aa b/graphics/netpbm/patches/patch-aa
index 5cbdb8da5e2..2ef2094157b 100644
--- a/graphics/netpbm/patches/patch-aa
+++ b/graphics/netpbm/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.21 2003/03/18 12:11:57 tron Exp $
+$NetBSD: patch-aa,v 1.22 2003/03/21 08:30:49 tron Exp $
--- Makefile.config.in.orig 2002-10-15 19:17:21.000000000 +0200
+++ Makefile.config.in 2003-03-18 10:44:40.000000000 +0100
@@ -91,6 +91,17 @@ $NetBSD: patch-aa,v 1.21 2003/03/18 12:11:57 tron Exp $
# OSF/Tru64:
#PNGLIB = /usr/local1/DEC/lib/libpng$(PNGVER).so
#PNGHDR_DIR = /usr/local1/DEC/include
+@@ -308,8 +312,8 @@
+ # NONE for the PNG library, it doesn't matter what you specify here --
+ # it won't get used.
+
+-ZLIB = NONE
+-ZHDR_DIR =
++ZLIB = $(BUILDLINK_DIR)/lib/libz.so
++ZHDR_DIR = $(BUILDLINK_DIR)/include
+ #ZLIB = libz.so
+
+ # The JBIG lossless image compression library (aka JBIG-KIT):
@@ -337,7 +341,7 @@
# network functions is the option in ppmtompeg to run it on multiple
# computers simultaneously.