Index: head/mail/mailagent/pkg-plist
===================================================================
--- head/mail/mailagent/pkg-plist	(revision 550759)
+++ head/mail/mailagent/pkg-plist	(revision 550760)
@@ -1,77 +1,77 @@
 bin/mailpatch
 bin/mailhelp
 bin/maillist
 bin/maildist
 bin/package
 bin/edusers
 bin/mailagent
 lib/mailagent/filter
 lib/mailagent/agenthelp
 lib/mailagent/commands
 lib/mailagent/distribs
 lib/mailagent/filter.sh
 lib/mailagent/mailagent.cf
 lib/mailagent/proglist
 lib/mailagent/chkagent.sh
 lib/mailagent/setup.cf
 lib/mailagent/compressors
 lib/mailagent/help/addauth
 lib/mailagent/help/approve
 lib/mailagent/help/delpower
 lib/mailagent/help/end
 lib/mailagent/help/getauth
 lib/mailagent/help/help
 lib/mailagent/help/newpower
 lib/mailagent/help/passwd
 lib/mailagent/help/password
 lib/mailagent/help/power
 lib/mailagent/help/release
 lib/mailagent/help/remauth
 lib/mailagent/help/set
 lib/mailagent/help/setauth
 lib/mailagent/help/user
 man/man1/edusers.1.gz
 man/man1/mailagent.1.gz
 man/man1/mailhelp.1.gz
 man/man1/package.1.gz
-@touch %%ORGFILE%%
-@rmempty %%ORGFILE%%
+@exec [ -f %%ORGFILE%% ] || touch %%ORGFILE%% || true
+@unexec [ -s %%ORGFILE%% ] || rm -f %%ORGFILE%% || true
 %%EXAMPLESDIR%%/agent/README
 %%EXAMPLESDIR%%/agent/daemon
 %%EXAMPLESDIR%%/agent/mailfolders
 %%EXAMPLESDIR%%/agent/mchk
 %%EXAMPLESDIR%%/agent/mhinc
 %%EXAMPLESDIR%%/agent/nocmds
 %%EXAMPLESDIR%%/agent/profile
 %%EXAMPLESDIR%%/agent/rules
 %%EXAMPLESDIR%%/agent/vacation
 %%EXAMPLESDIR%%/misc/README
 %%EXAMPLESDIR%%/misc/fakesend/README
 %%EXAMPLESDIR%%/misc/fakesend/fakesend.pl
 %%EXAMPLESDIR%%/misc/fakesend/freplcomps
 %%EXAMPLESDIR%%/misc/fakesend/mh_profile
 %%EXAMPLESDIR%%/misc/getcost/README
 %%EXAMPLESDIR%%/misc/getcost/getcost
 %%EXAMPLESDIR%%/misc/getcost/rules
 %%EXAMPLESDIR%%/misc/getcost/spamconfig
 %%EXAMPLESDIR%%/misc/mime/README
 %%EXAMPLESDIR%%/misc/mime/rules
 %%EXAMPLESDIR%%/misc/mime/unmime
 %%EXAMPLESDIR%%/misc/news/README
 %%EXAMPLESDIR%%/misc/news/ml.map
 %%EXAMPLESDIR%%/misc/news/newsgate
 %%EXAMPLESDIR%%/misc/news/rules
 %%EXAMPLESDIR%%/misc/pbounce/README
 %%EXAMPLESDIR%%/misc/pbounce/mailagent.cf
 %%EXAMPLESDIR%%/misc/pbounce/newcmd.cf
 %%EXAMPLESDIR%%/misc/pbounce/patbounce.pl
 %%EXAMPLESDIR%%/misc/pbounce/rules
 %%EXAMPLESDIR%%/misc/shell/README
 %%EXAMPLESDIR%%/misc/shell/server.cf
 %%EXAMPLESDIR%%/misc/shell/shell
 %%EXAMPLESDIR%%/misc/unkit/README
 %%EXAMPLESDIR%%/misc/unkit/kitok.msg
 %%EXAMPLESDIR%%/misc/unkit/mailagent.cf
 %%EXAMPLESDIR%%/misc/unkit/newcmd.cf
 %%EXAMPLESDIR%%/misc/unkit/rules
 %%EXAMPLESDIR%%/misc/unkit/unkit.pl
Index: head/net-mgmt/arpwatch/pkg-plist
===================================================================
--- head/net-mgmt/arpwatch/pkg-plist	(revision 550759)
+++ head/net-mgmt/arpwatch/pkg-plist	(revision 550760)
@@ -1,16 +1,16 @@
 arpwatch/arp2ethers
 arpwatch/d.awk
 arpwatch/duplicates.awk
 arpwatch/e.awk
 arpwatch/euppertolower.awk
 arpwatch/massagevendor
 arpwatch/p.awk
 arpwatch/update-ethercodes
 etc/rc.d/arpwatch
 man/man8/arpsnmp.8.gz
 man/man8/arpwatch.8.gz
 sbin/arpsnmp
 sbin/arpwatch
-@touch arpwatch/arp.dat
-@rmempty arpwatch/arp.dat
+@postexec test -f %D/arpwatch/arp.dat || touch %D/arpwatch/arp.dat
+@preunexec test -f %D/arpwatch/arp.dat && test -s %D/arpwatch/arp.dat || rm -f %D/arpwatch/arp.dat
 @dir(,operator,0755) arpwatch