12 files changed, 14 insertions, 28 deletions
diff --git a/wm/amaterus/PLIST b/wm/amaterus/PLIST
index a9a8464d066..758b9136366 100644
--- a/wm/amaterus/PLIST
+++ b/wm/amaterus/PLIST
@@ -1,7 +1,5 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 18:18:56 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2009/06/14 21:40:04 joerg Exp $
 bin/amaterus
 share/doc/amaterus/README
 share/doc/amaterus/README.en
 share/gnome/wm-properties/Amaterus.desktop
-@unexec ${RMDIR} %D/share/gnome/wm-properties 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/gnome 2>/dev/null || ${TRUE}
diff --git a/wm/bbkeys/PLIST b/wm/bbkeys/PLIST
index 45a5c7b8c9e..2aebf7e327a 100644
--- a/wm/bbkeys/PLIST
+++ b/wm/bbkeys/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:18:56 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2009/06/14 21:40:04 joerg Exp $
 bin/bbkeys
 bin/bbkeysconf.pl
 man/man1/bbkeys.1
@@ -11,4 +11,3 @@ share/doc/bbkeys/BUGS
 share/doc/bbkeys/ChangeLog
 share/doc/bbkeys/NEWS
 share/doc/bbkeys/README
-@unexec ${RMDIR} %D/share/bbtools 2>/dev/null || ${TRUE}
diff --git a/wm/bbkeys09/PLIST b/wm/bbkeys09/PLIST
index 7b142a4416b..c973bf3ab31 100644
--- a/wm/bbkeys09/PLIST
+++ b/wm/bbkeys09/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 18:18:56 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2009/06/14 21:40:04 joerg Exp $
 bin/bbkeys
 man/man1/bbkeys.1
 man/man5/bbkeysrc.5
@@ -11,4 +11,3 @@ share/share/doc/bbkeys/LICENSE
 share/share/doc/bbkeys/NEWS
 share/share/doc/bbkeys/README
 share/share/doc/bbkeys/TODO
-@unexec ${RMDIR} %D/share/bbtools 2>/dev/null || ${TRUE}
diff --git a/wm/bbpager/PLIST b/wm/bbpager/PLIST
index 1a1f8700820..9a21020802e 100644
--- a/wm/bbpager/PLIST
+++ b/wm/bbpager/PLIST
@@ -1,8 +1,7 @@
-@comment $NetBSD: PLIST,v 1.3 2002/12/14 00:21:36 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.4 2009/06/14 21:40:05 joerg Exp $
 bin/bbpager
 man/man1/bbpager.1
 man/man5/bbpager.bb.5
 share/bbtools/README.bbpager
 share/bbtools/bbpager.bb
 share/bbtools/bbpager.nobb
-@unexec ${RMDIR} %D/share/bbtools 2>/dev/null || ${TRUE}
diff --git a/wm/bbpager04/PLIST b/wm/bbpager04/PLIST
index c7d9c2ce4bd..0031f480ac0 100644
--- a/wm/bbpager04/PLIST
+++ b/wm/bbpager04/PLIST
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 2006/09/23 19:25:16 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.4 2009/06/14 21:40:05 joerg Exp $
 bin/bbpager
 man/man1/bbpager.1
 man/man5/bbpager.bb.5
 share/bbtools/README.bbpager
 share/bbtools/bbpager.rc
-@unexec ${RMDIR} %D/share/bbtools 2>/dev/null || ${TRUE}
diff --git a/wm/ctwm/PLIST b/wm/ctwm/PLIST
index 6dc069e217c..8f0267765dc 100644
--- a/wm/ctwm/PLIST
+++ b/wm/ctwm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:18:57 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2009/06/14 21:40:05 joerg Exp $
 bin/ctwm
 lib/X11/twm/images/3D_Expand15.xpm
 lib/X11/twm/images/3D_Iconify15.xpm
@@ -98,4 +98,3 @@ share/examples/ctwm/peterc.ctwmrc
 share/examples/ctwm/system.ctwmrc
 share/examples/ctwm/system.ctwmrc.gnome
 share/xsessions/ctwm.desktop
-@unexec ${RMDIR} %D/share/xsessions 2>/dev/null || ${TRUE}
diff --git a/wm/fluxter/PLIST b/wm/fluxter/PLIST
index 1098363dd56..650466ab57f 100644
--- a/wm/fluxter/PLIST
+++ b/wm/fluxter/PLIST
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:18:58 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/06/14 21:40:05 joerg Exp $
 bin/fluxter
 share/doc/fluxter/README.fluxter
 share/fluxbox/fluxter.bb
 share/fluxbox/fluxter.nobb
 share/examples/fluxter/fluxter.bb
-@unexec ${RMDIR} %D/share/fluxbox 2>/dev/null || ${TRUE}
diff --git a/wm/obconf/PLIST b/wm/obconf/PLIST
index eef5dbfcc1c..d38658bfc3b 100644
--- a/wm/obconf/PLIST
+++ b/wm/obconf/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 18:19:00 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2009/06/14 21:40:05 joerg Exp $
 bin/obconf
 share/applications/obconf.desktop
 share/locale/cs/LC_MESSAGES/obconf.mo
@@ -16,5 +16,3 @@ share/mimelnk/application/x-openbox-theme.desktop
 share/obconf/obconf.glade
 share/obconf/video-display.png
 share/pixmaps/obconf.png
-@unexec ${RMDIR} %D/share/mimelnk/application 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/mimelnk 2>/dev/null || ${TRUE}
diff --git a/wm/sawfish/PLIST b/wm/sawfish/PLIST
index 7e4f08e8610..ad264191a07 100644
--- a/wm/sawfish/PLIST
+++ b/wm/sawfish/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2009/06/14 18:19:01 joerg Exp $
+@comment $NetBSD: PLIST,v 1.16 2009/06/14 21:40:05 joerg Exp $
 bin/sawfish
 bin/sawfish-client
 bin/sawfish-ui
@@ -742,5 +742,5 @@ share/sawfish/${PKGVERSION}/themes/smaker/close_inv.png
 share/sawfish/${PKGVERSION}/themes/smaker/min.png
 share/sawfish/${PKGVERSION}/themes/smaker/min_inv.png
 share/sawfish/${PKGVERSION}/themes/smaker/theme.jl
-@exec ${MKDIR} %D/share/sawfish/themes
-@exec ${MKDIR} %D/share/sawfish/sounds
+@pkgdir share/sawfish/themes
+@pkgdir share/sawfish/sounds
diff --git a/wm/windowmaker/PLIST b/wm/windowmaker/PLIST
index ac5a5bb0bbe..47dec45be3d 100644
--- a/wm/windowmaker/PLIST
+++ b/wm/windowmaker/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2009/06/14 18:19:02 joerg Exp $
+@comment $NetBSD: PLIST,v 1.17 2009/06/14 21:40:05 joerg Exp $
 bin/convertfonts
 bin/get-wings-flags
 bin/get-wraster-flags
@@ -344,5 +344,3 @@ share/locale/sv/LC_MESSAGES/WindowMaker.mo
 share/locale/tr/LC_MESSAGES/WindowMaker.mo
 share/locale/zh_CN/LC_MESSAGES/WPrefs.mo
 share/locale/zh_CN/LC_MESSAGES/WindowMaker.mo
-@unexec ${RMDIR} %D/share/GNUstep/Applications 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/GNUstep 2>/dev/null || ${TRUE}
diff --git a/wm/xfce4-wm-themes/PLIST b/wm/xfce4-wm-themes/PLIST
index eb32c4e485b..071c2b09de4 100644
--- a/wm/xfce4-wm-themes/PLIST
+++ b/wm/xfce4-wm-themes/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2009/06/14 18:19:03 joerg Exp $
+@comment $NetBSD: PLIST,v 1.7 2009/06/14 21:40:05 joerg Exp $
 share/themes/Adept/xfwm4/README
 share/themes/Adept/xfwm4/bottom-active.xpm
 share/themes/Adept/xfwm4/bottom-inactive.xpm
@@ -3978,4 +3978,3 @@ share/themes/Xfce/xfwm4/top-left-active.xpm
 share/themes/Xfce/xfwm4/top-left-inactive.xpm
 share/themes/Xfce/xfwm4/top-right-active.xpm
 share/themes/Xfce/xfwm4/top-right-inactive.xpm
-@unexec ${RMDIR} %D/share/themes/Xfce 2>/dev/null || ${TRUE}
diff --git a/wm/xfce4-wm/PLIST b/wm/xfce4-wm/PLIST
index e17325db959..3e0e2fa42d3 100644
--- a/wm/xfce4-wm/PLIST
+++ b/wm/xfce4-wm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2009/06/14 18:19:03 joerg Exp $
+@comment $NetBSD: PLIST,v 1.18 2009/06/14 21:40:05 joerg Exp $
 bin/xfwm4
 lib/xfce4/mcs-plugins/wmtweaks_plugin.la
 lib/xfce4/mcs-plugins/workspaces_plugin.la
@@ -1275,4 +1275,3 @@ share/xfce4/doc/it/images/workspace_margins.png
 share/xfce4/doc/it/images/xfwm_workspaces.png
 share/xfce4/doc/it/xfwm4.html
 share/xfwm4/defaults
-@unexec ${RMDIR} %D/share/themes/Default 2>/dev/null || ${TRUE}