aboutsummaryrefslogtreecommitdiffstats
path: root/sysutils
diff options
context:
space:
mode:
authorsunpoet <sunpoet@FreeBSD.org>2013-10-10 15:12:14 +0800
committersunpoet <sunpoet@FreeBSD.org>2013-10-10 15:12:14 +0800
commit8d114d93a750551e98f009bcf1159da719d8fd10 (patch)
treef29a75eff2db98cd458872afdb2dc222bea1d8d7 /sysutils
parent65d2e45c5abda51965aa1d349b4277d627432c99 (diff)
downloadfreebsd-ports-gnome-8d114d93a750551e98f009bcf1159da719d8fd10.tar.gz
freebsd-ports-gnome-8d114d93a750551e98f009bcf1159da719d8fd10.tar.zst
freebsd-ports-gnome-8d114d93a750551e98f009bcf1159da719d8fd10.zip
- Remove CONF_DIR
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/freeipmi/Makefile6
-rw-r--r--sysutils/freeipmi/pkg-plist16
2 files changed, 10 insertions, 12 deletions
diff --git a/sysutils/freeipmi/Makefile b/sysutils/freeipmi/Makefile
index 5614158f098a..e8a7d4d3f1b9 100644
--- a/sysutils/freeipmi/Makefile
+++ b/sysutils/freeipmi/Makefile
@@ -20,7 +20,7 @@ IOPERM_DESC= Use i386_set_ioperm (i386/amd64 only)
CONFIGURE_ARGS= --disable-init-scripts \
--localstatedir=/var \
- --sysconfdir=${CONF_DIR} \
+ --sysconfdir=${ETCDIR} \
--with-ipmi-monitoring-sdr-cache-dir=${CACHE_DIR}/ipmimonitoringsdrcache \
--with-pkgconfig-dir=${PREFIX}/libdata/pkgconfig
CONFIGURE_ENV= PTHREAD_LIBS=-pthread ac_cv_path_CPP=${CPP}
@@ -50,11 +50,9 @@ MAN8= bmc-config.8 bmc-device.8 bmc-info.8 bmc-watchdog.8 \
ipmiconsole.8 ipmidetect.8 ipmidetectd.8 ipmimonitoring.8 \
ipmiping.8 ipmipower.8 ipmiseld.8 pef-config.8 rmcp-ping.8 \
rmcpping.8
-PLIST_SUB= CACHE_DIR=${CACHE_DIR} CONF_DIR=${ETCDIR:S/^${PREFIX}\///} \
- LOG_DIR=${LOG_DIR} RUN_DIR=${RUN_DIR}
+PLIST_SUB= CACHE_DIR=${CACHE_DIR} LOG_DIR=${LOG_DIR} RUN_DIR=${RUN_DIR}
CACHE_DIR?= /var/db/${PORTNAME}
-CONF_DIR?= ${ETCDIR}
LOG_DIR= /var/log/${PORTNAME}
RUN_DIR= /var/lib/${PORTNAME}
diff --git a/sysutils/freeipmi/pkg-plist b/sysutils/freeipmi/pkg-plist
index 919d44e7b789..527da1ddc2cb 100644
--- a/sysutils/freeipmi/pkg-plist
+++ b/sysutils/freeipmi/pkg-plist
@@ -1,10 +1,10 @@
-%%CONF_DIR%%/freeipmi.conf.sample
-%%CONF_DIR%%/ipmiseld.conf
-%%CONF_DIR%%/freeipmi_interpret_sel.conf
-%%CONF_DIR%%/freeipmi_interpret_sensor.conf
-%%CONF_DIR%%/ipmidetect.conf
-%%CONF_DIR%%/ipmidetectd.conf
-%%CONF_DIR%%/libipmiconsole.conf
+%%ETCDIR%%/freeipmi.conf.sample
+%%ETCDIR%%/ipmiseld.conf
+%%ETCDIR%%/freeipmi_interpret_sel.conf
+%%ETCDIR%%/freeipmi_interpret_sensor.conf
+%%ETCDIR%%/ipmidetect.conf
+%%ETCDIR%%/ipmidetectd.conf
+%%ETCDIR%%/libipmiconsole.conf
include/freeipmi/api/ipmi-api.h
include/freeipmi/api/ipmi-chassis-cmds-api.h
include/freeipmi/api/ipmi-dcmi-cmds-api.h
@@ -306,4 +306,4 @@ sbin/rmcpping
@dirrm include/freeipmi/cmds
@dirrm include/freeipmi/api
@dirrm include/freeipmi
-@dirrmtry %%CONF_DIR%%
+@dirrmtry %%ETCDIR%%