Convert @exec/@unexec to @pkgdir or drop it.

59 files changed, 166 insertions, 242 deletions

diff --git a/devel/GConf/PLIST b/devel/GConf/PLIST
index 01a300ba125..1ff0ea0581f 100644
--- a/devel/GConf/PLIST
+++ b/devel/GConf/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.27 2009/06/14 17:48:30 joerg Exp $
+@comment $NetBSD: PLIST,v 1.28 2009/06/14 18:48:07 joerg Exp $
 bin/gconf-merge-tree
 bin/gconftool-2
 include/gconf/2/gconf/gconf-changeset.h
@@ -125,7 +125,4 @@ share/locale/zh_CN/LC_MESSAGES/GConf2.mo
 share/locale/zh_HK/LC_MESSAGES/GConf2.mo
 share/locale/zh_TW/LC_MESSAGES/GConf2.mo
 share/sgml/gconf/gconf-1.0.dtd
-@exec ${MKDIR} %D/share/gconf/schemas
-@unexec ${RMDIR} -p %D/share/gconf 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} -p %D/lib/GConf 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} -p %D/include/gconf 2>/dev/null || ${TRUE}
+@pkgdir share/gconf/schemas
diff --git a/devel/apache-ant15/PLIST b/devel/apache-ant15/PLIST
index 3270315a917..a84f4d89ce4 100644
--- a/devel/apache-ant15/PLIST
+++ b/devel/apache-ant15/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:48:33 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:48:08 joerg Exp $
 bin/ant
 bin/antRun
 lib/java/ant/ant.jar
@@ -1039,5 +1039,3 @@ share/doc/java/ant/projects/antidote/index.html
 share/doc/java/ant/projects/antidote/module.html
 share/doc/java/ant/projects/index.html
 share/doc/java/ant/resources.html
-@unexec ${RMDIR} %D/lib/java 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/doc/java 2>/dev/null || ${TRUE}
diff --git a/devel/apache-maven/PLIST b/devel/apache-maven/PLIST
index 82a173fd54c..a78bccfad9e 100644
--- a/devel/apache-maven/PLIST
+++ b/devel/apache-maven/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:48:33 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:48:08 joerg Exp $
 bin/mvn
 etc/maven/m2.conf
 etc/maven/settings.xml
@@ -7,5 +7,3 @@ lib/java/maven/maven-${PKGVERSION}-uber.jar
 share/doc/java/maven/LICENSE.txt
 share/doc/java/maven/NOTICE.txt
 share/doc/java/maven/README.txt
-@unexec ${RMDIR} %D/lib/java 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/doc/java 2>/dev/null || ${TRUE}
diff --git a/devel/apr-util/PLIST b/devel/apr-util/PLIST
index 4c21141d047..11d4917719e 100644
--- a/devel/apr-util/PLIST
+++ b/devel/apr-util/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/10 15:58:29 seb Exp $
+@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:48:08 joerg Exp $
 bin/apu-1-config
 include/apr-1/apr_anylock.h
 include/apr-1/apr_base64.h
@@ -39,4 +39,3 @@ ${PLIST.pgsql}lib/apr-util-1/apr_dbd_pgsql.la
 ${PLIST.sqlite3}lib/apr-util-1/apr_dbd_sqlite3.la
 ${PLIST.db4}lib/apr-util-1/apr_dbm_db.la
 lib/pkgconfig/apr-util-1.pc
-@unexec ${RMDIR} %D/lib/apr-util-1 2>/dev/null || ${TRUE}
diff --git a/devel/atf/PLIST b/devel/atf/PLIST
index a98a8f87194..eb36607adf7 100644
--- a/devel/atf/PLIST
+++ b/devel/atf/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2009/06/14 17:48:34 joerg Exp $
+@comment $NetBSD: PLIST,v 1.8 2009/06/14 18:48:08 joerg Exp $
 bin/atf-check
 bin/atf-compile
 bin/atf-config
@@ -326,4 +326,3 @@ tests/atf/tools/t_atf_config
 tests/atf/tools/t_atf_exec
 tests/atf/tools/t_atf_report
 tests/atf/tools/t_atf_run
-@unexec ${RMDIR} %D/share/xsl >/dev/null 2>&1 || ${TRUE}
diff --git a/devel/autoconf/PLIST b/devel/autoconf/PLIST
index 416b683f9c6..403b081a167 100644
--- a/devel/autoconf/PLIST
+++ b/devel/autoconf/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2009/06/14 17:48:34 joerg Exp $
+@comment $NetBSD: PLIST,v 1.13 2009/06/14 18:48:09 joerg Exp $
 bin/autoconf
 bin/autoheader
 bin/autom4te
@@ -57,4 +57,3 @@ share/autoconf/m4sugar/m4sh.m4f
 share/autoconf/m4sugar/m4sugar.m4
 share/autoconf/m4sugar/m4sugar.m4f
 share/autoconf/m4sugar/version.m4
-@unexec ${RMDIR} %D/share/autoconf > /dev/null 2>&1 || ${TRUE}
diff --git a/devel/autoconf213/PLIST b/devel/autoconf213/PLIST
index 991882cddbf..e38e338a594 100644
--- a/devel/autoconf213/PLIST
+++ b/devel/autoconf213/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2006/03/30 03:44:42 jlam Exp $
+@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:48:09 joerg Exp $
 bin/autoconf-2.13
 bin/autoheader-2.13
 bin/autoreconf-2.13
@@ -21,4 +21,3 @@ share/autoconf/autoheader.m4
 share/autoconf/autoheader.m4f
 share/autoconf/config.guess
 share/autoconf/config.sub
-@unexec ${RMDIR} %D/share/autoconf 2>/dev/null || ${TRUE}
diff --git a/devel/boost-docs/PLIST b/devel/boost-docs/PLIST
index b9d413178ce..b449eda72c6 100644
--- a/devel/boost-docs/PLIST
+++ b/devel/boost-docs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2009/06/14 17:48:35 joerg Exp $
+@comment $NetBSD: PLIST,v 1.8 2009/06/14 18:48:09 joerg Exp $
 share/doc/boost/boost.css
 share/doc/boost/boost.png
 share/doc/boost/index.htm
@@ -8876,5 +8876,5 @@ share/doc/boost/more/writingdoc/template/index.html
 share/doc/boost/more/writingdoc/template/overview.html
 share/doc/boost/more/writingdoc/template/rationale.html
 share/doc/boost/rst.css
-@exec ${MKDIR} %D/share/doc/boost/libs/utility/swap
-@exec ${MKDIR} %D/share/doc/boost/libs/utility/enable_if
+@pkgdir share/doc/boost/libs/utility/swap
+@pkgdir share/doc/boost/libs/utility/enable_if
diff --git a/devel/bugzilla3/PLIST b/devel/bugzilla3/PLIST
index b9abf9cb3c9..f996d08a5f6 100644
--- a/devel/bugzilla3/PLIST
+++ b/devel/bugzilla3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2009/06/14 17:48:36 joerg Exp $
+@comment $NetBSD: PLIST,v 1.8 2009/06/14 18:48:09 joerg Exp $
 share/bugzilla/Bugzilla.pm
 share/bugzilla/Bugzilla/Attachment.pm
 share/bugzilla/Bugzilla/Attachment/PatchReader.pm
@@ -587,10 +587,3 @@ share/doc/bugzilla/en/Bugzilla-Guide.txt
 share/doc/bugzilla/en/rel_notes.txt
 share/examples/bugzilla/bugzilla.conf
 share/examples/bugzilla/localconfig
-@unexec ${RMDIR} %D/share/bugzilla/template 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/bugzilla/skins/contrib/Dusk 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/bugzilla/skins/contrib 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/bugzilla/skins 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/bugzilla/lib 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/bugzilla/Bugzilla 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/bugzilla 2>/dev/null || ${TRUE}
diff --git a/devel/c-cpp-reference/PLIST b/devel/c-cpp-reference/PLIST
index 70af19507c0..755f92ecca9 100644
--- a/devel/c-cpp-reference/PLIST
+++ b/devel/c-cpp-reference/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2009/06/14 17:48:36 joerg Exp $
+@comment $NetBSD: PLIST,v 1.10 2009/06/14 18:48:10 joerg Exp $
 share/doc/kde/HTML/en/kdevelop/reference/C/CONCEPT/JavaSim.html
 share/doc/kde/HTML/en/kdevelop/reference/C/CONCEPT/arrays.html
 share/doc/kde/HTML/en/kdevelop/reference/C/CONCEPT/assignment.html
@@ -1031,10 +1031,10 @@ share/doc/kde/HTML/en/kdevelop/reference/GRAPHICS/whiteball.gif
 share/doc/kde/HTML/en/kdevelop/reference/GRAPHICS/yellowball.gif
 share/kde/apps/kdevdocumentation/tocs/c++_reference.toc
 share/kde/apps/kdevdocumentation/tocs/c_reference.toc
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdevelop/reference/CPLUSPLUS/X_EXAMPLES
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdevelop/reference/CPLUSPLUS/TECHNIC
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdevelop/reference/CPLUSPLUS/PROBLEMS
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdevelop/reference/CPLUSPLUS/MISC
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdevelop/reference/CPLUSPLUS/LIBRARIES
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdevelop/reference/CPLUSPLUS/GDB
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdevelop/reference/CPLUSPLUS/FUNCTIONS
+@pkgdir share/doc/kde/HTML/en/kdevelop/reference/CPLUSPLUS/X_EXAMPLES
+@pkgdir share/doc/kde/HTML/en/kdevelop/reference/CPLUSPLUS/TECHNIC
+@pkgdir share/doc/kde/HTML/en/kdevelop/reference/CPLUSPLUS/PROBLEMS
+@pkgdir share/doc/kde/HTML/en/kdevelop/reference/CPLUSPLUS/MISC
+@pkgdir share/doc/kde/HTML/en/kdevelop/reference/CPLUSPLUS/LIBRARIES
+@pkgdir share/doc/kde/HTML/en/kdevelop/reference/CPLUSPLUS/GDB
+@pkgdir share/doc/kde/HTML/en/kdevelop/reference/CPLUSPLUS/FUNCTIONS
diff --git a/devel/distcc/PLIST b/devel/distcc/PLIST
index 175e030e959..844add29c1b 100644
--- a/devel/distcc/PLIST
+++ b/devel/distcc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2009/06/14 17:48:41 joerg Exp $
+@comment $NetBSD: PLIST,v 1.15 2009/06/14 18:48:10 joerg Exp $
 bin/distcc
 bin/distccd
 bin/distccmon-text
@@ -25,4 +25,4 @@ share/doc/distcc/reporting-bugs.txt
 share/doc/distcc/status-1.txt
 share/doc/distcc/survey.txt
 share/examples/rc.d/distccd
-@exec ${MKDIR} %D/share/distcc
+@pkgdir share/distcc
diff --git a/devel/doxymacs/PLIST b/devel/doxymacs/PLIST
index 31326796a11..2ba310a7dcb 100644
--- a/devel/doxymacs/PLIST
+++ b/devel/doxymacs/PLIST
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2006/11/01 07:16:24 dsainty Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:48:10 joerg Exp $
 bin/doxymacs_parser
 ${EMACS_LISPPREFIX}/doxymacs.el
 ${EMACS_LISPPREFIX}/doxymacs.elc
 ${EMACS_LISPPREFIX}/xml-parse.el
 ${EMACS_LISPPREFIX}/xml-parse.elc
-@unexec ${RMDIR} %D/${EMACS_LISPPREFIX} 2>/dev/null || ${TRUE}
diff --git a/devel/eric3/PLIST b/devel/eric3/PLIST
index dbcdaf988c5..0153569c939 100644
--- a/devel/eric3/PLIST
+++ b/devel/eric3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2009/06/14 17:48:43 joerg Exp $
+@comment $NetBSD: PLIST,v 1.7 2009/06/14 18:48:10 joerg Exp $
 bin/eric3
 bin/eric3-api
 bin/eric3-doc
@@ -1666,4 +1666,4 @@ ${PYSITELIB}/eric3/uninstall.pyc
 ${PYSITELIB}/eric3config.py
 ${PYSITELIB}/sitecustomize.py
 ${PYSITELIB}/sitecustomize.pyc
-@exec ${MKDIR} %D/lib/python2.4/site-packages/eric3/i18n
+@pkgdir ${PYSITELIB}/eric3/i18n
diff --git a/devel/glade/PLIST b/devel/glade/PLIST
index 37517d020b9..5bbabaf4ff8 100644
--- a/devel/glade/PLIST
+++ b/devel/glade/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2009/06/14 17:48:45 joerg Exp $
+@comment $NetBSD: PLIST,v 1.10 2009/06/14 18:48:11 joerg Exp $
 bin/glade-2
 share/applications/glade-2.desktop
 share/glade-2/gtk/autogen.sh
@@ -79,4 +79,4 @@ share/omf/glade-2/glade-faq-ro.omf
 share/omf/glade-2/glade-user-guide-C.omf
 share/pixmaps/glade-2.png
 share/pixmaps/glade-2/glade_logo.png
-@exec ${MKDIR} %D/share/gnome/help/glade-2/ro/figures
+@pkgdir share/gnome/help/glade-2/ro/figures
diff --git a/devel/glib/PLIST b/devel/glib/PLIST
index 5f9221f6d37..08bd01f1c8f 100644
--- a/devel/glib/PLIST
+++ b/devel/glib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2009/06/14 17:48:45 joerg Exp $
+@comment $NetBSD: PLIST,v 1.11 2009/06/14 18:48:11 joerg Exp $
 bin/glib-config
 include/glib/glib-1.2/glib.h
 include/glib/glib-1.2/gmodule.h
@@ -12,4 +12,3 @@ lib/pkgconfig/gmodule.pc
 lib/pkgconfig/gthread.pc
 man/man1/glib-config.1
 share/aclocal/glib.m4
-@unexec ${RMDIR} %D/include/glib 2>/dev/null || ${TRUE}
diff --git a/devel/glib2/PLIST b/devel/glib2/PLIST
index a57baeaa17b..0e681dc701f 100644
--- a/devel/glib2/PLIST
+++ b/devel/glib2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.46 2009/06/14 17:48:46 joerg Exp $
+@comment $NetBSD: PLIST,v 1.47 2009/06/14 18:48:11 joerg Exp $
 bin/glib-genmarshal
 bin/glib-gettextize
 bin/glib-mkenums
@@ -498,5 +498,4 @@ share/locale/yi/LC_MESSAGES/glib20.mo
 share/locale/zh_CN/LC_MESSAGES/glib20.mo
 share/locale/zh_HK/LC_MESSAGES/glib20.mo
 share/locale/zh_TW/LC_MESSAGES/glib20.mo
-@exec ${MKDIR} %D/lib/gio/modules 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/include/glib 2>/dev/null || ${TRUE}
+@pkgdir lib/gio/modules
diff --git a/devel/gnustep-base/PLIST b/devel/gnustep-base/PLIST
index 6854fe4e5f5..07c947abe23 100644
--- a/devel/gnustep-base/PLIST
+++ b/devel/gnustep-base/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.23 2009/06/14 17:48:46 joerg Exp $
+@comment $NetBSD: PLIST,v 1.24 2009/06/14 18:48:11 joerg Exp $
 bin/HTMLLinker
 bin/autogsdoc
 bin/cvtenc
@@ -810,8 +810,6 @@ man/man1/sfparse.1
 man/man1/xmlparse.1
 man/man8/gdomap.8
 share/GNUstep/Makefiles/Additional/base.make
-@exec ${MKDIR} %D/lib/GNUstep/Bundles
-@unexec ${RMDIR} %D/lib/GNUstep/Libraries 2>/dev/null || ${TRUE}
-@exec ${MKDIR} %D/lib/GNUstep/Frameworks
-@unexec ${RMDIR} %D/lib/GNUstep 2>/dev/null || ${TRUE}
-@exec ${MKDIR} %D/include/GNUstepBase/unicode
+@pkgdir lib/GNUstep/Bundles
+@pkgdir lib/GNUstep/Frameworks
+@pkgdir include/GNUstepBase/unicode
diff --git a/devel/gnustep-examples/PLIST b/devel/gnustep-examples/PLIST
index 6da5c4ae935..6df34b8d576 100644
--- a/devel/gnustep-examples/PLIST
+++ b/devel/gnustep-examples/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2009/06/14 17:48:46 joerg Exp $
+@comment $NetBSD: PLIST,v 1.9 2009/06/14 18:48:11 joerg Exp $
 bin/Calculator
 bin/CurrencyConverter
 bin/GSTest
@@ -128,4 +128,3 @@ lib/GNUstep/Applications/md5Digest.app/md5Digest
 lib/GNUstep/Applications/md5Digest.app/stamp.make
 lib/GNUstep/Services/example.service/Resources/Info-gnustep.plist
 lib/GNUstep/Services/example.service/example
-@unexec ${RMDIR} -p %D/lib/GNUstep/ApplicationSupport 2>/dev/null || ${TRUE}
diff --git a/devel/gnustep-make/PLIST b/devel/gnustep-make/PLIST
index e455ed1d0b4..5a738b3192f 100644
--- a/devel/gnustep-make/PLIST
+++ b/devel/gnustep-make/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2009/06/14 17:48:46 joerg Exp $
+@comment $NetBSD: PLIST,v 1.20 2009/06/14 18:48:12 joerg Exp $
 bin/debugapp
 bin/gnustep-config
 bin/openapp
@@ -126,8 +126,7 @@ man/man1/openapp.1
 man/man1/opentool.1
 man/man7/GNUstep.7
 man/man7/library-combo.7
-@exec ${MKDIR} %D/share/GNUstep/Makefiles/${GNUSTEP_ARCH}
-@exec ${MKDIR} %D/share/GNUstep/Makefiles/Auxiliary
-@exec ${MKDIR} %D/share/GNUstep/Makefiles/Additional
-@unexec ${RMDIR} %D/share/GNUstep 2>/dev/null || ${TRUE}
-@exec ${MKDIR} %D/share/GNUstep/Library
+@pkgdir share/GNUstep/Makefiles/${GNUSTEP_ARCH}
+@pkgdir share/GNUstep/Makefiles/Auxiliary
+@pkgdir share/GNUstep/Makefiles/Additional
+@pkgdir share/GNUstep/Library
diff --git a/devel/guile-gnome/PLIST b/devel/guile-gnome/PLIST
index cff2ac060ed..8e1033d9c4b 100644
--- a/devel/guile-gnome/PLIST
+++ b/devel/guile-gnome/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 17:48:47 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2009/06/14 18:48:12 joerg Exp $
 bin/guile-gnome-2
 include/guile-gnome-2/guile-gnome-corba/guile-gnome-corba-generic.h
 include/guile-gnome-2/guile-gnome-corba/guile-gnome-corba-primitives.h
@@ -196,5 +196,5 @@ share/guile-gnome-2/gnome/pango.scm
 share/guile-gnome-2/gnome/pangocairo.scm
 share/guile-gnome-2/gnome/vfs.scm
 share/guile/site/gnome-2.scm
-@exec ${MKDIR} %D/share/guile-gnome-platform/examples/gnome-vfs
-@exec ${MKDIR} %D/share/guile-gnome-platform/examples/gconf
+@pkgdir share/guile-gnome-platform/examples/gnome-vfs
+@pkgdir share/guile-gnome-platform/examples/gconf
diff --git a/devel/java-subversion/PLIST b/devel/java-subversion/PLIST
index 856c76a9ca5..0d8940e369f 100644
--- a/devel/java-subversion/PLIST
+++ b/devel/java-subversion/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:48:49 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:48:12 joerg Exp $
 lib/libsvnjavahl-1.la
 lib/svn-javahl/svn-javahl.jar
-@exec ${MKDIR} %D/lib/svn-javahl/include
+@pkgdir lib/svn-javahl/include
diff --git a/devel/javacc/PLIST b/devel/javacc/PLIST
index db80842a8cd..71f8580b8c2 100644
--- a/devel/javacc/PLIST
+++ b/devel/javacc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:48:49 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:48:12 joerg Exp $
 bin/javacc
 bin/jjdoc
 bin/jjtree
@@ -149,4 +149,3 @@ share/examples/javacc/VTransformer/Main.java
 share/examples/javacc/VTransformer/README
 share/examples/javacc/VTransformer/SimpleNode.java
 share/examples/javacc/VTransformer/UnparseVisitor.java
-@unexec ${RMDIR} %D/lib/java 2>/dev/null || ${TRUE}
diff --git a/devel/kdevelop-base/PLIST b/devel/kdevelop-base/PLIST
index 4c6a288e3b5..d54cc8f4de5 100644
--- a/devel/kdevelop-base/PLIST
+++ b/devel/kdevelop-base/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.26 2009/06/14 17:48:50 joerg Exp $
+@comment $NetBSD: PLIST,v 1.27 2009/06/14 18:48:12 joerg Exp $
 bin/kdevassistant
 bin/kdevdesigner
 bin/kdevelop
@@ -1389,31 +1389,31 @@ share/kde/servicetypes/kdevelopquickopen.desktop
 share/kde/servicetypes/kdevelopsourceformatter.desktop
 share/kde/servicetypes/kdevelopvcsintegrator.desktop
 share/kde/servicetypes/kdevelopversioncontrol.desktop
-@exec ${MKDIR} %D/share/kde/apps/kdevvcsmanager
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdevelop-apidocs/src/profileengine/lib/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdevelop-apidocs/src/profileengine/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdevelop-apidocs/src/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdevelop-apidocs/parts/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdevelop-apidocs/parts/documentation/interfaces/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdevelop-apidocs/parts/documentation/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdevelop-apidocs/lib/widgets/propeditor/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdevelop-apidocs/lib/widgets/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdevelop-apidocs/lib/util/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdevelop-apidocs/lib/interfaces/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdevelop-apidocs/lib/interfaces/extras/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdevelop-apidocs/lib/interfaces/external/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdevelop-apidocs/lib/interfaces/extensions/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdevelop-apidocs/lib/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdevelop-apidocs/lib/catalog/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdevelop-apidocs/languages/lib/interfaces/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdevelop-apidocs/languages/lib/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdevelop-apidocs/languages/lib/designer_integration/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdevelop-apidocs/languages/lib/debugger/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdevelop-apidocs/languages/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdevelop-apidocs/buildtools/lib/widgets/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdevelop-apidocs/buildtools/lib/parsers/qmake/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdevelop-apidocs/buildtools/lib/parsers/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdevelop-apidocs/buildtools/lib/parsers/autotools/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdevelop-apidocs/buildtools/lib/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdevelop-apidocs/buildtools/lib/base/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdevelop-apidocs/buildtools/html
+@pkgdir share/kde/apps/kdevvcsmanager
+@pkgdir share/doc/kde/HTML/en/kdevelop-apidocs/src/profileengine/lib/html
+@pkgdir share/doc/kde/HTML/en/kdevelop-apidocs/src/profileengine/html
+@pkgdir share/doc/kde/HTML/en/kdevelop-apidocs/src/html
+@pkgdir share/doc/kde/HTML/en/kdevelop-apidocs/parts/html
+@pkgdir share/doc/kde/HTML/en/kdevelop-apidocs/parts/documentation/interfaces/html
+@pkgdir share/doc/kde/HTML/en/kdevelop-apidocs/parts/documentation/html
+@pkgdir share/doc/kde/HTML/en/kdevelop-apidocs/lib/widgets/propeditor/html
+@pkgdir share/doc/kde/HTML/en/kdevelop-apidocs/lib/widgets/html
+@pkgdir share/doc/kde/HTML/en/kdevelop-apidocs/lib/util/html
+@pkgdir share/doc/kde/HTML/en/kdevelop-apidocs/lib/interfaces/html
+@pkgdir share/doc/kde/HTML/en/kdevelop-apidocs/lib/interfaces/extras/html
+@pkgdir share/doc/kde/HTML/en/kdevelop-apidocs/lib/interfaces/external/html
+@pkgdir share/doc/kde/HTML/en/kdevelop-apidocs/lib/interfaces/extensions/html
+@pkgdir share/doc/kde/HTML/en/kdevelop-apidocs/lib/html
+@pkgdir share/doc/kde/HTML/en/kdevelop-apidocs/lib/catalog/html
+@pkgdir share/doc/kde/HTML/en/kdevelop-apidocs/languages/lib/interfaces/html
+@pkgdir share/doc/kde/HTML/en/kdevelop-apidocs/languages/lib/html
+@pkgdir share/doc/kde/HTML/en/kdevelop-apidocs/languages/lib/designer_integration/html
+@pkgdir share/doc/kde/HTML/en/kdevelop-apidocs/languages/lib/debugger/html
+@pkgdir share/doc/kde/HTML/en/kdevelop-apidocs/languages/html
+@pkgdir share/doc/kde/HTML/en/kdevelop-apidocs/buildtools/lib/widgets/html
+@pkgdir share/doc/kde/HTML/en/kdevelop-apidocs/buildtools/lib/parsers/qmake/html
+@pkgdir share/doc/kde/HTML/en/kdevelop-apidocs/buildtools/lib/parsers/html
+@pkgdir share/doc/kde/HTML/en/kdevelop-apidocs/buildtools/lib/parsers/autotools/html
+@pkgdir share/doc/kde/HTML/en/kdevelop-apidocs/buildtools/lib/html
+@pkgdir share/doc/kde/HTML/en/kdevelop-apidocs/buildtools/lib/base/html
+@pkgdir share/doc/kde/HTML/en/kdevelop-apidocs/buildtools/html
diff --git a/devel/libFoundation/PLIST b/devel/libFoundation/PLIST
index 96eed22e942..6a5c1bad7ab 100644
--- a/devel/libFoundation/PLIST
+++ b/devel/libFoundation/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 17:48:50 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:48:13 joerg Exp $
 include/libFoundation/Foundation/Foundation.h
 include/libFoundation/Foundation/NSAccount.h
 include/libFoundation/Foundation/NSAllocDebugZone.h
@@ -252,7 +252,5 @@ lib/GNUstep/Libraries/${PKGNAME}/Resources/libFoundation/TimeZoneInfo/WET
 lib/libFoundation.so
 lib/libFoundation.so.1.1.7
 share/GNUstep/Makefiles/Additional/libFoundation.make
-@exec ${MKDIR} %D/lib/GNUstep/Libraries/${PKGNAME}/Resources/libFoundation/TimeZoneInfo/Asia
-@exec ${MKDIR} %D/lib/GNUstep/Libraries/${PKGNAME}/Resources/libFoundation/TimeZoneInfo/Africa
-@unexec ${RMDIR} %D/lib/GNUstep/Libraries 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/lib/GNUstep 2>/dev/null || ${TRUE}
+@pkgdir lib/GNUstep/Libraries/${PKGNAME}/Resources/libFoundation/TimeZoneInfo/Asia
+@pkgdir lib/GNUstep/Libraries/${PKGNAME}/Resources/libFoundation/TimeZoneInfo/Africa
diff --git a/devel/libbonobo/PLIST b/devel/libbonobo/PLIST
index fb2aeefa674..6a1c27f9ce0 100644
--- a/devel/libbonobo/PLIST
+++ b/devel/libbonobo/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.21 2009/06/14 17:48:51 joerg Exp $
+@comment $NetBSD: PLIST,v 1.22 2009/06/14 18:48:13 joerg Exp $
 bin/activation-client
 bin/bonobo-activation-run-query
 bin/bonobo-slay
@@ -260,5 +260,3 @@ share/locale/yi/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/zh_HK/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/libbonobo-2.0.mo
-@unexec ${RMDIR} %D/lib/bonobo/monikers 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/lib/bonobo 2>/dev/null || ${TRUE}
diff --git a/devel/libsmi/PLIST b/devel/libsmi/PLIST
index e012d9a56fa..4d0d8b18bbe 100644
--- a/devel/libsmi/PLIST
+++ b/devel/libsmi/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2009/06/14 17:48:56 joerg Exp $
+@comment $NetBSD: PLIST,v 1.7 2009/06/14 18:48:13 joerg Exp $
 bin/smicache
 bin/smidiff
 bin/smidump
@@ -375,7 +375,7 @@ share/libsmi/pibs/SLS-NEGOTIATION-PIB
 share/libsmi/pibs/SLS-NEGOTIATION-PIB-orig
 share/libsmi/pibs/UMTS-PIB
 share/libsmi/pibs/UMTS-PIB-orig
-@exec ${MKDIR} %D/share/libsmi/pibs/tubs
-@exec ${MKDIR} %D/share/libsmi/pibs/site
-@exec ${MKDIR} %D/share/libsmi/pibs/ietf
-@exec ${MKDIR} %D/share/libsmi/mibs/site
+@pkgdir share/libsmi/pibs/tubs
+@pkgdir share/libsmi/pibs/site
+@pkgdir share/libsmi/pibs/ietf
+@pkgdir share/libsmi/mibs/site
diff --git a/devel/mantis/PLIST b/devel/mantis/PLIST
index 68e72fb6b6c..a3e6b0e6054 100644
--- a/devel/mantis/PLIST
+++ b/devel/mantis/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2009/06/14 17:48:57 joerg Exp $
+@comment $NetBSD: PLIST,v 1.15 2009/06/14 18:48:13 joerg Exp $
 share/doc/mantis/CUSTOMIZATION
 share/doc/mantis/INSTALL
 share/examples/mantis/config_inc.php
@@ -701,4 +701,3 @@ share/mantis/view_all_set.php
 share/mantis/view_filters_page.php
 share/mantis/wiki.php
 share/mantis/xmlhttprequest.php
-@unexec ${RMDIR} %D/share/mantis 2>/dev/null || ${TRUE}
diff --git a/devel/mono-tools/PLIST b/devel/mono-tools/PLIST
index 00f28a2c725..38a485dd44f 100644
--- a/devel/mono-tools/PLIST
+++ b/devel/mono-tools/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 17:48:58 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2009/06/14 18:48:14 joerg Exp $
 bin/create-native-map
 bin/gasnview
 bin/gendarme
@@ -123,4 +123,4 @@ share/pixmaps/gendarme.svg
 man/man1/mprof-decoder.1
 man/man1/mprof-heap-viewer.1
 share/pixmaps/monodoc.png
-@exec ${MKDIR} %D/lib/ilcontrast
+@pkgdir lib/ilcontrast
diff --git a/devel/netbeans-ide/PLIST b/devel/netbeans-ide/PLIST
index f3fc92814ac..3e87fc8dcf1 100644
--- a/devel/netbeans-ide/PLIST
+++ b/devel/netbeans-ide/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:49:00 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:48:14 joerg Exp $
 bin/netbeans
 share/doc/html/netbeans-ide/CHANGES.html
 share/doc/html/netbeans-ide/CREDITS.html
@@ -620,7 +620,7 @@ share/netbeans-ide/update_tracking/org-openide-io.xml
 share/netbeans-ide/update_tracking/org-openide-src.xml
 share/netbeans-ide/update_tracking/org-openide.xml
 share/netbeans-ide/update_tracking/org-openidex-util.xml
-@exec ${MKDIR} %D/share/netbeans-ide/tomcat406/server/classes
-@exec ${MKDIR} %D/share/netbeans-ide/tomcat406/classes
-@exec ${MKDIR} %D/share/netbeans-ide/modules/ext/locale
-@exec ${MKDIR} %D/share/netbeans-ide/lib/patches
+@pkgdir share/netbeans-ide/tomcat406/server/classes
+@pkgdir share/netbeans-ide/tomcat406/classes
+@pkgdir share/netbeans-ide/modules/ext/locale
+@pkgdir share/netbeans-ide/lib/patches
diff --git a/devel/pvs/PLIST b/devel/pvs/PLIST
index e739a624609..aaf273c5144 100644
--- a/devel/pvs/PLIST
+++ b/devel/pvs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2009/06/14 17:49:03 joerg Exp $
+@comment $NetBSD: PLIST,v 1.10 2009/06/14 18:48:14 joerg Exp $
 bin/pvs
 pvs/README
 pvs/bin/pvs-platform
@@ -520,4 +520,4 @@ pvs/pvs.sty
 pvs/wish/gray.xbm
 pvs/wish/pvs-support.tcl
 pvs/wish/sequent.xbm
-@exec ${MKDIR} %D/pvs/Examples
+@pkgdir pvs/Examples
diff --git a/devel/rpc2/PLIST b/devel/rpc2/PLIST
index 721bd5aa1df..c1327fc8e0e 100644
--- a/devel/rpc2/PLIST
+++ b/devel/rpc2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2009/06/14 17:49:07 joerg Exp $
+@comment $NetBSD: PLIST,v 1.12 2009/06/14 18:48:15 joerg Exp $
 bin/rp2gen
 include/rpc2/errors.h
 include/rpc2/multi.h
@@ -10,4 +10,4 @@ include/rpc2/sftp.h
 lib/librpc2.la
 lib/libse.la
 lib/pkgconfig/rpc2.pc
-@exec ${MKDIR} %D/share/rpc2
+@pkgdir share/rpc2
diff --git a/devel/rt3/PLIST b/devel/rt3/PLIST
index ca9858ded13..34a31aeac8c 100644
--- a/devel/rt3/PLIST
+++ b/devel/rt3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2009/06/14 17:49:08 joerg Exp $
+@comment $NetBSD: PLIST,v 1.14 2009/06/14 18:48:15 joerg Exp $
 bin/mason_handler.fcgi
 ${PLIST.speedycgi}bin/mason_handler.scgi
 bin/mason_handler.svc
@@ -1075,4 +1075,4 @@ share/rt3/html/autohandler
 share/rt3/html/dhandler
 share/rt3/html/index.html
 share/rt3/html/l
-@exec ${MKDIR} %D/share/rt3/html/Callbacks
+@pkgdir share/rt3/html/Callbacks
diff --git a/devel/ruby-SDL/PLIST b/devel/ruby-SDL/PLIST
index f73443e492d..64f1121c118 100644
--- a/devel/ruby-SDL/PLIST
+++ b/devel/ruby-SDL/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 17:49:08 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:48:15 joerg Exp $
 ${GEM_HOME}/cache/rubysdl-${PKGVERSION}.gem
 ${GEM_LIBDIR}/LICENSE
 ${GEM_LIBDIR}/MANIFEST
@@ -103,4 +103,3 @@ ${GEM_LIBDIR}/sample/testgl.rb
 ${GEM_LIBDIR}/sample/testsprite.rb
 ${GEM_LIBDIR}/sample/transformblit.rb
 ${GEM_HOME}/specifications/rubysdl-${PKGVERSION}.gemspec
-@exec ${MKDIR} %D/lib/ruby/gems/1.8/doc/rubysdl-${PKGVERSION}
diff --git a/devel/ruby-abstract/PLIST b/devel/ruby-abstract/PLIST
index 69e0fe079df..a3538d3d6eb 100644
--- a/devel/ruby-abstract/PLIST
+++ b/devel/ruby-abstract/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:49:08 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:48:15 joerg Exp $
 ${GEM_HOME}/cache/abstract-${PKGVERSION}.gem
 ${GEM_LIBDIR}/ChangeLog
 ${GEM_LIBDIR}/README.txt
@@ -7,4 +7,3 @@ ${GEM_LIBDIR}/lib/abstract.rb
 ${GEM_LIBDIR}/setup.rb
 ${GEM_LIBDIR}/test/test.rb
 ${GEM_HOME}/specifications/abstract-${PKGVERSION}.gemspec
-@exec ${MKDIR} %D/${GEM_DOCDIR}
diff --git a/devel/ruby-debug-ide/PLIST b/devel/ruby-debug-ide/PLIST
index eacde85a8aa..ad1a3dffe74 100644
--- a/devel/ruby-debug-ide/PLIST
+++ b/devel/ruby-debug-ide/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 17:49:09 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2009/06/14 18:48:16 joerg Exp $
 bin/rdebug-ide
 ${GEM_HOME}/cache/ruby-debug-ide-${PKGVERSION}.gem
 ${GEM_LIBDIR}/bin/rdebug-ide
@@ -23,4 +23,3 @@ ${GEM_LIBDIR}/lib/ruby-debug/printers.rb
 ${GEM_LIBDIR}/lib/ruby-debug/processor.rb
 ${GEM_LIBDIR}/lib/ruby-debug/xml_printer.rb
 ${GEM_HOME}/specifications/ruby-debug-ide-${PKGVERSION}.gemspec
-@exec ${MKDIR} %D/${GEM_DOCDIR}
diff --git a/devel/ruby-gettext/PLIST b/devel/ruby-gettext/PLIST
index 03bf0ea81ff..c234f3e4c80 100644
--- a/devel/ruby-gettext/PLIST
+++ b/devel/ruby-gettext/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2009/06/14 17:49:09 joerg Exp $
+@comment $NetBSD: PLIST,v 1.7 2009/06/14 18:48:16 joerg Exp $
 bin/rgettext
 bin/rmsgfmt
 bin/rmsgmerge
@@ -1160,4 +1160,3 @@ ${GEM_LIBDIR}/test/testlib/testlib4.rb
 ${GEM_LIBDIR}/test/testlib/testlib5.rb
 ${GEM_LIBDIR}/test/testlib/testlib6.rb
 ${GEM_HOME}/specifications/gettext-${PKGVERSION}.gemspec
-@exec ${MKDIR} %D/${GEM_DOCDIR}
diff --git a/devel/ruby-metaid/PLIST b/devel/ruby-metaid/PLIST
index 142632b55e1..ad76d5731f3 100644
--- a/devel/ruby-metaid/PLIST
+++ b/devel/ruby-metaid/PLIST
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:49:10 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:48:16 joerg Exp $
 ${GEM_HOME}/cache/metaid-${PKGVERSION}.gem
 ${GEM_LIBDIR}/.require_paths
 ${GEM_LIBDIR}/metaid.rb
 ${GEM_HOME}/specifications/metaid-${PKGVERSION}.gemspec
-@exec ${MKDIR} %D/${GEM_DOCDIR}
diff --git a/devel/ruby-ncurses/PLIST b/devel/ruby-ncurses/PLIST
index ac71ea9b364..0d64e1d108d 100644
--- a/devel/ruby-ncurses/PLIST
+++ b/devel/ruby-ncurses/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 17:49:11 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:48:17 joerg Exp $
 ${GEM_HOME}/cache/ncurses-${PKGVERSION}.gem
 ${GEM_LIBDIR}/COPYING
 ${GEM_LIBDIR}/Changes
@@ -27,4 +27,3 @@ ${GEM_LIBDIR}/ncurses_wrap.h
 ${GEM_LIBDIR}/panel_wrap.c
 ${GEM_LIBDIR}/panel_wrap.h
 ${GEM_HOME}/specifications/ncurses-${PKGVERSION}.gemspec
-@exec ${MKDIR} %D/${GEM_DOCDIR}
diff --git a/devel/scmgit-base/PLIST b/devel/scmgit-base/PLIST
index 67f7431ab66..a30fbf6795e 100644
--- a/devel/scmgit-base/PLIST
+++ b/devel/scmgit-base/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2009/06/14 17:49:13 joerg Exp $
+@comment $NetBSD: PLIST,v 1.13 2009/06/14 18:48:17 joerg Exp $
 bin/git
 bin/git-cvsserver
 bin/git-receive-pack
@@ -216,4 +216,4 @@ ${PLIST.gui}share/gitk/lib/msgs/de.msg
 ${PLIST.gui}share/gitk/lib/msgs/es.msg
 ${PLIST.gui}share/gitk/lib/msgs/it.msg
 ${PLIST.gui}share/gitk/lib/msgs/sv.msg
-@exec ${MKDIR} %D/share/examples/scmgit/templates/branches
+@pkgdir share/examples/scmgit/templates/branches
diff --git a/devel/sdcc/PLIST b/devel/sdcc/PLIST
index de040cae1d0..a329cf6d9b2 100644
--- a/devel/sdcc/PLIST
+++ b/devel/sdcc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 17:49:13 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:48:17 joerg Exp $
 bin/as-gbz80
 bin/as-hc08
 bin/as-z80
@@ -3216,6 +3216,6 @@ share/sdcc/sdcc/lib/z80/time.o
 share/sdcc/sdcc/lib/z80/vprintf.asm
 share/sdcc/sdcc/lib/z80/vprintf.o
 share/sdcc/sdcc/lib/z80/z80.lib
-@exec ${MKDIR} %D/share/sdcc/sdcc/lib/src/small
-@exec ${MKDIR} %D/share/sdcc/sdcc/lib/src/medium
-@exec ${MKDIR} %D/share/sdcc/sdcc/lib/src/large
+@pkgdir share/sdcc/sdcc/lib/src/small
+@pkgdir share/sdcc/sdcc/lib/src/medium
+@pkgdir share/sdcc/sdcc/lib/src/large
diff --git a/devel/sparsehash/PLIST b/devel/sparsehash/PLIST
index fb0452e7fcb..93c5fa207fe 100644
--- a/devel/sparsehash/PLIST
+++ b/devel/sparsehash/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 17:49:15 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2009/06/14 18:48:18 joerg Exp $
 include/google/dense_hash_map
 include/google/dense_hash_set
 include/google/sparse_hash_map
@@ -16,4 +16,3 @@ share/doc/sparsehash/performance.html
 share/doc/sparsehash/sparse_hash_map.html
 share/doc/sparsehash/sparse_hash_set.html
 share/doc/sparsehash/sparsetable.html
-@unexec ${RMDIR} %D/include/google || ${TRUE}
diff --git a/devel/st/PLIST b/devel/st/PLIST
index d8580565203..98d539725ef 100644
--- a/devel/st/PLIST
+++ b/devel/st/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 17:49:15 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:48:18 joerg Exp $
 bin/st-lookupdns
 bin/st-proxy
 bin/st-server
@@ -8,4 +8,4 @@ share/doc/html/st/fig.gif
 share/doc/html/st/notes.html
 share/doc/html/st/reference.html
 share/doc/html/st/st.html
-@exec ${MKDIR} %D/include/st
+@pkgdir include/st
diff --git a/devel/vtcl/PLIST b/devel/vtcl/PLIST
index 54c44193ced..7e70a8cead5 100644
--- a/devel/vtcl/PLIST
+++ b/devel/vtcl/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:49:17 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:48:18 joerg Exp $
 bin/vtcl
 lib/vtcl/images/anchor.gif
 lib/vtcl/images/anchor_c.ppm
@@ -425,4 +425,4 @@ share/examples/vtcl/sample/notebook.tcl
 share/examples/vtcl/sample/notebook_recurse.tcl
 share/examples/vtcl/sample/panedwindow.tcl
 share/examples/vtcl/sample/sampleBLT.tcl
-@exec ${MKDIR} %D/lib/vtcl/lib/Widgets/user
+@pkgdir lib/vtcl/lib/Widgets/user
diff --git a/devel/xfce4-dev-tools/PLIST b/devel/xfce4-dev-tools/PLIST
index 6dd83bdab60..701546cb552 100644
--- a/devel/xfce4-dev-tools/PLIST
+++ b/devel/xfce4-dev-tools/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 17:49:17 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2009/06/14 18:48:18 joerg Exp $
 bin/xdt-autogen
 bin/xdt-commit
 share/xfce4/dev-tools/m4macros/xdt-depends.m4
@@ -6,9 +6,3 @@ share/xfce4/dev-tools/m4macros/xdt-features.m4
 share/xfce4/dev-tools/m4macros/xdt-i18n.m4
 share/xfce4/dev-tools/m4macros/xdt-python.m4
 share/xfce4/dev-tools/m4macros/xdt-xfce.m4
-@unexec ${RMDIR} %D/share/xfce4/doc/C/images 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/xfce4/doc/C 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/xfce4/doc/fr/images 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/xfce4/doc/fr 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/xfce4/doc 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/xfce4 2>/dev/null || ${TRUE}
diff --git a/editors/TeXmacs/PLIST b/editors/TeXmacs/PLIST
index 0f7362eeede..a07e15f95d9 100644
--- a/editors/TeXmacs/PLIST
+++ b/editors/TeXmacs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.40 2009/06/14 17:50:20 joerg Exp $
+@comment $NetBSD: PLIST,v 1.41 2009/06/14 18:53:00 joerg Exp $
 bin/fig2ps
 bin/texmacs
 include/TeXmacs.h
@@ -2290,21 +2290,21 @@ share/TeXmacs/texts/test/fonts-2.tm
 share/TeXmacs/texts/test/fonts-3.tm
 share/TeXmacs/texts/test/fonts.tm
 share/TeXmacs/texts/test/overview.tm
-@exec ${MKDIR} %D/share/TeXmacs/examples/plugins/world/bin
-@exec ${MKDIR} %D/share/TeXmacs/examples/plugins/substitute/bin
-@exec ${MKDIR} %D/share/TeXmacs/examples/plugins/secure/bin
-@exec ${MKDIR} %D/share/TeXmacs/examples/plugins/prompt/bin
-@exec ${MKDIR} %D/share/TeXmacs/examples/plugins/pnambic/bin
-@exec ${MKDIR} %D/share/TeXmacs/examples/plugins/nested/bin
-@exec ${MKDIR} %D/share/TeXmacs/examples/plugins/mutator/bin
-@exec ${MKDIR} %D/share/TeXmacs/examples/plugins/multiline/bin
-@exec ${MKDIR} %D/share/TeXmacs/examples/plugins/minimal/bin
-@exec ${MKDIR} %D/share/TeXmacs/examples/plugins/menus/bin
-@exec ${MKDIR} %D/share/TeXmacs/examples/plugins/markup/bin
-@exec ${MKDIR} %D/share/TeXmacs/examples/plugins/input/bin
-@exec ${MKDIR} %D/share/TeXmacs/examples/plugins/handler/bin
-@exec ${MKDIR} %D/share/TeXmacs/examples/plugins/formula/bin
-@exec ${MKDIR} %D/share/TeXmacs/examples/plugins/dynlink/lib
-@exec ${MKDIR} %D/share/TeXmacs/examples/plugins/dynlink/bin
-@exec ${MKDIR} %D/share/TeXmacs/examples/plugins/complete/bin
-@exec ${MKDIR} %D/libexec/TeXmacs/lib
+@pkgdir share/TeXmacs/examples/plugins/world/bin
+@pkgdir share/TeXmacs/examples/plugins/substitute/bin
+@pkgdir share/TeXmacs/examples/plugins/secure/bin
+@pkgdir share/TeXmacs/examples/plugins/prompt/bin
+@pkgdir share/TeXmacs/examples/plugins/pnambic/bin
+@pkgdir share/TeXmacs/examples/plugins/nested/bin
+@pkgdir share/TeXmacs/examples/plugins/mutator/bin
+@pkgdir share/TeXmacs/examples/plugins/multiline/bin
+@pkgdir share/TeXmacs/examples/plugins/minimal/bin
+@pkgdir share/TeXmacs/examples/plugins/menus/bin
+@pkgdir share/TeXmacs/examples/plugins/markup/bin
+@pkgdir share/TeXmacs/examples/plugins/input/bin
+@pkgdir share/TeXmacs/examples/plugins/handler/bin
+@pkgdir share/TeXmacs/examples/plugins/formula/bin
+@pkgdir share/TeXmacs/examples/plugins/dynlink/lib
+@pkgdir share/TeXmacs/examples/plugins/dynlink/bin
+@pkgdir share/TeXmacs/examples/plugins/complete/bin
+@pkgdir libexec/TeXmacs/lib
diff --git a/editors/emacs/PLIST b/editors/emacs/PLIST
index d33946504aa..9024734dbc5 100644
--- a/editors/emacs/PLIST
+++ b/editors/emacs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.21 2009/06/14 17:50:21 joerg Exp $
+@comment $NetBSD: PLIST,v 1.22 2009/06/14 18:53:00 joerg Exp $
 bin/emacs-b2m
 bin/emacs-ctags
 bin/emacs-ebrowse
@@ -2707,5 +2707,3 @@ share/emacs/${PKGVERSION}/lisp/xt-mouse.el.gz
 share/emacs/${PKGVERSION}/lisp/xt-mouse.elc
 share/emacs/${PKGVERSION}/site-lisp/subdirs.el
 share/emacs/site-lisp/subdirs.el
-@unexec ${RMDIR} %D/share/emacs/site-lisp 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/emacs 2>/dev/null || ${TRUE}
diff --git a/editors/emacs20/PLIST b/editors/emacs20/PLIST
index 632f55ae79b..a7a8e544574 100644
--- a/editors/emacs20/PLIST
+++ b/editors/emacs20/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2009/06/14 17:50:22 joerg Exp $
+@comment $NetBSD: PLIST,v 1.8 2009/06/14 18:53:00 joerg Exp $
 bin/emacs
 bin/emacs-${PKGVERSION}
 bin/emacs-b2m
@@ -1276,5 +1276,4 @@ share/emacs/${PKGVERSION}/lisp/zone-mode.el
 share/emacs/${PKGVERSION}/lisp/zone-mode.elc
 share/emacs/${PKGVERSION}/site-lisp/subdirs.el
 share/emacs/site-lisp/subdirs.el
-@exec ${MKDIR} %D/share/emacs/${PKGVERSION}/leim
-@unexec ${RMDIR} %D/share/emacs 2>/dev/null || ${TRUE}
+@pkgdir share/emacs/${PKGVERSION}/leim
diff --git a/editors/emacs21/PLIST b/editors/emacs21/PLIST
index 1d7d5308b1a..2a4e51c0a18 100644
--- a/editors/emacs21/PLIST
+++ b/editors/emacs21/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2009/06/14 17:50:22 joerg Exp $
+@comment $NetBSD: PLIST,v 1.8 2009/06/14 18:53:00 joerg Exp $
 bin/emacs
 bin/emacs-${EMACSVERSION}
 bin/emacs-b2m
@@ -49,7 +49,6 @@ man/man1/emacs-ctags.1
 man/man1/emacs-etags.1
 man/man1/emacs-gfdl.1
 man/man1/emacs.1
-@unexec ${RMDIR} %D/share/emacs 2>/dev/null || ${TRUE}
 share/emacs/${EMACSVERSION}/etc/BABYL
 share/emacs/${EMACSVERSION}/etc/CENSORSHIP
 share/emacs/${EMACSVERSION}/etc/COOKIES
@@ -171,7 +170,7 @@ share/emacs/${EMACSVERSION}/etc/ulimit.hack
 share/emacs/${EMACSVERSION}/etc/vipcard.tex
 share/emacs/${EMACSVERSION}/etc/viperCard.tex
 share/emacs/${EMACSVERSION}/etc/yow.lines
-@exec ${MKDIR} %D/share/emacs/${EMACSVERSION}/leim
+@pkgdir share/emacs/${EMACSVERSION}/leim
 share/emacs/${EMACSVERSION}/lisp/COPYING
 share/emacs/${EMACSVERSION}/lisp/README
 share/emacs/${EMACSVERSION}/lisp/abbrev.el
@@ -1768,5 +1767,3 @@ share/emacs/${EMACSVERSION}/lisp/xt-mouse.el
 share/emacs/${EMACSVERSION}/lisp/xt-mouse.elc
 share/emacs/${EMACSVERSION}/site-lisp/subdirs.el
 share/emacs/site-lisp/subdirs.el
-@unexec ${RMDIR} %D/share/emacs/site-lisp 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/emacs 2>/dev/null || ${TRUE}
diff --git a/editors/gedit/PLIST b/editors/gedit/PLIST
index dc1197cb0de..f9d209f17bf 100644
--- a/editors/gedit/PLIST
+++ b/editors/gedit/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.37 2009/06/14 17:50:22 joerg Exp $
+@comment $NetBSD: PLIST,v 1.38 2009/06/14 18:53:00 joerg Exp $
 bin/gedit
 bin/gnome-text-editor
 include/gedit-2.20/gedit/gedit-app.h
@@ -405,6 +405,6 @@ share/omf/gedit/gedit-uk.omf
 share/omf/gedit/gedit-zh_CN.omf
 share/omf/gedit/gedit-zh_HK.omf
 share/omf/gedit/gedit-zh_TW.omf
-@exec ${MKDIR} %D/share/gedit-2/plugins/sample
-@exec ${MKDIR} %D/share/gedit-2/plugins/indent
-@exec ${MKDIR} %D/share/gedit-2/plugins/changecase
+@pkgdir share/gedit-2/plugins/sample
+@pkgdir share/gedit-2/plugins/indent
+@pkgdir share/gedit-2/plugins/changecase
diff --git a/editors/nvi/PLIST b/editors/nvi/PLIST
index 8e6e00568c5..ccbcb97748e 100644
--- a/editors/nvi/PLIST
+++ b/editors/nvi/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 17:50:25 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:53:00 joerg Exp $
 bin/nex
 bin/nvi
 bin/nview
@@ -25,4 +25,3 @@ share/vi/tcl/errors.tcl
 share/vi/tcl/gnats.tcl
 share/vi/tcl/mailprocs.tcl
 share/vi/tcl/wc.tcl
-@unexec ${RMDIR} %D/share/vi 2>/dev/null || ${TRUE}
diff --git a/editors/speedbar/PLIST b/editors/speedbar/PLIST
index c98df71922e..4b07257ffb2 100644
--- a/editors/speedbar/PLIST
+++ b/editors/speedbar/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2006/03/20 04:59:08 jlam Exp $
+@comment $NetBSD: PLIST,v 1.10 2009/06/14 18:53:00 joerg Exp $
 ${EMACS_INFOPREFIX}/speedbar.info
 ${EMACS_LISPPREFIX}/speedbar/dframe.el
 ${EMACS_LISPPREFIX}/speedbar/dframe.elc
@@ -30,4 +30,3 @@ ${EMACS_LISPPREFIX}/speedbar/sb-tag-v.xpm
 ${EMACS_LISPPREFIX}/speedbar/sb-tag.xpm
 ${EMACS_LISPPREFIX}/speedbar/speedbar.el
 ${EMACS_LISPPREFIX}/speedbar/speedbar.elc
-@unexec ${RMDIR} %D/${EMACS_LISPPREFIX}/speedbar 2>/dev/null || ${TRUE}
diff --git a/editors/vim-lang/PLIST b/editors/vim-lang/PLIST
index 7da2c1e8ad0..e2477efb4eb 100644
--- a/editors/vim-lang/PLIST
+++ b/editors/vim-lang/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2009/06/14 17:50:27 joerg Exp $
+@comment $NetBSD: PLIST,v 1.10 2009/06/14 18:53:00 joerg Exp $
 man/fr.ISO8859-1/man1/evim.1
 man/fr.ISO8859-1/man1/ex.1
 man/fr.ISO8859-1/man1/rview.1
@@ -304,25 +304,3 @@ share/vim/${VIM_SUBDIR}/lang/zh_CN.UTF-8/LC_MESSAGES/vim.mo
 share/vim/${VIM_SUBDIR}/lang/zh_CN/LC_MESSAGES/vim.mo
 share/vim/${VIM_SUBDIR}/lang/zh_TW.UTF-8/LC_MESSAGES/vim.mo
 share/vim/${VIM_SUBDIR}/lang/zh_TW/LC_MESSAGES/vim.mo
-@unexec ${RMDIR} %D/man/fr.ISO8859-1/man1 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/man/fr.ISO8859-1 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/man/fr.UTF-8/man1 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/man/fr.UTF-8 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/man/fr/man1 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/man/fr 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/man/it.ISO8859-1/man1 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/man/it.ISO8859-1 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/man/it.UTF-8/man1 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/man/it.UTF-8 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/man/it/man1 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/man/it 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/man/pl.ISO8859-2/man1 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/man/pl.ISO8859-2 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/man/pl.UTF-8/man1 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/man/pl.UTF-8 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/man/pl/man1 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/man/pl 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/man/ru.KOI8-R/man1 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/man/ru.KOI8-R 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/man/ru.UTF-8/man1 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/man/ru.UTF-8 2>/dev/null || ${TRUE}
diff --git a/editors/xemacs-current/PLIST b/editors/xemacs-current/PLIST
index fc65649d90c..bc158d83518 100644
--- a/editors/xemacs-current/PLIST
+++ b/editors/xemacs-current/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2009/06/14 17:50:28 joerg Exp $
+@comment $NetBSD: PLIST,v 1.21 2009/06/14 18:53:01 joerg Exp $
 bin/${DISTNAME}
 bin/ellcc
 bin/gnuattach
@@ -10,8 +10,6 @@ bin/xemacs-b2m
 bin/xemacs-ctags
 bin/xemacs-etags
 bin/xemacs-rcs-checkin
-@exec ${MKDIR} %D/lib/xemacs/site-lisp
-@exec ${MKDIR} %D/lib/xemacs/site-modules
 lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/DOC
 lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/add-big-package.sh
 lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/config.values
@@ -1434,5 +1432,7 @@ man/man1/gnuserv.1
 man/man1/xemacs-ctags.1
 man/man1/xemacs-etags.1
 man/man1/xemacs.1
+@pkgdir lib/xemacs/site-lisp
+@pkgdir lib/xemacs/site-modules
 @exec ${MKDIR} /var/tmp/xemacs.lock && chmod 1777 /var/tmp/xemacs.lock
 @unexec ${RM} -rf /var/tmp/xemacs.lock
diff --git a/editors/xemacs/PLIST b/editors/xemacs/PLIST
index 217705b82f9..0953e59d510 100644
--- a/editors/xemacs/PLIST
+++ b/editors/xemacs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2009/06/14 17:50:27 joerg Exp $
+@comment $NetBSD: PLIST,v 1.18 2009/06/14 18:53:01 joerg Exp $
 bin/${DISTNAME}
 bin/ellcc
 bin/gnuattach
@@ -1254,6 +1254,6 @@ man/man1/gnuserv.1
 man/man1/xemacs-ctags.1
 man/man1/xemacs-etags.1
 man/man1/xemacs.1
-@exec ${MKDIR} %D/lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/modules
-@exec ${MKDIR} %D/lib/xemacs/site-modules
-@exec ${MKDIR} %D/lib/xemacs/site-lisp
+@pkgdir lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/modules
+@pkgdir lib/xemacs/site-modules
+@pkgdir lib/xemacs/site-lisp
diff --git a/emulators/aranym/PLIST b/emulators/aranym/PLIST
index 9e5201709f0..e18c685ab37 100644
--- a/emulators/aranym/PLIST
+++ b/emulators/aranym/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 17:51:01 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:54:52 joerg Exp $
 bin/aranym
 man/man1/aranym-jit.1
 man/man1/aranym-mmu.1
@@ -33,6 +33,6 @@ share/doc/aranym/emutos/changelog.txt
 share/doc/aranym/emutos/license.txt
 share/doc/aranym/emutos/readme.txt
 share/doc/aranym/emutos/status.txt
-@exec ${MKDIR} %D/share/aranym/atari/nfosmesa
-@exec ${MKDIR} %D/share/aranym/atari/nfjpeg
-@exec ${MKDIR} %D/share/aranym/atari/nfcdrom
+@pkgdir share/aranym/atari/nfosmesa
+@pkgdir share/aranym/atari/nfjpeg
+@pkgdir share/aranym/atari/nfcdrom
diff --git a/emulators/raine/PLIST b/emulators/raine/PLIST
index 8e8cebfd0f9..ccfcf3ee4f7 100644
--- a/emulators/raine/PLIST
+++ b/emulators/raine/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 17:51:07 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2009/06/14 18:54:52 joerg Exp $
 bin/raine
 share/applications/raine.desktop
 share/pixmaps/raine.png
@@ -28,6 +28,6 @@ share/raine/languages/template.cfg
 share/raine/languages/turkish.cfg
 share/raine/raine
 share/raine/raine.dat
-@exec ${MKDIR} %D/share/raine/roms
-@exec ${MKDIR} %D/share/raine/emudx
-@exec ${MKDIR} %D/share/raine/artwork
+@pkgdir share/raine/roms
+@pkgdir share/raine/emudx
+@pkgdir share/raine/artwork
diff --git a/emulators/vmware-module/PLIST b/emulators/vmware-module/PLIST
index 885cd5313e1..c8b9f48ff88 100644
--- a/emulators/vmware-module/PLIST
+++ b/emulators/vmware-module/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 17:51:09 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:54:52 joerg Exp $
 etc/rc.conf.d/linuxrtc
 etc/rc.conf.d/vmmon
 etc/rc.conf.d/vmnet
@@ -17,4 +17,3 @@ lkm/vmmon_post.sh
 @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/emulators/vmware-module3/PLIST b/emulators/vmware-module3/PLIST
index 8361bf6f5a5..d968c051092 100644
--- a/emulators/vmware-module3/PLIST
+++ b/emulators/vmware-module3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:51:09 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:54:53 joerg Exp $
 etc/rc.conf.d/linuxrtc
 etc/rc.conf.d/vmmon
 etc/rc.conf.d/vmnet
@@ -17,4 +17,3 @@ lkm/vmmon_post.sh
 @unexec ${RM} -f %D/lkm/vmnet 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/emulators/vmware3/PLIST b/emulators/vmware3/PLIST
index 29f43965ba9..06835a95bc4 100644
--- a/emulators/vmware3/PLIST
+++ b/emulators/vmware3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:51:10 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:54:53 joerg Exp $
 bin/vmnet-bridge
 bin/vmnet-dhcpd
 bin/vmnet-natd
@@ -303,4 +303,4 @@ share/vmware/xkeymap/se101
 share/vmware/xkeymap/se104
 share/vmware/xkeymap/us101
 share/vmware/xkeymap/us104
-@exec ${MKDIR} -p %D/share/vmware/licenses/site
+@pkgdir share/vmware/licenses/site