update amavisd-new to the latest version

remove the milter option since it is no longer contained in the software

1 files changed, 2 insertions, 35 deletions

diff --git a/mail/amavisd-new/Makefile b/mail/amavisd-new/Makefile
index 980cb3a31e3..21384aaa4cb 100644
--- a/mail/amavisd-new/Makefile
+++ b/mail/amavisd-new/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2016/07/09 06:38:27 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2016/09/14 18:20:30 spz Exp $
 
 DISTNAME=	amavisd-new-${VERSION}${PATCHLEVEL}
 PKGNAME=	amavisd-new-${VERSION}${PATCHLEVEL:S/-//}
-PKGREVISION=	1
 CATEGORIES=	mail security
 MASTER_SITES=	http://www.ijs.si/software/amavisd/ \
 		http://mirrors.catpipe.net/amavisd-new/ \
@@ -16,16 +15,13 @@ HOMEPAGE=	http://www.ijs.si/software/amavisd/
 COMMENT=	Daemonized interface between MTA and content checkers
 LICENSE=	gnu-gpl-v2
 
-VERSION=	2.10.1
+VERSION=	2.11.0
 PATCHLEVEL=	# empty
 
-#DEPENDS+=	{perl>=5.9.3,p5-Archive-Tar-[0-9]*}:../../archivers/p5-Archive-Tar
 DEPENDS+=	p5-Archive-Zip>=1.14:../../archivers/p5-Archive-Zip
 DEPENDS+=	p5-BerkeleyDB-[0-9]*:../../databases/p5-BerkeleyDB
-#DEPENDS+=	{perl>=5.10.1,p5-IO-Compress>=2.017}:../../devel/p5-IO-Compress	# Compress::Raw::Zlib>=2.017
 DEPENDS+=	p5-Convert-TNEF-[0-9]*:../../converters/p5-Convert-TNEF
 DEPENDS+=	p5-Convert-UUlib>=1.05:../../converters/p5-Convert-UUlib
-#DEPENDS+=	{perl>=5.8.1,p5-Digest-MD5>=2.22}:../../security/p5-Digest-MD5
 DEPENDS+=	p5-File-LibMagic>=1.0:../../devel/p5-File-LibMagic
 DEPENDS+=	p5-Mail-DKIM>=0.31:../../mail/p5-Mail-DKIM
 DEPENDS+=	p5-MIME-tools>=5.417:../../mail/p5-MIME-tools
@@ -33,7 +29,6 @@ DEPENDS+=	p5-MailTools>=1.58:../../mail/p5-MailTools
 DEPENDS+=	p5-Net-LibIDN-[0-9]*:../../net/p5-Net-LibIDN
 DEPENDS+=	p5-IO-stringy-[0-9]*:../../devel/p5-IO-stringy
 DEPENDS+=	p5-Net-Server>=0.88:../../net/p5-Net-Server
-#DEPENDS+=	{perl>=5.8.1,p5-Time-HiRes>=1.49}:../../time/p5-Time-HiRes
 DEPENDS+=	p5-Unix-Syslog-[0-9]*:../../sysutils/p5-Unix-Syslog
 
 WRKSRC=		${WRKDIR}/amavisd-new-${VERSION}
@@ -81,33 +76,9 @@ RCD_SCRIPTS=	amavisd
 SMF_NAME=	amavisd
 CONF_FILES=	${EGDIR}/amavisd.conf-minimal ${PKG_SYSCONFDIR}/amavisd.conf
 
-PKG_OPTIONS_VAR=	PKG_OPTIONS.amavisd-new
-PKG_SUPPORTED_OPTIONS=	milter
-
-.include "../../mk/bsd.options.mk"
-
-PLIST_VARS+=		milter
-.if !empty(PKG_OPTIONS:Mmilter)
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--with-runtime-dir=${AMAVIS_DIR}
-CONFIGURE_ARGS+=	--with-sockname=${AMAVIS_DIR}/amavisd.sock
-CONFIGURE_ARGS+=	--with-user=${AMAVIS_USER}
-CONFIGURE_ARGS+=	--with-milterinc=${BUILDLINK_PREFIX.libmilter}/include
-CONFIGURE_ARGS+=	--with-milterlib=${BUILDLINK_PREFIX.libmilter}/lib
-CONFIGURE_DIRS=		helper-progs
-BUILD_DIRS=		helper-progs
-RCD_SCRIPTS+=		amavismilter
-MESSAGE_SRC+=		${PKGDIR}/MESSAGE.milter
-PLIST.milter=		yes
-
-PTHREAD_OPTS+=		require native	# doesn't work with pth
-.  include "../../mail/libmilter/buildlink3.mk"
-.  include "../../mk/pthread.buildlink3.mk"
-.else
 USE_LANGUAGES=		# none, not even C
 
 do-build:	replace-interpreter
-.endif
 
 SUBST_CLASSES+=		amavisd
 SUBST_STAGE.amavisd=	pre-build
@@ -123,10 +94,6 @@ SUBST_SED.amavisd+=	-e "s|@PREFIX@|${PREFIX}|g"
 INSTALLATION_DIRS+=	sbin ${DOCDIR} ${EGDIR}
 
 do-install:
-.if !empty(PKG_OPTIONS:Mmilter)
-	${INSTALL_PROGRAM} ${WRKSRC}/helper-progs/amavis ${DESTDIR}${PREFIX}/sbin
-	${INSTALL_PROGRAM} ${WRKSRC}/helper-progs/amavis-milter ${DESTDIR}${PREFIX}/sbin
-.endif
 	${INSTALL_SCRIPT} ${WRKSRC}/amavisd ${DESTDIR}${PREFIX}/sbin/amavisd
 	${INSTALL_SCRIPT} ${WRKSRC}/amavisd-nanny ${DESTDIR}${PREFIX}/sbin/amavisd-nanny
 	${INSTALL_SCRIPT} ${WRKSRC}/amavisd-release ${DESTDIR}${PREFIX}/sbin/amavisd-release