Cleanup @dirrm* from my ports.

Sponsored by:	Absolight

20 files changed, 21 insertions, 390 deletions

diff --git a/databases/p5-Bucardo/pkg-plist b/databases/p5-Bucardo/pkg-plist
index d642f5495ddd..d6e282f21aa7 100644
--- a/databases/p5-Bucardo/pkg-plist
+++ b/databases/p5-Bucardo/pkg-plist
@@ -4,4 +4,3 @@ etc/rc.d/bucardo
 %%SITE_PERL%%/Bucardo.pm
 man/man1/bucardo.1.gz
 share/bucardo/bucardo.schema
-@dirrm share/bucardo
diff --git a/devel/p5-POE-Component-Schedule/pkg-plist b/devel/p5-POE-Component-Schedule/pkg-plist
index ab31de99e286..367e6d422c10 100644
--- a/devel/p5-POE-Component-Schedule/pkg-plist
+++ b/devel/p5-POE-Component-Schedule/pkg-plist
@@ -1,4 +1,2 @@
 %%SITE_PERL%%/POE/Component/Schedule.pm
 %%PERL5_MAN3%%/POE::Component::Schedule.3.gz
-@dirrmtry %%SITE_PERL%%/POE/Component
-@dirrmtry %%SITE_PERL%%/POE
diff --git a/devel/p5-Script-isAperlScript/pkg-plist b/devel/p5-Script-isAperlScript/pkg-plist
index 161c42785514..4f9b36995fa4 100644
--- a/devel/p5-Script-isAperlScript/pkg-plist
+++ b/devel/p5-Script-isAperlScript/pkg-plist
@@ -1,6 +1,3 @@
 %%PERL5_MAN3%%/Script::isAperlScript.3.gz
 %%SITE_PERL%%/Script/isAperlScript.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Script/isAperlScript/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Script/isAperlScript
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Script
-@dirrmtry %%SITE_PERL%%/Script
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
diff --git a/irc/anope/pkg-plist b/irc/anope/pkg-plist
index c803dd55210e..416b322dc927 100644
--- a/irc/anope/pkg-plist
+++ b/irc/anope/pkg-plist
@@ -176,11 +176,3 @@ libexec/anope/tools/epona2anope
 %%DATADIR%%/modules/viagra.so
 %%DATADIR%%/mydbgen
 %%DATADIR%%/tables.sql
-@dirrmtry libexec/anope/tools
-@dirrmtry libexec/anope
-@dirrmtry %%DATADIR%%/backups
-@dirrmtry %%DATADIR%%/languages
-@dirrmtry %%DATADIR%%/logs
-@dirrmtry %%DATADIR%%/modules/runtime
-@dirrmtry %%DATADIR%%/modules
-@dirrmtry %%DATADIR%%
diff --git a/irc/unreal/pkg-plist b/irc/unreal/pkg-plist
index 5b2bc4a00557..75bf5a530635 100644
--- a/irc/unreal/pkg-plist
+++ b/irc/unreal/pkg-plist
@@ -128,16 +128,13 @@ libexec/ircd
 %%EXAMPLESDIR%%/unrealircd.conf
 %%SQLMOD%%%%ETCDIR%%/m_sqlmod.conf
 %%SQLMOD%%lib/Unreal/m_sqlmod.so
-@dirrmtry lib/Unreal
-@dirrmtry %%EXAMPLESDIR%%/aliases
-@dirrmtry %%EXAMPLESDIR%%
 @owner ircd
 @group ircd
-@dirrmtry %%ETCDIR%%/aliases
-@dirrmtry %%ETCDIR%%
-@unexec rmdir "/var/log/ircd" >/dev/null 2>&1 || :
-@unexec rmdir "/var/run/ircd/tmp" >/dev/null 2>&1 || :
-@unexec rmdir "/var/run/ircd" >/dev/null 2>&1 || :
+@dir %%ETCDIR%%/aliases
+@dir %%ETCDIR%%
+@dir /var/log/ircd
+@dir /var/run/ircd/tmp
+@dir /var/run/ircd
 @unexec if cmp -s %D/etc/Unreal/aliases/aliases.conf %D/%%EXAMPLESDIR%%/aliases/aliases.conf; then rm -f %D/etc/Unreal/aliases/aliases.conf; fi
 @exec [ -f %D/etc/Unreal/aliases/aliases.conf ] || cp %D/%%EXAMPLESDIR%%/aliases/aliases.conf %D/etc/Unreal/aliases/aliases.conf
 @unexec if cmp -s %D/etc/Unreal/aliases/atheme.conf %D/%%EXAMPLESDIR%%/aliases/atheme.conf; then rm -f %D/etc/Unreal/aliases/atheme.conf; fi
diff --git a/mail/dcc-dccd/pkg-plist b/mail/dcc-dccd/pkg-plist
index cceaa26a3813..75a4b1711149 100644
--- a/mail/dcc-dccd/pkg-plist
+++ b/mail/dcc-dccd/pkg-plist
@@ -55,8 +55,6 @@ man/man8/dccifd.8.gz
 man/man8/dccm.8.gz
 man/man8/dccproc.8.gz
 man/man8/dccsight.8.gz
-@dirrm dcc/libexec
-@dirrm dcc/cgi-bin
 %%ALT_HOME%%@dirrmtry dcc
 %%ALT_HOME%%@cwd /var
 @owner %%DCCUSER%%
diff --git a/net-mgmt/p5-Monitoring-Plugin/pkg-plist b/net-mgmt/p5-Monitoring-Plugin/pkg-plist
index 2661f1e84781..b3c21d9dfa3d 100644
--- a/net-mgmt/p5-Monitoring-Plugin/pkg-plist
+++ b/net-mgmt/p5-Monitoring-Plugin/pkg-plist
@@ -15,7 +15,3 @@
 %%PERL5_MAN3%%/Monitoring::Plugin::Performance.3.gz
 %%PERL5_MAN3%%/Monitoring::Plugin::Range.3.gz
 %%PERL5_MAN3%%/Monitoring::Plugin::Threshold.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Monitoring/Plugin
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Monitoring
-@dirrm %%SITE_PERL%%/Monitoring/Plugin
-@dirrmtry %%SITE_PERL%%/Monitoring
diff --git a/security/p5-POE-Filter-SSL/pkg-plist b/security/p5-POE-Filter-SSL/pkg-plist
index cdd764d1476a..20967c7d8f21 100644
--- a/security/p5-POE-Filter-SSL/pkg-plist
+++ b/security/p5-POE-Filter-SSL/pkg-plist
@@ -1,8 +1,3 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Filter/SSL/SSL.so
 %%SITE_PERL%%/%%PERL_ARCH%%/POE/Filter/SSL.pm
 %%PERL5_MAN3%%/POE::Filter::SSL.3.gz
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Filter/SSL
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Filter
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/POE/Filter
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/POE
diff --git a/sysutils/munin-common/pkg-plist b/sysutils/munin-common/pkg-plist
index 52eb8a059c7f..6b7f0c5e03d5 100644
--- a/sysutils/munin-common/pkg-plist
+++ b/sysutils/munin-common/pkg-plist
@@ -12,8 +12,6 @@ man/man3/Munin::Common::TLS.3.gz
 man/man3/Munin::Common::TLSClient.3.gz
 man/man3/Munin::Common::TLSServer.3.gz
 man/man3/Munin::Common::Timeout.3.gz
-@dirrmtry %%SITE_PERL%%/Munin/Common
-@dirrmtry %%SITE_PERL%%/Munin
-@dirrmtry(%%USER%%,%%GROUP%%,) %%LOGDIR%%
-@dirrmtry(%%USER%%,%%GROUP%%,) %%STATEDIR%%
-@dirrmtry(%%USER%%,%%GROUP%%,) %%SPOOLDIR%%
+@dir(%%USER%%,%%GROUP%%,) %%LOGDIR%%
+@dir(%%USER%%,%%GROUP%%,) %%STATEDIR%%
+@dir(%%USER%%,%%GROUP%%,) %%SPOOLDIR%%
diff --git a/sysutils/munin-master/pkg-plist b/sysutils/munin-master/pkg-plist
index 5a8e5a77edb4..187fcbd3a3ca 100644
--- a/sysutils/munin-master/pkg-plist
+++ b/sysutils/munin-master/pkg-plist
@@ -78,13 +78,5 @@ man/man8/munin-update.8.gz
 www/cgi-bin/munin-cgi-graph
 www/cgi-bin/munin-cgi-html
 @sample %%WWWDIR%%/.htaccess.sample
-@dirrmtry %%ETCDIR%%/munin-conf.d
-@dirrmtry %%ETCDIR%%/static
-@dirrmtry %%ETCDIR%%/templates/partial
-@dirrmtry %%ETCDIR%%/templates
-@dirrmtry %%ETCDIR%%
-@dirrmtry %%SITE_PERL%%/Munin/Master
-@dirrmtry %%DATADIR%%
-@dirrmtry www/cgi-bin
-@dirrmtry(%%USER%%,%%GROUP%%,) %%WWWDIR%%
-@dirrmtry(%%WWWOWN%%,%%WWWGRP%%,) %%DBDIRNODE%%/cgi-tmp
+@dir(%%USER%%,%%GROUP%%,) %%WWWDIR%%
+@dir(%%WWWOWN%%,%%WWWGRP%%,) %%DBDIRNODE%%/cgi-tmp
diff --git a/sysutils/munin-node/pkg-plist b/sysutils/munin-node/pkg-plist
index 6217737b7263..f9f9222fd611 100644
--- a/sysutils/munin-node/pkg-plist
+++ b/sysutils/munin-node/pkg-plist
@@ -248,12 +248,4 @@ sbin/munin-sched
 %%DATADIR%%/plugins/varnish_
 %%DATADIR%%/plugins/vmstat
 %%DATADIR%%/plugins/zimbra_
-@dirrmtry %%ETCDIR%%/plugin-conf.d
-@dirrmtry %%ETCDIR%%/plugins
-@dirrmtry %%ETCDIR%%
-@dirrmtry %%SITE_PERL%%/Munin/Node/Configure
-@dirrmtry %%SITE_PERL%%/Munin/Node
-@dirrmtry %%SITE_PERL%%/Munin/Plugin
-@dirrmtry %%DATADIR%%/plugins
-@dirrmtry %%DATADIR%%
-@dirrmtry(%%USER%%,%%GROUP%%,) %%DBDIR%%/plugin-state
+@dir(%%USER%%,%%GROUP%%,) %%DBDIR%%/plugin-state
diff --git a/textproc/p5-Pod-WikiDoc/pkg-plist b/textproc/p5-Pod-WikiDoc/pkg-plist
index 460ddada1b80..65db697078eb 100644
--- a/textproc/p5-Pod-WikiDoc/pkg-plist
+++ b/textproc/p5-Pod-WikiDoc/pkg-plist
@@ -8,7 +8,3 @@ man/man1/wikidoc.1.gz
 %%SITE_PERL%%/Pod/WikiDoc/Parser.pm
 %%SITE_PERL%%/Pod/WikiDoc/Parser.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/WikiDoc/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/WikiDoc
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod
-@dirrm %%SITE_PERL%%/Pod/WikiDoc
-@dirrmtry %%SITE_PERL%%/Pod
diff --git a/www/baikal/Makefile b/www/baikal/Makefile
index 03272de8af7e..4336faae47bc 100644
--- a/www/baikal/Makefile
+++ b/www/baikal/Makefile
@@ -22,7 +22,7 @@ NO_BUILD=	yes
 
 SUB_FILES=	pkg-message
 
-PLIST_SUB=	WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} BINOWN=${BINOWN} BINGRP=${BINGRP}
+PLIST_SUB=	WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
 
 PORTDOCS=	*
 PORTEXAMPLES=	*
diff --git a/www/baikal/pkg-plist b/www/baikal/pkg-plist
index ae996b4b5aba..ed5adbe69540 100644
--- a/www/baikal/pkg-plist
+++ b/www/baikal/pkg-plist
@@ -301,11 +301,7 @@
 %%WWWDIR%%/Core/Resources/Web/README.md
 %%WWWDIR%%/Core/Resources/Web/TwitterBootstrap
 %%WWWDIR%%/Specific/.htaccess
-@owner %%WWWOWN%%
-@group %%WWWGRP%%
-@sample %%WWWDIR%%/Specific/db/db.sqlite.sample
-@group %%BINGRP%%
-@owner %%BINOWN%%
+@sample(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/Specific/db/db.sqlite.sample
 %%WWWDIR%%/html/.htaccess
 %%WWWDIR%%/html/admin/index.php
 %%WWWDIR%%/html/admin/install/index.php
@@ -823,186 +819,4 @@
 %%WWWDIR%%/vendor/sabre/vobject/tests/Sabre/VObject/issue153.vcf
 %%WWWDIR%%/vendor/sabre/vobject/tests/bootstrap.php
 %%WWWDIR%%/vendor/sabre/vobject/tests/phpunit.xml
-@dirrm %%WWWDIR%%/Core/Frameworks/Baikal/Core
-@dirrm %%WWWDIR%%/Core/Frameworks/Baikal/Model/AddressBook
-@dirrm %%WWWDIR%%/Core/Frameworks/Baikal/Model/Calendar
-@dirrm %%WWWDIR%%/Core/Frameworks/Baikal/Model/Config
-@dirrm %%WWWDIR%%/Core/Frameworks/Baikal/Model
-@dirrm %%WWWDIR%%/Core/Frameworks/Baikal/WWWRoot
-@dirrm %%WWWDIR%%/Core/Frameworks/Baikal
-@dirrm %%WWWDIR%%/Core/Frameworks/BaikalAdmin/Controller/Install
-@dirrm %%WWWDIR%%/Core/Frameworks/BaikalAdmin/Controller/Navigation/Topbar
-@dirrm %%WWWDIR%%/Core/Frameworks/BaikalAdmin/Controller/Navigation
-@dirrm %%WWWDIR%%/Core/Frameworks/BaikalAdmin/Controller/Settings
-@dirrm %%WWWDIR%%/Core/Frameworks/BaikalAdmin/Controller/User
-@dirrm %%WWWDIR%%/Core/Frameworks/BaikalAdmin/Controller
-@dirrm %%WWWDIR%%/Core/Frameworks/BaikalAdmin/Core
-@dirrm %%WWWDIR%%/Core/Frameworks/BaikalAdmin/Resources/GlyphiconsPro
-@dirrm %%WWWDIR%%/Core/Frameworks/BaikalAdmin/Resources/Images
-@dirrm %%WWWDIR%%/Core/Frameworks/BaikalAdmin/Resources/Strings/EN
-@dirrm %%WWWDIR%%/Core/Frameworks/BaikalAdmin/Resources/Strings
-@dirrm %%WWWDIR%%/Core/Frameworks/BaikalAdmin/Resources/Templates/Install
-@dirrm %%WWWDIR%%/Core/Frameworks/BaikalAdmin/Resources/Templates/Navigation/Topbar
-@dirrm %%WWWDIR%%/Core/Frameworks/BaikalAdmin/Resources/Templates/Navigation
-@dirrm %%WWWDIR%%/Core/Frameworks/BaikalAdmin/Resources/Templates/Page
-@dirrm %%WWWDIR%%/Core/Frameworks/BaikalAdmin/Resources/Templates/Settings
-@dirrm %%WWWDIR%%/Core/Frameworks/BaikalAdmin/Resources/Templates/User
-@dirrm %%WWWDIR%%/Core/Frameworks/BaikalAdmin/Resources/Templates
-@dirrm %%WWWDIR%%/Core/Frameworks/BaikalAdmin/Resources
-@dirrm %%WWWDIR%%/Core/Frameworks/BaikalAdmin/Route/Settings
-@dirrm %%WWWDIR%%/Core/Frameworks/BaikalAdmin/Route/User
-@dirrm %%WWWDIR%%/Core/Frameworks/BaikalAdmin/Route
-@dirrm %%WWWDIR%%/Core/Frameworks/BaikalAdmin/View/Install
-@dirrm %%WWWDIR%%/Core/Frameworks/BaikalAdmin/View/Navigation/Topbar
-@dirrm %%WWWDIR%%/Core/Frameworks/BaikalAdmin/View/Navigation
-@dirrm %%WWWDIR%%/Core/Frameworks/BaikalAdmin/View/Settings
-@dirrm %%WWWDIR%%/Core/Frameworks/BaikalAdmin/View/User
-@dirrm %%WWWDIR%%/Core/Frameworks/BaikalAdmin/View
-@dirrm %%WWWDIR%%/Core/Frameworks/BaikalAdmin/WWWRoot/install
-@dirrm %%WWWDIR%%/Core/Frameworks/BaikalAdmin/WWWRoot
-@dirrm %%WWWDIR%%/Core/Frameworks/BaikalAdmin
-@dirrm %%WWWDIR%%/Core/Frameworks/Flake/Controller
-@dirrm %%WWWDIR%%/Core/Frameworks/Flake/Core/DOM
-@dirrm %%WWWDIR%%/Core/Frameworks/Flake/Core/Database
-@dirrm %%WWWDIR%%/Core/Frameworks/Flake/Core/Datastructure
-@dirrm %%WWWDIR%%/Core/Frameworks/Flake/Core/Model
-@dirrm %%WWWDIR%%/Core/Frameworks/Flake/Core/Render
-@dirrm %%WWWDIR%%/Core/Frameworks/Flake/Core/Requester
-@dirrm %%WWWDIR%%/Core/Frameworks/Flake/Core
-@dirrm %%WWWDIR%%/Core/Frameworks/Flake/Model/User
-@dirrm %%WWWDIR%%/Core/Frameworks/Flake/Model
-@dirrm %%WWWDIR%%/Core/Frameworks/Flake/Util/Router
-@dirrm %%WWWDIR%%/Core/Frameworks/Flake/Util/Twig/lib/Twig/Error
-@dirrm %%WWWDIR%%/Core/Frameworks/Flake/Util/Twig/lib/Twig/Extension
-@dirrm %%WWWDIR%%/Core/Frameworks/Flake/Util/Twig/lib/Twig/Filter
-@dirrm %%WWWDIR%%/Core/Frameworks/Flake/Util/Twig/lib/Twig/Function
-@dirrm %%WWWDIR%%/Core/Frameworks/Flake/Util/Twig/lib/Twig/Loader
-@dirrm %%WWWDIR%%/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Binary
-@dirrm %%WWWDIR%%/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Filter
-@dirrm %%WWWDIR%%/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Test
-@dirrm %%WWWDIR%%/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Unary
-@dirrm %%WWWDIR%%/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression
-@dirrm %%WWWDIR%%/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node
-@dirrm %%WWWDIR%%/Core/Frameworks/Flake/Util/Twig/lib/Twig/NodeVisitor
-@dirrm %%WWWDIR%%/Core/Frameworks/Flake/Util/Twig/lib/Twig/Sandbox
-@dirrm %%WWWDIR%%/Core/Frameworks/Flake/Util/Twig/lib/Twig/Test
-@dirrm %%WWWDIR%%/Core/Frameworks/Flake/Util/Twig/lib/Twig/TokenParser
-@dirrm %%WWWDIR%%/Core/Frameworks/Flake/Util/Twig/lib/Twig
-@dirrm %%WWWDIR%%/Core/Frameworks/Flake/Util/Twig/lib
-@dirrm %%WWWDIR%%/Core/Frameworks/Flake/Util/Twig
-@dirrm %%WWWDIR%%/Core/Frameworks/Flake/Util
-@dirrm %%WWWDIR%%/Core/Frameworks/Flake
-@dirrm %%WWWDIR%%/Core/Frameworks/Formal/Core
-@dirrm %%WWWDIR%%/Core/Frameworks/Formal/Element
-@dirrm %%WWWDIR%%/Core/Frameworks/Formal/Form
-@dirrm %%WWWDIR%%/Core/Frameworks/Formal
-@dirrm %%WWWDIR%%/Core/Frameworks/TwitterBootstrap/css
-@dirrm %%WWWDIR%%/Core/Frameworks/TwitterBootstrap/img
-@dirrm %%WWWDIR%%/Core/Frameworks/TwitterBootstrap/js
-@dirrm %%WWWDIR%%/Core/Frameworks/TwitterBootstrap
-@dirrm %%WWWDIR%%/Core/Frameworks
-@dirrm %%WWWDIR%%/Core/Resources/Db/MySQL
-@dirrm %%WWWDIR%%/Core/Resources/Db/SQLite
-@dirrm %%WWWDIR%%/Core/Resources/Db
-@dirrm %%WWWDIR%%/Core/Resources/System
-@dirrm %%WWWDIR%%/Core/Resources/Web
-@dirrm %%WWWDIR%%/Core/Resources
-@dirrm %%WWWDIR%%/Core
-@owner %%WWWOWN%%
-@group %%WWWGRP%%
-@dirrmtry %%WWWDIR%%/Specific/db
-@group %%BINGRP%%
-@owner %%BINOWN%%
-@dirrmtry %%WWWDIR%%/Specific
-@dirrm %%WWWDIR%%/html/admin/install
-@dirrm %%WWWDIR%%/html/admin
-@dirrm %%WWWDIR%%/html/res
-@dirrm %%WWWDIR%%/html
-@dirrm %%WWWDIR%%/vendor/bin
-@dirrm %%WWWDIR%%/vendor/composer
-@dirrm %%WWWDIR%%/vendor/sabre/dav/bin
-@dirrm %%WWWDIR%%/vendor/sabre/dav/docs
-@dirrm %%WWWDIR%%/vendor/sabre/dav/examples/sql
-@dirrm %%WWWDIR%%/vendor/sabre/dav/examples/webserver
-@dirrm %%WWWDIR%%/vendor/sabre/dav/examples
-@dirrm %%WWWDIR%%/vendor/sabre/dav/lib/Sabre/CalDAV/Backend
-@dirrm %%WWWDIR%%/vendor/sabre/dav/lib/Sabre/CalDAV/Exception
-@dirrm %%WWWDIR%%/vendor/sabre/dav/lib/Sabre/CalDAV/Notifications/Notification
-@dirrm %%WWWDIR%%/vendor/sabre/dav/lib/Sabre/CalDAV/Notifications
-@dirrm %%WWWDIR%%/vendor/sabre/dav/lib/Sabre/CalDAV/Principal
-@dirrm %%WWWDIR%%/vendor/sabre/dav/lib/Sabre/CalDAV/Property
-@dirrm %%WWWDIR%%/vendor/sabre/dav/lib/Sabre/CalDAV/Schedule
-@dirrm %%WWWDIR%%/vendor/sabre/dav/lib/Sabre/CalDAV
-@dirrm %%WWWDIR%%/vendor/sabre/dav/lib/Sabre/CardDAV/Backend
-@dirrm %%WWWDIR%%/vendor/sabre/dav/lib/Sabre/CardDAV/Property
-@dirrm %%WWWDIR%%/vendor/sabre/dav/lib/Sabre/CardDAV
-@dirrm %%WWWDIR%%/vendor/sabre/dav/lib/Sabre/DAV/Auth/Backend
-@dirrm %%WWWDIR%%/vendor/sabre/dav/lib/Sabre/DAV/Auth
-@dirrm %%WWWDIR%%/vendor/sabre/dav/lib/Sabre/DAV/Browser/assets/icons
-@dirrm %%WWWDIR%%/vendor/sabre/dav/lib/Sabre/DAV/Browser/assets
-@dirrm %%WWWDIR%%/vendor/sabre/dav/lib/Sabre/DAV/Browser
-@dirrm %%WWWDIR%%/vendor/sabre/dav/lib/Sabre/DAV/Exception
-@dirrm %%WWWDIR%%/vendor/sabre/dav/lib/Sabre/DAV/FS
-@dirrm %%WWWDIR%%/vendor/sabre/dav/lib/Sabre/DAV/FSExt
-@dirrm %%WWWDIR%%/vendor/sabre/dav/lib/Sabre/DAV/Locks/Backend
-@dirrm %%WWWDIR%%/vendor/sabre/dav/lib/Sabre/DAV/Locks
-@dirrm %%WWWDIR%%/vendor/sabre/dav/lib/Sabre/DAV/Mount
-@dirrm %%WWWDIR%%/vendor/sabre/dav/lib/Sabre/DAV/PartialUpdate
-@dirrm %%WWWDIR%%/vendor/sabre/dav/lib/Sabre/DAV/Property
-@dirrm %%WWWDIR%%/vendor/sabre/dav/lib/Sabre/DAV/Tree
-@dirrm %%WWWDIR%%/vendor/sabre/dav/lib/Sabre/DAV
-@dirrm %%WWWDIR%%/vendor/sabre/dav/lib/Sabre/DAVACL/Exception
-@dirrm %%WWWDIR%%/vendor/sabre/dav/lib/Sabre/DAVACL/PrincipalBackend
-@dirrm %%WWWDIR%%/vendor/sabre/dav/lib/Sabre/DAVACL/Property
-@dirrm %%WWWDIR%%/vendor/sabre/dav/lib/Sabre/DAVACL
-@dirrm %%WWWDIR%%/vendor/sabre/dav/lib/Sabre/HTTP
-@dirrm %%WWWDIR%%/vendor/sabre/dav/lib/Sabre
-@dirrm %%WWWDIR%%/vendor/sabre/dav/lib
-@dirrm %%WWWDIR%%/vendor/sabre/dav/tests/Sabre/CalDAV/Backend
-@dirrm %%WWWDIR%%/vendor/sabre/dav/tests/Sabre/CalDAV/Notifications/Notification
-@dirrm %%WWWDIR%%/vendor/sabre/dav/tests/Sabre/CalDAV/Notifications
-@dirrm %%WWWDIR%%/vendor/sabre/dav/tests/Sabre/CalDAV/Principal
-@dirrm %%WWWDIR%%/vendor/sabre/dav/tests/Sabre/CalDAV/Property
-@dirrm %%WWWDIR%%/vendor/sabre/dav/tests/Sabre/CalDAV/Schedule/IMip
-@dirrm %%WWWDIR%%/vendor/sabre/dav/tests/Sabre/CalDAV/Schedule
-@dirrm %%WWWDIR%%/vendor/sabre/dav/tests/Sabre/CalDAV
-@dirrm %%WWWDIR%%/vendor/sabre/dav/tests/Sabre/CardDAV/Backend
-@dirrm %%WWWDIR%%/vendor/sabre/dav/tests/Sabre/CardDAV/Property
-@dirrm %%WWWDIR%%/vendor/sabre/dav/tests/Sabre/CardDAV
-@dirrm %%WWWDIR%%/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend
-@dirrm %%WWWDIR%%/vendor/sabre/dav/tests/Sabre/DAV/Auth
-@dirrm %%WWWDIR%%/vendor/sabre/dav/tests/Sabre/DAV/Browser
-@dirrm %%WWWDIR%%/vendor/sabre/dav/tests/Sabre/DAV/Exception
-@dirrm %%WWWDIR%%/vendor/sabre/dav/tests/Sabre/DAV/FSExt
-@dirrm %%WWWDIR%%/vendor/sabre/dav/tests/Sabre/DAV/Locks/Backend
-@dirrm %%WWWDIR%%/vendor/sabre/dav/tests/Sabre/DAV/Locks
-@dirrm %%WWWDIR%%/vendor/sabre/dav/tests/Sabre/DAV/Mount
-@dirrm %%WWWDIR%%/vendor/sabre/dav/tests/Sabre/DAV/PartialUpdate
-@dirrm %%WWWDIR%%/vendor/sabre/dav/tests/Sabre/DAV/Property
-@dirrm %%WWWDIR%%/vendor/sabre/dav/tests/Sabre/DAV/Tree
-@dirrm %%WWWDIR%%/vendor/sabre/dav/tests/Sabre/DAV
-@dirrm %%WWWDIR%%/vendor/sabre/dav/tests/Sabre/DAVACL/Exception
-@dirrm %%WWWDIR%%/vendor/sabre/dav/tests/Sabre/DAVACL/PrincipalBackend
-@dirrm %%WWWDIR%%/vendor/sabre/dav/tests/Sabre/DAVACL/Property
-@dirrm %%WWWDIR%%/vendor/sabre/dav/tests/Sabre/DAVACL
-@dirrm %%WWWDIR%%/vendor/sabre/dav/tests/Sabre/HTTP
-@dirrm %%WWWDIR%%/vendor/sabre/dav/tests/Sabre
-@dirrm %%WWWDIR%%/vendor/sabre/dav/tests
-@dirrm %%WWWDIR%%/vendor/sabre/dav
-@dirrm %%WWWDIR%%/vendor/sabre/vobject/bin
-@dirrm %%WWWDIR%%/vendor/sabre/vobject/lib/Sabre/VObject/Component
-@dirrm %%WWWDIR%%/vendor/sabre/vobject/lib/Sabre/VObject/Property
-@dirrm %%WWWDIR%%/vendor/sabre/vobject/lib/Sabre/VObject/Splitter
-@dirrm %%WWWDIR%%/vendor/sabre/vobject/lib/Sabre/VObject
-@dirrm %%WWWDIR%%/vendor/sabre/vobject/lib/Sabre
-@dirrm %%WWWDIR%%/vendor/sabre/vobject/lib
-@dirrm %%WWWDIR%%/vendor/sabre/vobject/tests/Sabre/VObject/Component
-@dirrm %%WWWDIR%%/vendor/sabre/vobject/tests/Sabre/VObject/Property
-@dirrm %%WWWDIR%%/vendor/sabre/vobject/tests/Sabre/VObject/Splitter
-@dirrm %%WWWDIR%%/vendor/sabre/vobject/tests/Sabre/VObject
-@dirrm %%WWWDIR%%/vendor/sabre/vobject/tests/Sabre
-@dirrm %%WWWDIR%%/vendor/sabre/vobject/tests
-@dirrm %%WWWDIR%%/vendor/sabre/vobject
-@dirrm %%WWWDIR%%/vendor/sabre
-@dirrm %%WWWDIR%%/vendor
-@dirrmtry %%WWWDIR%%
+@dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/Specific/db
diff --git a/www/p5-Mojolicious-Plugin-Authentication/pkg-plist b/www/p5-Mojolicious-Plugin-Authentication/pkg-plist
index b1c07ef09ce4..b67c5b665fea 100644
--- a/www/p5-Mojolicious-Plugin-Authentication/pkg-plist
+++ b/www/p5-Mojolicious-Plugin-Authentication/pkg-plist
@@ -1,5 +1,3 @@
 %%PERL5_MAN3%%/Mojolicious::Plugin::Authentication.3.gz
 %%SITE_PERL%%/Mojolicious/Plugin/Authentication.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mojolicious/Plugin/Authentication/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mojolicious/Plugin/Authentication
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mojolicious/Plugin