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

30 files changed, 129 insertions, 197 deletions

diff --git a/games/angband-x11/PLIST b/games/angband-x11/PLIST
index 7457f2d00a5..59a08f600e3 100644
--- a/games/angband-x11/PLIST
+++ b/games/angband-x11/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 17:56:39 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2009/06/14 19:10:35 joerg Exp $
 bin/angband
 share/games/angband/lib/apex/scores.raw
 share/games/angband/lib/data/artifact.raw
@@ -112,4 +112,3 @@ share/games/angband/lib/script/store.lua
 share/games/angband/lib/script/test.lua
 share/games/angband/lib/script/trace.lua
 share/games/angband/lib/xtra/font/16x16.txt
-@unexec ${RM} %D/share/games 2>/dev/null || ${TRUE}
diff --git a/games/bos/PLIST b/games/bos/PLIST
index 091812a1de8..8294c71844b 100644
--- a/games/bos/PLIST
+++ b/games/bos/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:56:40 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/06/14 19:10:35 joerg Exp $
 bin/bos
 share/bos/data/graphics/elites/build/development_yard.png
 share/bos/data/graphics/elites/build/development_yard_i.png
@@ -283,67 +283,67 @@ share/bos/data/video/int_logo_bos.ogg
 share/bos/data/video/int_logo_stratagus.avi
 share/bos/data/video/int_logo_stratagus.ogg
 share/doc/bos/README.txt
-@exec ${MKDIR} %D/share/bos/data
-@exec ${MKDIR} %D/share/bos/data/campaigns
-@exec ${MKDIR} %D/share/bos/data/graphics
-@exec ${MKDIR} %D/share/bos/data/graphics/buttons
-@exec ${MKDIR} %D/share/bos/data/graphics/nature/build
-@exec ${MKDIR} %D/share/bos/data/graphics/nature/thingies
-@exec ${MKDIR} %D/share/bos/data/graphics/terras
-@exec ${MKDIR} %D/share/bos/data/graphics/terras/missile
-@exec ${MKDIR} %D/share/bos/data/graphics/terras/ui
-@exec ${MKDIR} %D/share/bos/data/graphics/terras/units
-@exec ${MKDIR} %D/share/bos/data/graphics/tilesets/desert/elites
-@exec ${MKDIR} %D/share/bos/data/graphics/tilesets/desert/elites/buildings
-@exec ${MKDIR} %D/share/bos/data/graphics/tilesets/desert/neutral/units
-@exec ${MKDIR} %D/share/bos/data/graphics/tilesets/swamp
-@exec ${MKDIR} %D/share/bos/data/graphics/tilesets/wasteland
-@exec ${MKDIR} %D/share/bos/data/graphics/tilesets/winter/elites
-@exec ${MKDIR} %D/share/bos/data/graphics/tilesets/winter/elites/buildings
-@exec ${MKDIR} %D/share/bos/data/graphics/tilesets/winter/neutral/units
-@exec ${MKDIR} %D/share/bos/data/graphics/ui/cursors
-@exec ${MKDIR} %D/share/bos/data/graphics/ui/elites
-@exec ${MKDIR} %D/share/bos/data/graphics/ui/elites/cursors
-@exec ${MKDIR} %D/share/bos/data/graphics/ui/fonts
-@exec ${MKDIR} %D/share/bos/data/graphics/ui/terras
-@exec ${MKDIR} %D/share/bos/data/graphics/ui/terras/cursors
-@exec ${MKDIR} %D/share/bos/data/scripts/terras
-@exec ${MKDIR} %D/share/bos/data/sounds/elites/basic_voices
-@exec ${MKDIR} %D/share/bos/data/sounds/elites/basic_voices/acknowledgement
-@exec ${MKDIR} %D/share/bos/data/sounds/elites/basic_voices/annoyed
-@exec ${MKDIR} %D/share/bos/data/sounds/elites/basic_voices/help
-@exec ${MKDIR} %D/share/bos/data/sounds/elites/basic_voices/selected
-@exec ${MKDIR} %D/share/bos/data/sounds/elites/cryofarm
-@exec ${MKDIR} %D/share/bos/data/sounds/elites/units/peasant
-@exec ${MKDIR} %D/share/bos/data/sounds/elites/units/peasant/acknowledgement
-@exec ${MKDIR} %D/share/bos/data/sounds/elites/units/peasant/annoyed
-@exec ${MKDIR} %D/share/bos/data/sounds/elites/units/peasant/selected
-@exec ${MKDIR} %D/share/bos/data/sounds/misc
-@exec ${MKDIR} %D/share/bos/data/sounds/misc/building_explosion
-@exec ${MKDIR} %D/share/bos/data/sounds/misc/tree_chopping
-@exec ${MKDIR} %D/share/bos/data/sounds/missiles
-@exec ${MKDIR} %D/share/bos/data/sounds/missiles/sword_attack
-@exec ${MKDIR} %D/share/bos/data/sounds/neutral
-@exec ${MKDIR} %D/share/bos/data/sounds/neutral/buildings
-@exec ${MKDIR} %D/share/bos/data/sounds/neutral/units
-@exec ${MKDIR} %D/share/bos/data/sounds/neutral/units/pig
-@exec ${MKDIR} %D/share/bos/data/sounds/neutral/units/pig/annoyed
-@exec ${MKDIR} %D/share/bos/data/sounds/neutral/units/pig/selected
-@exec ${MKDIR} %D/share/bos/data/sounds/neutral/units/seal
-@exec ${MKDIR} %D/share/bos/data/sounds/neutral/units/seal/annoyed
-@exec ${MKDIR} %D/share/bos/data/sounds/neutral/units/seal/selected
-@exec ${MKDIR} %D/share/bos/data/sounds/neutral/units/sheep
-@exec ${MKDIR} %D/share/bos/data/sounds/neutral/units/sheep/annoyed
-@exec ${MKDIR} %D/share/bos/data/sounds/neutral/units/sheep/selected
-@exec ${MKDIR} %D/share/bos/data/sounds/neutral/units/warthog
-@exec ${MKDIR} %D/share/bos/data/sounds/neutral/units/warthog/annoyed
-@exec ${MKDIR} %D/share/bos/data/sounds/neutral/units/warthog/selected
-@exec ${MKDIR} %D/share/bos/data/sounds/spells
-@exec ${MKDIR} %D/share/bos/data/sounds/terras/basic_voices
-@exec ${MKDIR} %D/share/bos/data/sounds/terras/basic_voices/acknowledgement
-@exec ${MKDIR} %D/share/bos/data/sounds/terras/basic_voices/annoyed
-@exec ${MKDIR} %D/share/bos/data/sounds/terras/basic_voices/help
-@exec ${MKDIR} %D/share/bos/data/sounds/terras/basic_voices/selected
-@exec ${MKDIR} %D/share/bos/data/sounds/terras/buildings
-@exec ${MKDIR} %D/share/bos/data/sounds/terras/units
-@exec ${MKDIR} %D/share/bos/data/sounds/terras/units/peon
+@pkgdir share/bos/data
+@pkgdir share/bos/data/campaigns
+@pkgdir share/bos/data/graphics
+@pkgdir share/bos/data/graphics/buttons
+@pkgdir share/bos/data/graphics/nature/build
+@pkgdir share/bos/data/graphics/nature/thingies
+@pkgdir share/bos/data/graphics/terras
+@pkgdir share/bos/data/graphics/terras/missile
+@pkgdir share/bos/data/graphics/terras/ui
+@pkgdir share/bos/data/graphics/terras/units
+@pkgdir share/bos/data/graphics/tilesets/desert/elites
+@pkgdir share/bos/data/graphics/tilesets/desert/elites/buildings
+@pkgdir share/bos/data/graphics/tilesets/desert/neutral/units
+@pkgdir share/bos/data/graphics/tilesets/swamp
+@pkgdir share/bos/data/graphics/tilesets/wasteland
+@pkgdir share/bos/data/graphics/tilesets/winter/elites
+@pkgdir share/bos/data/graphics/tilesets/winter/elites/buildings
+@pkgdir share/bos/data/graphics/tilesets/winter/neutral/units
+@pkgdir share/bos/data/graphics/ui/cursors
+@pkgdir share/bos/data/graphics/ui/elites
+@pkgdir share/bos/data/graphics/ui/elites/cursors
+@pkgdir share/bos/data/graphics/ui/fonts
+@pkgdir share/bos/data/graphics/ui/terras
+@pkgdir share/bos/data/graphics/ui/terras/cursors
+@pkgdir share/bos/data/scripts/terras
+@pkgdir share/bos/data/sounds/elites/basic_voices
+@pkgdir share/bos/data/sounds/elites/basic_voices/acknowledgement
+@pkgdir share/bos/data/sounds/elites/basic_voices/annoyed
+@pkgdir share/bos/data/sounds/elites/basic_voices/help
+@pkgdir share/bos/data/sounds/elites/basic_voices/selected
+@pkgdir share/bos/data/sounds/elites/cryofarm
+@pkgdir share/bos/data/sounds/elites/units/peasant
+@pkgdir share/bos/data/sounds/elites/units/peasant/acknowledgement
+@pkgdir share/bos/data/sounds/elites/units/peasant/annoyed
+@pkgdir share/bos/data/sounds/elites/units/peasant/selected
+@pkgdir share/bos/data/sounds/misc
+@pkgdir share/bos/data/sounds/misc/building_explosion
+@pkgdir share/bos/data/sounds/misc/tree_chopping
+@pkgdir share/bos/data/sounds/missiles
+@pkgdir share/bos/data/sounds/missiles/sword_attack
+@pkgdir share/bos/data/sounds/neutral
+@pkgdir share/bos/data/sounds/neutral/buildings
+@pkgdir share/bos/data/sounds/neutral/units
+@pkgdir share/bos/data/sounds/neutral/units/pig
+@pkgdir share/bos/data/sounds/neutral/units/pig/annoyed
+@pkgdir share/bos/data/sounds/neutral/units/pig/selected
+@pkgdir share/bos/data/sounds/neutral/units/seal
+@pkgdir share/bos/data/sounds/neutral/units/seal/annoyed
+@pkgdir share/bos/data/sounds/neutral/units/seal/selected
+@pkgdir share/bos/data/sounds/neutral/units/sheep
+@pkgdir share/bos/data/sounds/neutral/units/sheep/annoyed
+@pkgdir share/bos/data/sounds/neutral/units/sheep/selected
+@pkgdir share/bos/data/sounds/neutral/units/warthog
+@pkgdir share/bos/data/sounds/neutral/units/warthog/annoyed
+@pkgdir share/bos/data/sounds/neutral/units/warthog/selected
+@pkgdir share/bos/data/sounds/spells
+@pkgdir share/bos/data/sounds/terras/basic_voices
+@pkgdir share/bos/data/sounds/terras/basic_voices/acknowledgement
+@pkgdir share/bos/data/sounds/terras/basic_voices/annoyed
+@pkgdir share/bos/data/sounds/terras/basic_voices/help
+@pkgdir share/bos/data/sounds/terras/basic_voices/selected
+@pkgdir share/bos/data/sounds/terras/buildings
+@pkgdir share/bos/data/sounds/terras/units
+@pkgdir share/bos/data/sounds/terras/units/peon
diff --git a/games/boson/PLIST b/games/boson/PLIST
index 6c7c954ed86..c66a6db7e53 100644
--- a/games/boson/PLIST
+++ b/games/boson/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 17:56:41 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2009/06/14 19:10:35 joerg Exp $
 bin/bocursor
 bin/bodebugdialog
 bin/boinfo
@@ -1050,5 +1050,5 @@ share/kde/apps/boson/themes/ui/standard/stop.png
 share/kde/apps/boson/topui.rc
 share/kde/config/bodebug.areas
 share/kde/config/bodebugrc
-@exec ${MKDIR} %D/share/kde/apps/boson/themes/species/neutral/objects
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/boson/editor
+@pkgdir share/kde/apps/boson/themes/species/neutral/objects
+@pkgdir share/doc/kde/HTML/en/boson/editor
diff --git a/games/civctp-demo/PLIST b/games/civctp-demo/PLIST
index 586710d3118..48f5eafb003 100644
--- a/games/civctp-demo/PLIST
+++ b/games/civctp-demo/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 17:56:41 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2009/06/14 19:10:35 joerg Exp $
 bin/civctp-demo
 lib/lokigames/civctp-demo/appstr.txt
 lib/lokigames/civctp-demo/civctp-demo
@@ -554,5 +554,3 @@ lib/lokigames/civctp-demo/ctp_data/english/uidata/layouts/victorymovie.ldl
 lib/lokigames/civctp-demo/ctp_data/english/uidata/layouts/victoryscreen.ldl
 lib/lokigames/civctp-demo/ctp_data/english/uidata/layouts/wondermovie.ldl
 share/doc/lokigames/civctp-demo-README
-@unexec ${RMDIR} -p %D/lib/lokigames 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} -p %D/share/doc/lokigames 2>/dev/null || ${TRUE}
diff --git a/games/crafty-doc/PLIST b/games/crafty-doc/PLIST
index 296a349c9ae..e87333b86de 100644
--- a/games/crafty-doc/PLIST
+++ b/games/crafty-doc/PLIST
@@ -1,3 +1,2 @@
-@comment $NetBSD: PLIST,v 1.3 2002/12/09 16:01:24 tron Exp $
+@comment $NetBSD: PLIST,v 1.4 2009/06/14 19:10:35 joerg Exp $
 share/doc/crafty/crafty.doc.ps
-@unexec ${RMDIR} -p %D/share/doc/crafty 2>/dev/null || ${TRUE}
diff --git a/games/dopewars/PLIST b/games/dopewars/PLIST
index c3aeef2ddaf..1c2e9a9fa67 100644
--- a/games/dopewars/PLIST
+++ b/games/dopewars/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2009/06/14 17:56:43 joerg Exp $
+@comment $NetBSD: PLIST,v 1.12 2009/06/14 19:10:36 joerg Exp $
 bin/dopewars
 man/man6/dopewars.6
 share/doc/${PKGNAME}/help/cops.html
@@ -49,4 +49,4 @@ share/locale/pt_BR/LC_MESSAGES/dopewars.mo
 share/pixmaps/dopewars-pill.png
 share/pixmaps/dopewars-shot.png
 share/pixmaps/dopewars-weed.png
-@exec ${MKDIR} %D/lib/dopewars
+@pkgdir lib/dopewars
diff --git a/games/duckmaze/PLIST b/games/duckmaze/PLIST
index 8646d3595e9..7a0f2de375a 100644
--- a/games/duckmaze/PLIST
+++ b/games/duckmaze/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:56:43 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/06/14 19:10:36 joerg Exp $
 bin/duckmaze
 share/duckmaze/doc/COPYING.txt
 share/duckmaze/doc/TODO.txt
@@ -35,5 +35,5 @@ share/duckmaze/levels/level_018
 share/duckmaze/mopelib/__init__.py
 share/duckmaze/mopelib/mopelib.py
 share/duckmaze/version
-@exec ${MKDIR} %D/share/duckmaze/sounds
-@exec ${MKDIR} %D/share/duckmaze/music
+@pkgdir share/duckmaze/sounds
+@pkgdir share/duckmaze/music
diff --git a/games/enigma/PLIST b/games/enigma/PLIST
index 210094a521b..7c83a3022f3 100644
--- a/games/enigma/PLIST
+++ b/games/enigma/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 17:56:43 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2009/06/14 19:10:36 joerg Exp $
 bin/enigma
 @comment include/enet/callbacks.h
 @comment include/enet/enet.h
@@ -2457,4 +2457,4 @@ share/locale/pt/LC_MESSAGES/enigma.mo
 share/locale/ru/LC_MESSAGES/enigma.mo
 share/locale/sv/LC_MESSAGES/enigma.mo
 share/pixmaps/enigma.png
-@exec ${MKDIR} %D/share/enigma/levels/enigma_stable
+@pkgdir share/enigma/levels/enigma_stable
diff --git a/games/et/PLIST b/games/et/PLIST
index 3d9a524bd43..b9cd71961c7 100644
--- a/games/et/PLIST
+++ b/games/et/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 17:56:43 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2009/06/14 19:10:36 joerg Exp $
 bin/et
 bin/etded
 lib/lokigames/et/CHANGES
@@ -240,4 +240,4 @@ lib/lokigames/et/Docs/Help/Compatibility/redstripe.jpg
 lib/lokigames/et/Docs/Help/Compatibility/style_ie.css
 lib/lokigames/et/Docs/Help/Default.htm
 lib/lokigames/et/Docs/EULA_Wolfenstein_Enemy_Territory.txt
-@exec ${MKDIR} %D/lib/lokigames/et/Docs/Help/_private
+@pkgdir lib/lokigames/et/Docs/Help/_private
diff --git a/games/eus-demo/PLIST b/games/eus-demo/PLIST
index 742ee24a569..c30d31c9921 100644
--- a/games/eus-demo/PLIST
+++ b/games/eus-demo/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 17:56:43 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2009/06/14 19:10:36 joerg Exp $
 bin/eus-demo
 lib/lokigames/eus-demo/EUS.txt
 lib/lokigames/eus-demo/eus-demo
@@ -195,5 +195,3 @@ lib/lokigames/eus-demo/sounds/win7.wav
 lib/lokigames/eus-demo/sounds/win8.wav
 lib/lokigames/eus-demo/sounds/win9.wav
 share/doc/lokigames/eus-demo-README
-@unexec ${RMDIR} -p %D/lib/lokigames 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} -p %D/share/doc/lokigames 2>/dev/null || ${TRUE}
diff --git a/games/exult/PLIST b/games/exult/PLIST
index d2653b3cec0..727186ba441 100644
--- a/games/exult/PLIST
+++ b/games/exult/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:56:43 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/06/14 19:10:36 joerg Exp $
 bin/expack
 bin/exult
 bin/shp2pcx
@@ -23,4 +23,4 @@ share/exult/u7misc.data
 share/exult/u7opcodes.data
 share/exult/u7siintrinsics.data
 share/icons/exult.png
-@exec ${MKDIR} %D/share/exult/estudio/new
+@pkgdir share/exult/estudio/new
diff --git a/games/flightgear-base/PLIST b/games/flightgear-base/PLIST
index 42a2aa9f164..3fc0fefd779 100644
--- a/games/flightgear-base/PLIST
+++ b/games/flightgear-base/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 17:56:44 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2009/06/14 19:10:36 joerg Exp $
 share/FlightGear/AI/Aircraft/737/737-Adria.xml
 share/FlightGear/AI/Aircraft/737/737-AerLingus.xml
 share/FlightGear/AI/Aircraft/737/737-Aeroflot.xml
@@ -6234,4 +6234,4 @@ share/FlightGear/mice.xml
 share/FlightGear/options.xml
 share/FlightGear/preferences.xml
 share/FlightGear/version
-@exec ${MKDIR} %D/share/FlightGear/Aircraft/Instruments-3d/mk-viii/Textures/gpws/xcf
+@pkgdir share/FlightGear/Aircraft/Instruments-3d/mk-viii/Textures/gpws/xcf
diff --git a/games/gnome-games/PLIST b/games/gnome-games/PLIST
index d1bf8af642b..b5a7eb19355 100644
--- a/games/gnome-games/PLIST
+++ b/games/gnome-games/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2009/06/14 17:56:46 joerg Exp $
+@comment $NetBSD: PLIST,v 1.23 2009/06/14 19:10:36 joerg Exp $
 bin/blackjack
 bin/glchess
 bin/glines
@@ -1968,4 +1968,4 @@ share/omf/same-gnome/same-gnome-sv.omf
 share/pixmaps/glchess/board.png
 share/pixmaps/glchess/piece.png
 share/pixmaps/gnome-sudoku/footprints.png
-@exec ${MKDIR} %D/lib/ggz
+@pkgdir lib/ggz
diff --git a/games/heretic2-demo/PLIST b/games/heretic2-demo/PLIST
index d55b9daa5d7..ee1630d5c08 100644
--- a/games/heretic2-demo/PLIST
+++ b/games/heretic2-demo/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 17:56:48 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2009/06/14 19:10:36 joerg Exp $
 bin/heretic2-demo
 lib/lokigames/heretic2-demo/base/book/back/b_conback8.bk
 lib/lokigames/heretic2-demo/base/book/back/b_conback8_00.m8
@@ -1888,5 +1888,3 @@ lib/lokigames/heretic2-demo/icon.xpm
 lib/lokigames/heretic2-demo/ref_glx.so
 share/doc/lokigames/heretic2-demo-QuickStart.txt
 share/doc/lokigames/heretic2-demo-README
-@unexec ${RMDIR} -p %D/lib/lokigames 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} -p %D/share/doc/lokigames 2>/dev/null || ${TRUE}
diff --git a/games/kdegames3/PLIST b/games/kdegames3/PLIST
index 54acc275870..2c227898862 100644
--- a/games/kdegames3/PLIST
+++ b/games/kdegames3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2009/06/14 17:56:49 joerg Exp $
+@comment $NetBSD: PLIST,v 1.17 2009/06/14 19:10:37 joerg Exp $
 bin/atlantik
 bin/kasteroids
 bin/katomic
@@ -2482,4 +2482,4 @@ share/kde/mimelnk/application/x-kolf.desktop
 share/kde/mimelnk/application/x-kourse.desktop
 share/kde/mimelnk/application/x-tuberling.desktop
 share/kde/services/atlantik.protocol
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdegames-apidocs/libkdegames/html
+@pkgdir share/doc/kde/HTML/en/kdegames-apidocs/libkdegames/html
diff --git a/games/kdetoys3/PLIST b/games/kdetoys3/PLIST
index 3fa5ba00e95..0d5a0478198 100644
--- a/games/kdetoys3/PLIST
+++ b/games/kdetoys3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2009/06/14 17:56:49 joerg Exp $
+@comment $NetBSD: PLIST,v 1.13 2009/06/14 19:10:37 joerg Exp $
 bin/amor
 bin/kodo
 bin/kteatime
@@ -602,6 +602,3 @@ share/kde/apps/kworldclock/zone.tab
 share/kde/services/kcmweather.desktop
 share/kde/services/kcmweatherservice.desktop
 share/kde/services/kweatherservice.desktop
-@unexec ${RMDIR} %D/share/kde/apps/kworldclock/maps/depths 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/kde/apps/kworldclock/maps 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/kde/apps/kworldclock 2>/dev/null || ${TRUE}
diff --git a/games/lbreakout/PLIST b/games/lbreakout/PLIST
index 430721292ab..66f23a4b40c 100644
--- a/games/lbreakout/PLIST
+++ b/games/lbreakout/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 17:56:50 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2009/06/14 19:10:37 joerg Exp $
 bin/lbreakout
 share/games/lbreakout/ball.bmp
 share/games/lbreakout/bkgnd0.bmp
@@ -47,4 +47,3 @@ share/games/lbreakout/weapon.wav
 share/games/lbreakout/wontgiveup.wav
 @exec install -c -m 666 -o games -g games %D/share/games/lbreakout/lbreakout.hscr /var/games
 @unexec echo "===> High scores have been preserved in '/var/games/lbreakout.hscr'" ; echo "     If you no longer need this file, you can delete it manually."
-@unexec ${RMDIR} %D/share/games 2>/dev/null || ${TRUE}
diff --git a/games/lgeneral/PLIST b/games/lgeneral/PLIST
index 38a71eac4d7..059680aaee8 100644
--- a/games/lgeneral/PLIST
+++ b/games/lgeneral/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:56:50 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/06/14 19:10:37 joerg Exp $
 bin/lgeneral
 share/games/lgeneral/gfx/font_credit.bmp
 share/games/lgeneral/gfx/title.bmp
@@ -33,14 +33,14 @@ share/games/lgeneral/themes/default/scroll_buttons.bmp
 share/games/lgeneral/themes/default/setup_confirm_buttons.bmp
 share/games/lgeneral/themes/default/unit_buttons.bmp
 share/games/lgeneral/themes/default/wallpaper.bmp
-@exec ${MKDIR} %D/share/games/lgeneral/units
-@exec ${MKDIR} %D/share/games/lgeneral/sounds
-@exec ${MKDIR} %D/share/games/lgeneral/scenarios
-@exec ${MKDIR} %D/share/games/lgeneral/nations
-@exec ${MKDIR} %D/share/games/lgeneral/music
-@exec ${MKDIR} %D/share/games/lgeneral/maps
-@exec ${MKDIR} %D/share/games/lgeneral/gfx/units
-@exec ${MKDIR} %D/share/games/lgeneral/gfx/terrain
-@exec ${MKDIR} %D/share/games/lgeneral/gfx/flags
-@exec ${MKDIR} %D/share/games/lgeneral/campaigns
-@exec ${MKDIR} %D/share/games/lgeneral/ai_modules
+@pkgdir share/games/lgeneral/units
+@pkgdir share/games/lgeneral/sounds
+@pkgdir share/games/lgeneral/scenarios
+@pkgdir share/games/lgeneral/nations
+@pkgdir share/games/lgeneral/music
+@pkgdir share/games/lgeneral/maps
+@pkgdir share/games/lgeneral/gfx/units
+@pkgdir share/games/lgeneral/gfx/terrain
+@pkgdir share/games/lgeneral/gfx/flags
+@pkgdir share/games/lgeneral/campaigns
+@pkgdir share/games/lgeneral/ai_modules
diff --git a/games/majesty-demo/PLIST b/games/majesty-demo/PLIST
index f90c419bc49..0eb40aa71e6 100644
--- a/games/majesty-demo/PLIST
+++ b/games/majesty-demo/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:56:51 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/06/14 19:10:37 joerg Exp $
 bin/maj_demo
 lib/lgp/maj_demo/maj_demo
 lib/lgp/maj_demo/README
@@ -29,4 +29,3 @@ lib/lgp/maj_demo/majesty.xpm
 lib/lgp/maj_demo/majestysite.url
 lib/lgp/maj_demo/quests/vampiric_revenge.qdd
 lib/lgp/maj_demo/quests/vampiric_revenge.q
-@unexec ${RMDIR} %D/lib/lgp 2>/dev/null || ${TRUE}
diff --git a/games/neverball/PLIST b/games/neverball/PLIST
index 9da22a74c6c..2c584d6e98d 100644
--- a/games/neverball/PLIST
+++ b/games/neverball/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 17:56:52 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2009/06/14 19:10:37 joerg Exp $
 bin/neverball
 share/doc/neverball/README
 share/neverball/data/back/alien.png
@@ -565,5 +565,5 @@ share/neverball/data/shot-rlk/zigzag.jpg
 share/neverball/data/ttf/VeraBd.ttf
 share/neverball/neverball
 share/neverball/neverputt
-@exec ${MKDIR} %D/share/neverball/data/shot-misc
-@exec ${MKDIR} %D/share/neverball/data/map-misc
+@pkgdir share/neverball/data/shot-misc
+@pkgdir share/neverball/data/map-misc
diff --git a/games/openttd/PLIST b/games/openttd/PLIST
index 6b4dcb1e654..cefa2817167 100644
--- a/games/openttd/PLIST
+++ b/games/openttd/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2009/06/14 17:56:52 joerg Exp $
+@comment $NetBSD: PLIST,v 1.14 2009/06/14 19:10:37 joerg Exp $
 bin/openttd
 man/man6/openttd.6
 share/openttd/data/openttdd.grf
@@ -86,6 +86,5 @@ share/openttd/scenario/Polopolis.scn
 share/openttd/scenario/Skadi Islands.scn
 share/openttd/scenario/Terra Incognita.scn
 share/openttd/scenario/Wales and West England.scn
-@unexec ${RMDIR} %D/share/openttd/data 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/openttd/gm 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/openttd 2>/dev/null || ${TRUE}
+@pkgdir share/openttd/data
+@pkgdir share/openttd/gm
diff --git a/games/qnetwalk/PLIST b/games/qnetwalk/PLIST
index 63139f745ab..c369e018752 100644
--- a/games/qnetwalk/PLIST
+++ b/games/qnetwalk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 17:56:53 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2009/06/14 19:10:37 joerg Exp $
 bin/qnetwalk
 man/man6/qnetwalk.6
 share/games/qnetwalk/click.wav
@@ -15,11 +15,3 @@ share/games/qnetwalk/turn.wav
 share/games/qnetwalk/win.wav
 share/kde/share/applnk/Games/qnetwalk.desktop
 share/kde/share/icons/hicolor/16x16/apps/qnetwalk.png
-@unexec ${RMDIR} %D/share/kde/share/icons/hicolor/16x16/apps 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/kde/share/icons/hicolor/16x16 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/kde/share/icons/hicolor 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/kde/share/icons 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/kde/share/applnk/Games 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/kde/share/applnk 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/kde/share 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/kde 2>/dev/null || ${TRUE}
diff --git a/games/quake2forge/PLIST b/games/quake2forge/PLIST
index 1d78af4718a..57117b925d9 100644
--- a/games/quake2forge/PLIST
+++ b/games/quake2forge/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 17:56:54 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2009/06/14 19:10:37 joerg Exp $
 bin/quake2forge
 lib/quake2forge/baseq2/game.la
 lib/quake2forge/ctf/game.la
@@ -22,5 +22,5 @@ share/doc/quake2forge/changes.txt
 share/doc/quake2forge/joystick.txt
 share/doc/quake2forge/readme.txt
 share/quake2forge/baseq2/config.cfg
-@exec ${MKDIR} %D/lib/quake2forge/xatrix
-@exec ${MKDIR} %D/lib/quake2forge/rogue
+@pkgdir lib/quake2forge/xatrix
+@pkgdir lib/quake2forge/rogue
diff --git a/games/quake3arena-demo/PLIST b/games/quake3arena-demo/PLIST
index b8b5dc50ad5..718a0012664 100644
--- a/games/quake3arena-demo/PLIST
+++ b/games/quake3arena-demo/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 17:56:54 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2009/06/14 19:10:38 joerg Exp $
 bin/quake3arena-demo
 lib/lokigames/quake3arena-demo/demoq3/pak0.pk3
 lib/lokigames/quake3arena-demo/quake3arena-demo
@@ -234,5 +234,3 @@ share/doc/lokigames/quake3arena-Help/Support/Index.html
 share/doc/lokigames/quake3arena-Help/Support/Information/Improving_Performance.htm
 share/doc/lokigames/quake3arena-Help/Support/Information/Minimum_System_Requirements.htm
 share/doc/lokigames/quake3arena-demo-README
-@unexec ${RMDIR} -p %D/lib/lokigames 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} -p %D/share/doc/lokigames 2>/dev/null || ${TRUE}
diff --git a/games/quake3arena/PLIST b/games/quake3arena/PLIST
index 1c7ba9d5503..ceb9ed8929a 100644
--- a/games/quake3arena/PLIST
+++ b/games/quake3arena/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2004/01/04 18:53:54 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.6 2009/06/14 19:10:38 joerg Exp $
 bin/quake3arena
 lib/lokigames/quake3arena/quake3arena
 lib/lokigames/quake3arena/baseq3/pak1.pk3
@@ -10,7 +10,3 @@ lib/lokigames/quake3arena/baseq3/pak6.pk3
 lib/lokigames/quake3arena/baseq3/pak7.pk3
 lib/lokigames/quake3arena/baseq3/pak8.pk3
 share/doc/lokigames/quake3arena-README
-@unexec ${RMDIR} -p %D/share/doc/lokigames 2>/dev/null || ${TRUE}
-@comment next dir not necessarily empty, since the game data file could
-@comment be there
-@unexec ${RMDIR} -p %D/lib/lokigames/quake3arena/baseq3 2>/dev/null || ${TRUE}
diff --git a/games/rtcw/PLIST b/games/rtcw/PLIST
index a2ef8a1dc47..ccf9f38bde2 100644
--- a/games/rtcw/PLIST
+++ b/games/rtcw/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 17:56:55 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2009/06/14 19:10:38 joerg Exp $
 lib/lokigames/rtcw/CHANGES
 lib/lokigames/rtcw/Docs/ATVIsmall.jpg
 lib/lokigames/rtcw/Docs/Dedicated Server Notes.html
@@ -229,5 +229,5 @@ lib/lokigames/rtcw/setup.data/setup.glade
 lib/lokigames/rtcw/setup.data/setup.xml
 lib/lokigames/rtcw/setup.data/splash.xpm
 lib/lokigames/rtcw/setup.sh
-@exec ${MKDIR} %D/lib/lokigames/rtcw/setup.data/bin/Linux/x86/plugins
-@exec ${MKDIR} %D/lib/lokigames/rtcw/setup.data/bin/Linux/x86/glibc-2.1/plugins
+@pkgdir lib/lokigames/rtcw/setup.data/bin/Linux/x86/plugins
+@pkgdir lib/lokigames/rtcw/setup.data/bin/Linux/x86/glibc-2.1/plugins
diff --git a/games/singularity/PLIST b/games/singularity/PLIST
index f6a9b0c95b5..d562d733eaa 100644
--- a/games/singularity/PLIST
+++ b/games/singularity/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 17:56:56 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2009/06/14 19:10:38 joerg Exp $
 bin/singularity
 share/doc/singularity/README.txt
 share/singularity/code/__init__.py
@@ -73,4 +73,4 @@ share/singularity/data/techs_de_DE.dat
 share/singularity/data/techs_en_US.dat
 share/singularity/data/techs_es_AR.dat
 share/singularity/data/techs_sv_SE.dat
-@exec ${MKDIR} %D/share/singularity/music
+@pkgdir share/singularity/music
diff --git a/games/teg/PLIST b/games/teg/PLIST
index 920b4b9a532..12dbffcec23 100644
--- a/games/teg/PLIST
+++ b/games/teg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 17:56:57 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2009/06/14 19:10:38 joerg Exp $
 bin/tegclient
 bin/tegrobot
 bin/tegserver
@@ -256,5 +256,5 @@ share/pixmaps/teg_pix/themes/sentimental/turquia.png
 share/pixmaps/teg_pix/themes/sentimental/uruguay.png
 share/pixmaps/teg_pix/themes/sentimental/yukon.png
 share/pixmaps/teg_pix/themes/sentimental/zaire.png
-@exec ${MKDIR} %D/share/gnome/help/teg/pl/stylesheet-images
-@exec ${MKDIR} %D/share/gnome/help/teg/C/stylesheet-images
+@pkgdir share/gnome/help/teg/pl/stylesheet-images
+@pkgdir share/gnome/help/teg/C/stylesheet-images
diff --git a/games/wesnoth/PLIST b/games/wesnoth/PLIST
index 1dad8ac12c1..7a817d88029 100644
--- a/games/wesnoth/PLIST
+++ b/games/wesnoth/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.29 2009/06/14 17:56:58 joerg Exp $
+@comment $NetBSD: PLIST,v 1.30 2009/06/14 19:10:38 joerg Exp $
 bin/wesnoth
 bin/wesnothd
 man/cs/man6/wesnoth.6
@@ -9428,43 +9428,3 @@ share/wesnoth/translations/zh_TW/LC_MESSAGES/wesnoth-tutorial.mo
 share/wesnoth/translations/zh_TW/LC_MESSAGES/wesnoth-units.mo
 share/wesnoth/translations/zh_TW/LC_MESSAGES/wesnoth-utbs.mo
 share/wesnoth/translations/zh_TW/LC_MESSAGES/wesnoth.mo
-@exec ${MKDIR} %D/man/zh_TW/man6
-@unexec ${RMDIR} %D/man/zh_TW/man6 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/man/zh_TW 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/man/zh_CN/man6 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/man/zh_CN 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/man/tr/man6 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/man/tr 2>/dev/null || ${TRUE}
-@exec ${MKDIR} %D/man/sv/man6
-@unexec ${RMDIR} %D/man/sv/man6 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/man/sv 2>/dev/null || ${TRUE}
-@exec ${MKDIR} %D/man/sr@latin/man6
-@unexec ${RMDIR} %D/man/sr@latin/man6 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/man/sr@latin 2>/dev/null || ${TRUE}
-@exec ${MKDIR} %D/man/sr/man6
-@unexec ${RMDIR} %D/man/sr/man6 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/man/sr 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/man/sk/man6 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/man/sk 2>/dev/null || ${TRUE}
-@exec ${MKDIR} %D/man/racv/man6
-@unexec ${RMDIR} %D/man/racv/man6 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/man/racv 2>/dev/null || ${TRUE}
-@exec ${MKDIR} %D/man/nl/man6
-@unexec ${RMDIR} %D/man/nl/man6 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/man/nl 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/man/lt/man6 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/man/lt 2>/dev/null || ${TRUE}
-@exec ${MKDIR} %D/man/ja/man6
-@unexec ${RMDIR} %D/man/ja/man6 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/man/ja 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/man/it/man6 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/man/it 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/man/hu/man6 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/man/hu 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/man/gl/man6 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/man/gl 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/man/en_GB/man6 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/man/en_GB 2>/dev/null || ${TRUE}
-@exec ${MKDIR} %D/man/da/man6
-@unexec ${RMDIR} %D/man/da/man6 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/man/da 2>/dev/null || ${TRUE}
diff --git a/games/xarchon/PLIST b/games/xarchon/PLIST
index f4ca9579d5a..fc43cd01394 100644
--- a/games/xarchon/PLIST
+++ b/games/xarchon/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 17:56:58 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2009/06/14 19:10:38 joerg Exp $
 bin/xarchon
 man/man6/xarchon.6
 share/xarchon/archon/NAMES
@@ -477,5 +477,5 @@ share/xarchon/logo.xpm
 share/xarchon/statistics
 share/xarchon/xarchon-palette
 share/xarchon/xarchon.default
-@exec ${MKDIR} %D/share/xarchon/archon/wav/actor/weapon
-@exec ${MKDIR} %D/share/xarchon/archon/wav/actor/piece
+@pkgdir share/xarchon/archon/wav/actor/weapon
+@pkgdir share/xarchon/archon/wav/actor/piece