4 files changed, 137 insertions, 87 deletions

diff --git a/sysutils/freeipmi/Makefile b/sysutils/freeipmi/Makefile
index 04f4ee7bfaae..d4ccc6fca19d 100644
--- a/sysutils/freeipmi/Makefile
+++ b/sysutils/freeipmi/Makefile
@@ -10,7 +10,7 @@
 #
 
 PORTNAME=	freeipmi
-PORTVERSION=	0.3.3
+PORTVERSION=	0.4.3
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.zresearch.com/pub/freeipmi/${PORTVERSION}/ \
 	ftp://ftp.riss-telecom.ru/pub/mirrors/ftp.zresearch.com/pub/freeipmi/${PORTVERSION}/
@@ -25,21 +25,41 @@ USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-CONFIGURE_ARGS+=	--disable-init-scripts --disable-logrotate-config
+CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
+	PTHREAD_LIBS=-pthread
+CONFIGURE_ARGS+=	--disable-init-scripts --disable-logrotate-config \
+	--localstatedir=/var \
+	--with-ipmipower-config-file=${PREFIX}/etc/ipmipower.conf \
+	--with-ipmi-monitoring-sdr-cache-dir=${CACHE_DIR}/ipmimonitoringsdrcache \
+	--with-ipmi-monitoring-sensor-config-file=${PREFIX}/etc/ipmi_monitoring_sensors.conf \
+	--with-ipmidetect-config-file=${PREFIX}/etc/ipmidetect.conf \
+	--with-ipmidetectd-config-file=${PREFIX}/etc/ipmidetectd.conf
 USE_LDCONFIG=	yes
 NOT_FOR_ARCHS=	ia64 sparc64 alpha
 PLIST_SUB+=	FREEIPMI_SHLIBVER=${FREEIPMI_SHLIBVER} \
-	IPMICONSOLE_SHLIBVER=${IPMICONSOLE_SHLIBVER}
-MAN5+=	ipmipower.conf.5 bmc-config.conf.5 ipmiconsole.conf.5
+	IPMICONSOLE_SHLIBVER=${IPMICONSOLE_SHLIBVER} \
+	IPMIDETECT_SHLIBVER=${IPMIDETECT_SHLIBVER} \
+	IPMIMONITORING_SHLIBVER=${IPMIMONITORING_SHLIBVER} \
+	CACHE_DIR=${CACHE_DIR} LOG_DIR=${LOG_DIR} RUN_DIR=${RUN_DIR}
+MAN3+=	libipmiconsole.3 libipmimonitoring.3 libipmidetect.3
+MAN5+=	ipmipower.conf.5 bmc-config.conf.5 ipmiconsole.conf.5 \
+	ipmidetect.conf.5 ipmidetectd.conf.5
 MAN8+=	bmc-watchdog.8 ipmipower.8 ipmi-raw.8 ipmi-sel.8 \
 	ipmi-sensors.8 ipmi-locate.8 bmc-info.8 ipmiping.8 \
-	rmcpping.8 bmc-autoconfig.8 bmc-config.8 ipmiconsole.8
-INFO+=		freeipmi freeipmi-faq
+	rmcpping.8 bmc-autoconfig.8 bmc-config.8 ipmiconsole.8 \
+	ipmi-fru.8 pef-config.8 ipmimonitoring.8 ipmi-chassis.8 \
+	ipmidetect.8 ipmidetectd.8
+INFO+=		freeipmi-faq
 PORTDOCS=	*
+PORTEXAMPLES=	*
 
-FREEIPMI_SHLIBVER=	3
-IPMICONSOLE_SHLIBVER=	0
+CACHE_DIR?=	/var/db/${PORTNAME}
+LOG_DIR=	/var/log/${PORTNAME}
+RUN_DIR=	/var/lib/${PORTNAME}
+FREEIPMI_SHLIBVER=	4
+IPMICONSOLE_SHLIBVER=	1
+IPMIDETECT_SHLIBVER=	0
+IPMIMONITORING_SHLIBVER=	0
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
@@ -53,18 +73,17 @@ BROKEN=	missing getpw*_r functions in this FreeBSD release
 # ports. Note: there is a bug in FreeBSD 5 before 5.5-RELEASE that
 # causes SIGBUS to the process sometimes when i386_set_ioperm is used
 # (PR 84842).
-.if ${ARCH} == "i386" && (defined(WITH_IOPERM) || \
-	${OSVERSION} < 500000 || ${OSVERSION} >= 505000)
+.if ${ARCH} == "i386" && defined(WITH_IOPERM)
 CPPFLAGS+=	-DUSE_IOPERM
 .endif
 
 .if defined(WITH_DEBUG)
-CONFIGURE_ARGS+=	--enable-debug
+CONFIGURE_ARGS+=	--enable-debug --enable-trace
 STRIP=	# empty
 .endif
 
 post-install:
-	@${CHMOD} 0700 ${PREFIX}/var/log/freeipmi \
-		${PREFIX}/var/lib/freeipmi
+	@${MKDIR} ${LOG_DIR}
+	@${CHMOD} 0700 ${CACHE_DIR} ${LOG_DIR} ${RUN_DIR}
 
 .include <bsd.port.post.mk>
diff --git a/sysutils/freeipmi/distinfo b/sysutils/freeipmi/distinfo
index 13ed894e4be0..2f6bd5ada3b3 100644
--- a/sysutils/freeipmi/distinfo
+++ b/sysutils/freeipmi/distinfo
@@ -1,3 +1,3 @@
-MD5 (freeipmi-0.3.3.tar.gz) = b722469ec4b5a4b805d69970811e4513
-SHA256 (freeipmi-0.3.3.tar.gz) = d22fee317080f08d012efd7ef7024712f5ec707e31a5b9106e686cd48e447df7
-SIZE (freeipmi-0.3.3.tar.gz) = 1324657
+MD5 (freeipmi-0.4.3.tar.gz) = e9475501adece106f38b9f5765e65fa5
+SHA256 (freeipmi-0.4.3.tar.gz) = e8562124602664d84cc9f351f9dfb7e8a7432c3570e366d4a6fdb89da04f41d8
+SIZE (freeipmi-0.4.3.tar.gz) = 1460844
diff --git a/sysutils/freeipmi/files/patch-bmc--config-bmc--autoconfig-Makefile.in b/sysutils/freeipmi/files/patch-bmc--config-bmc--autoconfig-Makefile.in
new file mode 100644
index 000000000000..d0bb833f30a8
--- /dev/null
+++ b/sysutils/freeipmi/files/patch-bmc--config-bmc--autoconfig-Makefile.in
@@ -0,0 +1,11 @@
+--- bmc-config/bmc-autoconfig/Makefile.in.orig	Wed Aug 15 07:17:08 2007
++++ bmc-config/bmc-autoconfig/Makefile.in	Sun Sep  9 22:26:32 2007
+@@ -194,7 +194,7 @@
+ sbin_SCRIPTS = $(EXTENSIONS)
+ CLEANFILES = 
+ BMC_CONFIG_TEMPLATE = bmc-config-template
+-BMC_CONFIG_TEMPLATE_DIR = $(localstatedir)/lib/$(PACKAGE)
++BMC_CONFIG_TEMPLATE_DIR = $(datadir)/examples/$(PACKAGE)
+ Bmc_Config_Templatedir = $(BMC_CONFIG_TEMPLATE_DIR)
+ Bmc_Config_Template_DATA = $(BMC_CONFIG_TEMPLATE)
+ EXTRA_DIST = bmc-autoconfig $(BMC_CONFIG_TEMPLATE)
diff --git a/sysutils/freeipmi/pkg-plist b/sysutils/freeipmi/pkg-plist
index 375b12d98e41..761ddf06f276 100644
--- a/sysutils/freeipmi/pkg-plist
+++ b/sysutils/freeipmi/pkg-plist
@@ -1,87 +1,80 @@
-sbin/bmc-watchdog
-sbin/ipmipower
-sbin/ipmi-raw
-sbin/ipmi-sel
-sbin/ipmi-sensors
-sbin/ipmi-locate
-sbin/bmc-info
-sbin/ipmiping
-sbin/rmcpping
-sbin/bmc-config
-sbin/bmc-autoconfig
-sbin/ipmiconsole
-include/freeipmi/udm/udm.h
-include/freeipmi/udm/ipmi-udm.h
-include/freeipmi/udm/ipmi-kcs-api-udm.h
-include/freeipmi/udm/ipmi-lan-interface-udm.h
-include/freeipmi/udm/ipmi-openipmi-api-udm.h
-include/freeipmi/udm/ipmi-ssif-api-udm.h
-include/freeipmi/udm/ipmi-chassis-cmds-udm.h
-include/freeipmi/udm/ipmi-device-global-cmds-udm.h
-include/freeipmi/udm/ipmi-lan-cmds-udm.h
-include/freeipmi/udm/ipmi-messaging-support-cmds-udm.h
-include/freeipmi/udm/ipmi-pef-and-alerting-cmds-udm.h
-include/freeipmi/udm/ipmi-rmcpplus-support-and-payload-cmds-udm.h
-include/freeipmi/udm/ipmi-sdr-repository-cmds-udm.h
-include/freeipmi/udm/ipmi-sensor-cmds-udm.h
-include/freeipmi/udm/ipmi-sel-cmds-udm.h
-include/freeipmi/udm/ipmi-serial-modem-cmds-udm.h
-include/freeipmi/udm/ipmi-sol-cmds-udm.h
-@dirrm include/freeipmi/udm
-include/freeipmi/freeipmi.h
+etc/ipmi_monitoring_sensors.conf
 include/freeipmi/fiid.h
+include/freeipmi/freeipmi.h
 include/freeipmi/ipmi-authentication-type-spec.h
+include/freeipmi/ipmi-bmc-watchdog-timer-cmds.h
 include/freeipmi/ipmi-channel-spec.h
+include/freeipmi/ipmi-chassis-boot-options-parameter-spec.h
+include/freeipmi/ipmi-chassis-cmds.h
 include/freeipmi/ipmi-cipher-suite-spec.h
 include/freeipmi/ipmi-cmd-spec.h
 include/freeipmi/ipmi-comp-code-spec.h
-include/freeipmi/ipmi-ipmb-interface.h
-include/freeipmi/ipmi-lan-param-spec.h
-include/freeipmi/ipmi-netfn-spec.h
-include/freeipmi/ipmi-pef-param-spec.h
-include/freeipmi/ipmi-privilege-level-spec.h
-include/freeipmi/ipmi-rmcpplus-status-spec.h
-include/freeipmi/ipmi-sensor-types-spec.h
-include/freeipmi/ipmi-sensor-units-spec.h
-include/freeipmi/ipmi-serial-modem-param-spec.h
-include/freeipmi/ipmi-sol-param-spec.h
-include/freeipmi/ipmi-slave-address-spec.h
-include/freeipmi/rmcp.h
-include/freeipmi/rmcp-utils.h
+include/freeipmi/ipmi-crypt.h
 include/freeipmi/ipmi-debug.h
+include/freeipmi/ipmi-device-global-cmds.h
 include/freeipmi/ipmi-error.h
-include/freeipmi/ipmi-utils.h
-include/freeipmi/ipmi-locate.h
-include/freeipmi/ipmi-kcs.h
+include/freeipmi/ipmi-fru-information-storage-definition.h
+include/freeipmi/ipmi-fru-inventory-device-cmds.h
+include/freeipmi/ipmi-ipmb-interface.h
 include/freeipmi/ipmi-kcs-api.h
-include/freeipmi/ipmi-lan.h
+include/freeipmi/ipmi-kcs.h
+include/freeipmi/ipmi-lan-cmds.h
 include/freeipmi/ipmi-lan-interface.h
+include/freeipmi/ipmi-lan-parameter-spec.h
 include/freeipmi/ipmi-lan-utils.h
-include/freeipmi/ipmi-openipmi-api.h
-include/freeipmi/ipmi-crypt.h
-include/freeipmi/ipmi-rmcpplus.h
-include/freeipmi/ipmi-rmcpplus-interface.h
-include/freeipmi/ipmi-rmcpplus-utils.h
-include/freeipmi/ipmi-smic-api.h
-include/freeipmi/ipmi-ssif-api.h
-include/freeipmi/ipmi-bmc-watchdog-timer-cmds.h
-include/freeipmi/ipmi-chassis-cmds.h
-include/freeipmi/ipmi-device-global-cmds.h
-include/freeipmi/ipmi-lan-cmds.h
+include/freeipmi/ipmi-lan.h
+include/freeipmi/ipmi-locate.h
 include/freeipmi/ipmi-messaging-support-cmds.h
+include/freeipmi/ipmi-netfn-spec.h
+include/freeipmi/ipmi-openipmi-api.h
 include/freeipmi/ipmi-pef-and-alerting-cmds.h
+include/freeipmi/ipmi-pef-parameter-spec.h
+include/freeipmi/ipmi-privilege-level-spec.h
+include/freeipmi/ipmi-rmcpplus-interface.h
+include/freeipmi/ipmi-rmcpplus-status-spec.h
 include/freeipmi/ipmi-rmcpplus-support-and-payload-cmds.h
+include/freeipmi/ipmi-rmcpplus-utils.h
+include/freeipmi/ipmi-rmcpplus.h
+include/freeipmi/ipmi-sdr-record-types.h
 include/freeipmi/ipmi-sdr-repository-cmds.h
 include/freeipmi/ipmi-sel-cmds.h
-include/freeipmi/ipmi-sensor-cmds.h
-include/freeipmi/ipmi-serial-modem-cmds.h
-include/freeipmi/ipmi-sol-cmds.h
-include/freeipmi/ipmi-sdr-record-types.h
 include/freeipmi/ipmi-sel-record-types.h
 include/freeipmi/ipmi-sensor-and-event-code-tables.h
+include/freeipmi/ipmi-sensor-cmds.h
+include/freeipmi/ipmi-sensor-types-spec.h
+include/freeipmi/ipmi-sensor-units-spec.h
 include/freeipmi/ipmi-sensor-utils.h
-@dirrm include/freeipmi
+include/freeipmi/ipmi-serial-modem-cmds.h
+include/freeipmi/ipmi-serial-modem-parameter-spec.h
+include/freeipmi/ipmi-slave-address-spec.h
+include/freeipmi/ipmi-smic-api.h
+include/freeipmi/ipmi-sol-cmds.h
+include/freeipmi/ipmi-sol-parameter-spec.h
+include/freeipmi/ipmi-ssif-api.h
+include/freeipmi/ipmi-utils.h
+include/freeipmi/rmcp-utils.h
+include/freeipmi/rmcp.h
+include/freeipmi/udm/ipmi-chassis-cmds-udm.h
+include/freeipmi/udm/ipmi-device-global-cmds-udm.h
+include/freeipmi/udm/ipmi-fru-inventory-device-cmds-udm.h
+include/freeipmi/udm/ipmi-kcs-api-udm.h
+include/freeipmi/udm/ipmi-lan-cmds-udm.h
+include/freeipmi/udm/ipmi-lan-interface-udm.h
+include/freeipmi/udm/ipmi-messaging-support-cmds-udm.h
+include/freeipmi/udm/ipmi-openipmi-api-udm.h
+include/freeipmi/udm/ipmi-pef-and-alerting-cmds-udm.h
+include/freeipmi/udm/ipmi-rmcpplus-support-and-payload-cmds-udm.h
+include/freeipmi/udm/ipmi-sdr-repository-cmds-udm.h
+include/freeipmi/udm/ipmi-sel-cmds-udm.h
+include/freeipmi/udm/ipmi-sensor-cmds-udm.h
+include/freeipmi/udm/ipmi-serial-modem-cmds-udm.h
+include/freeipmi/udm/ipmi-sol-cmds-udm.h
+include/freeipmi/udm/ipmi-ssif-api-udm.h
+include/freeipmi/udm/ipmi-udm.h
+include/freeipmi/udm/udm.h
+include/ipmi_monitoring.h
 include/ipmiconsole.h
+include/ipmidetect.h
 lib/libfreeipmi.a
 lib/libfreeipmi.la
 lib/libfreeipmi.so
@@ -90,9 +83,36 @@ lib/libipmiconsole.a
 lib/libipmiconsole.la
 lib/libipmiconsole.so
 lib/libipmiconsole.so.%%IPMICONSOLE_SHLIBVER%%
-var/lib/freeipmi/ipckey
-var/lib/freeipmi/bmc-config-template
-@dirrmtry var/lib/freeipmi
-@dirrmtry var/lib
-@exec mkdir -p -m 0700 %D/var/log/freeipmi
-@dirrmtry var/log/freeipmi
+lib/libipmidetect.a
+lib/libipmidetect.la
+lib/libipmidetect.so
+lib/libipmidetect.so.%%IPMIDETECT_SHLIBVER%%
+lib/libipmimonitoring.a
+lib/libipmimonitoring.la
+lib/libipmimonitoring.so
+lib/libipmimonitoring.so.%%IPMIMONITORING_SHLIBVER%%
+sbin/bmc-autoconfig
+sbin/bmc-config
+sbin/bmc-info
+sbin/bmc-watchdog
+sbin/ipmi-chassis
+sbin/ipmi-fru
+sbin/ipmi-locate
+sbin/ipmi-raw
+sbin/ipmi-sel
+sbin/ipmi-sensors
+sbin/ipmiconsole
+sbin/ipmidetect
+sbin/ipmidetectd
+sbin/ipmimonitoring
+sbin/ipmiping
+sbin/ipmipower
+sbin/pef-config
+sbin/rmcpping
+@dirrm include/freeipmi/udm
+@dirrm include/freeipmi
+@exec mkdir -p %%CACHE_DIR%%/ipmimonitoringsdrcache %%LOG_DIR%% %%RUN_DIR%%
+@exec touch %%RUN_DIR%%/ipckey
+@exec chmod 0700 %%CACHE_DIR%% %%LOG_DIR%% %%RUN_DIR%%
+@unexec rm -f %%RUN_DIR%%/ipckey
+@dirrmtry %%CACHE_DIR%%/ipmimonitoringsdrcache %%CACHE_DIR%% %%LOG_DIR%% %%RUN_DIR%%