summaryrefslogtreecommitdiff
path: root/graphics/netpbm
diff options
context:
space:
mode:
authorrillig <rillig>2005-12-05 20:49:47 +0000
committerrillig <rillig>2005-12-05 20:49:47 +0000
commitb4f920543059af038598712771c3211999ef42a6 (patch)
treedac5b1dd14794d86b061d26b9503adb2552ed3f8 /graphics/netpbm
parent5bf026ec112f405b514a2d69a72e10fa92c4c524 (diff)
downloadpkgsrc-b4f920543059af038598712771c3211999ef42a6.tar.gz
Fixed pkglint warnings. The warnings are mostly quoting issues, for
example MAKE_ENV+=FOO=${BAR} is changed to MAKE_ENV+=FOO=${BAR:Q}. Some other changes are outlined in http://mail-index.netbsd.org/tech-pkg/2005/12/02/0034.html
Diffstat (limited to 'graphics/netpbm')
-rw-r--r--graphics/netpbm/Makefile12
-rw-r--r--graphics/netpbm/hacks.mk4
2 files changed, 8 insertions, 8 deletions
diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index 23ff49ddcd4..33c77232a10 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.126 2005/10/19 09:30:08 adam Exp $
+# $NetBSD: Makefile,v 1.127 2005/12/05 20:50:21 rillig Exp $
DISTNAME= netpbm-10.30
CATEGORIES= graphics
@@ -14,16 +14,16 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
USE_TOOLS+= bash:run gmake lex perl
INSTALL_TARGET= install-dev install-run
-MAKE_ENV+= INSTALL="${INSTALL}" STRIPFLAG="${_STRIPFLAG_INSTALL}" \
- pkgdir="${STAGEDIR}"
+MAKE_ENV+= INSTALL=${INSTALL:Q} STRIPFLAG=${_STRIPFLAG_INSTALL:Q} \
+ pkgdir=${STAGEDIR:Q}
MAKEFILE= GNUmakefile
PLIST_SRC= ${WRKDIR}/PLIST_STAGE
REPLACE_PERL= editor/ppmfade editor/ppmshadow editor/pnmquant \
generator/ppmrainbow manweb editor/pnmflip editor/ppmquant
STAGEDIR= ${WRKDIR}/staging
-LIBS.SunOS= -lsocket -lnsl
-MAKE_ENV+= NETWORKLD="${LIBS}"
+LIBS.SunOS+= -lsocket -lnsl
+MAKE_ENV+= NETWORKLD=${LIBS:M*:Q}
# Several of the netpbm shell scripts use bashisms, so force using
# bash for all of the shell scripts.
@@ -47,7 +47,7 @@ MAKE_ENV+= BUILD_FIASCO=N
.endif
MAKE_ENV+= JASPERLIB="${LDFLAGS} -ljasper"
-MAKE_ENV+= JASPERHDR_DIR=${CPPFLAGS:Q}
+MAKE_ENV+= JASPERHDR_DIR=${CPPFLAGS:M*:Q}
.include "../../graphics/jasper/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
diff --git a/graphics/netpbm/hacks.mk b/graphics/netpbm/hacks.mk
index 90cd6498a43..0afe5dd841a 100644
--- a/graphics/netpbm/hacks.mk
+++ b/graphics/netpbm/hacks.mk
@@ -1,6 +1,6 @@
-# $NetBSD: hacks.mk,v 1.1 2005/01/24 20:48:05 tv Exp $
+# $NetBSD: hacks.mk,v 1.2 2005/12/05 20:50:21 rillig Exp $
-.ifndef NETPBM_HACKS_MK
+.if !defined(NETPBM_HACKS_MK)
NETPBM_HACKS_MK= # defined
### [historic : ???]