grep -> ${GREP}

true -> ${TRUE}
false -> ${FALSE}

41 files changed, 92 insertions, 92 deletions

diff --git a/graphics/hdf/Makefile b/graphics/hdf/Makefile
index 761f28a..646985d 100644
--- a/graphics/hdf/Makefile
+++ b/graphics/hdf/Makefile
@@ -3,7 +3,7 @@
 # Date created:		17 November 1996
 # Whom:			mi
 #
-# $Id: Makefile,v 1.8 1998/09/15 11:45:52 asami Exp $
+# $Id: Makefile,v 1.9 1998/10/05 03:20:28 steve Exp $
 #
 
 DISTNAME=	HDF4.1r2
@@ -60,7 +60,7 @@ pre-build:
 	-ln -s /usr/include/zconf.h /usr/include/zlib.h ${WRKSRC}/hdf/zlib/
 
 post-install:
-	@for binary in `grep ^bin/ ${PLIST}` ; do strip ${PREFIX}/$$binary; done
+	@for binary in `${GREP} ^bin/ ${PLIST}` ; do strip ${PREFIX}/$$binary; done
 
 test:
 	cd ${WRKSRC}; make ${MAKE_FLAGS} ${MAKEFILE} test
diff --git a/graphics/hdf5/Makefile b/graphics/hdf5/Makefile
index 761f28a..646985d 100644
--- a/graphics/hdf5/Makefile
+++ b/graphics/hdf5/Makefile
@@ -3,7 +3,7 @@
 # Date created:		17 November 1996
 # Whom:			mi
 #
-# $Id: Makefile,v 1.8 1998/09/15 11:45:52 asami Exp $
+# $Id: Makefile,v 1.9 1998/10/05 03:20:28 steve Exp $
 #
 
 DISTNAME=	HDF4.1r2
@@ -60,7 +60,7 @@ pre-build:
 	-ln -s /usr/include/zconf.h /usr/include/zlib.h ${WRKSRC}/hdf/zlib/
 
 post-install:
-	@for binary in `grep ^bin/ ${PLIST}` ; do strip ${PREFIX}/$$binary; done
+	@for binary in `${GREP} ^bin/ ${PLIST}` ; do strip ${PREFIX}/$$binary; done
 
 test:
 	cd ${WRKSRC}; make ${MAKE_FLAGS} ${MAKEFILE} test
diff --git a/japanese/Wnn6/Makefile b/japanese/Wnn6/Makefile
index 0a2fa11..067b799 100644
--- a/japanese/Wnn6/Makefile
+++ b/japanese/Wnn6/Makefile
@@ -3,7 +3,7 @@
 # Date created:		15 July 1997
 # Whom:			Satoshi Taoka <taoka@FreeBSD.org>
 #
-# $Id: Makefile,v 1.23 1999/05/01 04:00:20 taoka Exp $
+# $Id: Makefile,v 1.24 1999/08/09 06:22:14 taoka Exp $
 #
 
 DISTNAME=	OMRONWnn6
@@ -49,7 +49,7 @@ pre-extract::
 		${ECHO} "For example:"; \
 		${ECHO} "	make MOUNT_PT=/mnt MOUNT_DEV=/dev/cd0c"; \
 		${ECHO} "###########################################################"; \
-		/usr/bin/false; \
+		${FALSE}; \
 		;; \
 	  *) \
 		${ECHO} "Now mounting the CD-ROM ..."; \
@@ -61,7 +61,7 @@ pre-extract::
 	    ${ECHO} "${MOUNT_PT} is busy"; \
 	    ${ECHO} "Please 'umount ${MOUNT_PT}'"; \
 	    ${ECHO} "##################################################"; \
-	    /usr/bin/false; \
+	    ${FALSE}; \
 	  fi; \
 	done
 	@/sbin/mount_cd9660 ${MOUNT_DEV} ${MOUNT_PT}
@@ -75,7 +75,7 @@ pre-extract::
 		${ECHO} "!! Note that 'Wnn6 for Linux/FreeBSD' is an old version !!"; \
 		/sbin/umount ${MOUNT_PT}; \
 		${ECHO} "Umounting is done ..."; \
-		/usr/bin/false; \
+		${FALSE}; \
 	fi
 
 post-extract:
diff --git a/japanese/edict-utf-8/Makefile b/japanese/edict-utf-8/Makefile
index a917f77..476a431 100644
--- a/japanese/edict-utf-8/Makefile
+++ b/japanese/edict-utf-8/Makefile
@@ -3,7 +3,7 @@
 # Date created:		18 August 1997
 # Whom:			Jonathan Hanna
 #
-# $Id: Makefile,v 1.6 1999/08/22 18:58:29 mharo Exp $
+# $Id: Makefile,v 1.7 1999/08/22 23:32:40 mharo Exp $
 #
 
 DISTNAME=	edict-19990714
@@ -77,7 +77,7 @@ do-install:
 			instfile=`${BASENAME} $$file .gz` ; \
 			if ${GZIP_CMD} -cd ${_DISTDIR}/$$file > ${DATADIR}/$$instfile ; \
 			then \
-				true ; \
+				${TRUE} ; \
 			else \
 				exit 1; \
 			fi \
@@ -86,7 +86,7 @@ do-install:
 			instfile=`${BASENAME} $$file .Z` ; \
 			if ${GZIP_CMD} -cd ${_DISTDIR}/$$file > ${DATADIR}/$$instfile ; \
 			then \
-				true ; \
+				${TRUE} ; \
 			else \
 				exit 1; \
 			fi \
@@ -95,7 +95,7 @@ do-install:
 			instfile=`${BASENAME} $$file .zip` ; \
 			if unzip -o ${_DISTDIR}/$$file $$instfile -d ${DATADIR} ; \
 			then \
-				true ; \
+				${TRUE} ; \
 			else \
 				exit 1; \
 			fi \
diff --git a/japanese/edict/Makefile b/japanese/edict/Makefile
index a917f77..476a431 100644
--- a/japanese/edict/Makefile
+++ b/japanese/edict/Makefile
@@ -3,7 +3,7 @@
 # Date created:		18 August 1997
 # Whom:			Jonathan Hanna
 #
-# $Id: Makefile,v 1.6 1999/08/22 18:58:29 mharo Exp $
+# $Id: Makefile,v 1.7 1999/08/22 23:32:40 mharo Exp $
 #
 
 DISTNAME=	edict-19990714
@@ -77,7 +77,7 @@ do-install:
 			instfile=`${BASENAME} $$file .gz` ; \
 			if ${GZIP_CMD} -cd ${_DISTDIR}/$$file > ${DATADIR}/$$instfile ; \
 			then \
-				true ; \
+				${TRUE} ; \
 			else \
 				exit 1; \
 			fi \
@@ -86,7 +86,7 @@ do-install:
 			instfile=`${BASENAME} $$file .Z` ; \
 			if ${GZIP_CMD} -cd ${_DISTDIR}/$$file > ${DATADIR}/$$instfile ; \
 			then \
-				true ; \
+				${TRUE} ; \
 			else \
 				exit 1; \
 			fi \
@@ -95,7 +95,7 @@ do-install:
 			instfile=`${BASENAME} $$file .zip` ; \
 			if unzip -o ${_DISTDIR}/$$file $$instfile -d ${DATADIR} ; \
 			then \
-				true ; \
+				${TRUE} ; \
 			else \
 				exit 1; \
 			fi \
diff --git a/java/jikes/Makefile b/java/jikes/Makefile
index 05b4907..efb4583 100644
--- a/java/jikes/Makefile
+++ b/java/jikes/Makefile
@@ -3,7 +3,7 @@
 # Date created:         09 December 1998
 # Whom:                 Matthew Dillon <dillon@backplane.com>
 #
-# $Id: Makefile,v 1.10 1999/03/22 06:40:16 archie Exp $
+# $Id: Makefile,v 1.11 1999/06/28 02:22:18 billf Exp $
 #
 
 DISTNAME=	jikes-0.47
@@ -28,7 +28,7 @@ PATCH_STRIP=	-p2
 #	@echo "then set READ_IBM_LICENSE=YES in /etc/make.conf.local"
 #	@echo ""
 #	@echo "The license is available at http://www.ibm.com/research/jikes"
-#	@false
+#	@${FALSE}
 #.endif
 
 .include <bsd.port.mk>
diff --git a/lang/eperl/Makefile b/lang/eperl/Makefile
index 2a9932b..3947f9b 100644
--- a/lang/eperl/Makefile
+++ b/lang/eperl/Makefile
@@ -3,7 +3,7 @@
 # Date created:		03-Sep-1997
 # Whom:			Ralf S. Engelschall <rse@engelschall.com>
 #
-# $Id: Makefile,v 1.28 1998/08/02 14:53:32 rse Exp $
+# $Id: Makefile,v 1.29 1998/09/15 21:31:46 asami Exp $
 #
 
 DISTNAME=	eperl-2.2.14
@@ -49,7 +49,7 @@ do-install:
 		${MKDIR} ${PREFIX}/www/cgi-bin; \
 	fi
 	${INSTALL_PROGRAM} ${WRKSRC}/eperl ${PREFIX}/www/cgi-bin/nph-eperl
-	@if [ ".`grep x-httpd-eperl ${PREFIX}/etc/apache/srm.conf`" = . ]; then \
+	@if [ ".`${GREP} x-httpd-eperl ${PREFIX}/etc/apache/srm.conf`" = . ]; then \
 		${ECHO} "AddType  application/x-httpd-eperl  .phtml .eperl .epl" \
 			>>${PREFIX}/etc/apache/srm.conf; \
 		${ECHO} "Action   application/x-httpd-eperl  /cgi-bin/nph-eperl" \
diff --git a/lang/modula-3-lib/Makefile b/lang/modula-3-lib/Makefile
index 17eeb2a..8da98bf 100644
--- a/lang/modula-3-lib/Makefile
+++ b/lang/modula-3-lib/Makefile
@@ -3,7 +3,7 @@
 # Date created:		28 Oct 1996
 # Whom:			John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.15 1999/08/22 18:58:51 mharo Exp $
+# $Id: Makefile,v 1.16 1999/08/22 23:32:52 mharo Exp $
 #
 
 DISTNAME=	modula-3-lib-3.6
@@ -136,10 +136,10 @@ do-install:
 	@echo "Installing shared libraries"
 	@cd ${temp_prefix}; \
 	    umask 022; \
-	    grep '^lib/m3/' ${PLIST}.real | \
+	    ${GREP} '^lib/m3/' ${PLIST}.real | \
 		cpio -dump -R ${BINOWN}.${BINGRP} ${PREFIX}
 	@cd ${PREFIX}; \
-	    grep '^lib/m3/' ${PLIST}.real | xargs ${CHMOD} go=u-w; \
+	    ${GREP} '^lib/m3/' ${PLIST}.real | xargs ${CHMOD} go=u-w; \
 	    find -X lib/m3 -type d | xargs ${CHOWN} ${BINOWN}.${BINGRP}; \
 	    find -X lib/m3 -type d | xargs ${CHMOD} 755
 	@echo "Installing copyright notice"
diff --git a/math/siag/Makefile b/math/siag/Makefile
index 691e994..c57c731 100644
--- a/math/siag/Makefile
+++ b/math/siag/Makefile
@@ -3,7 +3,7 @@
 # Date created:		27 Jan 1998
 # Whom:			mi@aldan.algebra.com
 #
-# $Id: Makefile,v 1.16 1999/06/25 21:30:04 cpiazza Exp $
+# $Id: Makefile,v 1.17 1999/07/04 10:43:39 obrien Exp $
 #
 
 DISTNAME=	siag-3.1.18
@@ -61,7 +61,7 @@ post-install:
 	@test -e ${PREFIX}/lib/X11/app-defaults/Siag && ${ECHO} \
 		"It seems, you have old app-defaults file(s) from Siag.\
 		 Consider removing it(them) if new siag fails to come up" |\
-		fmt || true
+		fmt || ${TRUE}
 
 post-patch:
 	# Fixing makefiles to put docs in ${LOCALBASE}/share/doc/siag
diff --git a/misc/tet/Makefile b/misc/tet/Makefile
index f5aa397..108200e 100644
--- a/misc/tet/Makefile
+++ b/misc/tet/Makefile
@@ -3,7 +3,7 @@
 # Date created:		02 Oct 1998
 # Whom:			jkoshy
 #
-# $Id: Makefile,v 1.6 1999/02/11 09:05:38 jkoshy Exp $
+# $Id: Makefile,v 1.7 1999/08/22 18:59:15 mharo Exp $
 #
 
 DISTNAME=		tet3.2e-unsup
@@ -32,9 +32,9 @@ pre-extract:
 	@echo "You must set it to the directory where you would like "
 	@echo "this port to reside before attempting extraction."
 	@echo
-	@false
+	@${FALSE}
 .else
-	@true
+	@${TRUE}
 .endif
 
 # remove the TET_ROOT directory if it exists
diff --git a/net/SSLtelnet/Makefile b/net/SSLtelnet/Makefile
index 1f4b0a5..647e8b8 100644
--- a/net/SSLtelnet/Makefile
+++ b/net/SSLtelnet/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Mar 29, 1998
 # Whom:			issei@jp.FreeBSD.ORG
 #
-# $Id: Makefile,v 1.7 1999/03/26 08:44:57 dirk Exp $
+# $Id: Makefile,v 1.8 1999/08/05 08:00:18 dirk Exp $
 
 DISTNAME=		SSLtelnet-0.13
 CATEGORIES=		net security
@@ -17,7 +17,7 @@ pre-fetch:
 	@echo You must set variable USA_RESIDENT to YES, if you are USA resident
 	@echo or to NO, if you aren\'t USA resident to build this package.
 	@echo You must also have installed RSAREF if you are USA resident.
-	@false
+	@${FALSE}
 .elif defined(USA_RESIDENT)
 .if ${USA_RESIDENT} == YES
 LIB_DEPENDS=		rsaref.2:${PORTSDIR}/security/rsaref
diff --git a/net/dgd-lpmud/Makefile b/net/dgd-lpmud/Makefile
index d3bed8f..1e4bbc9 100644
--- a/net/dgd-lpmud/Makefile
+++ b/net/dgd-lpmud/Makefile
@@ -3,7 +3,7 @@
 # Date created:		10 November 1994
 # Whom:			adam
 #
-# $Id: Makefile,v 1.20 1997/01/16 11:46:58 adam Exp $
+# $Id: Makefile,v 1.21 1997/08/10 23:34:44 adam Exp $
 #
 
 DISTNAME=	dgd-lpmud
@@ -31,7 +31,7 @@ do-build:
 	@cd ${WRKDIR}/mud/bin; make
 
 do-install:
-	@tar -C ${WRKSRC} -cf - `grep '^[a-z]' ${PKGDIR}/PLIST` \
+	@tar -C ${WRKSRC} -cf - `${GREP} '^[a-z]' ${PKGDIR}/PLIST` \
 		| tar -C ${PREFIX}/dgd -xpf -
 
 .include <bsd.port.mk>
diff --git a/net/dgd-net/Makefile b/net/dgd-net/Makefile
index fb5538b..f711023 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.30 1998/07/20 16:30:13 adam Exp $
+# $Id: Makefile,v 1.31 1999/08/22 18:59:21 mharo Exp $
 #
 
 DISTNAME=	dgd-net-1.1p6
@@ -53,7 +53,7 @@ post-build:
 
 do-install:
 	@-mv ${PREFIX}/dgd/bin/driver.net ${PREFIX}/dgd/bin/driver.net.old
-	@tar -C ${WRKDIR} -cf - `grep '^dgd/' ${PKGDIR}/PLIST` \
+	@tar -C ${WRKDIR} -cf - `${GREP} '^dgd/' ${PKGDIR}/PLIST` \
 		| tar -C ${PREFIX} -xpf -
 
 .include <bsd.port.mk>
diff --git a/net/dgd/Makefile b/net/dgd/Makefile
index 0f6f55d..6710da8 100644
--- a/net/dgd/Makefile
+++ b/net/dgd/Makefile
@@ -3,7 +3,7 @@
 # Date created:		23 August 1994
 # Whom:			adam
 #
-# $Id: Makefile,v 1.77 1998/07/20 15:01:52 adam Exp $
+# $Id: Makefile,v 1.78 1999/08/22 18:59:22 mharo Exp $
 #
 
 DISTNAME=	dgd-1.1p6
@@ -44,7 +44,7 @@ post-build:
 
 do-install:
 	@-mv ${PREFIX}/dgd/bin/driver ${PREFIX}/dgd/bin/driver.old
-	@tar -C ${WRKDIR} -cf - `grep '^dgd/' ${PKGDIR}/PLIST` \
+	@tar -C ${WRKDIR} -cf - `${GREP} '^dgd/' ${PKGDIR}/PLIST` \
 		| tar -C ${PREFIX} -xpf -
 
 .include <bsd.port.mk>
diff --git a/net/ztelnet/Makefile b/net/ztelnet/Makefile
index be0efe6..1edb786 100644
--- a/net/ztelnet/Makefile
+++ b/net/ztelnet/Makefile
@@ -3,7 +3,7 @@
 # Date created:         15 Mar 1998
 # Whom:                 CHOI Junho <junker@jazz.snu.ac.kr>
 #
-# $Id: Makefile,v 1.6 1998/06/14 16:00:03 steve Exp $
+# $Id: Makefile,v 1.7 1999/06/18 17:31:21 mharo Exp $
 #
 # In this ports..
 #   - new compilation diff for FreeBSD(now we can upload!)
@@ -30,7 +30,7 @@ post-patch:
 	# we can ignore warnings
 	@( cd ${WRKSRC}/ztelnet && \
 	${PATCH} -s -p1 < ${WRKSRC}/ztelnet.patch || \
-	true ) > /dev/null 2>&1
+	${TRUE} ) > /dev/null 2>&1
 	# but it is not
 	@cd ${WRKSRC}/ztelnet && \
 	${PATCH} -s -p1 < ${WRKSRC}/rz.patch && \
diff --git a/news/nntpbtr/Makefile b/news/nntpbtr/Makefile
index 8dde26d..a15672a 100644
--- a/news/nntpbtr/Makefile
+++ b/news/nntpbtr/Makefile
@@ -3,7 +3,7 @@
 # Date created:         1 July 1996
 # Whom:                 dk
 #
-# $Id: Makefile,v 1.4 1997/08/10 19:22:26 fenner Exp $
+# $Id: Makefile,v 1.5 1997/08/10 22:31:23 fenner Exp $
 #
 
 DISTNAME=       nntpbtr-1.7
@@ -20,7 +20,7 @@ post-extract:
 	@${RM} -rf ${WRKSRC}/RCS
 
 pre-build:
-	cd ${FILESDIR} ; pax -rw -l -u dbz ${WRKDIR} || true
+	cd ${FILESDIR} ; pax -rw -l -u dbz ${WRKDIR} || ${TRUE}
 	cd ${WRKDIR}/dbz ; ${CC} ${CFLAGS} -c -I. dbz.c
 
 .include <bsd.port.mk>
diff --git a/print/afm/Makefile b/print/afm/Makefile
index d4fdd01..72f2e48 100644
--- a/print/afm/Makefile
+++ b/print/afm/Makefile
@@ -3,7 +3,7 @@
 # Date created:         23 November 1994
 # Whom:                 ljo
 #
-# $Id: Makefile,v 1.6 1995/11/22 13:17:53 asami Exp $
+# $Id: Makefile,v 1.7 1996/11/17 08:44:24 obrien Exp $
 #
 
 DISTNAME=	afm
@@ -16,6 +16,6 @@ pre-patch:
 	@rm -rf ${WRKSRC}/RCS
 
 do-build:
-	@true
+	@${TRUE}
 
 .include <bsd.port.mk>
diff --git a/print/pbm2ppa/Makefile b/print/pbm2ppa/Makefile
index 81e5caa..37e47b5 100644
--- a/print/pbm2ppa/Makefile
+++ b/print/pbm2ppa/Makefile
@@ -3,7 +3,7 @@
 # Date created:		18 November 1998
 # Whom:			smace@freebsd.org
 #
-# $Id: Makefile,v 1.3 1998/11/23 08:54:39 asami Exp $
+# $Id: Makefile,v 1.4 1999/05/10 02:39:19 smace Exp $
 #
 
 DISTNAME=	ppa-0.8.6
@@ -29,7 +29,7 @@ pre-configure:
 	@${ECHO} "720 -- HP720 family (HP 722C, etc.)"
 	@${ECHO} "820 -- HP820 family"
 	@${ECHO} "1000 -- HP820 family"
-	@false
+	@${FALSE}
 .endif
 .if !defined(PAPERSIZE)
 	@${ECHO}
diff --git a/print/pnm2ppa/Makefile b/print/pnm2ppa/Makefile
index 81e5caa..37e47b5 100644
--- a/print/pnm2ppa/Makefile
+++ b/print/pnm2ppa/Makefile
@@ -3,7 +3,7 @@
 # Date created:		18 November 1998
 # Whom:			smace@freebsd.org
 #
-# $Id: Makefile,v 1.3 1998/11/23 08:54:39 asami Exp $
+# $Id: Makefile,v 1.4 1999/05/10 02:39:19 smace Exp $
 #
 
 DISTNAME=	ppa-0.8.6
@@ -29,7 +29,7 @@ pre-configure:
 	@${ECHO} "720 -- HP720 family (HP 722C, etc.)"
 	@${ECHO} "820 -- HP820 family"
 	@${ECHO} "1000 -- HP820 family"
-	@false
+	@${FALSE}
 .endif
 .if !defined(PAPERSIZE)
 	@${ECHO}
diff --git a/print/tex/Makefile b/print/tex/Makefile
index 5cdc35a..a585e6a 100644
--- a/print/tex/Makefile
+++ b/print/tex/Makefile
@@ -3,7 +3,7 @@
 # Date created:         29 September 1994
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.32 1997/12/15 02:19:01 jmz Exp $
+# $Id: Makefile,v 1.33 1999/01/29 03:09:05 jmz Exp $
 #
 
 DISTNAME=	web2c-7.1
@@ -24,7 +24,7 @@ USE_GMAKE=	yes
 MAKE_FLAGS=	fmts= all_mems=
 
 do-build:
-	 @(cd ${WRKSRC}; unset `env|grep ^TEX|sed -e s/=.*//`; \
+	 @(cd ${WRKSRC}; unset `env|${GREP} ^TEX|sed -e s/=.*//`; \
 	    ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${ALL_TARGET})
 
 post-install:
diff --git a/russian/elm.language/Makefile b/russian/elm.language/Makefile
index cc9500d..8af5212 100644
--- a/russian/elm.language/Makefile
+++ b/russian/elm.language/Makefile
@@ -2,7 +2,7 @@
 # Date created:         2 Dec 1995
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.11 1998/06/27 05:19:28 asami Exp $
+# $Id: Makefile,v 1.12 1998/12/01 09:35:42 asami Exp $
 #
 
 PKGNAME=        ru-elm-2.4ME
@@ -19,7 +19,7 @@ NO_BUILD=       YES
 do-fetch:
 
 do-install:
-	grep -q -i koi8 ${PREFIX}/lib/elm.rc || \
+	${GREP} -q -i koi8 ${PREFIX}/lib/elm.rc || \
 		( \
 		echo "charset=KOI8-R"; \
 		echo "displaycharset=KOI8-R"; \
diff --git a/russian/koi8r-ps/Makefile b/russian/koi8r-ps/Makefile
index 426c80e..1868d0a 100644
--- a/russian/koi8r-ps/Makefile
+++ b/russian/koi8r-ps/Makefile
@@ -3,7 +3,7 @@
 # Date created:         22 July 1999
 # Whom:                 mi@aldan.algebra.com
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1999/07/30 17:04:02 ache Exp $
 
 DISTNAME=	koi8rPS-1.0
 CATEGORIES=	russian print
@@ -70,7 +70,7 @@ do-install:
 	###	${PREFIX}/share/ghostscript/5.50/Fontmap
 	### for GhostScript to use cyrillic fonts.
 	#################################################################
-	@test -t 0 && test -t 1 && ${ECHO} -n "Press enter" && read junk || true
+	@test -t 0 && test -t 1 && ${ECHO} -n "Press enter" && read junk || ${TRUE}
 .else
 	@if ${GREP} -q ArialCyrMT-BoldItalic "${FONTMAP}" ; then \
 		${ECHO} Apparently, Fontmap already lists this fonts. Ok. \
diff --git a/russian/netscape4.language/Makefile b/russian/netscape4.language/Makefile
index 546bdbc..022a267 100644
--- a/russian/netscape4.language/Makefile
+++ b/russian/netscape4.language/Makefile
@@ -3,7 +3,7 @@
 # Date created:         8 Apr 1996
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.14 1998/08/05 09:31:38 asami Exp $
+# $Id: Makefile,v 1.15 1998/12/02 05:11:02 asami Exp $
 #
 
 PKGNAME=        ru-netscape-3.01
@@ -27,13 +27,13 @@ do-fetch:
 
 do-install:
 	if [ -f ${APPDEF}/Netscape ] ; then \
-		grep -q '\.version:.*3\.01$$' ${APPDEF}/Netscape || \
+		${GREP} -q '\.version:.*3\.01$$' ${APPDEF}/Netscape || \
 			${RM} ${APPDEF}/Netscape; \
 	fi
 	if [ ! -f ${APPDEF}/Netscape ] ; then \
 		${CP} /usr/local/lib/netscape/Netscape.ad ${APPDEF}/Netscape; \
 	fi
-	cd ${APPDEF}; grep -q koi8-r=BOLD Netscape || \
+	cd ${APPDEF}; ${GREP} -q koi8-r=BOLD Netscape || \
 		patch < ${FILESDIR}/koi8-r_patch;
 
 .include <bsd.port.mk>
diff --git a/russian/pgp.language/Makefile b/russian/pgp.language/Makefile
index 9fcd71c..0e5b7fa 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.22 1999/05/07 03:24:08 jseger Exp $
+# $Id: Makefile,v 1.23 1999/08/22 23:33:21 mharo Exp $
 #
 
 DISTNAME=       pgp26ru
@@ -28,7 +28,7 @@ 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 ${PGPLIB}; grep -l -q '^Language.*=.*ru' config.txt || { \
+	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; }
 	-pgp > /dev/null  2>&1  # update .idx file
diff --git a/russian/pine.language/Makefile b/russian/pine.language/Makefile
index e656ec0..53ba4c8 100644
--- a/russian/pine.language/Makefile
+++ b/russian/pine.language/Makefile
@@ -2,7 +2,7 @@
 # Date created:         2 Dec 1995
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.5 1998/12/01 11:29:29 asami Exp $
+# $Id: Makefile,v 1.6 1999/08/22 23:33:23 mharo Exp $
 #
 
 PKGNAME=        ru-pine-3.96
@@ -19,7 +19,7 @@ NO_BUILD=       YES
 do-fetch:
 
 do-install:
-	grep -q -i koi8 ${PREFIX}/etc/pine.conf || \
+	${GREP} -q -i koi8 ${PREFIX}/etc/pine.conf || \
 		${CAT} ${FILESDIR}/pine.add >> \
 		${PREFIX}/etc/pine.conf
 
diff --git a/science/hdf/Makefile b/science/hdf/Makefile
index 761f28a..646985d 100644
--- a/science/hdf/Makefile
+++ b/science/hdf/Makefile
@@ -3,7 +3,7 @@
 # Date created:		17 November 1996
 # Whom:			mi
 #
-# $Id: Makefile,v 1.8 1998/09/15 11:45:52 asami Exp $
+# $Id: Makefile,v 1.9 1998/10/05 03:20:28 steve Exp $
 #
 
 DISTNAME=	HDF4.1r2
@@ -60,7 +60,7 @@ pre-build:
 	-ln -s /usr/include/zconf.h /usr/include/zlib.h ${WRKSRC}/hdf/zlib/
 
 post-install:
-	@for binary in `grep ^bin/ ${PLIST}` ; do strip ${PREFIX}/$$binary; done
+	@for binary in `${GREP} ^bin/ ${PLIST}` ; do strip ${PREFIX}/$$binary; done
 
 test:
 	cd ${WRKSRC}; make ${MAKE_FLAGS} ${MAKEFILE} test
diff --git a/science/hdf5-18/Makefile b/science/hdf5-18/Makefile
index 761f28a..646985d 100644
--- a/science/hdf5-18/Makefile
+++ b/science/hdf5-18/Makefile
@@ -3,7 +3,7 @@
 # Date created:		17 November 1996
 # Whom:			mi
 #
-# $Id: Makefile,v 1.8 1998/09/15 11:45:52 asami Exp $
+# $Id: Makefile,v 1.9 1998/10/05 03:20:28 steve Exp $
 #
 
 DISTNAME=	HDF4.1r2
@@ -60,7 +60,7 @@ pre-build:
 	-ln -s /usr/include/zconf.h /usr/include/zlib.h ${WRKSRC}/hdf/zlib/
 
 post-install:
-	@for binary in `grep ^bin/ ${PLIST}` ; do strip ${PREFIX}/$$binary; done
+	@for binary in `${GREP} ^bin/ ${PLIST}` ; do strip ${PREFIX}/$$binary; done
 
 test:
 	cd ${WRKSRC}; make ${MAKE_FLAGS} ${MAKEFILE} test
diff --git a/science/hdf5/Makefile b/science/hdf5/Makefile
index 761f28a..646985d 100644
--- a/science/hdf5/Makefile
+++ b/science/hdf5/Makefile
@@ -3,7 +3,7 @@
 # Date created:		17 November 1996
 # Whom:			mi
 #
-# $Id: Makefile,v 1.8 1998/09/15 11:45:52 asami Exp $
+# $Id: Makefile,v 1.9 1998/10/05 03:20:28 steve Exp $
 #
 
 DISTNAME=	HDF4.1r2
@@ -60,7 +60,7 @@ pre-build:
 	-ln -s /usr/include/zconf.h /usr/include/zlib.h ${WRKSRC}/hdf/zlib/
 
 post-install:
-	@for binary in `grep ^bin/ ${PLIST}` ; do strip ${PREFIX}/$$binary; done
+	@for binary in `${GREP} ^bin/ ${PLIST}` ; do strip ${PREFIX}/$$binary; done
 
 test:
 	cd ${WRKSRC}; make ${MAKE_FLAGS} ${MAKEFILE} test
diff --git a/security/pgp/Makefile b/security/pgp/Makefile
index a18138d..e92ce41 100644
--- a/security/pgp/Makefile
+++ b/security/pgp/Makefile
@@ -5,7 +5,7 @@
 # Date created:         8 Jul 1995
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.25 1999/08/22 18:59:54 mharo Exp $
+# $Id: Makefile,v 1.26 1999/08/22 23:33:24 mharo Exp $
 #
 
 # Pick an initial default, else it doesn't get set in the INDEX.
@@ -42,7 +42,7 @@ pre-fetch:
 	@echo
 	@echo You must set variable USA_RESIDENT to YES, if you are USA resident
 	@echo or to NO, if you aren\'t USA resident to build this package
-	@false
+	@${FALSE}
 .elif defined(USA_RESIDENT)
 .if ${USA_RESIDENT} == YES
 DISTNAME=       pgp262s
diff --git a/security/skip/Makefile b/security/skip/Makefile
index 9f7bef9..76755f0 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.8 1999/07/22 18:37:04 archie Exp $
+# $Id: Makefile,v 1.9 1999/07/31 21:48:34 archie Exp $
 
 DISTNAME=		skip-1.0
 CATEGORIES=		security
@@ -50,7 +50,7 @@ MAN4=			skipd.conf.4 raw_keys.4
 post-patch:
 	@find ${WRKSRC} -name '*.orig' -print | xargs rm
 	@cd ${WRKSRC}; \
-	FILES=`find . -type f -print | xargs grep -l @@PREFIX@@`; \
+	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; \
diff --git a/security/vscan/Makefile b/security/vscan/Makefile
index 6f33450..2117f1a 100644
--- a/security/vscan/Makefile
+++ b/security/vscan/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Thur Sept 25, 1996
 # Whom:                 David O'Brien (obrien@cs.ucdavis.edu)
 #
-# $Id: Makefile,v 1.8 1999/03/30 01:55:28 obrien Exp $
+# $Id: Makefile,v 1.9 1999/08/22 18:59:58 mharo Exp $
 #
 
 DISTNAME=	nlxb318e
@@ -26,7 +26,7 @@ pre-fetch:
 	@${ECHO} "This software has /usr/local hardcoded into it."
 	@${ECHO} "Sorry, but with PREFIX = ${PREFIX}, vscan will not work correctly."
 	@${ECHO} ""
-	@false
+	@${FALSE}
 .endif
 
 post-extract:
diff --git a/sysutils/lsof/Makefile b/sysutils/lsof/Makefile
index 488e134..55e6624 100644
--- a/sysutils/lsof/Makefile
+++ b/sysutils/lsof/Makefile
@@ -4,7 +4,7 @@
 # Date created:         Sat July 20, 1996
 # Whom:                 David O'Brien (obrien@FreeBSD.org)
 #
-# $Id: Makefile,v 1.44 1999/07/31 17:22:26 obrien Exp $
+# $Id: Makefile,v 1.45 1999/08/22 19:00:04 mharo Exp $
 #
 
 DISTNAME=	lsof_4.45_W
@@ -36,7 +36,7 @@ SRCBALL_NAME=	${DISTNAME:S/_W$//}
 
 post-extract:
 	@( cd ${WRKDIR} ; \
-	EXPMD5=`/usr/bin/grep MD5 README.${SRCBALL_NAME} | sed 's/^[ ]*//'` ; \
+	EXPMD5=`${GREP} MD5 README.${SRCBALL_NAME} | sed 's/^[ ]*//'` ; \
 	CALCMD5=`${MD5} ${SRCBALL_NAME}.tar` ; \
 	if [ "$${EXPMD5}"X != "$${CALCMD5}"X ]; then \
 		echo "Expected and calculated MD5 signatures don't agree." ; \
diff --git a/www/marc-search/Makefile b/www/marc-search/Makefile
index e497865..860a3b9 100644
--- a/www/marc-search/Makefile
+++ b/www/marc-search/Makefile
@@ -3,7 +3,7 @@
 # Date created:		25 November 1998
 # Whom:			Sheldon Hearn <axl@iafrica.com>
 #
-# $Id: Makefile,v 1.1.1.1 1998/12/01 02:15:41 jkoshy Exp $
+# $Id: Makefile,v 1.2 1999/06/21 11:07:15 sheldonh Exp $
 #
 
 DISTNAME=	marc-search.4.3
@@ -33,7 +33,7 @@ do-configure:
 .if !defined(PUB_HTML) || !defined(DOCROOT) || !defined(SCRIPTDIR)
 	@echo "You must tailor the port Makefile and set PUB_HTML, DOCROOT,"
 	@echo "and SCRIPTDIR to match your site configuration."
-	@false
+	@${FALSE}
 .else
 	${CP} ${FILESDIR}/marc-search.conf ${WRKSRC}/
 	for i in marc-search.cgi marc-search.conf ; do \
diff --git a/www/netscape4-communicator.us/Makefile b/www/netscape4-communicator.us/Makefile
index d2acc2c..f9977c2 100644
--- a/www/netscape4-communicator.us/Makefile
+++ b/www/netscape4-communicator.us/Makefile
@@ -4,7 +4,7 @@
 # Date created:         14 Feb 1998
 # Whom:                 obrien@cs.ucdavis.edu
 #
-# $Id: Makefile,v 1.10 1999/07/21 14:55:43 marcel Exp $
+# $Id: Makefile,v 1.11 1999/08/22 19:00:45 mharo Exp $
 #
 
 DISTNAME=	communicator-v407-us.x86-unknown-linux2.0_libc5
@@ -37,7 +37,7 @@ pre-fetch:
 	@${ECHO} Canadian resident, in order to build this package.
 	@${ECHO} There is no version of this port for NON-USA and NON-Canadian users.
 	@${ECHO}
-	@false
+	@${FALSE}
 #
 .elif defined(USA_RESIDENT)
 .if ${USA_RESIDENT} == YES || ${USA_RESIDENT} == yes
@@ -51,7 +51,7 @@ pre-fetch:
 	@${ECHO}
 	@${ECHO} There is no version of this port for NON-USA and NON-Canadian users.
 	@${ECHO}
-	@false
+	@${FALSE}
 .endif
 .endif
 
diff --git a/www/squirm/Makefile b/www/squirm/Makefile
index 2b8b7f6..caa30ac 100644
--- a/www/squirm/Makefile
+++ b/www/squirm/Makefile
@@ -3,7 +3,7 @@
 # Date created:     24 May 1999
 # Whom:             Maxim Sobolev <sobomax@altavista.net>
 #
-# $Id: Makefile,v 1.1.1.1 1999/06/09 01:39:19 steve Exp $
+# $Id: Makefile,v 1.2 1999/06/30 19:27:17 steve Exp $
 #
 
 DISTNAME=	squirm-1.0betaB
@@ -36,7 +36,7 @@ pre-install:
 	@echo 	'You should set SQUID_UID and SQUID_GID variables to your squid effective'
 	@echo	'user/group. For example: SQUID_UID=squid SQUID_GID=squid.'
 	@echo
-	@false
+	@${FALSE}
 .endif
 
 post-install:
diff --git a/x11-servers/XFree86-4-Server-snap/Makefile b/x11-servers/XFree86-4-Server-snap/Makefile
index cccdc7d..b37fd16 100644
--- a/x11-servers/XFree86-4-Server-snap/Makefile
+++ b/x11-servers/XFree86-4-Server-snap/Makefile
@@ -3,7 +3,7 @@
 # Date created:         5 January 1995
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.56 1999/07/20 23:42:28 asami Exp $
+# $Id: Makefile,v 1.57 1999/07/27 14:27:28 steve Exp $
 #
 
 DISTNAME=	xc
@@ -42,7 +42,7 @@ PLIST=		${PKGDIR}/PLIST.alpha
 pre-fetch:
 	@${ECHO}
 	@${ECHO} You must set variable USA_RESIDENT to YES or NO.
-	@false
+	@${FALSE}
 .elif defined(USA_RESIDENT)
 .if ${USA_RESIDENT} == NO
 pre-fetch:
diff --git a/x11-servers/XFree86-4-Server/Makefile b/x11-servers/XFree86-4-Server/Makefile
index cccdc7d..b37fd16 100644
--- a/x11-servers/XFree86-4-Server/Makefile
+++ b/x11-servers/XFree86-4-Server/Makefile
@@ -3,7 +3,7 @@
 # Date created:         5 January 1995
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.56 1999/07/20 23:42:28 asami Exp $
+# $Id: Makefile,v 1.57 1999/07/27 14:27:28 steve Exp $
 #
 
 DISTNAME=	xc
@@ -42,7 +42,7 @@ PLIST=		${PKGDIR}/PLIST.alpha
 pre-fetch:
 	@${ECHO}
 	@${ECHO} You must set variable USA_RESIDENT to YES or NO.
-	@false
+	@${FALSE}
 .elif defined(USA_RESIDENT)
 .if ${USA_RESIDENT} == NO
 pre-fetch:
diff --git a/x11/XFree86-4-clients/Makefile b/x11/XFree86-4-clients/Makefile
index cccdc7d..b37fd16 100644
--- a/x11/XFree86-4-clients/Makefile
+++ b/x11/XFree86-4-clients/Makefile
@@ -3,7 +3,7 @@
 # Date created:         5 January 1995
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.56 1999/07/20 23:42:28 asami Exp $
+# $Id: Makefile,v 1.57 1999/07/27 14:27:28 steve Exp $
 #
 
 DISTNAME=	xc
@@ -42,7 +42,7 @@ PLIST=		${PKGDIR}/PLIST.alpha
 pre-fetch:
 	@${ECHO}
 	@${ECHO} You must set variable USA_RESIDENT to YES or NO.
-	@false
+	@${FALSE}
 .elif defined(USA_RESIDENT)
 .if ${USA_RESIDENT} == NO
 pre-fetch:
diff --git a/x11/XFree86-4-libraries/Makefile b/x11/XFree86-4-libraries/Makefile
index cccdc7d..b37fd16 100644
--- a/x11/XFree86-4-libraries/Makefile
+++ b/x11/XFree86-4-libraries/Makefile
@@ -3,7 +3,7 @@
 # Date created:         5 January 1995
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.56 1999/07/20 23:42:28 asami Exp $
+# $Id: Makefile,v 1.57 1999/07/27 14:27:28 steve Exp $
 #
 
 DISTNAME=	xc
@@ -42,7 +42,7 @@ PLIST=		${PKGDIR}/PLIST.alpha
 pre-fetch:
 	@${ECHO}
 	@${ECHO} You must set variable USA_RESIDENT to YES or NO.
-	@false
+	@${FALSE}
 .elif defined(USA_RESIDENT)
 .if ${USA_RESIDENT} == NO
 pre-fetch:
diff --git a/x11/XFree86-4/Makefile b/x11/XFree86-4/Makefile
index cccdc7d..b37fd16 100644
--- a/x11/XFree86-4/Makefile
+++ b/x11/XFree86-4/Makefile
@@ -3,7 +3,7 @@
 # Date created:         5 January 1995
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.56 1999/07/20 23:42:28 asami Exp $
+# $Id: Makefile,v 1.57 1999/07/27 14:27:28 steve Exp $
 #
 
 DISTNAME=	xc
@@ -42,7 +42,7 @@ PLIST=		${PKGDIR}/PLIST.alpha
 pre-fetch:
 	@${ECHO}
 	@${ECHO} You must set variable USA_RESIDENT to YES or NO.
-	@false
+	@${FALSE}
 .elif defined(USA_RESIDENT)
 .if ${USA_RESIDENT} == NO
 pre-fetch:
diff --git a/x11/XFree86/Makefile b/x11/XFree86/Makefile
index cccdc7d..b37fd16 100644
--- a/x11/XFree86/Makefile
+++ b/x11/XFree86/Makefile
@@ -3,7 +3,7 @@
 # Date created:         5 January 1995
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.56 1999/07/20 23:42:28 asami Exp $
+# $Id: Makefile,v 1.57 1999/07/27 14:27:28 steve Exp $
 #
 
 DISTNAME=	xc
@@ -42,7 +42,7 @@ PLIST=		${PKGDIR}/PLIST.alpha
 pre-fetch:
 	@${ECHO}
 	@${ECHO} You must set variable USA_RESIDENT to YES or NO.
-	@false
+	@${FALSE}
 .elif defined(USA_RESIDENT)
 .if ${USA_RESIDENT} == NO
 pre-fetch: