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

22 files changed, 33 insertions, 61 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