expr -> ${EXPR}

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

51 files changed, 96 insertions, 96 deletions

diff --git a/audio/timidity++/Makefile b/audio/timidity++/Makefile
index 0fbe1937e479..3b5148935a1c 100644
--- a/audio/timidity++/Makefile
+++ b/audio/timidity++/Makefile
@@ -28,7 +28,7 @@ post-install:
 	${CP} goemon.cfg goemon.cfg.bak && \
 	${SED} 's=dir goemon=dir ${PREFIX}/lib/timidity/goemon=' \
 	   < goemon.cfg.bak > goemon.cfg && \
-	rm goemon.cfg.bak
+	${RM} goemon.cfg.bak
 
 
 .include <bsd.port.mk>
diff --git a/audio/timidity/Makefile b/audio/timidity/Makefile
index 0fbe1937e479..3b5148935a1c 100644
--- a/audio/timidity/Makefile
+++ b/audio/timidity/Makefile
@@ -28,7 +28,7 @@ post-install:
 	${CP} goemon.cfg goemon.cfg.bak && \
 	${SED} 's=dir goemon=dir ${PREFIX}/lib/timidity/goemon=' \
 	   < goemon.cfg.bak > goemon.cfg && \
-	rm goemon.cfg.bak
+	${RM} goemon.cfg.bak
 
 
 .include <bsd.port.mk>
diff --git a/benchmarks/bytebench/Makefile b/benchmarks/bytebench/Makefile
index b931574382ad..200f088c714e 100644
--- a/benchmarks/bytebench/Makefile
+++ b/benchmarks/bytebench/Makefile
@@ -32,6 +32,6 @@ do-install:
 	${CHMOD} 755 $(PREFIX)/lib/bytebench/pgms/*
 	${CHMOD} 755 $(PREFIX)/lib/bytebench/results
 	${CHMOD} 755 $(PREFIX)/lib/bytebench/testdir
-	@rm -f ${PREFIX}/lib/bytebench/pgms/*.orig
+	@${RM} -f ${PREFIX}/lib/bytebench/pgms/*.orig
 
 .include <bsd.port.mk>
diff --git a/benchmarks/unixbench/Makefile b/benchmarks/unixbench/Makefile
index b931574382ad..200f088c714e 100644
--- a/benchmarks/unixbench/Makefile
+++ b/benchmarks/unixbench/Makefile
@@ -32,6 +32,6 @@ do-install:
 	${CHMOD} 755 $(PREFIX)/lib/bytebench/pgms/*
 	${CHMOD} 755 $(PREFIX)/lib/bytebench/results
 	${CHMOD} 755 $(PREFIX)/lib/bytebench/testdir
-	@rm -f ${PREFIX}/lib/bytebench/pgms/*.orig
+	@${RM} -f ${PREFIX}/lib/bytebench/pgms/*.orig
 
 .include <bsd.port.mk>
diff --git a/cad/mars/Makefile b/cad/mars/Makefile
index 9910326476e3..99ed5a1ef138 100644
--- a/cad/mars/Makefile
+++ b/cad/mars/Makefile
@@ -39,7 +39,7 @@ do-install:
 	@(cd ${PREFIX}/share/doc ; \
 		${TAR} xfpz /${DISTDIR}/MaRS-2-doc.tar.gz ; \
 		[ -d mars ] && ${RM} -rf mars; \
-		/bin/mv doc mars )
+		${MV} doc mars )
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/libdlmalloc/Makefile b/devel/libdlmalloc/Makefile
index e6f17a017788..f827598e1bd9 100644
--- a/devel/libdlmalloc/Makefile
+++ b/devel/libdlmalloc/Makefile
@@ -17,7 +17,7 @@ MAINTAINER=	roberto@FreeBSD.ORG
 NO_WRKSUBDIR=   yes
 
 do-extract:
-	@rm -rf ${WRKDIR}
+	@${RM} -rf ${WRKDIR}
 	@${MKDIR} ${WRKDIR}
 	${CP} -p ${DISTDIR}/${DISTFILES} ${WRKDIR}
 	${CP} -p ${FILESDIR}/Makefile ${WRKDIR}
diff --git a/games/golddig/Makefile b/games/golddig/Makefile
index c5920fea6a9d..41eb0d87323e 100644
--- a/games/golddig/Makefile
+++ b/games/golddig/Makefile
@@ -20,7 +20,7 @@ MAN6=		golddig.6
 pre-patch:
 	@(cd ${WRKSRC}; for i in 245 244 246 247; do \
 	    ${AWK} '{if (/^#!/) x++} {if(x) print $$0'} $$i| /bin/sh; \
-	  done; mv golddig2/* .)
+	  done; ${MV} golddig2/* .)
 
 pre-install:
 	@${MKDIR} ${PREFIX}/bin
diff --git a/games/xjewel/Makefile b/games/xjewel/Makefile
index 052b549f711d..a766146907a7 100644
--- a/games/xjewel/Makefile
+++ b/games/xjewel/Makefile
@@ -24,7 +24,7 @@ pre-install:
 		${PREFIX}/lib/X11/xjewel)
 
 post-install:
-	@(mv ${PREFIX}/bin/xjewel ${PREFIX}/bin/xjewel_; \
+	@(${MV} ${PREFIX}/bin/xjewel ${PREFIX}/bin/xjewel_; \
 	$(ECHO) "#!/bin/sh" >${PREFIX}/bin/xjewel; \
 	$(ECHO) "xset +fp ${PREFIX}/lib/X11/xjewel" >>${PREFIX}/bin/xjewel; \
 	$(ECHO) "${PREFIX}/bin/xjewel_" >>${PREFIX}/bin/xjewel; \
diff --git a/games/yamsweeper/Makefile b/games/yamsweeper/Makefile
index f7c7ebfc64ff..8c71842eb14f 100644
--- a/games/yamsweeper/Makefile
+++ b/games/yamsweeper/Makefile
@@ -16,7 +16,7 @@ USE_IMAKE=	yes
 MAN1=		yamsweeper.1
 
 pre-configure:
-	@mv ${WRKSRC}/Imakefile ${WRKSRC}/Imakefile.old
+	@${MV} ${WRKSRC}/Imakefile ${WRKSRC}/Imakefile.old
 	@${CP} ${FILESDIR}/Imakefile ${WRKSRC}
 
 post-install:
diff --git a/graphics/p5-PGPLOT/Makefile b/graphics/p5-PGPLOT/Makefile
index c9bf6ba6a5cd..32af1e64dc16 100644
--- a/graphics/p5-PGPLOT/Makefile
+++ b/graphics/p5-PGPLOT/Makefile
@@ -31,7 +31,7 @@ F2CLIB=	-lf2c
 .endif
 
 post-patch:
-	(cd ${WRKSRC}/ExtUtils; mv -f F77.pm F77.pm~; ${SED} -e \
+	(cd ${WRKSRC}/ExtUtils; ${MV} -f F77.pm F77.pm~; ${SED} -e \
 	    's/@F2CLIB@/${F2CLIB}/g' F77.pm~ > F77.pm)
 
 post-install:
diff --git a/graphics/pgperl/Makefile b/graphics/pgperl/Makefile
index c9bf6ba6a5cd..32af1e64dc16 100644
--- a/graphics/pgperl/Makefile
+++ b/graphics/pgperl/Makefile
@@ -31,7 +31,7 @@ F2CLIB=	-lf2c
 .endif
 
 post-patch:
-	(cd ${WRKSRC}/ExtUtils; mv -f F77.pm F77.pm~; ${SED} -e \
+	(cd ${WRKSRC}/ExtUtils; ${MV} -f F77.pm F77.pm~; ${SED} -e \
 	    's/@F2CLIB@/${F2CLIB}/g' F77.pm~ > F77.pm)
 
 post-install:
diff --git a/japanese/gawk/Makefile b/japanese/gawk/Makefile
index 59af0bfbce23..7136950c315e 100644
--- a/japanese/gawk/Makefile
+++ b/japanese/gawk/Makefile
@@ -40,7 +40,7 @@ pre-fetch:
 	    done; \
 	    for file in ${DISTPATCHES} ; do zcat $${file}; done | \
 		${SED} -e '1,/-----8</d' -e '/-----8</,/-----8</d' | uudecode; \
-	    rm -f ${DISTPATCHES};\
+	    ${RM} -f ${DISTPATCHES};\
 	 fi)
 .endif
 
diff --git a/japanese/groff/Makefile b/japanese/groff/Makefile
index a221684467e0..81d40440687e 100644
--- a/japanese/groff/Makefile
+++ b/japanese/groff/Makefile
@@ -27,7 +27,7 @@ DESCS=		${WRKSRC}/devnippon/DESC.proto ${WRKSRC}/devps/DESC.in
 #for not writing "/usr/local" explicitly in the patch
 post-patch:
 	@for f in ${DESCS}; do \
-	  /bin/mv -f $${f} $${f}.tmp; \
+	  ${MV} -f $${f} $${f}.tmp; \
 	  ${SED} -e '$$d' $${f}.tmp > $${f}; \
 	  case $${f} in \
   	    */devnippon/*) \
diff --git a/japanese/gxditview/Makefile b/japanese/gxditview/Makefile
index f7e81dd70bea..9050f9f93303 100644
--- a/japanese/gxditview/Makefile
+++ b/japanese/gxditview/Makefile
@@ -35,7 +35,7 @@ pre-fetch:
 	    done; \
 	    for file in ${DISTPATCHES} ; do zcat $${file}; done | \
 		${SED} '/^END -----/,/^BEGIN ----/d' | uudecode; \
-	    rm -f ${DISTPATCHES};\
+	    ${RM} -f ${DISTPATCHES};\
 	 fi)
 
 .include <bsd.port.mk>
diff --git a/japanese/tcl76/Makefile b/japanese/tcl76/Makefile
index e24be9561b0d..b6f7671877ba 100644
--- a/japanese/tcl76/Makefile
+++ b/japanese/tcl76/Makefile
@@ -39,7 +39,7 @@ post-configure:
 	@${CP} ${FILESDIR}/Makefile.lib ${WRKSRC}
 
 pre-build:
-	cd ${WRKSRC} && ${MAKE} -f Makefile.lib PREFIX=${PREFIX} VERSION=${VERSION} && rm *.o
+	cd ${WRKSRC} && ${MAKE} -f Makefile.lib PREFIX=${PREFIX} VERSION=${VERSION} && ${RM} *.o
 
 pre-install:
 	${MKDIR} ${PREFIX}/lib/tcl${VERSION}
diff --git a/japanese/tk42/Makefile b/japanese/tk42/Makefile
index 1589ffa5d879..d27b01e00027 100644
--- a/japanese/tk42/Makefile
+++ b/japanese/tk42/Makefile
@@ -44,7 +44,7 @@ post-configure:
 	@${CP} ${FILESDIR}/Makefile.lib ${WRKSRC}
 
 pre-build:
-	cd ${WRKSRC} && ${MAKE} -f Makefile.lib PREFIX=${PREFIX} VERSION=${VERSION} && rm -f *.o
+	cd ${WRKSRC} && ${MAKE} -f Makefile.lib PREFIX=${PREFIX} VERSION=${VERSION} && ${RM} -f *.o
 
 pre-install:
 	${MKDIR} ${PREFIX}/lib/tk${VERSION}
diff --git a/korean/kaistfonts/Makefile b/korean/kaistfonts/Makefile
index fcac4f6c07ea..e55d1ab03ccb 100644
--- a/korean/kaistfonts/Makefile
+++ b/korean/kaistfonts/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Fri Mar 27 17:26:42 KST 1998
 # Whom:			CHOI Junho <junker@jazz.snu.ac.kr>
 #
-# $Id: Makefile,v 1.4 1998/11/17 02:31:47 asami Exp $
+# $Id: Makefile,v 1.5 1999/08/27 22:29:33 mharo Exp $
 #
 
 DISTNAME=	ko-kaistfonts-ksc-1.0
@@ -20,7 +20,7 @@ NO_WRKSUBDIR=	yes
 MAKE_ENV=	DISTDIR=${DISTDIR} DISTFILES="${DISTFILES}"
 
 do-extract:
-	@rm -fr ${WRKDIR} && \
+	@${RM} -fr ${WRKDIR} && \
 	${MKDIR} ${WRKDIR} && \
 	cd ${WRKDIR} && \
 	for file in ${DISTFILES}; do \
diff --git a/lang/bc-gcc/Makefile b/lang/bc-gcc/Makefile
index 0ccccbdaf116..38702bf3a101 100644
--- a/lang/bc-gcc/Makefile
+++ b/lang/bc-gcc/Makefile
@@ -52,10 +52,10 @@ pre-configure:
 	cd ${WRKSRC} ; ./configure ; make distclean
 
 post-install:
-	@mv ${PREFIX}/bin/gcc ${PREFIX}/bin/bc-gcc
-	@mv ${PREFIX}/bin/${GNUHOST}-gcc ${PREFIX}/bin/${GNUHOST}-bc-gcc
-	@mv ${PREFIX}/man/man1/gcc.1 ${PREFIX}/man/man1/bc-gcc.1
-	@mv ${PREFIX}/man/man1/cccp.1 ${PREFIX}/man/man1/bc-cccp.1
+	@${MV} ${PREFIX}/bin/gcc ${PREFIX}/bin/bc-gcc
+	@${MV} ${PREFIX}/bin/${GNUHOST}-gcc ${PREFIX}/bin/${GNUHOST}-bc-gcc
+	@${MV} ${PREFIX}/man/man1/gcc.1 ${PREFIX}/man/man1/bc-gcc.1
+	@${MV} ${PREFIX}/man/man1/cccp.1 ${PREFIX}/man/man1/bc-cccp.1
 	@( for prog in ${PREFIX}/bin/bc-gcc ${PREFIX}/bin/${GNUHOST}-bc-gcc ; \
 		do strip $$prog ; \
 		done )
diff --git a/lang/bwbasic/Makefile b/lang/bwbasic/Makefile
index 69c697f54be9..06eeae8ff674 100644
--- a/lang/bwbasic/Makefile
+++ b/lang/bwbasic/Makefile
@@ -25,7 +25,7 @@ pre-patch:
 	cd ${WRKSRC}/tmp; \
 	uudecode ${DISTDIR}/bwb-2.20-patch01.tar.Z.uu.txt; \
 	tar xzf bwb-2.20-patch01.tar.Z; \
-	mv bwb-2.20-patch01/* ${WRKSRC}
+	${MV} bwb-2.20-patch01/* ${WRKSRC}
 	${RM} -rf ${WRKSRC}/tmp
 
 # This puts the documentation in ${PREFIX}/share/bwbasic, and the 
diff --git a/lang/elk/Makefile b/lang/elk/Makefile
index 5546d1006f84..9ff366602f9b 100644
--- a/lang/elk/Makefile
+++ b/lang/elk/Makefile
@@ -31,7 +31,7 @@ post-install:
 	  ${CP} bin/scheme ${PREFIX}/bin/elk; \
 	  ${MKDIR} ${PREFIX}/include/elk; \
 	  ${CP} -R include/* ${PREFIX}/include/elk; \
-	  rm -rf bin include)
+	  ${RM} -rf bin include)
 	@${INSTALL_MAN} ${WRKSRC}/doc/man/elk.1 ${PREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/lang/lcc/Makefile b/lang/lcc/Makefile
index b1d602781579..ad3ac2d28785 100644
--- a/lang/lcc/Makefile
+++ b/lang/lcc/Makefile
@@ -34,7 +34,7 @@ pre-configure:
 		#${PKGDIR}/PLIST.in > ${PKGDIR}/PLIST
 	@${SED} -e "s:%%OPSYS%%:${OPSYS}:g"  \
 		${WRKSRC}/makefile > ${WRKSRC}/makefile.configured
-	@/bin/mv -f ${WRKSRC}/makefile.configured ${WRKSRC}/makefile
+	@${MV} -f ${WRKSRC}/makefile.configured ${WRKSRC}/makefile
 
 do-install:
 	@(umask 022 ; ${MKDIR} ${PREFIX}/${LCCDESTDIR})
diff --git a/lang/modula-3/Makefile b/lang/modula-3/Makefile
index 6eff50eb8456..6d8d71aa22ae 100644
--- a/lang/modula-3/Makefile
+++ b/lang/modula-3/Makefile
@@ -46,9 +46,9 @@ MAN1+=		formsedit.1 replayheap.1 showheap.1 shownew.1 showthread.1
 do-install:
 	@${ECHO_MSG} "Deleting extraneous cruft"
 	@cd ${temp_prefix}/lib/m3/pkg; \
-	    rm -rf m3 m3front m3middle m3linker
+	    ${RM} -rf m3 m3front m3middle m3linker
 	@cd ${temp_prefix}/lib/m3/FreeBSD2; \
-	    rm -f libm3front.so.*.* libm3link.so.*.* libm3middle.so.*.*
+	    ${RM} -f libm3front.so.*.* libm3link.so.*.* libm3middle.so.*.*
 	@${ECHO_MSG} "Installing files in \"${PREFIX}\""
 	@cd ${temp_prefix}; \
 	    umask 022; \
@@ -67,7 +67,7 @@ do-install:
 	    PATH=${PREFIX}/bin:$$PATH; \
 	    export LD_LIBRARY_PATH PATH; \
 	    umask 022; \
-	    rm -rf FreeBSD2; \
+	    ${RM} -rf FreeBSD2; \
 	    ${MKDIR} FreeBSD2; \
 	    cd FreeBSD2; \
 	    quake -D_bootstrap -D_all -DPACKAGE_DIR=${WRKSRC}/m3/m3build \
@@ -82,7 +82,7 @@ do-install:
 	    PATH=${PREFIX}/bin:$$PATH; \
 	    export PATH; \
 	    umask 022; \
-	    rm -rf FreeBSD2; \
+	    ${RM} -rf FreeBSD2; \
 	    m3build; \
 	    m3ship
 	@${ECHO_MSG} "Installing copyright notice"
diff --git a/lang/pbasic/Makefile b/lang/pbasic/Makefile
index a4050916b92d..f9e2a8a15326 100644
--- a/lang/pbasic/Makefile
+++ b/lang/pbasic/Makefile
@@ -20,7 +20,7 @@ MAKEFILE=	makefile
 MAN1=		pbasic.1
 
 do-configure:
-	-cd ${WRKSRC} ; rm -rf termio m68000 msdos vax pyramid ns32000 \
+	-cd ${WRKSRC} ; ${RM} -rf termio m68000 msdos vax pyramid ns32000 \
 			pdp11 cursor/cursor.dos cursor/cursor.ukc 
 
 do-install:
diff --git a/lang/rexx-imc/Makefile b/lang/rexx-imc/Makefile
index 4fabe7179d6c..4310f7bc0b28 100644
--- a/lang/rexx-imc/Makefile
+++ b/lang/rexx-imc/Makefile
@@ -25,7 +25,7 @@ UGLY_PATCH=	rexx.c rxfn.c util.c
 post-patch:
 .for c in ${UGLY_PATCH}
 	@${ECHO_MSG} "Changing struct fileinfo member errno to ferrno in ${c}"
-	@mv ${WRKSRC}/${c} ${WRKSRC}/${c}.old
+	@${MV} ${WRKSRC}/${c} ${WRKSRC}/${c}.old
 	@${SED} 's/->errno/->ferrno/g;' ${WRKSRC}/${c}.old > ${WRKSRC}/${c}
 	@${RM} ${WRKSRC}/${c}.old
 .endfor
diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile
index 05f4bf3b1798..56ba622d4214 100644
--- a/mail/qmail/Makefile
+++ b/mail/qmail/Makefile
@@ -138,7 +138,7 @@ thereal-post-patch:
 	if [ `dirname $i` != ${FILESDIR} ] ; \
 	then \
 		${CP} $i.sh $i.sh.orig; \
-		(head -c `expr \`ls -l $i.sh.orig \
+		(head -c `${EXPR} \`ls -l $i.sh.orig \
 		    | ${AWK} '{print $$5}'\` - 1` $i.sh.orig ; ${ECHO} '&') \
 		    > $i.sh ; \
 	fi
diff --git a/mail/smtpd/Makefile b/mail/smtpd/Makefile
index c6d42f3a0c34..34dc430fceda 100644
--- a/mail/smtpd/Makefile
+++ b/mail/smtpd/Makefile
@@ -20,7 +20,7 @@ MAINTAINER=    jonny@jonny.eng.br
 SPOOLBASE=	/var/smtpd
 
 post-patch:
-	@mv ${WRKSRC}/Makefile ${WRKSRC}/Makefile.tmp
+	@${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.tmp
 	@${SED} s+!!SPOOLBASE!!+${SPOOLBASE}+g < ${WRKSRC}/Makefile.tmp \
 	                                    > ${WRKSRC}/Makefile
 
diff --git a/math/xmgr/Makefile b/math/xmgr/Makefile
index 438fd9afba3f..ca856e9e898a 100644
--- a/math/xmgr/Makefile
+++ b/math/xmgr/Makefile
@@ -3,7 +3,7 @@
 # Date created:		So   2 Mär 1997 12:11:43 MET
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.15 1999/08/22 18:59:08 mharo Exp $
+# $Id: Makefile,v 1.16 1999/08/28 02:17:21 mharo Exp $
 #
 
 DISTNAME=	xmgr-4.1.1
@@ -31,9 +31,9 @@ ALL_TARGET=
 INSTALL_TARGET=	install links
 
 post-patch:
-	mv ${WRKSRC}/configure ${WRKSRC}/configure.input
+	${MV} ${WRKSRC}/configure ${WRKSRC}/configure.input
 	${SED} "s%__MOTIFLIB__%${MOTIFLIB}%" ${WRKSRC}/configure.input > ${WRKSRC}/configure
-	rm -f ${WRKSRC}/configure.input
+	${RM} -f ${WRKSRC}/configure.input
 	${CHMOD} 755 ${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/misc/mshell/Makefile b/misc/mshell/Makefile
index ec3fcf1b5e85..7cbeedf40b77 100644
--- a/misc/mshell/Makefile
+++ b/misc/mshell/Makefile
@@ -18,7 +18,7 @@ NO_WRKSUBDIR=	yes
 MAN1=		mshell.1
 
 do-extract:
-	@rm -rf ${WRKDIR}
+	@${RM} -rf ${WRKDIR}
 	@${MKDIR} ${WRKDIR}
 	zcat ${DISTDIR}/${DISTFILES} |(cd ${WRKDIR}; \
 	${AWK} '{if (/^#!/) x++} {if(x) print $$0'}| ${SH})
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
 
diff --git a/print/afm/Makefile b/print/afm/Makefile
index 72f2e48dbadf..af8d31231705 100644
--- a/print/afm/Makefile
+++ b/print/afm/Makefile
@@ -3,7 +3,7 @@
 # Date created:         23 November 1994
 # Whom:                 ljo
 #
-# $Id: Makefile,v 1.7 1996/11/17 08:44:24 obrien Exp $
+# $Id: Makefile,v 1.8 1999/08/23 04:23:48 mharo Exp $
 #
 
 DISTNAME=	afm
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://sgi.com/sgi/fax/source/
 EXTRACT_SUFX=   -tar.Z
 
 pre-patch:
-	@rm -rf ${WRKSRC}/RCS
+	@${RM} -rf ${WRKSRC}/RCS
 
 do-build:
 	@${TRUE}
diff --git a/print/dvips/Makefile b/print/dvips/Makefile
index f34c333e022c..ab82d398645f 100644
--- a/print/dvips/Makefile
+++ b/print/dvips/Makefile
@@ -3,7 +3,7 @@
 # Date created:         30 September 1994
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.17 1997/12/02 03:25:43 jmz Exp $
+# $Id: Makefile,v 1.18 1998/09/25 19:42:58 jmz Exp $
 #
 
 DISTNAME=	dvips576
@@ -28,6 +28,6 @@ post-install:
 	@install -c  -m 644 ${WRKDIR}/dvips576/PSvfs/*.vf ${PREFIX}/share/texmf/fonts/vf
 
 pre-clean:
-	@rm -f ${SCRIPTDIR}/post-install
+	@${RM} -f ${SCRIPTDIR}/post-install
 
 .include <bsd.port.mk>
diff --git a/print/tex/Makefile b/print/tex/Makefile
index f39c160dbe06..482579ebbdec 100644
--- a/print/tex/Makefile
+++ b/print/tex/Makefile
@@ -3,7 +3,7 @@
 # Date created:         29 September 1994
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.34 1999/08/23 04:23:37 mharo Exp $
+# $Id: Makefile,v 1.35 1999/08/28 02:17:27 mharo Exp $
 #
 
 DISTNAME=	web2c-7.1
@@ -31,7 +31,7 @@ post-install:
 	@for i in kpsewhich dmp bibtex dvicopy dvitomp dvitype gftodvi gftopk \
 	  gftype mf mft patgen pktogf pktype pltotf pooltype tangle tex tftopl \
 	  vftovp vptovf weave; do strip ${PREFIX}/bin/$$i; done
-	@rm -f ${PREFIX}/bin/mpostf ${PREFIX}/bin/inimpost ${PREFIX}/bin/virmpost  ${PREFIX}/bin/latex \
+	@${RM} -f ${PREFIX}/bin/mpostf ${PREFIX}/bin/inimpost ${PREFIX}/bin/virmpost  ${PREFIX}/bin/latex \
 	  ${PREFIX}/share/texmf/web2c/mpost.mem ${PREFIX}/share/texmf/web2c/mp.pool
 	@${MKDIR} ${PREFIX}/share/texmf/fonts/tfm
 	@(cd ${WRKDIR}/tfm; ${INSTALL_DATA} *.tfm ${PREFIX}/share/texmf/fonts/tfm)
diff --git a/russian/X.language/Makefile b/russian/X.language/Makefile
index 0cf8738b9273..2ed41f7824dc 100644
--- a/russian/X.language/Makefile
+++ b/russian/X.language/Makefile
@@ -3,7 +3,7 @@
 # Date created:         31 Aug 1995
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.22 1999/08/22 18:59:49 mharo Exp $
+# $Id: Makefile,v 1.23 1999/08/22 23:33:18 mharo Exp $
 #
 
 DISTNAME=       ru-X11-3.3
@@ -32,7 +32,7 @@ CYRF = ${XLIB}/fonts/cyrillic
 #Be careful to not delete embedded tab characters
 do-install:
 	-if [ ! -d ${CYRF}.old ]; then \
-		mv ${CYRF} ${CYRF}.old; \
+		${MV} ${CYRF} ${CYRF}.old; \
 	fi
 	-${MKDIR} ${CYRF}/100dpi
 	-${MKDIR} ${CYRF}/75dpi
diff --git a/russian/pgp.language/Makefile b/russian/pgp.language/Makefile
index 0763eab7fcef..0dab812f37c9 100644
--- a/russian/pgp.language/Makefile
+++ b/russian/pgp.language/Makefile
@@ -3,7 +3,7 @@
 # Date created:         4 May 1995
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.24 1999/08/23 04:23:40 mharo Exp $
+# $Id: Makefile,v 1.25 1999/08/28 02:17:28 mharo Exp $
 #
 
 DISTNAME=       pgp26ru
@@ -27,7 +27,7 @@ OBJS=           language.txt ru.hlp
 do-install:
 	[ -d ${PGPLIB} ] || ${MKDIR} ${PGPLIB}
 	cd ${WRKSRC}; install -c -o bin -g bin -m 444 ${OBJS} ${PGPLIB}
-	cd ${WRKSRC}; tr -d '\015' < NOTES.ru > ${PGPLIB}/NOTES.ru
+	cd ${WRKSRC}; ${TR} -d '\015' < NOTES.ru > ${PGPLIB}/NOTES.ru
 	cd ${PGPLIB}; ${GREP} -l -q '^Language.*=.*ru' config.txt || { \
 		${CP} config.txt config.txt.bak; \
 		${SED} 's/^Language.*=.*$$/Language = ru/' < config.txt.bak > config.txt; }
diff --git a/security/crack/Makefile b/security/crack/Makefile
index 7064ed682c30..041ace4ed378 100644
--- a/security/crack/Makefile
+++ b/security/crack/Makefile
@@ -5,7 +5,7 @@
 # Whom:			David O'Brien <obrien@FreeBSD.org>
 # Whom:                 Yukihiro Nakai <nakai@mlab.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.7 1998/10/10 03:42:59 steve Exp $
+# $Id: Makefile,v 1.8 1999/08/27 22:30:08 mharo Exp $
 #
 
 DISTNAME=	crack5.0
@@ -23,8 +23,8 @@ WRKSRC=		${WRKDIR}/c50a
 
 pre-configure:
 .if !defined(USE_DES)
-	@/bin/mv -f ${WRKSRC}/src/libdes ${WRKSRC}/src/libdes.notused
-	@/bin/mv -f ${WRKSRC}/src/util/elcid.c ${WRKSRC}/src/util/elcid.c.orig
+	@${MV} -f ${WRKSRC}/src/libdes ${WRKSRC}/src/libdes.notused
+	@${MV} -f ${WRKSRC}/src/util/elcid.c ${WRKSRC}/src/util/elcid.c.orig
 	@${CP} -p ${WRKSRC}/src/util/elcid.c,bsd ${WRKSRC}/src/util/elcid.c
 .endif
 	@${ECHO} "XLIB+= -lcrypt" >> ${WRKSRC}/src/util/Makefile
diff --git a/security/krb5-16/Makefile b/security/krb5-16/Makefile
index fda684c0128b..2f343c3cd859 100644
--- a/security/krb5-16/Makefile
+++ b/security/krb5-16/Makefile
@@ -3,7 +3,7 @@
 # Date created:				6/5/1998
 # Whom:					nectar@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.10 1999/06/05 22:31:36 mharo Exp $
+# $Id: Makefile,v 1.11 1999/08/22 18:59:53 mharo Exp $
 #
 
 DISTNAME=		krb5-1.0.6
@@ -167,7 +167,7 @@ post-install:
 # XXX Not sure why tmac.doc is installed here -- I don't think
 #     we need it.  I should patch the distribution to not install
 #     it, I think.
-	@rm -f ${PREFIX}/man/man1/tmac.doc
+	@${RM} -f ${PREFIX}/man/man1/tmac.doc
 # shared libs
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 # html documentation
diff --git a/security/krb5-17/Makefile b/security/krb5-17/Makefile
index fda684c0128b..2f343c3cd859 100644
--- a/security/krb5-17/Makefile
+++ b/security/krb5-17/Makefile
@@ -3,7 +3,7 @@
 # Date created:				6/5/1998
 # Whom:					nectar@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.10 1999/06/05 22:31:36 mharo Exp $
+# $Id: Makefile,v 1.11 1999/08/22 18:59:53 mharo Exp $
 #
 
 DISTNAME=		krb5-1.0.6
@@ -167,7 +167,7 @@ post-install:
 # XXX Not sure why tmac.doc is installed here -- I don't think
 #     we need it.  I should patch the distribution to not install
 #     it, I think.
-	@rm -f ${PREFIX}/man/man1/tmac.doc
+	@${RM} -f ${PREFIX}/man/man1/tmac.doc
 # shared libs
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 # html documentation
diff --git a/security/krb5-appl/Makefile b/security/krb5-appl/Makefile
index fda684c0128b..2f343c3cd859 100644
--- a/security/krb5-appl/Makefile
+++ b/security/krb5-appl/Makefile
@@ -3,7 +3,7 @@
 # Date created:				6/5/1998
 # Whom:					nectar@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.10 1999/06/05 22:31:36 mharo Exp $
+# $Id: Makefile,v 1.11 1999/08/22 18:59:53 mharo Exp $
 #
 
 DISTNAME=		krb5-1.0.6
@@ -167,7 +167,7 @@ post-install:
 # XXX Not sure why tmac.doc is installed here -- I don't think
 #     we need it.  I should patch the distribution to not install
 #     it, I think.
-	@rm -f ${PREFIX}/man/man1/tmac.doc
+	@${RM} -f ${PREFIX}/man/man1/tmac.doc
 # shared libs
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 # html documentation
diff --git a/security/krb5/Makefile b/security/krb5/Makefile
index fda684c0128b..2f343c3cd859 100644
--- a/security/krb5/Makefile
+++ b/security/krb5/Makefile
@@ -3,7 +3,7 @@
 # Date created:				6/5/1998
 # Whom:					nectar@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.10 1999/06/05 22:31:36 mharo Exp $
+# $Id: Makefile,v 1.11 1999/08/22 18:59:53 mharo Exp $
 #
 
 DISTNAME=		krb5-1.0.6
@@ -167,7 +167,7 @@ post-install:
 # XXX Not sure why tmac.doc is installed here -- I don't think
 #     we need it.  I should patch the distribution to not install
 #     it, I think.
-	@rm -f ${PREFIX}/man/man1/tmac.doc
+	@${RM} -f ${PREFIX}/man/man1/tmac.doc
 # shared libs
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 # html documentation
diff --git a/security/pgp/Makefile b/security/pgp/Makefile
index 4bc263ecae35..e42c24034a51 100644
--- a/security/pgp/Makefile
+++ b/security/pgp/Makefile
@@ -5,7 +5,7 @@
 # Date created:         8 Jul 1995
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.27 1999/08/23 04:23:54 mharo Exp $
+# $Id: Makefile,v 1.28 1999/08/27 22:30:09 mharo Exp $
 #
 
 # Pick an initial default, else it doesn't get set in the INDEX.
@@ -59,7 +59,7 @@ PATCHDIR=       ${.CURDIR}/patches.usa
 post-extract:
 	cd ${WRKDIR}; $(EXTRACT_CMD) $(EXTRACT_BEFORE_ARGS) -aa $(DISTNAME)i \
 		$(EXTRACT_AFTER_ARGS)
-	cd ${WRKDIR}; rm -f *.zip
+	cd ${WRKDIR}; ${RM} -f *.zip
 
 .else
 DISTNAME=       pgp263is
@@ -72,7 +72,7 @@ PATCHDIR=       ${.CURDIR}/patches.non_usa
 
 post-extract:
 	cd ${WRKDIR}; $(TAR) -xf pgp263ii.tar; \
-		rm -f pgp263ii.tar
+		${RM} -f pgp263ii.tar
 
 .endif
 .endif
diff --git a/security/skip/Makefile b/security/skip/Makefile
index b5811a22d930..3869c798c8cb 100644
--- a/security/skip/Makefile
+++ b/security/skip/Makefile
@@ -3,7 +3,7 @@
 # Date created:         		26 November 1997
 # Whom:                 		Archie L. Cobbs <archie@whistle.com>
 #
-# $Id: Makefile,v 1.10 1999/08/23 04:23:42 mharo Exp $
+# $Id: Makefile,v 1.11 1999/08/28 02:17:28 mharo Exp $
 
 DISTNAME=		skip-1.0
 CATEGORIES=		security
@@ -53,7 +53,7 @@ post-patch:
 	FILES=`find . -type f -print | xargs ${GREP} -l @@PREFIX@@`; \
 	for FILE in $$FILES; do \
 	  ${SED} 's!@@PREFIX@@!${PREFIX}!g' < $$FILE > $$FILE.new ; \
-	  mv $$FILE.new $$FILE; \
+	  ${MV} $$FILE.new $$FILE; \
 	done
 
 .include <bsd.port.pre.mk>
diff --git a/sysutils/LPRng/Makefile b/sysutils/LPRng/Makefile
index 1d6fa27407da..52c9f374bffe 100644
--- a/sysutils/LPRng/Makefile
+++ b/sysutils/LPRng/Makefile
@@ -3,7 +3,7 @@
 # Date created:		2 Apr 1997
 # Whom:			desmo@bandwidth.org
 #
-# $Id: Makefile,v 1.6 1999/08/22 19:00:01 mharo Exp $
+# $Id: Makefile,v 1.7 1999/08/22 23:33:26 mharo Exp $
 #
 
 DISTNAME=	LPRng-3.5.1
@@ -37,7 +37,7 @@ post-install:
 		${CP} ${DISTDIR}/$$file ${PREFIX}/share/doc/LPRng; \
 		cd ${PREFIX}/share/doc/LPRng; \
 		tar xvfz $$file; \
-		rm ${PREFIX}/share/doc/LPRng/$$file; \
+		${RM} ${PREFIX}/share/doc/LPRng/$$file; \
 	done
 	@${CAT} ${PKGDIR}/MESSAGE
 
diff --git a/www/fcgi/Makefile b/www/fcgi/Makefile
index 2ae060dc56e6..a7f7fca7941d 100644
--- a/www/fcgi/Makefile
+++ b/www/fcgi/Makefile
@@ -3,7 +3,7 @@
 # Date created:        13 May 1999
 # Whom:                kbyanc
 #
-# $Id: Makefile,v 1.1.1.1 1999/06/09 01:43:04 steve Exp $
+# $Id: Makefile,v 1.2 1999/08/11 19:01:50 cpiazza Exp $
 #
 
 DISTNAME=	fcgi-devkit-2.1
@@ -19,7 +19,7 @@ USE_PERL5=	yes
 GNU_CONFIGURE=	yes
 
 post-install:
-	@rm -f ${PREFIX}/fcgi-devkit/libfcgi/os_unix.c.orig \
+	@${RM} -f ${PREFIX}/fcgi-devkit/libfcgi/os_unix.c.orig \
 	       ${PREFIX}/fcgi-devkit/Makefile.in.orig
 
 .include <bsd.port.mk>
diff --git a/www/gn/Makefile b/www/gn/Makefile
index fcf1e3e251be..584a8bb2063f 100644
--- a/www/gn/Makefile
+++ b/www/gn/Makefile
@@ -3,7 +3,7 @@
 # Date created:         20 Sep 1994
 # Whom:                 adam
 #
-# $Id: Makefile,v 1.22 1999/08/27 22:30:22 mharo Exp $
+# $Id: Makefile,v 1.23 1999/08/28 01:57:56 mharo Exp $
 #
 
 DISTNAME=       gn-2.24
@@ -29,19 +29,19 @@ pre-install:
 	@${MKDIR} ${WRKSRC}/etc ${WRKSRC}/libexec ${WRKSRC}/gnroot
 	@cd ${WRKSRC}/gnroot; \
 		tar -cf - -C ${WRKSRC} docs | tar xpf - && \
-			mv docs/sample.root.menu menu
+			${MV} docs/sample.root.menu menu
 
 post-install:
 	@cd ${PREFIX}; \
 	  [ -s etc/gn_mime.types ] && \
 	  if ! cmp -s etc/gn_mime.types ${WRKSRC}/etc/gn_mime.types; then \
-		${ECHO} mv etc/gn_mime.types etc/gn_mime.types.old; \
-		mv etc/gn_mime.types etc/gn_mime.types.old; \
+		${ECHO} ${MV} etc/gn_mime.types etc/gn_mime.types.old; \
+		${MV} etc/gn_mime.types etc/gn_mime.types.old; \
   	  fi; \
 	  [ -s gnroot/menu ] && \
 	  if ! cmp -s gnroot/menu ${WRKSRC}/gnroot/menu; then \
-		${ECHO} mv gnroot/menu gnroot/menu.old; \
-		mv gnroot/menu gnroot/menu.old; \
+		${ECHO} ${MV} gnroot/menu gnroot/menu.old; \
+		${MV} gnroot/menu gnroot/menu.old; \
 	  fi; \
 	  tar -cf - -C ${WRKSRC} gnroot libexec bin etc | tar xpf - && \
 		(cd gnroot; ${WRKSRC}/bin/mkcache -r); \
diff --git a/www/wcol/Makefile b/www/wcol/Makefile
index 42764786f204..24768ce099c0 100644
--- a/www/wcol/Makefile
+++ b/www/wcol/Makefile
@@ -3,7 +3,7 @@
 # Date created:		17 July 1998
 # Whom:			Shigeyuki FUKUSHIMA <shige@kuis.kyoto-u.ac.jp>
 #
-# $Id: Makefile,v 1.1.1.1 1998/08/24 02:11:20 steve Exp $
+# $Id: Makefile,v 1.2 1999/03/01 09:38:29 shige Exp $
 #
 
 DISTNAME=	wcolEpre.980713_100245
@@ -24,8 +24,8 @@ DEFAULT_POOLDIR?=/var/spool/wcol
 MAKE_ENV+=DEFAULT_POOLDIR=${DEFAULT_POOLDIR}
 
 pre-patch:
-	@rm -f ${WRKSRC}/../admin/killwcol.in
-	@mv -f ${WRKSRC}/../admin/killwcol ${WRKSRC}/../admin/killwcol.in
+	@${RM} -f ${WRKSRC}/../admin/killwcol.in
+	@${MV} -f ${WRKSRC}/../admin/killwcol ${WRKSRC}/../admin/killwcol.in
 
 post-install:
 	@if [ ! -d ${DEFAULT_POOLDIR} ]; then \
diff --git a/x11-fm/x-files/Makefile b/x11-fm/x-files/Makefile
index 30bad05827a9..87fcfb8dec75 100644
--- a/x11-fm/x-files/Makefile
+++ b/x11-fm/x-files/Makefile
@@ -3,7 +3,7 @@
 # Date created:		14 April 1998
 # Whom:			Donald J. Maddox <dmaddox@conterra.com>
 #
-# $Id: Makefile,v 1.9 1999/07/02 00:00:26 mph Exp $
+# $Id: Makefile,v 1.10 1999/08/28 02:17:32 mharo Exp $
 #
 
 DISTNAME=       X-Files-1.43
@@ -23,7 +23,7 @@ USE_X_PREFIX=	yes
 pre-install:
 	@tclsh8.0 ${SCRIPTDIR}/mktclIndex ${WRKSRC}
 	@${SED} s#@X11BASE@#${X11BASE}# <${WRKSRC}/X-Files.tcl >${WRKSRC}/tmpfile
-	@mv ${WRKSRC}/tmpfile ${WRKSRC}/X-Files.tcl
+	@${MV} ${WRKSRC}/tmpfile ${WRKSRC}/X-Files.tcl
 
 do-install:
 	@${MKDIR} ${PREFIX}/lib/X11/X-Files
diff --git a/x11-wm/afterstep-i18n/Makefile b/x11-wm/afterstep-i18n/Makefile
index 16c5468cf8b9..1dbd1e1cafdb 100644
--- a/x11-wm/afterstep-i18n/Makefile
+++ b/x11-wm/afterstep-i18n/Makefile
@@ -3,7 +3,7 @@
 # Date created:		23 October 1998
 # Whom:			issei@jp.FreeBSD.ORG
 #
-# $Id: Makefile,v 1.6 1999/02/21 21:51:00 billf Exp $
+# $Id: Makefile,v 1.7 1999/08/28 02:17:33 mharo Exp $
 #
 
 DISTNAME=	AfterStep-1.0
@@ -48,7 +48,7 @@ post-patch:
 	@ ${PATCH} ${PATCH_DIST_ARGS} < ${FILESDIR}/steprc.ja.diff
 	@ for i in ${SRCDIRS}; do \
 		cd ${WRKSRC}/$$i; \
-		mv Imakefile Imakefile.orig; \
+		${MV} Imakefile Imakefile.orig; \
 		${SED} -e 's/#ifdef AlphaArchitecture/#if defined(AlphaArchitecture) \&\& !defined(FreeBSDArchitecture)/' < Imakefile.orig  >  Imakefile; \
 	done