- Use --qmail-queue-binary configure's argument to point to the proper

  location (i.e. ${QMAIL_DIR}/bin instead of ${PREFIX}/bin)
  Suggested by:	J. Martin Petersen <jmp@alvorlig.dk>
		Fumihiko Kimura <jfkimura@yahoo.co.jp>
- Check for qmail-queue binary in Makefile
- Display build knobs descriptions in pre-configure
- Install qs2mrtg.pl script (from contrib/)

Submitted by:	maintainer

4 files changed, 74 insertions, 10 deletions

diff --git a/mail/qmail-scanner/Makefile b/mail/qmail-scanner/Makefile
index a53c9e2832f9..09a855fd2b4b 100644
--- a/mail/qmail-scanner/Makefile
+++ b/mail/qmail-scanner/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	qmail-scanner
 PORTVERSION=	1.20
+PORTREVISION=	1
 CATEGORIES=	mail security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,13 +17,14 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	freebsd@simplerezo.com
 COMMENT=	Content/Anti-virus Scanner for qmail
 
+BUILD_DEPENDS=	${QMAIL_QUEUE}:${PORTSDIR}/mail/qmail \
+		${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes \
+		reformime:${PORTSDIR}/mail/maildrop
+
 # A normal qmail installation puts everything into /var/qmail/.
 # Must match your qmail installation
 QMAIL_DIR?=	/var/qmail
-
-BUILD_DEPENDS=	${QMAIL_DIR}/bin/qmail-queue:${PORTSDIR}/mail/qmail \
-		${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes \
-		reformime:${PORTSDIR}/mail/maildrop
+QMAIL_QUEUE=	${QMAIL_DIR}/bin/qmail-queue
 
 USE_PERL5=	yes
 NO_BUILD=	yes
@@ -58,7 +60,8 @@ PLIST_SUB=	SPOOLDIR="${SPOOLDIR:S,${PREFIX}/,,}"
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS+=	\
-		--qmaildir ${QMAIL_DIR} --spooldir ${SPOOLDIR} --bindir ${PREFIX}/bin \
+		--qmaildir ${QMAIL_DIR} --spooldir ${SPOOLDIR} \
+		--bindir ${PREFIX}/bin --qmail-queue-binary ${QMAIL_QUEUE} \
 		--admin "${QMAILSCAN_ADMIN}" --notify "${QMAILSCAN_NOTIFY}" \
 		--silent-viruses auto \
 		--redundant yes --unzip yes \
@@ -68,13 +71,41 @@ CONFIGURE_ARGS+=	\
 		--batch
 
 pre-configure:
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "----------------------------------------"
+	@${ECHO_MSG} "You may use the following build options:"
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "QMAILSCAN_ADMIN          email adress of qmail-scanner admin for alerts"
+	@${ECHO_MSG} "QMAILSCAN_ADMINREALNAME* name to use when sending alerts"
+	@${ECHO_MSG} "                         (do not use spaces but underscores here)"
+	@${ECHO_MSG} "QMAILSCAN_LOCALDOMAINS   domains classified as local domains preventing alerts"
+	@${ECHO_MSG} "                         of externals users (and mailing-lists...)"
+	@${ECHO_MSG} "QMAILSCAN_SCANNERS       list of installed content scanner"
+	@${ECHO_MSG} "                         default is automatic, so you do not need to set this"
+	@${ECHO_MSG} "QMAILSCAN_SPAMSREDIRECT* set this if you want to redirect all spams to a"
+	@${ECHO_MSG} "                         specific email address"
+	@${ECHO_MSG} "QMAILSCAN_SPAMSTOSUFFIX* suffix to alter spams recipients with"
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "When you set the last option to 'spam', a detected spam will be delivered to"
+	@${ECHO_MSG} "'user-spam@domain' instead of 'user@domain'."
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "* Please note these options are only available with FreeBSD ports "
+	@${ECHO_MSG} "So please, do not report relatives bugs to qmail-scanner team, but maintainer."
+	@${ECHO_MSG} "----------------------------------------"
+	@${ECHO_MSG} ""
 	@PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/pkg-install ${PKGNAME} PRE-INSTALL
+	@if ! ${TEST} -f ${QMAIL_QUEUE}; then \
+		@${ECHO_MSG} "Unable to found qmail-queue binary trying '${QMAIL_QUEUE}'.";  \
+		@${ECHO_MSG} "Please set QMAIL_DIR to your qmail installation directory !"; \
+		exit 1; \
+	fi
 
 do-install:
 	-${TEST} -f ${PREFIX}/bin/qmail-scanner-queue.pl && \
 		${MV} ${PREFIX}/bin/qmail-scanner-queue.pl \
 			${PREFIX}/bin/qmail-scanner-queue.pl.old
 	${INSTALL_SCRIPT} ${WRKSRC}/qmail-scanner-queue.pl ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/contrib/qs2mrtg.pl ${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/quarantine-attachments.txt \
 		${SPOOLDIR}/quarantine-attachments.sample
 	${TEST} -f ${SPOOLDIR}/quarantine-attachments.txt || \
diff --git a/mail/qmail-scanner/pkg-plist b/mail/qmail-scanner/pkg-plist
index ce4a6fb42dad..628c006a5729 100644
--- a/mail/qmail-scanner/pkg-plist
+++ b/mail/qmail-scanner/pkg-plist
@@ -1,5 +1,6 @@
 @comment $FreeBSD$
 bin/qmail-scanner-queue.pl
+bin/qs2mrtg.pl
 %%SPOOLDIR%%/quarantine-attachments.sample
 %%SPOOLDIR%%/quarantine-attachments.txt
 @unexec rmdir %%SPOOLDIR%%/archives/cur 2>/dev/null || true
diff --git a/mail/qmail-scanner1/Makefile b/mail/qmail-scanner1/Makefile
index a53c9e2832f9..09a855fd2b4b 100644
--- a/mail/qmail-scanner1/Makefile
+++ b/mail/qmail-scanner1/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	qmail-scanner
 PORTVERSION=	1.20
+PORTREVISION=	1
 CATEGORIES=	mail security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,13 +17,14 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	freebsd@simplerezo.com
 COMMENT=	Content/Anti-virus Scanner for qmail
 
+BUILD_DEPENDS=	${QMAIL_QUEUE}:${PORTSDIR}/mail/qmail \
+		${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes \
+		reformime:${PORTSDIR}/mail/maildrop
+
 # A normal qmail installation puts everything into /var/qmail/.
 # Must match your qmail installation
 QMAIL_DIR?=	/var/qmail
-
-BUILD_DEPENDS=	${QMAIL_DIR}/bin/qmail-queue:${PORTSDIR}/mail/qmail \
-		${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes \
-		reformime:${PORTSDIR}/mail/maildrop
+QMAIL_QUEUE=	${QMAIL_DIR}/bin/qmail-queue
 
 USE_PERL5=	yes
 NO_BUILD=	yes
@@ -58,7 +60,8 @@ PLIST_SUB=	SPOOLDIR="${SPOOLDIR:S,${PREFIX}/,,}"
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS+=	\
-		--qmaildir ${QMAIL_DIR} --spooldir ${SPOOLDIR} --bindir ${PREFIX}/bin \
+		--qmaildir ${QMAIL_DIR} --spooldir ${SPOOLDIR} \
+		--bindir ${PREFIX}/bin --qmail-queue-binary ${QMAIL_QUEUE} \
 		--admin "${QMAILSCAN_ADMIN}" --notify "${QMAILSCAN_NOTIFY}" \
 		--silent-viruses auto \
 		--redundant yes --unzip yes \
@@ -68,13 +71,41 @@ CONFIGURE_ARGS+=	\
 		--batch
 
 pre-configure:
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "----------------------------------------"
+	@${ECHO_MSG} "You may use the following build options:"
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "QMAILSCAN_ADMIN          email adress of qmail-scanner admin for alerts"
+	@${ECHO_MSG} "QMAILSCAN_ADMINREALNAME* name to use when sending alerts"
+	@${ECHO_MSG} "                         (do not use spaces but underscores here)"
+	@${ECHO_MSG} "QMAILSCAN_LOCALDOMAINS   domains classified as local domains preventing alerts"
+	@${ECHO_MSG} "                         of externals users (and mailing-lists...)"
+	@${ECHO_MSG} "QMAILSCAN_SCANNERS       list of installed content scanner"
+	@${ECHO_MSG} "                         default is automatic, so you do not need to set this"
+	@${ECHO_MSG} "QMAILSCAN_SPAMSREDIRECT* set this if you want to redirect all spams to a"
+	@${ECHO_MSG} "                         specific email address"
+	@${ECHO_MSG} "QMAILSCAN_SPAMSTOSUFFIX* suffix to alter spams recipients with"
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "When you set the last option to 'spam', a detected spam will be delivered to"
+	@${ECHO_MSG} "'user-spam@domain' instead of 'user@domain'."
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "* Please note these options are only available with FreeBSD ports "
+	@${ECHO_MSG} "So please, do not report relatives bugs to qmail-scanner team, but maintainer."
+	@${ECHO_MSG} "----------------------------------------"
+	@${ECHO_MSG} ""
 	@PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/pkg-install ${PKGNAME} PRE-INSTALL
+	@if ! ${TEST} -f ${QMAIL_QUEUE}; then \
+		@${ECHO_MSG} "Unable to found qmail-queue binary trying '${QMAIL_QUEUE}'.";  \
+		@${ECHO_MSG} "Please set QMAIL_DIR to your qmail installation directory !"; \
+		exit 1; \
+	fi
 
 do-install:
 	-${TEST} -f ${PREFIX}/bin/qmail-scanner-queue.pl && \
 		${MV} ${PREFIX}/bin/qmail-scanner-queue.pl \
 			${PREFIX}/bin/qmail-scanner-queue.pl.old
 	${INSTALL_SCRIPT} ${WRKSRC}/qmail-scanner-queue.pl ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/contrib/qs2mrtg.pl ${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/quarantine-attachments.txt \
 		${SPOOLDIR}/quarantine-attachments.sample
 	${TEST} -f ${SPOOLDIR}/quarantine-attachments.txt || \
diff --git a/mail/qmail-scanner1/pkg-plist b/mail/qmail-scanner1/pkg-plist
index ce4a6fb42dad..628c006a5729 100644
--- a/mail/qmail-scanner1/pkg-plist
+++ b/mail/qmail-scanner1/pkg-plist
@@ -1,5 +1,6 @@
 @comment $FreeBSD$
 bin/qmail-scanner-queue.pl
+bin/qs2mrtg.pl
 %%SPOOLDIR%%/quarantine-attachments.sample
 %%SPOOLDIR%%/quarantine-attachments.txt
 @unexec rmdir %%SPOOLDIR%%/archives/cur 2>/dev/null || true