summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjlam <jlam>2000-12-11 09:04:52 +0000
committerjlam <jlam>2000-12-11 09:04:52 +0000
commit443ca68726d4404b36a05c360cb210385a21184d (patch)
tree9a93af300d7616638f12a5a9cc4142b9420fcc21
parentdfdf4cb7745705ca1fd4e4cbd4370cdd643e63c4 (diff)
downloadpkgsrc-443ca68726d4404b36a05c360cb210385a21184d.tar.gz
Replace a few more utilities with their paths from bsd.pkg.mk.
-rw-r--r--security/cyrus-sasl/Makefile4
-rw-r--r--security/cyrus-sasl/pkg/DEINSTALL13
2 files changed, 11 insertions, 6 deletions
diff --git a/security/cyrus-sasl/Makefile b/security/cyrus-sasl/Makefile
index 368a14ff73b..d44787057ff 100644
--- a/security/cyrus-sasl/Makefile
+++ b/security/cyrus-sasl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2000/12/11 08:59:29 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2000/12/11 09:04:52 jlam Exp $
DISTNAME= cyrus-sasl-1.5.24
PKGNAME= ${DISTNAME}nb2
@@ -102,6 +102,8 @@ post-build:
pre-install:
${SED} -e "s,@CYRUS_USER@,${CYRUS_USER},g" \
-e "s,@CYRUS_GROUP@,${CYRUS_GROUP},g" \
+ -e "s,@CAT@,${CAT},g" \
+ -e "s,@RM@,${RM},g" \
< ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE}
${SED} -e "s,@CYRUS_USER@,${CYRUS_USER},g" \
-e "s,@CYRUS_GROUP@,${CYRUS_GROUP},g" \
diff --git a/security/cyrus-sasl/pkg/DEINSTALL b/security/cyrus-sasl/pkg/DEINSTALL
index e19454c5736..9ce92abe655 100644
--- a/security/cyrus-sasl/pkg/DEINSTALL
+++ b/security/cyrus-sasl/pkg/DEINSTALL
@@ -1,12 +1,15 @@
#!/bin/sh
#
-# $NetBSD: DEINSTALL,v 1.1 2000/12/10 09:43:38 jlam Exp $
+# $NetBSD: DEINSTALL,v 1.2 2000/12/11 09:04:52 jlam Exp $
PKGNAME=$1
STAGE=$2
-USER=@CYRUS_USER@
-GROUP=@CYRUS_GROUP@
+USER="@CYRUS_USER@"
+GROUP="@CYRUS_GROUP@"
+
+CAT="@CAT@"
+RM="@RM@"
SASLDB=/etc/sasldb.db
PWCHECKDIR=/var/pwcheck
@@ -16,8 +19,8 @@ DEINSTALL)
;;
POST-DEINSTALL)
- rm -rf ${PWCHECKDIR}
- cat << EOF
+ ${RM} -rf ${PWCHECKDIR}
+ ${CAT} << EOF
===========================================================================
If you won't be using ${PKGNAME} any longer, you may want to remove