summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sysutils/bacula-gnome-console/PLIST3
-rw-r--r--sysutils/bacula-tray-monitor/PLIST3
-rw-r--r--sysutils/bacula-wx-console/PLIST3
-rw-r--r--sysutils/bacula/PLIST.common_end2
-rw-r--r--sysutils/bbsload/PLIST3
-rw-r--r--sysutils/consolekit/PLIST4
-rw-r--r--sysutils/dbus/PLIST8
-rw-r--r--sysutils/gkrellm-server/PLIST3
-rw-r--r--sysutils/gvfs/PLIST4
-rw-r--r--sysutils/hal-info/PLIST6
-rw-r--r--sysutils/mc/Makefile3
-rw-r--r--sysutils/mc/PLIST9
-rw-r--r--sysutils/mc/PLIST.end2
-rw-r--r--sysutils/memtest86/PLIST3
-rw-r--r--sysutils/memtestplus/PLIST3
-rw-r--r--sysutils/munin-node/PLIST5
-rw-r--r--sysutils/munin-server/PLIST5
-rw-r--r--sysutils/nautilus/PLIST3
-rw-r--r--sysutils/rtty/PLIST12
-rw-r--r--sysutils/ruby-facter/PLIST3
-rw-r--r--sysutils/ruby-rb-appscript/PLIST3
-rw-r--r--sysutils/ups-nut/PLIST4
-rw-r--r--textproc/crimson/PLIST3
-rw-r--r--textproc/db2latex/PLIST3
-rw-r--r--textproc/dict-server/PLIST4
-rw-r--r--textproc/docbook-simple/PLIST3
-rw-r--r--textproc/docbook-xml/PLIST3
-rw-r--r--textproc/docbook-xsl/PLIST3
-rw-r--r--textproc/dsssl-docbook-modular/PLIST4
-rw-r--r--textproc/groff/PLIST6
-rw-r--r--textproc/groff/PLIST.x114
-rw-r--r--textproc/hunspell-de/PLIST3
-rw-r--r--textproc/hunspell-en_GB/PLIST3
-rw-r--r--textproc/hunspell-en_US/PLIST3
-rw-r--r--textproc/hunspell-sv_SE/PLIST3
-rw-r--r--textproc/hunspell/PLIST.common3
-rw-r--r--textproc/jade/PLIST3
-rw-r--r--textproc/libxslt/PLIST4
-rw-r--r--textproc/openjade/PLIST3
-rw-r--r--textproc/py-FourSuite/PLIST8
-rw-r--r--textproc/rarian/PLIST4
-rw-r--r--textproc/ruby-bluecloth/PLIST3
-rw-r--r--textproc/ruby-maruku/PLIST3
-rw-r--r--textproc/ruby-rison/PLIST3
-rw-r--r--textproc/ruby-rttool/PLIST3
-rw-r--r--textproc/ruby-xmlparser/PLIST3
-rw-r--r--textproc/saxon/PLIST3
-rw-r--r--textproc/tei-p5-schema/PLIST3
-rw-r--r--textproc/xalan-j/PLIST3
-rw-r--r--textproc/xapian-omega/PLIST3
-rw-r--r--textproc/xerces-j/PLIST3
-rw-r--r--textproc/xp/PLIST3
-rw-r--r--textproc/xt/PLIST3
-rw-r--r--time/bbdate/PLIST3
-rw-r--r--time/kronolith/PLIST4
-rw-r--r--time/pcal/PLIST3
-rw-r--r--time/planner/PLIST4
-rw-r--r--time/rsibreak/PLIST6
-rw-r--r--time/sunbird/PLIST4
-rw-r--r--time/xfce4-orage/PLIST3
60 files changed, 82 insertions, 145 deletions
diff --git a/sysutils/bacula-gnome-console/PLIST b/sysutils/bacula-gnome-console/PLIST
index f7c598a2dc1..cab74010fba 100644
--- a/sysutils/bacula-gnome-console/PLIST
+++ b/sysutils/bacula-gnome-console/PLIST
@@ -1,4 +1,3 @@
-@comment $NetBSD: PLIST,v 1.2 2007/09/07 15:15:35 ghen Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/06/14 21:28:46 joerg Exp $
sbin/bgnome-console
share/examples/bacula/bgnome-console.conf
-@unexec ${RMDIR} %D/share/examples/bacula 2>/dev/null || ${TRUE}
diff --git a/sysutils/bacula-tray-monitor/PLIST b/sysutils/bacula-tray-monitor/PLIST
index 6be753bd6d2..3437251e3ed 100644
--- a/sysutils/bacula-tray-monitor/PLIST
+++ b/sysutils/bacula-tray-monitor/PLIST
@@ -1,4 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/02/03 08:22:08 ghen Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/06/14 21:28:46 joerg Exp $
sbin/bacula-tray-monitor
share/examples/bacula/tray-monitor.conf
-@unexec ${RMDIR} %D/share/examples/bacula 2>/dev/null || ${TRUE}
diff --git a/sysutils/bacula-wx-console/PLIST b/sysutils/bacula-wx-console/PLIST
index 2c73254fa37..968b962baea 100644
--- a/sysutils/bacula-wx-console/PLIST
+++ b/sysutils/bacula-wx-console/PLIST
@@ -1,4 +1,3 @@
-@comment $NetBSD: PLIST,v 1.2 2007/09/07 15:15:35 ghen Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/06/14 21:28:46 joerg Exp $
sbin/bwx-console
share/examples/bacula/bwx-console.conf
-@unexec ${RMDIR} %D/share/examples/bacula 2>/dev/null || ${TRUE}
diff --git a/sysutils/bacula/PLIST.common_end b/sysutils/bacula/PLIST.common_end
deleted file mode 100644
index 39b40ab8b2e..00000000000
--- a/sysutils/bacula/PLIST.common_end
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST.common_end,v 1.3 2009/06/14 18:16:01 joerg Exp $
-@unexec ${RMDIR} %D/share/examples/bacula 2>/dev/null || ${TRUE}
diff --git a/sysutils/bbsload/PLIST b/sysutils/bbsload/PLIST
index eaf7cc1f2f5..73fbf286b04 100644
--- a/sysutils/bbsload/PLIST
+++ b/sysutils/bbsload/PLIST
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 2003/03/18 01:07:56 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.4 2009/06/14 21:28:47 joerg Exp $
bin/bbsload
man/man1/bbsload.1
share/bbtools/README.bbsload
share/bbtools/bbsload.bb
share/bbtools/bbsload.nobb
-@unexec ${RMDIR} %D/share/bbtools 2>/dev/null || ${TRUE}
diff --git a/sysutils/consolekit/PLIST b/sysutils/consolekit/PLIST
index abbfea583ba..507773cf3b6 100644
--- a/sysutils/consolekit/PLIST
+++ b/sysutils/consolekit/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:16:02 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/06/14 21:28:47 joerg Exp $
bin/ck-history
bin/ck-launch-session
bin/ck-list-sessions
@@ -21,5 +21,5 @@ share/dbus-1/interfaces/org.freedesktop.ConsoleKit.Session.xml
share/dbus-1/system-services/org.freedesktop.ConsoleKit.service
share/examples/consolekit/ConsoleKit.conf
share/examples/consolekit/00-primary.seat
-@exec ${MKDIR} %D/lib/ConsoleKit/run-session.d
+@pkgdir lib/ConsoleKit/run-session.d
@exec ${MKDIR} %D/etc/ConsoleKit/seats.d
diff --git a/sysutils/dbus/PLIST b/sysutils/dbus/PLIST
index 4dbfb99cd62..48fb9eeb006 100644
--- a/sysutils/dbus/PLIST
+++ b/sysutils/dbus/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2009/06/14 18:16:02 joerg Exp $
+@comment $NetBSD: PLIST,v 1.13 2009/06/14 21:28:47 joerg Exp $
bin/dbus-cleanup-sockets
bin/dbus-daemon
bin/dbus-launch
@@ -36,6 +36,6 @@ share/examples/dbus/system.conf
share/examples/rc.d/dbus
${PLIST.linux}share/examples/rc.d/messagebus.redhat
${PLIST.linux}share/examples/rc.d/rc.messagebus.slackware
-@exec ${MKDIR} %D/share/dbus-1/system-services
-@exec ${MKDIR} %D/share/dbus-1/services
-@exec ${MKDIR} %D/libexec/dbus-1
+@pkgdir share/dbus-1/system-services
+@pkgdir share/dbus-1/services
+@pkgdir libexec/dbus-1
diff --git a/sysutils/gkrellm-server/PLIST b/sysutils/gkrellm-server/PLIST
index ce979db6fc7..980ac5f079c 100644
--- a/sysutils/gkrellm-server/PLIST
+++ b/sysutils/gkrellm-server/PLIST
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:16:05 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2009/06/14 21:28:47 joerg Exp $
bin/gkrellmd
include/gkrellm2/gkrellmd.h
man/man1/gkrellmd.1
share/examples/gkrellm-server/gkrellmd.conf
share/examples/rc.d/gkrellmd
-@unexec ${RMDIR} %D/include/gkrellm2 2>/dev/null || ${TRUE}
diff --git a/sysutils/gvfs/PLIST b/sysutils/gvfs/PLIST
index 28bab16b67f..28d745cfcba 100644
--- a/sysutils/gvfs/PLIST
+++ b/sysutils/gvfs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2009/06/14 18:16:07 joerg Exp $
+@comment $NetBSD: PLIST,v 1.10 2009/06/14 21:28:47 joerg Exp $
bin/gvfs-cat
bin/gvfs-copy
bin/gvfs-info
@@ -114,4 +114,4 @@ share/locale/vi/LC_MESSAGES/gvfs.mo
share/locale/zh_CN/LC_MESSAGES/gvfs.mo
share/locale/zh_HK/LC_MESSAGES/gvfs.mo
share/locale/zh_TW/LC_MESSAGES/gvfs.mo
-@exec ${MKDIR} %D/share/gvfs/remote-volume-monitors
+@pkgdir share/gvfs/remote-volume-monitors
diff --git a/sysutils/hal-info/PLIST b/sysutils/hal-info/PLIST
index fad5e1d8119..f9726de0ae0 100644
--- a/sysutils/hal-info/PLIST
+++ b/sysutils/hal-info/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:16:07 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2009/06/14 21:28:47 joerg Exp $
share/hal/fdi/information/10freedesktop/10-battery.fdi
share/hal/fdi/information/10freedesktop/10-camera-ptp.fdi
share/hal/fdi/information/10freedesktop/10-cd-dvd-burner.fdi
@@ -48,5 +48,5 @@ share/hal/fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi
share/hal/fdi/information/10freedesktop/99-video-quirk-default.fdi
share/hal/fdi/preprobe/10osvendor/10-ide-drives.fdi
share/hal/fdi/preprobe/10osvendor/20-broken-usb-sticks.fdi
-@exec ${MKDIR} %D/share/hal/fdi/preprobe/20thirdparty
-@exec ${MKDIR} %D/share/hal/fdi/information/20thirdparty
+@pkgdir share/hal/fdi/preprobe/20thirdparty
+@pkgdir share/hal/fdi/information/20thirdparty
diff --git a/sysutils/mc/Makefile b/sysutils/mc/Makefile
index bfc59e157ab..67bffcfaca2 100644
--- a/sysutils/mc/Makefile
+++ b/sysutils/mc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.73 2008/02/25 07:23:03 obache Exp $
+# $NetBSD: Makefile,v 1.74 2009/06/14 21:28:47 joerg Exp $
DISTNAME= mc-4.6.1
PKGREVISION= 4
@@ -30,7 +30,6 @@ CONFIGURE_ARGS+= UNZIP=${TOOLS_PATH.unzip} ZIP=${TOOLS_PATH.zip}
PLIST_SRC+= ${PKGDIR}/PLIST
.include "options.mk"
-PLIST_SRC+= ${PKGDIR}/PLIST.end
PKG_SYSCONFSUBDIR= mc
SUBST_CLASSES+= conf
diff --git a/sysutils/mc/PLIST b/sysutils/mc/PLIST
index 04eb475176a..7efa301b9d2 100644
--- a/sysutils/mc/PLIST
+++ b/sysutils/mc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2009/06/14 18:16:09 joerg Exp $
+@comment $NetBSD: PLIST,v 1.8 2009/06/14 21:28:47 joerg Exp $
bin/mc
bin/mcmfmt
bin/mcview
@@ -76,10 +76,3 @@ share/mc/mc.hlp.sr
share/mc/mc.lib
share/mc/mc.menu
share/mc/mc.menu.sr
-@unexec ${RMDIR} %D/man/sr/man8 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/man/sr/man1 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/man/sr 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/hu/man1 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/man/hu 2>/dev/null || ${TRUE}
diff --git a/sysutils/mc/PLIST.end b/sysutils/mc/PLIST.end
deleted file mode 100644
index a1e7fec2aae..00000000000
--- a/sysutils/mc/PLIST.end
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST.end,v 1.1 2005/03/17 23:17:06 wiz Exp $
-@unexec ${RMDIR} %D/share/mc 2>/dev/null || ${TRUE}
diff --git a/sysutils/memtest86/PLIST b/sysutils/memtest86/PLIST
index 60283e71803..05bd855a4f3 100644
--- a/sysutils/memtest86/PLIST
+++ b/sysutils/memtest86/PLIST
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:16:10 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2009/06/14 21:28:47 joerg Exp $
mdec/memtest
mdec/memtest.bin
share/doc/memtest/README
-@unexec ${RMDIR} %D/mdec 2>/dev/null || ${TRUE}
diff --git a/sysutils/memtestplus/PLIST b/sysutils/memtestplus/PLIST
index abfc0120e87..60456ab5f9c 100644
--- a/sysutils/memtestplus/PLIST
+++ b/sysutils/memtestplus/PLIST
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:16:10 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2009/06/14 21:28:47 joerg Exp $
mdec/memtestplus
mdec/memtestplus.bin
${PLIST.iso}mdec/memtestplus.iso
share/doc/memtestplus/FAQ
share/doc/memtestplus/README
-@unexec ${RMDIR} %D/mdec 2>/dev/null || ${TRUE}
diff --git a/sysutils/munin-node/PLIST b/sysutils/munin-node/PLIST
index b1bed55e83c..8d3b22a3fb7 100644
--- a/sysutils/munin-node/PLIST
+++ b/sysutils/munin-node/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:16:10 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2009/06/14 21:28:47 joerg Exp $
lib/munin/plugins/acpi
lib/munin/plugins/amavis
lib/munin/plugins/apache_accesses
@@ -114,6 +114,3 @@ sbin/munin-node-configure-snmp
sbin/munin-run
share/examples/munin/munin-node.conf
share/examples/rc.d/munin-node
-@comment pkg-specific directories:
-@comment shared with munin-server
-@unexec ${RMDIR} %D/lib/munin 2>/dev/null || ${TRUE}
diff --git a/sysutils/munin-server/PLIST b/sysutils/munin-server/PLIST
index 3ce27c7530f..949191a86f7 100644
--- a/sysutils/munin-server/PLIST
+++ b/sysutils/munin-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:16:10 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2009/06/14 21:28:48 joerg Exp $
bin/munin-cron
lib/munin/munin-graph
lib/munin/munin-html
@@ -18,6 +18,3 @@ share/examples/munin/templates/munin-serviceview.tmpl
share/examples/munin/templates/style.css
www/munin/data/cgi/munin-cgi-graph
${PERL5_SITELIB}/Munin.pm
-@comment pkg-specific directories:
-@comment shared with munin-node
-@unexec ${RMDIR} %D/lib/munin 2>/dev/null || ${TRUE}
diff --git a/sysutils/nautilus/PLIST b/sysutils/nautilus/PLIST
index 12a1d383fd5..eb2f78f4332 100644
--- a/sysutils/nautilus/PLIST
+++ b/sysutils/nautilus/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.30 2009/06/14 18:16:11 joerg Exp $
+@comment $NetBSD: PLIST,v 1.31 2009/06/14 21:28:48 joerg Exp $
bin/nautilus
bin/nautilus-autorun-software
bin/nautilus-connect-server
@@ -213,4 +213,3 @@ share/pixmaps/nautilus/emblems.png
share/pixmaps/nautilus/erase.png
share/pixmaps/nautilus/knob.png
share/pixmaps/nautilus/thumbnail_frame.png
-@unexec ${MKDIR} %D/lib/nautilus/extensions-2.0 2>/dev/null || ${TRUE}
diff --git a/sysutils/rtty/PLIST b/sysutils/rtty/PLIST
index 8e8ec4c25bc..4be4e943230 100644
--- a/sysutils/rtty/PLIST
+++ b/sysutils/rtty/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:16:13 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2009/06/14 21:28:48 joerg Exp $
rtty/bin/ttysrv
rtty/bin/rtty
rtty/bin/locbrok
@@ -9,8 +9,8 @@ rtty/bin/agelogs
rtty/bin/agelog
share/doc/rtty/README
@comment rtty/bin created above
-@exec ${MKDIR} %D/rtty/dev
-@exec ${MKDIR} %D/rtty/sock
-@exec ${MKDIR} %D/rtty/log
-@exec ${MKDIR} %D/rtty/pid
-@exec ${MKDIR} %D/rtty/opt
+@pkgdir rtty/dev
+@pkgdir rtty/sock
+@pkgdir rtty/log
+@pkgdir rtty/pid
+@pkgdir rtty/opt
diff --git a/sysutils/ruby-facter/PLIST b/sysutils/ruby-facter/PLIST
index e17dfcc3fbf..f2a8ff68ecc 100644
--- a/sysutils/ruby-facter/PLIST
+++ b/sysutils/ruby-facter/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:16:13 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2009/06/14 21:28:48 joerg Exp $
bin/facter
${GEM_HOME}/cache/facter-${PKGVERSION}.gem
${GEM_LIBDIR}/CHANGELOG
@@ -78,4 +78,3 @@ ${GEM_LIBDIR}/spec/unit/util/ip.rb
${GEM_LIBDIR}/spec/unit/util/loader.rb
${GEM_LIBDIR}/spec/unit/util/resolution.rb
${GEM_HOME}/specifications/facter-${PKGVERSION}.gemspec
-@exec ${MKDIR} %D/${GEM_DOCDIR}
diff --git a/sysutils/ruby-rb-appscript/PLIST b/sysutils/ruby-rb-appscript/PLIST
index a71a672c61e..0ebd4c52c53 100644
--- a/sysutils/ruby-rb-appscript/PLIST
+++ b/sysutils/ruby-rb-appscript/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:16:13 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/06/14 21:28:48 joerg Exp $
${GEM_HOME}/cache/rb-appscript-${PKGVERSION}.gem
${GEM_LIBDIR}/CHANGES
${GEM_LIBDIR}/LICENSE
@@ -109,4 +109,3 @@ ${GEM_LIBDIR}/test/test_mactypes.rb
${GEM_LIBDIR}/test/test_osax.rb
${GEM_LIBDIR}/test/testall.sh
${GEM_HOME}/specifications/rb-appscript-${PKGVERSION}.gemspec
-@exec ${MKDIR} %D/lib/ruby/gems/1.8/doc/rb-appscript-${PKGVERSION}
diff --git a/sysutils/ups-nut/PLIST b/sysutils/ups-nut/PLIST
index cc71ccc43a1..8f93b0ceb04 100644
--- a/sysutils/ups-nut/PLIST
+++ b/sysutils/ups-nut/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2009/06/14 18:16:15 joerg Exp $
+@comment $NetBSD: PLIST,v 1.23 2009/06/14 21:28:48 joerg Exp $
bin/upsc
bin/upscmd
bin/upslog
@@ -150,4 +150,4 @@ share/examples/rc.d/upslog
share/examples/rc.d/upsmon
share/nut/cmdvartab
share/nut/driver.list
-@exec ${MKDIR} %D/share/doc/nut/drivers
+@pkgdir share/doc/nut/drivers
diff --git a/textproc/crimson/PLIST b/textproc/crimson/PLIST
index 4d16f93dbf3..fd07d37b0b1 100644
--- a/textproc/crimson/PLIST
+++ b/textproc/crimson/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 18:17:13 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2009/06/14 21:36:30 joerg Exp $
lib/java/crimson.jar
share/doc/java/crimson/api/allclasses-frame.html
share/doc/java/crimson/api/deprecated-list.html
@@ -156,4 +156,3 @@ share/examples/java/crimson/samples/spec.dtd
share/examples/java/crimson/samples/two_gent.xml
share/examples/java/crimson/samples/weekly-euc-jp.dtd
share/examples/java/crimson/samples/weekly-euc-jp.xml
-@unexec ${RMDIR} %D/lib/java 2>/dev/null || ${TRUE}
diff --git a/textproc/db2latex/PLIST b/textproc/db2latex/PLIST
index 5faf8ce77c9..d17fb066509 100644
--- a/textproc/db2latex/PLIST
+++ b/textproc/db2latex/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2009/06/14 18:17:13 joerg Exp $
+@comment $NetBSD: PLIST,v 1.7 2009/06/14 21:36:30 joerg Exp $
share/doc/db2latex/AUTHOR
share/doc/db2latex/COPYING
share/doc/db2latex/COPYRIGHT
@@ -1455,4 +1455,3 @@ share/xsl/db2latex/texmath.mod.xsl
share/xsl/db2latex/verbatim.mod.xsl
share/xsl/db2latex/xref.mod.xsl
share/xsl/db2latex/xsldoc.ent
-@unexec ${RMDIR} %D/share/xsl 2>/dev/null || ${TRUE}
diff --git a/textproc/dict-server/PLIST b/textproc/dict-server/PLIST
index 77ef56d7c0b..359f9d36f31 100644
--- a/textproc/dict-server/PLIST
+++ b/textproc/dict-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2009/06/14 18:17:13 joerg Exp $
+@comment $NetBSD: PLIST,v 1.7 2009/06/14 21:36:30 joerg Exp $
bin/dictfmt
bin/dictfmt_index2suffix
bin/dictfmt_index2word
@@ -14,4 +14,4 @@ man/man1/dictzip.1
man/man8/dictd.8
sbin/dictd
share/examples/dict-server/dictd.conf
-@exec ${MKDIR} %D/share/dictd
+@pkgdir share/dictd
diff --git a/textproc/docbook-simple/PLIST b/textproc/docbook-simple/PLIST
index 0aa7a362910..a20a54c3980 100644
--- a/textproc/docbook-simple/PLIST
+++ b/textproc/docbook-simple/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:17:14 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2009/06/14 21:36:31 joerg Exp $
@comment in xmlcatmgr: share/xml/catalog
share/xml/docbook/simple/${PKGVERSION}/catalog.xml
share/xml/docbook/simple/${PKGVERSION}/sdbcent.mod
@@ -10,4 +10,3 @@ share/xml/docbook/simple/${PKGVERSION}/sdocbook.dtd
share/xml/docbook/simple/${PKGVERSION}/sdocbookref-custom.dtd
share/xml/docbook/simple/${PKGVERSION}/sdocbookref.dtd
share/xml/docbook/simple/${PKGVERSION}/sinclist.mod
-@unexec ${RMDIR} %D/share/xml/docbook >/dev/null 2>&1 || ${TRUE}
diff --git a/textproc/docbook-xml/PLIST b/textproc/docbook-xml/PLIST
index 33a3046cbe5..1619e68f7d9 100644
--- a/textproc/docbook-xml/PLIST
+++ b/textproc/docbook-xml/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2009/06/14 18:17:14 joerg Exp $
+@comment $NetBSD: PLIST,v 1.12 2009/06/14 21:36:31 joerg Exp $
share/xml/docbook/4.4/ChangeLog
share/xml/docbook/4.4/README
share/xml/docbook/4.4/calstblx.dtd
@@ -96,4 +96,3 @@ share/xml/docbook/4.2/ent/iso-num.ent
share/xml/docbook/4.2/ent/iso-pub.ent
share/xml/docbook/4.2/ent/iso-tech.ent
share/xml/docbook/4.2/soextblx.dtd
-@unexec ${RMDIR} %D/share/xml/docbook >/dev/null 2>&1 || ${TRUE}
diff --git a/textproc/docbook-xsl/PLIST b/textproc/docbook-xsl/PLIST
index 945733628d6..1317aabb99f 100644
--- a/textproc/docbook-xsl/PLIST
+++ b/textproc/docbook-xsl/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.25 2009/06/14 18:17:14 joerg Exp $
+@comment $NetBSD: PLIST,v 1.26 2009/06/14 21:36:31 joerg Exp $
share/examples/docbook-xsl/titlepage.xml
share/examples/docbook-xsl/titlepage.xsl
share/xsl/docbook/VERSION
@@ -1587,4 +1587,3 @@ share/xsl/docbook/xhtml/toc.xsl
share/xsl/docbook/xhtml/verbatim.xsl
share/xsl/docbook/xhtml/xref.xsl
@comment in xmlcatmgr: share/xml/catalog
-@unexec ${RMDIR} %D/share/xsl 2>/dev/null || ${TRUE}
diff --git a/textproc/dsssl-docbook-modular/PLIST b/textproc/dsssl-docbook-modular/PLIST
index 8f34310ea23..5cb39b6081f 100644
--- a/textproc/dsssl-docbook-modular/PLIST
+++ b/textproc/dsssl-docbook-modular/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2009/06/14 18:17:14 joerg Exp $
+@comment $NetBSD: PLIST,v 1.9 2009/06/14 21:36:31 joerg Exp $
share/sgml/docbook/dsssl/modular/BUGS
share/sgml/docbook/dsssl/modular/ChangeLog
share/sgml/docbook/dsssl/modular/README
@@ -725,5 +725,3 @@ share/sgml/docbook/dsssl/modular/print/docbook.dsl
share/sgml/docbook/dsssl/modular/print/notoc.dsl
share/sgml/docbook/dsssl/modular/print/plain.dsl
share/sgml/docbook/dsssl/modular/print/version.dsl
-@unexec ${RMDIR} %D/share/sgml/docbook/dsssl 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/sgml/docbook 2>/dev/null || ${TRUE}
diff --git a/textproc/groff/PLIST b/textproc/groff/PLIST
index 2648246a864..8efc7581f9f 100644
--- a/textproc/groff/PLIST
+++ b/textproc/groff/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2009/06/14 18:17:16 joerg Exp $
+@comment $NetBSD: PLIST,v 1.18 2009/06/14 21:36:31 joerg Exp $
bin/addftinfo
bin/afmtodit
bin/${GNU_PREFIX}eqn
@@ -489,5 +489,5 @@ share/groff/${PKGVERSION}/tmac/www.tmac
share/groff/current
share/groff/site-tmac/man.local
share/groff/site-tmac/mdoc.local
-@exec ${MKDIR} %D/share/groff/site-font
-@exec ${MKDIR} %D/lib/groff/site-tmac
+@pkgdir share/groff/site-font
+@pkgdir lib/groff/site-tmac
diff --git a/textproc/groff/PLIST.x11 b/textproc/groff/PLIST.x11
index c403ddc0939..9a4c8914621 100644
--- a/textproc/groff/PLIST.x11
+++ b/textproc/groff/PLIST.x11
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.x11,v 1.4 2009/06/14 18:17:16 joerg Exp $
+@comment $NetBSD: PLIST.x11,v 1.5 2009/06/14 21:36:31 joerg Exp $
bin/gxditview
bin/xtotroff
lib/X11/app-defaults/GXditview
@@ -77,5 +77,3 @@ share/groff/${PKGVERSION}/font/devX75/TB
share/groff/${PKGVERSION}/font/devX75/TBI
share/groff/${PKGVERSION}/font/devX75/TI
share/groff/${PKGVERSION}/font/devX75/TR
-@unexec ${RMDIR} %D/lib/X11/app-defaults 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/lib/X11 2>/dev/null || ${TRUE}
diff --git a/textproc/hunspell-de/PLIST b/textproc/hunspell-de/PLIST
index da039ca47b9..7fffd410ea6 100644
--- a/textproc/hunspell-de/PLIST
+++ b/textproc/hunspell-de/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2008/11/11 14:17:34 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/06/14 21:36:31 joerg Exp $
share/hunspell/de_AT.aff
share/hunspell/de_AT.dic
share/hunspell/de_AT_small.aff
@@ -11,4 +11,3 @@ share/hunspell/de_DE.aff
share/hunspell/de_DE.dic
share/hunspell/de_DE_small.aff
share/hunspell/de_DE_small.dic
-@unexec ${RMDIR} %D/share/hunspell 2>/dev/null || ${TRUE}
diff --git a/textproc/hunspell-en_GB/PLIST b/textproc/hunspell-en_GB/PLIST
index 5bc7466eadc..aeb7952c234 100644
--- a/textproc/hunspell-en_GB/PLIST
+++ b/textproc/hunspell-en_GB/PLIST
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:17:18 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/06/14 21:36:31 joerg Exp $
share/doc/hunspell-en_GB/README_en_GB.txt
share/doc/hunspell-en_GB/dictionary.lst
share/hunspell/en_GB.aff
share/hunspell/en_GB.dic
-@unexec ${RMDIR} %D/share/hunspell 2>/dev/null || ${TRUE}
diff --git a/textproc/hunspell-en_US/PLIST b/textproc/hunspell-en_US/PLIST
index 4a8184d7937..eb2f57c76d7 100644
--- a/textproc/hunspell-en_US/PLIST
+++ b/textproc/hunspell-en_US/PLIST
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:17:18 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/06/14 21:36:31 joerg Exp $
share/doc/hunspell-en_US/README_en_US.txt
share/hunspell/en_US.aff
share/hunspell/en_US.dic
-@unexec ${RMDIR} %D/share/hunspell 2>/dev/null || ${TRUE}
diff --git a/textproc/hunspell-sv_SE/PLIST b/textproc/hunspell-sv_SE/PLIST
index d1eae557b7f..8c7655ccd2c 100644
--- a/textproc/hunspell-sv_SE/PLIST
+++ b/textproc/hunspell-sv_SE/PLIST
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:17:18 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/06/14 21:36:32 joerg Exp $
share/doc/hunspell-${DICTNAME}/README_${DICTNAME}.txt
share/hunspell/${DICTNAME}.aff
share/hunspell/${DICTNAME}.dic
-@unexec ${RMDIR} %D/share/hunspell 2>/dev/null || ${TRUE}
diff --git a/textproc/hunspell/PLIST.common b/textproc/hunspell/PLIST.common
index 7cb91330a21..1b64d23cba6 100644
--- a/textproc/hunspell/PLIST.common
+++ b/textproc/hunspell/PLIST.common
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.2 2009/06/14 18:17:18 joerg Exp $
+@comment $NetBSD: PLIST.common,v 1.3 2009/06/14 21:36:31 joerg Exp $
share/doc/hunspell-${DISTNAME}/README_${DISTNAME}.txt
share/hunspell/${DISTNAME}.aff
share/hunspell/${DISTNAME}.dic
-@unexec ${RMDIR} %D/share/hunspell 2>/dev/null || ${TRUE}
diff --git a/textproc/jade/PLIST b/textproc/jade/PLIST
index 391d168b81f..ce4493ee620 100644
--- a/textproc/jade/PLIST
+++ b/textproc/jade/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2009/06/14 18:17:20 joerg Exp $
+@comment $NetBSD: PLIST,v 1.8 2009/06/14 21:36:32 joerg Exp $
bin/jade
bin/nsgmls
bin/sgmlnorm
@@ -159,4 +159,3 @@ share/sgml/jade/demoMaster.tex
share/sgml/jade/dsssl.dtd
share/sgml/jade/fot.dtd
share/sgml/jade/style-sheet.dtd
-@unexec ${RMDIR} %D/share/sgml/jade 2>/dev/null || ${TRUE}
diff --git a/textproc/libxslt/PLIST b/textproc/libxslt/PLIST
index a224887bdc4..0fe8b4a061e 100644
--- a/textproc/libxslt/PLIST
+++ b/textproc/libxslt/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.38 2009/06/14 18:17:22 joerg Exp $
+@comment $NetBSD: PLIST,v 1.39 2009/06/14 21:36:32 joerg Exp $
bin/xslt-config
bin/xsltproc
include/libexslt/exslt.h
@@ -122,4 +122,4 @@ share/doc/libxslt/tutorial2/libxslt_pipes.xml
share/doc/libxslt/xslt.html
share/doc/libxslt/xsltproc.html
share/doc/libxslt/xsltproc2.html
-@exec ${MKDIR} %D/lib/libxslt-plugins
+@pkgdir lib/libxslt-plugins
diff --git a/textproc/openjade/PLIST b/textproc/openjade/PLIST
index df5e2a11c79..71feac5055f 100644
--- a/textproc/openjade/PLIST
+++ b/textproc/openjade/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 18:17:23 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2009/06/14 21:36:32 joerg Exp $
bin/openjade
lib/libogrove.la
lib/libospgrove.la
@@ -66,4 +66,3 @@ share/sgml/openjade/pubtext/html.soc
share/sgml/openjade/pubtext/xml.dcl
share/sgml/openjade/pubtext/xml.soc
share/sgml/openjade/style-sheet.dtd
-@unexec ${RMDIR} %D/share/sgml 2>/dev/null || ${TRUE}
diff --git a/textproc/py-FourSuite/PLIST b/textproc/py-FourSuite/PLIST
index 8f521262428..cad8e7f3f47 100644
--- a/textproc/py-FourSuite/PLIST
+++ b/textproc/py-FourSuite/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 18:17:24 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2009/06/14 21:36:32 joerg Exp $
${PYSITELIB}/Ft/Lib/CommandLine/Arguments.py
${PYSITELIB}/Ft/Lib/CommandLine/Arguments.pyc
${PYSITELIB}/Ft/Lib/CommandLine/Arguments.pyo
@@ -3617,6 +3617,6 @@ ${PYSITELIB}/Ft/Xml/cDomlettec.so
${PYSITELIB}/Ft/__init__.py
${PYSITELIB}/Ft/__init__.pyc
${PYSITELIB}/Ft/__init__.pyo
-@exec ${MKDIR} %D/${PYSITELIB}/Ft/Share/LoadTest/Server/SCore
-@exec ${MKDIR} %D/${PYSITELIB}/Ft/Share/Docs/html/HowTos/images
-@exec ${MKDIR} %D/${PYSITELIB}/Ft/Share/Data/FlatFile
+@pkgdir ${PYSITELIB}/Ft/Share/LoadTest/Server/SCore
+@pkgdir ${PYSITELIB}/Ft/Share/Docs/html/HowTos/images
+@pkgdir ${PYSITELIB}/Ft/Share/Data/FlatFile
diff --git a/textproc/rarian/PLIST b/textproc/rarian/PLIST
index 6beef8af454..8e4594b5775 100644
--- a/textproc/rarian/PLIST
+++ b/textproc/rarian/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:17:26 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2009/06/14 21:36:32 joerg Exp $
bin/rarian-example
bin/rarian-sk-config
bin/rarian-sk-extract
@@ -41,4 +41,4 @@ share/librarian/manual/rar-lib.xhtml
share/librarian/manual/rar-mdf.xhtml
share/librarian/manual/rar-skcompat.xhtml
share/librarian/rarian-sk-cl.xml
-@exec ${MKDIR} %D/share/omf
+@pkgdir share/omf
diff --git a/textproc/ruby-bluecloth/PLIST b/textproc/ruby-bluecloth/PLIST
index fe3abdeb73e..4b48f5289b8 100644
--- a/textproc/ruby-bluecloth/PLIST
+++ b/textproc/ruby-bluecloth/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:17:27 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/06/14 21:36:32 joerg Exp $
${GEM_HOME}/cache/BlueCloth-${PKGVERSION}.gem
${GEM_LIBDIR}/CHANGES
${GEM_LIBDIR}/LICENSE
@@ -18,4 +18,3 @@ ${GEM_LIBDIR}/tests/data/re-overflow.txt
${GEM_LIBDIR}/tests/data/re-overflow2.txt
${GEM_LIBDIR}/utils.rb
${GEM_HOME}/specifications/BlueCloth-${PKGVERSION}.gemspec
-@exec ${MKDIR} %D/${GEM_DOCDIR}
diff --git a/textproc/ruby-maruku/PLIST b/textproc/ruby-maruku/PLIST
index 4d073c5399c..bf80a595374 100644
--- a/textproc/ruby-maruku/PLIST
+++ b/textproc/ruby-maruku/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:17:29 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2009/06/14 21:36:32 joerg Exp $
bin/maruku
bin/marutex
${GEM_HOME}/cache/maruku-${PKGVERSION}.gem
@@ -205,4 +205,3 @@ ${GEM_LIBDIR}/tests/utf8-files/simple.md
${GEM_LIBDIR}/unit_test_block.sh
${GEM_LIBDIR}/unit_test_span.sh
${GEM_HOME}/specifications/maruku-${PKGVERSION}.gemspec
-@exec ${MKDIR} %D/${GEM_DOCDIR}
diff --git a/textproc/ruby-rison/PLIST b/textproc/ruby-rison/PLIST
index 3cf34e21ed1..7c02c2a1742 100644
--- a/textproc/ruby-rison/PLIST
+++ b/textproc/ruby-rison/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:17:29 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/06/14 21:36:32 joerg Exp $
${GEM_HOME}/cache/rison-${PKGVERSION}.gem
${GEM_LIBDIR}/COPYING.txt
${GEM_LIBDIR}/README.html
@@ -12,4 +12,3 @@ ${GEM_LIBDIR}/lib/rison/parser.rb
${GEM_LIBDIR}/test/test_dump.rb
${GEM_LIBDIR}/test/test_parser.rb
${GEM_HOME}/specifications/rison-${PKGVERSION}.gemspec
-@exec ${MKDIR} %D/${GEM_DOCDIR}
diff --git a/textproc/ruby-rttool/PLIST b/textproc/ruby-rttool/PLIST
index 7cf39d3d3de..5044a5e267a 100644
--- a/textproc/ruby-rttool/PLIST
+++ b/textproc/ruby-rttool/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2009/06/14 18:17:29 joerg Exp $
+@comment $NetBSD: PLIST,v 1.9 2009/06/14 21:36:33 joerg Exp $
bin/rdrt2
bin/rt2
${GEM_HOME}/cache/rttool-${PKGVERSION}.gem
@@ -31,4 +31,3 @@ ${GEM_LIBDIR}/test/test-rt2html-lib.rb
${GEM_LIBDIR}/test/test-rtparser.rb
${GEM_LIBDIR}/test/test.rb
${GEM_HOME}/specifications/rttool-${PKGVERSION}.gemspec
-@exec ${MKDIR} %D/${GEM_DOCDIR}
diff --git a/textproc/ruby-xmlparser/PLIST b/textproc/ruby-xmlparser/PLIST
index 6d264d1f9a4..84d508cbf90 100644
--- a/textproc/ruby-xmlparser/PLIST
+++ b/textproc/ruby-xmlparser/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:17:30 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2009/06/14 21:36:33 joerg Exp $
${GEM_HOME}/cache/xmlparser-${PKGVERSION}.gem
${GEM_LIBDIR}/MANIFEST
${GEM_LIBDIR}/README
@@ -53,4 +53,3 @@ ${GEM_LIBDIR}/lib/xmltree.rb
${GEM_LIBDIR}/lib/xmltreebuilder.rb
${GEM_LIBDIR}/lib/xmltreevisitor.rb
${GEM_HOME}/specifications/xmlparser-${PKGVERSION}.gemspec
-@exec ${MKDIR} %D/${GEM_DOCDIR}
diff --git a/textproc/saxon/PLIST b/textproc/saxon/PLIST
index 619a96a7268..3ee54fb2fee 100644
--- a/textproc/saxon/PLIST
+++ b/textproc/saxon/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:17:31 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2009/06/14 21:36:33 joerg Exp $
lib/java/saxon.jar
share/doc/java/saxon/api-guide.html
share/doc/java/saxon/changes.html
@@ -411,4 +411,3 @@ share/examples/java/saxon/styles/books-csv.xsl
share/examples/java/saxon/styles/books-sql.xsl
share/examples/java/saxon/styles/books-tle.xsl
share/examples/java/saxon/styles/bible.xsl
-@unexec ${RMDIR} %D/lib/java 2>/dev/null || ${TRUE}
diff --git a/textproc/tei-p5-schema/PLIST b/textproc/tei-p5-schema/PLIST
index c1a204ed4f5..554b01d2b0f 100644
--- a/textproc/tei-p5-schema/PLIST
+++ b/textproc/tei-p5-schema/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:17:32 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/06/14 21:36:33 joerg Exp $
share/xml/tei/schema/catalog.xml
share/xml/tei/schema/dtd/analysis-decl.dtd
share/xml/tei/schema/dtd/analysis.dtd
@@ -83,4 +83,3 @@ share/xml/tei/schema/relaxng/transcr.rnc
share/xml/tei/schema/relaxng/transcr.rng
share/xml/tei/schema/relaxng/verse.rnc
share/xml/tei/schema/relaxng/verse.rng
-@unexec ${RMDIR} %D/share/xml/tei 2>/dev/null || ${TRUE}
diff --git a/textproc/xalan-j/PLIST b/textproc/xalan-j/PLIST
index 32f0593dfba..6638a48dd95 100644
--- a/textproc/xalan-j/PLIST
+++ b/textproc/xalan-j/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:17:34 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2009/06/14 21:36:33 joerg Exp $
lib/java/bsf.jar
lib/java/xalan.jar
share/doc/java/xalan/apidocs/allclasses-frame.html
@@ -519,4 +519,3 @@ share/examples/java/xalan/UseStylesheetParam/foo.xml
share/examples/java/xalan/UseStylesheetParam/foo.xsl
share/examples/java/xalan/UseStylesheetParam/readme.html
share/examples/java/xalan/xalansamples.jar
-@unexec ${RMDIR} %D/lib/java 2>/dev/null || ${TRUE}
diff --git a/textproc/xapian-omega/PLIST b/textproc/xapian-omega/PLIST
index 3f652f764a2..bcec7db5047 100644
--- a/textproc/xapian-omega/PLIST
+++ b/textproc/xapian-omega/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:17:34 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/06/14 21:36:33 joerg Exp $
bin/dbi2omega
bin/htdig2omega
bin/mbox2omega
@@ -16,4 +16,3 @@ share/doc/xapian-omega/termprefixes.html
share/examples/xapian-omega/omega.conf
share/xapian-omega/htdig2omega.script
share/xapian-omega/mbox2omega.script
-@unexec ${RMDIR} %D/libexec/cgi-bin 2>/dev/null || ${TRUE}
diff --git a/textproc/xerces-j/PLIST b/textproc/xerces-j/PLIST
index c3133c539bc..8a9e0e7b9ca 100644
--- a/textproc/xerces-j/PLIST
+++ b/textproc/xerces-j/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:17:34 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2009/06/14 21:36:33 joerg Exp $
lib/java/xerces.jar
share/doc/java/xerces/apiDocs/allclasses-frame.html
share/doc/java/xerces/apiDocs/deprecated-list.html
@@ -536,4 +536,3 @@ share/examples/java/xerces/personal.dtd
share/examples/java/xerces/personal.xml
share/examples/java/xerces/personal.xsd
share/examples/java/xerces/xercesSamples.jar
-@unexec ${RMDIR} %D/lib/java 2>/dev/null || ${TRUE}
diff --git a/textproc/xp/PLIST b/textproc/xp/PLIST
index 73eba2c3475..243b7fe0ea3 100644
--- a/textproc/xp/PLIST
+++ b/textproc/xp/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 18:17:35 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2009/06/14 21:36:33 joerg Exp $
lib/java/xp.jar
share/doc/java/xp/api/.cvsignore
share/doc/java/xp/api/AllNames.html
@@ -107,4 +107,3 @@ share/doc/java/xp/api/packages.html
share/doc/java/xp/api/tree.html
share/doc/java/xp/copying.txt
share/doc/java/xp/index.html
-@unexec ${RMDIR} %D/lib/java 2>/dev/null || ${TRUE}
diff --git a/textproc/xt/PLIST b/textproc/xt/PLIST
index dc0099b0601..09c07e8ce9b 100644
--- a/textproc/xt/PLIST
+++ b/textproc/xt/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 18:17:35 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2009/06/14 21:36:33 joerg Exp $
lib/java/sax.jar
lib/java/xt.jar
share/doc/java/xt/copying.txt
@@ -18,4 +18,3 @@ share/examples/java/xt/split.xml
share/examples/java/xt/split.xsl
share/examples/java/xt/textfile.xml
share/examples/java/xt/textfile.xsl
-@unexec ${RMDIR} %D/lib/java 2>/dev/null || ${TRUE}
diff --git a/time/bbdate/PLIST b/time/bbdate/PLIST
index 3d3dcf8cc55..f7fbcc529af 100644
--- a/time/bbdate/PLIST
+++ b/time/bbdate/PLIST
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/07/18 15:53:14 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/06/14 21:38:07 joerg Exp $
bin/bbdate
share/bbtools/README.bbdate
share/bbtools/bbdate.conf
share/bbtools/bbdate.nobb
share/bbtools/bbdate.style
-@unexec ${RMDIR} %D/share/bbtools 2>/dev/null || ${TRUE}
diff --git a/time/kronolith/PLIST b/time/kronolith/PLIST
index 375c3ae03e8..1aca1fda3fb 100644
--- a/time/kronolith/PLIST
+++ b/time/kronolith/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2009/06/14 18:17:58 joerg Exp $
+@comment $NetBSD: PLIST,v 1.11 2009/06/14 21:38:08 joerg Exp $
share/doc/kronolith/INSTALL
share/doc/kronolith/README
share/doc/kronolith/RELEASE_NOTES
@@ -367,5 +367,3 @@ share/horde/kronolith/view.php
share/horde/kronolith/week.php
share/horde/kronolith/workweek.php
share/horde/kronolith/year.php
-@unexec ${RMDIR} %D/share/horde/kronolith/config 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/horde/kronolith 2>/dev/null || ${TRUE}
diff --git a/time/pcal/PLIST b/time/pcal/PLIST
index a945f2ff612..96f0ceed873 100644
--- a/time/pcal/PLIST
+++ b/time/pcal/PLIST
@@ -1,8 +1,7 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:17:59 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2009/06/14 21:38:08 joerg Exp $
bin/pcal
libexec/cgi-bin/pcal.cgi
man/man1/pcal.1
share/doc/pcal/ReadMe
share/httpd/htdocs/pcal.html
share/httpd/htdocs/pcalw.html
-@unexec ${RMDIR} -p %D/share/httpd/htdocs 2>/dev/null || ${TRUE}
diff --git a/time/planner/PLIST b/time/planner/PLIST
index 6a4acb54f4e..7f348f5e2c1 100644
--- a/time/planner/PLIST
+++ b/time/planner/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2009/06/14 18:17:59 joerg Exp $
+@comment $NetBSD: PLIST,v 1.7 2009/06/14 21:38:08 joerg Exp $
bin/planner
include/planner-1.0/libplanner/mrp-application.h
include/planner-1.0/libplanner/mrp-assignment.h
@@ -250,4 +250,4 @@ share/planner/ui/sql-plugin.ui
share/planner/ui/task-view.ui
share/planner/ui/time-table-view.ui
share/planner/ui/xml-planner-plugin.ui
-@exec ${MKDIR} %D/share/gtk-doc/html/libplanner
+@pkgdir share/gtk-doc/html/libplanner
diff --git a/time/rsibreak/PLIST b/time/rsibreak/PLIST
index c6b1e51655c..ec333b01c7a 100644
--- a/time/rsibreak/PLIST
+++ b/time/rsibreak/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:18:00 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/06/14 21:38:08 joerg Exp $
bin/rsibreak
share/applications/kde/rsibreak.desktop
share/doc/kde/HTML/da/rsibreak/common
@@ -81,5 +81,5 @@ share/locale/sr/LC_MESSAGES/rsibreak.mo
share/locale/sr@Latn/LC_MESSAGES/rsibreak.mo
share/locale/sv/LC_MESSAGES/rsibreak.mo
share/locale/tr/LC_MESSAGES/rsibreak.mo
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/${PKGNAME}-apidocs/rsibreak/src/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/${PKGNAME}-apidocs/rsibreak/html
+@pkgdir share/doc/kde/HTML/en/${PKGNAME}-apidocs/rsibreak/src/html
+@pkgdir share/doc/kde/HTML/en/${PKGNAME}-apidocs/rsibreak/html
diff --git a/time/sunbird/PLIST b/time/sunbird/PLIST
index be81bba233f..6c5c6339588 100644
--- a/time/sunbird/PLIST
+++ b/time/sunbird/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2009/06/14 18:18:00 joerg Exp $
+@comment $NetBSD: PLIST,v 1.8 2009/06/14 21:38:08 joerg Exp $
bin/${MOZILLA}
@comment begin PROGRAMS
lib/${MOZILLA}/${MOZILLA_BIN}
@@ -2701,5 +2701,3 @@ include/${MOZILLA}/xpcom-config.h
@exec env LD_LIBRARY_PATH=%D/lib/${MOZILLA} MOZILLA_FIVE_HOME=%D/lib/${MOZILLA} %D/lib/${MOZILLA}/regxpcom
@unexec ${RM} %D/lib/${MOZILLA}/components/compreg.dat
@unexec ${RM} %D/lib/${MOZILLA}/components/xpti.dat
-@comment begin DIRS
-@comment end DIRS
diff --git a/time/xfce4-orage/PLIST b/time/xfce4-orage/PLIST
index f673e6dc697..2efae587493 100644
--- a/time/xfce4-orage/PLIST
+++ b/time/xfce4-orage/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 18:18:01 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2009/06/14 21:38:08 joerg Exp $
bin/orage
lib/xfce4/mcs-plugins/orage_plugin.la
libexec/xfce4/panel-plugins/orageclock
@@ -458,4 +458,3 @@ share/orage/zoneinfo/Pacific/Wallis.ics
share/orage/zoneinfo/Pacific/Yap.ics
share/orage/zoneinfo/zones.tab
share/xfce4/panel-plugins/orageclock.desktop
-@unexec ${RMDIR} %D/libexec/xfce4/panel-plugins 2>/dev/null || ${TRUE}