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

16 files changed, 89 insertions, 105 deletions

diff --git a/misc/bbappconf/PLIST b/misc/bbappconf/PLIST
index 8a9a9cc0971..c8bf13ffe41 100644
--- a/misc/bbappconf/PLIST
+++ b/misc/bbappconf/PLIST
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 2002/12/18 04:34:42 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.4 2009/06/14 20:52:11 joerg Exp $
 bin/bbappconf
 man/man1/bbappconf.1
 share/bbtools/README.bbappconf
 share/bbtools/bbappconf.bb
 share/bbtools/bbappconf.nobb
-@unexec ${RMDIR} %D/share/bbtools 2>/dev/null || true
diff --git a/misc/bbweather/PLIST b/misc/bbweather/PLIST
index 8af9eb02e06..7103c2f48d9 100644
--- a/misc/bbweather/PLIST
+++ b/misc/bbweather/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 18:07:18 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2009/06/14 20:52:11 joerg Exp $
 bin/GrabWeather
 bin/bbweather
 man/man1/GrabWeather.1
@@ -14,4 +14,3 @@ share/doc/html/bbweather/index-3.html
 share/doc/html/bbweather/index-4.html
 share/doc/html/bbweather/index-5.html
 share/doc/html/bbweather/index.html
-@unexec ${RMDIR} %D/share/bbtools 2>/dev/null || ${TRUE}
diff --git a/misc/goffice0.6/PLIST b/misc/goffice0.6/PLIST
index f7e56ff39b0..b65a69e79b4 100644
--- a/misc/goffice0.6/PLIST
+++ b/misc/goffice0.6/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:07:22 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2009/06/14 20:52:12 joerg Exp $
 include/libgoffice-0.6/goffice/app/error-info.h
 include/libgoffice-0.6/goffice/app/file.h
 include/libgoffice-0.6/goffice/app/go-cmd-context-impl.h
@@ -448,6 +448,3 @@ share/pixmaps/goffice/${PKGVERSION}/radar.xpm
 share/pixmaps/goffice/${PKGVERSION}/scatter.xpm
 share/pixmaps/goffice/${PKGVERSION}/stock.xpm
 share/pixmaps/goffice/${PKGVERSION}/surface.xpm
-@unexec ${RMDIR} %D/share/pixmaps/goffice 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/goffice 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/lib/goffice 2>/dev/null || ${TRUE}
diff --git a/misc/kdeaccessibility3/PLIST b/misc/kdeaccessibility3/PLIST
index 2ee3f8cf645..ba349a3cccb 100644
--- a/misc/kdeaccessibility3/PLIST
+++ b/misc/kdeaccessibility3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2009/06/14 18:07:23 joerg Exp $
+@comment $NetBSD: PLIST,v 1.15 2009/06/14 20:52:12 joerg Exp $
 bin/kmag
 bin/kmousetool
 bin/kmouth
@@ -2874,4 +2874,3 @@ share/kde/services/kttsjobmgr.desktop
 share/kde/servicetypes/kttsd_audioplugin.desktop
 share/kde/servicetypes/kttsd_filterplugin.desktop
 share/kde/servicetypes/kttsd_synthplugin.desktop
-@exec ${MKDIR} %D/share/icons/mono/png
diff --git a/misc/kdeaddons3/PLIST b/misc/kdeaddons3/PLIST
index d36472f56e5..96ec169f017 100644
--- a/misc/kdeaddons3/PLIST
+++ b/misc/kdeaddons3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2009/06/14 18:07:23 joerg Exp $
+@comment $NetBSD: PLIST,v 1.21 2009/06/14 20:52:12 joerg Exp $
 bin/atlantikdesigner
 bin/fsview
 bin/jpegorient
@@ -380,4 +380,3 @@ share/kde/services/kuick_plugin.desktop
 share/kde/services/renaudiodlg.desktop
 share/kde/services/renimagedlg.desktop
 share/kde/services/webarchivethumbnail.desktop
-@unexec ${RMDIR} %D/share/kde/apps/knewsticker 2>/dev/null || ${TRUE}
diff --git a/misc/kdeartwork3/PLIST b/misc/kdeartwork3/PLIST
index a60c94685b1..f39f21834dd 100644
--- a/misc/kdeartwork3/PLIST
+++ b/misc/kdeartwork3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.34 2009/06/14 18:07:24 joerg Exp $
+@comment $NetBSD: PLIST,v 1.35 2009/06/14 20:52:12 joerg Exp $
 bin/kbanner.kss
 bin/kblob.kss
 bin/kclock.kss
@@ -7898,5 +7898,3 @@ share/kde/wallpapers/kraftwurm.jpg
 share/kde/wallpapers/kubical.png
 share/kde/wallpapers/mystical_rightturn.jpg
 share/kde/wallpapers/vegetative_fog.jpg
-@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/misc/kdeedu3/PLIST b/misc/kdeedu3/PLIST
index 981b3c5910e..9c76f4db301 100644
--- a/misc/kdeedu3/PLIST
+++ b/misc/kdeedu3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.24 2009/06/14 18:07:24 joerg Exp $
+@comment $NetBSD: PLIST,v 1.25 2009/06/14 20:52:12 joerg Exp $
 bin/apmount
 bin/blinken
 bin/celestrongps
@@ -2513,27 +2513,24 @@ share/kde/services/kfile_drgeo.desktop
 share/kde/services/kfile_kig.desktop
 share/kde/services/kig_part.desktop
 share/kde/services/kmplot_part.desktop
-@unexec ${RMDIR} %D/share/kde/apps/klatin/data/vocabs 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/kde/apps/klatin/data 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/kde/apps/klatin 2>/dev/null || ${TRUE}
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdeedu-apidocs/libkdeedu/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdeedu-apidocs/kwordquiz/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdeedu-apidocs/kvoctrain/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdeedu-apidocs/kverbos/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdeedu-apidocs/kturtle/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdeedu-apidocs/ktouch/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdeedu-apidocs/kstars/kstars/indi/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdeedu-apidocs/kstars/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdeedu-apidocs/kpercentage/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdeedu-apidocs/kmplot/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdeedu-apidocs/klettres/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdeedu-apidocs/klatin/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdeedu-apidocs/kiten/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdeedu-apidocs/kig/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdeedu-apidocs/khangman/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdeedu-apidocs/keduca/libkeduca/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdeedu-apidocs/keduca/keducabuilder/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdeedu-apidocs/keduca/keduca/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdeedu-apidocs/keduca/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdeedu-apidocs/kbruch/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdeedu-apidocs/kalzium/html
+@pkgdir share/doc/kde/HTML/en/kdeedu-apidocs/libkdeedu/html
+@pkgdir share/doc/kde/HTML/en/kdeedu-apidocs/kwordquiz/html
+@pkgdir share/doc/kde/HTML/en/kdeedu-apidocs/kvoctrain/html
+@pkgdir share/doc/kde/HTML/en/kdeedu-apidocs/kverbos/html
+@pkgdir share/doc/kde/HTML/en/kdeedu-apidocs/kturtle/html
+@pkgdir share/doc/kde/HTML/en/kdeedu-apidocs/ktouch/html
+@pkgdir share/doc/kde/HTML/en/kdeedu-apidocs/kstars/kstars/indi/html
+@pkgdir share/doc/kde/HTML/en/kdeedu-apidocs/kstars/html
+@pkgdir share/doc/kde/HTML/en/kdeedu-apidocs/kpercentage/html
+@pkgdir share/doc/kde/HTML/en/kdeedu-apidocs/kmplot/html
+@pkgdir share/doc/kde/HTML/en/kdeedu-apidocs/klettres/html
+@pkgdir share/doc/kde/HTML/en/kdeedu-apidocs/klatin/html
+@pkgdir share/doc/kde/HTML/en/kdeedu-apidocs/kiten/html
+@pkgdir share/doc/kde/HTML/en/kdeedu-apidocs/kig/html
+@pkgdir share/doc/kde/HTML/en/kdeedu-apidocs/khangman/html
+@pkgdir share/doc/kde/HTML/en/kdeedu-apidocs/keduca/libkeduca/html
+@pkgdir share/doc/kde/HTML/en/kdeedu-apidocs/keduca/keducabuilder/html
+@pkgdir share/doc/kde/HTML/en/kdeedu-apidocs/keduca/keduca/html
+@pkgdir share/doc/kde/HTML/en/kdeedu-apidocs/keduca/html
+@pkgdir share/doc/kde/HTML/en/kdeedu-apidocs/kbruch/html
+@pkgdir share/doc/kde/HTML/en/kdeedu-apidocs/kalzium/html
diff --git a/misc/kdepim3/PLIST b/misc/kdepim3/PLIST
index dea5e5e523c..546c4a936ed 100644
--- a/misc/kdepim3/PLIST
+++ b/misc/kdepim3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.33 2009/06/14 18:07:24 joerg Exp $
+@comment $NetBSD: PLIST,v 1.34 2009/06/14 20:52:12 joerg Exp $
 bin/akregator
 bin/egroupwarewizard
 bin/exchangewizard
@@ -1941,34 +1941,34 @@ share/kde/servicetypes/kontactplugin.desktop
 share/kde/servicetypes/korganizerpart.desktop
 share/kde/servicetypes/korgprintplugin.desktop
 share/kde/servicetypes/kpilotconduit.desktop
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/libkpimidentities/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/libkpgp/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/libkmime/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/libkholidays/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/libkdepim/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/libkcal/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/libemailfunctions/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/kpilot/lib/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/kpilot/kpilot/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/kpilot/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/korganizer/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/kontact/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/konsolekalendar/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/knotes/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/kmail/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/kitchensync/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/kioslaves/mbox/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/kioslaves/imap4/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/kioslaves/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/kgantt/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/kdgantt/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/karm/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/kandy/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/kalarm/lib/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/kalarm/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/kaddressbook/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/certmanager/lib/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/certmanager/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/akregator/src/librss/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/akregator/src/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdepim-apidocs/akregator/html
+@pkgdir share/doc/kde/HTML/en/kdepim-apidocs/libkpimidentities/html
+@pkgdir share/doc/kde/HTML/en/kdepim-apidocs/libkpgp/html
+@pkgdir share/doc/kde/HTML/en/kdepim-apidocs/libkmime/html
+@pkgdir share/doc/kde/HTML/en/kdepim-apidocs/libkholidays/html
+@pkgdir share/doc/kde/HTML/en/kdepim-apidocs/libkdepim/html
+@pkgdir share/doc/kde/HTML/en/kdepim-apidocs/libkcal/html
+@pkgdir share/doc/kde/HTML/en/kdepim-apidocs/libemailfunctions/html
+@pkgdir share/doc/kde/HTML/en/kdepim-apidocs/kpilot/lib/html
+@pkgdir share/doc/kde/HTML/en/kdepim-apidocs/kpilot/kpilot/html
+@pkgdir share/doc/kde/HTML/en/kdepim-apidocs/kpilot/html
+@pkgdir share/doc/kde/HTML/en/kdepim-apidocs/korganizer/html
+@pkgdir share/doc/kde/HTML/en/kdepim-apidocs/kontact/html
+@pkgdir share/doc/kde/HTML/en/kdepim-apidocs/konsolekalendar/html
+@pkgdir share/doc/kde/HTML/en/kdepim-apidocs/knotes/html
+@pkgdir share/doc/kde/HTML/en/kdepim-apidocs/kmail/html
+@pkgdir share/doc/kde/HTML/en/kdepim-apidocs/kitchensync/html
+@pkgdir share/doc/kde/HTML/en/kdepim-apidocs/kioslaves/mbox/html
+@pkgdir share/doc/kde/HTML/en/kdepim-apidocs/kioslaves/imap4/html
+@pkgdir share/doc/kde/HTML/en/kdepim-apidocs/kioslaves/html
+@pkgdir share/doc/kde/HTML/en/kdepim-apidocs/kgantt/html
+@pkgdir share/doc/kde/HTML/en/kdepim-apidocs/kdgantt/html
+@pkgdir share/doc/kde/HTML/en/kdepim-apidocs/karm/html
+@pkgdir share/doc/kde/HTML/en/kdepim-apidocs/kandy/html
+@pkgdir share/doc/kde/HTML/en/kdepim-apidocs/kalarm/lib/html
+@pkgdir share/doc/kde/HTML/en/kdepim-apidocs/kalarm/html
+@pkgdir share/doc/kde/HTML/en/kdepim-apidocs/kaddressbook/html
+@pkgdir share/doc/kde/HTML/en/kdepim-apidocs/certmanager/lib/html
+@pkgdir share/doc/kde/HTML/en/kdepim-apidocs/certmanager/html
+@pkgdir share/doc/kde/HTML/en/kdepim-apidocs/akregator/src/librss/html
+@pkgdir share/doc/kde/HTML/en/kdepim-apidocs/akregator/src/html
+@pkgdir share/doc/kde/HTML/en/kdepim-apidocs/akregator/html
diff --git a/misc/kdeutils3/PLIST b/misc/kdeutils3/PLIST
index 0b6592c3ab6..de285775dcb 100644
--- a/misc/kdeutils3/PLIST
+++ b/misc/kdeutils3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2009/06/14 18:07:24 joerg Exp $
+@comment $NetBSD: PLIST,v 1.20 2009/06/14 20:52:12 joerg Exp $
 bin/ark
 bin/irkick
 bin/kcalc
@@ -469,6 +469,6 @@ share/kde/services/kregexpeditorgui.desktop
 share/kde/services/kwallet_config.desktop
 share/kde/services/kwalletmanager_show.desktop
 share/kde/servicetypes/kmilo/kmilopluginsvc.desktop
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdeutils-apidocs/superkaramba/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdeutils-apidocs/kcalc/knumber/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdeutils-apidocs/kcalc/html
+@pkgdir share/doc/kde/HTML/en/kdeutils-apidocs/superkaramba/html
+@pkgdir share/doc/kde/HTML/en/kdeutils-apidocs/kcalc/knumber/html
+@pkgdir share/doc/kde/HTML/en/kdeutils-apidocs/kcalc/html
diff --git a/misc/kdrill/PLIST b/misc/kdrill/PLIST
index d7dbd950f41..0e39a3a8d55 100644
--- a/misc/kdrill/PLIST
+++ b/misc/kdrill/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2004/05/09 23:46:53 wiz Exp $
+@comment $NetBSD: PLIST,v 1.7 2009/06/14 20:52:13 joerg Exp $
 bin/kdrill
 lib/X11/app-defaults/KDrill
 ${IMAKE_MAN_DIR}/kdrill.${IMAKE_MANNEWSUFFIX}
@@ -9,4 +9,3 @@ share/kdrill/hiraplus.edic.gz
 share/kdrill/kanjidic.gz
 share/kdrill/kata.edic.gz
 share/kdrill/kataplus.edic.gz
-@unexec ${RMDIR} %D/share/kdrill 2>/dev/null || ${TRUE}
diff --git a/misc/koffice/PLIST b/misc/koffice/PLIST
index 3f8dbd615fe..f9d5abfcbf9 100644
--- a/misc/koffice/PLIST
+++ b/misc/koffice/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.29 2009/06/14 18:07:25 joerg Exp $
+@comment $NetBSD: PLIST,v 1.30 2009/06/14 20:52:13 joerg Exp $
 bin/karbon
 bin/kchart
 bin/kexi
@@ -4819,18 +4819,18 @@ share/kde/templates/SpreadSheet.desktop
 share/kde/templates/TextDocument.desktop
 share/locale/pl/LC_MESSAGES/kexi_add_column_gui_transl_pl.sh
 share/locale/pl/LC_MESSAGES/kexi_delete_column_gui_transl_pl.sh
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/koffice-apidocs/lib/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/koffice-apidocs/kword/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/koffice-apidocs/kspread/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/koffice-apidocs/krita/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/koffice-apidocs/kpresenter/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/koffice-apidocs/kplato/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/koffice-apidocs/koshell/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/koffice-apidocs/kivio/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/koffice-apidocs/kformula/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/koffice-apidocs/kexi/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/koffice-apidocs/kdgantt/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/koffice-apidocs/kchart/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/koffice-apidocs/karbon/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/koffice-apidocs/interfaces/html
-@exec ${MKDIR} %D/share/doc/kde/HTML/en/koffice-apidocs/filters/html
+@pkgdir share/doc/kde/HTML/en/koffice-apidocs/lib/html
+@pkgdir share/doc/kde/HTML/en/koffice-apidocs/kword/html
+@pkgdir share/doc/kde/HTML/en/koffice-apidocs/kspread/html
+@pkgdir share/doc/kde/HTML/en/koffice-apidocs/krita/html
+@pkgdir share/doc/kde/HTML/en/koffice-apidocs/kpresenter/html
+@pkgdir share/doc/kde/HTML/en/koffice-apidocs/kplato/html
+@pkgdir share/doc/kde/HTML/en/koffice-apidocs/koshell/html
+@pkgdir share/doc/kde/HTML/en/koffice-apidocs/kivio/html
+@pkgdir share/doc/kde/HTML/en/koffice-apidocs/kformula/html
+@pkgdir share/doc/kde/HTML/en/koffice-apidocs/kexi/html
+@pkgdir share/doc/kde/HTML/en/koffice-apidocs/kdgantt/html
+@pkgdir share/doc/kde/HTML/en/koffice-apidocs/kchart/html
+@pkgdir share/doc/kde/HTML/en/koffice-apidocs/karbon/html
+@pkgdir share/doc/kde/HTML/en/koffice-apidocs/interfaces/html
+@pkgdir share/doc/kde/HTML/en/koffice-apidocs/filters/html
diff --git a/misc/root/PLIST b/misc/root/PLIST
index 6022c4181c5..0efcf0d06fa 100644
--- a/misc/root/PLIST
+++ b/misc/root/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:07:29 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2009/06/14 20:52:13 joerg Exp $
 bin/cint
 bin/hadd
 bin/makecint
@@ -2334,5 +2334,5 @@ share/root/proof/utils/pload
 share/root/proof/utils/pps
 share/root/proof/utils/proof-facility
 share/root/proof/utils/push
-@exec ${MKDIR} %D/lib/root/cint/lib/gcc3strm/sys
-@exec ${MKDIR} %D/lib/root/cint/lib/gcc3strm/bits
+@pkgdir lib/root/cint/lib/gcc3strm/sys
+@pkgdir lib/root/cint/lib/gcc3strm/bits
diff --git a/misc/rpm/PLIST b/misc/rpm/PLIST
index 1368f592cd0..998bd176a10 100644
--- a/misc/rpm/PLIST
+++ b/misc/rpm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2009/06/14 18:07:29 joerg Exp $
+@comment $NetBSD: PLIST,v 1.7 2009/06/14 20:52:13 joerg Exp $
 bin/gendiff
 bin/rpm
 bin/rpm2cpio
@@ -24,4 +24,3 @@ share/locale/sk/LC_MESSAGES/rpm.mo
 share/locale/sr/LC_MESSAGES/rpm.mo
 share/locale/sv/LC_MESSAGES/rpm.mo
 share/locale/tr/LC_MESSAGES/rpm.mo
-@unexec ${RMDIR} -p %D/lib/rpm 2>/dev/null || ${TRUE}
diff --git a/misc/ruby-configuration/PLIST b/misc/ruby-configuration/PLIST
index 14f9b31c360..1b974d27e11 100644
--- a/misc/ruby-configuration/PLIST
+++ b/misc/ruby-configuration/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:07:30 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/06/14 20:52:13 joerg Exp $
 ${GEM_HOME}/cache/configuration-${PKGVERSION}.gem
 ${GEM_LIBDIR}/README
 ${GEM_LIBDIR}/config/a.rb
@@ -16,4 +16,3 @@ ${GEM_LIBDIR}/samples/c.rb
 ${GEM_LIBDIR}/samples/d.rb
 ${GEM_LIBDIR}/samples/e.rb
 ${GEM_HOME}/specifications/configuration-${PKGVERSION}.gemspec
-@exec ${MKDIR} %D/${GEM_DOCDIR}
diff --git a/misc/screen/PLIST b/misc/screen/PLIST
index 092115242d2..54371b2fcca 100644
--- a/misc/screen/PLIST
+++ b/misc/screen/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2009/06/14 18:07:31 joerg Exp $
+@comment $NetBSD: PLIST,v 1.13 2009/06/14 20:52:13 joerg Exp $
 bin/screen
 bin/${DISTNAME}
 info/screen.info
@@ -25,4 +25,3 @@ share/screen/utf8encodings/c8
 share/screen/utf8encodings/cc
 share/screen/utf8encodings/cd
 share/screen/utf8encodings/d6
-${PLIST.terminfo}@unexec ${RMDIR} -p %D/share/lib/terminfo/s 2>/dev/null || ${TRUE}
diff --git a/misc/softmaker-office-demo/PLIST b/misc/softmaker-office-demo/PLIST
index aafb188a7b1..140f0892268 100644
--- a/misc/softmaker-office-demo/PLIST
+++ b/misc/softmaker-office-demo/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:07:31 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/06/14 20:52:13 joerg Exp $
 bin/planmaker
 bin/textmaker
 lib/softmaker/fonts/coup.pfb
@@ -413,4 +413,4 @@ lib/softmaker/tm2006_en.pdf
 lib/softmaker/tmhi.bmp
 lib/softmaker/vgahlv.dwf
 lib/softmaker/vgasys.dwf
-@exec ${MKDIR} %D/lib/softmaker/install_hu/Config 2>/dev/null || ${TRUE}
+@pkgdir lib/softmaker/install_hu/Config