1 files changed, 15 insertions, 14 deletions

diff --git a/mail/nullmailer/pkg-plist b/mail/nullmailer/pkg-plist
index 5d049d68bc88..7198ee0fc2f4 100644
--- a/mail/nullmailer/pkg-plist
+++ b/mail/nullmailer/pkg-plist
@@ -5,24 +5,25 @@ libexec/nullmailer/sendmail
 bin/nullmailer-inject
 sbin/nullmailer-queue
 sbin/nullmailer-send
+etc/nullmailer/me.sample
 etc/nullmailer/remotes.sample
 etc/rc.d/nullmail.sh
-@exec mkdir -p %%LOCALSTATEDIR%%/var/%%SPOOL%%nullmailer/queue
-@exec chmod 700 %%LOCALSTATEDIR%%/var/%%SPOOL%%nullmailer/queue
-@exec mkdir -p %%LOCALSTATEDIR%%/var/%%SPOOL%%nullmailer/tmp
-@exec chmod 700 %%LOCALSTATEDIR%%/var/%%SPOOL%%nullmailer/tmp
-@exec rm -f %%LOCALSTATEDIR%%/var/%%SPOOL%%nullmailer/trigger
-@exec mkfifo %%LOCALSTATEDIR%%/var/%%SPOOL%%nullmailer/trigger
-@exec chmod 600 %%LOCALSTATEDIR%%/var/%%SPOOL%%nullmailer/trigger
-@exec chown -R nullmail %%LOCALSTATEDIR%%/var/%%SPOOL%%nullmailer/*
+@exec mkdir -p %%LOCALSTATEDIR%%/nullmailer/queue
+@exec chmod 700 %%LOCALSTATEDIR%%/nullmailer/queue
+@exec mkdir -p %%LOCALSTATEDIR%%/nullmailer/tmp
+@exec chmod 700 %%LOCALSTATEDIR%%/nullmailer/tmp
+@exec rm -f %%LOCALSTATEDIR%%/nullmailer/trigger
+@exec mkfifo %%LOCALSTATEDIR%%/nullmailer/trigger
+@exec chmod 600 %%LOCALSTATEDIR%%/nullmailer/trigger
+@exec chown -R nullmail %%LOCALSTATEDIR%%/nullmailer/*
 @exec chown nullmail %D/sbin/nullmailer-queue
 @exec chmod u+s %D/sbin/nullmailer-queue
 @exec chown nullmail %D/libexec/nullmailer/mailq
 @exec chmod u+s %D/libexec/nullmailer/mailq
-%%LOCALSTATEDIR_RM%%var/%%SPOOL%%nullmailer/queue
-%%LOCALSTATEDIR_RM%%var/%%SPOOL%%nullmailer/tmp
-@unexec rm -f %%LOCALSTATEDIR%%/var/%%SPOOL%%nullmailer/trigger
-@dirrm etc/nullmailer
+@unexec if [ -d %%LOCALSTATEDIR%%/nullmailer/queue ]; then rmdir %%LOCALSTATEDIR%%/nullmailer/queue; fi;
+@unexec if [ -d %%LOCALSTATEDIR%%/nullmailer/tmp ]; then rmdir %%LOCALSTATEDIR%%/nullmailer/tmp; fi;
+@unexec if [ -p %%LOCALSTATEDIR%%/nullmailer/trigger ]; then rm -f %%LOCALSTATEDIR%%/nullmailer/trigger; fi;
 @dirrm libexec/nullmailer
-%%LOCALSTATEDIR_RM%%var/%%SPOOL%%nullmailer
-@unexec if [ -n "$BATCH" ]; then echo "Warning: In batch mode, I will do 'rmuser -y nullmail'"; rmuser -y nullmail; fi
+@unexec t=`/bin/ls %D/etc/nullmailer`; if [ -z "$t" ]; then echo "Configuration directory is empty, remove it."; rmdir %D/etc/nullmailer; fi;
+@unexec if [ -d %%LOCALSTATEDIR%%/nullmailer ]; then rmdir %%LOCALSTATEDIR%%/nullmailer; fi
+@unexec if [ -n "$BATCH" ]; then echo "Warning: In batch mode, I will do 'rmuser -y nullmail'"; rmuser -y nullmail; fi;