Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 10 Oct 2013 07:12:14 +0000 (UTC)
From:      Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r329970 - head/sysutils/freeipmi
Message-ID:  <201310100712.r9A7CEgE041841@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: sunpoet
Date: Thu Oct 10 07:12:14 2013
New Revision: 329970
URL: http://svnweb.freebsd.org/changeset/ports/329970

Log:
  - Remove CONF_DIR

Modified:
  head/sysutils/freeipmi/Makefile
  head/sysutils/freeipmi/pkg-plist

Modified: head/sysutils/freeipmi/Makefile
==============================================================================
--- head/sysutils/freeipmi/Makefile	Thu Oct 10 07:11:14 2013	(r329969)
+++ head/sysutils/freeipmi/Makefile	Thu Oct 10 07:12:14 2013	(r329970)
@@ -20,7 +20,7 @@ IOPERM_DESC=	Use i386_set_ioperm (i386/a
 
 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-inf
 		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}
 

Modified: head/sysutils/freeipmi/pkg-plist
==============================================================================
--- head/sysutils/freeipmi/pkg-plist	Thu Oct 10 07:11:14 2013	(r329969)
+++ head/sysutils/freeipmi/pkg-plist	Thu Oct 10 07:12:14 2013	(r329970)
@@ -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%%



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310100712.r9A7CEgE041841>