Index: pkg-plist
===================================================================
--- pkg-plist	(revision 397258)
+++ pkg-plist	(working copy)
@@ -2,15 +2,7 @@
 %%HASH%%bin/csscompress
 %%HASH%%bin/cssconvert
 %%HASH%%bin/cssstat
-@owner %%DSPAM_OWNER%%
-@group %%DSPAM_GROUP%%
-@mode %%DSPAM_MODE%%
-bin/dspam
-@exec chown %%DSPAM_OWNER%%:%%DSPAM_GROUP%% %D/%F
-@exec chmod %%DSPAM_MODE%% %D/%F
-@mode
-@group wheel
-@owner root
+@(%%DSPAM_OWNER%%,%%DSPAM_GROUP%%,%%DSPAM_MODE%%) bin/dspam
 bin/dspamc
 bin/dspam_2sql
 bin/dspam_admin
@@ -23,15 +15,7 @@
 %%PGSQL%%bin/dspam_pg2int8
 bin/dspam_stats
 bin/dspam_train
-@mode 0640
-@owner %%DSPAM_OWNER%%
-@group %%DSPAM_GROUP%%
-@sample etc/dspam.conf.sample
-@exec chown %%DSPAM_OWNER%%:%%DSPAM_GROUP%% %D/%F
-@exec chmod 0640 %D/%F
-@group wheel
-@owner root
-@mode
+@sample(%%DSPAM_OWNER%%,%%DSPAM_GROUP%%,640) etc/dspam.conf.sample
 include/dspam/buffer.h
 include/dspam/config.h
 include/dspam/config_shared.h
@@ -222,17 +206,8 @@
 %%WebUI%%%%WWWDIR%%/templates/ro/nav_preferences.html
 %%WebUI%%%%WWWDIR%%/templates/ro/nav_quarantine.html
 %%WebUI%%%%WWWDIR%%/templates/ro/nav_viewmessage.html
-@cwd %%DSPAM_HOME%%
-firstrun.txt.sample
-firstspam.txt.sample
-quarantinefull.txt.sample
-@cwd /
-@owner %%DSPAM_HOME_OWNER%%
-@group %%DSPAM_HOME_GROUP%%
-@mode %%DSPAM_HOME_MODE%%
-@mode
-@exec chown %%DSPAM_HOME_OWNER%%:%%DSPAM_HOME_GROUP%% %%DSPAM_HOME%%
-@exec chmod %%DSPAM_HOME_MODE%% %%DSPAM_HOME%%
-@exec chown %%DSPAM_HOME_OWNER%%:%%DSPAM_HOME_GROUP%% %%LOG_DIR%%
-@group wheel
-@owner root
+%%DSPAM_HOME%%/firstrun.txt.sample
+%%DSPAM_HOME%%/firstspam.txt.sample
+%%DSPAM_HOME%%/quarantinefull.txt.sample
+@dir(%%DSPAM_HOME_OWNER%%,%%DSPAM_HOME_GROUP%%,%%DSPAM_HOME_MODE%%) %%DSPAM_HOME%%
+@dir(%%DSPAM_HOME_OWNER%%,%%DSPAM_HOME_GROUP%%) %%LOG_DIR%%