ports/157162: Fix port: security/clamav uses CONF_FILES internally

[Chris Rees]

>Number:         157162
>Category:       ports
>Synopsis:       Fix port: security/clamav uses CONF_FILES internally
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed May 18 19:50:12 UTC 2011
>Closed-Date:
>Last-Modified:
>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/Makefile,v
retrieving revision 1.161
diff -u -r1.161 Makefile
--- Makefile	23 Feb 2011 15:14:35 -0000	1.161
+++ Makefile	18 May 2011 18:37:15 -0000
@@ -31,7 +31,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
 
@@ -159,7 +159,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
@@ -236,7 +236,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:
>Unformatted: