From owner-cvs-ports@FreeBSD.ORG  Tue Feb 24 12:26:29 2009
Return-Path: <owner-cvs-ports@FreeBSD.ORG>
Delivered-To: cvs-ports@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0C8EF1065674;
	Tue, 24 Feb 2009 12:26:29 +0000 (UTC) (envelope-from flo@kasimir.com)
Received: from mail.solomo.de (mail.solomo.de [85.214.49.72])
	by mx1.freebsd.org (Postfix) with ESMTP id B4B688FC12;
	Tue, 24 Feb 2009 12:26:28 +0000 (UTC) (envelope-from flo@kasimir.com)
Received: from localhost (localhost [127.0.0.1])
	by mail.solomo.de (Postfix) with ESMTP id 903303F49E;
	Tue, 24 Feb 2009 13:16:22 +0100 (CET)
X-Virus-Scanned: amavisd-new at vistream.de
Received: from mail.solomo.de ([127.0.0.1])
	by localhost (mail.solomo.de [127.0.0.1]) (amavisd-new, port 10024)
	with LMTP id HzVExWAQIqiJ; Tue, 24 Feb 2009 13:16:20 +0100 (CET)
Received: from nibbler.vistream.local (relay3.vistream.de [87.139.10.28])
	(using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits))
	(No client certificate requested)
	by mail.solomo.de (Postfix) with ESMTPSA id EEC3E3F454;
	Tue, 24 Feb 2009 13:16:19 +0100 (CET)
Message-ID: <49A3E513.8050209@kasimir.com>
Date: Tue, 24 Feb 2009 13:16:19 +0100
From: Florian Smeets <flo@kasimir.com>
User-Agent: Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.5; en-US;
	rv:1.9.1b3pre) Gecko/20090223 Shredder/3.0b3pre
MIME-Version: 1.0
To: Gabor Kovesdan <gabor@FreeBSD.org>
References: <200902231153.n1NBr9u2024662@repoman.freebsd.org>
In-Reply-To: <200902231153.n1NBr9u2024662@repoman.freebsd.org>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Cc: cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org, ports-committers@FreeBSD.org
Subject: Re: cvs commit: ports/security/amavisd-new Makefile
 ports/security/amavisd-new/files amavisd.sh.in patch-amavisd
X-BeenThere: cvs-ports@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the ports tree <cvs-ports.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-ports>,
	<mailto:cvs-ports-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-ports>
List-Post: <mailto:cvs-ports@freebsd.org>
List-Help: <mailto:cvs-ports-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-ports>,
	<mailto:cvs-ports-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 24 Feb 2009 12:26:29 -0000

On 23.02.2009 12:53 Uhr, Gabor Kovesdan wrote:
> gabor       2009-02-23 11:53:09 UTC
>
>    FreeBSD ports repository
>
>    Modified files:
>      security/amavisd-new Makefile
>      security/amavisd-new/files amavisd.sh.in
>    Added files:
>      security/amavisd-new/files patch-amavisd

With the addition of the patch-amavisd file amavisd is looking for it's 
config file in /usr/local/usr/local/etc/amavisd.conf as the patch file 
changes @config_files to

-push(@config_files, '/etc/amavisd.conf')  if !@config_files;
+push(@config_files, '/usr/local/etc/amavisd.conf')  if !@config_files;

and in the Makefile we have

         @${REINPLACE_CMD} -e 
"s|/etc/amavisd.conf|${PREFIX}/etc/amavisd.conf|" \
                                 -e "s|/usr/bin/perl|${PERL}|" \
                         ${WRKSRC}/amavisd


The result look like this:

push(@config_files, '/usr/local/usr/local/etc/amavisd.conf')  if 
!@config_files;

One of the two has to go.

Cheers,
Florian