8 files changed, 19 insertions, 19 deletions

diff --git a/mail/dsbl-testers/Makefile b/mail/dsbl-testers/Makefile
index d16fe47af619..35ee86e96296 100644
--- a/mail/dsbl-testers/Makefile
+++ b/mail/dsbl-testers/Makefile
@@ -37,12 +37,12 @@ post-patch:
 # as dictated by port's rules
 BINARY_FILES=	auth-relaytest formmailtest httptest relaytest \
 		getcookie socks4test socks5test spamtrap
-CONF_FILES=	conf/dsbl.conf
+LOCAL_CONF_FILES=	conf/dsbl.conf
 
 do-install:
 	cd ${WRKSRC} && \
 		${INSTALL_PROGRAM} ${BINARY_FILES} ${PREFIX}/bin && \
-		${INSTALL_DATA} ${CONF_FILES} ${PREFIX}/etc
+		${INSTALL_DATA} ${LOCAL_CONF_FILES} ${PREFIX}/etc
 	cd ${WRKSRC}/man && \
 		${INSTALL_MAN} ${MAN1} ${MAN1PREFIX}/man/man1 && \
 		${INSTALL_MAN} ${MAN5} ${MAN5PREFIX}/man/man5
diff --git a/mail/elm+ME/Makefile b/mail/elm+ME/Makefile
index e9eb25ab3d48..8d3aeae9af95 100644
--- a/mail/elm+ME/Makefile
+++ b/mail/elm+ME/Makefile
@@ -159,7 +159,7 @@ MIME_TYPES=	elm.mimetypes
 MIME_CSETS=	elm.mimecharsets
 TERM_INFO=	elm.terminalinfo
 ELM_RC=		elm.rc
-CONF_FILES=	${MIME_TYPES} ${MIME_CSETS} ${TERM_INFO} ${ELM_RC}
+LOCAL_CONF_FILES=	${MIME_TYPES} ${MIME_CSETS} ${TERM_INFO} ${ELM_RC}
 DOC_FILES=	MIME.txt README.ME+ \
 		doc/Alias.fmtd doc/Config.fmtd doc/Cover.fmtd \
 		doc/Form.fmtd doc/Ref.fmtd doc/Users.fmtd
@@ -238,7 +238,7 @@ create-install-dirs:
 	@${MKDIR} ${CONF_DIR} ${LIB_DIR} ${SHLIB_DIR}
 
 backup-conf-files:
-.for file in ${CONF_FILES}
+.for file in ${LOCAL_CONF_FILES}
 	@if [ -f ${LIB_DIR}/${file} ]; then \
 		${MV} ${LIB_DIR}/${file} ${CONF_DIR}/${file}.orig; \
 	elif [ -f ${CONF_DIR}/${file} ]; then \
@@ -271,13 +271,13 @@ install-mime-types:
 	@${INSTALL_DATA} ${FILESDIR}/${MIME_TYPES} ${CONF_DIR}/${MIME_TYPES}
 
 install-conf-files:
-.for file in ${CONF_FILES}
+.for file in ${LOCAL_CONF_FILES}
 	@${INSTALL_DATA} ${CONF_DIR}/${file} ${CONF_DIR}/${file}-dist
 .endfor
 
 # for instance, don't restore obsolete files :( except elm.rc :)
 restore-conf-files:
-.for file in ${ELM_RC} # ${CONF_FILES}
+.for file in ${ELM_RC} # ${LOCAL_CONF_FILES}
 	@if [ -f ${CONF_DIR}/${file}.orig ]; then \
 		${MV} ${CONF_DIR}/${file}.orig ${CONF_DIR}/${file}; \
 	fi
diff --git a/net/isc-dhcp3-server/Makefile b/net/isc-dhcp3-server/Makefile
index 05d304f6d8d2..77309c5b0304 100644
--- a/net/isc-dhcp3-server/Makefile
+++ b/net/isc-dhcp3-server/Makefile
@@ -137,7 +137,7 @@ PORTDOCS=	LICENSE README RELNOTES
 .endif
 .if ${SUBSYS} == client
 BIN_FILES=	dhclient
-CONF_FILES=	dhclient.conf
+LOCAL_CONF_FILES=	dhclient.conf
 SAMP_FILES=	client/dhclient.conf
 DATA_FILES=	dhclient.leases
 .elif ${SUBSYS} == server
@@ -329,7 +329,7 @@ install-sample-files:
 .endfor
 
 create-conf-files:
-.for f in ${CONF_FILES}
+.for f in ${LOCAL_CONF_FILES}
 .if !exists(${CONF_DIR}/${f})
 	@${TOUCH} ${CONF_DIR}/${f}
 .endif
diff --git a/net/isc-dhcp30-server/Makefile b/net/isc-dhcp30-server/Makefile
index 05d304f6d8d2..77309c5b0304 100644
--- a/net/isc-dhcp30-server/Makefile
+++ b/net/isc-dhcp30-server/Makefile
@@ -137,7 +137,7 @@ PORTDOCS=	LICENSE README RELNOTES
 .endif
 .if ${SUBSYS} == client
 BIN_FILES=	dhclient
-CONF_FILES=	dhclient.conf
+LOCAL_CONF_FILES=	dhclient.conf
 SAMP_FILES=	client/dhclient.conf
 DATA_FILES=	dhclient.leases
 .elif ${SUBSYS} == server
@@ -329,7 +329,7 @@ install-sample-files:
 .endfor
 
 create-conf-files:
-.for f in ${CONF_FILES}
+.for f in ${LOCAL_CONF_FILES}
 .if !exists(${CONF_DIR}/${f})
 	@${TOUCH} ${CONF_DIR}/${f}
 .endif
diff --git a/net/isc-dhcp31-server/Makefile b/net/isc-dhcp31-server/Makefile
index 05d304f6d8d2..77309c5b0304 100644
--- a/net/isc-dhcp31-server/Makefile
+++ b/net/isc-dhcp31-server/Makefile
@@ -137,7 +137,7 @@ PORTDOCS=	LICENSE README RELNOTES
 .endif
 .if ${SUBSYS} == client
 BIN_FILES=	dhclient
-CONF_FILES=	dhclient.conf
+LOCAL_CONF_FILES=	dhclient.conf
 SAMP_FILES=	client/dhclient.conf
 DATA_FILES=	dhclient.leases
 .elif ${SUBSYS} == server
@@ -329,7 +329,7 @@ install-sample-files:
 .endfor
 
 create-conf-files:
-.for f in ${CONF_FILES}
+.for f in ${LOCAL_CONF_FILES}
 .if !exists(${CONF_DIR}/${f})
 	@${TOUCH} ${CONF_DIR}/${f}
 .endif
diff --git a/net/isc-dhcp40-server/Makefile b/net/isc-dhcp40-server/Makefile
index 05d304f6d8d2..77309c5b0304 100644
--- a/net/isc-dhcp40-server/Makefile
+++ b/net/isc-dhcp40-server/Makefile
@@ -137,7 +137,7 @@ PORTDOCS=	LICENSE README RELNOTES
 .endif
 .if ${SUBSYS} == client
 BIN_FILES=	dhclient
-CONF_FILES=	dhclient.conf
+LOCAL_CONF_FILES=	dhclient.conf
 SAMP_FILES=	client/dhclient.conf
 DATA_FILES=	dhclient.leases
 .elif ${SUBSYS} == server
@@ -329,7 +329,7 @@ install-sample-files:
 .endfor
 
 create-conf-files:
-.for f in ${CONF_FILES}
+.for f in ${LOCAL_CONF_FILES}
 .if !exists(${CONF_DIR}/${f})
 	@${TOUCH} ${CONF_DIR}/${f}
 .endif
diff --git a/security/amap/Makefile b/security/amap/Makefile
index 0e8eab5f07f3..5432422cbec9 100644
--- a/security/amap/Makefile
+++ b/security/amap/Makefile
@@ -26,10 +26,10 @@ PORTDOCS=	README TODO CHANGES AMAP-LIB-INTERFACE
 PLIST_SUB=	AMAPLIBDIR=lib/${PORTNAME} AMAPINCDIR=include/${PORTNAME}
 
 CONF_DIR=	${PREFIX}/etc/${PORTNAME}
-CONF_FILES=	appdefs.resp appdefs.rpc appdefs.trig
+LOCAL_CONF_FILES=	appdefs.resp appdefs.rpc appdefs.trig
 
 SUB_FILES=	pkg-install pkg-deinstall
-SUB_LIST=	CONF_FILES="${CONF_FILES}" CONF_DIR="${CONF_DIR}"
+SUB_LIST=	CONF_FILES="${LOCAL_CONF_FILES}" CONF_DIR="${CONF_DIR}"
 
 post-patch:
 	@${REINPLACE_CMD} -e \
@@ -51,7 +51,7 @@ do-install:
 		${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/include/${PORTNAME}
 .	endfor
 	${MKDIR} ${CONF_DIR}
-.	for i in ${CONF_FILES}
+.	for i in ${LOCAL_CONF_FILES}
 		${INSTALL_DATA} ${WRKSRC}/${i} ${CONF_DIR}/${i}.default
 .	endfor
 	${INSTALL_MAN} ${WRKSRC}/amap.1 ${MANPREFIX}/man/man1
diff --git a/security/openscep/Makefile b/security/openscep/Makefile
index 6d4cf28a6d9f..46ff6d225c25 100644
--- a/security/openscep/Makefile
+++ b/security/openscep/Makefile
@@ -31,10 +31,10 @@ CONFIGURE_ARGS=	--with-html-install-dir="${PREFIX}/www/openscep" \
 MAKE_ENV=	CPPFLAGS="-I${LOCALBASE}/include"
 
 CONF_DIR=	${PREFIX}/etc/${PORTNAME}
-CONF_FILES=	openscep.cnf openscep.ldif openscep.schema slapd.conf
+LOCAL_CONF_FILES=	openscep.cnf openscep.ldif openscep.schema slapd.conf
 
 SUB_FILES=	pkg-deinstall pkg-install pkg-message
-SUB_LIST=	CONF_DIR="${CONF_DIR}" CONF_FILES="${CONF_FILES}"
+SUB_LIST=	CONF_DIR="${CONF_DIR}" CONF_FILES="${LOCAL_CONF_FILES}"
 
 MAN1=		derdump.1 \
 		scep.1 \