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 /chat/gale | |
| 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 'chat/gale')
| -rw-r--r-- | chat/gale/Makefile | 4 | ||||
| -rw-r--r-- | chat/gale/pkg/INSTALL | 6 |
2 files changed, 5 insertions, 5 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." |