ports/116075: [maintainer update] security/amavisd-milter to 1.3.0

[Petr Rehor]

>Number:         116075
>Category:       ports
>Synopsis:       [maintainer update] security/amavisd-milter to 1.3.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Sep 04 09:50:00 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Petr Rehor
>Release:        FreeBSD 6.0-RELEASE-c3 i386
>Organization:
>Environment:
System: FreeBSD charon.rx.cz 6.0-RELEASE-c3 FreeBSD 6.0-RELEASE-c3 #0: Tue Nov 8 20:44:39 UTC 2005 root at marvin.rx.cz:/usr/obj/usr/src/sys/GENERIC i386
>Description:
Update amavisd-milter to 1.3.0 and fix ports/115270: security/amavisd-milter
does not work when using sendmail from ports.
>How-To-Repeat:
	
>Fix:
Patch attached with submission follows.


--- amavisd-milter.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/security/amavisd-milter/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- Makefile	21 Dec 2006 15:30:10 -0000	1.8
+++ Makefile	3 Sep 2007 18:40:23 -0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	amavisd-milter
-PORTVERSION=	1.2.1
+PORTVERSION=	1.3.0
 CATEGORIES=	security mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -48,19 +48,14 @@
 
 .include <bsd.port.pre.mk>
 
-.if !defined(WITH_SENDMAIL_BASE) && \
-    !defined(WITH_SENDMAIL_PORT) && \
-    !exists(${LOCALBASE}/lib/libmilter.a)
-WITH_SENDMAIL_BASE=yes
-.endif
+.include "${PORTSDIR}/mail/sendmail/bsd.milter.mk"
 
-.if defined(WITH_SENDMAIL_BASE)
-.if !exists(/usr/lib/libmilter.a)
+.if defined(WITH_SENDMAIL_BASE) && !exists(/usr/lib/libmilter.a)
 BROKEN=		Base system sendmail not found or too old, rebuild with WITH_SENDMAIL_PORT=yes
 .endif
-.else
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libmilter.a:${PORTSDIR}/mail/sendmail
-CONFIGURE_ARGS+=--with-sendmail=${LOCALBASE}
+
+.if defined(WITH_SENDMAIL_PORT)
+CONFIGURE_ARGS+=--with-sendmail=${MILTERBASE}
 .endif
 
 post-install:
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/security/amavisd-milter/distinfo,v
retrieving revision 1.8
diff -u -r1.8 distinfo
--- distinfo	21 Dec 2006 15:30:10 -0000	1.8
+++ distinfo	3 Sep 2007 17:36:28 -0000
@@ -1,3 +1,3 @@
-MD5 (amavisd-milter-1.2.1.tar.gz) = 920b4d9db48da287395b2b0312968bc1
-SHA256 (amavisd-milter-1.2.1.tar.gz) = bebed14fa28afae4269dd18d5c2f79549a4551d46480859e0ed7627bf7ab12d1
-SIZE (amavisd-milter-1.2.1.tar.gz) = 157587
+MD5 (amavisd-milter-1.3.0.tar.gz) = 35e9eaa71dbc1a30ea2d4fb07d79c92b
+SHA256 (amavisd-milter-1.3.0.tar.gz) = 565a0c7b3c6432805f73e34bbcf2c76afcb7a3fe0b53b7fae43581b8230e0671
+SIZE (amavisd-milter-1.3.0.tar.gz) = 159265
--- amavisd-milter.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: