Update to version 1.8.7 which has the changes to detect FreeBSD's

ipmi(4) device.  Remove patch and hack to make the patch work.

Submitted by:	Dmitry (maintainer)

3 files changed, 6 insertions, 59 deletions

diff --git a/sysutils/ipmitool/Makefile b/sysutils/ipmitool/Makefile
index 76552d8ee191..5ce43e4a0d30 100644
--- a/sysutils/ipmitool/Makefile
+++ b/sysutils/ipmitool/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	ipmitool
-PORTVERSION=	1.8.6
-PORTREVISION=	1
+PORTVERSION=	1.8.7
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -17,9 +16,6 @@ COMMENT=	CLI to manage IPMI systems
 
 USE_GMAKE=	yes
 USE_OPENSSL=	yes
-USE_AUTOTOOLS=	autoconf:259 libtool:15 aclocal:19 automake:19
-# libtool15 installs it's aclocal macros into ${LOCALBASE}/share/aclocal
-ACLOCAL_ARGS=	--acdir=${ACLOCAL_DIR} -I ${LOCALBASE}/share/aclocal
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS+=	--enable-intf-lan --enable-intf-lanplus \
@@ -33,17 +29,14 @@ 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
+		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
 
 .include <bsd.port.pre.mk>
 
-# Silence automake about missing files
-pre-configure:
-	@${TOUCH} ${WRKSRC}/NEWS ${WRKSRC}/INSTALL
-
 # FreeBSD has OpenIPMI-compatible driver, ipmi(4),
 # in 7-current after 2006-02-12. On older systems
 # only lan and lanplus interfaces are supported.
diff --git a/sysutils/ipmitool/distinfo b/sysutils/ipmitool/distinfo
index 2304658c6dfa..24e15b4ab081 100644
--- a/sysutils/ipmitool/distinfo
+++ b/sysutils/ipmitool/distinfo
@@ -1,4 +1,3 @@
-MD5 (ipmitool-1.8.6.tar.gz) = ee4196ccea99898c31b16099ac905260
-SHA256 (ipmitool-1.8.6.tar.gz) = dcfe5961dbdcffb4dbeac87f2b8bd854a659af101628c6fa94d8077f16f63050
-SIZE (ipmitool-1.8.6.tar.gz) = 611126
-SIZE (ipmitool-1.8.2.tar.gz) = 556042
+MD5 (ipmitool-1.8.7.tar.gz) = 8e581db152c97a8c402f94a13bd7aa67
+SHA256 (ipmitool-1.8.7.tar.gz) = 09f5661869804c1ee6e98cf86c79d911a94e5e9e18a8df0fe1471927ef05f77c
+SIZE (ipmitool-1.8.7.tar.gz) = 628278
diff --git a/sysutils/ipmitool/files/patch-aa b/sysutils/ipmitool/files/patch-aa
deleted file mode 100644
index 7c803d7904fb..000000000000
--- a/sysutils/ipmitool/files/patch-aa
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -ruN ../ipmitool-1.8.6/config.h.in ./config.h.in
---- ../ipmitool-1.8.6/config.h.in	Tue Jan 17 23:54:02 2006
-+++ ./config.h.in	Thu Feb 16 15:41:18 2006
-@@ -24,6 +24,9 @@
- /* Define to 1 if you have the <fcntl.h> header file. */
- #undef HAVE_FCNTL_H
- 
-+/* Define to 1 if you have the <sys/ipmi.h> header file. */
-+#undef HAVE_FREEBSD_IPMI_H
-+
- /* Define to 1 if you have the `gethostbyname' function. */
- #undef HAVE_GETHOSTBYNAME
- 
-diff -ruN ../ipmitool-1.8.6/configure.in ./configure.in
---- ../ipmitool-1.8.6/configure.in	Tue Jan 17 23:50:29 2006
-+++ ./configure.in	Thu Feb 16 15:48:14 2006
-@@ -192,7 +192,10 @@
- AC_CHECK_HEADER([linux/ipmi.h],
- 	[AC_DEFINE(HAVE_OPENIPMI_H, [1],
- 	[Define to 1 if you have the <linux/ipmi.h> header file.])],
--	[echo "** Unable to find OpenIPMI header files.  Using internal version."])
-+	[AC_CHECK_HEADER([sys/ipmi.h],
-+		[AC_DEFINE(HAVE_FREEBSD_IPMI_H, [1],
-+		[Define to 1 if you have the <sys/ipmi.h> header file.])],
-+		[echo "** Unable to find OpenIPMI header files.  Using internal version."])])
- 
- dnl set RPM distro tag for use in RPM name
- AC_ARG_WITH([rpm-distro],
-diff -ruN ../ipmitool-1.8.6/src/plugins/open/open.c ./src/plugins/open/open.c
---- ../ipmitool-1.8.6/src/plugins/open/open.c	Tue Jul 12 21:49:12 2005
-+++ ./src/plugins/open/open.c	Thu Feb 16 15:41:51 2006
-@@ -51,9 +51,12 @@
- 
- #include <config.h>
- 
--#ifdef HAVE_OPENIPMI_H
-+#if defined(HAVE_OPENIPMI_H)
- # include <linux/compiler.h>
- # include <linux/ipmi.h>
-+#elif defined(HAVE_FREEBSD_IPMI_H)
-+/* FreeBSD OpenIPMI-compatible header */
-+# include <sys/ipmi.h>
- #else
- # include "open.h"
- #endif