summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2000-01-09 01:19:09 +0000
committerwiz <wiz@pkgsrc.org>2000-01-09 01:19:09 +0000
commit294cda9307c1821747cf0916959036d4c9af49cc (patch)
tree84cc91ee1e88bcdaf83e25507529503ebe695b4f
parent1270d96dce0710742da50ebb605c141bc0e84f21 (diff)
downloadpkgsrc-294cda9307c1821747cf0916959036d4c9af49cc.tar.gz
replaced some more commands by their ${COMMAND} counterparts
-rw-r--r--lang/f2c/Makefile18
-rw-r--r--lang/fort77/Makefile4
-rw-r--r--lang/ghc/Makefile4
-rw-r--r--lang/guavac/Makefile15
-rw-r--r--lang/python/Makefile11
-rw-r--r--lang/smalleiffel/Makefile8
-rw-r--r--lang/sml-nj/Makefile6
7 files changed, 35 insertions, 31 deletions
diff --git a/lang/f2c/Makefile b/lang/f2c/Makefile
index 10beee1dadb..27fc1b06363 100644
--- a/lang/f2c/Makefile
+++ b/lang/f2c/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 1999/12/22 20:22:14 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.8 2000/01/09 01:19:09 wiz Exp $
DISTNAME= f2c-19991025
PKGNAME= f2c-19991025p1
@@ -12,17 +12,17 @@ HOMEPAGE= http://www.netlib.org/f2c/index.html
CONFLICTS= egcs-current-19980608
post-extract::
- @rm ${WRKSRC}/index.html
- @gunzip ${WRKSRC}/*.gz
- @cd ${WRKSRC} ; sh libf77 ; sh libi77
- @rm ${WRKSRC}/src/index.html
- @mv ${WRKSRC}/src/.depend ${WRKSRC}/src/depend.orig
- @gunzip ${WRKSRC}/src/*.gz
+ @${RM} ${WRKSRC}/index.html
+ @${GUNZIP_CMD} ${WRKSRC}/*.gz
+ @cd ${WRKSRC} ; ${SH} libf77 ; ${SH} libi77
+ @${RM} ${WRKSRC}/src/index.html
+ @${MV} ${WRKSRC}/src/.depend ${WRKSRC}/src/depend.orig
+ @${GUNZIP_CMD} ${WRKSRC}/src/*.gz
post-patch::
@cd ${WRKSRC} ; ${CC} -o chktypes chktypes.c
${WRKSRC}/chktypes
- @cp ${WRKSRC}/f2c.h ${WRKSRC}/libF77/f2c.h
- @cp ${WRKSRC}/f2c.h ${WRKSRC}/libI77/f2c.h
+ @${CP} ${WRKSRC}/f2c.h ${WRKSRC}/libF77/f2c.h
+ @${CP} ${WRKSRC}/f2c.h ${WRKSRC}/libI77/f2c.h
.include "../../mk/bsd.pkg.mk"
diff --git a/lang/fort77/Makefile b/lang/fort77/Makefile
index 7696a3171bb..700ecce215d 100644
--- a/lang/fort77/Makefile
+++ b/lang/fort77/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1999/12/16 14:56:37 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.5 2000/01/09 01:19:10 wiz Exp $
#
DISTNAME= fort77-1.14a
@@ -26,7 +26,7 @@ ALL_TARGET= test
USE_PERL5= YES
post-patch:
- for f in `find ${WRKDIR} -type f -print|xargs ${GREP} -l '/usr'`; \
+ for f in `${FIND} ${WRKDIR} -type f -print|xargs ${GREP} -l '/usr'`; \
do \
${SED} -e 's:/usr:'${PREFIX}':g' <$$f >$$f.pdone && \
${MV} $$f.pdone $$f; \
diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile
index 31516129811..1d3f7d792c9 100644
--- a/lang/ghc/Makefile
+++ b/lang/ghc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1999/12/27 18:20:11 tron Exp $
+# $NetBSD: Makefile,v 1.5 2000/01/09 01:19:11 wiz Exp $
# FreeBSD Id: ports/lang/ghc/Makefile,v 1.1.1.1 1999/11/10 17:25:28 nectar Exp
DISTNAME= ghc-4.04
@@ -44,7 +44,7 @@ pre-build:
(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} boot)
post-build:
- echo "GhcWithHscBuiltViaC=NO" >>${WRKSRC}/mk/build.mk
+ ${ECHO} "GhcWithHscBuiltViaC=NO" >>${WRKSRC}/mk/build.mk
(cd ${WRKSRC}/ghc/lib; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} clean boot all)
.include "../../mk/bsd.pkg.mk"
diff --git a/lang/guavac/Makefile b/lang/guavac/Makefile
index 6464ebff7d9..1a46106a2d3 100644
--- a/lang/guavac/Makefile
+++ b/lang/guavac/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 1999/04/07 13:21:00 agc Exp $
+# $NetBSD: Makefile,v 1.10 2000/01/09 01:19:11 wiz Exp $
#
DISTNAME= guavac-1.2
@@ -20,14 +20,17 @@ CXX= ${LOCALBASE}/egcs/bin/gcc
CONFIGURE_ENV+= CXX=${CXX}
.endif
-HAVE_GCC27!= ${CXX} -v 2>&1 | grep '2\.7\.'; echo
-.if !empty(HAVE_GCC27)
-IGNORE= "requires gcc 2.8 or egcs or better for ANSI C++"
-.endif
-
GNU_CONFIGURE= yes
post-install:
${MV} ${PREFIX}/man/cat1/guavac.man ${PREFIX}/man/cat1/guavac.0
.include "../../mk/bsd.pkg.mk"
+
+# next check has to be below include, else ${GREP} and ${ECHO} don't get
+# expanded correctly
+
+HAVE_GCC27!= ${CXX} -v 2>&1 | ${GREP} '2\.7\.'; ${ECHO}
+.if !empty(HAVE_GCC27)
+IGNORE= "requires gcc 2.8 or egcs or better for ANSI C++"
+.endif
diff --git a/lang/python/Makefile b/lang/python/Makefile
index 6462b26bcee..2e14132dc5b 100644
--- a/lang/python/Makefile
+++ b/lang/python/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 1999/08/02 10:59:34 agc Exp $
+# $NetBSD: Makefile,v 1.18 2000/01/09 01:19:11 wiz Exp $
#
DISTNAME= py152
@@ -48,10 +48,11 @@ post-configure:
post-install:
${CAT} ${PKGDIR}/PLIST.pre >${PLIST_SRC}
- (cd ${PREFIX}; find lib/python1.5 -type f -print >>${PLIST_SRC})
- (cd ${PREFIX}; find include/python1.5 -type f -print >>${PLIST_SRC})
- (cd ${PREFIX}; find -d include/python1.5 -type d -print | \
- ${SED} -e "s/^/@dirrm /" >>${PLIST_SRC})
+ (cd ${PREFIX}; ${FIND} lib/python1.5 -type f -print >>${PLIST_SRC})
+ (cd ${PREFIX}; ${FIND} include/python1.5 -type f -print \
+ >>${PLIST_SRC})
+ (cd ${PREFIX}; ${FIND} -d include/python1.5 -type d -print | \
+ ${SED} -e "s/^/@dirrm /" >>${PLIST_SRC})
${ECHO} "@unexec ${RM} -rf %D/lib/python1.5" >>${PLIST_SRC}
# Reinstall Python binary to get it stripped
${RM} ${PREFIX}/bin/python ${PREFIX}/bin/python1.5
diff --git a/lang/smalleiffel/Makefile b/lang/smalleiffel/Makefile
index f9585360cd0..300ef777ed6 100644
--- a/lang/smalleiffel/Makefile
+++ b/lang/smalleiffel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1999/10/13 19:03:38 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2000/01/09 01:19:11 wiz Exp $
#
DISTNAME= se
@@ -24,8 +24,8 @@ SE_BINARIES= clean compile compile_to_c compile_to_jvm \
finder pretty print_jvm_class short
post-extract:
- find ${WRKSRC} -type f -print | xargs ${CHMOD} 644
- find ${WRKSRC} -name ".gdb*" -print | xargs ${RM} -f
+ ${FIND} ${WRKSRC} -type f -print | xargs ${CHMOD} 644
+ ${FIND} ${WRKSRC} -name ".gdb*" -print | xargs ${RM} -f
cd ${WRKSRC}/man; ${RM} -f *.txt
cd ${WRKSRC}/sys; ${RM} -f compiler.se gc loadpath.* system.se
cd ${FILESDIR}; \
@@ -60,7 +60,7 @@ post-build:
${FILESDIR}/${BINNAME}.sh > ${WRKDIR}/${BINNAME}.sh
pre-install:
- find ${WRKSRC} -name "*.orig" -print | xargs ${RM} -f
+ ${FIND} ${WRKSRC} -name "*.orig" -print | xargs ${RM} -f
do-install:
${INSTALL_SCRIPT} ${WRKDIR}/${BINNAME}.sh ${PREFIX}/bin/${BINNAME}
diff --git a/lang/sml-nj/Makefile b/lang/sml-nj/Makefile
index 0796f016d34..b1268e20756 100644
--- a/lang/sml-nj/Makefile
+++ b/lang/sml-nj/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1999/12/09 16:35:18 agc Exp $
+# $NetBSD: Makefile,v 1.4 2000/01/09 01:19:11 wiz Exp $
# FreeBSD Id: ports/lang/sml-nj/Makefile,v 1.9 1999/08/25 06:35:27 obrien Exp
DISTNAME= ${SML_VERSION}-bin.${BOX}-unix
@@ -79,8 +79,8 @@ do-install:
${SED} -e "s,^BIN_DIR=.*\$$,BIN_DIR=${SML_BINDIR}," \
< ${WRKDIR}/bin/.run-sml > ${SML_BINDIR}/.run-sml
${CHMOD} 755 ${SML_BINDIR}/.run-sml
- cd ${WRKDIR} && ${GTAR} -cf - `find . -name '*.stable' | ${GREP} CM` | \
- ${GTAR} -C ${SML_BASE} -xf -
+ cd ${WRKDIR} && ${GTAR} -cf - `${FIND} . -name '*.stable' | \
+ ${GREP} CM` | ${GTAR} -C ${SML_BASE} -xf -
cd ${WRKDIR} && ${GTAR} -cf - `${SCRIPTDIR}/get-cm ${WRKDIR}` | \
${GTAR} -C ${SML_BASE} -xf -
for file in ${WRKDIR}/lib/*; do\