mkdir -> ${MKDIR}

rmdir -> ${RMDIR}
rm -> ${RM} (${RM} added to PLIST_SUBST)
chmod -> ${CHMOD}
chown -> ${CHOWN}

7 files changed, 18 insertions, 18 deletions

diff --git a/net/ORBit/PLIST b/net/ORBit/PLIST
index dc432e60e45..69fead44e79 100644
--- a/net/ORBit/PLIST
+++ b/net/ORBit/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/01/15 23:52:11 rh Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/02/15 10:12:53 skrll Exp $
 bin/libIDL-config
 bin/name-client
 bin/old-name-server
@@ -107,7 +107,7 @@ share/idl/orbit-1.0/CosTypedEventComm.idl
 share/idl/orbit-1.0/LName.pidl
 @dirrm share/idl/orbit-1.0
 @dirrm share/idl
-@unexec rmdir %D/lib/pkgconfig 2>/dev/null || true
+@unexec ${RMDIR} %D/lib/pkgconfig 2>/dev/null || true
 @dirrm include/orbit-1.0/orb
 @dirrm include/orbit-1.0/ORBitutil
 @dirrm include/orbit-1.0/ORBitservices
diff --git a/net/arla/PLIST b/net/arla/PLIST
index ff5f758966d..f50a23db97a 100644
--- a/net/arla/PLIST
+++ b/net/arla/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/05 22:39:06 skrll Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/02/15 10:12:53 skrll Exp $
 include/arlalib.h
 include/atypes.h
 include/fs_errors.h
@@ -113,7 +113,7 @@ man/man8/bos.8
 @unexec install-info --delete %D/info/arla.info %D/info/dir
 info/arla.info
 @exec install-info %D/info/arla.info %D/info/dir
-@exec if [ ! -e ${ARLA_CACHE} ] ; then ${MKDIR} -p ${ARLA_CACHE}; /bin/chmod 700 ${ARLA_CACHE}; chown root ${ARLA_CACHE}; fi
+@exec if [ ! -e ${ARLA_CACHE} ] ; then ${MKDIR} -p ${ARLA_CACHE}; ${CHMOD} 700 ${ARLA_CACHE}; ${CHOWN} root ${ARLA_CACHE}; fi
 @exec if [ ! -e /sbin/mount_xfs ]; then /bin/ln -s %D/sbin/mount_xfs /sbin/mount_xfs; fi
 @unexec /bin/rm -f /sbin/mount_xfs
 @unexec /bin/rm -rf ${ARLA_CACHE}
diff --git a/net/icsi-finger/PLIST b/net/icsi-finger/PLIST
index 81dd77982cf..9494d51cda8 100644
--- a/net/icsi-finger/PLIST
+++ b/net/icsi-finger/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:55:40 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:54 skrll Exp $
 bin/gfinger
 sbin/gfingerd
 sbin/packet2ascii
@@ -32,6 +32,6 @@ share/examples/icsi-finger/targets/x-.users
 share/examples/icsi-finger/targets/x-help
 @dirrm share/examples/icsi-finger/targets
 @dirrm share/examples/icsi-finger
-@exec mkdir -p %D/etc/fingerdir/targets
+@exec ${MKDIR} -p %D/etc/fingerdir/targets
 @dirrm etc/fingerdir/targets
 @dirrm etc/fingerdir
diff --git a/net/ipa/PLIST b/net/ipa/PLIST
index d8b45dde601..0b11ae75ebc 100644
--- a/net/ipa/PLIST
+++ b/net/ipa/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:55:41 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:54 skrll Exp $
 bin/ipa
 bin/ipastat
 etc/ipa.conf.default
@@ -15,6 +15,6 @@ share/examples/ipa/README
 share/examples/ipa/example-1
 share/examples/ipa/example-2
 @dirrm share/examples/ipa
-@unexec if [ -f %D/etc/rc.d/ipa.sh ]; then cmp -s %D/etc/rc.d/ipa.sh.sample %D/etc/rc.d/ipa.sh && rm -f %D/etc/rc.d/ipa.sh || echo "If you are permanently removing this pkg, you should do a ``rm ${PKG_PREFIX}/etc/rc.d/ipa.sh`` to remove startup files left." | fmt ; fi
-@unexec rmdir %D/man/ru_SU.KOI8-R/man8 %D/man/ru_SU.KOI8-R/man5 %D/man/ru_SU.KOI8-R 2>/dev/null || true
-@unexec if [ -L %D/man/ru_RU.KOI8-R ]; then rm %D/man/ru_RU.KOI8-R 2>/dev/null || true; else rmdir %D/man/ru_RU.KOI8-R/man8 %D/man/ru_RU.KOI8-R/man5 %D/man/ru_RU.KOI8-R && rm %D/man/ru_RU.KOI8-R 2>/dev/null || true ; fi
+@unexec if [ -f %D/etc/rc.d/ipa.sh ]; then cmp -s %D/etc/rc.d/ipa.sh.sample %D/etc/rc.d/ipa.sh && ${RM} -f %D/etc/rc.d/ipa.sh || echo "If you are permanently removing this pkg, you should do a ``rm ${PKG_PREFIX}/etc/rc.d/ipa.sh`` to remove startup files left." | fmt ; fi
+@unexec ${RMDIR} %D/man/ru_SU.KOI8-R/man8 %D/man/ru_SU.KOI8-R/man5 %D/man/ru_SU.KOI8-R 2>/dev/null || true
+@unexec if [ -L %D/man/ru_RU.KOI8-R ]; then ${RM} %D/man/ru_RU.KOI8-R 2>/dev/null || true; else ${RMDIR} %D/man/ru_RU.KOI8-R/man8 %D/man/ru_RU.KOI8-R/man5 %D/man/ru_RU.KOI8-R && ${RM} %D/man/ru_RU.KOI8-R 2>/dev/null || true ; fi
diff --git a/net/mirror/PLIST b/net/mirror/PLIST
index 2fd153f2233..f09045bde65 100644
--- a/net/mirror/PLIST
+++ b/net/mirror/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:56:12 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:54 skrll Exp $
 bin/mirror
 bin/do_unlinks
 bin/pkgs_to_mmin
@@ -11,4 +11,4 @@ lib/mirror/ftp.pl
 lib/mirror/lsparse.pl
 lib/mirror/mirror.defaults.dist
 @exec if [ ! -f %D/lib/mirror/mirror.defaults ]; then cp -p %D/lib/mirror/mirror.defaults.dist %D/lib/mirror/mirror.defaults; fi
-@unexec rmdir %D/lib/mirror 2>/dev/null || true
+@unexec ${RMDIR} %D/lib/mirror 2>/dev/null || true
diff --git a/net/radiusd-cistron/PLIST b/net/radiusd-cistron/PLIST
index 9c378343578..f1771d5e32a 100644
--- a/net/radiusd-cistron/PLIST
+++ b/net/radiusd-cistron/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/02/04 13:01:33 martti Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/02/15 10:12:54 skrll Exp $
 bin/radclient
 bin/radlast
 bin/radtest
@@ -53,7 +53,7 @@ share/doc/radiusd-cistron/README.simul
 share/doc/radiusd-cistron/README.tunnel
 share/doc/radiusd-cistron/README.usersfile
 @dirrm share/doc/radiusd-cistron
-@unexec rmdir %D/etc/raddbr 2>/dev/null || true
-@unexec rm -f /var/log/radius.log
-@unexec rm -f /var/run/radiusd.pid
+@unexec ${RMDIR} %D/etc/raddbr 2>/dev/null || true
+@unexec ${RM} -f /var/log/radius.log
+@unexec ${RM} -f /var/run/radiusd.pid
 @unexec echo "Leaving /var/run/radutmp, /var/log/radwtmp and /var/log/radacct alone."
diff --git a/net/snort/PLIST b/net/snort/PLIST
index 4917ed2f697..60a0de56b46 100644
--- a/net/snort/PLIST
+++ b/net/snort/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2001/11/28 13:44:51 kleink Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/02/15 10:12:55 skrll Exp $
 bin/snort
 man/man8/snort.8
 share/doc/snort/AUTHORS
@@ -62,4 +62,4 @@ share/snort/x11.rules
 @dirrm share/snort
 @dirrm share/doc/snort
 @exec install -d -m 700 -o root -g wheel /var/log/snort
-@unexec rmdir /var/log/snort 2>/dev/null || true
+@unexec ${RMDIR} /var/log/snort 2>/dev/null || true