expr -> ${EXPR}

mv   -> ${MV}
rm   -> ${RM}
tr   -> ${TR}

5 files changed, 16 insertions, 16 deletions

diff --git a/net/bb/Makefile b/net/bb/Makefile
index 32bcae94fff2..1af527c97f86 100644
--- a/net/bb/Makefile
+++ b/net/bb/Makefile
@@ -3,7 +3,7 @@
 # Date created:         So  17 Nov 1996 16:59:23 MET
 # Whom:                 Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.32 1999/06/27 14:22:46 andreas Exp $
+# $Id: Makefile,v 1.33 1999/08/27 22:29:52 mharo Exp $
 #
 
 DISTNAME=	bb-1.2a
@@ -38,9 +38,9 @@ do-install:
 	@${LN} -fs ${PREFIX}/bb/www ${PREFIX}/share/apache/htdocs/bb
 	@${LN} -fs bb.html ${PREFIX}/bb/www/index.html
 	@${LN} -fs ${PREFIX}/bb/web/bb-ack.sh ${PREFIX}/share/apache/cgi-bin
-	@mv -f ${PREFIX}/bb/doc/bbclient ${PREFIX}/bb/bin
-	@mv -f ${PREFIX}/bb/doc/bbconfig ${PREFIX}/bb/bin
-	@mv -f ${PREFIX}/bb/doc ${PREFIX}/share/doc/bb
+	@${MV} -f ${PREFIX}/bb/doc/bbclient ${PREFIX}/bb/bin
+	@${MV} -f ${PREFIX}/bb/doc/bbconfig ${PREFIX}/bb/bin
+	@${MV} -f ${PREFIX}/bb/doc ${PREFIX}/share/doc/bb
 	@${MKDIR} ${PREFIX}/share/bb/bbclients
 	@${TOUCH} ${PREFIX}/share/bb/bbclients/.keep_me
 	@${RM} ${PREFIX}/bb/KNOWN.BUGS
diff --git a/net/dgd-net/Makefile b/net/dgd-net/Makefile
index 21c5a0c0b231..8694bd3aecfe 100644
--- a/net/dgd-net/Makefile
+++ b/net/dgd-net/Makefile
@@ -3,7 +3,7 @@
 # Date created:		17 June 1996
 # Whom:			adam
 #
-# $Id: Makefile,v 1.32 1999/08/23 04:23:35 mharo Exp $
+# $Id: Makefile,v 1.33 1999/08/28 01:57:43 mharo Exp $
 #
 
 DISTNAME=	dgd-net-1.1p6
@@ -45,14 +45,14 @@ pre-patch:
 
 post-build:
 	@cd ${WRKSRC}; ${MAKE} install
-	@mv ${WRKDIR}/dgd/bin/driver ${WRKDIR}/dgd/bin/driver.net
-	@mv ${WRKDIR}/dgd/bin/precomp ${WRKDIR}/dgd/bin/precomp.net
-	@mv ${WRKDIR}/dgd/doc/Introduction ${WRKDIR}/dgd/doc/Introduction.NET
-	@mv ${WRKDIR}/dgd/doc/kfun/send_message ${WRKDIR}/dgd/doc/kfun/send_message.NET
+	@${MV} ${WRKDIR}/dgd/bin/driver ${WRKDIR}/dgd/bin/driver.net
+	@${MV} ${WRKDIR}/dgd/bin/precomp ${WRKDIR}/dgd/bin/precomp.net
+	@${MV} ${WRKDIR}/dgd/doc/Introduction ${WRKDIR}/dgd/doc/Introduction.NET
+	@${MV} ${WRKDIR}/dgd/doc/kfun/send_message ${WRKDIR}/dgd/doc/kfun/send_message.NET
 	@${CHMOD} o+r ${WRKDIR}/dgd/doc/kfun/*
 
 do-install:
-	@-mv ${PREFIX}/dgd/bin/driver.net ${PREFIX}/dgd/bin/driver.net.old
+	@-${MV} ${PREFIX}/dgd/bin/driver.net ${PREFIX}/dgd/bin/driver.net.old
 	@tar -C ${WRKDIR} -cf - `${GREP} '^dgd/' ${PKGDIR}/PLIST` \
 		| tar -C ${PREFIX} -xpf -
 
diff --git a/net/dgd/Makefile b/net/dgd/Makefile
index 6710da89becf..e131e306282a 100644
--- a/net/dgd/Makefile
+++ b/net/dgd/Makefile
@@ -3,7 +3,7 @@
 # Date created:		23 August 1994
 # Whom:			adam
 #
-# $Id: Makefile,v 1.78 1999/08/22 18:59:22 mharo Exp $
+# $Id: Makefile,v 1.79 1999/08/23 04:23:36 mharo Exp $
 #
 
 DISTNAME=	dgd-1.1p6
@@ -43,7 +43,7 @@ post-build:
 	@${CHMOD} o+r ${WRKDIR}/dgd/doc/kfun/*
 
 do-install:
-	@-mv ${PREFIX}/dgd/bin/driver ${PREFIX}/dgd/bin/driver.old
+	@-${MV} ${PREFIX}/dgd/bin/driver ${PREFIX}/dgd/bin/driver.old
 	@tar -C ${WRKDIR} -cf - `${GREP} '^dgd/' ${PKGDIR}/PLIST` \
 		| tar -C ${PREFIX} -xpf -
 
diff --git a/net/pmf/Makefile b/net/pmf/Makefile
index bde4a38d9d8d..0ea015bb35e0 100644
--- a/net/pmf/Makefile
+++ b/net/pmf/Makefile
@@ -3,7 +3,7 @@
 # Date created:         24 Sep 1994
 # Whom:                 adam
 #
-# $Id: Makefile,v 1.11 1999/06/06 12:51:53 jseger Exp $
+# $Id: Makefile,v 1.12 1999/08/22 18:59:29 mharo Exp $
 #
 
 DISTNAME=       pmf-1.13.1
@@ -18,7 +18,7 @@ WRKSRC=		${WRKDIR}/pmfdir/src
 pre-install:
 	@${MKDIR} ${PREFIX}/lib/pmf
 	@find ${WRKSRC}/../system_dir -name '*.orig' -exec ${RM} {} \;
-	@-mv ${WRKSRC}/../doc/pmf.doc ${WRKSRC}/../system_dir
+	@-${MV} ${WRKSRC}/../doc/pmf.doc ${WRKSRC}/../system_dir
 	@tar -C ${WRKSRC}/../system_dir -cf - . \
 		| tar -C ${PREFIX}/lib/pmf -xf -
 	@${CHOWN} -R bin.bin ${PREFIX}/lib/pmf
diff --git a/net/wais/Makefile b/net/wais/Makefile
index 3735b95e663d..103aedd3d618 100644
--- a/net/wais/Makefile
+++ b/net/wais/Makefile
@@ -3,7 +3,7 @@
 # Date created:         20 Sep 1994
 # Whom:                 adam
 #
-# $Id: Makefile,v 1.11 1996/12/01 01:23:17 obrien Exp $
+# $Id: Makefile,v 1.12 1996/12/08 09:48:59 max Exp $
 #
 
 DISTNAME=       freeWAIS-0.5
@@ -21,7 +21,7 @@ is_depended: all
 
 pre-patch:
 	@${CP} ${WRKSRC}/Makefile.bsdi ${WRKSRC}/Makefile.freebsd
-	@mv ${WRKSRC}/src/client/x/Imakefile ${WRKDIR} \
+	@${MV} ${WRKSRC}/src/client/x/Imakefile ${WRKDIR} \
 	&& ${SED} -e '\;/SETME_IN_Imakefile;s;;${WRKSRC};' \
 		<${WRKDIR}/Imakefile >${WRKSRC}/src/client/x/Imakefile