- Update to 1.20 [1]

- Fix @dirrm stderr redirection in pkg-plist [2]

PR:		60395 [2] (partly)
Submitted by:	maintainer [1],
		Fumihiko Kimura <jfkimura@yahoo.co.jp> [2]

8 files changed, 60 insertions, 34 deletions

diff --git a/mail/qmail-scanner/Makefile b/mail/qmail-scanner/Makefile
index 8449d2f34ee5..a53c9e2832f9 100644
--- a/mail/qmail-scanner/Makefile
+++ b/mail/qmail-scanner/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	qmail-scanner
-PORTVERSION=	1.20.r4
+PORTVERSION=	1.20
 CATEGORIES=	mail security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -37,10 +37,15 @@ QMAILSCAN_ADMIN?=	root
 .if defined(QMAILSCAN_ADMINREALNAME)
 CONFIGURE_ARGS+=	--admin-realname "${QMAILSCAN_ADMINREALNAME}"
 .endif
-QMAILSCAN_NOTIFY?=	sender,recips,admin
+QMAILSCAN_NOTIFY?=	sender,recips
 .if defined(QMAILSCAN_LOCALDOMAINS)
 CONFIGURE_ARGS+=	--local-domains "${QMAILSCAN_LOCALDOMAINS}"
 .endif
+.if defined(QMAILSCAN_SCANNERS)
+CONFIGURE_ARGS+=	--scanners "${QMAILSCAN_SCANNERS}"
+.else
+CONFIGURE_ARGS+=	--scanners auto
+.endif
 .if defined(QMAILSCAN_SPAMSREDIRECT)
 CONFIGURE_ARGS+=	--spams-redirect "${QMAILSCAN_SPAMSREDIRECT}"
 .endif
@@ -52,13 +57,12 @@ SPOOLDIR=	${PREFIX}/qmailscan
 PLIST_SUB=	SPOOLDIR="${SPOOLDIR:S,${PREFIX}/,,}"
 
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--qmaildir ${QMAIL_DIR} --spooldir ${SPOOLDIR} \
-		--bindir ${PREFIX}/bin \
+CONFIGURE_ARGS+=	\
+		--qmaildir ${QMAIL_DIR} --spooldir ${SPOOLDIR} --bindir ${PREFIX}/bin \
 		--admin "${QMAILSCAN_ADMIN}" --notify "${QMAILSCAN_NOTIFY}" \
 		--silent-viruses auto \
-		--archive no --redundant yes --unzip yes \
+		--redundant yes --unzip yes \
 		--add-dscr-hdrs yes \
-		--scanners auto \
 		--fix-mime yes \
 		--log-details syslog --debug no \
 		--batch
diff --git a/mail/qmail-scanner/distinfo b/mail/qmail-scanner/distinfo
index e959ceb85822..be798405e4af 100644
--- a/mail/qmail-scanner/distinfo
+++ b/mail/qmail-scanner/distinfo
@@ -1 +1 @@
-MD5 (qmail-scanner-1.20rc4.tgz) = 3324c752ce4d0d85d5a68821722d7240
+MD5 (qmail-scanner-1.20.tgz) = d1e1753bd966fe6b20a7ef46ed2da524
diff --git a/mail/qmail-scanner/files/patch-configure b/mail/qmail-scanner/files/patch-configure
index 5eec14b74de8..35a5a2b8169e 100644
--- a/mail/qmail-scanner/files/patch-configure
+++ b/mail/qmail-scanner/files/patch-configure
@@ -1,5 +1,14 @@
 --- configure.orig	Thu Dec 11 14:28:41 2003
 +++ configure	Thu Dec 11 14:28:48 2003
+@@ -48,6 +48,8 @@
+     QSLANG="en_GB"
+ fi
+ 
++QSLANG=`echo $QSLANG|sed 's/\..*//'`
++
+ if [ ! -d "./locale/$QSLANG" ]; then
+     echo "
+ 
 @@ -83,7 +83,8 @@ DEBUG_LEVEL="1"
  FORCE_UNZIP="0"
  DESCRIPTIVE_HEADERS="0"
diff --git a/mail/qmail-scanner/pkg-plist b/mail/qmail-scanner/pkg-plist
index 785de258f924..ce4a6fb42dad 100644
--- a/mail/qmail-scanner/pkg-plist
+++ b/mail/qmail-scanner/pkg-plist
@@ -2,13 +2,13 @@
 bin/qmail-scanner-queue.pl
 %%SPOOLDIR%%/quarantine-attachments.sample
 %%SPOOLDIR%%/quarantine-attachments.txt
-@unexec rmdir %%SPOOLDIR%%/archives/cur 2>1 || true
-@unexec rmdir %%SPOOLDIR%%/archives/new 2>1 || true
-@unexec rmdir %%SPOOLDIR%%/archives/tmp 2>1 || true
-@unexec rmdir %%SPOOLDIR%%/archives 2>1 || true
-@unexec rmdir %%SPOOLDIR%%/quarantine/cur 2>1 || true
-@unexec rmdir %%SPOOLDIR%%/quarantine/new 2>1 || true
-@unexec rmdir %%SPOOLDIR%%/quarantine/tmp 2>1 || true
-@unexec rmdir %%SPOOLDIR%%/quarantine 2>1 || true
-@unexec rmdir %%SPOOLDIR%%/tmp 2>1 || true
-@unexec rmdir %%SPOOLDIR%% 2>1 || true
+@unexec rmdir %%SPOOLDIR%%/archives/cur 2>/dev/null || true
+@unexec rmdir %%SPOOLDIR%%/archives/new 2>/dev/null || true
+@unexec rmdir %%SPOOLDIR%%/archives/tmp 2>/dev/null || true
+@unexec rmdir %%SPOOLDIR%%/archives 2>/dev/null || true
+@unexec rmdir %%SPOOLDIR%%/quarantine/cur 2>/dev/null || true
+@unexec rmdir %%SPOOLDIR%%/quarantine/new 2>/dev/null || true
+@unexec rmdir %%SPOOLDIR%%/quarantine/tmp 2>/dev/null || true
+@unexec rmdir %%SPOOLDIR%%/quarantine 2>/dev/null || true
+@unexec rmdir %%SPOOLDIR%%/tmp 2>/dev/null || true
+@unexec rmdir %%SPOOLDIR%% 2>/dev/null || true
diff --git a/mail/qmail-scanner1/Makefile b/mail/qmail-scanner1/Makefile
index 8449d2f34ee5..a53c9e2832f9 100644
--- a/mail/qmail-scanner1/Makefile
+++ b/mail/qmail-scanner1/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	qmail-scanner
-PORTVERSION=	1.20.r4
+PORTVERSION=	1.20
 CATEGORIES=	mail security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -37,10 +37,15 @@ QMAILSCAN_ADMIN?=	root
 .if defined(QMAILSCAN_ADMINREALNAME)
 CONFIGURE_ARGS+=	--admin-realname "${QMAILSCAN_ADMINREALNAME}"
 .endif
-QMAILSCAN_NOTIFY?=	sender,recips,admin
+QMAILSCAN_NOTIFY?=	sender,recips
 .if defined(QMAILSCAN_LOCALDOMAINS)
 CONFIGURE_ARGS+=	--local-domains "${QMAILSCAN_LOCALDOMAINS}"
 .endif
+.if defined(QMAILSCAN_SCANNERS)
+CONFIGURE_ARGS+=	--scanners "${QMAILSCAN_SCANNERS}"
+.else
+CONFIGURE_ARGS+=	--scanners auto
+.endif
 .if defined(QMAILSCAN_SPAMSREDIRECT)
 CONFIGURE_ARGS+=	--spams-redirect "${QMAILSCAN_SPAMSREDIRECT}"
 .endif
@@ -52,13 +57,12 @@ SPOOLDIR=	${PREFIX}/qmailscan
 PLIST_SUB=	SPOOLDIR="${SPOOLDIR:S,${PREFIX}/,,}"
 
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--qmaildir ${QMAIL_DIR} --spooldir ${SPOOLDIR} \
-		--bindir ${PREFIX}/bin \
+CONFIGURE_ARGS+=	\
+		--qmaildir ${QMAIL_DIR} --spooldir ${SPOOLDIR} --bindir ${PREFIX}/bin \
 		--admin "${QMAILSCAN_ADMIN}" --notify "${QMAILSCAN_NOTIFY}" \
 		--silent-viruses auto \
-		--archive no --redundant yes --unzip yes \
+		--redundant yes --unzip yes \
 		--add-dscr-hdrs yes \
-		--scanners auto \
 		--fix-mime yes \
 		--log-details syslog --debug no \
 		--batch
diff --git a/mail/qmail-scanner1/distinfo b/mail/qmail-scanner1/distinfo
index e959ceb85822..be798405e4af 100644
--- a/mail/qmail-scanner1/distinfo
+++ b/mail/qmail-scanner1/distinfo
@@ -1 +1 @@
-MD5 (qmail-scanner-1.20rc4.tgz) = 3324c752ce4d0d85d5a68821722d7240
+MD5 (qmail-scanner-1.20.tgz) = d1e1753bd966fe6b20a7ef46ed2da524
diff --git a/mail/qmail-scanner1/files/patch-configure b/mail/qmail-scanner1/files/patch-configure
index 5eec14b74de8..35a5a2b8169e 100644
--- a/mail/qmail-scanner1/files/patch-configure
+++ b/mail/qmail-scanner1/files/patch-configure
@@ -1,5 +1,14 @@
 --- configure.orig	Thu Dec 11 14:28:41 2003
 +++ configure	Thu Dec 11 14:28:48 2003
+@@ -48,6 +48,8 @@
+     QSLANG="en_GB"
+ fi
+ 
++QSLANG=`echo $QSLANG|sed 's/\..*//'`
++
+ if [ ! -d "./locale/$QSLANG" ]; then
+     echo "
+ 
 @@ -83,7 +83,8 @@ DEBUG_LEVEL="1"
  FORCE_UNZIP="0"
  DESCRIPTIVE_HEADERS="0"
diff --git a/mail/qmail-scanner1/pkg-plist b/mail/qmail-scanner1/pkg-plist
index 785de258f924..ce4a6fb42dad 100644
--- a/mail/qmail-scanner1/pkg-plist
+++ b/mail/qmail-scanner1/pkg-plist
@@ -2,13 +2,13 @@
 bin/qmail-scanner-queue.pl
 %%SPOOLDIR%%/quarantine-attachments.sample
 %%SPOOLDIR%%/quarantine-attachments.txt
-@unexec rmdir %%SPOOLDIR%%/archives/cur 2>1 || true
-@unexec rmdir %%SPOOLDIR%%/archives/new 2>1 || true
-@unexec rmdir %%SPOOLDIR%%/archives/tmp 2>1 || true
-@unexec rmdir %%SPOOLDIR%%/archives 2>1 || true
-@unexec rmdir %%SPOOLDIR%%/quarantine/cur 2>1 || true
-@unexec rmdir %%SPOOLDIR%%/quarantine/new 2>1 || true
-@unexec rmdir %%SPOOLDIR%%/quarantine/tmp 2>1 || true
-@unexec rmdir %%SPOOLDIR%%/quarantine 2>1 || true
-@unexec rmdir %%SPOOLDIR%%/tmp 2>1 || true
-@unexec rmdir %%SPOOLDIR%% 2>1 || true
+@unexec rmdir %%SPOOLDIR%%/archives/cur 2>/dev/null || true
+@unexec rmdir %%SPOOLDIR%%/archives/new 2>/dev/null || true
+@unexec rmdir %%SPOOLDIR%%/archives/tmp 2>/dev/null || true
+@unexec rmdir %%SPOOLDIR%%/archives 2>/dev/null || true
+@unexec rmdir %%SPOOLDIR%%/quarantine/cur 2>/dev/null || true
+@unexec rmdir %%SPOOLDIR%%/quarantine/new 2>/dev/null || true
+@unexec rmdir %%SPOOLDIR%%/quarantine/tmp 2>/dev/null || true
+@unexec rmdir %%SPOOLDIR%%/quarantine 2>/dev/null || true
+@unexec rmdir %%SPOOLDIR%%/tmp 2>/dev/null || true
+@unexec rmdir %%SPOOLDIR%% 2>/dev/null || true