Index: head/dns/bindgraph/pkg-plist
===================================================================
--- head/dns/bindgraph/pkg-plist	(revision 374364)
+++ head/dns/bindgraph/pkg-plist	(revision 374365)
@@ -1,4 +1,3 @@
 %%CGIDIR%%/bindgraph.cgi
 sbin/bindgraph.pl
-@dirrmtry %%CGIDIR%%
-@dirrmtry(%%BINDGRAPH_USER%%,%%BINDGRAPH_GROUP%%,) %%DATADIR%%
+@dir(%%BINDGRAPH_USER%%,%%BINDGRAPH_GROUP%%,) %%DATADIR%%
Index: head/dns/curvedns/pkg-plist
===================================================================
--- head/dns/curvedns/pkg-plist	(revision 374364)
+++ head/dns/curvedns/pkg-plist	(revision 374365)
@@ -1,13 +1,7 @@
 bin/curvedns
 bin/curvedns-keygen
-@owner %%CURVE_UID%%
-@group %%CURVE_GID%%
-%%ETCDIR%%/env/UID
-%%ETCDIR%%/env/GID
-@sample %%ETCDIR%%/run.sample
-@sample %%ETCDIR%%/log/run.sample
-@mode 0700
-@dirrmtry %%ETCDIR%%/env
-@mode
-@dirrmtry %%ETCDIR%%/log
-@dirrmtry %%ETCDIR%%
+@(%%CURVE_UID%%,%%CURVE_GID%%,) %%ETCDIR%%/env/UID
+@(%%CURVE_UID%%,%%CURVE_GID%%,) %%ETCDIR%%/env/GID
+@sample(%%CURVE_UID%%,%%CURVE_GID%%,) %%ETCDIR%%/run.sample
+@sample(%%CURVE_UID%%,%%CURVE_GID%%,) %%ETCDIR%%/log/run.sample
+@dir(%%CURVE_UID%%,%%CURVE_GID%%,700) %%ETCDIR%%/env
Index: head/dns/opendnssec/pkg-plist
===================================================================
--- head/dns/opendnssec/pkg-plist	(revision 374364)
+++ head/dns/opendnssec/pkg-plist	(revision 374365)
@@ -1,67 +1,53 @@
 bin/ods-getconf
 bin/ods-hsmspeed
 bin/ods-hsmutil
 bin/ods-kaspcheck
 bin/ods-ksmutil
 bin/ods-kasp2html
 @sample %%ETCDIR%%/addns.xml.sample
 @sample %%ETCDIR%%/conf.xml.sample
 @sample %%ETCDIR%%/kasp.xml.sample
 @sample %%ETCDIR%%/zonelist.xml.sample
 sbin/ods-control
 sbin/ods-enforcerd
 sbin/ods-signer
 sbin/ods-signerd
 %%DATADIR%%/addns.rnc
 %%DATADIR%%/addns.rng
 %%DATADIR%%/conf.rnc
 %%DATADIR%%/conf.rng
 %%SQLITE%%%%DATADIR%%/database_create.sqlite3
 %%MYSQL%%%%DATADIR%%/database_create.mysql
 %%DATADIR%%/enforcerstate.rnc
 %%DATADIR%%/enforcerstate.rng
 %%DATADIR%%/kasp.rnc
 %%DATADIR%%/kasp.rng
 %%DATADIR%%/kasp2html.xsl
 %%SQLITE%%%%DATADIR%%/migrate_adapters_1.sqlite3
 %%SQLITE%%%%DATADIR%%/migrate_keyshare_sqlite3.pl
 %%SQLITE%%%%DATADIR%%/migrate_to_ng_sqlite.pl
 %%MYSQL%%%%DATADIR%%/migrate_adapters_1.mysql
 %%MYSQL%%%%DATADIR%%/migrate_keyshare_mysql.pl
 %%MYSQL%%%%DATADIR%%/migrate_zone_delete.mysql
 %%MYSQL%%%%DATADIR%%/migrate_id_mysql.pl
 %%MYSQL%%%%DATADIR%%/migrate_to_ng_mysql.pl
 %%DATADIR%%/signconf.rnc
 %%DATADIR%%/signconf.rng
 %%DATADIR%%/zonelist.rnc
 %%DATADIR%%/zonelist.rng
 man/man1/ods-hsmspeed.1.gz
 man/man1/ods-hsmutil.1.gz
 man/man1/ods-ksmutil.1.gz
 man/man1/ods-kaspcheck.1.gz
 man/man5/ods-timing.5.gz
 man/man7/opendnssec.7.gz
 man/man8/ods-control.8.gz
 man/man8/ods-enforcerd.8.gz
 man/man8/ods-getconf.8.gz
 man/man8/ods-signer.8.gz
 man/man8/ods-signerd.8.gz
-@owner opendnssec
-@group opendnssec
-@exec install -d -o opendnssec -g opendnssec %D/var/opendnssec/unsigned
-@exec install -d -o opendnssec -g opendnssec %D/var/opendnssec/tmp
-@exec install -d -o opendnssec -g opendnssec %D/var/opendnssec/signed
-@exec install -d -o opendnssec -g opendnssec %D/var/opendnssec/signconf
-@exec install -d -o opendnssec -g opendnssec %D/var/run/opendnssec
-@dirrm var/opendnssec/unsigned
-@dirrm var/opendnssec/tmp
-@dirrm var/opendnssec/signed
-@dirrm var/opendnssec/signconf
-@dirrm var/opendnssec
-@dirrmtry var/run/opendnssec
-@owner root
-@group wheel
-@dirrm %%DATADIR%%
-@dirrm %%ETCDIR%%
-@dirrmtry var/run
-@dirrmtry var
+@dir(opendnssec,opendnssec,) var/opendnssec/unsigned
+@dir(opendnssec,opendnssec,) var/opendnssec/tmp
+@dir(opendnssec,opendnssec,) var/opendnssec/signed
+@dir(opendnssec,opendnssec,) var/opendnssec/signconf
+@dir(opendnssec,opendnssec,) var/run/opendnssec
Index: head/dns/opendnssec13/pkg-plist
===================================================================
--- head/dns/opendnssec13/pkg-plist	(revision 374364)
+++ head/dns/opendnssec13/pkg-plist	(revision 374365)
@@ -1,57 +1,56 @@
 %%AUDITOR%%bin/ods-auditor
 bin/ods-getconf
 bin/ods-hsmspeed
 bin/ods-hsmutil
 bin/ods-ksmutil
 %%AUDITOR%%bin/ods-kaspcheck
 bin/ods-kasp2html
 @sample %%ETCDIR%%/conf.xml.sample
 @sample %%ETCDIR%%/kasp.xml.sample
 @sample %%ETCDIR%%/zonefetch.xml.sample
 @sample %%ETCDIR%%/zonelist.xml.sample
 %%AUDITOR%%lib/opendnssec/kasp_auditor/auditor.rb
 %%AUDITOR%%lib/opendnssec/kasp_auditor/changed_config.rb
 %%AUDITOR%%lib/opendnssec/kasp_auditor/commands.rb
 %%AUDITOR%%lib/opendnssec/kasp_auditor/config.rb
 %%AUDITOR%%lib/opendnssec/kasp_auditor/key_tracker.rb
 %%AUDITOR%%lib/opendnssec/kasp_auditor/parse.rb
 %%AUDITOR%%lib/opendnssec/kasp_auditor/preparser.rb
 %%AUDITOR%%lib/opendnssec/kasp_auditor.rb
 %%AUDITOR%%lib/opendnssec/kasp_auditor/partial_auditor.rb
 %%AUDITOR%%lib/opendnssec/kasp_checker.rb
 %%AUDITOR%%lib/opendnssec/time_shift.rb
 %%AUDITOR%%man/man1/ods-auditor.1.gz
 man/man1/ods-hsmspeed.1.gz
 man/man1/ods-hsmutil.1.gz
 %%AUDITOR%%man/man1/ods-kaspcheck.1.gz
 man/man1/ods-ksmutil.1.gz
 man/man5/ods-timing.5.gz
 man/man7/opendnssec.7.gz
 man/man8/ods-control.8.gz
 man/man8/ods-enforcerd.8.gz
 man/man8/ods-getconf.8.gz
 man/man8/ods-signer.8.gz
 man/man8/ods-signerd.8.gz
 sbin/ods-control
 sbin/ods-enforcerd
 sbin/ods-signer
 sbin/ods-signerd
 %%DATADIR%%/conf.rnc
 %%DATADIR%%/conf.rng
 %%SQLITE%%%%DATADIR%%/database_create.sqlite3
 %%MYSQL%%%%DATADIR%%/database_create.mysql
 %%DATADIR%%/kasp.rnc
 %%DATADIR%%/kasp.rng
 %%DATADIR%%/kasp2html.xsl
 %%DATADIR%%/signconf.rnc
 %%DATADIR%%/signconf.rng
 %%DATADIR%%/zonefetch.rnc
 %%DATADIR%%/zonefetch.rng
 %%DATADIR%%/zonelist.rnc
 %%DATADIR%%/zonelist.rng
-@exec mkdir -p %D/var/run/opendnssec
-@exec mkdir -p %D/var/opendnssec/unsigned
-@exec mkdir -p %D/var/opendnssec/tmp
-@exec mkdir -p %D/var/opendnssec/signed
-@exec mkdir -p %D/var/opendnssec/signconf
-@exec chown -R %%USER%%:%%GROUP%% %D/var/opendnssec
+@dir(%%USER%%,%%GROUP%%,) var/run/opendnssec
+@dir(%%USER%%,%%GROUP%%,) var/opendnssec/unsigned
+@dir(%%USER%%,%%GROUP%%,) var/opendnssec/tmp
+@dir(%%USER%%,%%GROUP%%,) var/opendnssec/signed
+@dir(%%USER%%,%%GROUP%%,) var/opendnssec/signconf