Replace @exec/@unexec with @pkgdir or drop it.

29 files changed, 88 insertions, 117 deletions

diff --git a/lang/STk/PLIST b/lang/STk/PLIST
index bd323da616f..632022b6a62 100644
--- a/lang/STk/PLIST
+++ b/lang/STk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:03:28 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2009/06/14 20:34:12 joerg Exp $
 bin/snow
 bin/snow-4.0.1
 bin/stk
@@ -552,4 +552,4 @@ lib/stk/4.0.1/man/mann/stk_wm.n
 lib/stk/man
 share/doc/stk/Extending.ps
 share/doc/stk/manual.ps
-@exec ${MKDIR} %D/lib/stk/site-scheme
+@pkgdir lib/stk/site-scheme
diff --git a/lang/chicken/PLIST b/lang/chicken/PLIST
index c690c5c2981..a96ce6e2b52 100644
--- a/lang/chicken/PLIST
+++ b/lang/chicken/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2009/06/14 18:03:29 joerg Exp $
+@comment $NetBSD: PLIST,v 1.23 2009/06/14 20:34:13 joerg Exp $
 bin/chicken
 bin/chicken-bug
 bin/chicken-profile
@@ -87,4 +87,4 @@ share/doc/${PKGNAME}/html/unit-tcp.html
 share/doc/${PKGNAME}/html/unit-utils.html
 share/doc/${PKGNAME}/html/using-the-compiler.html
 share/doc/${PKGNAME}/html/using-the-interpreter.html
-@exec ${MKDIR} %D/lib/chicken/3
+@pkgdir lib/chicken/3
diff --git a/lang/coq/PLIST b/lang/coq/PLIST
index 6de34047334..ceca5865564 100644
--- a/lang/coq/PLIST
+++ b/lang/coq/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2009/06/14 18:03:29 joerg Exp $
+@comment $NetBSD: PLIST,v 1.9 2009/06/14 20:34:13 joerg Exp $
 bin/coq-interface
 bin/coq-tex
 bin/coq_makefile
@@ -357,4 +357,4 @@ man/man1/parser.1
 share/emacs/site-lisp/coq-inferior.el
 share/emacs/site-lisp/coq.el
 share/emacs/site-lisp/coqdoc.sty
-@exec ${MKDIR} %D/lib/coq/user-contrib
+@pkgdir lib/coq/user-contrib
diff --git a/lang/erlang-doc/PLIST b/lang/erlang-doc/PLIST
index 03d634b1055..95ba9a31849 100644
--- a/lang/erlang-doc/PLIST
+++ b/lang/erlang-doc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:03:30 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2009/06/14 20:34:13 joerg Exp $
 lib/erlang/doc/applications.html
 lib/erlang/doc/design_principles/applications.html
 lib/erlang/doc/design_principles/appup_cookbook.html
@@ -2306,4 +2306,3 @@ lib/erlang/lib/xmerl-${VERSION.xmerl}/doc/html/xmerl_xs.html
 lib/erlang/lib/xmerl-${VERSION.xmerl}/doc/html/xmerl_xs_examples.html
 lib/erlang/lib/xmerl-${VERSION.xmerl}/doc/html/xmerl_xsd.html
 lib/erlang/lib/xmerl-${VERSION.xmerl}/info
-@unexec ${RMDIR} %D/lib/erlang/lib/jinterface-${VERSION.jinterface} 2>/dev/null || ${TRUE}
diff --git a/lang/erlang/PLIST.common_end b/lang/erlang/PLIST.common_end
index c2855cea1fa..2038a751f3c 100644
--- a/lang/erlang/PLIST.common_end
+++ b/lang/erlang/PLIST.common_end
@@ -1,16 +1,16 @@
-@comment $NetBSD: PLIST.common_end,v 1.8 2009/06/14 18:03:30 joerg Exp $
-@exec ${MKDIR} %D/lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/otpCA/crl
-@exec ${MKDIR} %D/lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/otpCA/certs
-@exec ${MKDIR} %D/lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/erlangCA/crl
-@exec ${MKDIR} %D/lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/erlangCA/certs
-@exec ${MKDIR} %D/lib/erlang/lib/orber-${VERSION.orber}/priv/lib
-@exec ${MKDIR} %D/lib/erlang/lib/kernel-${VERSION.kernel}/examples/uds_dist/priv
-@exec ${MKDIR} %D/lib/erlang/lib/kernel-${VERSION.kernel}/examples/uds_dist/ebin
-@exec ${MKDIR} %D/lib/erlang/lib/inets-${VERSION.inets}/examples/server_root/logs
-@exec ${MKDIR} %D/lib/erlang/lib/inets-${VERSION.inets}/examples/server_root/htdocs/secret/top_secret
-@exec ${MKDIR} %D/lib/erlang/lib/inets-${VERSION.inets}/examples/server_root/htdocs/mnesia_secret/top_secret
-@exec ${MKDIR} %D/lib/erlang/lib/erl_interface-${VERSION.erl_interface}/src/auxdir
-@exec ${MKDIR} %D/lib/erlang/lib/common_test-${VERSION.common_test}/priv/lib
-@exec ${MKDIR} %D/lib/erlang/lib/common_test-${VERSION.common_test}/priv/bin
-@exec ${MKDIR} %D/lib/erlang/erts-${VERSION.erts}/man
-@exec ${MKDIR} %D/lib/erlang/erts-${VERSION.erts}/doc
+@comment $NetBSD: PLIST.common_end,v 1.9 2009/06/14 20:34:13 joerg Exp $
+@pkgdir lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/otpCA/crl
+@pkgdir lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/otpCA/certs
+@pkgdir lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/erlangCA/crl
+@pkgdir lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/erlangCA/certs
+@pkgdir lib/erlang/lib/orber-${VERSION.orber}/priv/lib
+@pkgdir lib/erlang/lib/kernel-${VERSION.kernel}/examples/uds_dist/priv
+@pkgdir lib/erlang/lib/kernel-${VERSION.kernel}/examples/uds_dist/ebin
+@pkgdir lib/erlang/lib/inets-${VERSION.inets}/examples/server_root/logs
+@pkgdir lib/erlang/lib/inets-${VERSION.inets}/examples/server_root/htdocs/secret/top_secret
+@pkgdir lib/erlang/lib/inets-${VERSION.inets}/examples/server_root/htdocs/mnesia_secret/top_secret
+@pkgdir lib/erlang/lib/erl_interface-${VERSION.erl_interface}/src/auxdir
+@pkgdir lib/erlang/lib/common_test-${VERSION.common_test}/priv/lib
+@pkgdir lib/erlang/lib/common_test-${VERSION.common_test}/priv/bin
+@pkgdir lib/erlang/erts-${VERSION.erts}/man
+@pkgdir lib/erlang/erts-${VERSION.erts}/doc
diff --git a/lang/gauche/PLIST b/lang/gauche/PLIST
index 511d06fb86b..58fb26daa11 100644
--- a/lang/gauche/PLIST
+++ b/lang/gauche/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2009/06/14 18:03:31 joerg Exp $
+@comment $NetBSD: PLIST,v 1.20 2009/06/14 20:34:13 joerg Exp $
 bin/gauche-cesconv
 bin/gauche-config
 bin/gauche-install
@@ -258,15 +258,5 @@ share/gauche/${PKGVERSION}/template.extension.h
 share/gauche/${PKGVERSION}/template.extensionlib.stub
 share/gauche/${PKGVERSION}/template.module.scm
 share/gauche/${PKGVERSION}/template.test.scm
-@exec ${MKDIR} %D/lib/gauche/site 2>/dev/null || ${TRUE}
-@exec ${MKDIR} %D/lib/gauche/site/${PKGVERSION} 2>/dev/null || ${TRUE}
-@exec ${MKDIR} %D/lib/gauche/site/${PKGVERSION}/${MACHINE_GNU_PLATFORM} 2>/dev/null || ${TRUE}
-@exec ${MKDIR} %D/share/gauche/site 2>/dev/null || ${TRUE}
-@exec ${MKDIR} %D/share/gauche/site/lib 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/gauche/site/lib 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/gauche/site 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/gauche 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/lib/gauche/site/${PKGVERSION}/${MACHINE_GNU_PLATFORM} 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/lib/gauche/site/${PKGVERSION} 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/lib/gauche/site 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/lib/gauche 2>/dev/null || ${TRUE}
+@pkgdir lib/gauche/site/${PKGVERSION}/${MACHINE_GNU_PLATFORM}
+@pkgdir share/gauche/site/lib 2>/dev/null || ${TRUE}
diff --git a/lang/gforth/PLIST b/lang/gforth/PLIST
index 7a54c0caca0..1bc57f6838d 100644
--- a/lang/gforth/PLIST
+++ b/lang/gforth/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2009/06/14 18:03:32 joerg Exp $
+@comment $NetBSD: PLIST,v 1.11 2009/06/14 20:34:13 joerg Exp $
 bin/gforth
 bin/${PKGNAME}
 bin/gforth-fast
@@ -183,22 +183,18 @@ share/gforth/${PKGVERSION}/vt100key.fs
 share/gforth/${PKGVERSION}/wordinfo.fs
 share/gforth/${PKGVERSION}/wordsets.fs
 share/gforth/site-forth/siteinit.fs
-@exec ${MKDIR} %D/share/gforth/${PKGVERSION}/arch/sparc
-@exec ${MKDIR} %D/share/gforth/${PKGVERSION}/arch/shboom
-@exec ${MKDIR} %D/share/gforth/${PKGVERSION}/arch/sharc
-@exec ${MKDIR} %D/share/gforth/${PKGVERSION}/arch/power
-@exec ${MKDIR} %D/share/gforth/${PKGVERSION}/arch/misc
-@exec ${MKDIR} %D/share/gforth/${PKGVERSION}/arch/m68k
-@exec ${MKDIR} %D/share/gforth/${PKGVERSION}/arch/ia64
-@exec ${MKDIR} %D/share/gforth/${PKGVERSION}/arch/hppa
-@exec ${MKDIR} %D/share/gforth/${PKGVERSION}/arch/h8
-@exec ${MKDIR} %D/share/gforth/${PKGVERSION}/arch/generic
-@exec ${MKDIR} %D/share/gforth/${PKGVERSION}/arch/c165
-@exec ${MKDIR} %D/share/gforth/${PKGVERSION}/arch/avr
-@exec ${MKDIR} %D/share/gforth/${PKGVERSION}/arch/8086
-@exec ${MKDIR} %D/share/gforth/${PKGVERSION}/arch/6502
-@exec ${MKDIR} %D/share/gforth/${PKGVERSION}/arch/4stack
-@unexec ${RMDIR} %D/share/gforth/site-forth 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/gforth 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/lib/gforth/site-forth 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/lib/gforth 2>/dev/null || ${TRUE}
+@pkgdir share/gforth/${PKGVERSION}/arch/sparc
+@pkgdir share/gforth/${PKGVERSION}/arch/shboom
+@pkgdir share/gforth/${PKGVERSION}/arch/sharc
+@pkgdir share/gforth/${PKGVERSION}/arch/power
+@pkgdir share/gforth/${PKGVERSION}/arch/misc
+@pkgdir share/gforth/${PKGVERSION}/arch/m68k
+@pkgdir share/gforth/${PKGVERSION}/arch/ia64
+@pkgdir share/gforth/${PKGVERSION}/arch/hppa
+@pkgdir share/gforth/${PKGVERSION}/arch/h8
+@pkgdir share/gforth/${PKGVERSION}/arch/generic
+@pkgdir share/gforth/${PKGVERSION}/arch/c165
+@pkgdir share/gforth/${PKGVERSION}/arch/avr
+@pkgdir share/gforth/${PKGVERSION}/arch/8086
+@pkgdir share/gforth/${PKGVERSION}/arch/6502
+@pkgdir share/gforth/${PKGVERSION}/arch/4stack
diff --git a/lang/guile/PLIST b/lang/guile/PLIST
index 438da716bc0..e69c4d7a746 100644
--- a/lang/guile/PLIST
+++ b/lang/guile/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.24 2009/06/14 18:03:33 joerg Exp $
+@comment $NetBSD: PLIST,v 1.25 2009/06/14 20:34:13 joerg Exp $
 bin/guile
 bin/guile-config
 bin/guile-snarf
@@ -278,4 +278,4 @@ share/guile/1.8/srfi/srfi-69.scm
 share/guile/1.8/srfi/srfi-8.scm
 share/guile/1.8/srfi/srfi-88.scm
 share/guile/1.8/srfi/srfi-9.scm
-@exec ${MKDIR} %D/share/guile/site
+@pkgdir share/guile/site
diff --git a/lang/gwydion-dylan/PLIST b/lang/gwydion-dylan/PLIST
index c89af47eb37..2ed75bb3828 100644
--- a/lang/gwydion-dylan/PLIST
+++ b/lang/gwydion-dylan/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:03:33 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/06/14 20:34:13 joerg Exp $
 bin/d2c
 bin/dybug
 bin/mindy
@@ -69,5 +69,5 @@ man/man4/platforms.descr.4
 man/man7/dylan.7
 man/man7/gwydion.7
 share/dylan/platforms.descr
-@exec ${MKDIR} %D/lib/dylan/${PKGVERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/elisp
-@exec ${MKDIR} %D/lib/dylan/${PKGVERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/dylan-user
+@pkgdir lib/dylan/${PKGVERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/elisp
+@pkgdir lib/dylan/${PKGVERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/dylan-user
diff --git a/lang/inform/PLIST b/lang/inform/PLIST
index b2f5c7b77af..7583ccf021c 100644
--- a/lang/inform/PLIST
+++ b/lang/inform/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2009/06/14 18:03:33 joerg Exp $
+@comment $NetBSD: PLIST,v 1.9 2009/06/14 20:34:13 joerg Exp $
 bin/inform
 bin/inform-6.31
 share/inform/6.31/include/AdHints.h
@@ -254,7 +254,7 @@ share/zcode/ruins1.z5
 share/zcode/ruins2.z5
 share/zcode/ruins3.z5
 share/zcode/toyshop.z5
-@exec ${MKDIR} %D/share/inform/include
-@exec ${MKDIR} %D/share/inform/module
-@exec ${MKDIR} %D/share/inform/manual
-@exec ${MKDIR} %D/share/zcode
+@pkgdir share/inform/include
+@pkgdir share/inform/module
+@pkgdir share/inform/manual
+@pkgdir share/zcode
diff --git a/lang/jbuilder-jit/PLIST b/lang/jbuilder-jit/PLIST
index 97ae55aaa0f..97a96d478d3 100644
--- a/lang/jbuilder-jit/PLIST
+++ b/lang/jbuilder-jit/PLIST
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 18:03:34 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2009/06/14 20:34:14 joerg Exp $
 ${JAVADIR}/lib/i386/libjavacomp.so
 ${JAVADIR}/lib/i386/libjavacomp_g.so
 share/doc/jbuilder-jit/README.javacomp
 share/doc/jbuilder-jit/LICENSE.javacomp
-@unexec ${RMDIR} %D/${JAVADIR}/lib/i386 2>/dev/null || ${TRUE}
diff --git a/lang/jdk-openjit/PLIST b/lang/jdk-openjit/PLIST
index ceb8179b3e2..f6a631c4def 100644
--- a/lang/jdk-openjit/PLIST
+++ b/lang/jdk-openjit/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:03:34 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/06/14 20:34:14 joerg Exp $
 ${JAVADIR}/${CLASSDIR}/org/OpenJIT/BCinfo.class
 ${JAVADIR}/${CLASSDIR}/org/OpenJIT/Compile.class
 ${JAVADIR}/${CLASSDIR}/org/OpenJIT/CompilerError.class
@@ -24,4 +24,3 @@ ${JAVADIR}/${CLASSDIR}/org/OpenJIT/X86code.class
 ${JAVADIR}/${CLASSDIR}/org/OpenJIT/X86reg.class
 ${JAVADIR}/${JRELIB}/libOpenJIT.so
 ${JAVADIR}/${JRELIB}/libOpenJIT_g.so
-@unexec ${RMDIR} -p %D/${JAVADIR}/${CLASSDIR}/org 2>/dev/null || ${TRUE}
diff --git a/lang/lua/PLIST b/lang/lua/PLIST
index 9705966f844..9d62206b5c3 100644
--- a/lang/lua/PLIST
+++ b/lang/lua/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2009/06/14 18:03:36 joerg Exp $
+@comment $NetBSD: PLIST,v 1.12 2009/06/14 20:34:14 joerg Exp $
 bin/lua
 bin/luac
 include/lauxlib.h
@@ -46,5 +46,5 @@ share/examples/lua/table.lua
 share/examples/lua/trace-calls.lua
 share/examples/lua/trace-globals.lua
 share/examples/lua/xd.lua
-@exec ${MKDIR} %D/share/lua/5.1
-@exec ${MKDIR} %D/lib/lua/5.1
+@pkgdir share/lua/5.1
+@pkgdir lib/lua/5.1
diff --git a/lang/ocaml/PLIST b/lang/ocaml/PLIST
index 4b106a71bfe..207a99d6699 100644
--- a/lang/ocaml/PLIST
+++ b/lang/ocaml/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2009/06/14 18:03:37 joerg Exp $
+@comment $NetBSD: PLIST,v 1.20 2009/06/14 20:34:14 joerg Exp $
 bin/camlp4
 bin/camlp4boot
 bin/camlp4o
@@ -519,5 +519,3 @@ man/man3/Unix.LargeFile.3o
 man/man3/Weak.3o
 man/man3/Weak.Make.3o
 man/man3/Weak.S.3o
-@unexec ${RMDIR} %D/lib/ocaml/ocamldoc/custom 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/lib/ocaml 2>/dev/null || ${TRUE}
diff --git a/lang/pear/PLIST b/lang/pear/PLIST
index 9a5263f9df9..6fa6f0ef8e3 100644
--- a/lang/pear/PLIST
+++ b/lang/pear/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:03:38 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2009/06/14 20:34:14 joerg Exp $
 bin/pear
 bin/peardev
 bin/pecl
@@ -11,8 +11,6 @@ lib/php/.depdb
 lib/php/.depdblock
 lib/php/.filemap
 lib/php/.lock
-@exec ${MKDIR} %D/lib/php/.registry/.channel.__uri
-@exec ${MKDIR} %D/lib/php/.registry/.channel.pecl.php.net
 lib/php/.registry/archive_tar.reg
 lib/php/.registry/console_getopt.reg
 lib/php/.registry/pear.reg
@@ -146,7 +144,5 @@ lib/php/test/Structures_Graph/tests/README
 lib/php/test/Structures_Graph/tests/all-tests.php
 lib/php/test/Structures_Graph/tests/testCase/BasicGraph.php
 share/examples/pear/pear.conf
-@unexec ${RMDIR} %D/lib/php/data 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/lib/php/test 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/lib/php/doc 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/lib/php/.registry 2>/dev/null || ${TRUE}
+@pkgdir lib/php/.registry/.channel.__uri
+@pkgdir lib/php/.registry/.channel.pecl.php.net
diff --git a/lang/php5/PLIST b/lang/php5/PLIST
index 3dce1adbbaa..c758a4faa1c 100644
--- a/lang/php5/PLIST
+++ b/lang/php5/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2009/06/14 18:03:38 joerg Exp $
+@comment $NetBSD: PLIST,v 1.23 2009/06/14 20:34:14 joerg Exp $
 bin/php
 bin/php-config
 bin/phpize
@@ -161,7 +161,6 @@ include/php/ext/standard/url_scanner.h
 include/php/ext/standard/url_scanner_ex.h
 include/php/ext/xml/expat_compat.h
 include/php/ext/xml/php_xml.h
-@exec ${MKDIR} %D/include/php/include
 include/php/main/SAPI.h
 include/php/main/build-defs.h
 include/php/main/config.w32.h
@@ -227,4 +226,4 @@ man/man1/phpize.1
 share/examples/php/php.ini-dist
 share/examples/php/php.ini-recommended
 share/php/php.gif
-@unexec ${RMDIR} %D/lib/php 2>/dev/null || ${TRUE}
+@pkgdir include/php/include
diff --git a/lang/python26/PLIST.common_end b/lang/python26/PLIST.common_end
index 3ea45f7c53e..3667bab2d52 100644
--- a/lang/python26/PLIST.common_end
+++ b/lang/python26/PLIST.common_end
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST.common_end,v 1.4 2009/06/14 18:03:39 joerg Exp $
-@exec ${MKDIR} %D/lib/python${PY_VER_SUFFIX}/lib-old
+@comment $NetBSD: PLIST.common_end,v 1.5 2009/06/14 20:34:14 joerg Exp $
+@pkgdir lib/python${PY_VER_SUFFIX}/lib-old
diff --git a/lang/ruby18-base/PLIST b/lang/ruby18-base/PLIST
index 635fa8f227c..fbb3699fe11 100644
--- a/lang/ruby18-base/PLIST
+++ b/lang/ruby18-base/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2009/06/10 12:46:47 taca Exp $
+@comment $NetBSD: PLIST,v 1.16 2009/06/14 20:34:14 joerg Exp $
 bin/erb${RUBY_VER}
 bin/h2rb${RUBY_VER}
 bin/irb${RUBY_VER}
@@ -106,8 +106,6 @@ ${RUBY_ARCHLIB}/thread.${RUBY_DLEXT}
 ${RUBY_ARCHLIB}/util.h
 ${RUBY_ARCHLIB}/version.h
 ${RUBY_ARCHLIB}/zlib.${RUBY_DLEXT}
-@exec ${MKDIR} %D/${RUBY_SITEARCHLIB}
-@exec ${MKDIR} %D/${RUBY_VENDORARCHLIB}
 ${RUBY_LIB}/importenv.rb
 ${PLIST.io}${RUBY_LIB}/io/nonblock.rb
 ${RUBY_LIB}/ipaddr.rb
@@ -774,3 +772,5 @@ ${RUBY_EG}/webrick/hello.rb
 ${RUBY_EG}/webrick/httpd.rb
 ${RUBY_EG}/webrick/httpproxy.rb
 ${RUBY_EG}/webrick/httpsd.rb
+@pkgdir ${RUBY_SITEARCHLIB}
+@pkgdir ${RUBY_VENDORARCHLIB}
diff --git a/lang/ruby18-base/PLIST.common_end b/lang/ruby18-base/PLIST.common_end
deleted file mode 100644
index 4c606c2d377..00000000000
--- a/lang/ruby18-base/PLIST.common_end
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST.common_end,v 1.9 2009/06/14 18:03:40 joerg Exp $
-@unexec ${RMDIR} %D/lib/ruby 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/${RUBY_RIDIR} 2>/dev/null || ${TRUE}
diff --git a/lang/sbcl/PLIST b/lang/sbcl/PLIST
index f9698019fca..759c4bfc933 100644
--- a/lang/sbcl/PLIST
+++ b/lang/sbcl/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2009/06/14 18:03:40 joerg Exp $
+@comment $NetBSD: PLIST,v 1.7 2009/06/14 20:34:15 joerg Exp $
 bin/sbcl
 lib/sbcl/asdf-install/.cvsignore
 lib/sbcl/asdf-install/CVS/Entries
@@ -247,5 +247,5 @@ share/doc/sbcl/COPYING
 share/doc/sbcl/CREDITS
 share/doc/sbcl/NEWS
 share/doc/sbcl/SUPPORT
-@exec ${MKDIR} %D/share/doc/sbcl/html
-@exec ${MKDIR} %D/lib/sbcl/site-systems
+@pkgdir share/doc/sbcl/html
+@pkgdir lib/sbcl/site-systems
diff --git a/lang/smalltalk/PLIST b/lang/smalltalk/PLIST
index 50ac8b8fa1d..e8ef9c0aefd 100644
--- a/lang/smalltalk/PLIST
+++ b/lang/smalltalk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2009/06/14 18:03:41 joerg Exp $
+@comment $NetBSD: PLIST,v 1.19 2009/06/14 20:34:15 joerg Exp $
 bin/gst
 bin/gst-blox
 bin/gst-config
@@ -272,4 +272,4 @@ share/smalltalk/unsupported/resolve.st
 share/smalltalk/unsupported/t.st
 share/smalltalk/unsupported/torture.st
 var/lib/smalltalk/gst.im
-@exec ${MKDIR} %D/include/snprintfv
+@pkgdir include/snprintfv
diff --git a/lang/sun-jdk6/PLIST b/lang/sun-jdk6/PLIST
index 4573c90e958..8c635da7af5 100644
--- a/lang/sun-jdk6/PLIST
+++ b/lang/sun-jdk6/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2009/06/14 18:03:42 joerg Exp $
+@comment $NetBSD: PLIST,v 1.7 2009/06/14 20:34:15 joerg Exp $
 bin/sun6-appletviewer
 bin/sun6-apt
 bin/sun6-extcheck
@@ -3653,4 +3653,4 @@ java/sun-6/sample/webservices/EbayServer/src/ebay/server/Ebay.java
 java/sun-6/sample/webservices/EbayServer/src/ebay/server/ImageProvider.java
 java/sun-6/sample/webservices/EbayServer/src/ebay/server/Main.java
 java/sun-6/src.zip
-@exec ${MKDIR} %D/java/sun-6/db/demo/programs/localcal/lib
+@pkgdir java/sun-6/db/demo/programs/localcal/lib
diff --git a/lang/sun-jre15/PLIST.linux-i386 b/lang/sun-jre15/PLIST.linux-i386
index 297b596bdfb..481b71922fd 100644
--- a/lang/sun-jre15/PLIST.linux-i386
+++ b/lang/sun-jre15/PLIST.linux-i386
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.linux-i386,v 1.9 2009/06/14 18:03:42 joerg Exp $
+@comment $NetBSD: PLIST.linux-i386,v 1.10 2009/06/14 20:34:15 joerg Exp $
 bin/sun15-java
 bin/sun15-javaws
 bin/sun15-keytool
@@ -667,4 +667,4 @@ java/sun-1.5/plugin/desktop/sun_java.desktop
 java/sun-1.5/plugin/desktop/sun_java.png
 java/sun-1.5/plugin/i386/ns7-gcc29/libjavaplugin_oji.so
 java/sun-1.5/plugin/i386/ns7/libjavaplugin_oji.so
-@exec ${MKDIR} %D/java/sun-1.5/lib/applet
+@pkgdir java/sun-1.5/lib/applet
diff --git a/lang/sun-jre15/PLIST.linux-x86_64 b/lang/sun-jre15/PLIST.linux-x86_64
index 37270b329d9..72285692bff 100644
--- a/lang/sun-jre15/PLIST.linux-x86_64
+++ b/lang/sun-jre15/PLIST.linux-x86_64
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.linux-x86_64,v 1.7 2009/06/14 18:03:42 joerg Exp $
+@comment $NetBSD: PLIST.linux-x86_64,v 1.8 2009/06/14 20:34:15 joerg Exp $
 bin/sun15-java
 bin/sun15-javaws
 bin/sun15-keytool
@@ -613,4 +613,4 @@ java/sun-1.5/man/man1/rmiregistry.1
 java/sun-1.5/man/man1/servertool.1
 java/sun-1.5/man/man1/tnameserv.1
 java/sun-1.5/man/man1/unpack200.1
-@exec ${MKDIR} %D/java/sun-1.5/lib/applet
+@pkgdir java/sun-1.5/lib/applet
diff --git a/lang/sun-jre6/PLIST.linux-i386 b/lang/sun-jre6/PLIST.linux-i386
index d4c60adf56c..2e3a29200c2 100644
--- a/lang/sun-jre6/PLIST.linux-i386
+++ b/lang/sun-jre6/PLIST.linux-i386
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.linux-i386,v 1.15 2009/06/14 18:03:43 joerg Exp $
+@comment $NetBSD: PLIST.linux-i386,v 1.16 2009/06/14 20:34:15 joerg Exp $
 bin/sun6-java
 bin/sun6-javaws
 bin/sun6-keytool
@@ -719,4 +719,4 @@ java/sun-6/plugin/desktop/sun_java.desktop
 java/sun-6/plugin/desktop/sun_java.png
 java/sun-6/plugin/i386/ns7-gcc29/libjavaplugin_oji.so
 java/sun-6/plugin/i386/ns7/libjavaplugin_oji.so
-@exec ${MKDIR} %D/java/sun-6/lib/applet
+@pkgdir java/sun-6/lib/applet
diff --git a/lang/swi-prolog-lite/PLIST b/lang/swi-prolog-lite/PLIST
index 1790b48ed61..1ee4ea5fbf5 100644
--- a/lang/swi-prolog-lite/PLIST
+++ b/lang/swi-prolog-lite/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 18:03:43 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2009/06/14 20:34:15 joerg Exp $
 bin/plld
 bin/plrc
 bin/swi-prolog
@@ -95,5 +95,5 @@ lib/swi-prolog-${PKGVERSION}/swipl
 man/man1/plld.1
 man/man1/plrc.1
 man/man1/swi-prolog.1
-@exec ${MKDIR} %D/lib/swi-prolog-${PKGVERSION}/man
-@exec ${MKDIR} %D/lib/swi-prolog-${PKGVERSION}/lib/${MACHINE_ARCH}-${LOWER_OPSYS}${APPEND_ELF}
+@pkgdir lib/swi-prolog-${PKGVERSION}/man
+@pkgdir lib/swi-prolog-${PKGVERSION}/lib/${MACHINE_ARCH}-${LOWER_OPSYS}${APPEND_ELF}
diff --git a/lang/tcl-expect/PLIST b/lang/tcl-expect/PLIST
index 2e91876912c..374691f33e7 100644
--- a/lang/tcl-expect/PLIST
+++ b/lang/tcl-expect/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2009/06/14 18:03:43 joerg Exp $
+@comment $NetBSD: PLIST,v 1.12 2009/06/14 20:34:16 joerg Exp $
 bin/expect
 include/expect.h
 include/expect_comm.h
@@ -40,4 +40,3 @@ share/examples/tcl/expect/weather
 share/examples/tcl/expect/xkibitz
 share/examples/tcl/expect/xkibitz.1
 share/examples/tcl/expect/xpstat
-@unexec ${RMDIR} %D/share/examples/tcl 2>/dev/null || ${TRUE}
diff --git a/lang/tcl-otcl/PLIST b/lang/tcl-otcl/PLIST
index 2190970b359..dac18306dee 100644
--- a/lang/tcl-otcl/PLIST
+++ b/lang/tcl-otcl/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:03:43 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2009/06/14 20:34:16 joerg Exp $
 bin/otclsh
 bin/owish
 include/otcl.h
@@ -10,4 +10,3 @@ share/doc/tcl/otcl/class.html
 share/doc/tcl/otcl/object.html
 share/doc/tcl/otcl/tutorial.html
 share/doc/tcl/otcl/otcl-paper.ps.gz
-@unexec ${RMDIR} %D/share/doc/tcl 2>/dev/null || ${TRUE}
diff --git a/lang/tcl/PLIST b/lang/tcl/PLIST
index 605ac9e31e6..ba468b7d11e 100644
--- a/lang/tcl/PLIST
+++ b/lang/tcl/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2009/06/14 18:03:43 joerg Exp $
+@comment $NetBSD: PLIST,v 1.12 2009/06/14 20:34:15 joerg Exp $
 bin/tclsh
 bin/tclsh8.4
 include/tcl.h
@@ -731,4 +731,4 @@ man/mann/upvar.n
 man/mann/variable.n
 man/mann/vwait.n
 man/mann/while.n
-@exec ${MKDIR} %D/lib/tcl
+@pkgdir lib/tcl