Update to mimedefang 2.58

Changes since 2.57:
* Various minor bug-fixes, including a memory leak.

Changes since 2.56:
* Various minor bug-fixes
* New md-mx-ctrl hload command shows load over past 1, 4, 12 and 24 hours.
* New multiplexor scheduling algorithm tries to keep a given command on a
  given set of slaves.

3 files changed, 24 insertions, 26 deletions

diff --git a/mail/mimedefang/Makefile b/mail/mimedefang/Makefile
index d0b521551a0..deab7f1fbe0 100644
--- a/mail/mimedefang/Makefile
+++ b/mail/mimedefang/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.34 2006/03/14 01:14:30 jlam Exp $
+# $NetBSD: Makefile,v 1.35 2006/11/08 09:42:05 markd Exp $
 
-DISTNAME=		mimedefang-2.56
+DISTNAME=		mimedefang-2.58
 CATEGORIES=		mail
 MASTER_SITES=		http://www.mimedefang.org/static/
 
@@ -31,7 +31,7 @@ PKG_GROUPS=		${DEFANG_GROUP}
 PKG_USERS=		${DEFANG_USER}:${DEFANG_GROUP}
 
 BUILD_DEFS+=		PKG_SYSCONFSUBDIR DEFANG_SPOOLDIR
-BUILD_DEFS+=		DEFANG_USER DEFANG_GROUP
+BUILD_DEFS+=		DEFANG_USER DEFANG_GROUP VARBASE
 
 EGDIR=			${PREFIX}/share/examples/mimedefang
 SHAREDIR=		${PREFIX}/share/mimedefang
@@ -66,9 +66,8 @@ CONFIGURE_ENV+=		NAI=${PREFIX}/bin/uvscan
 # Doesn't work with pth
 PTHREAD_OPTS+=		require native
 
-INSTALLATION_DIRS=	bin man/man5 man/man7 man/man8
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man5 ${PKGMANDIR}/man7 ${PKGMANDIR}/man8
 do-install:
-	${INSTALL_DATA_DIR} ${PKG_SYSCONFDIR}
 	${INSTALL_DATA_DIR} ${EGDIR}
 	${INSTALL_DATA_DIR} ${SHAREDIR}
 	${INSTALL_DATA} ${WRKSRC}/gen-ip-validator.pl ${SHAREDIR}
@@ -77,13 +76,13 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/mimedefang ${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/watch-mimedefang ${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/mimedefang.pl ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/md-mx-ctrl.8 ${PREFIX}/man/man8
-	${INSTALL_DATA} ${WRKSRC}/mimedefang.8 ${PREFIX}/man/man8
-	${INSTALL_DATA} ${WRKSRC}/mimedefang.pl.8 ${PREFIX}/man/man8
-	${INSTALL_DATA} ${WRKSRC}/mimedefang-multiplexor.8 ${PREFIX}/man/man8
-	${INSTALL_DATA} ${WRKSRC}/watch-mimedefang.8 ${PREFIX}/man/man8
-	${INSTALL_DATA} ${WRKSRC}/mimedefang-filter.5 ${PREFIX}/man/man5
-	${INSTALL_DATA} ${WRKSRC}/mimedefang-protocol.7 ${PREFIX}/man/man7
+	${INSTALL_DATA} ${WRKSRC}/md-mx-ctrl.8 ${PREFIX}/${PKGMANDIR}/man8
+	${INSTALL_DATA} ${WRKSRC}/mimedefang.8 ${PREFIX}/${PKGMANDIR}/man8
+	${INSTALL_DATA} ${WRKSRC}/mimedefang.pl.8 ${PREFIX}/${PKGMANDIR}/man8
+	${INSTALL_DATA} ${WRKSRC}/mimedefang-multiplexor.8 ${PREFIX}/${PKGMANDIR}/man8
+	${INSTALL_DATA} ${WRKSRC}/watch-mimedefang.8 ${PREFIX}/${PKGMANDIR}/man8
+	${INSTALL_DATA} ${WRKSRC}/mimedefang-filter.5 ${PREFIX}/${PKGMANDIR}/man5
+	${INSTALL_DATA} ${WRKSRC}/mimedefang-protocol.7 ${PREFIX}/${PKGMANDIR}/man7
 	${INSTALL_DATA} ${WRKSRC}/examples/suggested-minimum-filter-for-windows-clients ${EGDIR}/mimedefang-filter
 	${INSTALL_DATA} ${WRKSRC}/SpamAssassin/spamassassin.cf ${EGDIR}/sa-mimedefang.cf
 
diff --git a/mail/mimedefang/distinfo b/mail/mimedefang/distinfo
index 578ad993414..5960ce88ce1 100644
--- a/mail/mimedefang/distinfo
+++ b/mail/mimedefang/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.14 2006/03/13 00:05:14 markd Exp $
+$NetBSD: distinfo,v 1.15 2006/11/08 09:42:05 markd Exp $
 
-SHA1 (mimedefang-2.56.tar.gz) = 1b693a3500fc1bf78970b871378987b806da9555
-RMD160 (mimedefang-2.56.tar.gz) = d0bad8d4a6155df4672ece3f0d214763f80db518
-Size (mimedefang-2.56.tar.gz) = 314846 bytes
+SHA1 (mimedefang-2.58.tar.gz) = 1f6efc74535e5c4db35c031bdbc1e6a07bdafd33
+RMD160 (mimedefang-2.58.tar.gz) = 703bf4e77c5923f1ebbd5aa207d4e8d3c057e4b2
+Size (mimedefang-2.58.tar.gz) = 317448 bytes
 SHA1 (patch-ab) = 855a939cca7af09fd418da41589fc585750dae58
-SHA1 (patch-ac) = f6ca90301aa9dfac0e12733cead18ff91816aa6f
+SHA1 (patch-ac) = 0cd334c28d5458498d6d6fe2cce612ef448a0359
diff --git a/mail/mimedefang/patches/patch-ac b/mail/mimedefang/patches/patch-ac
index 70dee2415cb..6afd4776489 100644
--- a/mail/mimedefang/patches/patch-ac
+++ b/mail/mimedefang/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.3 2005/12/10 22:14:15 markd Exp $
+$NetBSD: patch-ac,v 1.4 2006/11/08 09:42:05 markd Exp $
 
---- mimedefang.pl.in.orig	2005-12-11 08:49:06.000000000 +1300
+--- mimedefang.pl.in.orig	2006-11-08 03:47:07.000000000 +1300
 +++ mimedefang.pl.in
-@@ -126,27 +126,27 @@ $VirusScannerRoutinesInitialized = 0;
+@@ -121,26 +121,26 @@ $VirusScannerRoutinesInitialized = 0;
  $SALocalTestsOnly = 1;
  $DoStatusTags = 0;
  
@@ -13,6 +13,11 @@ $NetBSD: patch-ac,v 1.3 2005/12/10 22:14:15 markd Exp $
 -$Features{'Virus:CLAMD'}    = ('@CLAMD@' ne '/bin/false' ? '@CLAMD@' : 0);
 -$Features{'Virus:FPROT'}    = ('@FPROT@' ne '/bin/false' ? '@FPROT@' : 0);
 -$Features{'Virus:FSAV'}     = ('@FSAV@' ne '/bin/false' ? '@FSAV@' : 0);
+-$Features{'Virus:HBEDV'}    = ('@HBEDV@' ne '/bin/false' ? '@HBEDV@' : 0);
+-$Features{'Virus:VEXIRA'}   = ('@VEXIRA@' ne '/bin/false' ? '@VEXIRA@' : 0);
+-$Features{'Virus:NAI'}      = ('@NAI@' ne '/bin/false' ? '@NAI@' : 0);
+-$Features{'Virus:BDC'}      = ('@BDC@' ne '/bin/false' ? '@BDC@' : 0);
+-$Features{'Virus:NVCC'}     = ('@NVCC@' ne '/bin/false' ? '@NVCC@' : 0);
 +$Features{'Virus:AVP'}      = ((('@AVP@' ne '/bin/false') and (-x '@AVP@')) ? '@AVP@' : 0);
 +$Features{'Virus:AVP5'}      = ((('@AVP5@' ne '/bin/false') and (-x '@AVP5@')) ? '@AVP5@' : 0);
 +$Features{'Virus:KAVSCANNER'} = ((('@KAVSCANNER@' ne '/bin/false') and (-x '@KAVSCANNER@')) ? '@KAVSCANNER@' : 0);
@@ -20,12 +25,6 @@ $NetBSD: patch-ac,v 1.3 2005/12/10 22:14:15 markd Exp $
 +$Features{'Virus:CLAMD'}    = ((('@CLAMD@' ne '/bin/false') and (-x '@CLAMD@')) ? '@CLAMD@' : 0);
 +$Features{'Virus:FPROT'}    = ((('@FPROT@' ne '/bin/false') and (-x '@FPROT@')) ? '@FPROT@' : 0);
 +$Features{'Virus:FSAV'}     = ((('@FSAV@' ne '/bin/false') and (-x '@FSAV@')) ? '@FSAV@' : 0);
- $Features{'Virus:FileScan'} = 0; # Will be set by detect_and_load_perl_modules
--$Features{'Virus:HBEDV'}    = ('@HBEDV@' ne '/bin/false' ? '@HBEDV@' : 0);
--$Features{'Virus:VEXIRA'}   = ('@VEXIRA@' ne '/bin/false' ? '@VEXIRA@' : 0);
--$Features{'Virus:NAI'}      = ('@NAI@' ne '/bin/false' ? '@NAI@' : 0);
--$Features{'Virus:BDC'}      = ('@BDC@' ne '/bin/false' ? '@BDC@' : 0);
--$Features{'Virus:NVCC'}     = ('@NVCC@' ne '/bin/false' ? '@NVCC@' : 0);
 +$Features{'Virus:HBEDV'}    = ((('@HBEDV@' ne '/bin/false') and (-x '@HBEDV@')) ? '@HBEDV@' : 0);
 +$Features{'Virus:VEXIRA'}   = ((('@VEXIRA@' ne '/bin/false') and (-x '@VEXIRA@')) ? '@VEXIRA@' : 0);
 +$Features{'Virus:NAI'}      = ((('@NAI@' ne '/bin/false') and (-x '@NAI@')) ? '@NAI@' : 0);