Upgrade to 2.0.21

4 files changed, 41 insertions, 4 deletions

diff --git a/sysutils/openipmi/Makefile b/sysutils/openipmi/Makefile
index 3f0d56562d5f..b4c67d353873 100644
--- a/sysutils/openipmi/Makefile
+++ b/sysutils/openipmi/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	openipmi
-PORTVERSION=	2.0.19
-PORTREVISION=	4
+PORTVERSION=	2.0.21
 CATEGORIES=	sysutils
 MASTER_SITES=	SF/${PORTNAME}/OpenIPMI%202.0%20Library
 DISTNAME=	OpenIPMI-${PORTVERSION}
@@ -123,5 +122,14 @@ PLIST_SUB+=		GLIB20="@comment "
 post-patch:
 	@${REINPLACE_CMD} '/libOpenIPMIutils_la_LIBADD =/s/$$/ -lexecinfo/' \
 		${WRKSRC}/utils/Makefile.in
+	@${REINPLACE_CMD} 's|malloc.h|stdlib.h|' \
+		${WRKSRC}/lanserv/sdrcomp/sdrcomp.c \
+		${WRKSRC}/lanserv/extcmd.c \
+		${WRKSRC}/lanserv/bmc_app.c \
+		${WRKSRC}/lanserv/bmc_storage.c \
+		${WRKSRC}/lanserv/bmc_picmg.c \
+		${WRKSRC}/lanserv/bmc_sensor.c
+	@${REINPLACE_CMD} 's|-ldl||' \
+		${WRKSRC}/lanserv/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/sysutils/openipmi/distinfo b/sysutils/openipmi/distinfo
index 3b8b1821250f..db90f37bc1ae 100644
--- a/sysutils/openipmi/distinfo
+++ b/sysutils/openipmi/distinfo
@@ -1,2 +1,2 @@
-SHA256 (OpenIPMI-2.0.19.tar.gz) = 5b0de4741f07e350bf53b7d31bb20dd1109c2dc005dfb13969d8a9ff290f3a4e
-SIZE (OpenIPMI-2.0.19.tar.gz) = 2971041
+SHA256 (OpenIPMI-2.0.21.tar.gz) = 37b844d02119b94b31e2bb2bd8062ffdf6cd3eb4bc75fa6c47184e8b14fe95b8
+SIZE (OpenIPMI-2.0.21.tar.gz) = 3473323
diff --git a/sysutils/openipmi/files/patch-lanserv_extcmd.c b/sysutils/openipmi/files/patch-lanserv_extcmd.c
new file mode 100644
index 000000000000..3fed0d33ab35
--- /dev/null
+++ b/sysutils/openipmi/files/patch-lanserv_extcmd.c
@@ -0,0 +1,15 @@
+--- lanserv/extcmd.c.orig	2015-07-30 03:31:16 UTC
++++ lanserv/extcmd.c
+@@ -52,10 +52,11 @@
+  *      products derived from this software without specific prior
+  *      written permission.
+  */
++#include <sys/types.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+-#include <netinet/ether.h>
++#include <net/ethernet.h>
+ #include <ctype.h>
+ #include <string.h>
+ #include <errno.h>
diff --git a/sysutils/openipmi/pkg-plist b/sysutils/openipmi/pkg-plist
index a5f644079781..e2f69095a01e 100644
--- a/sysutils/openipmi/pkg-plist
+++ b/sysutils/openipmi/pkg-plist
@@ -1,4 +1,5 @@
 @comment common files list
+bin/ipmi_sim
 bin/ipmi_ui
 bin/ipmicmd
 bin/ipmilan
@@ -6,7 +7,11 @@ bin/ipmish
 bin/openipmicmd
 bin/openipmish
 bin/rmcp_ping
+bin/sdrcomp
 bin/solterm
+etc/ipmi/ipmisim1.emu
+etc/ipmi/lan.conf
+include/OpenIPMI/extcmd.h
 include/OpenIPMI/internal/ilist.h
 include/OpenIPMI/internal/ipmi_control.h
 include/OpenIPMI/internal/ipmi_domain.h
@@ -47,15 +52,21 @@ include/OpenIPMI/ipmi_sdr.h
 include/OpenIPMI/ipmi_smi.h
 include/OpenIPMI/ipmi_sol.h
 include/OpenIPMI/ipmi_solparm.h
+include/OpenIPMI/ipmi_string.h
 include/OpenIPMI/ipmi_tcl.h
 include/OpenIPMI/ipmi_types.h
 include/OpenIPMI/ipmi_ui.h
 include/OpenIPMI/ipmi_user.h
 include/OpenIPMI/ipmiif.h
 include/OpenIPMI/lanserv.h
+include/OpenIPMI/mcserv.h
+include/OpenIPMI/msg.h
 include/OpenIPMI/mxp.h
 include/OpenIPMI/os_handler.h
+include/OpenIPMI/persist.h
 include/OpenIPMI/selector.h
+include/OpenIPMI/serserv.h
+include/OpenIPMI/serv.h
 lib/libIPMIlanserv.a
 lib/libIPMIlanserv.so
 lib/libIPMIlanserv.so.0
@@ -90,12 +101,15 @@ libdata/pkgconfig/OpenIPMIposix.pc
 libdata/pkgconfig/OpenIPMIpthread.pc
 libdata/pkgconfig/OpenIPMIui.pc
 libdata/pkgconfig/OpenIPMIutils.pc
+man/man1/ipmi_sim.1.gz
 man/man1/ipmi_ui.1.gz
 man/man1/openipmicmd.1.gz
 man/man1/openipmigui.1.gz
 man/man1/openipmish.1.gz
 man/man1/rmcp_ping.1.gz
 man/man1/solterm.1.gz
+man/man5/ipmi_lan.5.gz
+man/man5/ipmi_sim_cmd.5.gz
 man/man7/ipmi_cmdlang.7.gz
 man/man7/openipmi_conparms.7.gz
 man/man8/ipmilan.8.gz