5 files changed, 6 insertions, 57 deletions

diff --git a/sysutils/ipmitool/Makefile b/sysutils/ipmitool/Makefile
index 2693f129d1c5..a0b8c66c6f28 100644
--- a/sysutils/ipmitool/Makefile
+++ b/sysutils/ipmitool/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ipmitool
-PORTVERSION=	1.8.2
+PORTVERSION=	1.8.6
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -20,7 +20,8 @@ GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 # On FreeBSD only lan and lanplus interfaces are supported at this time
 CONFIGURE_ARGS+=	--enable-intf-lan --enable-intf-lanplus \
-		--disable-intf-open --disable-intf-imb --disable-intf-lipmi
+		--disable-intf-open --disable-intf-imb --disable-intf-lipmi \
+		--disable-intf-bmc
 PLIST_FILES=	bin/ipmitool sbin/ipmievd
 PLIST_DIRS=	share/${PORTNAME}
 PORTDOCS=	README AUTHORS ChangeLog COPYING
diff --git a/sysutils/ipmitool/distinfo b/sysutils/ipmitool/distinfo
index 8a92b4542009..2304658c6dfa 100644
--- a/sysutils/ipmitool/distinfo
+++ b/sysutils/ipmitool/distinfo
@@ -1,3 +1,4 @@
-MD5 (ipmitool-1.8.2.tar.gz) = d249ddd2176385fcea93753f5e103160
-SHA256 (ipmitool-1.8.2.tar.gz) = 21dec8166e0b5d89a9563f190a713a5bd1082ea8028047d1c9877818297034bb
+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
diff --git a/sysutils/ipmitool/files/patch-lib_helper.c b/sysutils/ipmitool/files/patch-lib_helper.c
deleted file mode 100644
index 268de36d0030..000000000000
--- a/sysutils/ipmitool/files/patch-lib_helper.c
+++ /dev/null
@@ -1,25 +0,0 @@
---- lib/helper.c.orig	Wed May 18 03:58:05 2005
-+++ lib/helper.c	Tue May 31 22:01:31 2005
-@@ -34,17 +34,20 @@
-  * facility.
-  */
- 
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <sys/ioctl.h>	/* For TIOCNOTTY */
-+
- #include <stdlib.h>
- #include <stdio.h>
- #include <inttypes.h>
- #include <signal.h>
- #include <string.h>
- #include <strings.h>
--#include <sys/types.h>
--#include <sys/stat.h>
- #include <unistd.h>
- #include <fcntl.h>
- #include <errno.h>
-+#include <paths.h>		/* For _PATH_TTY */
- 
- #include <ipmitool/helper.h>
- #include <ipmitool/log.h>
diff --git a/sysutils/ipmitool/files/patch-lib_ipmi__lang.c b/sysutils/ipmitool/files/patch-lib_ipmi__lang.c
deleted file mode 100644
index b6b93901d7d5..000000000000
--- a/sysutils/ipmitool/files/patch-lib_ipmi__lang.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- lib/ipmi_lanp.c.orig	Thu Mar 24 07:39:01 2005
-+++ lib/ipmi_lanp.c	Tue Apr  5 09:17:30 2005
-@@ -38,11 +38,11 @@
- #include <stdio.h>
- #include <string.h>
- #include <strings.h>
-+#include <sys/types.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
- #include <errno.h>
--#include <sys/types.h>
- #include <unistd.h>
- #include <signal.h>
- #include <setjmp.h>
diff --git a/sysutils/ipmitool/files/patch-src_ipmishell.c b/sysutils/ipmitool/files/patch-src_ipmishell.c
deleted file mode 100644
index 5336418f7009..000000000000
--- a/sysutils/ipmitool/files/patch-src_ipmishell.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/ipmishell.c.orig	Sat Jan  8 04:43:38 2005
-+++ src/ipmishell.c	Sun Feb  6 23:47:32 2005
-@@ -114,7 +114,9 @@
- 		rl_event_hook = rl_event_keepalive;
- #if defined(RL_READLINE_VERSION) && RL_READLINE_VERSION >= 0x0402
- 		/* set to 1 second */
--		rl_set_keyboard_input_timeout(1000*1000);
-+		/* There is a bug in readline 4.2 and later (at least on FreeBSD):
-+		 * timeout equal or greater than 1 second causes an infinite loop. */
-+		rl_set_keyboard_input_timeout(1000 * 1000 - 1);
- #endif
- 	}
-