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

10 files changed, 38 insertions, 68 deletions

diff --git a/editors/TeXmacs/PLIST b/editors/TeXmacs/PLIST
index 0f7362eeede..a07e15f95d9 100644
--- a/editors/TeXmacs/PLIST
+++ b/editors/TeXmacs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.40 2009/06/14 17:50:20 joerg Exp $
+@comment $NetBSD: PLIST,v 1.41 2009/06/14 18:53:00 joerg Exp $
 bin/fig2ps
 bin/texmacs
 include/TeXmacs.h
@@ -2290,21 +2290,21 @@ share/TeXmacs/texts/test/fonts-2.tm
 share/TeXmacs/texts/test/fonts-3.tm
 share/TeXmacs/texts/test/fonts.tm
 share/TeXmacs/texts/test/overview.tm
-@exec ${MKDIR} %D/share/TeXmacs/examples/plugins/world/bin
-@exec ${MKDIR} %D/share/TeXmacs/examples/plugins/substitute/bin
-@exec ${MKDIR} %D/share/TeXmacs/examples/plugins/secure/bin
-@exec ${MKDIR} %D/share/TeXmacs/examples/plugins/prompt/bin
-@exec ${MKDIR} %D/share/TeXmacs/examples/plugins/pnambic/bin
-@exec ${MKDIR} %D/share/TeXmacs/examples/plugins/nested/bin
-@exec ${MKDIR} %D/share/TeXmacs/examples/plugins/mutator/bin
-@exec ${MKDIR} %D/share/TeXmacs/examples/plugins/multiline/bin
-@exec ${MKDIR} %D/share/TeXmacs/examples/plugins/minimal/bin
-@exec ${MKDIR} %D/share/TeXmacs/examples/plugins/menus/bin
-@exec ${MKDIR} %D/share/TeXmacs/examples/plugins/markup/bin
-@exec ${MKDIR} %D/share/TeXmacs/examples/plugins/input/bin
-@exec ${MKDIR} %D/share/TeXmacs/examples/plugins/handler/bin
-@exec ${MKDIR} %D/share/TeXmacs/examples/plugins/formula/bin
-@exec ${MKDIR} %D/share/TeXmacs/examples/plugins/dynlink/lib
-@exec ${MKDIR} %D/share/TeXmacs/examples/plugins/dynlink/bin
-@exec ${MKDIR} %D/share/TeXmacs/examples/plugins/complete/bin
-@exec ${MKDIR} %D/libexec/TeXmacs/lib
+@pkgdir share/TeXmacs/examples/plugins/world/bin
+@pkgdir share/TeXmacs/examples/plugins/substitute/bin
+@pkgdir share/TeXmacs/examples/plugins/secure/bin
+@pkgdir share/TeXmacs/examples/plugins/prompt/bin
+@pkgdir share/TeXmacs/examples/plugins/pnambic/bin
+@pkgdir share/TeXmacs/examples/plugins/nested/bin
+@pkgdir share/TeXmacs/examples/plugins/mutator/bin
+@pkgdir share/TeXmacs/examples/plugins/multiline/bin
+@pkgdir share/TeXmacs/examples/plugins/minimal/bin
+@pkgdir share/TeXmacs/examples/plugins/menus/bin
+@pkgdir share/TeXmacs/examples/plugins/markup/bin
+@pkgdir share/TeXmacs/examples/plugins/input/bin
+@pkgdir share/TeXmacs/examples/plugins/handler/bin
+@pkgdir share/TeXmacs/examples/plugins/formula/bin
+@pkgdir share/TeXmacs/examples/plugins/dynlink/lib
+@pkgdir share/TeXmacs/examples/plugins/dynlink/bin
+@pkgdir share/TeXmacs/examples/plugins/complete/bin
+@pkgdir libexec/TeXmacs/lib
diff --git a/editors/emacs/PLIST b/editors/emacs/PLIST
index d33946504aa..9024734dbc5 100644
--- a/editors/emacs/PLIST
+++ b/editors/emacs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.21 2009/06/14 17:50:21 joerg Exp $
+@comment $NetBSD: PLIST,v 1.22 2009/06/14 18:53:00 joerg Exp $
 bin/emacs-b2m
 bin/emacs-ctags
 bin/emacs-ebrowse
@@ -2707,5 +2707,3 @@ share/emacs/${PKGVERSION}/lisp/xt-mouse.el.gz
 share/emacs/${PKGVERSION}/lisp/xt-mouse.elc
 share/emacs/${PKGVERSION}/site-lisp/subdirs.el
 share/emacs/site-lisp/subdirs.el
-@unexec ${RMDIR} %D/share/emacs/site-lisp 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/emacs 2>/dev/null || ${TRUE}
diff --git a/editors/emacs20/PLIST b/editors/emacs20/PLIST
index 632f55ae79b..a7a8e544574 100644
--- a/editors/emacs20/PLIST
+++ b/editors/emacs20/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2009/06/14 17:50:22 joerg Exp $
+@comment $NetBSD: PLIST,v 1.8 2009/06/14 18:53:00 joerg Exp $
 bin/emacs
 bin/emacs-${PKGVERSION}
 bin/emacs-b2m
@@ -1276,5 +1276,4 @@ share/emacs/${PKGVERSION}/lisp/zone-mode.el
 share/emacs/${PKGVERSION}/lisp/zone-mode.elc
 share/emacs/${PKGVERSION}/site-lisp/subdirs.el
 share/emacs/site-lisp/subdirs.el
-@exec ${MKDIR} %D/share/emacs/${PKGVERSION}/leim
-@unexec ${RMDIR} %D/share/emacs 2>/dev/null || ${TRUE}
+@pkgdir share/emacs/${PKGVERSION}/leim
diff --git a/editors/emacs21/PLIST b/editors/emacs21/PLIST
index 1d7d5308b1a..2a4e51c0a18 100644
--- a/editors/emacs21/PLIST
+++ b/editors/emacs21/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2009/06/14 17:50:22 joerg Exp $
+@comment $NetBSD: PLIST,v 1.8 2009/06/14 18:53:00 joerg Exp $
 bin/emacs
 bin/emacs-${EMACSVERSION}
 bin/emacs-b2m
@@ -49,7 +49,6 @@ man/man1/emacs-ctags.1
 man/man1/emacs-etags.1
 man/man1/emacs-gfdl.1
 man/man1/emacs.1
-@unexec ${RMDIR} %D/share/emacs 2>/dev/null || ${TRUE}
 share/emacs/${EMACSVERSION}/etc/BABYL
 share/emacs/${EMACSVERSION}/etc/CENSORSHIP
 share/emacs/${EMACSVERSION}/etc/COOKIES
@@ -171,7 +170,7 @@ share/emacs/${EMACSVERSION}/etc/ulimit.hack
 share/emacs/${EMACSVERSION}/etc/vipcard.tex
 share/emacs/${EMACSVERSION}/etc/viperCard.tex
 share/emacs/${EMACSVERSION}/etc/yow.lines
-@exec ${MKDIR} %D/share/emacs/${EMACSVERSION}/leim
+@pkgdir share/emacs/${EMACSVERSION}/leim
 share/emacs/${EMACSVERSION}/lisp/COPYING
 share/emacs/${EMACSVERSION}/lisp/README
 share/emacs/${EMACSVERSION}/lisp/abbrev.el
@@ -1768,5 +1767,3 @@ share/emacs/${EMACSVERSION}/lisp/xt-mouse.el
 share/emacs/${EMACSVERSION}/lisp/xt-mouse.elc
 share/emacs/${EMACSVERSION}/site-lisp/subdirs.el
 share/emacs/site-lisp/subdirs.el
-@unexec ${RMDIR} %D/share/emacs/site-lisp 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/emacs 2>/dev/null || ${TRUE}
diff --git a/editors/gedit/PLIST b/editors/gedit/PLIST
index dc1197cb0de..f9d209f17bf 100644
--- a/editors/gedit/PLIST
+++ b/editors/gedit/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.37 2009/06/14 17:50:22 joerg Exp $
+@comment $NetBSD: PLIST,v 1.38 2009/06/14 18:53:00 joerg Exp $
 bin/gedit
 bin/gnome-text-editor
 include/gedit-2.20/gedit/gedit-app.h
@@ -405,6 +405,6 @@ share/omf/gedit/gedit-uk.omf
 share/omf/gedit/gedit-zh_CN.omf
 share/omf/gedit/gedit-zh_HK.omf
 share/omf/gedit/gedit-zh_TW.omf
-@exec ${MKDIR} %D/share/gedit-2/plugins/sample
-@exec ${MKDIR} %D/share/gedit-2/plugins/indent
-@exec ${MKDIR} %D/share/gedit-2/plugins/changecase
+@pkgdir share/gedit-2/plugins/sample
+@pkgdir share/gedit-2/plugins/indent
+@pkgdir share/gedit-2/plugins/changecase
diff --git a/editors/nvi/PLIST b/editors/nvi/PLIST
index 8e6e00568c5..ccbcb97748e 100644
--- a/editors/nvi/PLIST
+++ b/editors/nvi/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 17:50:25 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:53:00 joerg Exp $
 bin/nex
 bin/nvi
 bin/nview
@@ -25,4 +25,3 @@ share/vi/tcl/errors.tcl
 share/vi/tcl/gnats.tcl
 share/vi/tcl/mailprocs.tcl
 share/vi/tcl/wc.tcl
-@unexec ${RMDIR} %D/share/vi 2>/dev/null || ${TRUE}
diff --git a/editors/speedbar/PLIST b/editors/speedbar/PLIST
index c98df71922e..4b07257ffb2 100644
--- a/editors/speedbar/PLIST
+++ b/editors/speedbar/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2006/03/20 04:59:08 jlam Exp $
+@comment $NetBSD: PLIST,v 1.10 2009/06/14 18:53:00 joerg Exp $
 ${EMACS_INFOPREFIX}/speedbar.info
 ${EMACS_LISPPREFIX}/speedbar/dframe.el
 ${EMACS_LISPPREFIX}/speedbar/dframe.elc
@@ -30,4 +30,3 @@ ${EMACS_LISPPREFIX}/speedbar/sb-tag-v.xpm
 ${EMACS_LISPPREFIX}/speedbar/sb-tag.xpm
 ${EMACS_LISPPREFIX}/speedbar/speedbar.el
 ${EMACS_LISPPREFIX}/speedbar/speedbar.elc
-@unexec ${RMDIR} %D/${EMACS_LISPPREFIX}/speedbar 2>/dev/null || ${TRUE}
diff --git a/editors/vim-lang/PLIST b/editors/vim-lang/PLIST
index 7da2c1e8ad0..e2477efb4eb 100644
--- a/editors/vim-lang/PLIST
+++ b/editors/vim-lang/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2009/06/14 17:50:27 joerg Exp $
+@comment $NetBSD: PLIST,v 1.10 2009/06/14 18:53:00 joerg Exp $
 man/fr.ISO8859-1/man1/evim.1
 man/fr.ISO8859-1/man1/ex.1
 man/fr.ISO8859-1/man1/rview.1
@@ -304,25 +304,3 @@ share/vim/${VIM_SUBDIR}/lang/zh_CN.UTF-8/LC_MESSAGES/vim.mo
 share/vim/${VIM_SUBDIR}/lang/zh_CN/LC_MESSAGES/vim.mo
 share/vim/${VIM_SUBDIR}/lang/zh_TW.UTF-8/LC_MESSAGES/vim.mo
 share/vim/${VIM_SUBDIR}/lang/zh_TW/LC_MESSAGES/vim.mo
-@unexec ${RMDIR} %D/man/fr.ISO8859-1/man1 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/man/fr.ISO8859-1 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/man/fr.UTF-8/man1 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/man/fr.UTF-8 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/man/fr/man1 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/man/fr 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/man/it.ISO8859-1/man1 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/man/it.ISO8859-1 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/man/it.UTF-8/man1 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/man/it.UTF-8 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/pl.ISO8859-2/man1 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/man/pl.ISO8859-2 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/man/pl.UTF-8/man1 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/man/pl.UTF-8 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/man/pl/man1 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/man/pl 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/man/ru.KOI8-R/man1 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/man/ru.KOI8-R 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/man/ru.UTF-8/man1 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/man/ru.UTF-8 2>/dev/null || ${TRUE}
diff --git a/editors/xemacs-current/PLIST b/editors/xemacs-current/PLIST
index fc65649d90c..bc158d83518 100644
--- a/editors/xemacs-current/PLIST
+++ b/editors/xemacs-current/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2009/06/14 17:50:28 joerg Exp $
+@comment $NetBSD: PLIST,v 1.21 2009/06/14 18:53:01 joerg Exp $
 bin/${DISTNAME}
 bin/ellcc
 bin/gnuattach
@@ -10,8 +10,6 @@ bin/xemacs-b2m
 bin/xemacs-ctags
 bin/xemacs-etags
 bin/xemacs-rcs-checkin
-@exec ${MKDIR} %D/lib/xemacs/site-lisp
-@exec ${MKDIR} %D/lib/xemacs/site-modules
 lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/DOC
 lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/add-big-package.sh
 lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/config.values
@@ -1434,5 +1432,7 @@ man/man1/gnuserv.1
 man/man1/xemacs-ctags.1
 man/man1/xemacs-etags.1
 man/man1/xemacs.1
+@pkgdir lib/xemacs/site-lisp
+@pkgdir lib/xemacs/site-modules
 @exec ${MKDIR} /var/tmp/xemacs.lock && chmod 1777 /var/tmp/xemacs.lock
 @unexec ${RM} -rf /var/tmp/xemacs.lock
diff --git a/editors/xemacs/PLIST b/editors/xemacs/PLIST
index 217705b82f9..0953e59d510 100644
--- a/editors/xemacs/PLIST
+++ b/editors/xemacs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2009/06/14 17:50:27 joerg Exp $
+@comment $NetBSD: PLIST,v 1.18 2009/06/14 18:53:01 joerg Exp $
 bin/${DISTNAME}
 bin/ellcc
 bin/gnuattach
@@ -1254,6 +1254,6 @@ man/man1/gnuserv.1
 man/man1/xemacs-ctags.1
 man/man1/xemacs-etags.1
 man/man1/xemacs.1
-@exec ${MKDIR} %D/lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/modules
-@exec ${MKDIR} %D/lib/xemacs/site-modules
-@exec ${MKDIR} %D/lib/xemacs/site-lisp
+@pkgdir lib/${DISTNAME}/${MACHINE_GNU_PLATFORM}/modules
+@pkgdir lib/xemacs/site-modules
+@pkgdir lib/xemacs/site-lisp