From owner-freebsd-ports-bugs@FreeBSD.ORG  Sun Jul 17 13:30:13 2005
Return-Path: <owner-freebsd-ports-bugs@FreeBSD.ORG>
X-Original-To: freebsd-ports-bugs@hub.freebsd.org
Delivered-To: freebsd-ports-bugs@hub.freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 6226D16A41C
	for <freebsd-ports-bugs@hub.freebsd.org>;
	Sun, 17 Jul 2005 13:30:13 +0000 (GMT)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP id E9AF943D49
	for <freebsd-ports-bugs@hub.freebsd.org>;
	Sun, 17 Jul 2005 13:30:12 +0000 (GMT)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1])
	by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j6HDUC4R021794
	for <freebsd-ports-bugs@freefall.freebsd.org>;
	Sun, 17 Jul 2005 13:30:12 GMT
	(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j6HDUC30021790;
	Sun, 17 Jul 2005 13:30:12 GMT (envelope-from gnats)
Resent-Date: Sun, 17 Jul 2005 13:30:12 GMT
Resent-Message-Id: <200507171330.j6HDUC30021790@freefall.freebsd.org>
Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer)
Resent-To: freebsd-ports-bugs@FreeBSD.org
Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org,
	Blaz Zupan <blaz@si.FreeBSD.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 984FA16A41C
	for <FreeBSD-gnats-submit@freebsd.org>;
	Sun, 17 Jul 2005 13:27:19 +0000 (GMT)
	(envelope-from blaz@titanic.medinet.si)
Received: from titanic.medinet.si (titanic.medinet.si [212.18.42.5])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 44D7643D49
	for <FreeBSD-gnats-submit@freebsd.org>;
	Sun, 17 Jul 2005 13:27:19 +0000 (GMT)
	(envelope-from blaz@titanic.medinet.si)
Received: by titanic.medinet.si (Postfix, from userid 1000)
	id 6B68455475; Sun, 17 Jul 2005 15:27:17 +0200 (CEST)
Message-Id: <20050717132717.6B68455475@titanic.medinet.si>
Date: Sun, 17 Jul 2005 15:27:17 +0200 (CEST)
From: Blaz Zupan <blaz@si.FreeBSD.org>
To: FreeBSD-gnats-submit@FreeBSD.org
X-Send-Pr-Version: 3.113
Cc: 
Subject: ports/83604: MAINTAINER UPDATE: fix for security/amavisd-new
	installation on 4.11
X-BeenThere: freebsd-ports-bugs@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: Blaz Zupan <blaz@si.FreeBSD.org>
List-Id: Ports bug reports <freebsd-ports-bugs.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports-bugs>, 
	<mailto:freebsd-ports-bugs-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-ports-bugs>
List-Post: <mailto:freebsd-ports-bugs@freebsd.org>
List-Help: <mailto:freebsd-ports-bugs-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports-bugs>, 
	<mailto:freebsd-ports-bugs-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 17 Jul 2005 13:30:13 -0000


>Number:         83604
>Category:       ports
>Synopsis:       MAINTAINER UPDATE: fix for security/amavisd-new installation on 4.11
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jul 17 13:30:12 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Blaz Zupan
>Release:        FreeBSD 4.11-RELEASE i386
>Organization:
>Environment:

	
>Description:

Installation of port fails on FreeBSD 4.11 if sendmail milter support is
enabled, because the startup script is installed to /etc/rc.d instead of
/usr/local/etc/rc.d.

>How-To-Repeat:
	
>Fix:

diff -urN amavisd-new.orig/Makefile amavisd-new/Makefile
--- amavisd-new.orig/Makefile	Wed Jul  6 10:47:09 2005
+++ amavisd-new/Makefile	Sun Jul 17 15:21:08 2005
@@ -8,6 +8,7 @@
 
 PORTNAME=	amavisd-new
 PORTVERSION=	2.3.2
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	security
 MASTER_SITES=	http://www.ijs.si/software/amavisd/ \
@@ -77,7 +78,11 @@
 .endif
 
 .if defined(WITH_MILTER) && !defined(AMAVIS_NOAMAVIS)
+.if ${OSVERSION} >= 500037
 USE_RCORDER+=	amavis-milter.sh
+.else
+USE_RC_SUBR+=	amavis-milter.sh
+.endif
 .else
 AMAVIS_NOMILTER="@comment "
 .endif
>Release-Note:
>Audit-Trail:
>Unformatted: