grep -> ${GREP}

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

5 files changed, 11 insertions, 11 deletions

diff --git a/russian/elm.language/Makefile b/russian/elm.language/Makefile
index cc9500d84b6c..8af5212e1299 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 426c80e0e259..1868d0a05462 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 546bdbc806f5..022a267fb330 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 9fcd71c71cf3..0e5b7fa4941d 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 e656ec0711db..53ba4c8b7b1a 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