grep isn't used anymore, so don't substitute for @GREP@ in the INSTALL

files.  Substitute for @ID@ instead of directly using 'id', and use the
value of ${ID} already set in defs.*.mk.

10 files changed, 25 insertions, 25 deletions

diff --git a/chat/gale/Makefile b/chat/gale/Makefile
index 926ed9d44ea..71a1e9ed070 100644
--- a/chat/gale/Makefile
+++ b/chat/gale/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/06/11 06:34:21 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2001/08/14 03:41:37 jlam Exp $
 #
 
 DISTNAME=	gale-0.99a
@@ -57,7 +57,7 @@ pre-install:
 		-e 's|@ADDUSER@|${ADDUSER}|g' \
 		-e 's|@ADDGROUP@|${ADDGROUP}|g' \
 		-e 's|@CHGRP@|${CHGRP}|g' \
-		-e 's|@GREP@|${GREP}|g' \
+		-e 's|@ID@|${ID}|g' \
 		-e 's|@RM@|${RM}|g' \
 		-e 's|@TOUCH@|${TOUCH}|g' \
 		< ${PKGDIR}/INSTALL > ${INSTALL_FILE}
diff --git a/chat/gale/pkg/INSTALL b/chat/gale/pkg/INSTALL
index e07a53bc553..9dd86b1b871 100644
--- a/chat/gale/pkg/INSTALL
+++ b/chat/gale/pkg/INSTALL
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: INSTALL,v 1.3 2001/08/12 19:55:56 veego Exp $
+# $NetBSD: INSTALL,v 1.4 2001/08/14 03:41:38 jlam Exp $
 
 USER=@GALE_USER@
 GROUP=@GALE_GROUP@
@@ -8,7 +8,7 @@ GROUP=@GALE_GROUP@
 ADDUSER="@ADDUSER@"
 ADDGROUP="@ADDGROUP@"
 CHGRP="@CHGRP@"
-GREP="@GREP@"
+ID="@ID@"
 RM="@RM@"
 TOUCH="@TOUCH@"
 
@@ -30,7 +30,7 @@ ${RM} -f "/tmp/grouptest.$$"
 
 # Use `id' to be able to use NIS.
 #
-id ${USER} 2>/dev/null >/dev/null
+${ID} ${USER} 2>/dev/null >/dev/null
 if [ $? -eq 0 ]
 then
 	echo "User '${USER}' already exists...proceeding."
diff --git a/databases/postgresql-server/Makefile b/databases/postgresql-server/Makefile
index fd9f6d4a00a..b635f59b6b4 100644
--- a/databases/postgresql-server/Makefile
+++ b/databases/postgresql-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/06/23 19:26:52 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2001/08/14 03:41:38 jlam Exp $
 
 .include "../../databases/postgresql/Makefile.common"
 .include "../../databases/postgresql/Makefile.ssl"
@@ -54,7 +54,7 @@ FILES_SUBST+=		ADDGROUP=${ADDGROUP:Q}
 FILES_SUBST+=		CAT=${CAT:Q}
 FILES_SUBST+=		CHGRP=${CHGRP:Q}
 FILES_SUBST+=		CHOWN=${CHOWN:Q}
-FILES_SUBST+=		GREP=${GREP:Q}
+FILES_SUBST+=		ID=${ID:Q}
 FILES_SUBST+=		MKDIR=${MKDIR:Q}
 FILES_SUBST+=		RM=${RM:Q}
 FILES_SUBST+=		SU=${SU:Q}
diff --git a/databases/postgresql-server/pkg/INSTALL b/databases/postgresql-server/pkg/INSTALL
index 8762131b5f2..3772ed4c54e 100644
--- a/databases/postgresql-server/pkg/INSTALL
+++ b/databases/postgresql-server/pkg/INSTALL
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: INSTALL,v 1.4 2001/08/12 19:55:56 veego Exp $
+# $NetBSD: INSTALL,v 1.5 2001/08/14 03:41:38 jlam Exp $
 
 PKGNAME=$1
 STAGE=$2
@@ -13,7 +13,7 @@ ADDUSER="@ADDUSER@"
 ADDGROUP="@ADDGROUP@"
 CHGRP="@CHGRP@"
 CHOWN="@CHOWN@"
-GREP="@GREP@"
+ID="@ID@"
 MKDIR="@MKDIR@"
 RM="@RM@"
 SU="@SU@"
@@ -39,7 +39,7 @@ PRE-INSTALL)
 
 	# Use `id' to be able to use NIS.
 	#
-	id ${USER} 2>/dev/null >/dev/null
+	${ID} ${USER} 2>/dev/null >/dev/null
 	if [ $? -eq 0 ]
 	then
 		echo "User '${USER}' already exists...proceeding."
diff --git a/print/cups/Makefile b/print/cups/Makefile
index 157e5aad283..1d114b0cd16 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2001/08/02 03:37:39 jlam Exp $
+# $NetBSD: Makefile,v 1.36 2001/08/14 03:41:38 jlam Exp $
 
 DISTNAME=		cups-${DIST_VERS}-source
 PKGNAME=		cups-${VERS}
@@ -85,7 +85,7 @@ FILES_SUBST+=		CHMOD=${CHMOD:Q}
 FILES_SUBST+=		CHOWN=${CHOWN:Q}
 FILES_SUBST+=		CMP=${CMP:Q}
 FILES_SUBST+=		CP=${CP:Q}
-FILES_SUBST+=		GREP=${GREP:Q}
+FILES_SUBST+=		ID=${ID:Q}
 FILES_SUBST+=		MKDIR=${MKDIR:Q}
 FILES_SUBST+=		RM=${RM:Q}
 FILES_SUBST+=		RMDIR=${RMDIR:Q}
diff --git a/print/cups/pkg/INSTALL b/print/cups/pkg/INSTALL
index b7cc673ed55..46378126ebb 100644
--- a/print/cups/pkg/INSTALL
+++ b/print/cups/pkg/INSTALL
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# $NetBSD: INSTALL,v 1.10 2001/08/12 19:55:56 veego Exp $
+# $NetBSD: INSTALL,v 1.11 2001/08/14 03:41:39 jlam Exp $
 
 PKGNAME=$1
 STAGE=$2
@@ -15,7 +15,7 @@ CHGRP="@CHGRP@"
 CHMOD="@CHMOD@"
 CHOWN="@CHOWN@"
 CP="@CP@"
-GREP="@GREP@"
+ID="@ID@"
 MKDIR="@MKDIR@"
 RM="@RM@"
 TOUCH="@TOUCH@"
@@ -47,7 +47,7 @@ PRE-INSTALL)
 
 	# Use `id' to be able to use NIS.
 	#
-	id ${USER} 2>/dev/null >/dev/null
+	${ID} ${USER} 2>/dev/null >/dev/null
 	if [ $? -eq 0 ]
 	then
 		echo "User '${USER}' already exists...proceeding."
diff --git a/security/cyrus-sasl/Makefile b/security/cyrus-sasl/Makefile
index 99e4dbd3571..fb451748b45 100644
--- a/security/cyrus-sasl/Makefile
+++ b/security/cyrus-sasl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2001/03/27 03:20:15 hubertf Exp $
+# $NetBSD: Makefile,v 1.15 2001/08/14 03:41:39 jlam Exp $
 
 DISTNAME=		cyrus-sasl-1.5.24
 PKGNAME=		${DISTNAME}nb3
@@ -110,7 +110,7 @@ pre-install:
 		-e "s,@CHGRP@,${CHGRP},g" \
 		-e "s,@CHMOD@,${CHMOD},g" \
 		-e "s,@CHOWN@,${CHOWN},g" \
-		-e "s,@GREP@,${GREP},g" \
+		-e "s,@ID@,${ID},g" \
 		-e "s,@MKDIR@,${MKDIR},g" \
 		-e "s,@RM@,${RM},g" \
 		-e "s,@TOUCH@,${TOUCH},g" \
diff --git a/security/cyrus-sasl/pkg/INSTALL b/security/cyrus-sasl/pkg/INSTALL
index a2746dd75cb..dd6b9c184bd 100644
--- a/security/cyrus-sasl/pkg/INSTALL
+++ b/security/cyrus-sasl/pkg/INSTALL
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# $NetBSD: INSTALL,v 1.2 2001/08/12 19:45:18 veego Exp $
+# $NetBSD: INSTALL,v 1.3 2001/08/14 03:41:39 jlam Exp $
 
 PKGNAME=$1
 STAGE=$2
@@ -13,7 +13,7 @@ ADDGROUP="@ADDGROUP@"
 CHGRP="@CHGRP@"
 CHMOD="@CHMOD@"
 CHOWN="@CHOWN@"
-GREP="@GREP@"
+ID="@ID@"
 MKDIR="@MKDIR@"
 RM="@RM@"
 TOUCH="@TOUCH@"
@@ -41,7 +41,7 @@ PRE-INSTALL)
 
 	# Use `id' to be able to use NIS.
 	#
-	id ${USER} 2>/dev/null >/dev/null
+	${ID} ${USER} 2>/dev/null >/dev/null
 	if [ $? -eq 0 ]
 	then
 		echo "User '${USER}' already exists...proceeding."
diff --git a/sysutils/ups-nut/Makefile b/sysutils/ups-nut/Makefile
index 1f328036bc6..eaab1147d89 100644
--- a/sysutils/ups-nut/Makefile
+++ b/sysutils/ups-nut/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/04/01 14:04:36 martin Exp $
+# $NetBSD: Makefile,v 1.8 2001/08/14 03:41:39 jlam Exp $
 #
 
 DISTNAME=		nut-0.44.3-pre5
@@ -59,7 +59,7 @@ pre-install:
 		-e 's|@ADDUSER@|${ADDUSER}|g' \
 		-e 's|@ADDGROUP@|${ADDGROUP}|g' \
 		-e 's|@CHGRP@|${CHGRP}|g' \
-		-e 's|@GREP@|${GREP}|g' \
+		-e 's|@ID@|${ID}|g' \
 		-e 's|@RM@|${RM}|g' \
 		-e 's|@TOUCH@|${TOUCH}|g' \
 		< ${PKGDIR}/INSTALL > ${INSTALL_FILE}
diff --git a/sysutils/ups-nut/pkg/INSTALL b/sysutils/ups-nut/pkg/INSTALL
index 055fb288fc7..10de348e8e5 100644
--- a/sysutils/ups-nut/pkg/INSTALL
+++ b/sysutils/ups-nut/pkg/INSTALL
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: INSTALL,v 1.2 2001/08/12 19:55:57 veego Exp $
+# $NetBSD: INSTALL,v 1.3 2001/08/14 03:41:39 jlam Exp $
 
 USER=@NUT_USER@
 GROUP=@NUT_GROUP@
@@ -8,7 +8,7 @@ GROUP=@NUT_GROUP@
 ADDUSER="@ADDUSER@"
 ADDGROUP="@ADDGROUP@"
 CHGRP="@CHGRP@"
-GREP="@GREP@"
+ID="@ID@"
 RM="@RM@"
 TOUCH="@TOUCH@"
 
@@ -30,7 +30,7 @@ ${RM} -f "/tmp/grouptest.$$"
 
 # Use `id' to be able to use NIS.
 #
-id ${USER} 2>/dev/null >/dev/null
+${ID} ${USER} 2>/dev/null >/dev/null
 if [ $? -eq 0 ]
 then
 	echo "User '${USER}' already exists...proceeding."