5 files changed, 7 insertions, 138 deletions

diff --git a/dns/bind10/pkg-plist b/dns/bind10/pkg-plist
index 9f4890ba0562..dd79bc5e4b0e 100644
--- a/dns/bind10/pkg-plist
+++ b/dns/bind10/pkg-plist
@@ -823,51 +823,3 @@ sbin/bind10
 %%PORTDOCS%%%%DOCSDIR%%/bind10-messages.html
 @unexec rmdir "/var/bind10/mapped_files" >/dev/null 2>&1 || :
 @unexec rmdir "/var/bind10" >/dev/null 2>&1 || :
-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrmtry %%DATADIR%%/config_plugins
-@dirrmtry %%DATADIR%%
-@dirrmtry libexec/bind10/backends
-@dirrmtry libexec/bind10
-@dirrmtry %%PYTHON_SITELIBDIR%%/isc/xfrin
-@dirrmtry %%PYTHON_SITELIBDIR%%/isc/util/cio
-@dirrmtry %%PYTHON_SITELIBDIR%%/isc/util
-@dirrmtry %%PYTHON_SITELIBDIR%%/isc/sysinfo
-@dirrmtry %%PYTHON_SITELIBDIR%%/isc/statistics
-@dirrmtry %%PYTHON_SITELIBDIR%%/isc/server_common
-@dirrmtry %%PYTHON_SITELIBDIR%%/isc/notify
-@dirrmtry %%PYTHON_SITELIBDIR%%/isc/net
-@dirrmtry %%PYTHON_SITELIBDIR%%/isc/memmgr
-@dirrmtry %%PYTHON_SITELIBDIR%%/isc/log_messages
-@dirrmtry %%PYTHON_SITELIBDIR%%/isc/dns
-@dirrmtry %%PYTHON_SITELIBDIR%%/isc/ddns
-@dirrmtry %%PYTHON_SITELIBDIR%%/isc/datasrc
-@dirrmtry %%PYTHON_SITELIBDIR%%/isc/config
-@dirrmtry %%PYTHON_SITELIBDIR%%/isc/cc
-@dirrmtry %%PYTHON_SITELIBDIR%%/isc/bind10
-@dirrmtry %%PYTHON_SITELIBDIR%%/isc/acl
-@dirrmtry %%PYTHON_SITELIBDIR%%/isc
-@dirrmtry %%PYTHON_SITELIBDIR%%/bindctl
-@dirrmtry include/bind10/util
-@dirrmtry include/bind10/log
-@dirrmtry include/bind10/hooks
-@dirrmtry include/bind10/exceptions
-@dirrmtry include/bind10/dns
-@dirrmtry include/bind10/dhcp
-@dirrmtry include/bind10/asiolink
-@dirrmtry include/bind10/asio/windows
-@dirrmtry include/bind10/asio/ssl/detail
-@dirrmtry include/bind10/asio/ssl
-@dirrmtry include/bind10/asio/posix
-@dirrmtry include/bind10/asio/local/detail/impl
-@dirrmtry include/bind10/asio/local/detail
-@dirrmtry include/bind10/asio/local
-@dirrmtry include/bind10/asio/ip/impl
-@dirrmtry include/bind10/asio/ip/detail/impl
-@dirrmtry include/bind10/asio/ip/detail
-@dirrmtry include/bind10/asio/ip
-@dirrmtry include/bind10/asio/impl
-@dirrmtry include/bind10/asio/detail/impl
-@dirrmtry include/bind10/asio/detail
-@dirrmtry include/bind10/asio
-@dirrmtry include/bind10
-@dirrmtry %%ETCDIR%%
diff --git a/dns/bundy/pkg-plist b/dns/bundy/pkg-plist
index 052d52de0291..21bd71c7863a 100644
--- a/dns/bundy/pkg-plist
+++ b/dns/bundy/pkg-plist
@@ -821,73 +821,5 @@ sbin/bundy-cmdctl-usermgr
 %%PORTDOCS%%%%DOCSDIR%%/bundy-guide.html
 %%PORTDOCS%%%%DOCSDIR%%/bundy-guide.txt
 %%PORTDOCS%%%%DOCSDIR%%/bundy-messages.html
-@dirrmtry %%ETCDIR%%
-@dirrmtry include/bundy/asio/detail/impl
-@dirrmtry include/bundy/asio/detail
-@dirrmtry include/bundy/asio/impl
-@dirrmtry include/bundy/asio/ip/detail/impl
-@dirrmtry include/bundy/asio/ip/detail
-@dirrmtry include/bundy/asio/ip/impl
-@dirrmtry include/bundy/asio/ip
-@dirrmtry include/bundy/asio/local/detail/impl
-@dirrmtry include/bundy/asio/local/detail
-@dirrmtry include/bundy/asio/local
-@dirrmtry include/bundy/asio/posix
-@dirrmtry include/bundy/asio/ssl/detail
-@dirrmtry include/bundy/asio/ssl
-@dirrmtry include/bundy/asio/windows
-@dirrmtry include/bundy/asio
-@dirrmtry include/bundy/asiolink
-@dirrmtry include/bundy/dhcp
-@dirrmtry include/bundy/dns
-@dirrmtry include/bundy/exceptions
-@dirrmtry include/bundy/hooks
-@dirrmtry include/bundy/log
-@dirrmtry include/bundy/util
-@dirrmtry include/bundy
-@dirrmtry %%PYTHON_SITELIBDIR%%/bundy/__pycache__
-@dirrmtry %%PYTHON_SITELIBDIR%%/bundy/acl/__pycache__
-@dirrmtry %%PYTHON_SITELIBDIR%%/bundy/acl
-@dirrmtry %%PYTHON_SITELIBDIR%%/bundy/bundy/__pycache__
-@dirrmtry %%PYTHON_SITELIBDIR%%/bundy/bundy
-@dirrmtry %%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__
-@dirrmtry %%PYTHON_SITELIBDIR%%/bundy/cc
-@dirrmtry %%PYTHON_SITELIBDIR%%/bundy/config/__pycache__
-@dirrmtry %%PYTHON_SITELIBDIR%%/bundy/config
-@dirrmtry %%PYTHON_SITELIBDIR%%/bundy/datasrc/__pycache__
-@dirrmtry %%PYTHON_SITELIBDIR%%/bundy/datasrc
-@dirrmtry %%PYTHON_SITELIBDIR%%/bundy/ddns/__pycache__
-@dirrmtry %%PYTHON_SITELIBDIR%%/bundy/ddns
-@dirrmtry %%PYTHON_SITELIBDIR%%/bundy/dns/__pycache__
-@dirrmtry %%PYTHON_SITELIBDIR%%/bundy/dns
-@dirrmtry %%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__
-@dirrmtry %%PYTHON_SITELIBDIR%%/bundy/log_messages
-@dirrmtry %%PYTHON_SITELIBDIR%%/bundy/memmgr/__pycache__
-@dirrmtry %%PYTHON_SITELIBDIR%%/bundy/memmgr
-@dirrmtry %%PYTHON_SITELIBDIR%%/bundy/net/__pycache__
-@dirrmtry %%PYTHON_SITELIBDIR%%/bundy/net
-@dirrmtry %%PYTHON_SITELIBDIR%%/bundy/notify/__pycache__
-@dirrmtry %%PYTHON_SITELIBDIR%%/bundy/notify
-@dirrmtry %%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__
-@dirrmtry %%PYTHON_SITELIBDIR%%/bundy/server_common
-@dirrmtry %%PYTHON_SITELIBDIR%%/bundy/statistics/__pycache__
-@dirrmtry %%PYTHON_SITELIBDIR%%/bundy/statistics
-@dirrmtry %%PYTHON_SITELIBDIR%%/bundy/sysinfo/__pycache__
-@dirrmtry %%PYTHON_SITELIBDIR%%/bundy/sysinfo
-@dirrmtry %%PYTHON_SITELIBDIR%%/bundy/util/__pycache__
-@dirrmtry %%PYTHON_SITELIBDIR%%/bundy/util/cio/__pycache__
-@dirrmtry %%PYTHON_SITELIBDIR%%/bundy/util/cio
-@dirrmtry %%PYTHON_SITELIBDIR%%/bundy/util
-@dirrmtry %%PYTHON_SITELIBDIR%%/bundy/xfrin/__pycache__
-@dirrmtry %%PYTHON_SITELIBDIR%%/bundy/xfrin
-@dirrmtry %%PYTHON_SITELIBDIR%%/bundy
-@dirrmtry %%PYTHON_SITELIBDIR%%/bundyctl/__pycache__
-@dirrmtry %%PYTHON_SITELIBDIR%%/bundyctl
-@dirrmtry libexec/bundy/backends
-@dirrmtry libexec/bundy
-@dirrmtry %%DATADIR%%/config_plugins/__pycache__
-@dirrmtry %%DATADIR%%/config_plugins
-@dirrmtry %%DATADIR%%
-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrmtry /var/bundy/mapped_files
-@dirrmtry /var/bundy
+@dir /var/bundy/mapped_files
+@dir /var/bundy
diff --git a/dns/maradns/pkg-plist b/dns/maradns/pkg-plist
index a26ab0956852..fce538c7e0f8 100644
--- a/dns/maradns/pkg-plist
+++ b/dns/maradns/pkg-plist
@@ -19,4 +19,3 @@ man/man8/zoneserver.8.gz
 sbin/Deadwood
 sbin/maradns
 sbin/zoneserver
-@dirrmtry %%ETCDIR%%
diff --git a/dns/maradns1/pkg-plist b/dns/maradns1/pkg-plist
index 59c8563727eb..c873692b0ba9 100644
--- a/dns/maradns1/pkg-plist
+++ b/dns/maradns1/pkg-plist
@@ -148,13 +148,3 @@ sbin/zoneserver
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_full_mararc.orig
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_mararc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_recursive_mararc.txt
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/tutorial
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/text
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/pdf
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/misc/js-manpages
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/misc
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/en
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrmtry etc/maradns/logger
-@dirrmtry etc/maradns
diff --git a/dns/yadifa/pkg-plist b/dns/yadifa/pkg-plist
index c5140fcd3a56..e3a34f741594 100644
--- a/dns/yadifa/pkg-plist
+++ b/dns/yadifa/pkg-plist
@@ -185,12 +185,8 @@ sbin/yadifad
 /var/yadifa/masters/localhost.zone
 /var/yadifa/masters/localhost6.zone
 /var/yadifa/masters/somedomain.eu.zone
-@dirrmtry include/dnscore
-@dirrmtry include/dnsdb
-@dirrmtry include/dnszone
-%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%
-@dirrmtry /var/yadifa/keys
-@dirrmtry /var/yadifa/masters
-@dirrmtry /var/yadifa/slaves
-@dirrmtry /var/yadifa/xfr
-@dirrmtry /var/yadifa
+@dir /var/yadifa/keys
+@dir /var/yadifa/masters
+@dir /var/yadifa/slaves
+@dir /var/yadifa/xfr
+@dir /var/yadifa