8 files changed, 118 insertions, 203 deletions

diff --git a/sysutils/freeipmi/Makefile b/sysutils/freeipmi/Makefile
index b47a3cb0edc7..3370fa48a772 100644
--- a/sysutils/freeipmi/Makefile
+++ b/sysutils/freeipmi/Makefile
@@ -6,64 +6,56 @@
 #
 
 PORTNAME=	freeipmi
-PORTVERSION=	0.2.3
+PORTVERSION=	0.3.0
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.zresearch.com/pub/freeipmi/${PORTVERSION}/
 
 PATCH_SITES=	ftp://ftp.riss-telecom.ru/pub/patches/
-PATCHFILES=	${DISTNAME}-fbsd1.diff
+PATCHFILES=	${DISTNAME}-fbsd2.diff
 
 MAINTAINER=	frolov@riss-telecom.ru
 COMMENT=	Library and tools to support IPMI-capable hardware
 
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libargp.a:${PORTSDIR}/devel/argp-standalone
-
-OPTIONS+=	FISH "Build fish (FreeIPMI shell) and scripts" on
+LIB_DEPENDS+=	gcrypt:${PORTSDIR}/security/libgcrypt
 
 USE_AUTOTOOLS=	autoconf:259 libtool:15 aclocal:19 automake:19
-ACLOCAL_ARGS=	--acdir=${ACLOCAL_DIR} -I ${LOCALBASE}/share/aclocal
+ACLOCAL_ARGS=	--acdir=${ACLOCAL_DIR} -I ${CONFIGURE_WRKSRC} \
+	-I ${LOCALBASE}/share/aclocal
 USE_GMAKE=	yes
 USE_GETOPT_LONG=	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
 USE_LDCONFIG=	yes
 NOT_FOR_ARCHS=	ia64 sparc64 alpha
-PLIST_SUB+=	SHLIBVER=${SHLIBVER}
-MAN5+=	ipmipower.conf.5
-MAN8+=	bmc-info.8 bmc-watchdog.8 ipmi-locate.8 ipmi-raw.8 \
-	ipmiping.8 ipmipower.8 rmcpping.8
+PLIST_SUB+=	FREEIPMI_SHLIBVER=${FREEIPMI_SHLIBVER} \
+	IPMICONSOLE_SHLIBVER=${IPMICONSOLE_SHLIBVER}
+MAN5+=	ipmipower.conf.5 bmc-config.conf.5 ipmiconsole.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
 PORTDOCS=	*
-PKGDEINSTALL=	${PKGINSTALL}
 
-SHLIBVER=	2
+FREEIPMI_SHLIBVER=	3
+IPMICONSOLE_SHLIBVER=	0
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.pre.mk>
 
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+.if ${OSVERSION} < 500112
+BROKEN=	missing getpw*_r functions in this FreeBSD release
+.endif
+
 .if defined(WITH_IOPERM)
 CPPFLAGS+=	-DUSE_IOPERM
 .endif
-.if defined(WITH_FISH)
-LIB_DEPENDS+=	guile:${PORTSDIR}/lang/guile
-CONFIGURE_ARGS+=	--enable-fish
-PLIST_SUB+=	FISH=""
-MAN5+=	bmc-config.conf.5
-MAN8+=	bmc-config.8 fish.8 ipmi-sel.8 ipmi-sensors.8
-.else
-CONFIGURE_ARGS+=	--disable-fish
-PLIST_SUB+=	FISH="@comment "
-.endif
 
 post-install:
-	@${MKDIR} ${PREFIX}/etc/fish
-	${INSTALL_DATA} ${WRKSRC}/fish/fish.scm \
-		${PREFIX}/etc/fish/fish.scm-dist
-	${INSTALL_DATA} ${WRKSRC}/fish/extensions/ipmi-sensors-conf.scm \
-		${PREFIX}/etc/fish/ipmi-sensors-conf.scm-dist
-	@${SETENV} PKG_PREFIX=${PREFIX} \
-		${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+	@${CHMOD} 0700 ${DESTDIR}${PREFIX}/var/log/freeipmi \
+		${DESTDIR}${PREFIX}/var/lib/freeipmi
 
 .include <bsd.port.post.mk>
diff --git a/sysutils/freeipmi/distinfo b/sysutils/freeipmi/distinfo
index 416c491e8731..504f5d63e235 100644
--- a/sysutils/freeipmi/distinfo
+++ b/sysutils/freeipmi/distinfo
@@ -1,6 +1,6 @@
-MD5 (freeipmi-0.2.3.tar.gz) = aa3d093e835f9e75301d5cab02c09c68
-SHA256 (freeipmi-0.2.3.tar.gz) = 4333609231797b3cdc17f76856af5d6ed60e337d606870fcc19e441e00f9d334
-SIZE (freeipmi-0.2.3.tar.gz) = 1081539
-MD5 (freeipmi-0.2.3-fbsd1.diff) = a879f7f68b4bc45cfad8203b455984f3
-SHA256 (freeipmi-0.2.3-fbsd1.diff) = 699bbe1e5d503f292b4d564dc6e81e35e3e4b43309d6b7d9a96fd6933917f5b2
-SIZE (freeipmi-0.2.3-fbsd1.diff) = 12707
+MD5 (freeipmi-0.3.0.tar.gz) = a40e98e601aec592da1ee313713a70cc
+SHA256 (freeipmi-0.3.0.tar.gz) = 9e489e0655bed9bd0efe4d5c228769b651ba7c1d6f8d12d22118f54565e14e35
+SIZE (freeipmi-0.3.0.tar.gz) = 1302210
+MD5 (freeipmi-0.3.0-fbsd2.diff) = 3631a5992020e96d5efd5598e0ae6caa
+SHA256 (freeipmi-0.3.0-fbsd2.diff) = 0294ead74cf632cd2a13782222aa2227d810e88475ad16c3dfac8c0182d5fac6
+SIZE (freeipmi-0.3.0-fbsd2.diff) = 14824
diff --git a/sysutils/freeipmi/files/patch-Makefile.am b/sysutils/freeipmi/files/patch-Makefile.am
index 6dfe04588da6..41fe0de145d3 100644
--- a/sysutils/freeipmi/files/patch-Makefile.am
+++ b/sysutils/freeipmi/files/patch-Makefile.am
@@ -1,11 +1,11 @@
---- Makefile.am.orig	Mon Jun 26 19:07:22 2006
-+++ Makefile.am	Sat Aug 12 23:16:07 2006
-@@ -7,7 +7,7 @@
+--- Makefile.am.orig	Mon Nov  6 23:16:47 2006
++++ Makefile.am	Wed Dec  6 17:17:43 2006
+@@ -3,7 +3,7 @@ SUBDIRS = doc libfreeipmi common bmc-wat
  PACKAGE = @PACKAGE@
  VERSION = @VERSION@
  
--EXTRA = ChangeLog AUTHORS COPYING INSTALL NEWS README TODO THANKS COPYING.bmc-watchdog DISCLAIMER.bmc-watchdog COPYING.ipmipower DISCLAIMER.ipmipower COPYING.ipmiping DISCLAIMER.ipmiping COPYING.rmcpping DISCLAIMER.rmcpping
-+EXTRA = ChangeLog AUTHORS INSTALL NEWS README TODO THANKS DISCLAIMER.bmc-watchdog DISCLAIMER.ipmipower DISCLAIMER.ipmiping DISCLAIMER.rmcpping
+-EXTRA = ChangeLog ChangeLog.0 AUTHORS COPYING INSTALL NEWS README TODO THANKS COPYING.bmc-watchdog DISCLAIMER.bmc-watchdog COPYING.ipmipower DISCLAIMER.ipmipower COPYING.ipmiping DISCLAIMER.ipmiping COPYING.rmcpping DISCLAIMER.rmcpping COPYING.ipmiconsole DISCLAIMER.ipmiconsole
++EXTRA = ChangeLog ChangeLog.0 AUTHORS INSTALL NEWS README TODO THANKS DISCLAIMER.bmc-watchdog DISCLAIMER.ipmipower DISCLAIMER.ipmiping DISCLAIMER.rmcpping DISCLAIMER.ipmiconsole
  
  docdir   = $(datadir)/doc/$(PACKAGE)
  doc_DATA = $(EXTRA)
diff --git a/sysutils/freeipmi/files/patch-bmc--watchdog-Makefile.am b/sysutils/freeipmi/files/patch-bmc--watchdog-Makefile.am
deleted file mode 100644
index fa0503348362..000000000000
--- a/sysutils/freeipmi/files/patch-bmc--watchdog-Makefile.am
+++ /dev/null
@@ -1,28 +0,0 @@
---- ./bmc-watchdog/Makefile.am.orig	Sun Mar 13 10:19:53 2005
-+++ ./bmc-watchdog/Makefile.am	Fri Sep  8 14:03:23 2006
-@@ -9,14 +9,14 @@
- #  following and add `chk' to the EXTRA_DIST list
- #TESTS=chk
- 
--DEFINITSCRIPT = bmc-watchdog
--DEFINITSCRIPTdir = $(sysconfdir)/init.d
--DEFINITSCRIPT_DATA = $(DEFINITSCRIPT)
--
--BMCWATCHDOGLOGdir = /var/log/$(PACKAGE)
--
--EXTRA_DIST = $(DEFINITSCRIPT)
--
--install-data-hook:
--	chmod 755 $(DESTDIR)/$(DEFINITSCRIPTdir)/$(DEFINITSCRIPT)
--	$(top_srcdir)/install-sh -m 755 -d $(DESTDIR)$(BMCWATCHDOGLOGdir)
-+#DEFINITSCRIPT = bmc-watchdog
-+#DEFINITSCRIPTdir = $(sysconfdir)/init.d
-+#DEFINITSCRIPT_DATA = $(DEFINITSCRIPT)
-+#
-+#BMCWATCHDOGLOGdir = /var/log/$(PACKAGE)
-+#
-+#EXTRA_DIST = $(DEFINITSCRIPT)
-+#
-+#install-data-hook:
-+#	chmod 755 $(DESTDIR)/$(DEFINITSCRIPTdir)/$(DEFINITSCRIPT)
-+#	$(top_srcdir)/install-sh -m 755 -d $(DESTDIR)$(BMCWATCHDOGLOGdir)
diff --git a/sysutils/freeipmi/files/patch-fish-Makefile.am b/sysutils/freeipmi/files/patch-fish-Makefile.am
deleted file mode 100644
index a59cd9544966..000000000000
--- a/sysutils/freeipmi/files/patch-fish-Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
---- fish/Makefile.am.orig	Fri Dec 30 17:16:08 2005
-+++ fish/Makefile.am	Sun Aug 13 00:58:12 2006
-@@ -19,5 +19,5 @@
- 
- DEFCONF = fish.scm
- EXTRA_DIST = $(DEFCONF) 
--Defconfdir = $(sysconfdir)/fish
--Defconf_DATA = $(DEFCONF)
-+#Defconfdir = $(sysconfdir)/fish
-+#Defconf_DATA = $(DEFCONF)
diff --git a/sysutils/freeipmi/files/patch-fish-extensions-Makefile.am b/sysutils/freeipmi/files/patch-fish-extensions-Makefile.am
deleted file mode 100644
index 4f64fac0b3db..000000000000
--- a/sysutils/freeipmi/files/patch-fish-extensions-Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
---- fish/extensions/Makefile.am.orig	Sun Oct 16 08:04:04 2005
-+++ fish/extensions/Makefile.am	Sun Aug 13 00:58:59 2006
-@@ -13,8 +13,8 @@
- Extensions_DATA = $(EXTENSIONS)
- 
- EXTENSIONSCONF = ipmi-sensors-conf.scm
--Extensionsconfdir = $(sysconfdir)/fish
--Extensionsconf_DATA = $(EXTENSIONSCONF)
-+#Extensionsconfdir = $(sysconfdir)/fish
-+#Extensionsconf_DATA = $(EXTENSIONSCONF)
- 
- EXTRA_DIST = $(EXTENSIONS) $(EXTENSIONSCONF) 
- 
diff --git a/sysutils/freeipmi/pkg-install b/sysutils/freeipmi/pkg-install
deleted file mode 100644
index e2163feae7c0..000000000000
--- a/sysutils/freeipmi/pkg-install
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-
-conffiles="etc/fish/fish.scm etc/fish/ipmi-sensors-conf.scm"
-rundir="/var/lib/freeipmi"
-logdir="/var/log/freeipmi"
-
-case "$2" in
-POST-INSTALL)
-	for file in $conffiles; do
-		[ -f "$PKG_PREFIX/$file-dist" -a ! -f "$PKG_PREFIX/$file" ] && \
-			cp "$PKG_PREFIX/$file-dist" "$PKG_PREFIX/$file"
-	done
-
-	mkdir -p "$rundir" "$logdir" && \
-		chmod 0700 "$rundir" "$logdir"
-	touch "$rundir/ipckey"
-	;;
-DEINSTALL)
-	for file in $conffiles; do
-		[ -f "$PKG_PREFIX/$file-dist" ] && \
-			cmp -s "$PKG_PREFIX/$file" "$PKG_PREFIX/$file-dist" && \
-			rm -f $PKG_PREFIX/$file
-	done
-
-	rm -f "$rundir/ipckey"
-	rmdir "$rundir" "$logdir" 2>/dev/null || :
-	;;
-esac
diff --git a/sysutils/freeipmi/pkg-plist b/sysutils/freeipmi/pkg-plist
index d2ccab1dc83e..24777276b3ad 100644
--- a/sysutils/freeipmi/pkg-plist
+++ b/sysutils/freeipmi/pkg-plist
@@ -1,96 +1,98 @@
-%%FISH%%etc/fish/fish.scm-dist
-%%FISH%%etc/fish/ipmi-sensors-conf.scm-dist
-include/freeipmi/acpi-spmi-locate.h
-include/freeipmi/bit-ops.h
-include/freeipmi/defaults-locate.h
-include/freeipmi/fiid.h
+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
-include/freeipmi/ipmi-chassis-cmds.h
+include/freeipmi/fiid.h
+include/freeipmi/ipmi-authentication-type-spec.h
+include/freeipmi/ipmi-channel-spec.h
+include/freeipmi/ipmi-cipher-suite-spec.h
 include/freeipmi/ipmi-cmd-spec.h
 include/freeipmi/ipmi-comp-code-spec.h
-include/freeipmi/ipmi-debug.h
-include/freeipmi/ipmi-dev-global-cmds.h
-include/freeipmi/ipmi-error.h
-include/freeipmi/ipmi-interface.h
 include/freeipmi/ipmi-ipmb-interface.h
-include/freeipmi/ipmi-kcs-interface.h
-include/freeipmi/ipmi-lan-cmds.h
-include/freeipmi/ipmi-lan-interface.h
 include/freeipmi/ipmi-lan-param-spec.h
-include/freeipmi/ipmi-locate.h
-include/freeipmi/ipmi-md2.h
-include/freeipmi/ipmi-md5.h
-include/freeipmi/ipmi-msg-interface-desc.h
-include/freeipmi/ipmi-msg-support-cmds.h
 include/freeipmi/ipmi-netfn-spec.h
-include/freeipmi/ipmi-pef-cmds.h
 include/freeipmi/ipmi-pef-param-spec.h
-include/freeipmi/ipmi-sdr-record-types.h
-include/freeipmi/ipmi-sdr-repo-cache.h
-include/freeipmi/ipmi-sdr-repo-cmds.h
-include/freeipmi/ipmi-sel-api.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-debug.h
+include/freeipmi/ipmi-error.h
+include/freeipmi/ipmi-utils.h
+include/freeipmi/ipmi-locate.h
+include/freeipmi/ipmi-kcs.h
+include/freeipmi/ipmi-kcs-api.h
+include/freeipmi/ipmi-lan.h
+include/freeipmi/ipmi-lan-interface.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-messaging-support-cmds.h
+include/freeipmi/ipmi-pef-and-alerting-cmds.h
+include/freeipmi/ipmi-rmcpplus-support-and-payload-cmds.h
+include/freeipmi/ipmi-sdr-repository-cmds.h
 include/freeipmi/ipmi-sel-cmds.h
-include/freeipmi/ipmi-sel-record-types.h
-include/freeipmi/ipmi-semaphores.h
-include/freeipmi/ipmi-sensor-api.h
 include/freeipmi/ipmi-sensor-cmds.h
-include/freeipmi/ipmi-sensor-event-messages.h
-include/freeipmi/ipmi-sensor-types.h
-include/freeipmi/ipmi-sensor-utils.h
-include/freeipmi/ipmi-serial-cmds.h
-include/freeipmi/ipmi-serial-modem-param-spec.h
-include/freeipmi/ipmi-sessions.h
-include/freeipmi/ipmi-smic-interface.h
+include/freeipmi/ipmi-serial-modem-cmds.h
 include/freeipmi/ipmi-sol-cmds.h
-include/freeipmi/ipmi-ssif-interface.h
-include/freeipmi/ipmi-utils.h
-include/freeipmi/ipmi-watchdog.h
-include/freeipmi/pci-locate.h
-include/freeipmi/rmcp.h
-include/freeipmi/smbios-locate.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-utils.h
+@dirrm include/freeipmi
+include/ipmiconsole.h
 lib/libfreeipmi.a
 lib/libfreeipmi.la
 lib/libfreeipmi.so
-lib/libfreeipmi.so.%%SHLIBVER%%
-%%FISH%%sbin/bmc-autoconfig
-%%FISH%%sbin/bmc-config
-sbin/bmc-info
-sbin/bmc-watchdog
-%%FISH%%sbin/fish
-sbin/ipmi-locate
-%%FISH%%sbin/ipmi-pef
-sbin/ipmi-raw
-%%FISH%%sbin/ipmi-sel
-%%FISH%%sbin/ipmi-sensors
-sbin/ipmiping
-sbin/ipmipower
-sbin/rmcpping
-%%FISH%%share/fish/extensions/bc-common.scm
-%%FISH%%share/fish/extensions/bc-lan-conf-auth-section.scm
-%%FISH%%share/fish/extensions/bc-lan-conf-misc-section.scm
-%%FISH%%share/fish/extensions/bc-lan-conf-section.scm
-%%FISH%%share/fish/extensions/bc-lan-serial-channel-section.scm
-%%FISH%%share/fish/extensions/bc-misc-section.scm
-%%FISH%%share/fish/extensions/bc-pef-conf-section.scm
-%%FISH%%share/fish/extensions/bc-section.scm
-%%FISH%%share/fish/extensions/bc-serial-conf-section.scm
-%%FISH%%share/fish/extensions/bc-user-section.scm
-%%FISH%%share/fish/extensions/bmc-config.scm
-%%FISH%%share/fish/extensions/bmc-info.scm
-%%FISH%%share/fish/extensions/discovery.scm
-%%FISH%%share/fish/extensions/init.scm
-%%FISH%%share/fish/extensions/pef.scm
-%%FISH%%share/fish/extensions/sdr.scm
-%%FISH%%share/fish/extensions/sel.scm
-%%FISH%%share/fish/extensions/sensors-alias.scm
-%%FISH%%share/fish/extensions/sensors-common.scm
-%%FISH%%share/fish/extensions/sensors-simple-display.scm
-%%FISH%%share/fish/extensions/sensors-verbose-display.scm
-%%FISH%%share/fish/extensions/sensors-very-verbose-display.scm
-%%FISH%%share/fish/extensions/sensors.scm
-%%FISH%%share/fish/extensions/shell.scm
-%%FISH%%share/fish/extensions/utils.scm
-%%FISH%%@dirrm etc/fish
-@dirrm include/freeipmi
-%%FISH%%@dirrm share/fish/extensions
-%%FISH%%@dirrm share/fish
+lib/libfreeipmi.so.%%FREEIPMI_SHLIBVER%%
+lib/libipmiconsole.a
+lib/libipmiconsole.la
+lib/libipmiconsole.so
+lib/libipmiconsole.so.%%IPMICONSOLE_SHLIBVER%%
+var/lib/freeipmi/ipckey
+var/lib/freeipmi/bmc-config-template
+@dirrm var/lib/freeipmi
+@dirrm var/lib
+@exec mkdir -p -m 0700 %D/var/log/freeipmi
+@dirrm var/log/freeipmi