mkdir -> ${MKDIR}

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

16 files changed, 61 insertions, 61 deletions

diff --git a/www/Mosaic/PLIST b/www/Mosaic/PLIST
index c3779fad9fe..c25a3a401ca 100644
--- a/www/Mosaic/PLIST
+++ b/www/Mosaic/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 02:15:23 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:13:02 skrll Exp $
 bin/Mosaic
 bin/mosaic
 lib/X11/app-defaults/Mosaic
-@exec mkdir -p %D/share/mosaic
-@unexec rm -rf %D/share/mosaic
+@exec ${MKDIR} -p %D/share/mosaic
+@unexec ${RM} -rf %D/share/mosaic
diff --git a/www/apache-current/PLIST b/www/apache-current/PLIST
index 410d3685146..8a3be864a7f 100644
--- a/www/apache-current/PLIST
+++ b/www/apache-current/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/01/04 09:45:09 martti Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/02/15 10:13:02 skrll Exp $
 bin/ab
 bin/apachectl
 bin/apxs
@@ -719,4 +719,4 @@ share/httpd/icons/world2.png
 @dirrm share/httpd/manual/vhosts
 @dirrm share/httpd/manual
 @dirrm share/httpd
-@unexec rmdir %D/etc/httpd 2>/dev/null || true
+@unexec ${RMDIR} %D/etc/httpd 2>/dev/null || true
diff --git a/www/bluefish/PLIST b/www/bluefish/PLIST
index fc7730a1fbf..10525df0514 100644
--- a/www/bluefish/PLIST
+++ b/www/bluefish/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/01/19 02:00:44 mjl Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/02/15 10:13:02 skrll Exp $
 bin/bluefish
 man/man1/bluefish.1
 share/bluefish/php3_functions
@@ -175,7 +175,7 @@ ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/bluefish.mo
 ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/bluefish.mo
 ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/bluefish.mo
 ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/bluefish.mo
-@unexec rmdir -p %D/share/pixmaps 2>/dev/null || true
+@unexec ${RMDIR} -p %D/share/pixmaps 2>/dev/null || true
 @dirrm share/doc/html/bluefish/images
 @dirrm share/doc/html/bluefish/en
 @dirrm share/doc/html/bluefish/it
diff --git a/www/cocoon/PLIST b/www/cocoon/PLIST
index 35ee6434c77..84259be0c70 100644
--- a/www/cocoon/PLIST
+++ b/www/cocoon/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 02:16:32 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:13:02 skrll Exp $
 lib/java/cocoon.jar
 lib/java/sax-bugfix.jar
 lib/java/turbine-pool.jar
@@ -594,7 +594,7 @@ share/examples/java/cocoon/ldap/ldap.xml
 share/examples/java/cocoon/ldap/ldap.xsl
 share/examples/java/cocoon/index.xml
 share/examples/java/cocoon/index.xsl
-@unexec rm -rf tomcat/repository
+@unexec ${RM} -rf tomcat/repository
 @dirrm share/examples/java/cocoon/xsp
 @dirrm share/examples/java/cocoon/xinclude
 @dirrm share/examples/java/cocoon/wap
diff --git a/www/communicator/PLIST.post b/www/communicator/PLIST.post
index f52e3f88154..28a29cba0a3 100644
--- a/www/communicator/PLIST.post
+++ b/www/communicator/PLIST.post
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.post,v 1.1 2001/11/01 02:24:37 zuntum Exp $
+@comment $NetBSD: PLIST.post,v 1.2 2002/02/15 10:13:03 skrll Exp $
 @dirrm lib/netscape/${BINNAME}-${NS_VERS}/spell
 @dirrm lib/netscape/${BINNAME}-${NS_VERS}/plugins
 @dirrm lib/netscape/${BINNAME}-${NS_VERS}/nethelp/netscape/trouble
@@ -18,6 +18,6 @@
 @dirrm lib/netscape/${BINNAME}-${NS_VERS}/java/classes
 @dirrm lib/netscape/${BINNAME}-${NS_VERS}/java
 @dirrm lib/netscape/${BINNAME}-${NS_VERS}
-@exec mkdir -p %D/lib/netscape/plugins
-@unexec rmdir %D/lib/netscape/plugins 2>/dev/null || true
-@unexec rmdir %D/lib/netscape 2>/dev/null || true
+@exec ${MKDIR} -p %D/lib/netscape/plugins
+@unexec ${RMDIR} %D/lib/netscape/plugins 2>/dev/null || true
+@unexec ${RMDIR} %D/lib/netscape 2>/dev/null || true
diff --git a/www/haskell-cgi/PLIST b/www/haskell-cgi/PLIST
index 0fa730a062a..b9a840dc9c8 100644
--- a/www/haskell-cgi/PLIST
+++ b/www/haskell-cgi/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 02:16:48 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:13:03 skrll Exp $
 share/examples/hugs-cgi/Counter.cgi
 share/examples/hugs-cgi/DownloadPapers.cgi
 share/examples/hugs-cgi/EnvPassed.cgi
@@ -8,5 +8,5 @@ share/examples/hugs-cgi/HelloPlain.cgi
 share/examples/hugs-cgi/README
 share/examples/hugs-cgi/TODO
 share/hugs/lib/CGI.lhs
-@unexec rmdir %D/share/hugs/lib 2>/dev/null || true
+@unexec ${RMDIR} %D/share/hugs/lib 2>/dev/null || true
 @dirrm share/examples/hugs-cgi
diff --git a/www/jakarta-tomcat/PLIST b/www/jakarta-tomcat/PLIST
index c55ae16c534..a61d93b0524 100644
--- a/www/jakarta-tomcat/PLIST
+++ b/www/jakarta-tomcat/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 02:17:08 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:13:03 skrll Exp $
 etc/rc.d/tomcat
 tomcat/KEYS
 tomcat/LICENSE
@@ -364,17 +364,17 @@ tomcat/webapps/admin.war
 tomcat/webapps/examples.war
 tomcat/webapps/test.war
 @comment must explicitly remove webapp working files, but not any user files in webapps
-@unexec rm -rf tomcat/webapps/ROOT
-@unexec rm -rf tomcat/webapps/admin
-@unexec rm -rf tomcat/webapps/examples
-@unexec rm -rf tomcat/webapps/test
+@unexec ${RM} -rf tomcat/webapps/ROOT
+@unexec ${RM} -rf tomcat/webapps/admin
+@unexec ${RM} -rf tomcat/webapps/examples
+@unexec ${RM} -rf tomcat/webapps/test
 @comment must explicitly remove tomcat working stash
-@unexec rm -rf tomcat/work
+@unexec ${RM} -rf tomcat/work
 @comment also remove auto-generated conf fragments, if present
-@unexec rm -f /usr/pkg/tomcat/conf/iis_redirect.reg-auto
-@unexec rm -f /usr/pkg/tomcat/conf/mod_jk.conf-auto
-@unexec rm -f /usr/pkg/tomcat/conf/obj.conf-auto
-@unexec rm -f /usr/pkg/tomcat/conf/uriworkermap.properties-auto
+@unexec ${RM} -f /usr/pkg/tomcat/conf/iis_redirect.reg-auto
+@unexec ${RM} -f /usr/pkg/tomcat/conf/mod_jk.conf-auto
+@unexec ${RM} -f /usr/pkg/tomcat/conf/obj.conf-auto
+@unexec ${RM} -f /usr/pkg/tomcat/conf/uriworkermap.properties-auto
 @dirrm tomcat/src/org/apache/tomcat/util/xml
 @dirrm tomcat/src/org/apache/tomcat/util/pattern
 @dirrm tomcat/src/org/apache/tomcat/util/compat
diff --git a/www/mozilla/PLIST-ELF b/www/mozilla/PLIST-ELF
index 0eaf0020957..67677053076 100644
--- a/www/mozilla/PLIST-ELF
+++ b/www/mozilla/PLIST-ELF
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST-ELF,v 1.4 2002/02/09 03:54:47 taya Exp $
+@comment $NetBSD: PLIST-ELF,v 1.5 2002/02/15 10:13:03 skrll Exp $
 bin/mozilla
 @comment begin PROGRAMS
 lib/mozilla/dirver
@@ -2387,14 +2387,14 @@ include/mozilla/xultmpl/nsIXULTemplateBuilder.h
 @comment end INCLUDE
 @exec env LD_LIBRARY_PATH=%D/lib/mozilla MOZILLA_FIVE_HOME=%D/lib/mozilla %D/lib/mozilla/regxpcom
 @exec env LD_LIBRARY_PATH=%D/lib/mozilla MOZILLA_FIVE_HOME=%D/lib/mozilla %D/lib/mozilla/regchrome
-@unexec rm %D/lib/mozilla/component.reg
-@unexec rm %D/lib/mozilla/chrome/chrome.rdf
-@unexec rm %D/lib/mozilla/chrome/overlayinfo/communicator/content/overlays.rdf
-@unexec rm %D/lib/mozilla/chrome/overlayinfo/editor/content/overlays.rdf
-@unexec rm %D/lib/mozilla/chrome/overlayinfo/messenger/content/overlays.rdf
-@unexec rm %D/lib/mozilla/chrome/overlayinfo/navigator/content/overlays.rdf
-@unexec rm %D/lib/mozilla/chrome/overlayinfo/inspector/content/overlays.rdf
-@unexec rm %D/lib/mozilla/components/xpti.dat
+@unexec ${RM} %D/lib/mozilla/component.reg
+@unexec ${RM} %D/lib/mozilla/chrome/chrome.rdf
+@unexec ${RM} %D/lib/mozilla/chrome/overlayinfo/communicator/content/overlays.rdf
+@unexec ${RM} %D/lib/mozilla/chrome/overlayinfo/editor/content/overlays.rdf
+@unexec ${RM} %D/lib/mozilla/chrome/overlayinfo/messenger/content/overlays.rdf
+@unexec ${RM} %D/lib/mozilla/chrome/overlayinfo/navigator/content/overlays.rdf
+@unexec ${RM} %D/lib/mozilla/chrome/overlayinfo/inspector/content/overlays.rdf
+@unexec ${RM} %D/lib/mozilla/components/xpti.dat
 @dirrm lib/mozilla/chrome/overlayinfo/navigator/content
 @dirrm lib/mozilla/chrome/overlayinfo/navigator
 @dirrm lib/mozilla/chrome/overlayinfo/messenger/content
diff --git a/www/mozilla/PLIST-a.out b/www/mozilla/PLIST-a.out
index 23923fe9317..f432e85e068 100644
--- a/www/mozilla/PLIST-a.out
+++ b/www/mozilla/PLIST-a.out
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST-a.out,v 1.4 2002/02/09 03:54:47 taya Exp $
+@comment $NetBSD: PLIST-a.out,v 1.5 2002/02/15 10:13:03 skrll Exp $
 bin/mozilla
 @comment begin PROGRAMS
 lib/mozilla/dirver
@@ -2387,14 +2387,14 @@ include/mozilla/xultmpl/nsIXULTemplateBuilder.h
 @comment end INCLUDE
 @exec env LD_LIBRARY_PATH=%D/lib/mozilla MOZILLA_FIVE_HOME=%D/lib/mozilla %D/lib/mozilla/regxpcom
 @exec env LD_LIBRARY_PATH=%D/lib/mozilla MOZILLA_FIVE_HOME=%D/lib/mozilla %D/lib/mozilla/regchrome
-@unexec rm %D/lib/mozilla/component.reg
-@unexec rm %D/lib/mozilla/chrome/chrome.rdf
-@unexec rm %D/lib/mozilla/chrome/overlayinfo/communicator/content/overlays.rdf
-@unexec rm %D/lib/mozilla/chrome/overlayinfo/editor/content/overlays.rdf
-@unexec rm %D/lib/mozilla/chrome/overlayinfo/messenger/content/overlays.rdf
-@unexec rm %D/lib/mozilla/chrome/overlayinfo/navigator/content/overlays.rdf
-@unexec rm %D/lib/mozilla/chrome/overlayinfo/inspector/content/overlays.rdf
-@unexec rm %D/lib/mozilla/components/xpti.dat
+@unexec ${RM} %D/lib/mozilla/component.reg
+@unexec ${RM} %D/lib/mozilla/chrome/chrome.rdf
+@unexec ${RM} %D/lib/mozilla/chrome/overlayinfo/communicator/content/overlays.rdf
+@unexec ${RM} %D/lib/mozilla/chrome/overlayinfo/editor/content/overlays.rdf
+@unexec ${RM} %D/lib/mozilla/chrome/overlayinfo/messenger/content/overlays.rdf
+@unexec ${RM} %D/lib/mozilla/chrome/overlayinfo/navigator/content/overlays.rdf
+@unexec ${RM} %D/lib/mozilla/chrome/overlayinfo/inspector/content/overlays.rdf
+@unexec ${RM} %D/lib/mozilla/components/xpti.dat
 @dirrm lib/mozilla/chrome/overlayinfo/navigator/content
 @dirrm lib/mozilla/chrome/overlayinfo/navigator
 @dirrm lib/mozilla/chrome/overlayinfo/messenger/content
diff --git a/www/navigator/PLIST.post b/www/navigator/PLIST.post
index 3048e08340f..4a7baacdb0b 100644
--- a/www/navigator/PLIST.post
+++ b/www/navigator/PLIST.post
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.post,v 1.1 2001/11/01 20:42:28 zuntum Exp $
+@comment $NetBSD: PLIST.post,v 1.2 2002/02/15 10:13:04 skrll Exp $
 @dirrm lib/netscape/${BINNAME}-${NS_VERS}/plugins
 @dirrm lib/netscape/${BINNAME}-${NS_VERS}/nethelp/netscape/shared
 @dirrm lib/netscape/${BINNAME}-${NS_VERS}/nethelp/netscape/navigatr
@@ -11,6 +11,6 @@
 @dirrm lib/netscape/${BINNAME}-${NS_VERS}/java/classes
 @dirrm lib/netscape/${BINNAME}-${NS_VERS}/java
 @dirrm lib/netscape/${BINNAME}-${NS_VERS}
-@exec mkdir -p %D/lib/netscape/plugins
-@unexec rmdir %D/lib/netscape/plugins 2>/dev/null || true
-@unexec rmdir %D/lib/netscape 2>/dev/null || true
+@exec ${MKDIR} -p %D/lib/netscape/plugins
+@unexec ${RMDIR} %D/lib/netscape/plugins 2>/dev/null || true
+@unexec ${RMDIR} %D/lib/netscape 2>/dev/null || true
diff --git a/www/ns-plugger-common/PLIST b/www/ns-plugger-common/PLIST
index c81b989c242..6e8bb54dbaa 100644
--- a/www/ns-plugger-common/PLIST
+++ b/www/ns-plugger-common/PLIST
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 02:17:29 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:13:04 skrll Exp $
 ${NS_PLUGINS_DIR}/plugger.so
 man/man7/plugger.7
 share/doc/plugger/README
 share/doc/plugger/COPYING
 @dirrm share/doc/plugger
-@unexec rmdir -p %D/${NS_PLUGINS_DIR} 2>/dev/null || true
+@unexec ${RMDIR} -p %D/${NS_PLUGINS_DIR} 2>/dev/null || true
diff --git a/www/php-FastTemplate/PLIST b/www/php-FastTemplate/PLIST
index 6c5d0972a72..dda15defe83 100644
--- a/www/php-FastTemplate/PLIST
+++ b/www/php-FastTemplate/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 02:18:25 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:13:04 skrll Exp $
 ${PHP_LIB_SUBDIR}/class.FastTemplate.php3
 share/doc/html/${PKGBASE}/FastTemplate.html
 share/examples/${PKGBASE}/dynamic_example.php
@@ -18,4 +18,4 @@ share/examples/${PKGBASE}/templates/test.tpl
 @dirrm share/examples/${PKGBASE}/templates
 @dirrm share/examples/${PKGBASE}
 @dirrm share/doc/html/${PKGBASE}
-@unexec rmdir -p %D/${PHP_LIB_SUBDIR} 2>/dev/null || true
+@unexec ${RMDIR} -p %D/${PHP_LIB_SUBDIR} 2>/dev/null || true
diff --git a/www/php4/PLIST b/www/php4/PLIST
index 357b1020fe8..006030e80cb 100644
--- a/www/php4/PLIST
+++ b/www/php4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2001/12/31 23:54:25 jlam Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/02/15 10:13:04 skrll Exp $
 bin/pear
 bin/pearize
 bin/php
@@ -266,7 +266,7 @@ share/php/php4.gif
 @dirrm lib/php/Cache
 @dirrm lib/php/Benchmark
 @dirrm lib/php/Archive
-@unexec rmdir -p %D/${PHP_EXTENSION_DIR} 2>/dev/null || true
+@unexec ${RMDIR} -p %D/${PHP_EXTENSION_DIR} 2>/dev/null || true
 @dirrm include/php/regex
 @dirrm include/php/main
 @dirrm include/php/ext/xml/expat/xmltok
diff --git a/www/waplet/PLIST b/www/waplet/PLIST
index e191ee0ab4b..425c5873fe3 100644
--- a/www/waplet/PLIST
+++ b/www/waplet/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 02:19:02 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:13:05 skrll Exp $
 share/httpd/htdocs/waplet/waplet.jar
 share/doc/waplet/README
 share/doc/waplet/COPYING
@@ -8,7 +8,7 @@ share/doc/waplet/waplet.java
 share/examples/waplet/sample.html
 share/examples/waplet/wap_content.wml
 @dirrm share/httpd/htdocs/waplet
-@unexec rmdir %D/share/httpd/htdocs 2>/dev/null || true
-@unexec rmdir %D/share/httpd 2>/dev/null || true
+@unexec ${RMDIR} %D/share/httpd/htdocs 2>/dev/null || true
+@unexec ${RMDIR} %D/share/httpd 2>/dev/null || true
 @dirrm share/doc/waplet
 @dirrm share/examples/waplet
diff --git a/www/wwwcount/PLIST b/www/wwwcount/PLIST
index 88d3bc040c5..4e21977d197 100644
--- a/www/wwwcount/PLIST
+++ b/www/wwwcount/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 02:19:09 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:13:05 skrll Exp $
 bin/mkstrip
 bin/extdgts
 libdata/wwwcount/digits/A/peng.gif
@@ -86,7 +86,7 @@ share/examples/wwwcount.conf
 @exec if [ ! -f %D/etc/wwwcount.conf ]; then cp -p %D/share/examples/wwwcount.conf %D/etc/wwwcount.conf; fi
 man/man1/mkstrip.1
 @exec touch /var/log/wwwcount
-@exec chown nobody.nogroup /var/log/wwwcount
+@exec ${CHOWN} nobody.nogroup /var/log/wwwcount
 @dirrm libdata/wwwcount/digits/A
 @dirrm libdata/wwwcount/digits/B
 @dirrm libdata/wwwcount/digits/C
diff --git a/www/wwwoffle/PLIST b/www/wwwoffle/PLIST
index 2a3cbf85560..03e6bf2fb52 100644
--- a/www/wwwoffle/PLIST
+++ b/www/wwwoffle/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 02:19:10 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:13:05 skrll Exp $
 bin/wwwoffle
 bin/wwwoffle-ls
 bin/wwwoffle-mv
@@ -42,6 +42,6 @@ share/doc/wwwoffle/README.win32
 @exec ${MKDIR} /var/wwwoffle/lastime
 @exec ${MKDIR} /var/wwwoffle/prevtime1
 @exec ${PREFIX}/sbin/wwwoffle-convert-cache /var/wwwoffle
-@unexec cd /var/wwwoffle && rm -rf html*
-@unexec rmdir /var/wwwoffle/* 2>/dev/null && rmdir /var/wwwoffle 2>/dev/null || true
+@unexec cd /var/wwwoffle && ${RM} -rf html*
+@unexec ${RMDIR} /var/wwwoffle/* 2>/dev/null && ${RMDIR} /var/wwwoffle 2>/dev/null || true
 @unexec if [ -d /var/wwwoffle ]; then echo "If you won't use the WWWOFFLE package anymore, remove the cache manually by"; echo '	rm -rf /var/wwwoffle'; fi