From nobody@FreeBSD.org  Wed May 18 19:46:05 2011
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1DA0D106564A
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 18 May 2011 19:46:05 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id 0F4548FC14
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 18 May 2011 19:46:05 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.4/8.14.4) with ESMTP id p4IJk4KV032648
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 18 May 2011 19:46:04 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.4/8.14.4/Submit) id p4IJk4f4032647;
	Wed, 18 May 2011 19:46:04 GMT
	(envelope-from nobody)
Message-Id: <201105181946.p4IJk4f4032647@red.freebsd.org>
Date: Wed, 18 May 2011 19:46:04 GMT
From: Chris Rees <utisoft@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: Fix port: security/clamav-devel uses CONF_FILES internally
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         157161
>Category:       ports
>Synopsis:       Fix port: security/clamav-devel uses CONF_FILES internally
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    garga
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed May 18 19:50:11 UTC 2011
>Closed-Date:    Thu May 19 11:35:48 UTC 2011
>Last-Modified:  Thu May 19 11:40:10 UTC 2011
>Originator:     Chris Rees
>Release:        
>Organization:
>Environment:
>Description:
As discussed on ports@ and with bapt, new variables CONF_FILES and CONF_DIRS are to be introduced to bsd.port.mk.

This causes problems in some ports, of which this is one.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: Makefile
===================================================================
RCS file: /exports/cvsroot-freebsd/ports/security/clamav-devel/Makefile,v
retrieving revision 1.203
diff -u -r1.203 Makefile
--- Makefile	23 Feb 2011 15:32:46 -0000	1.203
+++ Makefile	18 May 2011 18:34:47 -0000
@@ -33,7 +33,7 @@
 MAKE_JOBS_SAFE=	yes
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	clamav-clamd clamav-freshclam
-CONF_FILES=	clamd freshclam
+CLAM_CONF_FILES=	clamd freshclam
 
 LICENSE=	GPLv2
 
@@ -164,7 +164,7 @@
 
 .if defined(WITH_MILTER)
 USE_RC_SUBR+=	clamav-milter
-CONF_FILES+=	clamav-milter
+CLAM_CONF_FILES+=	clamav-milter
 . if defined(WITH_LDAP) && exists(${LOCALBASE}/lib/libldap.so)
 USE_OPENLDAP=	yes
 LDFLAGS+=	-lldap
@@ -237,7 +237,7 @@
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/clamav-config.h ${PREFIX}/include
-.for c in ${CONF_FILES}
+.for c in ${CLAM_CONF_FILES}
 	@[ -f ${PREFIX}/etc/${c}.conf ] || \
 		${CP} -v ${PREFIX}/etc/${c}.conf.default ${PREFIX}/etc/${c}.conf
 .endfor


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->garga 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Wed May 18 19:50:54 UTC 2011 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=157161 

From: Chris Rees <utisoft@gmail.com>
To: bug-followup@freebsd.org
Cc:  
Subject: Re: ports/157161: Fix port: security/clamav-devel uses CONF_FILES internally
Date: Wed, 18 May 2011 21:34:56 +0100

 Sorry, forgot to include a commit message:
 
 - Rename CONF_FILES to avoid conflict with incoming feature
 
 PR: ports/157161
 Submitted by: Chris Rees (utisoft@gmail.com)
State-Changed-From-To: open->closed 
State-Changed-By: garga 
State-Changed-When: Thu May 19 11:35:47 UTC 2011 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=157161 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/157161: commit references a PR
Date: Thu, 19 May 2011 11:35:37 +0000 (UTC)

 garga       2011-05-19 11:35:28 UTC
 
   FreeBSD ports repository
 
   Modified files:
     security/clamav      Makefile 
     security/clamav-devel Makefile 
   Log:
   - s/CONF_FILES/CLAM_CONF_FILES/ to avoid a conflict in the future with new
     options with the same name that will be added to bsd.port.mk
   
   PR:             ports/157161, ports/157162
   Submitted by:   Chris Rees <utisoft@gmail.com>
   
   Revision  Changes    Path
   1.204     +3 -3      ports/security/clamav-devel/Makefile
   1.162     +3 -3      ports/security/clamav/Makefile
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
