summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorrodent <rodent@pkgsrc.org>2013-04-06 21:07:31 +0000
committerrodent <rodent@pkgsrc.org>2013-04-06 21:07:31 +0000
commitadda884d44cb88a3a470e58f81adefef66c4f3b7 (patch)
treec9dec68b64c6028a90065156103df5ec5322256c /graphics
parent0fe51336d1067daa8658086c8d91d4a9b9c92c1f (diff)
downloadpkgsrc-adda884d44cb88a3a470e58f81adefef66c4f3b7.tar.gz
"Each sed command should appear in an assignment of its own."
Diffstat (limited to 'graphics')
-rw-r--r--graphics/tkpiechart/Makefile6
-rw-r--r--graphics/vnc2swf/Makefile13
-rw-r--r--graphics/xpaint/Makefile10
3 files changed, 15 insertions, 14 deletions
diff --git a/graphics/tkpiechart/Makefile b/graphics/tkpiechart/Makefile
index 5dc3b811161..cfd15c26387 100644
--- a/graphics/tkpiechart/Makefile
+++ b/graphics/tkpiechart/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2012/10/06 14:11:23 asau Exp $
+# $NetBSD: Makefile,v 1.19 2013/04/06 21:07:32 rodent Exp $
DISTNAME= tkpiechart-5.4
PKGREVISION= 1
@@ -21,8 +21,8 @@ SUBST_CLASSES+= patch
SUBST_MESSAGE.patch= Remove version numbers for required packages.
SUBST_STAGE.patch= post-patch
SUBST_FILES.patch= demo demo.tcl instapkg.tcl piechart.htm
-SUBST_SED.patch= -e '/require/s/stooop 3.7/stooop/g' \
- -e '/require/s/switched 1.4/switched/g'
+SUBST_SED.patch= -e '/require/s/stooop 3.7/stooop/g'
+SUBST_SED.patch+= -e '/require/s/switched 1.4/switched/g'
post-patch:
${CHMOD} a+x ${WRKSRC}/instapkg.tcl
diff --git a/graphics/vnc2swf/Makefile b/graphics/vnc2swf/Makefile
index 51b64740698..b10d5389176 100644
--- a/graphics/vnc2swf/Makefile
+++ b/graphics/vnc2swf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2013/03/20 03:05:50 obache Exp $
+# $NetBSD: Makefile,v 1.19 2013/04/06 21:07:32 rodent Exp $
#
DISTNAME= vnc2swf-0.5.0
@@ -36,11 +36,12 @@ SUBST_SED.x11base= -e "s|/usr/X11R6|${PREFIX}|"
SUBST_CLASSES+= toolpath
SUBST_STAGE.toolpath= pre-configure
SUBST_FILES.toolpath= recordwin.sh
-SUBST_SED.toolpath= -e "s|VNC2SWF=vnc2swf|VNC2SWF=${PREFIX}/bin/vnc2swf|" \
- -e "s|X11VNC=x11vnc|X11VNC=${PREFIX}/bin/x11vnc|" \
- -e "s|XWININFO=xwininfo|XWININFO=${X11BASE}/bin/xwininfo|" \
- -e "s|AWK=awk|AWK=${AWK}|" \
- -e 's|-mouse|-localhost|'
+SUBST_SED.toolpath= -e "s|VNC2SWF=vnc2swf|VNC2SWF=${PREFIX}/bin/vnc2swf|"
+SUBST_SED.toolpath+= -e "s|X11VNC=x11vnc|X11VNC=${PREFIX}/bin/x11vnc|"
+SUBST_SED.toolpath+= -e "s|XWININFO=xwininfo|XWININFO=${X11BASE}/bin/xwininfo|"
+SUBST_SED.toolpath+= -e "s|AWK=awk|AWK=${AWK}|"
+SUBST_SED.toolpath+= -e 's|-mouse|-localhost|'
+
post-install:
${INSTALL_DATA} ${WRKSRC}/Vnc2Swf.ad ${DESTDIR}${PREFIX}/lib/X11/app-defaults/Vnc2Swf
cd ${WRKSRC}/docs && \
diff --git a/graphics/xpaint/Makefile b/graphics/xpaint/Makefile
index 824c51ccd25..a361677f231 100644
--- a/graphics/xpaint/Makefile
+++ b/graphics/xpaint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.73 2013/02/16 11:22:35 wiz Exp $
+# $NetBSD: Makefile,v 1.74 2013/04/06 21:07:33 rodent Exp $
DISTNAME= xpaint-2.7.8.1
PKGREVISION= 10
@@ -18,10 +18,10 @@ MAKE_JOBS_SAFE= NO
SUBST_CLASSES+= foo
SUBST_STAGE.foo= pre-configure
SUBST_FILES.foo= Local.config configure
-SUBST_SED.foo= -e "s|@LOCALBASE@|${LOCALBASE}|g" \
- -e "s|@PREFIX@|${PREFIX}|g" \
- -e "s|@XAWDIR@|${BUILDLINK_PREFIX.Xaw3d}|g" \
- -e "s|@XPMDIR@|${BUILDLINK_PREFIX.libXpm}|g"
+SUBST_SED.foo= -e "s|@LOCALBASE@|${LOCALBASE}|g"
+SUBST_SED.foo+= -e "s|@PREFIX@|${PREFIX}|g"
+SUBST_SED.foo+= -e "s|@XAWDIR@|${BUILDLINK_PREFIX.Xaw3d}|g"
+SUBST_SED.foo+= -e "s|@XPMDIR@|${BUILDLINK_PREFIX.libXpm}|g"
INSTALLATION_DIRS+= bin lib/X11/app-defaults ${PKGMANDIR}/cat1
INSTALLATION_DIRS+= share/xpaint