2 files changed, 27 insertions, 14 deletions

diff --git a/mail/qmail-scanner/files/pkg-install.in b/mail/qmail-scanner/files/pkg-install.in
index 9b69e9855472..6d0083fdcc34 100644
--- a/mail/qmail-scanner/files/pkg-install.in
+++ b/mail/qmail-scanner/files/pkg-install.in
@@ -1,7 +1,5 @@
 #!/bin/sh
 
-PREFIX=%%PREFIX%%
-
 PW="/usr/sbin/pw"
 CHOWN="/usr/sbin/chown"
 CHMOD="/bin/chmod"
@@ -36,8 +34,12 @@ POST-INSTALL)
 
   # Mod and owner
   ${CHOWN} -R ${QS_USER}:${QS_USER} ${SPOOLDIR}
-  ${CHOWN} ${QS_USER}:${QS_USER} ${PREFIX}/bin/qmail-scanner-queue.pl
-  ${CHMOD} 4755 ${PREFIX}/bin/qmail-scanner-queue.pl
+  ${CHOWN} ${QS_USER}:${QS_USER} ${PKG_PREFIX}/bin/qmail-scanner-queue.pl
+  ${CHMOD} 4755 ${PKG_PREFIX}/bin/qmail-scanner-queue.pl
+
+  # Initialize
+  ${PKG_PREFIX}/bin/qmail-scanner-queue.pl -z
+  ${PKG_PREFIX}/bin/qmail-scanner-queue.pl -g
 
   # Mod and owner (final)
   ${CHOWN} -R ${QS_USER}:${QS_USER} ${SPOOLDIR}
diff --git a/mail/qmail-scanner/files/pkg-message.in b/mail/qmail-scanner/files/pkg-message.in
index 2f3f1f42065c..5df6cd08a2cf 100644
--- a/mail/qmail-scanner/files/pkg-message.in
+++ b/mail/qmail-scanner/files/pkg-message.in
@@ -2,25 +2,36 @@
 Congratulations! Qmail-Scanner is now installed!
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
- - Please, configure correctly your anti-virus and anti-spam;
- - You HAVE to reinstall this port each time you add or remo-
-ve an Anti-Virus or Anti-Spam;
- - Now configure the environment variable to use qmail-scanner:
+ATTENTION!!!
 
- You just need to add for your tcpserver file (generally called
+For qmail-scanner work correctly, be sure to have QMAILQUEUE patch applied on
+your qmail.
+
+Please, configure correctly your anti-virus and anti-spam. You
+HAVE to reinstall this port each time you add or remove an 
+Anti-Virus or Anti-Spam;
+
+Now configure the environment variable to use qmail-scanner:
+
+You just need to add for your tcpserver file (generally called
 as: tcp.smtp):
- QMAILQUEUE="%%PREFIX%%/bin/qmail-scanner-queue.pl"
 
- Or create an new file in /service/smtpd/env, with the following
+QMAILQUEUE="%%PREFIX%%/bin/qmail-scanner-queue.pl"
+
+Or create an new file in /service/smtpd/env, with the following
 content and called as "QMAILQUEUE":
- %%PREFIX%%/bin/qmail-scanner-queue.pl
+
+%%PREFIX%%/bin/qmail-scanner-queue.pl
 
 NOTE: always you change anything in your environment dir, you just
 need to restart your smtpd, for it use: "svc -k /service/smtpd".
 
 You can test your installation by running 'make test' in port dir.
 
-Please, run the following commands:
+Remember to rename quarantine-events.txt.sample in /var/spool/qscand 
+and then run "qmail-scanner-queue.pl -g" to generate DB version. 
+
+Please log into an unpriviledged account and run 
 
-%%PREFIX%%/bin/qmail-scanner-queue.pl -z
 %%PREFIX%%/bin/qmail-scanner-queue.pl -g
+