change maintainer (with ack from the previous one)

update to 2.7.0. Excerpt from the release notes:

NEW FEATURES SUMMARY

- significant improvements affecting a pre-queue content filtering setup
  (time limiting, warm/flying restart, ...) - requires Postfix 2.7.0 and
  SpamAssassin 3.3.0, or later;

- new daemon amavisd-signer makes it possible to sign mail with DKIM
  signatures without requiring amavisd process to have access to private
  signing keys;

- added support for the Sophos-SSSP, Avira SAVAPI and ClamAV clamd streaming
  protocols allows amavisd to communicate with these antivirus solutions;

- allow specifying multiple (fail-over) back-end mailers for resubmission
  of messages from amavisd back to MTA;

- support for Postfix 2.8.0 XFORWARD IDENT, passes a local message identifier
  (queue id) downstream to a post-queue content filter and back to Postfix;

- speedup in data transfer rate on receiving large mail via SMTP/LMTP
  sessions by a factor of 3.9 for plain text sessions, and by a factor
  of 11 for encrypted (TLS) sessions;

- recognize and insert header fields as prepared by SpamAssassin 3.3.0
  or later through its 'add_header' configuration option;

- a new setting allows a forward_method to be chosen based on a message
  content type and/or recipient address; this may be useful for outgoing
  mail routing purposes or to implement sender reputation schemes;

- per-recipient (or per- policy bank) SpamAssassin configuration files or
  SQL configuration sets are supported (@sa_userconf_maps), and per-recipient
  SQL Bayes database usernames (@sa_username_maps);

- new macros: client_helo, client_addr, client_port, client_addr_port,
  mime2utf8, rusage, ADDEDHEADERHAM, ADDEDHEADERSPAM, banned_parts_as_attr,
  actions_performed, new arguments to macros dkim, header_field, HEADER,
  YESNO and YESNOCAPS;

- @listen_sockets setting offers a unified configuration of listening
  sockets; it may be configured directly, or the traditional way: the
  $inet_socket_port, $unix_socketname and $inet_socket_bind just add their
  entries to the @listen_sockets list;

- lists of lookup tables (the @*_maps variables) can now contain
  explicit SQL and LDAP lookup objects as their elements, instead of
  (or in addition to) the implied SQL and LDAP lookups;

- a new configuration variable @virus_name_to_policy_bank_maps allows
  loading of policy banks based on a virus name;

- a new configuration variable $mail_id_size_bits allows setting the size
  of randomly generated mail_id and secret_id codes;

- a new configuration variable $sql_store_info_for_all_msgs allows storing
  information on mail messages selectively just for quarantined messages;

- added SNMP counters InMsgsStatus* which combine the final mail checking
  status with a direction of a mail flow;

- optional transparent archival quarantine, retaining envelope recipient
  addresses on delivery to a dedicated SMTP server;

3 files changed, 9 insertions, 10 deletions

diff --git a/mail/amavisd-new/Makefile b/mail/amavisd-new/Makefile
index a95da544e0c..b21b725f7f5 100644
--- a/mail/amavisd-new/Makefile
+++ b/mail/amavisd-new/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2010/12/24 07:19:35 kefren Exp $
+# $NetBSD: Makefile,v 1.4 2011/10/25 20:33:07 spz Exp $
 
 DISTNAME=	amavisd-new-${VERSION}${PATCHLEVEL}
 PKGNAME=	amavisd-new-${VERSION}${PATCHLEVEL:S/-//}
@@ -9,12 +9,12 @@ MASTER_SITES=	http://www.ijs.si/software/amavisd/ \
 		http://mirror.cedratnet.com/amavisd-new/ \
 		http://mirror.omroep.nl/amavisd-new/
 
-MAINTAINER=	jdunn@aquezada.com
+MAINTAINER=	spz@NetBSD.org
 HOMEPAGE=	http://www.ijs.si/software/amavisd/
 COMMENT=	Daemonized interface between MTA and content checkers
 LICENSE=	gnu-gpl-v2
 
-VERSION=	2.6.4
+VERSION=	2.7.0
 PATCHLEVEL=	# empty
 
 PKG_DESTDIR_SUPPORT=	user-destdir
@@ -54,6 +54,7 @@ MESSAGE_SRC=		${PKGDIR}/MESSAGE
 
 PKG_GROUPS_VARS+=	AMAVIS_GROUP
 PKG_USERS_VARS+=	AMAVIS_USER
+BUILD_DEFS+=		VARBASE
 BUILD_DEFS+=		AMAVIS_DIR AMAVIS_QUARANTINE
 FILES_SUBST+=		AMAVIS_USER=${AMAVIS_USER}
 FILES_SUBST+=		AMAVIS_GROUP=${AMAVIS_GROUP}
@@ -133,6 +134,5 @@ do-install:
 	done
 	${INSTALL_DATA} ${WRKSRC}/amavisd.conf ${DESTDIR}${EGDIR}/amavisd.conf-minimal
 	${INSTALL_DATA} ${WRKSRC}/amavisd.conf-default ${DESTDIR}${EGDIR}
-	${INSTALL_DATA} ${WRKSRC}/amavisd.conf-sample ${DESTDIR}${EGDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/amavisd-new/PLIST b/mail/amavisd-new/PLIST
index c72d235a3be..61254b1d7a0 100644
--- a/mail/amavisd-new/PLIST
+++ b/mail/amavisd-new/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2010/12/24 07:19:35 kefren Exp $
+@comment $NetBSD: PLIST,v 1.4 2011/10/25 20:33:07 spz Exp $
 ${PLIST.milter}sbin/amavis
 ${PLIST.milter}sbin/amavis-milter
 sbin/amavisd
@@ -40,6 +40,5 @@ share/doc/amavisd-new/RELEASE_NOTES
 share/doc/amavisd-new/amavisd-new-docs.html
 share/examples/amavisd-new/amavisd.conf-default
 share/examples/amavisd-new/amavisd.conf-minimal
-share/examples/amavisd-new/amavisd.conf-sample
 share/examples/rc.d/amavisd
 ${PLIST.milter}share/examples/rc.d/amavismilter
diff --git a/mail/amavisd-new/distinfo b/mail/amavisd-new/distinfo
index 5aecd0f64e5..0491baa1a70 100644
--- a/mail/amavisd-new/distinfo
+++ b/mail/amavisd-new/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2010/12/24 07:19:35 kefren Exp $
+$NetBSD: distinfo,v 1.4 2011/10/25 20:33:07 spz Exp $
 
-SHA1 (amavisd-new-2.6.4.tar.gz) = 993b7ca839ce038fd13f65351950f0ef03d99ff9
-RMD160 (amavisd-new-2.6.4.tar.gz) = 010dd9bf49a3c7553996c49553fd0fa84ca7bdab
-Size (amavisd-new-2.6.4.tar.gz) = 947596 bytes
+SHA1 (amavisd-new-2.7.0.tar.gz) = b4ba0a4e9d3fbbfc6a790e81837a8b7eb9480f47
+RMD160 (amavisd-new-2.7.0.tar.gz) = b869dd41cfd56b1855a42edc285276016f663c5c
+Size (amavisd-new-2.7.0.tar.gz) = 941811 bytes
 SHA1 (patch-aa) = d8bc17da9b1d3ef883331d462ee06d534f5ff5b0