summaryrefslogtreecommitdiff
path: root/graphics/netpbm
diff options
context:
space:
mode:
authorrillig <rillig@pkgsrc.org>2006-10-11 18:44:25 +0000
committerrillig <rillig@pkgsrc.org>2006-10-11 18:44:25 +0000
commit4b9cbf457ed84b65d836bc168acb2de7443e4ba0 (patch)
treec3430af61f0de577426a28909a1f86770eb91469 /graphics/netpbm
parent183a50eb64ed28c928d2379eb88282ec8276cdff (diff)
downloadpkgsrc-4b9cbf457ed84b65d836bc168acb2de7443e4ba0.tar.gz
Fixed "test ==" and a few pkglint warnings.
Diffstat (limited to 'graphics/netpbm')
-rw-r--r--graphics/netpbm/Makefile6
-rw-r--r--graphics/netpbm/distinfo3
-rw-r--r--graphics/netpbm/patches/patch-cb13
3 files changed, 18 insertions, 4 deletions
diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index 0bf47e1a9b9..c13c6621ff8 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.145 2006/10/03 22:56:50 schwarz Exp $
+# $NetBSD: Makefile,v 1.146 2006/10/11 18:44:25 rillig Exp $
DISTNAME= netpbm-10.34
CATEGORIES= graphics
@@ -23,7 +23,7 @@ REPLACE_PERL+= editor/ppmfade editor/ppmshadow editor/pnmquant \
STAGEDIR= ${WRKDIR}/staging
LIBS.SunOS+= -lsocket -lnsl
-MAKE_ENV+= NETWORKLD=${LIBS:M*:Q}
+MAKE_ENV+= NETWORKLD=${LIBS:Q}
# Several of the netpbm shell scripts use bashisms, so force using
# bash for all of the shell scripts.
@@ -55,7 +55,7 @@ MAKE_ENV+= NETPBMLIBTYPE="unixshared" NETPBMLIBSUFFIX="so"
.endif
MAKE_ENV+= JASPERLIB="${LDFLAGS} -ljasper"
-MAKE_ENV+= JASPERHDR_DIR=${CPPFLAGS:M*:Q}
+MAKE_ENV+= JASPERHDR_DIR=${CPPFLAGS:Q}
.if ${PKGSRC_COMPILER} == "ido"
CPPFLAGS+= -DSGI_IDO_CC
diff --git a/graphics/netpbm/distinfo b/graphics/netpbm/distinfo
index 6634df63005..5ef5f6ff091 100644
--- a/graphics/netpbm/distinfo
+++ b/graphics/netpbm/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.61 2006/10/03 23:01:25 schwarz Exp $
+$NetBSD: distinfo,v 1.62 2006/10/11 18:44:25 rillig Exp $
SHA1 (netpbm-10.34.tgz) = 530458871f9d3dc763a1bf82f227eeb79098c601
RMD160 (netpbm-10.34.tgz) = 57a596efa6cacb981135d554a72cbaffc4cfe72c
@@ -27,3 +27,4 @@ SHA1 (patch-au) = d098d29cd3b62236e3e4a84b1d74de18de85c06f
SHA1 (patch-av) = ef10c607f40dc5cc64dc77c04b1daca4e0ce34eb
SHA1 (patch-aw) = bd890324e95fa7bb893d9d5cdab9d5a33dcff777
SHA1 (patch-ca) = b63be9bd38dd182949edf3b892608b72d13c1fa0
+SHA1 (patch-cb) = b1be33ae6acfe57bf2f407cd48a6b140c3ddea85
diff --git a/graphics/netpbm/patches/patch-cb b/graphics/netpbm/patches/patch-cb
new file mode 100644
index 00000000000..b67aafc6d07
--- /dev/null
+++ b/graphics/netpbm/patches/patch-cb
@@ -0,0 +1,13 @@
+$NetBSD: patch-cb,v 1.1 2006/10/11 18:44:25 rillig Exp $
+
+--- buildtools/installosf.orig 2002-01-29 05:03:15.000000000 +0100
++++ buildtools/installosf 2006-10-11 20:41:35.000000000 +0200
+@@ -17,7 +17,7 @@ while [ $# -gt 0 ]; do
+ elif [ "$1" = "-m" ]; then
+ shift
+ PERMISSIONS=$1
+- elif [ ${SOURCE_FILE}x == x ]; then
++ elif [ ${SOURCE_FILE}x = x ]; then
+ SOURCE_FILE=$1
+ else
+ TARGET_DIR=$1