5 files changed, 83 insertions, 20 deletions

diff --git a/sysutils/freeipmi/Makefile b/sysutils/freeipmi/Makefile
index 5b1445915d2f..c29a083e8748 100644
--- a/sysutils/freeipmi/Makefile
+++ b/sysutils/freeipmi/Makefile
@@ -15,12 +15,12 @@
 #
 
 PORTNAME=	freeipmi
-PORTVERSION=	0.6.10
+PORTVERSION=	0.7.1
 CATEGORIES=	sysutils
-MASTER_SITES=	ftp://ftp.zresearch.com/pub/freeipmi/${PORTVERSION}/ \
-	ftp://ftp.riss-telecom.ru/pub/mirrors/ftp.zresearch.com/pub/freeipmi/${PORTVERSION}/
+MASTER_SITES=	http://ftp.zresearch.com/pub/freeipmi/${PORTVERSION}/ \
+	ftp://freebsd.riss-telecom.ru/pub/mirrors/ftp.zresearch.com/pub/freeipmi/${PORTVERSION}/
 
-MAINTAINER=	frolov@riss-telecom.ru
+MAINTAINER=	frol@nov.net
 COMMENT=	Library and tools to support IPMI-capable hardware
 
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libargp.a:${PORTSDIR}/devel/argp-standalone
@@ -34,7 +34,7 @@ CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
 CONFIGURE_ARGS+=	--disable-init-scripts --disable-logrotate-config \
 	--disable-logdir --localstatedir=/var \
 	--with-ipmi-monitoring-sdr-cache-dir=${CACHE_DIR}/ipmimonitoringsdrcache \
-	--sysconfdir=${PREFIX}/etc/${PORTNAME}
+	--sysconfdir=${CONF_DIR}
 USE_LDCONFIG=	yes
 NOT_FOR_ARCHS=	ia64 sparc64 alpha
 PLIST_SUB+=	FREEIPMI_SHLIBVER=${FREEIPMI_SHLIBVER} \
@@ -42,22 +42,24 @@ PLIST_SUB+=	FREEIPMI_SHLIBVER=${FREEIPMI_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 \
-	libfreeipmi.3
-MAN5+=	ipmipower.conf.5 bmc-config.conf.5 ipmiconsole.conf.5 \
-	ipmidetect.conf.5 ipmidetectd.conf.5
+MAN3+=	libfreeipmi.3 libipmiconsole.3 libipmidetect.3 \
+	libipmimonitoring.3
+MAN5+=	bmc-config.conf.5 freeipmi.conf.5 ipmiconsole.conf.5 \
+	ipmidetect.conf.5 ipmidetectd.conf.5 ipmipower.conf.5
 MAN7+=	freeipmi.7
-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-config.8 ipmiconsole.8 \
-	ipmi-fru.8 pef-config.8 ipmimonitoring.8 ipmi-chassis.8 \
-	ipmidetect.8 ipmidetectd.8 ipmi-oem.8 ipmi-sensors-config.8
+MAN8+=	bmc-config.8 bmc-device.8 bmc-info.8 bmc-watchdog.8 \
+	ipmi-chassis-config.8 ipmi-chassis.8 ipmi-fru.8 \
+	ipmi-locate.8 ipmi-oem.8 ipmi-raw.8 ipmi-sel.8 \
+	ipmi-sensors-config.8 ipmi-sensors.8 ipmiconsole.8 \
+	ipmidetect.8 ipmidetectd.8 ipmimonitoring.8 ipmiping.8 \
+	ipmipower.8 pef-config.8 rmcpping.8
 INFO+=		freeipmi-faq
 
 CACHE_DIR?=	/var/db/${PORTNAME}
 LOG_DIR=	/var/log/${PORTNAME}
 RUN_DIR=	/var/lib/${PORTNAME}
-FREEIPMI_SHLIBVER=	6
+CONF_DIR?=	${PREFIX}/etc/${PORTNAME}
+FREEIPMI_SHLIBVER=	7
 IPMICONSOLE_SHLIBVER=	2
 IPMIDETECT_SHLIBVER=	0
 IPMIMONITORING_SHLIBVER=	2
@@ -92,5 +94,10 @@ PORTDOCS=	*
 post-install:
 	@${MKDIR} ${LOG_DIR}
 	@${CHMOD} 0700 ${CACHE_DIR} ${LOG_DIR} ${RUN_DIR}
+	[ -f ${CONF_DIR}/freeipmi.conf ] || \
+		${CP} -p ${CONF_DIR}/freeipmi.conf.sample ${CONF_DIR}/freeipmi.conf
+	[ -f ${CONF_DIR}/ipmi_monitoring_sensors.conf ] || \
+		${CP} -p ${CONF_DIR}/ipmi_monitoring_sensors.conf.sample \
+			${CONF_DIR}/ipmi_monitoring_sensors.conf
 
 .include <bsd.port.post.mk>
diff --git a/sysutils/freeipmi/distinfo b/sysutils/freeipmi/distinfo
index 4dcff278d310..39bc3a1d12fd 100644
--- a/sysutils/freeipmi/distinfo
+++ b/sysutils/freeipmi/distinfo
@@ -1,3 +1,3 @@
-MD5 (freeipmi-0.6.10.tar.gz) = f446d076dc86d78a7cda342d2d8a956f
-SHA256 (freeipmi-0.6.10.tar.gz) = 33c22e46feabe027913b40fd9ff5a8a745ac9b6cf27a6010f0fa801b2a966cdd
-SIZE (freeipmi-0.6.10.tar.gz) = 1669900
+MD5 (freeipmi-0.7.1.tar.gz) = 4ef8c6023a13bde27054627e6de4b07c
+SHA256 (freeipmi-0.7.1.tar.gz) = bb8899f6dbcfab1d9dff26cf02f092e465f7d11a32dc41b79772ec73ff50ff6d
+SIZE (freeipmi-0.7.1.tar.gz) = 1911218
diff --git a/sysutils/freeipmi/files/patch-etc-Makefile.in b/sysutils/freeipmi/files/patch-etc-Makefile.in
new file mode 100644
index 000000000000..16ea831a2cab
--- /dev/null
+++ b/sysutils/freeipmi/files/patch-etc-Makefile.in
@@ -0,0 +1,22 @@
+--- etc/Makefile.in.orig	Sat Nov  8 06:11:17 2008
++++ etc/Makefile.in	Sat Nov  8 16:25:31 2008
+@@ -239,8 +239,8 @@
+ 	@list='$(Freeipmiconf_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+-	  echo " $(FreeipmiconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(Freeipmiconfdir)/$$f'"; \
+-	  $(FreeipmiconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(Freeipmiconfdir)/$$f"; \
++	  echo " $(FreeipmiconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(Freeipmiconfdir)/$$f.sample'"; \
++	  $(FreeipmiconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(Freeipmiconfdir)/$$f.sample"; \
+ 	done
+ 
+ uninstall-FreeipmiconfDATA:
+@@ -377,8 +377,6 @@
+ 
+ 
+ install-data-local:
+-	$(INSTALL) -m 755 -d $(DESTDIR)$(sysconfdir)
+-	$(INSTALL) -m 755 $(srcdir)/freeipmi.conf $(DESTDIR)$(sysconfdir)
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
diff --git a/sysutils/freeipmi/files/patch-ipmimonitorig-Makefile.in b/sysutils/freeipmi/files/patch-ipmimonitorig-Makefile.in
new file mode 100644
index 000000000000..1f58e84fff54
--- /dev/null
+++ b/sysutils/freeipmi/files/patch-ipmimonitorig-Makefile.in
@@ -0,0 +1,22 @@
+--- ipmimonitoring/Makefile.in.orig	Sat Nov  8 06:11:22 2008
++++ ipmimonitoring/Makefile.in	Sat Nov  8 16:24:12 2008
+@@ -355,8 +355,8 @@
+ 	@list='$(Monitoringconf_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+-	  echo " $(MonitoringconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(Monitoringconfdir)/$$f'"; \
+-	  $(MonitoringconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(Monitoringconfdir)/$$f"; \
++	  echo " $(MonitoringconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(Monitoringconfdir)/$$f.sample'"; \
++	  $(MonitoringconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(Monitoringconfdir)/$$f.sample"; \
+ 	done
+ 
+ uninstall-MonitoringconfDATA:
+@@ -649,8 +649,6 @@
+ 	$(CPP) -C -P -I. $@.pre  $@
+ 
+ install-data-local:
+-	$(INSTALL) -m 755 -d $(DESTDIR)$(sysconfdir)
+-	$(INSTALL) -m 755 $(srcdir)/ipmi_monitoring_sensors.conf $(DESTDIR)$(IPMI_MONITORING_SENSOR_CONFIG_FILE_DEFAULT)
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
diff --git a/sysutils/freeipmi/pkg-plist b/sysutils/freeipmi/pkg-plist
index 71847f63d1ec..db6a018c7ac2 100644
--- a/sysutils/freeipmi/pkg-plist
+++ b/sysutils/freeipmi/pkg-plist
@@ -1,7 +1,13 @@
-etc/freeipmi/ipmi_monitoring_sensors.conf
+@unexec [ -f %D/etc/freeipmi/freeipmi.conf ] && cmp -s %D/etc/freeipmi/freeipmi.conf.sample %D/etc/freeipmi/freeipmi.conf && rm -f %D/etc/freeipmi/freeipmi.conf
+etc/freeipmi/freeipmi.conf.sample
+@exec [ -f %D/etc/freeipmi/freeipmi.conf ] || cp -p %D/etc/freeipmi/freeipmi.conf.sample %D/etc/freeipmi/freeipmi.conf
+@unexec [ -f %D/etc/freeipmi/ipmi_monitoring_sensors.conf ] && cmp -s %D/etc/freeipmi/ipmi_monitoring_sensors.conf.sample %D/etc/freeipmi/ipmi_monitoring_sensors.conf && rm -f %D/etc/freeipmi/ipmi_monitoring_sensors.conf
+etc/freeipmi/ipmi_monitoring_sensors.conf.sample
+@exec [ -f %D/etc/freeipmi/ipmi_monitoring_sensors.conf ] || cp -p %D/etc/freeipmi/ipmi_monitoring_sensors.conf.sample %D/etc/freeipmi/ipmi_monitoring_sensors.conf
 include/freeipmi/api/ipmi-api.h
 include/freeipmi/api/ipmi-chassis-cmds-api.h
 include/freeipmi/api/ipmi-device-global-cmds-api.h
+include/freeipmi/api/ipmi-event-cmds-api.h
 include/freeipmi/api/ipmi-fru-inventory-device-cmds-api.h
 include/freeipmi/api/ipmi-lan-cmds-api.h
 include/freeipmi/api/ipmi-messaging-support-cmds-api.h
@@ -15,6 +21,7 @@ include/freeipmi/api/ipmi-sol-cmds-api.h
 include/freeipmi/cmds/ipmi-bmc-watchdog-timer-cmds.h
 include/freeipmi/cmds/ipmi-chassis-cmds.h
 include/freeipmi/cmds/ipmi-device-global-cmds.h
+include/freeipmi/cmds/ipmi-event-cmds.h
 include/freeipmi/cmds/ipmi-fru-inventory-device-cmds.h
 include/freeipmi/cmds/ipmi-lan-cmds.h
 include/freeipmi/cmds/ipmi-messaging-support-cmds.h
@@ -30,8 +37,10 @@ include/freeipmi/debug/ipmi-debug.h
 include/freeipmi/driver/ipmi-kcs-driver.h
 include/freeipmi/driver/ipmi-openipmi-driver.h
 include/freeipmi/driver/ipmi-ssif-driver.h
+include/freeipmi/driver/ipmi-sunbmc-driver.h
 include/freeipmi/fiid/fiid.h
 include/freeipmi/freeipmi.h
+include/freeipmi/interface/ipmi-ipmb-interface.h
 include/freeipmi/interface/ipmi-kcs-interface.h
 include/freeipmi/interface/ipmi-lan-interface.h
 include/freeipmi/interface/ipmi-rmcpplus-interface.h
@@ -64,6 +73,7 @@ include/freeipmi/spec/ipmi-sol-parameter-spec.h
 include/freeipmi/spec/ipmi-system-software-id-spec.h
 include/freeipmi/util/ipmi-cipher-suite-util.h
 include/freeipmi/util/ipmi-error-util.h
+include/freeipmi/util/ipmi-ipmb-util.h
 include/freeipmi/util/ipmi-lan-util.h
 include/freeipmi/util/ipmi-rmcpplus-util.h
 include/freeipmi/util/ipmi-sensor-and-event-code-tables-util.h
@@ -90,9 +100,11 @@ lib/libipmimonitoring.la
 lib/libipmimonitoring.so
 lib/libipmimonitoring.so.%%IPMIMONITORING_SHLIBVER%%
 sbin/bmc-config
+sbin/bmc-device
 sbin/bmc-info
 sbin/bmc-watchdog
 sbin/ipmi-chassis
+sbin/ipmi-chassis-config
 sbin/ipmi-fru
 sbin/ipmi-locate
 sbin/ipmi-oem
@@ -108,7 +120,6 @@ sbin/ipmiping
 sbin/ipmipower
 sbin/pef-config
 sbin/rmcpping
-@dirrmtry etc/freeipmi
 @dirrm include/freeipmi/util
 @dirrm include/freeipmi/spec
 @dirrm include/freeipmi/sdr-cache
@@ -121,6 +132,7 @@ sbin/rmcpping
 @dirrm include/freeipmi/cmds
 @dirrm include/freeipmi/api
 @dirrm include/freeipmi
+@dirrmtry etc/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%%