From aa05fc6afc73bf3c71bf598cdbef1c15e4fc37b3 Mon Sep 17 00:00:00 2001 From: garga Date: Thu, 19 May 2011 11:35:28 +0000 Subject: - 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 --- security/clamav-devel/Makefile | 6 +++--- security/clamav/Makefile | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'security') diff --git a/security/clamav-devel/Makefile b/security/clamav-devel/Makefile index b4c79f70b383..171a5640ca97 100644 --- a/security/clamav-devel/Makefile +++ b/security/clamav-devel/Makefile @@ -33,7 +33,7 @@ GNU_CONFIGURE= yes 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 @@ CONFIGURE_ARGS+=--disable-llvm .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 @@ pre-su-install: 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 diff --git a/security/clamav/Makefile b/security/clamav/Makefile index 1fca015f926a..de0230bb17ea 100644 --- a/security/clamav/Makefile +++ b/security/clamav/Makefile @@ -31,7 +31,7 @@ GNU_CONFIGURE= yes 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 @@ CONFIGURE_ARGS+=--disable-llvm .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 @@ pre-su-install: 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 -- cgit merge-4.6.2 FreeBSD GNOME current development ports (https://github.com/freebsd/freebsd-ports-gnome)
aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* - Set CONFLICTS with unzip-iconv upcoming as a new porttota2011-05-051-1/+1
* - Unbreakpav2011-03-172-22/+20
* - Mark BROKEN: does not patchpav2009-11-071-0/+2