Remove redundant echoing, quoting, and input redirection to sed.

5 files changed, 40 insertions, 49 deletions

diff --git a/graphics/geomview/Makefile b/graphics/geomview/Makefile
index 5b92ba9d0e2..958f6112059 100644
--- a/graphics/geomview/Makefile
+++ b/graphics/geomview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/04/14 21:43:43 jtb Exp $
+# $NetBSD: Makefile,v 1.7 2001/04/28 23:59:18 jtb Exp $
 
 DISTNAME=		geomview-1.8.1
 CATEGORIES=		graphics math
@@ -19,7 +19,7 @@ EVAL_PREFIX+=		MESA_PREFIX=Mesa
 CONFIGURE_ARGS+=	--without-xforms
 CONFIGURE_ARGS+=	--with-opengl=${MESA_PREFIX}
 CONFIGURE_ARGS+=	--with-motif=${MOTIFBASE}
-CONFIGURE_ENV+=		"CPPFLAGS=-Dunix -Dalloca=__builtin_alloca"
+CONFIGURE_ENV+=		CPPFLAGS="-Dunix -Dalloca=__builtin_alloca"
 
 INFO_FILES=		geomview
 
diff --git a/graphics/pgraf/Makefile b/graphics/pgraf/Makefile
index 904e21577fc..163bc8ddad7 100644
--- a/graphics/pgraf/Makefile
+++ b/graphics/pgraf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/04/14 21:43:44 jtb Exp $
+# $NetBSD: Makefile,v 1.5 2001/04/28 23:59:19 jtb Exp $
 
 DISTNAME=		pgraf-20010131
 CATEGORIES=		graphics
@@ -20,9 +20,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/man/man3/pgraf.3 ${PREFIX}/man/man3
 	${INSTALL_DATA} ${WRKSRC}/man/man5/pgraf.5 ${PREFIX}/man/man5
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/pgraf
-	@for f in ${WRKSRC}/metagens/*.r ${WRKSRC}/tests/*; do 		 \
-		i="${INSTALL_DATA} $$f ${PREFIX}/share/examples/pgraf/"; \
-		${ECHO} $$i; $$i; 					 \
-	done
+	${INSTALL_DATA} ${WRKSRC}/metagens/*.r ${WRKSRC}/tests/*	\
+		${PREFIX}/share/examples/pgraf/
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/plotmtv/Makefile b/graphics/plotmtv/Makefile
index 031900dbfd0..287f398cbf6 100644
--- a/graphics/plotmtv/Makefile
+++ b/graphics/plotmtv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/04/14 21:43:45 jtb Exp $
+# $NetBSD: Makefile,v 1.5 2001/04/28 23:59:19 jtb Exp $
 
 DISTNAME=	Plotmtv1.4.1
 PKGNAME=	plotmtv-1.4.1
@@ -21,6 +21,6 @@ post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/plotmtv
 	${INSTALL_DATA} ${WRKSRC}/Tests/*.mtv ${PREFIX}/share/examples/plotmtv
 	${INSTALL_SCRIPT} ${WRKSRC}/Tests/run.sh ${WRKSRC}/Tests/run.csh \
-	${PREFIX}/share/examples/plotmtv
+		${PREFIX}/share/examples/plotmtv
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/plplot/Makefile b/graphics/plplot/Makefile
index 48d01f48f9b..cfb96c52168 100644
--- a/graphics/plplot/Makefile
+++ b/graphics/plplot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2001/04/14 21:43:45 jtb Exp $
+# $NetBSD: Makefile,v 1.15 2001/04/28 23:59:19 jtb Exp $
 
 DISTNAME=	plplot-5.0.3
 CATEGORIES=	graphics
@@ -21,38 +21,37 @@ USE_X11=	#defined
 
 EVAL_PREFIX+=	TK_PREFIX=tk TCL_PREFIX=tcl
 
-CONFIGURE_ENV+=	"BIN_DIR=${PREFIX}/bin"
-CONFIGURE_ENV+=	"LIB_DIR=${PREFIX}/lib"
-CONFIGURE_ENV+=	"INCLUDE_DIR=${PREFIX}/include/plplot"
-CONFIGURE_ENV+=	"DATA_DIR=${PREFIX}/libdata/plplot"
-CONFIGURE_ENV+=	"DOC_DIR=${PREFIX}/share/doc/plplot"
-CONFIGURE_ENV+=	"DEMOS_DIR=${PREFIX}/share/examples/plplot"
-CONFIGURE_ENV+=	"TCL_DIR=${PREFIX}/lib/tcl/plplot"
-CONFIGURE_ENV+=	"TKINCDIR=${TK_PREFIX}/include"
-CONFIGURE_ENV+=	"TKLIBDIR=${TK_PREFIX}/lib"
-CONFIGURE_ENV+=	"TCLINCDIR=${TCL_PREFIX}/include"
-CONFIGURE_ENV+=	"TCLLIBDIR=${TCL_PREFIX}/lib"
-CONFIGURE_ENV+=	"USER_FLAGS_C=${CFLAGS}"
-CONFIGURE_ENV+=	"USER_FLAGS_LC=${LDFLAGS}"
-CONFIGURE_ENV+=	"USER_FLAGS_CXX=${CXXFLAGS}"
-CONFIGURE_ENV+=	"USER_FLAGS_LCXX=${LDFLAGS}"
-CONFIGURE_ENV+=	"USER_FLAGS_F=${FFLAGS}"
-CONFIGURE_ENV+=	"USER_FLAGS_LF=${LDLAGS}"
+CONFIGURE_ENV+=	BIN_DIR="${PREFIX}/bin"
+CONFIGURE_ENV+=	LIB_DIR="${PREFIX}/lib"
+CONFIGURE_ENV+=	INCLUDE_DIR="${PREFIX}/include/plplot"
+CONFIGURE_ENV+=	DATA_DIR="${PREFIX}/libdata/plplot"
+CONFIGURE_ENV+=	DOC_DIR="${PREFIX}/share/doc/plplot"
+CONFIGURE_ENV+=	DEMOS_DIR="${PREFIX}/share/examples/plplot"
+CONFIGURE_ENV+=	TCL_DIR="${PREFIX}/lib/tcl/plplot"
+CONFIGURE_ENV+=	TKINCDIR="${TK_PREFIX}/include"
+CONFIGURE_ENV+=	TKLIBDIR="${TK_PREFIX}/lib"
+CONFIGURE_ENV+=	TCLINCDIR="${TCL_PREFIX}/include"
+CONFIGURE_ENV+=	TCLLIBDIR="${TCL_PREFIX}/lib"
+CONFIGURE_ENV+=	USER_FLAGS_C="${CFLAGS}"
+CONFIGURE_ENV+=	USER_FLAGS_LC="${LDFLAGS}"
+CONFIGURE_ENV+=	USER_FLAGS_CXX="${CXXFLAGS}"
+CONFIGURE_ENV+=	USER_FLAGS_LCXX="${LDFLAGS}"
+CONFIGURE_ENV+=	USER_FLAGS_F="${FFLAGS}"
+CONFIGURE_ENV+=	USER_FLAGS_LF="${LDLAGS}"
 
-CONFIGURE_ARGS+="--with-double"
-CONFIGURE_ARGS+="--enable-xwin"
-CONFIGURE_ARGS+="--enable-tcl"
-CONFIGURE_ARGS+="--enable-tk"
-CONFIGURE_ARGS+="--without-shlib"
-CONFIGURE_ARGS+="--disable-python"
-CONFIGURE_ARGS+="--disable-itcl"
-CONFIGURE_ARGS+="--disable-dp"
+CONFIGURE_ARGS+=--with-double
+CONFIGURE_ARGS+=--enable-xwin
+CONFIGURE_ARGS+=--enable-tcl
+CONFIGURE_ARGS+=--enable-tk
+CONFIGURE_ARGS+=--without-shlib
+CONFIGURE_ARGS+=--disable-python
+CONFIGURE_ARGS+=--disable-itcl
+CONFIGURE_ARGS+=--disable-dp
 
 post-patch:
-	for f in ${WRKSRC}/src/plctrl.c; do				\
-		${SED} -e 's:@PREFIX@:'${PREFIX}':g'			\
-		$$f > $$f.tmp && ${MV} $$f.tmp $$f;			\
-	done
+	${MV} -f ${WRKSRC}/src/plctrl.c ${WRKSRC}/src/plctrl.c.dist
+	${SED} -e 's:@PREFIX@:'${PREFIX}':g' ${WRKSRC}/src/plctrl.c.dist \
+		> ${WRKSRC}/src/plctrl.c
 
 pre-configure:
 	(cd ${WRKSRC}/cf && ${LOCALBASE}/bin/autoconf)
diff --git a/graphics/yplot/Makefile b/graphics/yplot/Makefile
index c9bebd69df2..32156c6e108 100644
--- a/graphics/yplot/Makefile
+++ b/graphics/yplot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/04/14 21:43:46 jtb Exp $
+# $NetBSD: Makefile,v 1.6 2001/04/28 23:59:19 jtb Exp $
 
 DISTNAME=		yplot-1.0.3
 CATEGORIES=		graphics math
@@ -24,19 +24,13 @@ pre-build:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/yplot ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/yplotl ${PREFIX}/bin
-	@for f in yplot.i yplotl.i yplot_body.i; do			\
-	i="${INSTALL_DATA} ${WRKSRC}/$$f				\
-	${PREFIX}/share/yorick/1.4/startup/";				\
-	${ECHO} $$i; $$i;						\
-	done
+	cd ${WRKSRC} && ${INSTALL_DATA} yplot.i yplotl.i yplot_body.i	\
+		${PREFIX}/share/yorick/1.4/startup/
 	${INSTALL_DATA} ${WRKSRC}/doc/yplot.doc				\
 	${PREFIX}/share/yorick/1.4/doc/
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/yplot
 	${INSTALL_DATA} ${WRKSRC}/doc/ytut.ps ${PREFIX}/share/doc/yplot
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/yplot
-	@for f in ${WRKSRC}/doc/*.i; do					\
-	i="${INSTALL_DATA} $$f ${PREFIX}/share/examples/yplot/";	\
-	${ECHO} $$i; $$i;						\
-	done
+	${INSTALL_DATA} ${WRKSRC}/doc/*.i ${PREFIX}/share/examples/yplot/
 
 .include "../../mk/bsd.pkg.mk"