From e223e77651d454e3a71ff010c26610a64bde6f3a Mon Sep 17 00:00:00 2001
From: jtb <jtb>
Date: Sat, 28 Apr 2001 23:59:17 +0000
Subject: Remove redundant echoing, quoting, and input redirection to sed.

---
 math/admesh/Makefile   |  8 +++-----
 math/aribas/Makefile   | 12 +++---------
 math/mcsim/Makefile    | 18 ++++++------------
 math/meschach/Makefile | 38 +++++++++++++-------------------------
 math/metis/Makefile    | 22 +++++++---------------
 math/odepack/Makefile  |  5 ++---
 math/quadpack/Makefile |  6 ++----
 math/rlab/Makefile     | 16 ++++++++--------
 math/slatec/Makefile   |  5 ++---
 math/tela/Makefile     |  6 +++---
 math/tochnog/Makefile  | 12 +++---------
 math/udunits/Makefile  |  4 ++--
 12 files changed, 54 insertions(+), 98 deletions(-)

(limited to 'math')

diff --git a/math/admesh/Makefile b/math/admesh/Makefile
index 3f97bb48578..66ac481981b 100644
--- a/math/admesh/Makefile
+++ b/math/admesh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/04/14 21:43:50 jtb Exp $
+# $NetBSD: Makefile,v 1.4 2001/04/28 23:59:20 jtb Exp $
 
 DISTNAME=		admesh-0.95
 CATEGORIES=		math
@@ -13,10 +13,8 @@ GNU_CONFIGURE=		yes
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/admesh ${PREFIX}/bin
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/admesh
-	@for f in README ADMESH.DOC; do					\
-	i="${INSTALL_DATA} ${WRKSRC}/$$f ${PREFIX}/share/doc/admesh/";	\
-	${ECHO} $$i; $$i;						\
-	done
+	cd ${WRKSRC} && ${INSTALL_DATA} README ADMESH.DOC		\
+		${PREFIX}/share/doc/admesh/
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/admesh
 	${INSTALL_DATA} ${WRKSRC}/block.stl ${PREFIX}/share/examples/admesh
 
diff --git a/math/aribas/Makefile b/math/aribas/Makefile
index e645b11a2b2..b0d5fb15644 100644
--- a/math/aribas/Makefile
+++ b/math/aribas/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/04/14 21:43:50 jtb Exp $
+# $NetBSD: Makefile,v 1.5 2001/04/28 23:59:20 jtb Exp $
 
 DISTNAME=	aribas-1.20
 CATEGORIES=	math
@@ -15,15 +15,9 @@ MAKE_ENV+=	CPPFLAGS="-DUNiX -DPROTO"
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/aribas ${PREFIX}/bin
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/aribas
-	@for f in ${WRKDIR}/aribas/doc/*; do \
-		i="${INSTALL_DATA} $$f ${PREFIX}/share/doc/aribas/"; \
-		${ECHO} $$i; $$i; \
-	done
+	${INSTALL_DATA} ${WRKDIR}/aribas/doc/* ${PREFIX}/share/doc/aribas/
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/aribas
-	@for f in ${WRKDIR}/aribas/examples/*; do \
-		i="${INSTALL_DATA} $$f ${PREFIX}/share/examples/aribas/"; \
-		${ECHO} $$i; $$i; \
-	done
+	${INSTALL_DATA} ${WRKDIR}/aribas/examples/* ${PREFIX}/share/examples/aribas/
 	${INSTALL_DATA_DIR} ${PREFIX}/share/emacs/site-lisp
 	${INSTALL_DATA} ${WRKSRC}/EL/aribas.el ${PREFIX}/share/emacs/site-lisp
 
diff --git a/math/mcsim/Makefile b/math/mcsim/Makefile
index 45ee115459c..3bf39fbc802 100644
--- a/math/mcsim/Makefile
+++ b/math/mcsim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/04/14 21:43:52 jtb Exp $
+# $NetBSD: Makefile,v 1.5 2001/04/28 23:59:20 jtb Exp $
 
 DISTNAME=	mcsim-4.2.0
 CATEGORIES=	math
@@ -17,17 +17,11 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/mod/mod ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/sim/mcsim ${PREFIX}/bin
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mcsim
-	@for f in ${WRKSRC}/doc/*.txt ${WRKSRC}/doc/MCSim*	\
-	${WRKSRC}/doc/mcsim.dvi; do				\
-	i="${INSTALL_DATA} $$f ${PREFIX}/share/doc/mcsim/";	\
-	${ECHO} $$i; $$i;					\
-	done
+	${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${WRKSRC}/doc/MCSim*	\
+		${WRKSRC}/doc/mcsim.dvi ${PREFIX}/share/doc/mcsim/
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/mcsim
-	${INSTALL_DATA} ${WRKSRC}/doc/mcsim.html		\
-	${PREFIX}/share/doc/html/mcsim
-	@for f in mcsim mcsim-1 mcsim-2 mcsim-3; do		\
-	i="${INSTALL_DATA} ${WRKSRC}/doc/$$f ${PREFIX}/info/";	\
-	${ECHO} $$i; $$i;					\
-	done
+	${INSTALL_DATA} ${WRKSRC}/doc/mcsim.html			\
+		${PREFIX}/share/doc/html/mcsim
+	${INSTALL_DATA} mcsim mcsim-1 mcsim-2 mcsim-3 ${PREFIX}/info/
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/meschach/Makefile b/math/meschach/Makefile
index 7fc74bf98e2..9f89cb05195 100644
--- a/math/meschach/Makefile
+++ b/math/meschach/Makefile
@@ -1,8 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/04/14 21:43:53 jtb Exp $
-#
-#  XXX The tests run during configuration should not be compiled 
-#      with optimization as they determine machine parameters and
-#      may give incorrect results if optimized.
+# $NetBSD: Makefile,v 1.7 2001/04/28 23:59:20 jtb Exp $
 
 DISTNAME=		mesch12b
 PKGNAME=		meschach-1.2b
@@ -22,32 +18,24 @@ pre-patch:
 	${CP} ${FILESDIR}/makefile.in ${WRKSRC}
 
 post-patch:
-	${SED} -e 's:@PREFIX@:'${PREFIX}':g' ${FILESDIR}/makefile.test \
-	> ${WRKSRC}/Makefile
+	${SED} -e 's:@PREFIX@:'${PREFIX}':g' ${FILESDIR}/makefile.test 	\
+		> ${WRKSRC}/Makefile
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/include/meschach
-	@for f in err.h machine.h matlab.h matrix.h meminfo.h sparse.h	\
-	zmatrix.h iter.h matrix2.h oldnames.h sparse2.h zmatrix2.h; do	\
-	i="${INSTALL_DATA} ${WRKSRC}/$$f ${PREFIX}/include/meschach/";	\
-	${ECHO} $$i; $$i;						\
-	done
+	cd ${WRKSRC} && ${INSTALL_DATA} err.h machine.h matlab.h 	\
+		matrix.h meminfo.h sparse.h zmatrix.h iter.h matrix2.h 	\
+		oldnames.h sparse2.h zmatrix2.h ${PREFIX}/include/meschach/
 	${INSTALL_DATA_DIR} ${PREFIX}/share/meschach
 	${INSTALL_DATA_DIR} ${PREFIX}/share/meschach/tests
-	@for f in torture.c sptort.c ztorture.c memtort.c itertort.c	   \
-	mfuntort.c iotort.c; do						   \
-	i="${INSTALL_DATA} ${WRKSRC}/$$f ${PREFIX}/share/meschach/tests/"; \
-	${ECHO} $$i; $$i;						   \
-	done
+	cd ${WRKSRC} && ${INSTALL_DATA} torture.c sptort.c ztorture.c 	\
+		memtort.c itertort.c mfuntort.c iotort.c 		\
+		${PREFIX}/share/meschach/tests/
 	${INSTALL_DATA} ${WRKSRC}/Makefile ${PREFIX}/share/meschach/tests
-	@for f in ${WRKSRC}/README ${WRKSRC}/DOC/*; do			\
-	i="${INSTALL_DATA} $$f ${PREFIX}/share/meschach/";		\
-	${ECHO} $$i; $$i;						\
-	done
+	cd ${WRKSRC} && ${INSTALL_DATA} README ./DOC/* 			\
+		${PREFIX}/share/meschach/
 	${INSTALL_DATA} ${WRKSRC}/copyright ${PREFIX}/share/meschach
-	@for f in tutadv.c tutorial.c; do				\
-	i="${INSTALL_DATA} ${WRKSRC}/$$f ${PREFIX}/share/meschach/";	\
-	${ECHO} $$i; $$i;						\
-	done
+	cd ${WRKSRC} && ${INSTALL_DATA} tutadv.c tutorial.c		\
+		${PREFIX}/share/meschach/
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/metis/Makefile b/math/metis/Makefile
index 04a5a13694c..1dbd1d82758 100644
--- a/math/metis/Makefile
+++ b/math/metis/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/04/14 21:43:53 jtb Exp $
+# $NetBSD: Makefile,v 1.4 2001/04/28 23:59:20 jtb Exp $
 
 DISTNAME=		metis-4.0
 CATEGORIES=		math
@@ -11,25 +11,17 @@ COMMENT=		Unstructured graph partitioning and sparse matrix ordering system
 ALL_TARGET=		default
 
 do-install:
-	@for f in graphchk kmetis mesh2dual mesh2nodal oemetis onmetis	\
-	partdmesh partnmesh pmetis; do					\
-	i="${INSTALL_PROGRAM} ${WRKSRC}/$$f ${PREFIX}/bin/";		\
-	${ECHO} $$i; $$i;						\
-	done
+	cd ${WRKSRC} && ${INSTALL_PROGRAM} graphchk kmetis mesh2dual 	\
+		mesh2nodal oemetis onmetis partdmesh partnmesh pmetis	\
+		${PREFIX}/bin/
 	${INSTALL_DATA} ${WRKSRC}/libmetis.a ${PREFIX}/lib
 	${INSTALL_DATA_DIR} ${PREFIX}/include/metis
-	@for f in ${WRKSRC}/Lib/*.h; do				\
-	i="${INSTALL_DATA} $$f ${PREFIX}/include/metis/";	\
-	${ECHO} $$i; $$i;					\
-	done
+	${INSTALL_DATA} ${WRKSRC}/Lib/*.h ${PREFIX}/include/metis/
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/metis
 	${INSTALL_DATA} ${WRKSRC}/Doc/manual.ps ${PREFIX}/share/doc/metis
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/metis
-	@for f in 0README 4elt.graph metis.mesh test.mgraph; do	\
-	i="${INSTALL_DATA} ${WRKSRC}/Graphs/$$f			\
-	${PREFIX}/share/examples/metis/";			\
-	${ECHO} $$i; $$i;					\
-	done
+	cd ${WRKSRC}/Graphs && ${INSTALL_DATA} 0README 4elt.graph 	\
+		metis.mesh test.mgraph ${PREFIX}/share/examples/metis/
 	${INSTALL_DATA} ${WRKSRC}/Test/mtest.c ${PREFIX}/share/examples/metis
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/odepack/Makefile b/math/odepack/Makefile
index 88ecda9ceb4..f24f4ba4197 100644
--- a/math/odepack/Makefile
+++ b/math/odepack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/04/14 21:43:54 jtb Exp $
+# $NetBSD: Makefile,v 1.7 2001/04/28 23:59:21 jtb Exp $
 
 DISTNAME=		odepack-20001130
 CATEGORIES=		math
@@ -16,7 +16,6 @@ pre-build:
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/odepack
-	${INSTALL_DATA} ${WRKSRC}/doc ${PREFIX}/share/doc/odepack
-	${INSTALL_DATA} ${WRKSRC}/readme ${PREFIX}/share/doc/odepack
+	cd ${WRKSRC} && ${INSTALL_DATA} doc readme ${PREFIX}/share/doc/odepack
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/quadpack/Makefile b/math/quadpack/Makefile
index 0a58fe1997d..bbc0835eec1 100644
--- a/math/quadpack/Makefile
+++ b/math/quadpack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/04/14 21:43:56 jtb Exp $
+# $NetBSD: Makefile,v 1.6 2001/04/28 23:59:21 jtb Exp $
 
 DISTNAME=		quadpack-20001130
 CATEGORIES=		math
@@ -16,8 +16,6 @@ pre-build:
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/quadpack
-	for i in doc readme ; do					\
-	${INSTALL_DATA} ${WRKSRC}/$$i ${PREFIX}/share/doc/quadpack;	\
-	done
+	cd ${WRKSRC} && ${INSTALL_DATA} doc readme ${PREFIX}/share/doc/quadpack
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/rlab/Makefile b/math/rlab/Makefile
index d998b697862..52b4808911b 100644
--- a/math/rlab/Makefile
+++ b/math/rlab/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/04/14 21:43:56 jtb Exp $
+# $NetBSD: Makefile,v 1.9 2001/04/28 23:59:21 jtb Exp $
 
 DISTNAME=		rlab-2.1.05
 CATEGORIES=		math
@@ -17,7 +17,7 @@ GNU_CONFIGURE=		YES
 USE_FORTRAN=		YES
 
 EVAL_PREFIX+=		GC_PREFIX=boehm-gc
-CONFIGURE_ARGS+=	"--with-GC=${GC_PREFIX}"
+CONFIGURE_ARGS+=	--with-GC=${GC_PREFIX}
 
 PLIST_SRC=		${PKGDIR}/PLIST
 
@@ -27,31 +27,31 @@ RLAB_PLOT_PKG?=		gnuplot
 .if (${RLAB_PLOT_PKG} == "plplot")
 DEPENDS+=		plplot>=5.0.1:../../graphics/plplot
 EVAL_PREFIX+=		PLPLOT_PREFIX=plplot
-CONFIGURE_ARGS+=	"--with-plplot=${PLPLOT_PREFIX}"
+CONFIGURE_ARGS+=	--with-plplot=${PLPLOT_PREFIX}
 PLIST_SRC+=		${PKGDIR}/PLIST.plplot
 .elif (${RLAB_PLOT_PKG} == "plotmtv")
 DEPENDS+=		plotmtv-[0-9]*:../../graphics/plotmtv
-CONFIGURE_ARGS+=	"--with-plotmtv=yes"
+CONFIGURE_ARGS+=	--with-plotmtv=yes
 PLIST_SRC+=		${PKGDIR}/PLIST.plotmtv
 .elif (${RLAB_PLOT_PKG} == "pgraf")
 DEPENDS+=		pgraf-[0-9]*:../../graphics/pgraf
 EVAL_PREFIX+=		PGRAF_PREFIX=pgraf
-CONFIGURE_ARGS+=	"--with-pgraf=yes"
+CONFIGURE_ARGS+=	--with-pgraf=yes
 PLIST_SRC+=		${PKGDIR}/PLIST.pgraf
 .else
 DEPENDS+=		gnuplot>=3.5:../../graphics/gnuplot
-CONFIGURE_ARGS+=	"--with-gnuplot=yes"
+CONFIGURE_ARGS+=	--with-gnuplot=yes
 PLIST_SRC+=		${PKGDIR}/PLIST.gnuplot
 .endif
 
 RLAB_USE_SUPERLU?=	YES
 .if (${RLAB_USE_SUPERLU} == YES)
 DEPENDS+=		superlu-[0-9]*:../../math/superlu
-CONFIGURE_ARGS+=	"--enable-SUPERLU"
+CONFIGURE_ARGS+=	--enable-SUPERLU
 .endif
 
 .if defined(RLAB_PAGER)
-CONFIGURE_ENV+=		"PAGER=${RLAB_PAGER}"
+CONFIGURE_ENV+=		PAGER="${RLAB_PAGER}"
 .endif
 
 pre-configure:
diff --git a/math/slatec/Makefile b/math/slatec/Makefile
index 8bcde3e5eab..0fc9eafed24 100644
--- a/math/slatec/Makefile
+++ b/math/slatec/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/04/14 21:43:56 jtb Exp $
+# $NetBSD: Makefile,v 1.7 2001/04/28 23:59:21 jtb Exp $
 
 DISTNAME=	slatec_src
 PKGNAME=	slatec-4.1
@@ -17,7 +17,6 @@ WRKSRC=		${WRKDIR}/src
 USE_FORTRAN=	YES
 
 post-extract:
-	${CP} ${FILESDIR}/d1mach.f ${FILESDIR}/i1mach.f ${FILESDIR}/r1mach.f \
-	${FILESDIR}/Makefile ${WRKSRC}
+	cd ${FILESDIR} && ${CP} d1mach.f i1mach.f r1mach.f Makefile ${WRKSRC}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/tela/Makefile b/math/tela/Makefile
index db1010cd38e..1a4f74bfae4 100644
--- a/math/tela/Makefile
+++ b/math/tela/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/04/24 23:43:02 jtb Exp $
+# $NetBSD: Makefile,v 1.8 2001/04/28 23:59:21 jtb Exp $
 
 DISTNAME=	tela-1.32
 CATEGORIES=	math
@@ -25,8 +25,8 @@ USE_X11=	#defined
 
 INSTALL_TARGET= install installdocs
 
-CONFIGURE_ENV+=	"INSTALLATION_PREFIX=${PREFIX}/share/tela"
-CONFIGURE_ENV+=	"ARCHDEP_INSTALLATION_PREFIX=${PREFIX}/lib/tela"
+CONFIGURE_ENV+=	INSTALLATION_PREFIX="${PREFIX}/share/tela"
+CONFIGURE_ENV+=	ARCHDEP_INSTALLATION_PREFIX="${PREFIX}/lib/tela"
 
 pre-configure:
 	@for f in ${WRKSRC}/t/demo.t ${WRKSRC}/t/docview.t	\
diff --git a/math/tochnog/Makefile b/math/tochnog/Makefile
index 3a47964e926..17ca7ecb7d5 100644
--- a/math/tochnog/Makefile
+++ b/math/tochnog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/04/14 21:43:57 jtb Exp $
+# $NetBSD: Makefile,v 1.7 2001/04/28 23:59:22 jtb Exp $
 
 DISTNAME=	tochnog-20010210
 CATEGORIES=	math
@@ -26,14 +26,8 @@ do-install:
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/tnp.ps.gz \
 	${PREFIX}/share/doc/tochnog
 	${INSTALL_DATA_DIR} ${PREFIX}/share/tochnog/test
-	@for f in ${WRKDIR}/tochnog/test/*; do			\
-	i="${INSTALL_DATA} $$f ${PREFIX}/share/tochnog/test/";	\
-	${ECHO} $$i; $$i;					\
-	done
+	${INSTALL_DATA} ${WRKDIR}/tochnog/test/* ${PREFIX}/share/tochnog/test/
 	${INSTALL_DATA_DIR} ${PREFIX}/share/tochnog/tools
-	@for f in ${WRKDIR}/tochnog/tools/*; do			\
-	i="${INSTALL_DATA} $$f ${PREFIX}/share/tochnog/tools/";	\
-	${ECHO} $$i; $$i;					\
-	done
+	${INSTALL_DATA} ${WRKDIR}/tochnog/tools/* ${PREFIX}/share/tochnog/tools/
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/udunits/Makefile b/math/udunits/Makefile
index 8f4e0a485d0..c33ed69ed1e 100644
--- a/math/udunits/Makefile
+++ b/math/udunits/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/04/14 21:43:57 jtb Exp $
+# $NetBSD: Makefile,v 1.4 2001/04/28 23:59:22 jtb Exp $
 
 DISTNAME=		udunits
 PKGNAME=		udunits-1.11.7
@@ -14,7 +14,7 @@ WRKSRC=			${WRKDIR}/${PKGNAME}/src
 DIST_SUBDIR=		${PKGNAME}
 GNU_CONFIGURE=		yes
 CPPFLAGS+=		-Df2cFortran -Dunix
-CONFIGURE_ENV+=		"CPPFLAGS=${CPPFLAGS}"
+CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
 USE_PERL5=		yes
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/UDUNITS/.packlist
 
-- 
cgit v1.2.3