diff options
| author | jlam <jlam> | 2001-08-14 03:41:37 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2001-08-14 03:41:37 +0000 |
| commit | fa4a5161ab7394ae46c058a43c6eb550b9954b8c (patch) | |
| tree | be92c5758d72a625f5cd1f8562ab245b28dc9940 /security | |
| parent | 3b67ea892a211534e02ae5fe6882adb79b2b1a36 (diff) | |
| download | pkgsrc-fa4a5161ab7394ae46c058a43c6eb550b9954b8c.tar.gz | |
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.
Diffstat (limited to 'security')
| -rw-r--r-- | security/cyrus-sasl/Makefile | 4 | ||||
| -rw-r--r-- | security/cyrus-sasl/pkg/INSTALL | 6 |
2 files changed, 5 insertions, 5 deletions
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." |