From reho@rx.cz  Sun Apr 16 01:54:40 2006
Return-Path: <reho@rx.cz>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id CFD6B16A402
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 16 Apr 2006 01:54:40 +0000 (UTC)
	(envelope-from reho@rx.cz)
Received: from charon.rx.cz (199.106.broadband4.iol.cz [85.71.106.199])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0C85543D6D
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 16 Apr 2006 01:54:33 +0000 (GMT)
	(envelope-from reho@rx.cz)
Received: from charon.rx.cz (localhost [127.0.0.1])
	by charon.rx.cz (8.13.4/8.13.4) with ESMTP id k3G1sVmf022143
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 16 Apr 2006 03:54:32 +0200 (CEST)
	(envelope-from reho@199.106.broadband4.iol.cz)
Received: (from root@localhost)
	by charon.rx.cz (8.13.4/8.13.4/Submit) id k3G1sV4r022142;
	Sun, 16 Apr 2006 03:54:31 +0200 (CEST)
	(envelope-from reho)
Message-Id: <200604160154.k3G1sV4r022142@charon.rx.cz>
Date: Sun, 16 Apr 2006 03:54:31 +0200 (CEST)
From: Petr Rehor <prehor@gmail.com>
Reply-To: Petr Rehor <prehor@gmail.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [maintainer update] security/amavisd-milter to 1.1.2
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         95847
>Category:       ports
>Synopsis:       [maintainer update] security/amavisd-milter to 1.1.2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Apr 16 02:00:33 GMT 2006
>Closed-Date:    Tue Apr 25 22:08:59 GMT 2006
>Last-Modified:  Tue Apr 25 22:08:59 GMT 2006
>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@marvin.rx.cz:/usr/obj/usr/src/sys/GENERIC i386
>Description:
Update amavisd-milter to 1.1.2.
>How-To-Repeat:
	
>Fix:
--- amavisd-milter.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/security/amavisd-milter/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- Makefile	17 Feb 2006 16:38:48 -0000	1.5
+++ Makefile	16 Apr 2006 01:20:48 -0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	amavisd-milter
-PORTVERSION=	1.1.1
+PORTVERSION=	1.1.2
 CATEGORIES=	security mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -14,6 +14,17 @@
 MAINTAINER=	prehor@gmail.com
 COMMENT=	Milter for amavisd-new
 
+##
+# Use the following quirks to choose which sendmail to use (ports or system):
+#
+#   WITH_SENDMAIL_BASE=yes
+# or
+#   WITH_SENDMAIL_PORT=yes
+#
+# If unspecified, check for an up-to-date system version but give an
+# installed port preference over it.
+##
+
 RUN_DEPENDS=	amavisd:${PORTSDIR}/security/amavisd-new
 
 # Shared defaults with security/amavisd-new
@@ -21,7 +32,7 @@
 AMAVISDIR?=	/var/amavis
 
 GNU_CONFIGURE=	yes
-USE_RCORDER=	${PORTNAME}.sh
+USE_RC_SUBR=	${PORTNAME}.sh
 
 SUB_FILES=	pkg-message
 SUB_LIST=	AMAVISUSER=${AMAVISUSER} \
@@ -34,6 +45,23 @@
 
 MAN8=		amavisd-milter.8
 
+.include <bsd.port.pre.mk>
+
+.if !defined(WITH_SENDMAIL_BASE) && \
+    !defined(WITH_SENDMAIL_PORT) && \
+    !exists(${LOCALBASE}/lib/libmilter.a)
+WITH_SENDMAIL_BASE=yes
+.endif
+
+.if defined(WITH_SENDMAIL_BASE)
+.if !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}
+.endif
+
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
@@ -43,4 +71,4 @@
 .endif
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/security/amavisd-milter/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- distinfo	17 Feb 2006 16:38:48 -0000	1.5
+++ distinfo	16 Apr 2006 01:16:10 -0000
@@ -1,3 +1,3 @@
-MD5 (amavisd-milter-1.1.1.tar.gz) = 4f5a724a53b28ed745b87681d381395c
-SHA256 (amavisd-milter-1.1.1.tar.gz) = b8da06549f068685de26664fe1e9c444cc02c9f479dae1ce43f4e9c99603e7fe
-SIZE (amavisd-milter-1.1.1.tar.gz) = 146409
+MD5 (amavisd-milter-1.1.2.tar.gz) = d6d091c061dda0625d0c492628d94747
+SHA256 (amavisd-milter-1.1.2.tar.gz) = 2db99d639b9cbcd59161c4bd1c8dea60198d6f91cd520dc1d1c93785abe30506
+SIZE (amavisd-milter-1.1.2.tar.gz) = 148064
--- amavisd-milter.diff ends here ---


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: pav 
State-Changed-When: Tue Apr 25 22:08:51 UTC 2006 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=95847 
>Unformatted:
