mkdir -> ${MKDIR}

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

15 files changed, 54 insertions, 54 deletions

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