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

8 files changed, 9 insertions, 22 deletions

diff --git a/security/base/PLIST b/security/base/PLIST
index be9e473bed5..62b9f4788de 100644
--- a/security/base/PLIST
+++ b/security/base/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2009/06/14 18:13:26 joerg Exp $
+@comment $NetBSD: PLIST,v 1.11 2009/06/14 21:21:16 joerg Exp $
 share/base/admin/base_roleadmin.php
 share/base/admin/base_useradmin.php
 share/base/admin/index.php
@@ -122,6 +122,3 @@ share/doc/base/UPGRADE
 share/doc/base/base_faq.rtf
 share/examples/base/base.conf
 share/examples/base/base_conf.php
-@unexec ${RMDIR} %D/share/base/includes/templates/default 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/base/includes/templates 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/base 2>/dev/null || ${TRUE}
diff --git a/security/nessus-plugins/PLIST b/security/nessus-plugins/PLIST
index d5fcb414782..eeb2d42845b 100644
--- a/security/nessus-plugins/PLIST
+++ b/security/nessus-plugins/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2009/06/14 18:13:33 joerg Exp $
+@comment $NetBSD: PLIST,v 1.15 2009/06/14 21:21:16 joerg Exp $
 bin/nessus-build
 lib/nessus/plugins_factory/Makefile
 lib/nessus/plugins_factory/libtool
@@ -6,5 +6,4 @@ lib/nessus/plugins_factory/nessus.tmpl
 man/man1/nessus-build.1
 man/man8/nessus-update-plugins.8
 sbin/nessus-update-plugins
-@exec ${MKDIR} %D/lib/nessus/plugins/.desc
-@unexec ${RMDIR} %D/lib/nessus/plugins/.desc 2>/dev/null || ${TRUE}
+@pkgdir lib/nessus/plugins/.desc
diff --git a/security/nikto/PLIST b/security/nikto/PLIST
index 3547f49db11..fadb661f73e 100644
--- a/security/nikto/PLIST
+++ b/security/nikto/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:13:33 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2009/06/14 21:21:16 joerg Exp $
 bin/nikto
 share/doc/nikto/CHANGES.txt
 share/doc/nikto/LICENSE.txt
@@ -27,6 +27,3 @@ libdata/nikto/plugins/realms.db
 libdata/nikto/plugins/scan_database.db
 libdata/nikto/plugins/server_msgs.db
 libdata/nikto/plugins/servers.db
-@unexec ${RMDIR} %D/libdata/nikto/plugins 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/libdata/nikto/docs 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/libdata/nikto 2>/dev/null || ${TRUE}
diff --git a/security/openssl/PLIST.common b/security/openssl/PLIST.common
index be3beaac8bc..876b4703680 100644
--- a/security/openssl/PLIST.common
+++ b/security/openssl/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.15 2009/06/14 18:13:34 joerg Exp $
+@comment $NetBSD: PLIST.common,v 1.16 2009/06/14 21:21:16 joerg Exp $
 bin/c_rehash
 bin/openssl
 include/openssl/aes.h
@@ -1101,4 +1101,3 @@ share/examples/openssl/c_info
 share/examples/openssl/c_issuer
 share/examples/openssl/c_name
 share/examples/openssl/openssl.cnf
-@unexec ${RMDIR} -p %D/lib/pkgconfig 2>/dev/null || ${TRUE}
diff --git a/security/openvas-libnasl/PLIST b/security/openvas-libnasl/PLIST
index 6782d954bea..a238be29e6e 100644
--- a/security/openvas-libnasl/PLIST
+++ b/security/openvas-libnasl/PLIST
@@ -1,8 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2009/01/04 01:09:31 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/06/14 21:21:16 joerg Exp $
 bin/openvas-libnasl-config
 bin/openvas-nasl
 include/openvas/nasl.h
 lib/libopenvasnasl.la
 man/man1/openvas-libnasl-config.1
 man/man1/openvas-nasl.1
-@unexec ${RMDIR} %D/include/openvas 2>/dev/null || ${TRUE}
diff --git a/security/openvas-libraries/PLIST b/security/openvas-libraries/PLIST
index 86b5238027f..e13279966c2 100644
--- a/security/openvas-libraries/PLIST
+++ b/security/openvas-libraries/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2009/01/04 01:08:52 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/06/14 21:21:16 joerg Exp $
 bin/libopenvas-config
 include/openvas/arglists.h
 include/openvas/bpf_share.h
@@ -26,4 +26,3 @@ include/openvas/www_funcs.h
 lib/libopenvas.la
 lib/libopenvas_hg.la
 man/man1/libopenvas-config.1
-@unexec ${RMDIR} %D/include/openvas 2>/dev/null || ${TRUE}
diff --git a/security/openvas-plugins/PLIST b/security/openvas-plugins/PLIST
index 7b06e74c50e..e05a4fdfbde 100644
--- a/security/openvas-plugins/PLIST
+++ b/security/openvas-plugins/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2009/01/04 01:10:22 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/06/14 21:21:16 joerg Exp $
 lib/openvas/plugins/12planet_chat_server_xss.nasl
 lib/openvas/plugins/3com_nbx_voip_netset_detection.nasl
 lib/openvas/plugins/3com_switches.nasl
@@ -5992,5 +5992,3 @@ lib/openvas/plugins/zope_zclass.nasl
 lib/openvas/plugins/zyxel_http_pwd.nasl
 lib/openvas/plugins/zyxel_pwd.nasl
 sbin/openvas-nvt-sync
-@unexec ${RMDIR} %D/lib/openvas/plugins 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/lib/openvas 2>/dev/null || ${TRUE}
diff --git a/security/openvas-server/PLIST b/security/openvas-server/PLIST
index fc4c96a84e4..5c69713d259 100644
--- a/security/openvas-server/PLIST
+++ b/security/openvas-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2009/01/04 01:11:55 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/06/14 21:21:16 joerg Exp $
 bin/openvas-mkcert-client
 bin/openvas-mkrand
 bin/openvasd-config
@@ -22,4 +22,3 @@ sbin/openvas-mkcert
 sbin/openvas-rmuser
 sbin/openvasd
 share/examples/rc.d/openvasd
-@unexec ${RMDIR} %D/include/openvas 2>/dev/null || ${TRUE}