4 files changed, 36 insertions, 39 deletions

diff --git a/sysutils/ipmitool/Makefile b/sysutils/ipmitool/Makefile
index dc6248d11a2e..00eaa429dc20 100644
--- a/sysutils/ipmitool/Makefile
+++ b/sysutils/ipmitool/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	ipmitool
-PORTVERSION=	1.8.8
-PORTREVISION=	1
+PORTVERSION=	1.8.9
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,38 +14,47 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	frolov@riss-telecom.ru
 COMMENT=	CLI to manage IPMI systems
 
+USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS+=	--enable-intf-lan --enable-intf-lanplus \
 		--disable-intf-imb --disable-intf-lipmi --disable-intf-bmc \
-		${OPENIPMI_OPT}
+		--mandir=${MANPREFIX}/man
+CONFIGURE_ENV+=	CC="${CC}" CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" \
+	LDFLAGS="${LDFLAGS}"
 PLIST_FILES=	bin/ipmitool sbin/ipmievd
-PLIST_DIRS=	share/${PORTNAME}
-PORTDOCS=	README AUTHORS ChangeLog COPYING
+PORTDOCS=	*
 MAN1+=		${PORTNAME}.1
 MAN8+=		ipmievd.8
 
-DATAFILES=	bmclanconf ipmi.init.basic ipmi.init.redhat README \
-		collect_data.sh create_rrds.sh create_webpage_compact.sh \
-		create_webpage.sh oem_ibm_sel_map ipmievd.init.redhat \
-		ipmievd.init.suse ipmievd.init.debian
-.for f in ${DATAFILES}
-PLIST_FILES+=	share/${PORTNAME}/${f}
-.endfor
+.if defined(WITH_DEBUG)
+CFLAGS+=	-ggdb -Wall
+.endif
 
 .include <bsd.port.pre.mk>
 
 .if exists(/usr/include/sys/ipmi.h)
-OPENIPMI_OPT=	--enable-intf-open
+CONFIGURE_ARGS+=	--enable-intf-open
 .elif defined(WITH_IPMI_KMOD) || \
 	exists(${LOCALBASE}/include/sys/ipmi.h)
 BUILD_DEPENDS+=	${LOCALBASE}/include/sys/ipmi.h:${PORTSDIR}/sysutils/ipmi-kmod
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include"
-OPENIPMI_OPT=	--enable-intf-open
+CPPFLAGS+=	-I${LOCALBASE}/include
+CONFIGURE_ARGS+=	--enable-intf-open
+.else
+CONFIGURE_ARGS+=	--disable-intf-open
+.endif
+
+.if defined(WITH_FREEIPMI) || \
+	(exists(${LOCALBASE}/include/freeipmi/freeipmi.h) && \
+		!defined(WITHOUT_FREEIPMI))
+LIB_DEPENDS+=	freeipmi:${PORTSDIR}/sysutils/freeipmi
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+CONFIGURE_ARGS+=	--enable-intf-free
 .else
-OPENIPMI_OPT=	--disable-intf-open
+CONFIGURE_ARGS+=	--disable-intf-free
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/sysutils/ipmitool/distinfo b/sysutils/ipmitool/distinfo
index 832c081e3998..fcd4057ec861 100644
--- a/sysutils/ipmitool/distinfo
+++ b/sysutils/ipmitool/distinfo
@@ -1,3 +1,3 @@
-MD5 (ipmitool-1.8.8.tar.gz) = 8ae20a7621b00148acacab5b44540f3e
-SHA256 (ipmitool-1.8.8.tar.gz) = 5d0abd9131d066faf0119722159dc8e768ff373fa30cb1a49dc5c376c9e36909
-SIZE (ipmitool-1.8.8.tar.gz) = 634899
+MD5 (ipmitool-1.8.9.tar.bz2) = af3d63b17a22744fb77b8c0ceb104b72
+SHA256 (ipmitool-1.8.9.tar.bz2) = 174e9ebacc9a63a0758a196532d1d1bc9ba8a3cb150fd66fbc50c5bc746a4845
+SIZE (ipmitool-1.8.9.tar.bz2) = 513004
diff --git a/sysutils/ipmitool/files/patch-lanplus.c b/sysutils/ipmitool/files/patch-lanplus.c
deleted file mode 100644
index 1c1de1436045..000000000000
--- a/sysutils/ipmitool/files/patch-lanplus.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/plugins/lanplus/lanplus.c.orig	Fri Apr 21 09:34:30 2006
-+++ src/plugins/lanplus/lanplus.c	Thu Jan 18 21:12:54 2007
-@@ -2456,7 +2456,7 @@
- {
- 	struct ipmi_rs * rsp = ipmi_lan_poll_recv(intf);
- 	
--   if(rsp->session.authtype != 0)
-+   if(rsp != NULL && rsp->session.authtype != 0)
-    {
-    	ack_sol_packet(intf, rsp);	              
- 
diff --git a/sysutils/ipmitool/pkg-descr b/sysutils/ipmitool/pkg-descr
index 14cba7d6e676..149d5ab602e7 100644
--- a/sysutils/ipmitool/pkg-descr
+++ b/sysutils/ipmitool/pkg-descr
@@ -1,13 +1,13 @@
-Quoting IPMITool homepage:
+Quoting IPMItool homepage:
 
-"IPMItool is a simple command-line interface to systems that support the
-Intelligent Platform Management Interface (IPMI) v1.5 specification. It
-provides the ability to read the SDR and print sensor values, display
-the contents of the SEL, print FRU information, read and set LAN
-configuration parameters, and perform chassis power control."
+"IPMItool is a utility for managing and configuring devices that
+support the Intelligent Platform Management Interface (IPMI) version
+1.5 and version 2.0 specifications. IPMI is an open standard for
+monitoring, logging, recovery, inventory, and control of hardware that
+is implemented independent of the main CPU, BIOS, and OS."
 
-FreeBSD has ipmi(4) driver for in-band IPMI operations in
-7-current after 2006-02-12. On older systems only out-of-band
-LAN and LANPlus interfaces are supported.
+FreeBSD has OpenIPMI-compatible ipmi(4) driver for in-band IPMI
+operations in the base system starting from 6.2 release. On older
+systems sysutils/ipmi-kmod port is available.
 
 WWW: http://ipmitool.sourceforge.net/