diff options
| author | garga <garga@FreeBSD.org> | 2011-05-19 19:35:28 +0800 |
|---|---|---|
| committer | garga <garga@FreeBSD.org> | 2011-05-19 19:35:28 +0800 |
| commit | aa05fc6afc73bf3c71bf598cdbef1c15e4fc37b3 (patch) | |
| tree | 2efe963d2cbda3d76a9ecaf0a7d366ab0dbde0a1 | |
| parent | 01f181cc963bce98b99e6a2c1c731cdab7402339 (diff) | |
| download | freebsd-ports-gnome-aa05fc6afc73bf3c71bf598cdbef1c15e4fc37b3.tar.gz freebsd-ports-gnome-aa05fc6afc73bf3c71bf598cdbef1c15e4fc37b3.tar.zst freebsd-ports-gnome-aa05fc6afc73bf3c71bf598cdbef1c15e4fc37b3.zip | |
- 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>
| -rw-r--r-- | security/clamav-devel/Makefile | 6 | ||||
| -rw-r--r-- | security/clamav/Makefile | 6 |
2 files changed, 6 insertions, 6 deletions
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 |