summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--audio/easytag/PLIST6
-rw-r--r--audio/esound/PLIST4
-rw-r--r--audio/festival/PLIST6
-rw-r--r--audio/gnome-audio/PLIST4
-rw-r--r--audio/gqmpeg/PLIST6
-rw-r--r--audio/mbrola/PLIST4
-rw-r--r--audio/realplayer/PLIST4
-rw-r--r--audio/xmcd/PLIST4
-rw-r--r--cad/eagle/PLIST4
-rw-r--r--cad/gnetlist/PLIST6
-rw-r--r--cad/gschem/PLIST6
-rw-r--r--chat/bitchx/PLIST8
-rw-r--r--chat/gaim/PLIST4
-rw-r--r--chat/gnomeicu/PLIST8
-rw-r--r--chat/ircII/PLIST6
-rw-r--r--chat/zircon/PLIST14
-rw-r--r--comms/minicom/PLIST4
-rw-r--r--comms/pilotmgr/PLIST4
-rw-r--r--cross/armv2-netbsd/PLIST4
-rw-r--r--cross/binutils/PLIST8
-rw-r--r--databases/db/PLIST8
-rw-r--r--databases/geneweb/PLIST10
-rw-r--r--databases/gnats/PLIST8
-rw-r--r--databases/odbc-postgresql/PLIST6
-rw-r--r--databases/openldap1/PLIST.common6
-rw-r--r--databases/postgresql-lib/PLIST4
-rw-r--r--databases/postgresql-server/PLIST4
-rw-r--r--devel/GConf/PLIST4
-rw-r--r--devel/cweb/PLIST6
-rw-r--r--devel/ftnchek/PLIST4
-rw-r--r--devel/gal/PLIST4
-rw-r--r--devel/haskell-mode/PLIST4
-rw-r--r--devel/libnet/PLIST4
-rw-r--r--devel/libtool-base/PLIST4
-rw-r--r--devel/pkgconfig/PLIST4
-rw-r--r--editors/emacs/PLIST8
-rw-r--r--editors/gnotepad/PLIST6
-rw-r--r--editors/mule/PLIST6
-rw-r--r--editors/speedbar/PLIST4
-rw-r--r--editors/xemacs/PLIST4
-rw-r--r--emulators/plex86/PLIST6
-rw-r--r--emulators/suse_base/PLIST12
-rw-r--r--emulators/vmware-module/PLIST10
-rw-r--r--finance/gnofin/PLIST4
-rw-r--r--fonts/arphicttf/PLIST4
-rw-r--r--games/angband-tty/PLIST8
-rw-r--r--games/angband-x11/PLIST8
-rw-r--r--games/civctp-demo/PLIST6
-rw-r--r--games/crafty-doc/PLIST4
-rw-r--r--games/crossfire-srv/PLIST4
-rw-r--r--games/eus-demo/PLIST6
-rw-r--r--games/heretic2-demo/PLIST6
-rw-r--r--games/iso-pernangband/PLIST10
-rw-r--r--games/quake3arena-demo/PLIST6
-rw-r--r--games/quake3arena/PLIST6
-rw-r--r--games/tanked/PLIST6
-rw-r--r--games/xemeraldia/PLIST6
-rw-r--r--games/xgalaga/PLIST4
-rw-r--r--games/xkobo/PLIST4
-rw-r--r--games/xmris/PLIST6
-rw-r--r--games/xpuyopuyo/PLIST6
-rw-r--r--graphics/ImageMagick/PLIST4
-rw-r--r--graphics/MesaLib/PLIST4
-rw-r--r--graphics/gdk-pixbuf/PLIST4
-rw-r--r--graphics/gimp/PLIST6
-rw-r--r--graphics/glu/PLIST4
-rw-r--r--graphics/glut/PLIST4
-rw-r--r--graphics/gnome-iconedit/PLIST4
-rw-r--r--graphics/gphoto/PLIST8
-rw-r--r--graphics/imlib/PLIST6
-rw-r--r--graphics/mgl/PLIST4
-rw-r--r--graphics/ns-flash/PLIST4
-rw-r--r--graphics/yplot/PLIST4
-rw-r--r--ham/tfkiss/PLIST4
-rw-r--r--japanese/canna-lib/PLIST8
-rw-r--r--japanese/canna-server/PLIST6
-rw-r--r--japanese/freewnn-server/PLIST4
-rw-r--r--japanese/sj3-server/PLIST8
-rw-r--r--lang/blackdown-jdk13/PLIST14
-rw-r--r--lang/eieio/PLIST4
-rw-r--r--lang/guile/PLIST4
-rw-r--r--lang/icon/PLIST4
-rw-r--r--lang/perl5/PLIST4
-rw-r--r--lang/sun-jre13/PLIST6
-rw-r--r--lang/tcl-expect/PLIST6
-rw-r--r--mail/exim/PLIST4
-rw-r--r--mail/mailwrapper/PLIST8
-rw-r--r--mail/nmh/PLIST4
-rw-r--r--mail/pine/PLIST4
-rw-r--r--mail/popa3d/PLIST4
-rw-r--r--mail/postfix/PLIST8
-rw-r--r--mail/sendmail-current/PLIST.common4
-rw-r--r--mail/sendmail/PLIST4
-rw-r--r--mail/sendmail88/PLIST4
-rw-r--r--mail/vm/PLIST.emacs4
-rw-r--r--mail/xmailbox/PLIST6
-rw-r--r--math/aribas/PLIST4
-rw-r--r--math/cassowary/PLIST6
-rw-r--r--math/gnumeric0/PLIST4
-rw-r--r--math/guppi/PLIST6
-rw-r--r--math/octave/PLIST12
-rw-r--r--math/xlife/PLIST4
-rw-r--r--math/yacas/PLIST6
-rw-r--r--misc/gnome-utils/PLIST4
-rw-r--r--misc/hitchhiker/PLIST4
-rw-r--r--misc/jitterbug/PLIST4
-rw-r--r--misc/kdrill/PLIST4
-rw-r--r--misc/screen/PLIST4
-rw-r--r--misc/screen/PLIST.SunOS4
-rw-r--r--mk/bsd.pkg.mk5
-rw-r--r--net/ORBit/PLIST4
-rw-r--r--net/arla/PLIST4
-rw-r--r--net/icsi-finger/PLIST4
-rw-r--r--net/ipa/PLIST8
-rw-r--r--net/mirror/PLIST4
-rw-r--r--net/radiusd-cistron/PLIST8
-rw-r--r--net/snort/PLIST4
-rw-r--r--news/inn/PLIST6
-rw-r--r--news/nntpcache/PLIST20
-rw-r--r--news/nntpclnt/PLIST10
-rw-r--r--print/acroread/PLIST.post12
-rw-r--r--print/acroread3/PLIST.post6
-rw-r--r--print/apsfilter/PLIST6
-rw-r--r--print/pcps/PLIST4
-rw-r--r--print/stylewriter/PLIST6
-rw-r--r--print/teTeX-bin/PLIST4
-rw-r--r--security/nessus-core/PLIST10
-rw-r--r--security/openssl/PLIST.common6
-rw-r--r--security/priv/PLIST6
-rw-r--r--security/ssh/PLIST4
-rw-r--r--shells/esh/PLIST8
-rw-r--r--shells/scsh/PLIST4
-rw-r--r--sysutils/aperture/PLIST4
-rw-r--r--sysutils/daemontools/PLIST4
-rw-r--r--sysutils/rtty/PLIST12
-rw-r--r--textproc/docbook/PLIST4
-rw-r--r--textproc/dsssl-docbook-modular/PLIST4
-rw-r--r--textproc/html/PLIST4
-rw-r--r--textproc/iso12083/PLIST4
-rw-r--r--textproc/iso8879/PLIST4
-rw-r--r--textproc/scrollkeeper/PLIST10
-rw-r--r--textproc/t1lib/PLIST4
-rw-r--r--time/pcal/PLIST4
-rw-r--r--time/plan/PLIST8
-rw-r--r--wm/amaterus/PLIST6
-rw-r--r--wm/windowmaker/PLIST4
-rw-r--r--wm/wmx/PLIST6
-rw-r--r--www/Mosaic/PLIST6
-rw-r--r--www/apache-current/PLIST4
-rw-r--r--www/bluefish/PLIST4
-rw-r--r--www/cocoon/PLIST4
-rw-r--r--www/communicator/PLIST.post8
-rw-r--r--www/haskell-cgi/PLIST4
-rw-r--r--www/jakarta-tomcat/PLIST20
-rw-r--r--www/mozilla/PLIST-ELF18
-rw-r--r--www/mozilla/PLIST-a.out18
-rw-r--r--www/navigator/PLIST.post8
-rw-r--r--www/ns-plugger-common/PLIST4
-rw-r--r--www/php-FastTemplate/PLIST4
-rw-r--r--www/php4/PLIST4
-rw-r--r--www/waplet/PLIST6
-rw-r--r--www/wwwcount/PLIST4
-rw-r--r--www/wwwoffle/PLIST6
-rw-r--r--x11/Xbae/PLIST6
-rw-r--r--x11/controlcenter/PLIST4
-rw-r--r--x11/fltk/PLIST4
-rw-r--r--x11/gdm/PLIST8
-rw-r--r--x11/gnome-core/PLIST26
-rw-r--r--x11/gnome-libs/PLIST16
-rw-r--r--x11/gnome-python/PLIST4
-rw-r--r--x11/gtk--/PLIST4
-rw-r--r--x11/gtk-engines/PLIST6
-rw-r--r--x11/gtk/PLIST6
-rw-r--r--x11/gtkglarea/PLIST4
-rw-r--r--x11/gtkstep/PLIST4
-rw-r--r--x11/ssystem/PLIST6
-rw-r--r--x11/xbanner/PLIST4
-rw-r--r--x11/xdm3d/PLIST6
178 files changed, 534 insertions, 533 deletions
diff --git a/audio/easytag/PLIST b/audio/easytag/PLIST
index ed985e4655e..68fba82b74d 100644
--- a/audio/easytag/PLIST
+++ b/audio/easytag/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:15:42 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:28 skrll Exp $
bin/easytag
share/easytag/EasyTAG_logo.xpm
share/gnome/apps/Multimedia/easytag.desktop
@@ -11,6 +11,6 @@ ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/easytag.mo
${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/easytag.mo
${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/easytag.mo
share/pixmaps/EasyTAG.xpm
-@unexec rmdir -p %D/share/pixmaps 2>/dev/null || true
-@unexec rmdir -p %D/share/gnome/apps/Multimedia 2>/dev/null || true
+@unexec ${RMDIR} -p %D/share/pixmaps 2>/dev/null || true
+@unexec ${RMDIR} -p %D/share/gnome/apps/Multimedia 2>/dev/null || true
@dirrm share/easytag
diff --git a/audio/esound/PLIST b/audio/esound/PLIST
index 722f25685dc..1553f65105f 100644
--- a/audio/esound/PLIST
+++ b/audio/esound/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:15:46 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:28 skrll Exp $
bin/esd
bin/esd-config
bin/esdcat
@@ -18,4 +18,4 @@ lib/libesd.so.2
lib/libesd.so.2.23
lib/pkgconfig/esound.pc
share/aclocal/esd.m4
-@unexec rmdir %D/lib/pkgconfig 2>/dev/null || true
+@unexec ${RMDIR} %D/lib/pkgconfig 2>/dev/null || true
diff --git a/audio/festival/PLIST b/audio/festival/PLIST
index 91b9eae6d5c..3933a4809f7 100644
--- a/audio/festival/PLIST
+++ b/audio/festival/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:15:49 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:29 skrll Exp $
bin/festival
bin/festival_client
libexec/audsp
@@ -122,8 +122,8 @@ share/festival/lib/tokenpos.scm
share/festival/lib/tts.scm
share/festival/lib/voices.scm
share/festival/lib/web.scm
-@unexec rm -r %D/share/festival/lib/voices
-@unexec rm -r %D/share/festival/lib/dicts
+@unexec ${RM} -r %D/share/festival/lib/voices
+@unexec ${RM} -r %D/share/festival/lib/dicts
@dirrm share/festival/lib/etc/NetBSD
@dirrm share/festival/lib/etc
@dirrm share/festival/lib
diff --git a/audio/gnome-audio/PLIST b/audio/gnome-audio/PLIST
index 906eb388cc9..409e81daacd 100644
--- a/audio/gnome-audio/PLIST
+++ b/audio/gnome-audio/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:16:39 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:29 skrll Exp $
share/sounds/card_shuffle.wav
share/sounds/phone.wav
share/sounds/shutdown1.wav
@@ -16,4 +16,4 @@ share/sounds/gtk-events/clicked.wav
share/sounds/gtk-events/toggled.wav
@dirrm share/sounds/gtk-events
@dirrm share/sounds/panel
-@unexec rmdir %D/share/sounds 2>/dev/null || true
+@unexec ${RMDIR} %D/share/sounds 2>/dev/null || true
diff --git a/audio/gqmpeg/PLIST b/audio/gqmpeg/PLIST
index 8bd54a772bc..dd885565f6a 100644
--- a/audio/gqmpeg/PLIST
+++ b/audio/gqmpeg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/01/14 20:48:52 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/02/15 10:12:29 skrll Exp $
bin/gqmpeg
bin/gqmpeg-shoutcast-plugin.sh
man/man1/gqmpeg.1
@@ -12,5 +12,5 @@ ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gqmpeg.mo
${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/gqmpeg.mo
${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gqmpeg.mo
share/pixmaps/gqmpeg.png
-@unexec rmdir -p %D/share/gqmpeg/skins 2> /dev/null || true
-@unexec rmdir -p %D/share/gnome/apps/Multimedia 2> /dev/null || true
+@unexec ${RMDIR} -p %D/share/gqmpeg/skins 2> /dev/null || true
+@unexec ${RMDIR} -p %D/share/gnome/apps/Multimedia 2> /dev/null || true
diff --git a/audio/mbrola/PLIST b/audio/mbrola/PLIST
index 984b829d152..783b3a4774b 100644
--- a/audio/mbrola/PLIST
+++ b/audio/mbrola/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:17:18 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:29 skrll Exp $
bin/mbrola
share/doc/mbrola/readme.txt
-@unexec rm -r %D/share/mbrola
+@unexec ${RM} -r %D/share/mbrola
@dirrm share/doc/mbrola
diff --git a/audio/realplayer/PLIST b/audio/realplayer/PLIST
index f57393312fe..9899b5622e9 100644
--- a/audio/realplayer/PLIST
+++ b/audio/realplayer/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:17:43 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:29 skrll Exp $
bin/realplay
lib/RealPlayer8/Codecs/14_4.so.6.0
lib/RealPlayer8/Codecs/28_8.so.6.0
@@ -305,7 +305,7 @@ lib/RealPlayer8/rp7mini.xpm
lib/RealPlayer8/rpnp.so
lib/netscape/plugins/raclass.zip
lib/netscape/plugins/rpnp.so
-@unexec rmdir -p %D/lib/netscape/plugins 2>/dev/null || true
+@unexec ${RMDIR} -p %D/lib/netscape/plugins 2>/dev/null || true
@dirrm lib/RealPlayer8/Plugins/ExtResources
@dirrm lib/RealPlayer8/Plugins
@dirrm lib/RealPlayer8/Help/realplay/pics
diff --git a/audio/xmcd/PLIST b/audio/xmcd/PLIST
index 5b14975abba..d9b23ea9791 100644
--- a/audio/xmcd/PLIST
+++ b/audio/xmcd/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/01/08 10:07:28 tron Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/02/15 10:12:30 skrll Exp $
bin/cda
bin/xmcd
bin/xmcd_start
@@ -291,7 +291,7 @@ man/man1/xmcd.1
@dirrm lib/X11/xmcd/discog/Blues
@dirrm lib/X11/xmcd/discog
@dirrm lib/X11/xmcd/config/.tbl
-@unexec rmdir %D/lib/X11/xmcd/config 2>/dev/null || true
+@unexec ${RMDIR} %D/lib/X11/xmcd/config 2>/dev/null || true
@dirrm lib/X11/xmcd/bin-${OPSYS}-${MACHINE_ARCH}
@dirrm lib/X11/xmcd/lib-${OPSYS}-${MACHINE_ARCH}
@dirrm lib/X11/xmcd/scripts
diff --git a/cad/eagle/PLIST b/cad/eagle/PLIST
index 6b170ed98ea..f42f8dd82bf 100644
--- a/cad/eagle/PLIST
+++ b/cad/eagle/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:47:49 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:30 skrll Exp $
bin/eagle
eagle/README
eagle/bin/eagle
@@ -605,7 +605,7 @@ eagle/ulp/rename-in-lbr.ulp
eagle/ulp/useful_routines.ulp
eagle/uninstall
eagle/userinstall
-@unexec rm -f %D/eagle/bin/eagle.key
+@unexec ${RM} -f %D/eagle/bin/eagle.key
@dirrm eagle/ulp
@dirrm eagle/scr
@dirrm eagle/projects/examples/tutorial
diff --git a/cad/gnetlist/PLIST b/cad/gnetlist/PLIST
index 25e33f3c6a7..3d4757c5fe3 100644
--- a/cad/gnetlist/PLIST
+++ b/cad/gnetlist/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:48:14 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:30 skrll Exp $
bin/gnetlist
bin/gschem2pcb
bin/mk_verilog_syms
@@ -26,5 +26,5 @@ share/gEDA/scheme/gnet-verilog.scm
share/gEDA/scheme/gnet-vhdl.scm
share/gEDA/scheme/gnet-vipec.scm
share/gEDA/scheme/gnetlist.scm
-@unexec rmdir %D/share/gEDA/scheme 2>/dev/null || true
-@unexec rmdir %D/share/gEDA 2>/dev/null || true
+@unexec ${RMDIR} %D/share/gEDA/scheme 2>/dev/null || true
+@unexec ${RMDIR} %D/share/gEDA 2>/dev/null || true
diff --git a/cad/gschem/PLIST b/cad/gschem/PLIST
index e28cc894e1d..cc1ddc7d385 100644
--- a/cad/gschem/PLIST
+++ b/cad/gschem/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:48:17 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:30 skrll Exp $
bin/gschem
man/man1/gschem.1
share/gEDA/gschem-gtkrc
@@ -8,5 +8,5 @@ share/gEDA/scheme/generate_netlist.scm
share/gEDA/scheme/gschem.scm
share/gEDA/scheme/list-keys.scm
share/gEDA/scheme/print-NB-attribs.scm
-@unexec rmdir %D/share/gEDA/scheme 2>/dev/null || true
-@unexec rmdir %D/share/gEDA 2>/dev/null || true
+@unexec ${RMDIR} %D/share/gEDA/scheme 2>/dev/null || true
+@unexec ${RMDIR} %D/share/gEDA 2>/dev/null || true
diff --git a/chat/bitchx/PLIST b/chat/bitchx/PLIST
index b24819ca085..72946cbfd0d 100644
--- a/chat/bitchx/PLIST
+++ b/chat/bitchx/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 19:04:20 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:30 skrll Exp $
bin/BitchX
bin/BitchX-1.0c18
bin/scr-bx
@@ -962,9 +962,9 @@ share/bx/BitchX.quit
share/bx/BitchX.kick
share/bx/wserv
share/bx/BitchX.doc
-@exec mkdir -p %D/lib/bx/plugins
-@exec mkdir -p %D/share/bx/help/4_Misc/fset
-@exec mkdir -p %D/share/bx/help/4_Misc/wset
+@exec ${MKDIR} -p %D/lib/bx/plugins
+@exec ${MKDIR} -p %D/share/bx/help/4_Misc/fset
+@exec ${MKDIR} -p %D/share/bx/help/4_Misc/wset
@dirrm share/bx/help/1_General/dcc
@dirrm share/bx/help/1_General/ctcp
@dirrm share/bx/help/1_General
diff --git a/chat/gaim/PLIST b/chat/gaim/PLIST
index 6e51f3b9b01..b870418c272 100644
--- a/chat/gaim/PLIST
+++ b/chat/gaim/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2001/12/17 05:42:53 tron Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/02/15 10:12:31 skrll Exp $
bin/gaim
man/man1/gaim.1
lib/gaim/autorecon.so
@@ -41,5 +41,5 @@ ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gaim.mo
${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/gaim.mo
share/gnome/apps/Internet/gaim.desktop
share/pixmaps/gaim.xpm
-@unexec rmdir -p %D/share/gnome/apps/Internet 2>/dev/null || true
+@unexec ${RMDIR} -p %D/share/gnome/apps/Internet 2>/dev/null || true
@dirrm lib/gaim
diff --git a/chat/gnomeicu/PLIST b/chat/gnomeicu/PLIST
index feaa0455090..5b3362a651b 100644
--- a/chat/gnomeicu/PLIST
+++ b/chat/gnomeicu/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 20:06:27 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:31 skrll Exp $
bin/gnomeicu
bin/gnomeicu-client
etc/CORBA/servers/GnomeICU.gnorba
@@ -122,6 +122,6 @@ share/sounds/gnomeicu/message.wav
@dirrm share/gnomeicu/icons
@dirrm share/gnomeicu
@dirrm share/sounds/gnomeicu
-@unexec rmdir share/applets/Network 2> /dev/null || true
-@unexec rmdir etc/sound/events 2> /dev/null || true
-@unexec rmdir etc/CORBA/servers 2> /dev/null || true
+@unexec ${RMDIR} share/applets/Network 2> /dev/null || true
+@unexec ${RMDIR} etc/sound/events 2> /dev/null || true
+@unexec ${RMDIR} etc/CORBA/servers 2> /dev/null || true
diff --git a/chat/ircII/PLIST b/chat/ircII/PLIST
index 6a1ed769173..cc55157e9ed 100644
--- a/chat/ircII/PLIST
+++ b/chat/ircII/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2001/12/10 13:38:29 mrg Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/02/15 10:12:31 skrll Exp $
bin/irc
bin/irc-20011210
bin/ircbug
@@ -625,5 +625,5 @@ share/irc/translation/UNITED_KINGDOM_COM
@dirrm share/irc/help/window
@dirrm share/irc/translation
@dirrm share/irc/help
-@unexec rmdir %D/share/irc/script 2>/dev/null || true
-@unexec rmdir %D/share/irc 2>/dev/null || true
+@unexec ${RMDIR} %D/share/irc/script 2>/dev/null || true
+@unexec ${RMDIR} %D/share/irc 2>/dev/null || true
diff --git a/chat/zircon/PLIST b/chat/zircon/PLIST
index 0665f378a5a..18865f5e911 100644
--- a/chat/zircon/PLIST
+++ b/chat/zircon/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 19:42:45 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:31 skrll Exp $
bin/zircon
share/doc/zircon/BUGS
share/doc/zircon/COPYRIGHT
@@ -141,12 +141,12 @@ share/zircon/plugins/NoticeOps/setup.tcl
share/zircon/plugins/Sed/decrypt.tcl
share/zircon/plugins/Sed/pkgIndex.tcl
share/zircon/samples/zircon.ad
-@exec mkdir -p %D/share/zircon/help/Channels
-@exec mkdir -p %D/share/zircon/help/Servers
-@exec mkdir -p %D/share/zircon/help/Services
-@exec mkdir -p %D/share/zircon/help/Users
-@exec mkdir -p %D/share/zircon/scripts
-@exec mkdir -p %D/share/zircon/sounds
+@exec ${MKDIR} -p %D/share/zircon/help/Channels
+@exec ${MKDIR} -p %D/share/zircon/help/Servers
+@exec ${MKDIR} -p %D/share/zircon/help/Services
+@exec ${MKDIR} -p %D/share/zircon/help/Users
+@exec ${MKDIR} -p %D/share/zircon/scripts
+@exec ${MKDIR} -p %D/share/zircon/sounds
@dirrm share/doc/zircon
@dirrm share/zircon/help/Zircon/Windows
@dirrm share/zircon/help/Zircon
diff --git a/comms/minicom/PLIST b/comms/minicom/PLIST
index 6c7f181f6fe..b5c105391f5 100644
--- a/comms/minicom/PLIST
+++ b/comms/minicom/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 20:44:23 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:31 skrll Exp $
bin/ascii-xfr
bin/minicom
bin/runscript
@@ -56,4 +56,4 @@ share/locale/pt_BR/LC_MESSAGES/minicom.mo
@dirrm share/doc/minicom/tables
@dirrm share/doc/minicom/demos
@dirrm share/doc/minicom
-@unexec rm -rf %D/etc/minicom
+@unexec ${RM} -rf %D/etc/minicom
diff --git a/comms/pilotmgr/PLIST b/comms/pilotmgr/PLIST
index 33640a2663b..f4a1db8d796 100644
--- a/comms/pilotmgr/PLIST
+++ b/comms/pilotmgr/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 20:44:34 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:32 skrll Exp $
bin/PilotManager
lib/pilotmgr/Backup.pm
lib/pilotmgr/Installer.pm
@@ -24,7 +24,7 @@ share/doc/pilotmgr/DiscAlias.txt
share/doc/pilotmgr/SyncPlan.help
share/doc/pilotmgr/WelcomeMessage
@exec ln -s %D/share/doc/pilotmgr %D/lib/pilotmgr/docs
-@unexec rm -f %D/lib/pilotmgr/docs
+@unexec ${RM} -f %D/lib/pilotmgr/docs
@dirrm lib/pilotmgr/lib/test
@dirrm lib/pilotmgr/lib/perl5
@dirrm lib/pilotmgr/lib/images
diff --git a/cross/armv2-netbsd/PLIST b/cross/armv2-netbsd/PLIST
index fe465d75858..d34e4fb87c2 100644
--- a/cross/armv2-netbsd/PLIST
+++ b/cross/armv2-netbsd/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:03:23 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:32 skrll Exp $
bin/armv2-netbsd-addr2line
bin/armv2-netbsd-ar
bin/armv2-netbsd-as
@@ -27,4 +27,4 @@ lib/ldscripts/armelf.xn
lib/ldscripts/armelf.xr
lib/ldscripts/armelf.xs
lib/ldscripts/armelf.xu
-@unexec rmdir %D/lib/ldscripts 2>/dev/null || true
+@unexec ${RMDIR} %D/lib/ldscripts 2>/dev/null || true
diff --git a/cross/binutils/PLIST b/cross/binutils/PLIST
index f505466fb38..db912db35fa 100644
--- a/cross/binutils/PLIST
+++ b/cross/binutils/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:03:26 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:32 skrll Exp $
include/ansidecl.h
include/bfd.h
lib/ldscripts/armnbsd.x
@@ -139,6 +139,6 @@ libexec/binutils/strip
libexec/binutils/windres
@dirrm libexec/binutils
@exec ln -s %D/libexec/binutils/cross-env ${LOCALBASE}/bin/cross-env
-@unexec rm ${LOCALBASE}/bin/cross-env
-@unexec rm -f %D/lib/libbfd.so %D/lib/libopcodes.so 2> /dev/null || true
-@unexec rmdir %D/lib/ldscripts 2>/dev/null || true
+@unexec ${RM} ${LOCALBASE}/bin/cross-env
+@unexec ${RM} -f %D/lib/libbfd.so %D/lib/libopcodes.so 2> /dev/null || true
+@unexec ${RMDIR} %D/lib/ldscripts 2>/dev/null || true
diff --git a/databases/db/PLIST b/databases/db/PLIST
index d91353a704e..5023dd1e1c7 100644
--- a/databases/db/PLIST
+++ b/databases/db/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:11:36 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:32 skrll Exp $
bin/db_load
bin/db_dump
bin/db_deadlock
@@ -463,9 +463,9 @@ share/doc/html/db/utility/db_load.html
share/doc/html/db/utility/db_recover.html
share/doc/html/db/utility/db_stat.html
share/doc/html/db/utility/index.html
-@exec mkdir -p %D/share/doc/html/db/api_java/special
-@exec mkdir -p %D/share/doc/html/db/api_cxx/special
-@exec mkdir -p %D/share/doc/html/db/api_c/special
+@exec ${MKDIR} -p %D/share/doc/html/db/api_java/special
+@exec ${MKDIR} -p %D/share/doc/html/db/api_cxx/special
+@exec ${MKDIR} -p %D/share/doc/html/db/api_c/special
@dirrm share/doc/html/db/utility
@dirrm share/doc/html/db/test
@dirrm share/doc/html/db/sleepycat
diff --git a/databases/geneweb/PLIST b/databases/geneweb/PLIST
index 6ee21500af6..560c93a4976 100644
--- a/databases/geneweb/PLIST
+++ b/databases/geneweb/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:11:41 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:32 skrll Exp $
bin/consang
bin/ged2gwb
bin/gwb2ged
@@ -495,7 +495,7 @@ share/geneweb/setup/sv/welcome.htm
@dirrm share/geneweb/setup/lv
@dirrm share/geneweb/setup/sv
@dirrm share/geneweb/setup
-@unexec rmdir %D/share/geneweb/cnt 2>/dev/null || true
-@unexec rmdir %D/share/geneweb/db 2>/dev/null || true
-@unexec rmdir %D/share/geneweb/images 2>/dev/null || true
-@unexec rmdir %D/share/geneweb 2>/dev/null || true
+@unexec ${RMDIR} %D/share/geneweb/cnt 2>/dev/null || true
+@unexec ${RMDIR} %D/share/geneweb/db 2>/dev/null || true
+@unexec ${RMDIR} %D/share/geneweb/images 2>/dev/null || true
+@unexec ${RMDIR} %D/share/geneweb 2>/dev/null || true
diff --git a/databases/gnats/PLIST b/databases/gnats/PLIST
index 39882755413..d11591c6f38 100644
--- a/databases/gnats/PLIST
+++ b/databases/gnats/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:11:42 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:33 skrll Exp $
bin/edit-pr
bin/getclose
bin/install-sid
@@ -73,9 +73,9 @@ share/gnats/gnats-db/gnats-adm/gnatsd.conf
share/gnats/gnats-db/gnats-adm/responsible
share/gnats/gnats-db/gnats-adm/states
share/gnats/gnats-db/gnats-adm/submitters
-@exec mkdir %D/share/gnats/gnats-db/gnats-queue
-@exec mkdir %D/share/gnats/gnats-db/pending
-@exec chown gnats %D/share/gnats/gnats-db %D/share/gnats/gnats-db/gnats-adm %D/share/gnats/gnats-db/gnats-adm/locks %D/share/gnats/gnats-db/pending %D/share/gnats/gnats-db/gnats-queue
+@exec ${MKDIR} %D/share/gnats/gnats-db/gnats-queue
+@exec ${MKDIR} %D/share/gnats/gnats-db/pending
+@exec ${CHOWN} gnats %D/share/gnats/gnats-db %D/share/gnats/gnats-db/gnats-adm %D/share/gnats/gnats-db/gnats-adm/locks %D/share/gnats/gnats-db/pending %D/share/gnats/gnats-db/gnats-queue
@dirrm libexec/gnats
@dirrm share/gnats/gnats-db/gnats-adm/locks
@dirrm share/gnats/gnats-db/gnats-adm
diff --git a/databases/odbc-postgresql/PLIST b/databases/odbc-postgresql/PLIST
index 493b90173da..e650f6c28ba 100644
--- a/databases/odbc-postgresql/PLIST
+++ b/databases/odbc-postgresql/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:11:56 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:33 skrll Exp $
include/pgsql/iodbc/iodbc.h
include/pgsql/iodbc/isql.h
include/pgsql/iodbc/isqlext.h
@@ -7,5 +7,5 @@ lib/libpsqlodbc.so
lib/libpsqlodbc.so.0
lib/libpsqlodbc.so.0.26
share/postgresql/odbc.sql
-@unexec rmdir -p %D/share/postgresql 2>/dev/null || true
-@unexec rmdir -p %D/include/pgsql/iodbc 2>/dev/null || true
+@unexec ${RMDIR} -p %D/share/postgresql 2>/dev/null || true
+@unexec ${RMDIR} -p %D/include/pgsql/iodbc 2>/dev/null || true
diff --git a/databases/openldap1/PLIST.common b/databases/openldap1/PLIST.common
index d9fb642ab90..bf83fe1a0ab 100644
--- a/databases/openldap1/PLIST.common
+++ b/databases/openldap1/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.1 2001/11/01 00:21:31 zuntum Exp $
+@comment $NetBSD: PLIST.common,v 1.2 2002/02/15 10:12:33 skrll Exp $
bin/ud
bin/ldapsearch
bin/ldapmodify
@@ -220,6 +220,6 @@ sbin/ldbmtest
share/openldap/ldapfriendly
share/openldap/go500gw.help
share/openldap/rcpt500.help
-@unexec rmdir %D/etc/openldap 2>/dev/null || true
-@unexec rmdir -p %D/var/openldap-ldbm 2>/dev/null || true
+@unexec ${RMDIR} %D/etc/openldap 2>/dev/null || true
+@unexec ${RMDIR} -p %D/var/openldap-ldbm 2>/dev/null || true
@dirrm share/openldap
diff --git a/databases/postgresql-lib/PLIST b/databases/postgresql-lib/PLIST
index 40064ce4291..68a6d813794 100644
--- a/databases/postgresql-lib/PLIST
+++ b/databases/postgresql-lib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:12:38 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:33 skrll Exp $
bin/ecpg
include/pgsql/access/attnum.h
include/pgsql/access/genam.h
@@ -358,4 +358,4 @@ man/man1/ecpg.1
@dirrm include/pgsql/catalog
@dirrm include/pgsql/bootstrap
@dirrm include/pgsql/access
-@unexec rmdir -p %D/include/pgsql 2>/dev/null || true
+@unexec ${RMDIR} -p %D/include/pgsql 2>/dev/null || true
diff --git a/databases/postgresql-server/PLIST b/databases/postgresql-server/PLIST
index 2c89af1ea64..da1135b4623 100644
--- a/databases/postgresql-server/PLIST
+++ b/databases/postgresql-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:12:41 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:34 skrll Exp $
bin/postgres
bin/postmaster
etc/rc.d/pgsql
@@ -11,4 +11,4 @@ share/postgresql/pg_ident.conf.sample
share/postgresql/postgresql.conf.sample
share/postgresql/template1.bki
share/postgresql/template1.description
-@unexec rmdir -p %D/share/postgresql 2>/dev/null || true
+@unexec ${RMDIR} -p %D/share/postgresql 2>/dev/null || true
diff --git a/devel/GConf/PLIST b/devel/GConf/PLIST
index 556c2abe0b1..b607d434dab 100644
--- a/devel/GConf/PLIST
+++ b/devel/GConf/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/02/05 22:39:01 skrll Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/02/15 10:12:34 skrll Exp $
bin/gconf-config
bin/gconf-config-1
bin/gconfd-1
@@ -76,4 +76,4 @@ share/locale/zh_CN.GB2312/LC_MESSAGES/GConf.mo
@dirrm etc/gconf/1
@dirrm etc/gconf
@exec test %D = ${LOCALBASE} || ln -s %D/share/aclocal/gconf-1.m4 ${LOCALBASE}/share/aclocal/gconf-1.m4
-@unexec test %D = ${LOCALBASE} || rm ${LOCALBASE}/share/aclocal/gconf-1.m4
+@unexec test %D = ${LOCALBASE} || ${RM} ${LOCALBASE}/share/aclocal/gconf-1.m4
diff --git a/devel/cweb/PLIST b/devel/cweb/PLIST
index 0bb43bc4320..6526f0cb7e4 100644
--- a/devel/cweb/PLIST
+++ b/devel/cweb/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:23:06 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:34 skrll Exp $
bin/ctangle
bin/cweave
man/man1/cweb.1
@@ -26,8 +26,8 @@ share/examples/cweb/xview_types.w
share/texmf/tex/plain/base/cwebmac.tex
@unexec mktexlsr
@exec mktexlsr
-@unexec rmdir %D/share/emacs/site-lisp 2>/dev/null || true
-@unexec rmdir %D/share/emacs 2>/dev/null || true
+@unexec ${RMDIR} %D/share/emacs/site-lisp 2>/dev/null || true
+@unexec ${RMDIR} %D/share/emacs 2>/dev/null || true
@dirrm share/examples/cweb
@dirrm share/doc/cweb
@dirrm share/cweb
diff --git a/devel/ftnchek/PLIST b/devel/ftnchek/PLIST
index ce6d03df576..c90af8a975a 100644
--- a/devel/ftnchek/PLIST
+++ b/devel/ftnchek/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:23:32 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:34 skrll Exp $
bin/dcl2inc
bin/ftnchek
libexec/ftnchek/dcl2inc.awk
@@ -71,7 +71,7 @@ share/doc/ftnchek/html/wordsize.html
share/doc/ftnchek/html/wrap.html
share/doc/ftnchek/macro-doc.txt
share/emacs/site-lisp/ftnchek.el
-@unexec rmdir %D/share/emacs/site-lisp 2>/dev/null || true
+@unexec ${RMDIR} %D/share/emacs/site-lisp 2>/dev/null || true
@dirrm share/doc/ftnchek/html
@dirrm share/doc/ftnchek
@dirrm libexec/ftnchek
diff --git a/devel/gal/PLIST b/devel/gal/PLIST
index 632a11e5d5e..1280c725a42 100644
--- a/devel/gal/PLIST
+++ b/devel/gal/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/01/16 03:20:18 rh Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/02/15 10:12:35 skrll Exp $
include/gal/util/e-util.h
include/gal/util/e-xml-utils.h
include/gal/util/e-cache.h
@@ -195,7 +195,7 @@ ${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/gal.mo
${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/gal.mo
${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/gal.mo
${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gal.mo
-@exec mkdir -p -m 0755 %D/share/gal/html/gal
+@exec ${MKDIR} -p -m 0755 %D/share/gal/html/gal
@dirrm share/pixmaps/gal/categories
@dirrm share/pixmaps/gal
@dirrm share/gal/html/gal
diff --git a/devel/haskell-mode/PLIST b/devel/haskell-mode/PLIST
index c6908564e86..51f17ddd446 100644
--- a/devel/haskell-mode/PLIST
+++ b/devel/haskell-mode/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:24:07 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:35 skrll Exp $
${LISPDIR}/haskell-decl-scan.el
${LISPDIR}/haskell-decl-scan.elc
${LISPDIR}/haskell-doc.el
@@ -13,4 +13,4 @@ ${LISPDIR}/haskell-mode.el
${LISPDIR}/haskell-mode.elc
${LISPDIR}/haskell-simple-indent.el
${LISPDIR}/haskell-simple-indent.elc
-@unexec rmdir %D/${LISPDIR} 2>/dev/null || true
+@unexec ${RMDIR} %D/${LISPDIR} 2>/dev/null || true
diff --git a/devel/libnet/PLIST b/devel/libnet/PLIST
index 52069148578..e778e29f1c7 100644
--- a/devel/libnet/PLIST
+++ b/devel/libnet/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:24:38 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:35 skrll Exp $
bin/libnet-config
include/libnet.h
include/libnet/libnet-asn1.h
@@ -14,5 +14,5 @@ lib/libnet.so.1
lib/libnet.so.1.0
man/man3/libnet.3
@exec ln -s %D/share/doc/libnet/examples %D/share/examples/libnet
-@unexec rm %D/share/examples/libnet
+@unexec ${RM} %D/share/examples/libnet
@dirrm include/libnet
diff --git a/devel/libtool-base/PLIST b/devel/libtool-base/PLIST
index 450a49dfd47..52636c93b02 100644
--- a/devel/libtool-base/PLIST
+++ b/devel/libtool-base/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:24:47 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:35 skrll Exp $
bin/libtool
bin/libtoolize
include/ltdl.h
@@ -31,4 +31,4 @@ share/libtool/ltconfig
share/libtool/ltmain.sh
@dirrm share/libtool/libltdl
@dirrm share/libtool
-@unexec rmdir %D/share/aclocal 2>/dev/null || true
+@unexec ${RMDIR} %D/share/aclocal 2>/dev/null || true
diff --git a/devel/pkgconfig/PLIST b/devel/pkgconfig/PLIST
index 0c5566e048e..27dba56f9b2 100644
--- a/devel/pkgconfig/PLIST
+++ b/devel/pkgconfig/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:31:32 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:35 skrll Exp $
bin/pkg-config
man/man1/pkg-config.1
share/aclocal/pkg.m4
-@exec mkdir -p %D/lib/pkgconfig
+@exec ${MKDIR} -p %D/lib/pkgconfig
@dirrm lib/pkgconfig
diff --git a/editors/emacs/PLIST b/editors/emacs/PLIST
index 0c1157b4047..20766c6de0a 100644
--- a/editors/emacs/PLIST
+++ b/editors/emacs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 21:22:42 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:36 skrll Exp $
bin/emacs
bin/emacs-${PKGVERSION}
bin/emacs-b2m
@@ -1399,8 +1399,8 @@ share/emacs/${PKGVERSION}/lisp/zone-mode.elc
share/emacs/${PKGVERSION}/site-lisp/subdirs.el
@dirrm share/emacs/${PKGVERSION}/site-lisp
share/emacs/site-lisp/subdirs.el
-@unexec rmdir %D/share/emacs/site-lisp 2>/dev/null || true
-@exec mkdir -p %D/share/emacs/${PKGVERSION}/leim
+@unexec ${RMDIR} %D/share/emacs/site-lisp 2>/dev/null || true
+@exec ${MKDIR} -p %D/share/emacs/${PKGVERSION}/leim
@dirrm share/emacs/${PKGVERSION}/leim
@dirrm share/emacs/${PKGVERSION}
-@unexec rmdir %D/share/emacs 2>/dev/null || true
+@unexec ${RMDIR} %D/share/emacs 2>/dev/null || true
diff --git a/editors/gnotepad/PLIST b/editors/gnotepad/PLIST
index f96dc7388a4..a7e135ebaff 100644
--- a/editors/gnotepad/PLIST
+++ b/editors/gnotepad/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 21:22:46 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:36 skrll Exp $
bin/gnp
man/man1/gnp.1
share/gnome/apps/Applications/gnotepad+.desktop
@@ -114,5 +114,5 @@ share/locale/ja/LC_MESSAGES/gnotepad+.mo
@dirrm share/gnotepad+
@dirrm share/gnome/help/gnotepad+/C
@dirrm share/gnome/help/gnotepad+
-@unexec rmdir share/gnome/help 2> /dev/null || true
-@unexec rmdir share/gnome/apps/Applications 2> /dev/null || true
+@unexec ${RMDIR} share/gnome/help 2> /dev/null || true
+@unexec ${RMDIR} share/gnome/apps/Applications 2> /dev/null || true
diff --git a/editors/mule/PLIST b/editors/mule/PLIST
index 4c4e193a6b1..b3782182ef9 100644
--- a/editors/mule/PLIST
+++ b/editors/mule/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/13 22:30:27 skrll Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/02/15 10:12:36 skrll Exp $
bin/any2ps
bin/b2m
bin/coco
@@ -8,7 +8,7 @@ bin/etags
bin/m2ps
bin/mule-19.28
@exec ln %D/%F %B/mule
-@unexec rm %B/mule
+@unexec ${RM} %B/mule
bin/rcs-checkin
@comment @unexec install-info --delete %D/info/CCL %D/info/dir
@comment @unexec install-info --delete %D/info/ISO2022 %D/info/dir
@@ -1024,7 +1024,7 @@ lib/mule/19.28/lisp/yow.el
lib/mule/19.28/lisp/yow.elc
@comment f=%D/lib/mule/lock ; [ ! -d $f ] && ${MKDIR} $f && ${CHMOD} 1777 $f
@exec f=%D/lib/mule/lock ; [ ! -d $f ] && ${MKDIR} $f
-@unexec f=%D/lib/mule/lock ; [ -d $f ] && rm -rf $f
+@unexec f=%D/lib/mule/lock ; [ -d $f ] && ${RM} -rf $f
@exec f=%D/lib/mule/site-lisp ; [ ! -d $f ] && ${MKDIR} $f
@unexec f=%D/lib/mule/site-lisp ; [ -d $f ] && ${MKDIR} $f
@dirrm lib/mule/19.28/lisp/its
diff --git a/editors/speedbar/PLIST b/editors/speedbar/PLIST
index ac87a77a819..c68e756ba4e 100644
--- a/editors/speedbar/PLIST
+++ b/editors/speedbar/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 21:23:23 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:36 skrll Exp $
${LISPDIR}/dframe.el
${LISPDIR}/dframe.elc
${LISPDIR}/sb-dir-minus.xpm
@@ -20,4 +20,4 @@ ${LISPDIR}/speedbar.elc
@unexec install-info --delete %D/info/speedbar.info %D/info/dir
info/speedbar.info
@exec install-info %D/info/speedbar.info %D/info/dir
-@unexec rmdir %D/${LISPDIR} 2>/dev/null || true
+@unexec ${RMDIR} %D/${LISPDIR} 2>/dev/null || true
diff --git a/editors/xemacs/PLIST b/editors/xemacs/PLIST
index 05039fac5a8..33e4f1c54bb 100644
--- a/editors/xemacs/PLIST
+++ b/editors/xemacs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/13 22:31:30 skrll Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/02/15 10:12:37 skrll Exp $
bin/gnuattach
bin/gnuclient
bin/gnudoit
@@ -967,4 +967,4 @@ man/man1/xemacs-etags.1
@dirrm lib/${PKGNAME}
@dirrm lib/xemacs
@exec ${MKDIR} -p /var/tmp/xemacs.lock && ${CHMOD} 1777 /var/tmp/xemacs.lock
-@unexec rm -rf /var/tmp/xemacs.lock
+@unexec ${RM} -rf /var/tmp/xemacs.lock
diff --git a/emulators/plex86/PLIST b/emulators/plex86/PLIST
index 2b2761573c2..e6f7c0e815f 100644
--- a/emulators/plex86/PLIST
+++ b/emulators/plex86/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/05 22:03:55 skrll Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/02/15 10:12:37 skrll Exp $
bin/plex86
bin/plex86_reset
lib/X11/fonts/local/vga.pcf.gz
@@ -12,7 +12,7 @@ lib/plex86/bios/VGABIOS-elpin-2.40
lib/plex86/netbsd_post.sh
lib/plex86/plugin-bochs.so
lkm/plex86.o
-@unexec rm -f %D/lkm/plex86 2>/dev/null || true
+@unexec ${RM} -f %D/lkm/plex86 2>/dev/null || true
share/examples/plex86/freedos.conf
share/examples/plex86/linuxhd.conf
share/examples/plex86/msdos.conf
@@ -22,4 +22,4 @@ share/examples/plex86/winnt.conf
@dirrm lib/plex86/bios
@dirrm lib/plex86
@dirrm share/examples/plex86
-@unexec rmdir %D/lkm 2>/dev/null || true
+@unexec ${RMDIR} %D/lkm 2>/dev/null || true
diff --git a/emulators/suse_base/PLIST b/emulators/suse_base/PLIST
index c6d38402226..25c9091a2af 100644
--- a/emulators/suse_base/PLIST
+++ b/emulators/suse_base/PLIST
@@ -1,11 +1,11 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:53:33 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:37 skrll Exp $
sbin/linux-mkpwd
-@unexec rm -f %D/@@EMULSUBDIR@@/etc/ld.so.cache
+@unexec ${RM} -f %D/@@EMULSUBDIR@@/etc/ld.so.cache
@@EMULSUBDIR@@/etc/ld.so.conf
-@unexec cd %D/@@EMULSUBDIR@@/etc && rm -f group gshadow passwd shadow
-@exec mkdir -p %D/@@EMULSUBDIR@@/dev
+@unexec cd %D/@@EMULSUBDIR@@/etc && ${RM} -f group gshadow passwd shadow
+@exec ${MKDIR} -p %D/@@EMULSUBDIR@@/dev
@exec ln -s /dev/sound %D/@@EMULSUBDIR@@/dev/dsp
-@unexec rm -f %D/@@EMULSUBDIR@@/dev/dsp
+@unexec ${RM} -f %D/@@EMULSUBDIR@@/dev/dsp
@exec ln -s /dev/null %D/@@EMULSUBDIR@@/dev/null
-@unexec rm -f %D/@@EMULSUBDIR@@/dev/null
+@unexec ${RM} -f %D/@@EMULSUBDIR@@/dev/null
@dirrm @@EMULSUBDIR@@/dev
diff --git a/emulators/vmware-module/PLIST b/emulators/vmware-module/PLIST
index bdeb1ab9fc2..5c3a60b821e 100644
--- a/emulators/vmware-module/PLIST
+++ b/emulators/vmware-module/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:54:10 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:37 skrll Exp $
etc/rc.conf.d/linuxrtc
etc/rc.conf.d/vmmon
etc/rc.conf.d/vmnet
@@ -15,7 +15,7 @@ lkm/linuxrtc_post.sh
lkm/vmmon.o
lkm/vmmon_post.sh
@dirrm etc/rc.conf.d
-@unexec rm -f %D/lkm/if_hub. 2>/dev/null || true
-@unexec rm -f %D/lkm/linuxrtc 2>/dev/null || true
-@unexec rm -f %D/lkm/vmmon 2>/dev/null || true
-@unexec rmdir %D/lkm 2>/dev/null || true
+@unexec ${RM} -f %D/lkm/if_hub. 2>/dev/null || true
+@unexec ${RM} -f %D/lkm/linuxrtc 2>/dev/null || true
+@unexec ${RM} -f %D/lkm/vmmon 2>/dev/null || true
+@unexec ${RMDIR} %D/lkm 2>/dev/null || true
diff --git a/finance/gnofin/PLIST b/finance/gnofin/PLIST
index 9d68debad1e..95e3531c147 100644
--- a/finance/gnofin/PLIST
+++ b/finance/gnofin/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:01:10 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:37 skrll Exp $
bin/gnofin
lib/gnofin/plugins/libcbb.a
lib/gnofin/plugins/libcbb.la
@@ -45,6 +45,6 @@ share/locale/cs/LC_MESSAGES/gnofin.mo
share/locale/fr/LC_MESSAGES/gnofin.mo
share/locale/pt_BR/LC_MESSAGES/gnofin.mo
man/man1/gnofin.1
-@unexec rmdir -p %D/share/gnome/apps/Applications 2> /dev/null || true
+@unexec ${RMDIR} -p %D/share/gnome/apps/Applications 2> /dev/null || true
@dirrm lib/gnofin/plugins
@dirrm lib/gnofin
diff --git a/fonts/arphicttf/PLIST b/fonts/arphicttf/PLIST
index bddd335ef3f..79ec2112f81 100644
--- a/fonts/arphicttf/PLIST
+++ b/fonts/arphicttf/PLIST
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.2 2001/11/29 17:37:57 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/02/15 10:12:38 skrll Exp $
lib/X11/fonts/TrueType/bkai00mp.ttf
lib/X11/fonts/TrueType/bsmi00lp.ttf
lib/X11/fonts/TrueType/gbsn00lp.ttf
lib/X11/fonts/TrueType/gkai00mp.ttf
@exec mkttfdir %D/lib/X11/fonts/TrueType
@unexec mkttfdir %D/lib/X11/fonts/TrueType
-@unexec rmdir %D/lib/X11/fonts/TrueType
+@unexec ${RMDIR} %D/lib/X11/fonts/TrueType
diff --git a/games/angband-tty/PLIST b/games/angband-tty/PLIST
index 6f9fd0eb251..13873558eda 100644
--- a/games/angband-tty/PLIST
+++ b/games/angband-tty/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:50:44 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:38 skrll Exp $
bin/angband
share/angband/edit/a_info.txt
share/angband/edit/e_info.txt
@@ -70,9 +70,9 @@ share/angband/user/pref-x11.prf
share/angband/user/pref.prf
share/angband/user/user-mac.prf
share/angband/user/user.prf
-@unexec rm -r %D/share/angband/apex
-@unexec rm -r %D/share/angband/data
-@unexec rm -r %D/share/angband/save
+@unexec ${RM} -r %D/share/angband/apex
+@unexec ${RM} -r %D/share/angband/data
+@unexec ${RM} -r %D/share/angband/save
@dirrm share/angband/bone
@dirrm share/angband/edit
@dirrm share/angband/file
diff --git a/games/angband-x11/PLIST b/games/angband-x11/PLIST
index 5e458638115..13873558eda 100644
--- a/games/angband-x11/PLIST
+++ b/games/angband-x11/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:50:47 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:38 skrll Exp $
bin/angband
share/angband/edit/a_info.txt
share/angband/edit/e_info.txt
@@ -70,9 +70,9 @@ share/angband/user/pref-x11.prf
share/angband/user/pref.prf
share/angband/user/user-mac.prf
share/angband/user/user.prf
-@unexec rm -r %D/share/angband/apex
-@unexec rm -r %D/share/angband/data
-@unexec rm -r %D/share/angband/save
+@unexec ${RM} -r %D/share/angband/apex
+@unexec ${RM} -r %D/share/angband/data
+@unexec ${RM} -r %D/share/angband/save
@dirrm share/angband/bone
@dirrm share/angband/edit
@dirrm share/angband/file
diff --git a/games/civctp-demo/PLIST b/games/civctp-demo/PLIST
index 7b476a49983..9cba9b3d75c 100644
--- a/games/civctp-demo/PLIST
+++ b/games/civctp-demo/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:51:09 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:38 skrll Exp $
bin/civctp-demo
lib/lokigames/civctp-demo/appstr.txt
lib/lokigames/civctp-demo/civctp-demo
@@ -584,5 +584,5 @@ share/doc/lokigames/civctp-demo-README
@dirrm lib/lokigames/civctp-demo/ctp_data/default
@dirrm lib/lokigames/civctp-demo/ctp_data
@dirrm lib/lokigames/civctp-demo
-@unexec rmdir -p %D/lib/lokigames 2>/dev/null || true
-@unexec rmdir -p %D/share/doc/lokigames 2>/dev/null || true
+@unexec ${RMDIR} -p %D/lib/lokigames 2>/dev/null || true
+@unexec ${RMDIR} -p %D/share/doc/lokigames 2>/dev/null || true
diff --git a/games/crafty-doc/PLIST b/games/crafty-doc/PLIST
index eda9f38ac79..086242363cc 100644
--- a/games/crafty-doc/PLIST
+++ b/games/crafty-doc/PLIST
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:51:42 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:39 skrll Exp $
share/doc/crafty/crafty.doc.ps
-@unexec rmdir -p %D/share/doc/crafty 2>/dev/null || true
+@unexec ${RMDIR} -p %D/share/doc/crafty 2>/dev/null || true
diff --git a/games/crossfire-srv/PLIST b/games/crossfire-srv/PLIST
index 9186fd23aaa..0eedbdcd470 100644
--- a/games/crossfire-srv/PLIST
+++ b/games/crossfire-srv/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:51:48 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:39 skrll Exp $
bin/random_map
bin/crossfire
bin/flushlocks
@@ -1759,7 +1759,7 @@ share/crossfire/maps/mak/unnatural/unnat
var/crossfire/highscore
var/crossfire/bookarch
var/crossfire/temp.maps
-@unexec rm -r %D/var/crossfire/unique-items/*
+@unexec ${RM} -r %D/var/crossfire/unique-items/*
@dirrm var/crossfire/unique-items
@dirrm var/crossfire/players
@dirrm var/crossfire
diff --git a/games/eus-demo/PLIST b/games/eus-demo/PLIST
index 52e5cf33f28..994ca194fee 100644
--- a/games/eus-demo/PLIST
+++ b/games/eus-demo/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:52:00 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:40 skrll Exp $
bin/eus-demo
lib/lokigames/eus-demo/EUS.txt
lib/lokigames/eus-demo/eus-demo
@@ -198,5 +198,5 @@ share/doc/lokigames/eus-demo-README
@dirrm lib/lokigames/eus-demo/sounds
@dirrm lib/lokigames/eus-demo/pixmaps
@dirrm lib/lokigames/eus-demo
-@unexec rmdir -p %D/lib/lokigames 2>/dev/null || true
-@unexec rmdir -p %D/share/doc/lokigames 2>/dev/null || true
+@unexec ${RMDIR} -p %D/lib/lokigames 2>/dev/null || true
+@unexec ${RMDIR} -p %D/share/doc/lokigames 2>/dev/null || true
diff --git a/games/heretic2-demo/PLIST b/games/heretic2-demo/PLIST
index de2ae432ba1..82d0ca5f0fa 100644
--- a/games/heretic2-demo/PLIST
+++ b/games/heretic2-demo/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:53:10 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:40 skrll Exp $
bin/heretic2-demo
lib/lokigames/heretic2-demo/base/book/back/b_conback8.bk
lib/lokigames/heretic2-demo/base/book/back/b_conback8_00.m8
@@ -2150,5 +2150,5 @@ share/doc/lokigames/heretic2-demo-README
@dirrm lib/lokigames/heretic2-demo/base/book
@dirrm lib/lokigames/heretic2-demo/base
@dirrm lib/lokigames/heretic2-demo
-@unexec rmdir -p %D/lib/lokigames 2>/dev/null || true
-@unexec rmdir -p %D/share/doc/lokigames 2>/dev/null || true
+@unexec ${RMDIR} -p %D/lib/lokigames 2>/dev/null || true
+@unexec ${RMDIR} -p %D/share/doc/lokigames 2>/dev/null || true
diff --git a/games/iso-pernangband/PLIST b/games/iso-pernangband/PLIST
index 86059c55d75..7c45d2fce8f 100644
--- a/games/iso-pernangband/PLIST
+++ b/games/iso-pernangband/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:53:20 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:40 skrll Exp $
bin/iso-pernangband
share/iso-pernangband/apex/scores.raw
share/iso-pernangband/bone/bone004.001
@@ -233,10 +233,10 @@ share/iso-pernangband/xtra/font/xm8x13b.fnt
share/iso-pernangband/xtra/font/xm8x16.fnt
share/iso-pernangband/xtra/font/vga8x16.hex
share/iso-pernangband/xtra/font/vga11x19.hex
-@unexec rm -r %D/share/iso-pernangband/apex
-@unexec rm -r %D/share/iso-pernangband/bone
-@unexec rm -r %D/share/iso-pernangband/data
-@unexec rm -r %D/share/iso-pernangband/save
+@unexec ${RM} -r %D/share/iso-pernangband/apex
+@unexec ${RM} -r %D/share/iso-pernangband/bone
+@unexec ${RM} -r %D/share/iso-pernangband/data
+@unexec ${RM} -r %D/share/iso-pernangband/save
@dirrm share/iso-pernangband/dngn
@dirrm share/iso-pernangband/edit
@dirrm share/iso-pernangband/file
diff --git a/games/quake3arena-demo/PLIST b/games/quake3arena-demo/PLIST
index cb891f81016..ebe5cf0e170 100644
--- a/games/quake3arena-demo/PLIST
+++ b/games/quake3arena-demo/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:55:17 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:41 skrll Exp $
bin/quake3arena-demo
lib/lokigames/quake3arena-demo/demoq3/pak0.pk3
lib/lokigames/quake3arena-demo/q3ded
@@ -249,5 +249,5 @@ share/doc/lokigames/quake3arena-demo-README
@dirrm share/doc/lokigames/quake3arena-Help
@dirrm lib/lokigames/quake3arena-demo/demoq3
@dirrm lib/lokigames/quake3arena-demo
-@unexec rmdir -p %D/lib/lokigames 2>/dev/null || true
-@unexec rmdir -p %D/share/doc/lokigames 2>/dev/null || true
+@unexec ${RMDIR} -p %D/lib/lokigames 2>/dev/null || true
+@unexec ${RMDIR} -p %D/share/doc/lokigames 2>/dev/null || true
diff --git a/games/quake3arena/PLIST b/games/quake3arena/PLIST
index 121414ee3d0..ed97a652d82 100644
--- a/games/quake3arena/PLIST
+++ b/games/quake3arena/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:55:11 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:40 skrll Exp $
bin/quake3arena
lib/lokigames/quake3arena/libMesaVoodooGL.so
lib/lokigames/quake3arena/libMesaVoodooGL.so.3
@@ -13,7 +13,7 @@ share/doc/lokigames/quake3arena-Help/Q3A_EULA.txt
share/doc/lokigames/quake3arena-Help/Q3A_FAQ.html
share/doc/lokigames/quake3arena-README
@dirrm share/doc/lokigames/quake3arena-Help
-@unexec rmdir -p %D/share/doc/lokigames 2>/dev/null || true
+@unexec ${RMDIR} -p %D/share/doc/lokigames 2>/dev/null || true
@comment next dir not necessarily empty, since the game data file could
@comment be there
-@unexec rmdir -p %D/lib/lokigames/quake3arena/baseq3 2>/dev/null || true
+@unexec ${RMDIR} -p %D/lib/lokigames/quake3arena/baseq3 2>/dev/null || true
diff --git a/games/tanked/PLIST b/games/tanked/PLIST
index a035e0854a0..770d5a8821b 100644
--- a/games/tanked/PLIST
+++ b/games/tanked/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:55:49 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:41 skrll Exp $
bin/tanked
bin/tankedserv
share/tanked/maps/README
@@ -15,8 +15,8 @@ share/tanked/maps/tiny.map
share/tanked/maps.list
share/tanked/motd
share/tanked/players
-@unexec rm -f share/tanked/logs/*
-@unexec rm -f %D/share/tanked/motd %D/share/tanked/players
+@unexec ${RM} -f share/tanked/logs/*
+@unexec ${RM} -f %D/share/tanked/motd %D/share/tanked/players
@dirrm share/tanked/maps
@dirrm share/tanked/logs
@dirrm share/tanked
diff --git a/games/xemeraldia/PLIST b/games/xemeraldia/PLIST
index 61b1677a282..3c70256aada 100644
--- a/games/xemeraldia/PLIST
+++ b/games/xemeraldia/PLIST
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/13 22:32:43 skrll Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/02/15 10:12:41 skrll Exp $
bin/xemeraldia
lib/X11/app-defaults/XEmeraldia
@exec ${MKDIR} -p %D/${GAMES_DIR}/xemeraldia
@exec touch -f %D/${GAMES_DIR}/xemeraldia/xemeraldia.scores
@exec ${CHMOD} 666 %D/${GAMES_DIR}/xemeraldia/xemeraldia.scores
-@unexec rm -f %D/${GAMES_DIR}/xemeraldia/xemeraldia.scores
-@unexec rmdir %D/${GAMES_DIR}/xemeraldia
+@unexec ${RM} -f %D/${GAMES_DIR}/xemeraldia/xemeraldia.scores
+@unexec ${RMDIR} %D/${GAMES_DIR}/xemeraldia
diff --git a/games/xgalaga/PLIST b/games/xgalaga/PLIST
index 8512001dd3d..de8d849de66 100644
--- a/games/xgalaga/PLIST
+++ b/games/xgalaga/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:56:48 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:41 skrll Exp $
bin/xgalaga
share/xgalaga/README
share/xgalaga/sounds/ddloo.raw
@@ -26,7 +26,7 @@ share/xgalaga/levels/level8.xgl
share/xgalaga/levels/level9.xgl
share/xgalaga/xgal.sndsrv.linux
share/xgalaga/scores
-@unexec rm -f %D/share/xgalaga/scores
+@unexec ${RM} -f %D/share/xgalaga/scores
@dirrm share/xgalaga/sounds
@dirrm share/xgalaga/levels
@dirrm share/xgalaga
diff --git a/games/xkobo/PLIST b/games/xkobo/PLIST
index f36592384f7..13065444ea1 100644
--- a/games/xkobo/PLIST
+++ b/games/xkobo/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/13 22:35:07 skrll Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/02/15 10:12:41 skrll Exp $
bin/xkobo
man/cat1/xkobo.0
@exec ${MKDIR} %D/lib/X11/xkobo-scores && ${CHMOD} 775 %D/lib/X11/xkobo-scores
-@unexec rm -r %D/lib/X11/xkobo-scores
+@unexec ${RM} -r %D/lib/X11/xkobo-scores
diff --git a/games/xmris/PLIST b/games/xmris/PLIST
index dff9a91adb4..91815bfbedf 100644
--- a/games/xmris/PLIST
+++ b/games/xmris/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:57:10 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:42 skrll Exp $
bin/xmred
bin/xmris
bin/xmsit
@@ -11,5 +11,5 @@ man/man6/xmsit.6
man/man6/xmred.6
man/man6/xmris.6
@dirrm lib/X11/app-defaults/xmris
-@exec mkdir %D/share/xmris
-@unexec rm -rf %D/share/xmris
+@exec ${MKDIR} %D/share/xmris
+@unexec ${RM} -rf %D/share/xmris
diff --git a/games/xpuyopuyo/PLIST b/games/xpuyopuyo/PLIST
index 54e82b87d94..36b0863c70e 100644
--- a/games/xpuyopuyo/PLIST
+++ b/games/xpuyopuyo/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:57:32 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:42 skrll Exp $
bin/xpuyopuyo
man/man6/xpuyopuyo.6
share/gnome/apps/Games/xpuyopuyo.desktop
@@ -124,5 +124,5 @@ share/xpuyopuyo/xpuyopuyo.txt
@dirrm share/xpuyopuyo/themes
@dirrm share/xpuyopuyo/sounds
@dirrm share/xpuyopuyo
-@unexec rmdir -p %D/share/pixmaps 2>/dev/null || true
-@unexec rmdir -p %D/share/gnome/apps/Games 2>/dev/null || true
+@unexec ${RMDIR} -p %D/share/pixmaps 2>/dev/null || true
+@unexec ${RMDIR} -p %D/share/gnome/apps/Games 2>/dev/null || true
diff --git a/graphics/ImageMagick/PLIST b/graphics/ImageMagick/PLIST
index 35fabd58e47..f716fda2be0 100644
--- a/graphics/ImageMagick/PLIST
+++ b/graphics/ImageMagick/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:50:08 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:42 skrll Exp $
bin/Magick++-config
bin/Magick-config
bin/animate
@@ -62,7 +62,7 @@ lib/libMagick++.la
lib/libMagick++.so
lib/libMagick++.so.5
lib/libMagick++.so.5.39
-@exec mkdir -p %D/lib/ImageMagick/modules/coders
+@exec ${MKDIR} -p %D/lib/ImageMagick/modules/coders
man/man1/ImageMagick.1
man/man1/Magick-config.1
man/man1/Magick++-config.1
diff --git a/graphics/MesaLib/PLIST b/graphics/MesaLib/PLIST
index 54a2dec2d3f..cbe5017ea9a 100644
--- a/graphics/MesaLib/PLIST
+++ b/graphics/MesaLib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:50:11 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:42 skrll Exp $
etc/mesa.conf
include/GL/gl.h
include/GL/gl_mangle.h
@@ -14,4 +14,4 @@ lib/libGL.so.3
lib/libGL.so.3.4
lib/libGL.a
lib/libGL.la
-@unexec rmdir %D/include/GL >/dev/null 2>&1 || true
+@unexec ${RMDIR} %D/include/GL >/dev/null 2>&1 || true
diff --git a/graphics/gdk-pixbuf/PLIST b/graphics/gdk-pixbuf/PLIST
index e55c965a88d..5f2f4da3c8e 100644
--- a/graphics/gdk-pixbuf/PLIST
+++ b/graphics/gdk-pixbuf/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:50:50 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:42 skrll Exp $
bin/gdk-pixbuf-config
include/gdk-pixbuf/gdk-pixbuf.h
include/gdk-pixbuf/gdk-pixbuf-loader.h
@@ -52,4 +52,4 @@ share/aclocal/gdk-pixbuf.m4
@dirrm lib/gdk-pixbuf
@dirrm include/gdk-pixbuf
@exec test %D = ${LOCALBASE} || ln -s %D/share/aclocal/gdk-pixbuf.m4 ${LOCALBASE}/share/aclocal/gdk-pixbuf.m4
-@unexec test %D = ${LOCALBASE} || rm -f ${LOCALBASE}/share/aclocal/gdk-pixbuf.m4
+@unexec test %D = ${LOCALBASE} || ${RM} -f ${LOCALBASE}/share/aclocal/gdk-pixbuf.m4
diff --git a/graphics/gimp/PLIST b/graphics/gimp/PLIST
index aea183f7f9a..c6e10b07add 100644
--- a/graphics/gimp/PLIST
+++ b/graphics/gimp/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/13 19:50:06 drochner Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/02/15 10:12:43 skrll Exp $
bin/escputil
bin/escputil-1.2
bin/gimp
@@ -1668,7 +1668,7 @@ share/locale/zh_TW/LC_MESSAGES/gimp.mo
@dirrm share/gimp/1.2/brushes
@dirrm share/gimp/1.2
@dirrm share/gimp
-@unexec rmdir %D/share/aclocal 2>/dev/null || true
+@unexec ${RMDIR} %D/share/aclocal 2>/dev/null || true
@dirrm lib/gimp/1.2/plug-ins
@dirrm lib/gimp/1.2/modules
@dirrm lib/gimp/1.2
@@ -1678,4 +1678,4 @@ share/locale/zh_TW/LC_MESSAGES/gimp.mo
@dirrm etc/gimp/1.2
@dirrm etc/gimp
@exec test %D = ${LOCALBASE} || ln -s %D/share/aclocal/gimp.m4 ${LOCALBASE}/share/aclocal/gimp.m4
-@unexec test %D = ${LOCALBASE} || rm ${LOCALBASE}/share/aclocal/gimp.m4
+@unexec test %D = ${LOCALBASE} || ${RM} ${LOCALBASE}/share/aclocal/gimp.m4
diff --git a/graphics/glu/PLIST b/graphics/glu/PLIST
index 8de6fbfd68e..768d5841f5e 100644
--- a/graphics/glu/PLIST
+++ b/graphics/glu/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:51:12 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:43 skrll Exp $
include/GL/glu.h
include/GL/glu_mangle.h
lib/libGLU.so
@@ -6,4 +6,4 @@ lib/libGLU.so.3
lib/libGLU.so.3.4
lib/libGLU.a
lib/libGLU.la
-@unexec rmdir %D/include/GL >/dev/null 2>&1 || true
+@unexec ${RMDIR} %D/include/GL >/dev/null 2>&1 || true
diff --git a/graphics/glut/PLIST b/graphics/glut/PLIST
index e1d7432c495..7082ee76ac8 100644
--- a/graphics/glut/PLIST
+++ b/graphics/glut/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:51:14 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:43 skrll Exp $
include/GL/glut.h
include/GL/glutf90.h
lib/libglut.so
@@ -6,4 +6,4 @@ lib/libglut.so.3
lib/libglut.so.3.7
lib/libglut.a
lib/libglut.la
-@unexec rmdir %D/include/GL >/dev/null 2>&1 || true
+@unexec ${RMDIR} %D/include/GL >/dev/null 2>&1 || true
diff --git a/graphics/gnome-iconedit/PLIST b/graphics/gnome-iconedit/PLIST
index bdffbdd1871..4021cea9280 100644
--- a/graphics/gnome-iconedit/PLIST
+++ b/graphics/gnome-iconedit/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:51:15 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:43 skrll Exp $
bin/gnome-iconedit
etc/CORBA/servers/gnome-iconedit.gnorba
share/gnome/apps/Graphics/gnome-iconedit.desktop
@@ -30,4 +30,4 @@ share/pixmaps/gnome-iconedit/selector.png
@dirrm share/pixmaps/gnome-iconedit
@dirrm share/gnome/help/gnome-iconedit/C
@dirrm share/gnome/help/gnome-iconedit
-@unexec rmdir -p share/gnome/apps/Graphics 2>/dev/null || true
+@unexec ${RMDIR} -p share/gnome/apps/Graphics 2>/dev/null || true
diff --git a/graphics/gphoto/PLIST b/graphics/gphoto/PLIST
index 2edbe63eca6..2947caa34c3 100644
--- a/graphics/gphoto/PLIST
+++ b/graphics/gphoto/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:51:19 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:44 skrll Exp $
bin/dc21x_cam
bin/gphoto
bin/gphoto-exifdump
@@ -125,6 +125,6 @@ share/gphoto/gallery/RedNGray/thumbnail.html
@dirrm share/gphoto/gallery
@dirrm share/gphoto/doc
@dirrm share/gphoto
-@unexec rmdir %D/share/gnome/apps/Graphics 2>/dev/null || true
-@unexec rmdir %D/share/gnome/apps 2>/dev/null || true
-@unexec rmdir %D/share/gnome 2>/dev/null || true
+@unexec ${RMDIR} %D/share/gnome/apps/Graphics 2>/dev/null || true
+@unexec ${RMDIR} %D/share/gnome/apps 2>/dev/null || true
+@unexec ${RMDIR} %D/share/gnome 2>/dev/null || true
diff --git a/graphics/imlib/PLIST b/graphics/imlib/PLIST
index f15e40ad71c..581e8031bad 100644
--- a/graphics/imlib/PLIST
+++ b/graphics/imlib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:51:32 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:44 skrll Exp $
bin/imlib_config
bin/imlib-config
etc/imrc
@@ -61,5 +61,5 @@ share/doc/imlib/imlib.gif
share/doc/imlib/index.html
@dirrm share/doc/imlib
@exec test %D = ${LOCALBASE} || ln -fs %D/share/aclocal/imlib.m4 ${LOCALBASE}/share/aclocal/imlib.m4
-@unexec test %D = ${LOCALBASE} || rm ${LOCALBASE}/share/aclocal/imlib.m4
-@unexec rmdir %D/share/aclocal 2>/dev/null || true
+@unexec test %D = ${LOCALBASE} || ${RM} ${LOCALBASE}/share/aclocal/imlib.m4
+@unexec ${RMDIR} %D/share/aclocal 2>/dev/null || true
diff --git a/graphics/mgl/PLIST b/graphics/mgl/PLIST
index 587a4f29ae4..b3f32f7f070 100644
--- a/graphics/mgl/PLIST
+++ b/graphics/mgl/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:52:01 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:44 skrll Exp $
bin/kill_mgl.sh
bin/mcalc
bin/mdate
@@ -68,7 +68,7 @@ share/doc/mgl2/mil/mil.doc
share/doc/mgl2/nine/README.txt
share/doc/mgl2/nine/CHANGES.doc
share/mgl2/mgl_fontcreate.c
-@unexec rm -f %D/etc/calibdata
+@unexec ${RM} -f %D/etc/calibdata
@dirrm share/mgl2
@dirrm share/doc/mgl2/nine
@dirrm share/doc/mgl2/mil
diff --git a/graphics/ns-flash/PLIST b/graphics/ns-flash/PLIST
index 198e3f70337..7529ad77ea3 100644
--- a/graphics/ns-flash/PLIST
+++ b/graphics/ns-flash/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:52:25 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:44 skrll Exp $
lib/netscape/plugins/ShockwaveFlash.class
lib/netscape/plugins/libflashplayer.so
-@unexec rmdir %D/lib/netscape/plugins 2>/dev/null || true
+@unexec ${RMDIR} %D/lib/netscape/plugins 2>/dev/null || true
diff --git a/graphics/yplot/PLIST b/graphics/yplot/PLIST
index 206f1cfc748..7cbfd3ded33 100644
--- a/graphics/yplot/PLIST
+++ b/graphics/yplot/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:54:53 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:44 skrll Exp $
bin/yplot
bin/yplotl
share/yorick/1.4/contrib/yplot.i
@@ -46,4 +46,4 @@ share/doc/yplot/ytut.dvi
share/doc/yplot/ytut.ps.gz
@dirrm share/doc/yplot
@dirrm share/examples/yplot
-@unexec rmdir %D/share/yorick/1.4/contrib 2>/dev/null || true
+@unexec ${RMDIR} %D/share/yorick/1.4/contrib 2>/dev/null || true
diff --git a/ham/tfkiss/PLIST b/ham/tfkiss/PLIST
index 9aa85139ba9..687b0374946 100644
--- a/ham/tfkiss/PLIST
+++ b/ham/tfkiss/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 21:39:49 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:45 skrll Exp $
sbin/tfkiss
share/tfkiss/doc/alas.eng
share/tfkiss/doc/alas.txt
@@ -7,7 +7,7 @@ share/tfkiss/doc/rfc1226
share/tfkiss/doc/tfkiss.doc
share/tfkiss/conf/tfkiss.ini
share/tfkiss/conf/tfkiss.cfg
-@unexec rm -f %D/share/tfkiss/conf/tfkiss.par
+@unexec ${RM} -f %D/share/tfkiss/conf/tfkiss.par
@dirrm share/tfkiss/doc
@dirrm share/tfkiss/conf
@dirrm share/tfkiss
diff --git a/japanese/canna-lib/PLIST b/japanese/canna-lib/PLIST
index 6a8efed2648..b4c222507a2 100644
--- a/japanese/canna-lib/PLIST
+++ b/japanese/canna-lib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:29:02 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:45 skrll Exp $
@cwd ${DICT_DIR}
@cwd ${DICT_DIR}
canna/default.cbp
@@ -112,10 +112,10 @@ share/canna/sample/unix.canna
share/canna/sample/vje.canna
share/canna/sample/wx2+.canna
@exec ln -s ${DICT_DIR}/canna ${PREFIX}/share/canna/dic
-@exec chown ${CANNAOWNER}:${CANNAGROUP} ${DICT_DIR}/canna
-@unexec rm ${PREFIX}/share/canna/dic
+@exec ${CHOWN} ${CANNAOWNER}:${CANNAGROUP} ${DICT_DIR}/canna
+@unexec ${RM} ${PREFIX}/share/canna/dic
@dirrm share/canna/sample/src
@dirrm share/canna/sample
@dirrm share/canna
@dirrm include/canna
-@unexec rmdir ${DICT_DIR}/canna
+@unexec ${RMDIR} ${DICT_DIR}/canna
diff --git a/japanese/canna-server/PLIST b/japanese/canna-server/PLIST
index b6f34ff44c0..a2d7e69806e 100644
--- a/japanese/canna-server/PLIST
+++ b/japanese/canna-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/13 22:43:06 skrll Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/02/15 10:12:45 skrll Exp $
@cwd ${DICT_DIR}
@cwd ${DICT_DIR}
canna/canna/bushu.cld
@@ -66,5 +66,5 @@ sbin/cannaserver
@exec ${MKDIR} ${CANNA_SPOOL}
@exec ${CHMOD} ${CANNAOWNER}:${CANNAGROUP} ${CANNA_SPOOL}
@exec ${CHOWN} ${CANNA_MODE} ${CANNA_SPOOL}
-@unexec rmdir ${DICT_DIR}/canna/canna
-@unexec rmdir ${CANNA_SPOOL}
+@unexec ${RMDIR} ${DICT_DIR}/canna/canna
+@unexec ${RMDIR} ${CANNA_SPOOL}
diff --git a/japanese/freewnn-server/PLIST b/japanese/freewnn-server/PLIST
index 3f512761974..25503655384 100644
--- a/japanese/freewnn-server/PLIST
+++ b/japanese/freewnn-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:29:08 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:45 skrll Exp $
@cwd ${DICT_DIR}
@cwd ${DICT_DIR}
wnn/ja_JP/pubdic/bio.dic
@@ -67,4 +67,4 @@ sbin/wnnstat
sbin/wnntouch
etc/rc.d/ja_freewnn
@exec ln -s ${DICT_DIR}/wnn/ja_JP %D/share/wnn/ja_JP/dic
-@unexec rm %D/share/wnn/ja_JP/dic
+@unexec ${RM} %D/share/wnn/ja_JP/dic
diff --git a/japanese/sj3-server/PLIST b/japanese/sj3-server/PLIST
index 3bd257a098e..cd04994951d 100644
--- a/japanese/sj3-server/PLIST
+++ b/japanese/sj3-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/13 22:44:25 skrll Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/02/15 10:12:45 skrll Exp $
@cwd ${DICT_DIR}
@cwd ${DICT_DIR}
sj3/sj3main.dic
@@ -28,6 +28,6 @@ share/sj3/sjrk
@dirrm share/sj3
@exec ${MKDIR} ${DICT_DIR}/sj3/user
@exec ${CHMOD} 755 ${DICT_DIR}/sj3/user
-@exec chown ${SJ3OWNER}:${SJ3GROUP} ${DICT_DIR}/sj3/user
-@unexec rmdir ${DICT_DIR}/sj3/user
-@unexec rmdir ${DICT_DIR}/sj3
+@exec ${CHOWN} ${SJ3OWNER}:${SJ3GROUP} ${DICT_DIR}/sj3/user
+@unexec ${RMDIR} ${DICT_DIR}/sj3/user
+@unexec ${RMDIR} ${DICT_DIR}/sj3
diff --git a/lang/blackdown-jdk13/PLIST b/lang/blackdown-jdk13/PLIST
index b69c51944e0..4bf68d15094 100644
--- a/lang/blackdown-jdk13/PLIST
+++ b/lang/blackdown-jdk13/PLIST
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:22:48 zuntum Exp $
-@unexec rm -f %D/java/jre/bin/java
-@unexec rm -f %D/java/jre/bin/keytool
-@unexec rm -f %D/java/jre/bin/policytool
-@unexec rm -f %D/java/jre/bin/tnameserv
-@unexec rm -f %D/java/jre/bin/rmiregistry
-@unexec rm -f %D/java/jre/bin/rmid
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:46 skrll Exp $
+@unexec ${RM} -f %D/java/jre/bin/java
+@unexec ${RM} -f %D/java/jre/bin/keytool
+@unexec ${RM} -f %D/java/jre/bin/policytool
+@unexec ${RM} -f %D/java/jre/bin/tnameserv
+@unexec ${RM} -f %D/java/jre/bin/rmiregistry
+@unexec ${RM} -f %D/java/jre/bin/rmid
java/jre/bin/ppc/green_threads/java
java/jre/bin/ppc/green_threads/keytool
java/jre/bin/ppc/green_threads/policytool
diff --git a/lang/eieio/PLIST b/lang/eieio/PLIST
index 76a4c36b87c..41fece602f9 100644
--- a/lang/eieio/PLIST
+++ b/lang/eieio/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:23:04 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:46 skrll Exp $
${LISPDIR}/eieio.el
${LISPDIR}/eieio.elc
${LISPDIR}/eieio-comp.el
@@ -16,4 +16,4 @@ ${LISPDIR}/compare-strings.elc
@unexec install-info --delete %D/info/eieio.info %D/info/dir
info/eieio.info
@exec install-info %D/info/eieio.info %D/info/dir
-@unexec rmdir %D/${LISPDIR} 2>/dev/null || true
+@unexec ${RMDIR} %D/${LISPDIR} 2>/dev/null || true
diff --git a/lang/guile/PLIST b/lang/guile/PLIST
index ba500ea6a3e..ab56df6d8e2 100644
--- a/lang/guile/PLIST
+++ b/lang/guile/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:23:32 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:46 skrll Exp $
bin/guile
bin/guile-config
bin/guile-doc-snarf
@@ -148,4 +148,4 @@ share/guile/guile-procedures.txt
@dirrm include/libguile
@dirrm include/guile-readline
@dirrm include/guile
-@unexec rmdir %D/share/aclocal 2>/dev/null || true
+@unexec ${RMDIR} %D/share/aclocal 2>/dev/null || true
diff --git a/lang/icon/PLIST b/lang/icon/PLIST
index c680bc06592..bb360c91823 100644
--- a/lang/icon/PLIST
+++ b/lang/icon/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:23:36 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:46 skrll Exp $
bin/iconc
bin/icont
bin/iconx
@@ -834,4 +834,4 @@ share/doc/icon/lb80.jpg
share/doc/icon/relnotes.htm
share/doc/icon/wwwcube.gif
@dirrm share/doc/icon
-@unexec rmdir %D/lib/icon 2>/dev/null || true
+@unexec ${RMDIR} %D/lib/icon 2>/dev/null || true
diff --git a/lang/perl5/PLIST b/lang/perl5/PLIST
index c2d3d9cea7d..e0b89418900 100644
--- a/lang/perl5/PLIST
+++ b/lang/perl5/PLIST
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:24:30 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:46 skrll Exp $
share/mk/bsd.perl.mk
-@unexec rm -f %D/${PERL5_ARCHLIB}/perllocal.pod
+@unexec ${RM} -f %D/${PERL5_ARCHLIB}/perllocal.pod
diff --git a/lang/sun-jre13/PLIST b/lang/sun-jre13/PLIST
index edf70dcecb7..70fbe2454f0 100644
--- a/lang/sun-jre13/PLIST
+++ b/lang/sun-jre13/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:25:10 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:47 skrll Exp $
bin/java
jre/CHANGES
jre/COPYRIGHT
@@ -144,8 +144,8 @@ jre/man/man1/rmiregistry.1
jre/man/man1/tnameserv.1
jre/plugin/i386/ns4/javaplugin.so
jre/plugin/i386/ns600/libjavaplugin_oji.so
-@exec mkdir -p %D/jre/lib/applet
-@exec mkdir -p %D/jre/lib/ext
+@exec ${MKDIR} -p %D/jre/lib/applet
+@exec ${MKDIR} -p %D/jre/lib/ext
@dirrm jre/plugin/i386/ns600
@dirrm jre/plugin/i386/ns4
@dirrm jre/plugin/i386
diff --git a/lang/tcl-expect/PLIST b/lang/tcl-expect/PLIST
index 5cec67fef15..9efc3245ba1 100644
--- a/lang/tcl-expect/PLIST
+++ b/lang/tcl-expect/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/01/03 13:50:15 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/02/15 10:12:47 skrll Exp $
bin/expect
include/expect.h
include/expect_comm.h
@@ -43,6 +43,6 @@ share/examples/tcl/expect/xkibitz
share/examples/tcl/expect/xkibitz.1
share/examples/tcl/expect/xpstat
@dirrm lib/tcl/expect5.33
-@unexec rmdir %D/lib/tcl 2>/dev/null || true
+@unexec ${RMDIR} %D/lib/tcl 2>/dev/null || true
@dirrm share/examples/tcl/expect
-@unexec rmdir %D/share/examples/tcl 2>/dev/null || true
+@unexec ${RMDIR} %D/share/examples/tcl 2>/dev/null || true
diff --git a/mail/exim/PLIST b/mail/exim/PLIST
index f952e5d7ac5..b52a2dbc275 100644
--- a/mail/exim/PLIST
+++ b/mail/exim/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:59:57 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:47 skrll Exp $
etc/exim/configure
etc/exim/mailer.conf.exim
etc/rc.d/exim
@@ -16,5 +16,5 @@ sbin/exinext
sbin/exiqsumm
sbin/exiwhat
man/man8/exim.8
-@unexec rmdir /var/log/exim 2>/dev/null || true
+@unexec ${RMDIR} /var/log/exim 2>/dev/null || true
@dirrm etc/exim
diff --git a/mail/mailwrapper/PLIST b/mail/mailwrapper/PLIST
index f70d421246d..c1e3efdb7e1 100644
--- a/mail/mailwrapper/PLIST
+++ b/mail/mailwrapper/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:00:25 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:47 skrll Exp $
etc/mailer.conf.default
@exec test -e /etc/mailer.conf || ln -sf %F /etc/mailer.conf
man/cat5/mailer.conf.0.gz
@@ -6,13 +6,13 @@ man/cat8/mailwrapper.0.gz
man/man5/mailer.conf.5.gz
man/man8/mailwrapper.8.gz
sbin/mailwrapper
-@exec mkdir -p /usr/libexec/sendmail
+@exec ${MKDIR} -p /usr/libexec/sendmail
@exec mv -i /usr/sbin/sendmail /usr/libexec/sendmail </dev/null 2>/dev/null || true
@exec ln -fs %D/sbin/mailwrapper /usr/bin/mailq
@exec ln -fs %D/sbin/mailwrapper /usr/bin/newaliases
@exec ln -fs %D/sbin/mailwrapper /usr/sbin/sendmail
-@unexec rm /usr/bin/mailq /usr/bin/newaliases /usr/sbin/sendmail
+@unexec ${RM} /usr/bin/mailq /usr/bin/newaliases /usr/sbin/sendmail
@unexec mv /usr/libexec/sendmail/sendmail /usr/sbin/sendmail
@unexec ln /usr/sbin/sendmail /usr/bin/mailq
@unexec ln /usr/sbin/sendmail /usr/bin/newaliases
-@unexec rmdir /usr/libexec/sendmail
+@unexec ${RMDIR} /usr/libexec/sendmail
diff --git a/mail/nmh/PLIST b/mail/nmh/PLIST
index 5bea85be5c8..a4fa0de6cb4 100644
--- a/mail/nmh/PLIST
+++ b/mail/nmh/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:00:42 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:47 skrll Exp $
bin/ali
bin/anno
bin/burst
@@ -148,4 +148,4 @@ share/doc/nmh/README
share/doc/nmh/TODO
@dirrm libexec/nmh
@dirrm share/doc/nmh
-@unexec rmdir %D/etc/nmh 2>/dev/null || true
+@unexec ${RMDIR} %D/etc/nmh 2>/dev/null || true
diff --git a/mail/pine/PLIST b/mail/pine/PLIST
index ac890e36e33..9ec251b7721 100644
--- a/mail/pine/PLIST
+++ b/mail/pine/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/01/13 20:43:42 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/02/15 10:12:48 skrll Exp $
bin/pgpdecode
bin/pgpencrypt
bin/pgpsign
@@ -17,7 +17,7 @@ share/pine/contrib/utils/sendit.sh
share/pine/contrib/utils/sendtoall
share/pine/contrib/utils/txtcc.sh
share/examples/pine/dot.pinerc.pgp
-@unexec if cmp -s %D/etc/pine.conf %D/share/examples/pine/pine.conf; then rm -f %D/etc/pine.conf; fi
+@unexec if cmp -s %D/etc/pine.conf %D/share/examples/pine/pine.conf; then ${RM} -f %D/etc/pine.conf; fi
share/examples/pine/pine.conf
@exec if [ ! -f %D/etc/pine.conf ]; then cp -p %D/share/examples/pine/pine.conf %D/etc/; fi
share/examples/pine/pine.conf.fixed
diff --git a/mail/popa3d/PLIST b/mail/popa3d/PLIST
index 9a684af2f02..84165a4e0f4 100644
--- a/mail/popa3d/PLIST
+++ b/mail/popa3d/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2001/12/23 23:03:23 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/02/15 10:12:48 skrll Exp $
libexec/popa3d
man/man8/popa3d.8
share/doc/popa3d/DESIGN
@@ -6,5 +6,5 @@ share/doc/popa3d/INSTALL
share/doc/popa3d/LICENSE
@dirrm share/doc/popa3d
@comment empty dir to chroot to
-@exec mkdir -p %D/share/empty
+@exec ${MKDIR} -p %D/share/empty
@dirrm share/empty
diff --git a/mail/postfix/PLIST b/mail/postfix/PLIST
index f28fb7d7390..b7ca4aa2587 100644
--- a/mail/postfix/PLIST
+++ b/mail/postfix/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:01:06 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:48 skrll Exp $
etc/mailer.conf.postfix
libexec/postfix/bounce
libexec/postfix/cleanup
@@ -104,9 +104,9 @@ man/man8/trivial-rewrite.8
@dirrm share/postfix
@dirrm share/doc/postfix
@dirrm libexec/postfix
-@exec mkdir -p /etc/postfix
+@exec ${MKDIR} -p /etc/postfix
@exec if [ ! -f /etc/postfix/main.cf ]; then cp %D/share/postfix/main.cf /etc/postfix ; fi
@exec if [ ! -f /etc/postfix/master.cf ]; then cp %D/share/postfix/master.cf /etc/postfix ; fi
-@exec if [ ! -d /var/spool/postfix ]; then mkdir /var/spool/postfix; chmod 755 /var/spool/postfix ; fi
+@exec if [ ! -d /var/spool/postfix ]; then ${MKDIR} /var/spool/postfix; ${CHMOD} 755 /var/spool/postfix ; fi
@exec ln -sf %D/share/postfix/postfix-script /etc/postfix
-@unexec rm -f /etc/postfix/postfix-script
+@unexec ${RM} -f /etc/postfix/postfix-script
diff --git a/mail/sendmail-current/PLIST.common b/mail/sendmail-current/PLIST.common
index a2a8efbab2f..46bd72b0fe7 100644
--- a/mail/sendmail-current/PLIST.common
+++ b/mail/sendmail-current/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.1 2001/11/01 01:04:12 zuntum Exp $
+@comment $NetBSD: PLIST.common,v 1.2 2002/02/15 10:12:48 skrll Exp $
bin/newaliases
bin/mailq
bin/hoststat
@@ -187,5 +187,5 @@ share/sendmail/siteconfig/uucp.ucbvax.m4
@dirrm share/sendmail/hack
@dirrm share/sendmail/feature
@dirrm share/sendmail/domain
-@unexec rm -rf %D/share/sendmail/cf
+@unexec ${RM} -rf %D/share/sendmail/cf
@dirrm share/sendmail
diff --git a/mail/sendmail/PLIST b/mail/sendmail/PLIST
index 33c47f834d0..cfd64a90c5d 100644
--- a/mail/sendmail/PLIST
+++ b/mail/sendmail/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:01:19 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:48 skrll Exp $
bin/newaliases
bin/mailq
bin/hoststat
@@ -187,5 +187,5 @@ share/sendmail/siteconfig/uucp.ucbvax.m4
@dirrm share/sendmail/hack
@dirrm share/sendmail/feature
@dirrm share/sendmail/domain
-@unexec rm -rf %D/share/sendmail/cf
+@unexec ${RM} -rf %D/share/sendmail/cf
@dirrm share/sendmail
diff --git a/mail/sendmail88/PLIST b/mail/sendmail88/PLIST
index 42f4e605cf4..df85285a625 100644
--- a/mail/sendmail88/PLIST
+++ b/mail/sendmail88/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:01:21 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:49 skrll Exp $
etc/mailer.conf.sendmail
libexec/sendmail/sendmail
libexec/sendmail/smrsh
@@ -110,5 +110,5 @@ share/sendmail/README
@dirrm share/sendmail/hack
@dirrm share/sendmail/feature
@dirrm share/sendmail/domain
-@unexec rm -rf %D/share/sendmail/cf
+@unexec ${RM} -rf %D/share/sendmail/cf
@dirrm share/sendmail
diff --git a/mail/vm/PLIST.emacs b/mail/vm/PLIST.emacs
index 30671855c83..073c52a1036 100644
--- a/mail/vm/PLIST.emacs
+++ b/mail/vm/PLIST.emacs
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.emacs,v 1.2 2001/12/11 15:49:26 wiz Exp $
+@comment $NetBSD: PLIST.emacs,v 1.3 2002/02/15 10:12:49 skrll Exp $
bin/base64-decode
bin/base64-encode
bin/qp-decode
@@ -178,4 +178,4 @@ share/emacs/site-lisp/vm/vm.el
share/emacs/site-lisp/vm/vm.elc
@dirrm share/emacs/site-lisp/vm/pixmaps
@dirrm share/emacs/site-lisp/vm
-@unexec rmdir %D/share/emacs/site-lisp 2>/dev/null || true
+@unexec ${RMDIR} %D/share/emacs/site-lisp 2>/dev/null || true
diff --git a/mail/xmailbox/PLIST b/mail/xmailbox/PLIST
index cda817e7afe..f288191e498 100644
--- a/mail/xmailbox/PLIST
+++ b/mail/xmailbox/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:01:47 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:49 skrll Exp $
bin/xmailbox
lib/X11/app-defaults/XMailbox
share/xmailbox/0xmail1.xpm
@@ -10,5 +10,5 @@ share/xmailbox/5xmail1.xpm
share/xmailbox/xmail1.xpm
share/xmailbox/xnomail1.xpm
man/cat1/xmailbox.0
-@exec mkdir -p %D/share/xmailbox
-@unexec rm -rf %D/share/xmailbox
+@exec ${MKDIR} -p %D/share/xmailbox
+@unexec ${RM} -rf %D/share/xmailbox
diff --git a/math/aribas/PLIST b/math/aribas/PLIST
index 1cda44820ee..76508cc724c 100644
--- a/math/aribas/PLIST
+++ b/math/aribas/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:12:07 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:49 skrll Exp $
bin/aribas
share/doc/aribas/aribas.doc
share/doc/aribas/aribas.tut
@@ -7,6 +7,6 @@ share/examples/aribas/README
share/examples/aribas/factor.ari
share/examples/aribas/pi.ari
share/examples/aribas/queens.ari
-@unexec rmdir %D/share/emacs/site-lisp 2>/dev/null || true
+@unexec ${RMDIR} %D/share/emacs/site-lisp 2>/dev/null || true
@dirrm share/examples/aribas
@dirrm share/doc/aribas
diff --git a/math/cassowary/PLIST b/math/cassowary/PLIST
index 727444544fe..d21dc45c7c1 100644
--- a/math/cassowary/PLIST
+++ b/math/cassowary/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:12:13 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:50 skrll Exp $
bin/cassowary-config
include/Cl.h
include/ClC.h
@@ -61,5 +61,5 @@ share/doc/cassowary/cassowary-tr.ps.gz
@dirrm lib/cassowary/tests
@dirrm lib/cassowary
@dirrm include/cassowary
-@unexec rmdir %D/lib/guile/site 2>/dev/null || true
-@unexec rmdir %D/lib/guile 2>/dev/null || true
+@unexec ${RMDIR} %D/lib/guile/site 2>/dev/null || true
+@unexec ${RMDIR} %D/lib/guile 2>/dev/null || true
diff --git a/math/gnumeric0/PLIST b/math/gnumeric0/PLIST
index 03bd660b010..088d6903bf7 100644
--- a/math/gnumeric0/PLIST
+++ b/math/gnumeric0/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/01/25 01:39:53 rh Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/02/15 10:12:50 skrll Exp $
bin/gnumeric
lib/gnumeric/${PKGVERSION}-bonobo/plugins/applix/applix.a
lib/gnumeric/${PKGVERSION}-bonobo/plugins/applix/applix.la
@@ -786,4 +786,4 @@ share/pixmaps/gnumeric/top_border
@dirrm lib/gnumeric/${PKGVERSION}-bonobo/plugins
@dirrm lib/gnumeric/${PKGVERSION}-bonobo
@dirrm lib/gnumeric
-@unexec rmdir %D/share/mc/templates >/dev/null 2>&1 || true
+@unexec ${RMDIR} %D/share/mc/templates >/dev/null 2>&1 || true
diff --git a/math/guppi/PLIST b/math/guppi/PLIST
index 7d0938e1dcf..a5d19618301 100644
--- a/math/guppi/PLIST
+++ b/math/guppi/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2001/11/14 08:43:17 tron Exp $
+@comment $NetBSD: PLIST,v 1.6 2002/02/15 10:12:50 skrll Exp $
bin/gnome-guile-repl
bin/gnome-python-repl
bin/guppi-gnumeric
@@ -269,7 +269,7 @@ share/gnome/help/guppi/C/docbook.css
share/gnome/help/guppi/C/guppi.html
share/gnome/help/guppi/C/ln14.html
share/gnome/help/guppi/C/topic.dat
-@exec mkdir -p %D/share/gnome/help/guppi/C/images
+@exec ${MKDIR} -p %D/share/gnome/help/guppi/C/images
share/guppi/glade/guppi-gnumeric-format-guru.glade
share/guppi/glade/view-properties.glade
share/guppi/scripts/guppi-gnumeric-plots.xml
@@ -422,4 +422,4 @@ share/pixmaps/guppi/surface.xpm
@dirrm include/libguppitank
@dirrm include/libguppi
@exec test %D = ${LOCALBASE} || ln -s %D/share/aclocal/libguppi.m4 ${LOCALBASE}/share/aclocal/libguppi.m4
-@unexec test %D = ${LOCALBASE} || rm -f ${LOCALBASE}/share/aclocal/libguppi.m4
+@unexec test %D = ${LOCALBASE} || ${RM} -f ${LOCALBASE}/share/aclocal/libguppi.m4
diff --git a/math/octave/PLIST b/math/octave/PLIST
index 2320f12295c..88284b1e665 100644
--- a/math/octave/PLIST
+++ b/math/octave/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:33:45 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:51 skrll Exp $
bin/octave
bin/octave-bug
bin/mkoctfile
@@ -208,7 +208,7 @@ include/${PKGNAME}/defaults.h
include/${PKGNAME}/oct-conf.h
include/${PKGNAME}/oct-gperf.h
@exec ln -s ${PKGNAME} %D/include/octave
-@unexec rm -f %D/include/octave
+@unexec ${RM} -f %D/include/octave
@unexec install-info --delete %D/info/octave.info %D/info/dir
@unexec install-info --delete %D/info/liboctave.info %D/info/dir
info/octave.info
@@ -234,12 +234,12 @@ lib/${PKGNAME}/libcruft.a
lib/${PKGNAME}/liboctave.a
lib/${PKGNAME}/liboctinterp.a
@exec ln -s ${PKGNAME} %D/lib/octave
-@unexec rm -f %D/lib/octave
+@unexec ${RM} -f %D/lib/octave
libexec/octave/2.0.16/exec/${MACHINE_GNU_ARCH}-${LOWER_VENDOR}-${LOWER_OPSYS}/info-emacs-info
libexec/octave/2.0.16/exec/${MACHINE_GNU_ARCH}-${LOWER_VENDOR}-${LOWER_OPSYS}/info-emacs-octave-help
-@exec mkdir -p %D/libexec/octave/2.0.16/oct/${MACHINE_GNU_ARCH}-${LOWER_VENDOR}-${LOWER_OPSYS}
-@exec mkdir -p %D/libexec/octave/site/exec/${MACHINE_GNU_ARCH}-${LOWER_VENDOR}-${LOWER_OPSYS}
-@exec mkdir -p %D/libexec/octave/site/oct/${MACHINE_GNU_ARCH}-${LOWER_VENDOR}-${LOWER_OPSYS}
+@exec ${MKDIR} -p %D/libexec/octave/2.0.16/oct/${MACHINE_GNU_ARCH}-${LOWER_VENDOR}-${LOWER_OPSYS}
+@exec ${MKDIR} -p %D/libexec/octave/site/exec/${MACHINE_GNU_ARCH}-${LOWER_VENDOR}-${LOWER_OPSYS}
+@exec ${MKDIR} -p %D/libexec/octave/site/oct/${MACHINE_GNU_ARCH}-${LOWER_VENDOR}-${LOWER_OPSYS}
libexec/octave/ls-R
man/man1/octave.1
share/octave/2.0.16/doc/Octave-FAQ.ps
diff --git a/math/xlife/PLIST b/math/xlife/PLIST
index 160c3f5337d..49bdfd349fa 100644
--- a/math/xlife/PLIST
+++ b/math/xlife/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2001/12/31 21:32:56 fredb Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:51 skrll Exp $
bin/collect
bin/lifeconv
bin/lifesearch
@@ -232,4 +232,4 @@ share/xlife/wireworld/test.l
@dirrm share/xlife/life
@dirrm share/xlife/misc
@dirrm share/xlife/wireworld
-@unexec rmdir %D/share/xlife || true
+@unexec ${RMDIR} %D/share/xlife || true
diff --git a/math/yacas/PLIST b/math/yacas/PLIST
index 3e730671595..ba2b8098067 100644
--- a/math/yacas/PLIST
+++ b/math/yacas/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2001/12/19 01:09:25 dmcmahill Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/02/15 10:12:51 skrll Exp $
bin/yacas
bin/yacas_client
share/emacs/site-lisp/yacas.el
@@ -205,5 +205,5 @@ share/yacas/yacasinit.ys
@dirrm share/yacas/array.rep
@dirrm share/yacas/addons
@dirrm share/yacas
-@unexec rmdir %D/share/emacs/site-lisp 2>/dev/null || true
-@unexec rmdir %D/share/emacs 2>/dev/null || true
+@unexec ${RMDIR} %D/share/emacs/site-lisp 2>/dev/null || true
+@unexec ${RMDIR} %D/share/emacs 2>/dev/null || true
diff --git a/misc/gnome-utils/PLIST b/misc/gnome-utils/PLIST
index 1564d6a0694..26584ae9dd6 100644
--- a/misc/gnome-utils/PLIST
+++ b/misc/gnome-utils/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/05 22:39:05 skrll Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/02/15 10:12:51 skrll Exp $
bin/gcalc
bin/gcharmap
bin/gcolorsel
@@ -841,7 +841,7 @@ share/stripchart/stripchart.params
@dirrm share/gnome/help/gsearchtool/C
@dirrm share/gnome/help/gsearchtool
@dirrm share/gnome/help/gnome-exe-handler/C/stylesheet-images
-@exec mkdir -p %D/share/gnome/help/gnome-exe-handler/C/figures
+@exec ${MKDIR} -p %D/share/gnome/help/gnome-exe-handler/C/figures
@dirrm share/gnome/help/gnome-exe-handler/C/figures
@dirrm share/gnome/help/gnome-exe-handler/C
@dirrm share/gnome/help/gnome-exe-handler
diff --git a/misc/hitchhiker/PLIST b/misc/hitchhiker/PLIST
index e691b3ccdd5..ddd27147d69 100644
--- a/misc/hitchhiker/PLIST
+++ b/misc/hitchhiker/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:28:19 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:52 skrll Exp $
bin/hh2000
share/gnome/apps/Applications/hh2000.desktop
share/hh2000/data/asteroids.csv
@@ -50,7 +50,7 @@ share/pixmaps/hh2000/star.xpm
share/pixmaps/hh2000/step_forward.xpm
share/pixmaps/hh2000/step_reverse.xpm
share/pixmaps/hh2000icon.png
-@unexec rmdir -p share/gnome/apps/Applications 2> /dev/null || true
+@unexec ${RMDIR} -p share/gnome/apps/Applications 2> /dev/null || true
@dirrm share/pixmaps/hh2000
@dirrm share/hh2000/scripts
@dirrm share/hh2000/maps
diff --git a/misc/jitterbug/PLIST b/misc/jitterbug/PLIST
index f7d285095ed..1c7b345c09f 100644
--- a/misc/jitterbug/PLIST
+++ b/misc/jitterbug/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/05 22:39:05 skrll Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/02/15 10:12:52 skrll Exp $
@JB_USER@/config/footer.html
@exec if [ ! -d %D/@JB_DATADIR@ ]; then ${MKDIR} -p %D/@JB_DATADIR@; fi
@exec if [ ! -f %D/@JB_DATADIR@/footer.html ]; then /bin/cp -p %D/%F %D/@JB_DATADIR@/footer.html; fi
@@ -40,7 +40,7 @@ etc/jitterbug/httpd.conf.add
@dirrm @JB_USER@/@JB_PACKAGE@/bug_tracking
@dirrm @JB_USER@/@JB_PACKAGE@
@JB_USER@/etc/jitterbug.auth
-@exec /usr/sbin/chown -R @JB_USER@ %D/@JB_USER@
+@exec ${CHOWN} -R @JB_USER@ %D/@JB_USER@
@exec /usr/bin/chgrp -R @JB_GROUP@ %D/@JB_USER@
@dirrm @JB_USER@/config
@dirrm @JB_USER@/etc
diff --git a/misc/kdrill/PLIST b/misc/kdrill/PLIST
index b348365b2c2..eac25ae2184 100644
--- a/misc/kdrill/PLIST
+++ b/misc/kdrill/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/02/07 13:49:06 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:52 skrll Exp $
bin/kdrill
lib/X11/app-defaults/KDrill
man/cat1/kdrill.0
@@ -7,4 +7,4 @@ share/kdrill/hiraplus.edic.gz
share/kdrill/kata.edic.gz
share/kdrill/kataplus.edic.gz
share/kdrill/fullkatahira.edic.gz
-@unexec rmdir %D/share/kdrill 2>/dev/null || true
+@unexec ${RMDIR} %D/share/kdrill 2>/dev/null || true
diff --git a/misc/screen/PLIST b/misc/screen/PLIST
index e9be23e0e21..56a22c25e05 100644
--- a/misc/screen/PLIST
+++ b/misc/screen/PLIST
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:29:31 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:52 skrll Exp $
bin/screen
bin/${DISTNAME}
man/man1/screen.1
@unexec install-info --delete %D/info/screen.info %D/info/dir
info/screen.info
@exec install-info %D/info/screen.info %D/info/dir
-@unexec if [ -f %D/bin/screen.old ]; then rm -f %D/bin/screen.old ; fi
+@unexec if [ -f %D/bin/screen.old ]; then ${RM} -f %D/bin/screen.old ; fi
share/examples/screen/screenrc
@dirrm share/examples/screen
diff --git a/misc/screen/PLIST.SunOS b/misc/screen/PLIST.SunOS
index 2d08ed4b818..ee762b34933 100644
--- a/misc/screen/PLIST.SunOS
+++ b/misc/screen/PLIST.SunOS
@@ -1,11 +1,11 @@
-@comment $NetBSD: PLIST.SunOS,v 1.1 2001/11/01 01:33:18 zuntum Exp $
+@comment $NetBSD: PLIST.SunOS,v 1.2 2002/02/15 10:12:52 skrll Exp $
bin/screen
bin/${DISTNAME}
man/man1/screen.1
@unexec install-info --delete %D/info/screen.info %D/info/dir
info/screen.info
@exec install-info %D/info/screen.info %D/info/dir
-@unexec if [ -f %D/bin/screen.old ]; then rm -f %D/bin/screen.old ; fi
+@unexec if [ -f %D/bin/screen.old ]; then ${RM} -f %D/bin/screen.old ; fi
share/examples/screen/screenrc
@dirrm share/examples/screen
share/lib/terminfo/s/screen
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index c610c8feeb5..23f8fef56b9 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.926 2002/02/13 23:02:14 hubertf Exp $
+# $NetBSD: bsd.pkg.mk,v 1.927 2002/02/15 10:12:52 skrll Exp $
#
# This file is in the public domain.
#
@@ -516,6 +516,7 @@ PLIST_SUBST+= OPSYS=${OPSYS} \
CHOWN=${CHOWN:Q} \
MKDIR=${MKDIR:Q} \
RMDIR=${RMDIR:Q} \
+ RM=${RM:Q} \
TRUE=${TRUE:Q} \
QMAILDIR=${QMAILDIR}
.if defined(PERL5_SITELIB)
@@ -3674,7 +3675,7 @@ PERL5_PACKLIST_FILES= ( ${CAT} ${PERL5_PACKLIST}; for f in ${PERL5_PACKLIST}; do
| ${SORT} -u
PERL5_PACKLIST_DIRS= ( ${CAT} ${PERL5_PACKLIST}; for f in ${PERL5_PACKLIST}; do [ ! -f $$f ] || ${ECHO} $$f; done ) \
| ${SED} -e "s,[ ].*,," -e "s,/\./,/,g" -e "s,${PREFIX}/,," \
- -e "s,^,@unexec ${RMDIR} -p %D/," \
+ -e "s,^,@unexec \${RMDIR} -p %D/," \
-e "s,/[^/]*$$, 2>/dev/null || true," \
| ${SORT} -ur
PERL5_GENERATE_PLIST= ${PERL5_COMMENT}; \
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
diff --git a/news/inn/PLIST b/news/inn/PLIST
index 326afb65d5f..cf5231ff295 100644
--- a/news/inn/PLIST
+++ b/news/inn/PLIST
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 21:03:42 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:55 skrll Exp $
bin/inews
-@exec mkdir -p %D/etc/nntp
-@unexec rm -rf %D/etc/nntp
+@exec ${MKDIR} -p %D/etc/nntp
+@unexec ${RM} -rf %D/etc/nntp
etc/rc.d/innd
inn/bin/actmerge
inn/bin/actsync
diff --git a/news/nntpcache/PLIST b/news/nntpcache/PLIST
index 226ae2b3b13..37e01ec6667 100644
--- a/news/nntpcache/PLIST
+++ b/news/nntpcache/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 21:03:47 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:56 skrll Exp $
etc/nntpcache/VERSION
etc/nntpcache/innreport.conf-dist
etc/nntpcache/innreport.pl
@@ -13,10 +13,10 @@ etc/nntpcache/spam.filter
etc/nntpcache/http/index.html
etc/nntpcache/http/moose.gif
etc/nntpcache/http/nntpcache.jpg
-@exec mkdir -p %D/etc/nntpcache/http/innreport/pics
-@exec chown -R news:news %D/etc/nntpcache
-@exec chmod 700 %D/etc/nntpcache
-@unexec rmdir -p %D/etc/nntpcache/http/innreport/pics 2>/dev/null || true
+@exec ${MKDIR} -p %D/etc/nntpcache/http/innreport/pics
+@exec ${CHOWN} -R news:news %D/etc/nntpcache
+@exec ${CHMOD} 700 %D/etc/nntpcache
+@unexec ${RMDIR} -p %D/etc/nntpcache/http/innreport/pics 2>/dev/null || true
etc/rc.d/nntpcached
sbin/innreport.sh
sbin/newshound
@@ -26,12 +26,12 @@ libexec/nntpcache-gdb.sh
libexec/nntpcache.gdb
man/man8/newshound.8
man/man8/nntpcached.8
-@unexec rmdir etc/nntpcache 2>/dev/null || true
-@exec mkdir -p /var/spool/nntpcache
+@unexec ${RMDIR} etc/nntpcache 2>/dev/null || true
+@exec ${MKDIR} -p /var/spool/nntpcache
@exec cp %D/etc/nntpcache/VERSION /var/spool/nntpcache/VERSION
-@exec chown -R news:news /var/spool/nntpcache
-@exec chmod 700 /var/spool/nntpcache
-@unexec rm -rf /var/spool/nntpcache
+@exec ${CHOWN} -R news:news /var/spool/nntpcache
+@exec ${CHMOD} 700 /var/spool/nntpcache
+@unexec ${RM} -rf /var/spool/nntpcache
share/doc/nntpcache/INSTALL
share/doc/nntpcache/README
share/doc/nntpcache/FAQ
diff --git a/news/nntpclnt/PLIST b/news/nntpclnt/PLIST
index d8e808f6220..f8ab54d21e3 100644
--- a/news/nntpclnt/PLIST
+++ b/news/nntpclnt/PLIST
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 21:03:48 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:56 skrll Exp $
bin/inews
include/nntp.h
lib/libnntpclnt.a
-@exec mkdir -p %D/etc/nntp
-@unexec rm -f %D/etc/nntp/domainname
-@unexec rm -f %D/etc/nntp/server
-@unexec rm -f %D/etc/nntp/server.auth
+@exec ${MKDIR} -p %D/etc/nntp
+@unexec ${RM} -f %D/etc/nntp/domainname
+@unexec ${RM} -f %D/etc/nntp/server
+@unexec ${RM} -f %D/etc/nntp/server.auth
@dirrm etc/nntp
man/man3/nntpclnt.3.gz
diff --git a/print/acroread/PLIST.post b/print/acroread/PLIST.post
index 85caa14ad5c..cdb43e7df8c 100644
--- a/print/acroread/PLIST.post
+++ b/print/acroread/PLIST.post
@@ -1,11 +1,11 @@
-@comment $NetBSD: PLIST.post,v 1.1 2001/10/31 23:31:21 zuntum Exp $
-@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
+@comment $NetBSD: PLIST.post,v 1.2 2002/02/15 10:12:56 skrll Exp $
+@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 ln -sf ../../Resource/Font %D/Acrobat4/Reader/${PLATFORM}/fonts
-@unexec rm -f %D/Acrobat4/Reader/${PLATFORM}/fonts
+@unexec ${RM} -f %D/Acrobat4/Reader/${PLATFORM}/fonts
@exec ln -sf ../res %D/Acrobat4/Reader/${PLATFORM}/res
-@unexec rm -f %D/Acrobat4/Reader/${PLATFORM}/res
+@unexec ${RM} -f %D/Acrobat4/Reader/${PLATFORM}/res
@dirrm Acrobat4/Browsers/${PLATFORM}
@dirrm Acrobat4/Browsers
@dirrm Acrobat4/Reader/res
diff --git a/print/acroread3/PLIST.post b/print/acroread3/PLIST.post
index 29aa9378a82..4359fd696fc 100644
--- a/print/acroread3/PLIST.post
+++ b/print/acroread3/PLIST.post
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST.post,v 1.1 2001/10/31 23:31:15 zuntum Exp $
+@comment $NetBSD: PLIST.post,v 1.2 2002/02/15 10:12:56 skrll Exp $
@exec ln -sf %D/Acrobat3/Reader/Fonts %D/Acrobat3/Reader/${PLATFORM}/fonts
-@unexec rm -f %D/Acrobat3/Reader/${PLATFORM}/fonts
+@unexec ${RM} -f %D/Acrobat3/Reader/${PLATFORM}/fonts
@exec ln -sf %D/Acrobat3/Reader/res %D/Acrobat3/Reader/${PLATFORM}/res
-@unexec rm -f %D/Acrobat3/Reader/${PLATFORM}/res
+@unexec ${RM} -f %D/Acrobat3/Reader/${PLATFORM}/res
@dirrm Acrobat3/Browsers/${PLATFORM}
@dirrm Acrobat3/Reader/${PLATFORM}/app-defaults
@dirrm Acrobat3/Reader/${PLATFORM}/bin
diff --git a/print/apsfilter/PLIST b/print/apsfilter/PLIST
index 1dcc777797b..6c3acc9a857 100644
--- a/print/apsfilter/PLIST
+++ b/print/apsfilter/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/01/10 06:53:02 martti Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/02/15 10:12:56 skrll Exp $
bin/aps2file
bin/apsfilter-bug
bin/apspreview
@@ -274,7 +274,7 @@ share/doc/apsfilter/README.TeX
share/doc/apsfilter/apsfilter4.gif
share/doc/apsfilter/handbook.html
share/doc/apsfilter/paper
-@unexec rmdir %D/etc/apsfilter 2>/dev/null || true
+@unexec ${RMDIR} %D/etc/apsfilter 2>/dev/null || true
@dirrm share/apsfilter/bin
@dirrm share/apsfilter/driver/ijs
@dirrm share/apsfilter/driver/hpdj
@@ -287,5 +287,5 @@ share/doc/apsfilter/paper
@dirrm share/apsfilter/driver
@dirrm share/apsfilter/setup
@dirrm share/apsfilter/template
-@unexec rmdir %D/share/apsfilter 2>/dev/null || true
+@unexec ${RMDIR} %D/share/apsfilter 2>/dev/null || true
@dirrm share/doc/apsfilter
diff --git a/print/pcps/PLIST b/print/pcps/PLIST
index 328804a7d60..3745c7d5893 100644
--- a/print/pcps/PLIST
+++ b/print/pcps/PLIST
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:27:56 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:57 skrll Exp $
bin/pcps
man/man1/pcps.1
share/doc/pcps/pcps.man
share/doc/pcps/license.doc
share/doc/pcps/register.doc
@dirrm share/doc/pcps
-@unexec rm -f %D/bin/pcps.cfg
+@unexec ${RM} -f %D/bin/pcps.cfg
diff --git a/print/stylewriter/PLIST b/print/stylewriter/PLIST
index e8934c6a135..4fdbc7a0803 100644
--- a/print/stylewriter/PLIST
+++ b/print/stylewriter/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:28:02 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:57 skrll Exp $
sbin/lpstyl
libexec/stylewriter/direct_stylpbm
libexec/stylewriter/direct_stylps
@@ -17,5 +17,5 @@ share/examples/stylewriter/styl.ppd
@dirrm share/examples/stylewriter
@dirrm share/doc/stylewriter
@dirrm libexec/stylewriter
-@exec mkdir -p /var/spool/lpd/stylps
-@unexec rmdir /var/spool/lpd/stylps 2>/dev/null || true
+@exec ${MKDIR} -p /var/spool/lpd/stylps
+@unexec ${RMDIR} /var/spool/lpd/stylps 2>/dev/null || true
diff --git a/print/teTeX-bin/PLIST b/print/teTeX-bin/PLIST
index 69b907b66ec..a549a2c83c1 100644
--- a/print/teTeX-bin/PLIST
+++ b/print/teTeX-bin/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:28:06 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:57 skrll Exp $
@comment There are three files in this package that teTeX-share installs
@comment and that teTeX-bin modifies. Take care of this:
lib/libkpathsea.a
@@ -350,4 +350,4 @@ bin/mktexmf
bin/mktexpk
@comment The next file is changed by various sub-pkgs (hugetex, ...)
@exec %D/bin/mktexlsr
-@unexec rm -f %D/share/texmf/ls-R
+@unexec ${RM} -f %D/share/texmf/ls-R
diff --git a/security/nessus-core/PLIST b/security/nessus-core/PLIST
index 9a91be4c42f..c46fa003895 100644
--- a/security/nessus-core/PLIST
+++ b/security/nessus-core/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/05 22:39:07 skrll Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/02/15 10:12:57 skrll Exp $
bin/nessus
include/nessus/config.h
include/nessus/includes.h
@@ -15,9 +15,9 @@ man/man8/nessusd.8
sbin/nessus-adduser
sbin/nessusd
@exec ${MKDIR} -p %D/lib/nessus/reports
-@unexec /bin/rmdir %D/lib/nessus/reports 2>/dev/null || true
-@unexec /bin/rmdir %D/lib/nessus 2>/dev/null || true
+@unexec ${RMDIR} %D/lib/nessus/reports 2>/dev/null || true
+@unexec ${RMDIR} %D/lib/nessus 2>/dev/null || true
@exec ${MKDIR} -p %D/etc/nessus
-@unexec /bin/rmdir %D/etc/nessus 2>/dev/null || true
+@unexec ${RMDIR} %D/etc/nessus 2>/dev/null || true
@exec ${MKDIR} -p /var/nessus
-@unexec /bin/rmdir /var/nessus 2>/dev/null || true
+@unexec ${RMDIR} /var/nessus 2>/dev/null || true
diff --git a/security/openssl/PLIST.common b/security/openssl/PLIST.common
index 6864075a71b..e724d9ba74d 100644
--- a/security/openssl/PLIST.common
+++ b/security/openssl/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.1 2001/11/01 01:22:31 zuntum Exp $
+@comment $NetBSD: PLIST.common,v 1.2 2002/02/15 10:12:58 skrll Exp $
bin/CA.pl
bin/CA.sh
bin/asn1parse
@@ -326,8 +326,8 @@ share/doc/openssl/ssl/SSL_shutdown.pod
share/doc/openssl/ssl/SSL_write.pod
share/doc/openssl/ssl/ssl.pod
share/doc/openssl/ssleay.txt
-@exec mkdir -p %D/certs %D/private
-@unexec rmdir %D/certs 2>/dev/null || true
+@exec ${MKDIR} -p %D/certs %D/private
+@unexec ${RMDIR} %D/certs 2>/dev/null || true
@dirrm include/openssl
@dirrm private
@dirrm share/doc/openssl/apps
diff --git a/security/priv/PLIST b/security/priv/PLIST
index f06b2b02767..8e2deec53f8 100644
--- a/security/priv/PLIST
+++ b/security/priv/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:17:34 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:58 skrll Exp $
bin/priv
man/man1/priv.1
-@exec mkdir -p @PRIV_CONF_DIR@/priv || true
-@unexec rmdir @PRIV_CONF_DIR@/priv || true
+@exec ${MKDIR} -p @PRIV_CONF_DIR@/priv || true
+@unexec ${RMDIR} @PRIV_CONF_DIR@/priv || true
diff --git a/security/ssh/PLIST b/security/ssh/PLIST
index 0181675cd93..c75792b517c 100644
--- a/security/ssh/PLIST
+++ b/security/ssh/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:17:53 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:58 skrll Exp $
bin/ssh
bin/ssh1
bin/scp
@@ -33,7 +33,7 @@ sbin/sshd
sbin/sshd1
share/examples/ssh/ssh_config
share/examples/ssh/sshd_config
-@exec if [ ! -d @SSH_CONF_DIR@ ]; then echo "Creating directory @SSH_CONF_DIR@ for ssh config files.." ; mkdir -p @SSH_CONF_DIR@; fi
+@exec if [ ! -d @SSH_CONF_DIR@ ]; then echo "Creating directory @SSH_CONF_DIR@ for ssh config files.." ; ${MKDIR} -p @SSH_CONF_DIR@; fi
@exec if [ ! -f @SSH_CONF_DIR@/ssh_config ]; then echo "Installing example ssh_config in @SSH_CONF_DIR@.." ; ${INSTALL} -c -o root -g ${ROOT_GROUP} -m 0644 %D/share/examples/ssh/ssh_config @SSH_CONF_DIR@; fi
@exec if [ ! -f @SSH_CONF_DIR@/sshd_config ]; then echo "Installing example sshd_config in @SSH_CONF_DIR@.." ; ${INSTALL} -c -o root -g ${ROOT_GROUP} -m 0644 %D/share/examples/ssh/sshd_config @SSH_CONF_DIR@; fi
@exec if [ ! -f @SSH_CONF_DIR@/ssh_host_key ]; then echo "Generating a secret host key in @SSH_CONF_DIR@.." ; %D/bin/ssh-keygen -N "" -f @SSH_CONF_DIR@/ssh_host_key; fi
diff --git a/shells/esh/PLIST b/shells/esh/PLIST
index 6f1c62cb27d..a9c17d58b73 100644
--- a/shells/esh/PLIST
+++ b/shells/esh/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:26:58 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:58 skrll Exp $
bin/esh
@unexec install-info --delete --info-dir=%D/info %D/info/esh.info
info/esh.info
@@ -18,8 +18,8 @@ share/examples/esh/test4.esh
share/examples/esh/test5.esh
share/examples/esh/test6.esh
share/examples/esh/test7.esh
-@unexec rmdir %D/share/emacs/site-lisp 2>/dev/null || true
-@unexec rmdir %D/share/emacs 2>/dev/null || true
-@unexec rmdir %D/share 2>/dev/null || true
+@unexec ${RMDIR} %D/share/emacs/site-lisp 2>/dev/null || true
+@unexec ${RMDIR} %D/share/emacs 2>/dev/null || true
+@unexec ${RMDIR} %D/share 2>/dev/null || true
@dirrm share/examples/esh
@dirrm share/doc/esh
diff --git a/shells/scsh/PLIST b/shells/scsh/PLIST
index 305f29c2d7b..4d586ee73e3 100644
--- a/shells/scsh/PLIST
+++ b/shells/scsh/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:27:00 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:58 skrll Exp $
bin/scsh
include/scsh.h
lib/scsh/big/array.scm
@@ -269,7 +269,7 @@ lib/scsh/emacs/comint.el
lib/scsh/emacs/jar-hacks.el
man/man1/scsh.1
@exec ln -fs %D/lib/scsh/doc %D/share/doc/scsh
-@unexec rm -f %D/share/doc/scsh
+@unexec ${RM} -f %D/share/doc/scsh
@dirrm lib/scsh/emacs
@dirrm lib/scsh/big
@dirrm lib/scsh/cig
diff --git a/sysutils/aperture/PLIST b/sysutils/aperture/PLIST
index 06704252b28..09af3c67f23 100644
--- a/sysutils/aperture/PLIST
+++ b/sysutils/aperture/PLIST
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:52:52 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:59 skrll Exp $
bin/memconfig
bin/xf86test
include/memrange.h
lkm/xf86.o
lkm/xf86_mod_install
-@unexec rm -f %D/lkm/xf86
+@unexec ${RM} -f %D/lkm/xf86
man/cat4/xf86.0
man/cat8/memconfig.0
man/man4/xf86.4
diff --git a/sysutils/daemontools/PLIST b/sysutils/daemontools/PLIST
index a8c69df2263..a3cded121e6 100644
--- a/sysutils/daemontools/PLIST
+++ b/sysutils/daemontools/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:53:02 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:59 skrll Exp $
bin/envdir
bin/envuidgid
bin/fghack
@@ -29,4 +29,4 @@ man/man8/tai64n.8
man/man8/tai64nlocal.8
share/examples/daemontools/svscan.sh.sample
@dirrm share/examples/daemontools
-@exec mkdir ${SERVICEDIR} || true
+@exec ${MKDIR} ${SERVICEDIR} || true
diff --git a/sysutils/rtty/PLIST b/sysutils/rtty/PLIST
index ea1ad6ee290..9cb3a2dcf4a 100644
--- a/sysutils/rtty/PLIST
+++ b/sysutils/rtty/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:53:41 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:59 skrll Exp $
rtty/bin/ttysrv
rtty/bin/rtty
rtty/bin/locbrok
@@ -9,11 +9,11 @@ rtty/bin/agelogs
rtty/bin/agelog
share/doc/rtty/README
@comment rtty/bin created above
-@exec mkdir %D/rtty/dev
-@exec mkdir %D/rtty/sock
-@exec mkdir %D/rtty/log
-@exec mkdir %D/rtty/pid
-@exec mkdir %D/rtty/opt
+@exec ${MKDIR} %D/rtty/dev
+@exec ${MKDIR} %D/rtty/sock
+@exec ${MKDIR} %D/rtty/log
+@exec ${MKDIR} %D/rtty/pid
+@exec ${MKDIR} %D/rtty/opt
@dirrm rtty/dev
@dirrm rtty/sock
@dirrm rtty/log
diff --git a/textproc/docbook/PLIST b/textproc/docbook/PLIST
index 945657bb1eb..e5a917c3e0e 100644
--- a/textproc/docbook/PLIST
+++ b/textproc/docbook/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:56:30 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:59 skrll Exp $
share/sgml/docbook/2.4.1/241chg.txt
share/sgml/docbook/2.4.1/announce.txt
share/sgml/docbook/2.4.1/calstbl.mod
@@ -69,4 +69,4 @@ share/sgml/docbook/4.1/readme.txt
@dirrm share/sgml/docbook/3.0
@dirrm share/sgml/docbook/2.4.1
@dirrm share/sgml/docbook
-@unexec rmdir %D/share/sgml 2>/dev/null || true
+@unexec ${RMDIR} %D/share/sgml 2>/dev/null || true
diff --git a/textproc/dsssl-docbook-modular/PLIST b/textproc/dsssl-docbook-modular/PLIST
index 77b96819c4c..a58dd4e027b 100644
--- a/textproc/dsssl-docbook-modular/PLIST
+++ b/textproc/dsssl-docbook-modular/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:56:32 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:59 skrll Exp $
share/sgml/docbook/dsssl/modular/BUGS
share/sgml/docbook/dsssl/modular/ChangeLog
share/sgml/docbook/dsssl/modular/README
@@ -743,4 +743,4 @@ share/sgml/docbook/dsssl/modular/test/xtables.sgm
@dirrm share/sgml/docbook/dsssl/modular/common
@dirrm share/sgml/docbook/dsssl/modular/bin
@dirrm share/sgml/docbook/dsssl/modular
-@unexec rmdir %D/share/sgml/docbook/dsssl 2>/dev/null || true
+@unexec ${RMDIR} %D/share/sgml/docbook/dsssl 2>/dev/null || true
diff --git a/textproc/html/PLIST b/textproc/html/PLIST
index 34369857b77..86db1383686 100644
--- a/textproc/html/PLIST
+++ b/textproc/html/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:56:52 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:13:00 skrll Exp $
share/sgml/html/2.0/ISOlat1.sgml
share/sgml/html/2.0/html-1.dtd
share/sgml/html/2.0/html-1s.dtd
@@ -20,4 +20,4 @@ share/sgml/html/catalog
@dirrm share/sgml/html/3.2
@dirrm share/sgml/html/2.0
@dirrm share/sgml/html
-@unexec rmdir %D/share/sgml 2>/dev/null || true
+@unexec ${RMDIR} %D/share/sgml 2>/dev/null || true
diff --git a/textproc/iso12083/PLIST b/textproc/iso12083/PLIST
index 76c5349c478..729e306067a 100644
--- a/textproc/iso12083/PLIST
+++ b/textproc/iso12083/PLIST
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:56:58 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:13:00 skrll Exp $
share/sgml/iso12083/article.dtd
share/sgml/iso12083/book.dtd
share/sgml/iso12083/maths.dtd
share/sgml/iso12083/serial.dtd
share/sgml/iso12083/catalog
@dirrm share/sgml/iso12083
-@unexec rmdir %D/share/sgml 2>/dev/null || true
+@unexec ${RMDIR} %D/share/sgml 2>/dev/null || true
diff --git a/textproc/iso8879/PLIST b/textproc/iso8879/PLIST
index 152ce35a256..99a49ebd4a1 100644
--- a/textproc/iso8879/PLIST
+++ b/textproc/iso8879/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:56:59 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:13:00 skrll Exp $
share/sgml/iso8879/ISOamsa
share/sgml/iso8879/ISOamsb
share/sgml/iso8879/ISOamsc
@@ -20,4 +20,4 @@ share/sgml/iso8879/ISOpub
share/sgml/iso8879/ISOtech
share/sgml/iso8879/catalog
@dirrm share/sgml/iso8879
-@unexec rmdir %D/share/sgml 2>/dev/null || true
+@unexec ${RMDIR} %D/share/sgml 2>/dev/null || true
diff --git a/textproc/scrollkeeper/PLIST b/textproc/scrollkeeper/PLIST
index 33e97913092..42b6d8d994c 100644
--- a/textproc/scrollkeeper/PLIST
+++ b/textproc/scrollkeeper/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/01/02 04:49:35 fredb Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/02/15 10:13:00 skrll Exp $
bin/scrollkeeper-config
bin/scrollkeeper-get-cl
bin/scrollkeeper-get-content-list
@@ -465,8 +465,8 @@ var/lib/scrollkeeper/bg_BG
@dirrm share/scrollkeeper/doc/scrollkeeper_manual
@dirrm share/scrollkeeper/doc
@dirrm share/scrollkeeper
-@unexec rmdir %D/share/omf/scrollkeeper || true
-@unexec rmdir %D/share/omf || true
+@unexec ${RMDIR} %D/share/omf/scrollkeeper || true
+@unexec ${RMDIR} %D/share/omf || true
@dirrm share/doc/scrollkeeper-0.2
-@unexec rm -rf %D/var/scrollkeeper || true
-@unexec rmdir %D/var || true
+@unexec ${RM} -rf %D/var/scrollkeeper || true
+@unexec ${RMDIR} %D/var || true
diff --git a/textproc/t1lib/PLIST b/textproc/t1lib/PLIST
index 7744a6171c8..37703582a16 100644
--- a/textproc/t1lib/PLIST
+++ b/textproc/t1lib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:58:54 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:13:00 skrll Exp $
bin/type1afm
bin/xglyph
include/t1lib.h
@@ -97,4 +97,4 @@ share/t1lib/Fonts/type1/eufm10.pfb
@dirrm share/t1lib/Fonts
@dirrm share/examples/t1lib
@comment remove any rendered docs as well
-@unexec rm -rf %D/share/doc/t1lib || true
+@unexec ${RM} -rf %D/share/doc/t1lib || true
diff --git a/time/pcal/PLIST b/time/pcal/PLIST
index 6144ab21b6b..1eb92a38a6b 100644
--- a/time/pcal/PLIST
+++ b/time/pcal/PLIST
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:19:10 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:13:01 skrll Exp $
bin/pcal
libexec/cgi-bin/pcal.cgi
man/man1/pcal.1
share/doc/ReadMe.pcal
share/httpd/htdocs/pcal.html
share/httpd/htdocs/pcalw.html
-@unexec rmdir -p %D/share/httpd/htdocs 2>/dev/null || true
+@unexec ${RMDIR} -p %D/share/httpd/htdocs 2>/dev/null || true
diff --git a/time/plan/PLIST b/time/plan/PLIST
index defb64f1b28..156ab91f714 100644
--- a/time/plan/PLIST
+++ b/time/plan/PLIST
@@ -1,12 +1,12 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:19:12 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:13:01 skrll Exp $
bin/plan
libexec/plan/pland
libexec/plan/notifier
libexec/plan/netplan
libexec/plan/plan_cal.ps
-@exec mkdir -p %D/libexec/plan/netplan.dir && chmod 700 %D/libexec/plan/netplan.dir && chown 32767:39 %D/libexec/plan/netplan.dir
-@unexec rmdir %D/libexec/plan/netplan.dir 2>/dev/null || echo "==> %D/libexec/plan/netplan.dir not empty. You should remove it manually if it's no longer needed."
-@unexec rmdir %D/libexec/plan 2>/dev/null || true
+@exec ${MKDIR} -p %D/libexec/plan/netplan.dir && ${CHMOD} 700 %D/libexec/plan/netplan.dir && ${CHOWN} 32767:39 %D/libexec/plan/netplan.dir
+@unexec ${RMDIR} %D/libexec/plan/netplan.dir 2>/dev/null || echo "==> %D/libexec/plan/netplan.dir not empty. You should remove it manually if it's no longer needed."
+@unexec ${RMDIR} %D/libexec/plan 2>/dev/null || true
man/man1/plan.1
man/man1/netplan.1
man/man4/plan.4
diff --git a/wm/amaterus/PLIST b/wm/amaterus/PLIST
index b87d05ad17f..d00104f8c4c 100644
--- a/wm/amaterus/PLIST
+++ b/wm/amaterus/PLIST
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 20:59:02 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:13:01 skrll Exp $
bin/amaterus
share/doc/amaterus/README
share/doc/amaterus/README.en
share/gnome/wm-properties/Amaterus.desktop
@dirrm share/doc/amaterus
-@unexec rmdir %D/share/gnome/wm-properties 2>/dev/null || true
-@unexec rmdir %D/share/gnome 2>/dev/null || true
+@unexec ${RMDIR} %D/share/gnome/wm-properties 2>/dev/null || true
+@unexec ${RMDIR} %D/share/gnome 2>/dev/null || true
diff --git a/wm/windowmaker/PLIST b/wm/windowmaker/PLIST
index aa2f7d71365..79a97a76465 100644
--- a/wm/windowmaker/PLIST
+++ b/wm/windowmaker/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2001/12/25 15:10:49 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/02/15 10:13:01 skrll Exp $
GNUstep/Apps/WPrefs.app/WPrefs
GNUstep/Apps/WPrefs.app/WPrefs.tiff
GNUstep/Apps/WPrefs.app/WPrefs.xpm
@@ -66,7 +66,7 @@ GNUstep/Apps/WPrefs.app/tiff/windowfocus.tiff
GNUstep/Apps/WPrefs.app/tiff/workspace.tiff
GNUstep/Apps/WPrefs.app/tiff/workspacename.tiff
GNUstep/Apps/WPrefs.app/tiff/xis.tiff
-@exec mkdir -p %D/GNUstep/Apps/WPrefs.app/xpm
+@exec ${MKDIR} -p %D/GNUstep/Apps/WPrefs.app/xpm
bin/get-wings-flags
bin/get-wraster-flags
bin/get-wutil-flags
diff --git a/wm/wmx/PLIST b/wm/wmx/PLIST
index ab02ad4230f..e43104aa94a 100644
--- a/wm/wmx/PLIST
+++ b/wm/wmx/PLIST
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 20:59:34 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:13:01 skrll Exp $
bin/wmx
share/doc/wmx/README
share/doc/wmx/README.contrib
@dirrm share/doc/wmx
-@exec mkdir -p %D/etc/wmx
-@unexec rmdir -p %D/etc/wmx 2>/dev/null || true
+@exec ${MKDIR} -p %D/etc/wmx
+@unexec ${RMDIR} -p %D/etc/wmx 2>/dev/null || true
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
diff --git a/x11/Xbae/PLIST b/x11/Xbae/PLIST
index 5f6b7dcc23c..4fae7fa8cd6 100644
--- a/x11/Xbae/PLIST
+++ b/x11/Xbae/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:10:27 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:13:05 skrll Exp $
include/Xbae/Matrix.h
include/Xbae/Input.h
include/Xbae/Caption.h
@@ -43,5 +43,5 @@ share/doc/html/Xbae/INSTALL
@dirrm share/doc/html/Xbae
@dirrm include/Xbae
@exec test %D = ${LOCALBASE} || ln -fs %D/share/aclocal/ac_find_xbae.m4 ${LOCALBASE}/share/aclocal/ac_find_xbae.m4
-@unexec test %D = ${LOCALBASE} || rm ${LOCALBASE}/share/aclocal/ac_find_xbae.m4
-@unexec rmdir %D/share/aclocal 2>/dev/null || true
+@unexec test %D = ${LOCALBASE} || ${RM} ${LOCALBASE}/share/aclocal/ac_find_xbae.m4
+@unexec ${RMDIR} %D/share/aclocal 2>/dev/null || true
diff --git a/x11/controlcenter/PLIST b/x11/controlcenter/PLIST
index fc7ba87b8b4..9d3bec3910f 100644
--- a/x11/controlcenter/PLIST
+++ b/x11/controlcenter/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/14 14:35:45 drochner Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/02/15 10:13:06 skrll Exp $
bin/background-properties-capplet
bin/file-types-capplet
bin/gnome-edit-properties-capplet
@@ -160,7 +160,7 @@ share/pixmaps/control-center.png
@dirrm share/gnome/apps/Settings/Documents
@dirrm share/gnome/apps/Settings/Desktop
@dirrm share/gnome/apps/Settings
-@unexec rmdir -p %D/share/gnome/apps 2>/dev/null || true
+@unexec ${RMDIR} -p %D/share/gnome/apps 2>/dev/null || true
@dirrm share/control-center/UIOptions
@dirrm share/control-center/Session
@dirrm share/control-center/Peripherals
diff --git a/x11/fltk/PLIST b/x11/fltk/PLIST
index 44c026ccc67..44d36e156e5 100644
--- a/x11/fltk/PLIST
+++ b/x11/fltk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:10:39 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:13:06 skrll Exp $
bin/fluid
include/FL/Enumerations.H
include/FL/Enumerations.h
@@ -188,7 +188,7 @@ include/FL/win32.h
include/FL/x.H
include/FL/x.h
@exec ln -sf FL %D/include/Fl
-@unexec rm -f %D/include/Fl
+@unexec ${RM} -f %D/include/Fl
lib/libfltk.a
lib/libfltk.la
lib/libfltk.so
diff --git a/x11/gdm/PLIST b/x11/gdm/PLIST
index 001eb158aca..c6e8997df74 100644
--- a/x11/gdm/PLIST
+++ b/x11/gdm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:10:43 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:13:07 skrll Exp $
bin/gdm
bin/gdmchooser
bin/gdmconfig
@@ -21,7 +21,7 @@ share/gnome/help/gdm/C/daemonov.html
share/gnome/help/gdm/C/docbook.css
share/gnome/help/gdm/C/f21.html
share/gnome/help/gdm/C/gdm.html
-@exec mkdir -p %D/share/gnome/help/gdm/C/images
+@exec ${MKDIR} -p %D/share/gnome/help/gdm/C/images
share/gnome/help/gdm/C/index.html
share/gnome/help/gdm/C/intro.html
share/gnome/help/gdm/C/ln15.html
@@ -75,6 +75,6 @@ share/pixmaps/nohost.png
@dirrm etc/gdm/PreSession.default
@dirrm etc/gdm/PostSession.default
@dirrm etc/gdm/Init.default
-@unexec rmdir %D/etc/gdm/Sessions %D/etc/gdm/PreSession %D/etc/gdm/PostSession %D/etc/gdm/Init %D/etc/gdm 2>/dev/null || true
+@unexec ${RMDIR} %D/etc/gdm/Sessions %D/etc/gdm/PreSession %D/etc/gdm/PostSession %D/etc/gdm/Init %D/etc/gdm 2>/dev/null || true
@exec ${INSTALL} -d -o ${GDMOWN} -g ${GDMGRP} -m 750 ${LOCALSTATEDIR}/gdm
-@unexec rm -rf ${LOCALSTATEDIR}/gdm
+@unexec ${RM} -rf ${LOCALSTATEDIR}/gdm
diff --git a/x11/gnome-core/PLIST b/x11/gnome-core/PLIST
index 96746f4df68..954a3ee2a23 100644
--- a/x11/gnome-core/PLIST
+++ b/x11/gnome-core/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:10:48 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:13:07 skrll Exp $
bin/deskguide_applet
bin/gmenu
bin/gnome-about
@@ -1515,18 +1515,18 @@ share/pixmaps/vnterm.xpm
@dirrm share/gnome/help/clock_applet/C/figures
@dirrm share/gnome/help/clock_applet/C
@dirrm share/gnome/help/clock_applet
-@unexec rmdir %D/share/gnome/apps/Utilities 2>/dev/null || true
-@unexec rmdir %D/share/gnome/apps/System 2>/dev/null || true
-@unexec rmdir %D/share/gnome/apps/Settings/Session 2>/dev/null || true
-@unexec rmdir %D/share/gnome/apps/Settings/Desktop 2>/dev/null || true
-@unexec rmdir %D/share/gnome/apps/Settings 2>/dev/null || true
-@unexec rmdir %D/share/gnome/apps/Multimedia 2>/dev/null || true
-@unexec rmdir %D/share/gnome/apps/Internet 2>/dev/null || true
-@unexec rmdir %D/share/gnome/apps/Graphics 2>/dev/null || true
-@unexec rmdir %D/share/gnome/apps/Games 2>/dev/null || true
-@unexec rmdir %D/share/gnome/apps/Development 2>/dev/null || true
-@unexec rmdir %D/share/gnome/apps/Applications 2>/dev/null || true
-@unexec rmdir %D/share/gnome/apps 2>/dev/null || true
+@unexec ${RMDIR} %D/share/gnome/apps/Utilities 2>/dev/null || true
+@unexec ${RMDIR} %D/share/gnome/apps/System 2>/dev/null || true
+@unexec ${RMDIR} %D/share/gnome/apps/Settings/Session 2>/dev/null || true
+@unexec ${RMDIR} %D/share/gnome/apps/Settings/Desktop 2>/dev/null || true
+@unexec ${RMDIR} %D/share/gnome/apps/Settings 2>/dev/null || true
+@unexec ${RMDIR} %D/share/gnome/apps/Multimedia 2>/dev/null || true
+@unexec ${RMDIR} %D/share/gnome/apps/Internet 2>/dev/null || true
+@unexec ${RMDIR} %D/share/gnome/apps/Graphics 2>/dev/null || true
+@unexec ${RMDIR} %D/share/gnome/apps/Games 2>/dev/null || true
+@unexec ${RMDIR} %D/share/gnome/apps/Development 2>/dev/null || true
+@unexec ${RMDIR} %D/share/gnome/apps/Applications 2>/dev/null || true
+@unexec ${RMDIR} %D/share/gnome/apps 2>/dev/null || true
@dirrm share/omf/gnome-core
@dirrm share/gnome-terminal/glade
@dirrm share/gnome-terminal
diff --git a/x11/gnome-libs/PLIST b/x11/gnome-libs/PLIST
index f1af78bb95a..6ed1c85d07b 100644
--- a/x11/gnome-libs/PLIST
+++ b/x11/gnome-libs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/14 14:33:02 drochner Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/02/15 10:13:07 skrll Exp $
bin/dns-helper
bin/gconfigger
bin/gnome-bug
@@ -573,16 +573,16 @@ share/type-convert/type.convert
@dirrm share/gtk-doc/html/libart
@dirrm share/gtk-doc/html
@dirrm share/gtk-doc
-@unexec rmdir %D/share/gnome/html/zvt 2>/dev/null || true
-@unexec rmdir %D/share/gnome/html/gnorba 2>/dev/null || true
+@unexec ${RMDIR} %D/share/gnome/html/zvt 2>/dev/null || true
+@unexec ${RMDIR} %D/share/gnome/html/gnorba 2>/dev/null || true
@dirrm share/gnome/html/gnomeui
@dirrm share/gnome/html/gnome
@dirrm share/gnome/html
@dirrm share/gnome/help/gnome-dev-info/C
@dirrm share/gnome/help/gnome-dev-info
@dirrm share/gnome/help
-@unexec rmdir %D/share/gnome/apps 2>/dev/null || true
-@unexec rmdir %D/share/gnome 2>/dev/null || true
+@unexec ${RMDIR} %D/share/gnome/apps 2>/dev/null || true
+@unexec ${RMDIR} %D/share/gnome 2>/dev/null || true
@dirrm share/doc/gnome-libs
@dirrm lib/gnome-libs/include
@dirrm lib/gnome-libs
@@ -597,6 +597,6 @@ share/type-convert/type.convert
@dirrm etc/CORBA/servers
@dirrm etc/CORBA
@exec test %D = ${LOCALBASE} || ln -s %D/share/aclocal/libart.m4 ${LOCALBASE}/share/aclocal/libart.m4
-@unexec test %D = ${LOCALBASE} || rm -f ${LOCALBASE}/share/aclocal/libart.m4
-@exec mkdir -p ${LOCALSTATEDIR}
-@unexec rm -rf ${LOCALSTATEDIR}
+@unexec test %D = ${LOCALBASE} || ${RM} -f ${LOCALBASE}/share/aclocal/libart.m4
+@exec ${MKDIR} -p ${LOCALSTATEDIR}
+@unexec ${RM} -rf ${LOCALSTATEDIR}
diff --git a/x11/gnome-python/PLIST b/x11/gnome-python/PLIST
index a6a4fd6da51..71d9c272055 100644
--- a/x11/gnome-python/PLIST
+++ b/x11/gnome-python/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/01/19 11:44:19 drochner Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/02/15 10:13:07 skrll Exp $
${PYINC}/pygtk/pygdkimlib.h
${PYINC}/pygtk/pygtk.h
${PYSITELIB}/GDK.py
@@ -129,5 +129,5 @@ ${PYSITELIB}/pyglade/xmlparse.pyc
${PYSITELIB}/pyglade/xmlparse.pyo
@dirrm ${PYSITELIB}/pyglade
@dirrm ${PYSITELIB}/gnome
-@unexec rmdir %D/${PYSITELIB} 2>/dev/null || true
+@unexec ${RMDIR} %D/${PYSITELIB} 2>/dev/null || true
@dirrm ${PYINC}/pygtk
diff --git a/x11/gtk--/PLIST b/x11/gtk--/PLIST
index 2ba7f9d09b6..4bea86305fb 100644
--- a/x11/gtk--/PLIST
+++ b/x11/gtk--/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/14 13:58:24 drochner Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/02/15 10:13:08 skrll Exp $
bin/gtkmm-config
include/gdk--.h
include/gdk--/bitmap.h
@@ -196,7 +196,7 @@ lib/libgtkmm.la
lib/libgtkmm.so
lib/libgtkmm.so.2
lib/libgtkmm.so.2.1
-@unexec test %D = ${LOCALBASE} || rm ${LOCALBASE}/share/aclocal/gtk--.m4
+@unexec test %D = ${LOCALBASE} || ${RM} ${LOCALBASE}/share/aclocal/gtk--.m4
share/aclocal/gtk--.m4
@exec test %D = ${LOCALBASE} || ln -s %D/share/aclocal/gtk--.m4 ${LOCALBASE}/share/aclocal/gtk--.m4
@dirrm lib/gtkmm/proc
diff --git a/x11/gtk-engines/PLIST b/x11/gtk-engines/PLIST
index 5de2cce4a7f..57f8c2070da 100644
--- a/x11/gtk-engines/PLIST
+++ b/x11/gtk-engines/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:10:55 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:13:08 skrll Exp $
lib/gtk/themes/engines/libmetal.a
lib/gtk/themes/engines/libmetal.la
lib/gtk/themes/engines/libmetal.so
@@ -108,5 +108,5 @@ share/themes/Redmond95/gtk/gtkrc
@dirrm share/themes/Notif
@dirrm share/themes/Metal/gtk
@dirrm share/themes/Metal
-@unexec rmdir -p %D/share/themes 2>/dev/null || true
-@unexec rmdir -p %D/lib/gtk/themes/engines 2>/dev/null || true
+@unexec ${RMDIR} -p %D/share/themes 2>/dev/null || true
+@unexec ${RMDIR} -p %D/lib/gtk/themes/engines 2>/dev/null || true
diff --git a/x11/gtk/PLIST b/x11/gtk/PLIST
index e6c49dfdbd4..7c55b75f5f0 100644
--- a/x11/gtk/PLIST
+++ b/x11/gtk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:10:53 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:13:07 skrll Exp $
bin/gtk-config
etc/gtk/gtkrc.az
etc/gtk/gtkrc.be
@@ -237,8 +237,8 @@ ${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/gtk+.mo
${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/gtk+.mo
share/themes/Default/gtk/gtkrc
@exec test %D = ${LOCALBASE} || ln -s %D/share/aclocal/gtk.m4 ${LOCALBASE}/share/aclocal/gtk.m4
-@unexec test %D = ${LOCALBASE} || rm ${LOCALBASE}/share/aclocal/gtk.m4
-@unexec rmdir %D/share/aclocal 2>/dev/null || true
+@unexec test %D = ${LOCALBASE} || ${RM} ${LOCALBASE}/share/aclocal/gtk.m4
+@unexec ${RMDIR} %D/share/aclocal 2>/dev/null || true
@dirrm share/themes/Default/gtk
@dirrm share/themes/Default
@dirrm share/themes
diff --git a/x11/gtkglarea/PLIST b/x11/gtkglarea/PLIST
index 2842be2a2fb..596db94ff7d 100644
--- a/x11/gtkglarea/PLIST
+++ b/x11/gtkglarea/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:10:57 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:13:08 skrll Exp $
include/gtkgl/gdkgl.h
include/gtkgl/gtkglarea.h
@dirrm include/gtkgl
@@ -12,5 +12,5 @@ share/doc/gtkglarea/HOWTO.txt
share/doc/gtkglarea/gdkgl.txt
share/doc/gtkglarea/gtkglarea.txt
@exec test %D = ${LOCALBASE} || ln -s %D/share/aclocal/gtkgl.m4 ${LOCALBASE}/share/aclocal/gtkgl.m4
-@unexec test %D = ${LOCALBASE} || rm ${LOCALBASE}/share/aclocal/gtkgl.m4
+@unexec test %D = ${LOCALBASE} || ${RM} ${LOCALBASE}/share/aclocal/gtkgl.m4
@dirrm share/doc/gtkglarea
diff --git a/x11/gtkstep/PLIST b/x11/gtkstep/PLIST
index 6c749c9d3b1..ed7d02ba1eb 100644
--- a/x11/gtkstep/PLIST
+++ b/x11/gtkstep/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:10:58 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:13:08 skrll Exp $
lib/gtk/themes/engines/libstep.la
lib/gtk/themes/engines/libstep.a
lib/gtk/themes/engines/libstep.so
@@ -7,4 +7,4 @@ share/themes/Step/README.html
share/themes/Step/gtk/gtkrc
@dirrm share/themes/Step/gtk
@dirrm share/themes/Step
-@unexec rmdir %D/lib/gtk/themes/engines %D/lib/gtk/themes %D/lib/gtk 2>/dev/null || true
+@unexec ${RMDIR} %D/lib/gtk/themes/engines %D/lib/gtk/themes %D/lib/gtk 2>/dev/null || true
diff --git a/x11/ssystem/PLIST b/x11/ssystem/PLIST
index f86c33440a6..46018470f5d 100644
--- a/x11/ssystem/PLIST
+++ b/x11/ssystem/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:11:39 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:13:08 skrll Exp $
bin/ssystem
share/doc/ssystem/LICENSE
share/doc/ssystem/README
@@ -32,5 +32,5 @@ share/ssystem/triton.jpg
share/ssystem/uranus.jpg
share/ssystem/venus.jpg
@dirrm share/doc/ssystem
-@unexec rmdir %D/share/ssystem/hires || true
-@unexec rmdir %D/share/ssystem || true
+@unexec ${RMDIR} %D/share/ssystem/hires || true
+@unexec ${RMDIR} %D/share/ssystem || true
diff --git a/x11/xbanner/PLIST b/x11/xbanner/PLIST
index a32c93acfea..623a16a7b3d 100644
--- a/x11/xbanner/PLIST
+++ b/x11/xbanner/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:11:58 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:13:09 skrll Exp $
bin/freetemp
bin/random_effect
bin/xb_check
@@ -16,4 +16,4 @@ share/doc/xbanner/rnd_doc.html
share/doc/xbanner/stars.gif
share/doc/xbanner/xb_check.html
@dirrm share/doc/xbanner
-@unexec rmdir -p %D/lib/X11/app-defaults 2>/dev/null || true
+@unexec ${RMDIR} -p %D/lib/X11/app-defaults 2>/dev/null || true
diff --git a/x11/xdm3d/PLIST b/x11/xdm3d/PLIST
index 1f04ef7087a..c2eeba7d8f3 100644
--- a/x11/xdm3d/PLIST
+++ b/x11/xdm3d/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:12:05 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:13:09 skrll Exp $
bin/xdm3d
share/xdm3d/GiveConsole
share/xdm3d/TakeConsole
@@ -10,5 +10,5 @@ share/xdm3d/Xsetup_0
share/xdm3d/chooser
share/xdm3d/xdm-config
share/xdm3d/Xresources
-@exec mkdir -p %D/share/xdm3d/authdir
-@unexec rm -rf %D/share/xdm3d
+@exec ${MKDIR} -p %D/share/xdm3d/authdir
+@unexec ${RM} -rf %D/share/xdm3d