From owner-freebsd-ports-bugs@FreeBSD.ORG Wed May 18 19:50:12 2011 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A9704106568A for ; Wed, 18 May 2011 19:50:12 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 6F41D8FC13 for ; Wed, 18 May 2011 19:50:12 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p4IJoCUE033957 for ; Wed, 18 May 2011 19:50:12 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p4IJoCeX033956; Wed, 18 May 2011 19:50:12 GMT (envelope-from gnats) Resent-Date: Wed, 18 May 2011 19:50:12 GMT Resent-Message-Id: <201105181950.p4IJoCeX033956@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, Chris Rees Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1111A1065678 for ; Wed, 18 May 2011 19:46:31 +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 031048FC1B for ; Wed, 18 May 2011 19:46:31 +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 p4IJkU2S032692 for ; Wed, 18 May 2011 19:46:30 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.4/8.14.4/Submit) id p4IJkUkt032691; Wed, 18 May 2011 19:46:30 GMT (envelope-from nobody) Message-Id: <201105181946.p4IJkUkt032691@red.freebsd.org> Date: Wed, 18 May 2011 19:46:30 GMT From: Chris Rees To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/157162: Fix port: security/clamav uses CONF_FILES internally X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 May 2011 19:50:12 -0000 >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: