svn commit: r371495 - in head/mail/spamass-milter: . files

[Bruce A. Mah]

Author: bmah
Date: Sun Oct 26 03:25:50 2014
New Revision: 371495
URL: https://svnweb.freebsd.org/changeset/ports/371495
QAT: https://qat.redports.org/buildarchive/r371495/

Log:
  Update mail/spamass-milter to 0.4.0.
  
  Brief summary of changes (taken from upstream release announcement):
  
  - -C option to change the default reject code
  - -S option to specify a path to sendmail (for the -x option)
  - -R option to specify the rejection message
  - -a option to skip messages that were authenticated
  - IPv6 address support
  - zombie process fix for the - option introduced in 0.3.2
  
  Some of these changes (notably the -R and -a flags and the IPv6
  support) were previously included in the port via patch files, which
  are now unneeded and have been removed.

Deleted:
  head/mail/spamass-milter/files/extra-patch-addauth
  head/mail/spamass-milter/files/extra-patch-ipv6
  head/mail/spamass-milter/files/extra-patch-options
  head/mail/spamass-milter/files/extra-patch-rejecttext1
Modified:
  head/mail/spamass-milter/Makefile
  head/mail/spamass-milter/distinfo

Modified: head/mail/spamass-milter/Makefile
==============================================================================
--- head/mail/spamass-milter/Makefile	Sun Oct 26 00:15:42 2014	(r371494)
+++ head/mail/spamass-milter/Makefile	Sun Oct 26 03:25:50 2014	(r371495)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	spamass-milter
-PORTVERSION=	0.3.2
-PORTREVISION=	1
+PORTVERSION=	0.4.0
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	spamass-milt
@@ -17,35 +16,11 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 LICENSE=	GPLv2
 
 
-OPTIONS_DEFINE=	ADDAUTH_PATCH REJECTTEXT_PATCH LDAP SENDMAIL_PORT IPV6 DOCS
-ADDAUTH_PATCH_DESC=	Bypass checks for SMTP AUTH connections
-REJECTTEXT_PATCH_DESC=	Customize SMTP reject message
+OPTIONS_DEFINE=	LDAP SENDMAIL_PORT DOCS
 SENDMAIL_PORT_DESC=	Build against sendmail port
 
 .include <bsd.port.pre.mk>
 
-ORIG_ARGS=	fd:mMp:P:r:u:D:i:b:B:e:x
-NEW_ARGS:=	${ORIG_ARGS}
-
-.if ${PORT_OPTIONS:MADDAUTH_PATCH}
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-addauth
-NEW_ARGS:=	${NEW_ARGS}a
-.endif
-
-.if ${PORT_OPTIONS:MREJECTTEXT_PATCH}
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-rejecttext1
-NEW_ARGS:=	${NEW_ARGS}R:
-.endif
-
-.if ${PORT_OPTIONS:MIPV6}
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-ipv6
-.endif
-
-# extra-patch-options is modified in pre-patch
-.if ${ORIG_ARGS} != ${NEW_ARGS}
-EXTRA_PATCHES+=	${WRKDIR}/extra-patch-options
-.endif
-
 .if exists(${LOCALBASE}/lib/libldap.so)
 WITH_LDAP=yes
 .undef WITHOUT_LDAP
@@ -66,11 +41,6 @@ GNU_CONFIGURE=	yes
 
 SUB_FILES=	pkg-message
 
-pre-patch:
-.if ${ORIG_ARGS} != ${NEW_ARGS}
-	@${SED} -e 's|%NEW_ARGS%|${NEW_ARGS}|' ${FILESDIR}/extra-patch-options > ${WRKDIR}/extra-patch-options
-.endif
-
 post-patch:
 	@${SED} -e's,%%PREFIX%%,${PREFIX},g' \
 		${FILESDIR}/activation.txt > ${WRKDIR}/activation.txt

Modified: head/mail/spamass-milter/distinfo
==============================================================================
--- head/mail/spamass-milter/distinfo	Sun Oct 26 00:15:42 2014	(r371494)
+++ head/mail/spamass-milter/distinfo	Sun Oct 26 03:25:50 2014	(r371495)
@@ -1,2 +1,2 @@
-SHA256 (spamass-milter-0.3.2.tar.gz) = c14b9021092f8c5408df1db25e5645db4cba5bac5ba487175230696a99d269cc
-SIZE (spamass-milter-0.3.2.tar.gz) = 154579
+SHA256 (spamass-milter-0.4.0.tar.gz) = 782f1bb3b08a0447cd51ad4b64e7506926739fa9cce537f3cc62aa9b24d46b07
+SIZE (spamass-milter-0.4.0.tar.gz) = 158646