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

16 files changed, 20 insertions, 41 deletions

diff --git a/mail/GNUMail/PLIST b/mail/GNUMail/PLIST
index 2a0de977281..1f5a79017c7 100644
--- a/mail/GNUMail/PLIST
+++ b/mail/GNUMail/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2009/06/14 18:04:26 joerg Exp $
+@comment $NetBSD: PLIST,v 1.11 2009/06/14 20:45:10 joerg Exp $
 bin/GNUMail
 include/GNUMail
 lib/GNUstep/Applications/GNUMail.app/GNUMail
@@ -217,4 +217,4 @@ share/GNUstep/Library/GNUMail/Viewing.prefs/Resources/Info-gnustep.plist
 share/GNUstep/Library/GNUMail/Viewing.prefs/Resources/viewing.tiff
 share/GNUstep/Library/GNUMail/Viewing.prefs/Viewing
 share/GNUstep/Library/GNUMail/Viewing.prefs/stamp.make
-@exec ${MKDIR} %D/lib/GNUstep/Frameworks/GNUMail.framework/Versions/1/Headers
+@pkgdir lib/GNUstep/Frameworks/GNUMail.framework/Versions/1/Headers
diff --git a/mail/bbmail/PLIST b/mail/bbmail/PLIST
index 2f8e4c5314f..5b67799cfc3 100644
--- a/mail/bbmail/PLIST
+++ b/mail/bbmail/PLIST
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/10/09 14:35:39 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/06/14 20:45:11 joerg Exp $
 bin/bbmail
 man/man1/bbmail.1
 share/bbtools/bbmail.bb
-@unexec ${RMDIR} %D/share/bbtools 2>/dev/null || ${TRUE}
diff --git a/mail/claws-mail/PLIST.plugins b/mail/claws-mail/PLIST.plugins
index 2c7bcc23870..f9342e759c9 100644
--- a/mail/claws-mail/PLIST.plugins
+++ b/mail/claws-mail/PLIST.plugins
@@ -1,3 +1,2 @@
-@comment $NetBSD: PLIST.plugins,v 1.1 2007/08/03 02:34:40 smb Exp $
+@comment $NetBSD: PLIST.plugins,v 1.2 2009/06/14 20:45:11 joerg Exp $
 lib/claws-mail/plugins/${PLUGIN_NAME}.la
-@unexec ${RMDIR} %D/lib/claws-mail/plugins 2>/dev/null || ${TRUE}
diff --git a/mail/dovecot/PLIST b/mail/dovecot/PLIST
index 77d257182e5..eaca29279a7 100644
--- a/mail/dovecot/PLIST
+++ b/mail/dovecot/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.24 2009/06/14 18:04:31 joerg Exp $
+@comment $NetBSD: PLIST,v 1.25 2009/06/14 20:45:11 joerg Exp $
 include/dovecot/config.h
 include/dovecot/src/auth/auth-cache.h
 include/dovecot/src/auth/auth-client-connection.h
@@ -446,4 +446,4 @@ share/examples/dovecot/dovecot-openssl.cnf
 share/examples/dovecot/dovecot-sql-example.conf
 share/examples/dovecot/mkcert.sh
 share/examples/rc.d/dovecot
-@exec ${MKDIR} %D/lib/dovecot/auth
+@pkgdir lib/dovecot/auth
diff --git a/mail/hypermail/PLIST b/mail/hypermail/PLIST
index b190efbf1ca..6f0f71c4702 100644
--- a/mail/hypermail/PLIST
+++ b/mail/hypermail/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 18:04:34 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2009/06/14 20:45:11 joerg Exp $
 bin/hypermail
 bin/msg2archive
 bin/rdmsg
@@ -12,4 +12,4 @@ share/doc/html/hypermail/hypermail-faq.html
 share/doc/html/hypermail/hypermail.html
 share/doc/html/hypermail/hypermail.png
 share/doc/html/hypermail/stars.png
-@exec ${MKDIR} %D/share/doc/html/hypermail/images
+@pkgdir share/doc/html/hypermail/images
diff --git a/mail/imp/PLIST b/mail/imp/PLIST
index 9e9e2f76e34..8244080d871 100644
--- a/mail/imp/PLIST
+++ b/mail/imp/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2009/06/14 18:04:35 joerg Exp $
+@comment $NetBSD: PLIST,v 1.15 2009/06/14 20:45:11 joerg Exp $
 share/doc/imp/CHANGES
 share/doc/imp/COPYING
 share/doc/imp/CREDITS
@@ -558,5 +558,3 @@ share/horde/imp/themes/tango-blue/screen.css
 share/horde/imp/themes/tango-blue/themed_graphics
 share/horde/imp/thread.php
 share/horde/imp/view.php
-@unexec ${RMDIR} %D/share/horde/imp/config 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/horde/imp 2>/dev/null || ${TRUE}
diff --git a/mail/ingo/PLIST b/mail/ingo/PLIST
index fc8e65caf1c..5e90da854ce 100644
--- a/mail/ingo/PLIST
+++ b/mail/ingo/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2009/06/14 18:04:35 joerg Exp $
+@comment $NetBSD: PLIST,v 1.11 2009/06/14 20:45:11 joerg Exp $
 share/doc/ingo/INSTALL
 share/doc/ingo/README
 share/doc/ingo/RELEASE_NOTES
@@ -183,5 +183,3 @@ share/horde/ingo/themes/tango-blue/graphics/whitelist.png
 share/horde/ingo/themes/tango-blue/themed_graphics
 share/horde/ingo/vacation.php
 share/horde/ingo/whitelist.php
-@unexec ${RMDIR} %D/share/horde/ingo/config 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/horde/ingo 2>/dev/null || ${TRUE}
diff --git a/mail/mailman/PLIST b/mail/mailman/PLIST
index ea879b4e370..f3fefed72b2 100644
--- a/mail/mailman/PLIST
+++ b/mail/mailman/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2009/06/14 18:04:37 joerg Exp $
+@comment $NetBSD: PLIST,v 1.20 2009/06/14 20:45:11 joerg Exp $
 lib/mailman/Mailman/Archiver/Archiver.py
 lib/mailman/Mailman/Archiver/Archiver.pyc
 lib/mailman/Mailman/Archiver/HyperArch.py
@@ -2217,4 +2217,3 @@ share/doc/mailman/mailman-member.ps
 share/doc/mailman/mailman-member.txt
 share/examples/mailman/mailman.conf
 share/examples/rc.d/mailman
-@unexec ${RMDIR} -p %D/lib/mailman/Mailman 2>/dev/null || ${TRUE}
diff --git a/mail/popa3d/PLIST b/mail/popa3d/PLIST
index 2a8522bae8f..fed9526b544 100644
--- a/mail/popa3d/PLIST
+++ b/mail/popa3d/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2009/06/14 18:04:39 joerg Exp $
+@comment $NetBSD: PLIST,v 1.10 2009/06/14 20:45:11 joerg Exp $
 man/man8/popa3d.8
 sbin/popa3d
 share/doc/popa3d/DESIGN
@@ -6,4 +6,4 @@ share/doc/popa3d/INSTALL
 share/doc/popa3d/LICENSE
 share/examples/rc.d/popa3d
 @comment empty dir to chroot to
-@exec ${MKDIR} %D/share/empty
+@pkgdir share/empty
diff --git a/mail/sendmail/PLIST b/mail/sendmail/PLIST
index 4e38745c019..07e4185b59b 100644
--- a/mail/sendmail/PLIST
+++ b/mail/sendmail/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2009/06/14 18:04:42 joerg Exp $
+@comment $NetBSD: PLIST,v 1.16 2009/06/14 20:45:11 joerg Exp $
 bin/hoststat
 bin/mailq
 bin/newaliases
@@ -222,5 +222,3 @@ share/sendmail/siteconfig/uucp.cogsci.m4
 share/sendmail/siteconfig/uucp.old.arpa.m4
 share/sendmail/siteconfig/uucp.ucbarpa.m4
 share/sendmail/siteconfig/uucp.ucbvax.m4
-@unexec ${RMDIR} %D/share/examples/sendmail 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} ${SMRSH_CMDDIR} 2>/dev/null || ${TRUE}
diff --git a/mail/sendmail813/PLIST b/mail/sendmail813/PLIST
index 7b5052cabaa..8e6008ef7a0 100644
--- a/mail/sendmail813/PLIST
+++ b/mail/sendmail813/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:04:42 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/06/14 20:45:12 joerg Exp $
 bin/hoststat
 bin/mailq
 bin/newaliases
@@ -219,5 +219,3 @@ share/sendmail/siteconfig/uucp.cogsci.m4
 share/sendmail/siteconfig/uucp.old.arpa.m4
 share/sendmail/siteconfig/uucp.ucbarpa.m4
 share/sendmail/siteconfig/uucp.ucbvax.m4
-@unexec ${RMDIR} %D/share/examples/sendmail 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} ${SMRSH_CMDDIR} 2>/dev/null || ${TRUE}
diff --git a/mail/thunderbird-gtk1/PLIST b/mail/thunderbird-gtk1/PLIST
index 9c3946efb1d..da1217d1f7a 100644
--- a/mail/thunderbird-gtk1/PLIST
+++ b/mail/thunderbird-gtk1/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2009/06/14 18:04:44 joerg Exp $
+@comment $NetBSD: PLIST,v 1.18 2009/06/14 20:45:12 joerg Exp $
 bin/${MOZILLA}
 @comment begin PROGRAMS
 lib/${MOZILLA}/${MOZILLA_BIN}
@@ -2843,5 +2843,3 @@ share/pixmaps/${MOZILLA}.xpm
 @unexec ${RM} -f %D/lib/${MOZILLA}/chrome/app-chrome.manifest
 @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/mail/thunderbird/PLIST b/mail/thunderbird/PLIST
index dfad764cbc6..e4796bfd375 100644
--- a/mail/thunderbird/PLIST
+++ b/mail/thunderbird/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.27 2009/06/14 18:04:44 joerg Exp $
+@comment $NetBSD: PLIST,v 1.28 2009/06/14 20:45:12 joerg Exp $
 bin/${MOZILLA}
 @comment begin PROGRAMS
 lib/${MOZILLA}/${MOZILLA_BIN}
@@ -2853,5 +2853,3 @@ share/pixmaps/${MOZILLA}.xpm
 @unexec ${RM} -f %D/lib/${MOZILLA}/chrome/app-chrome.manifest
 @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/mail/turba/PLIST b/mail/turba/PLIST
index 7b1428c63e3..d84a50f5e91 100644
--- a/mail/turba/PLIST
+++ b/mail/turba/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2009/06/14 18:04:45 joerg Exp $
+@comment $NetBSD: PLIST,v 1.16 2009/06/14 20:45:12 joerg Exp $
 share/doc/turba/INSTALL
 share/doc/turba/LDAP
 share/doc/turba/README
@@ -273,5 +273,3 @@ share/horde/turba/themes/tango-blue/graphics/za_secondary.png
 share/horde/turba/themes/tango-blue/themed_graphics
 share/horde/turba/vcard.php
 share/horde/turba/view.php
-@unexec ${RMDIR} %D/share/horde/turba/config 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/horde/turba 2>/dev/null || ${TRUE}
diff --git a/mail/vm/PLIST b/mail/vm/PLIST
index 005e06c587c..d4757486890 100644
--- a/mail/vm/PLIST
+++ b/mail/vm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 18:04:45 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2009/06/14 20:45:12 joerg Exp $
 bin/base64-decode
 bin/base64-encode
 bin/qp-decode
@@ -170,5 +170,3 @@ ${EMACS_LISPPREFIX}/vm/vm-window.el
 ${EMACS_LISPPREFIX}/vm/vm-window.elc
 ${EMACS_LISPPREFIX}/vm/vm.el
 ${EMACS_LISPPREFIX}/vm/vm.elc
-@unexec ${RMDIR} -p %D/${PIXMAPDIR} 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} -p %D/${EMACS_LISPPREFIX} 2>/dev/null || ${TRUE}
diff --git a/mail/wmmail/PLIST b/mail/wmmail/PLIST
index 9724e2bb6d9..14b8fb45dee 100644
--- a/mail/wmmail/PLIST
+++ b/mail/wmmail/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:04:45 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2009/06/14 20:45:12 joerg Exp $
 GNUstep/Apps/WMMail.app/Anims/NeXT/Mail1.xpm
 GNUstep/Apps/WMMail.app/Anims/NeXT/Mail2.xpm
 GNUstep/Apps/WMMail.app/Anims/NeXT/Mail3.xpm
@@ -42,5 +42,3 @@ GNUstep/Apps/WMMail.app/Sounds/drip.au
 GNUstep/Apps/WMMail.app/Sounds/hammer.au
 GNUstep/Apps/WMMail.app/Sounds/monkey.au
 GNUstep/Apps/WMMail.app/WMMail
-@unexec ${RMDIR} %D/GNUstep/Apps 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/GNUstep 2>/dev/null || ${TRUE}