OpenIPMI: Update to 2.0.29

[Juraj Lutter <otis%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Juraj Lutter <otis%NetBSD.org@localhost>
Pushed By:	otis
Date:		Wed Oct 7 15:56:00 2020 +0000
Changeset:	1f240e3ee8bcdb0d6bd1854f33361086a7571e38

Modified Files:
	OpenIPMI/Makefile
	OpenIPMI/PLIST
	OpenIPMI/distinfo
	OpenIPMI/patches/patch-configure
Removed Files:
	OpenIPMI/patches/patch-ipmi.init

Log Message:
OpenIPMI: Update to 2.0.29

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=1f240e3ee8bcdb0d6bd1854f33361086a7571e38

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 OpenIPMI/Makefile                | 12 +++++++++---
 OpenIPMI/PLIST                   |  1 +
 OpenIPMI/distinfo                | 11 +++++------
 OpenIPMI/patches/patch-configure | 35 +++++++++--------------------------
 OpenIPMI/patches/patch-ipmi.init | 23 -----------------------
 5 files changed, 24 insertions(+), 58 deletions(-)

diffs:
diff --git a/OpenIPMI/Makefile b/OpenIPMI/Makefile
index 5d6be2662a..f49398ce26 100644
--- a/OpenIPMI/Makefile
+++ b/OpenIPMI/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD$
 
-DISTNAME=	OpenIPMI-2.0.24
+DISTNAME=	OpenIPMI-2.0.29
 CATEGORIES=	devel
 MASTER_SITES=	https://newcontinuum.dl.sourceforge.net/project/openipmi/OpenIPMI%202.0%20Library/
 
@@ -9,10 +9,13 @@ HOMEPAGE=	http://openipmi.sourceforge.net/
 COMMENT=	User-level library that provides a higher-level abstraction of IPMI
 LICENSE=	gnu-lgpl-v2
 
-WRKSRC=		${WRKDIR}/OpenIPMI
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
-USE_TOOLS+=	pkg-config gmake
+USE_TOOLS+=	gmake perl pkg-config
+
+CONFIGURE_ARGS+=	--with-python=${LOCALBASE}/bin/python${PYVERSSUFFIX}
+CONFIGURE_ARGS+=	--with-perl=no
+CONFIGURE_ARGS+=	--with-swig=no
 
 PKGCONFIG_OVERRIDE+=	OpenIPMI.pc.in
 PKGCONFIG_OVERRIDE+=	OpenIPMIcmdlang.pc.in
@@ -25,5 +28,8 @@ PKGCONFIG_OVERRIDE+=	OpenIPMIui.pc.in
 PKGCONFIG_OVERRIDE+=	OpenIPMIutils.pc.in
 
 .include "../../devel/popt/buildlink3.mk"
+.include "../../lang/python/pyversion.mk"
+.include "../../lang/perl5/buildlink3.mk"
 .include "../../mk/curses.buildlink3.mk"
+.include "../../mk/readline.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/OpenIPMI/PLIST b/OpenIPMI/PLIST
index 9d1776e986..6169c184a8 100644
--- a/OpenIPMI/PLIST
+++ b/OpenIPMI/PLIST
@@ -30,6 +30,7 @@ include/OpenIPMI/internal/locked_list.h
 include/OpenIPMI/internal/md2.h
 include/OpenIPMI/internal/md5.h
 include/OpenIPMI/internal/opq.h
+include/OpenIPMI/ipmbserv.h
 include/OpenIPMI/ipmi_addr.h
 include/OpenIPMI/ipmi_auth.h
 include/OpenIPMI/ipmi_bits.h
diff --git a/OpenIPMI/distinfo b/OpenIPMI/distinfo
index 946826cc2c..66bdaa414a 100644
--- a/OpenIPMI/distinfo
+++ b/OpenIPMI/distinfo
@@ -1,8 +1,7 @@
 $NetBSD$
 
-SHA1 (OpenIPMI-2.0.24.tar.gz) = 3d62e3610c8ef472bb7199757a1e5707fc905274
-RMD160 (OpenIPMI-2.0.24.tar.gz) = ce2d73cd88118eed311ced3572c05064e9e42bdc
-SHA512 (OpenIPMI-2.0.24.tar.gz) = bf768efff80fd042a99308c0b9fa45a7608b6a9a025f0d564e32e2b224d0c6af8bf8aba8418fc5411c43b2fec74eeb989c3beb6b2b1828d7bc73eea53f0670a8
-Size (OpenIPMI-2.0.24.tar.gz) = 2508111 bytes
-SHA1 (patch-configure) = 3e1a2e56a328225f9049dbbfa8120a682c14be8e
-SHA1 (patch-ipmi.init) = 4d28bc719d7f00a98d03d1256d88cc4eb5a4011a
+SHA1 (OpenIPMI-2.0.29.tar.gz) = a8dd1a9b877e94926af1da69421e8f2bd642c9c7
+RMD160 (OpenIPMI-2.0.29.tar.gz) = 1a82606dca2e585a5075eeb40e23aa10029724db
+SHA512 (OpenIPMI-2.0.29.tar.gz) = ff23aadfe4b9002574d1f06dda3d61f7a03ef1df2c61855516b7d67bd6d3272c53af74e3412e1045242dcb845f50b7c542083e918805c0efac424dd86e720a10
+Size (OpenIPMI-2.0.29.tar.gz) = 3119530 bytes
+SHA1 (patch-configure) = 633922a3546f3be1b7dd5cd9b409d2359181e463
diff --git a/OpenIPMI/patches/patch-configure b/OpenIPMI/patches/patch-configure
index 0f6d6e957f..10bd4bef2f 100644
--- a/OpenIPMI/patches/patch-configure
+++ b/OpenIPMI/patches/patch-configure
@@ -1,32 +1,15 @@
 $NetBSD$
-#remove == for portability
 
---- configure.orig     2017-08-03 01:48:38.000000000 +0000
+Fix bashisms
+
+--- configure.orig	2020-06-12 14:14:25.000000000 +0000
 +++ configure
-@@ -13192,7 +13192,7 @@ fi
- 
- echo "checking for tcl... $havetcl"
- 
--if test "x$havetcl" == "xyes"; then
-+if test "x$havetcl" = "xyes"; then
-    OLDLIBS="$LIBS"
-    LIBS="$LIBS $TCL_LIBS"
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -14048,7 +14048,7 @@ fi
- if test "x$diaprog" != "x"; then
-    diaver=`$diaprog --version 2>&1 | sed 's/Dia version \([^,]*\), .*$/\1/'`
-    tmp=`echo $diaver | sed 's/^[0-9.]\+$//'`
--   if test "x$diaver" == "x" -o "x$tmp" != 'x'; then
-+   if test "x$diaver" = "x" -o "x$tmp" != 'x'; then
-       # Couldn't get the dia version, give up.
-       echo "Couldn't determine the dia version from '$diaver'"
-    else
-@@ -14188,7 +14188,7 @@ $as_echo "no" >&6; }
+@@ -13061,7 +13061,7 @@ if test "x$ac_cv_header_tcl_tcl_h" = xye
  fi
  
  
--if test "x$DIA" == "x" -o "x$LATEX" == "x" -o "x$BIBTEX" == "x" -o "x$DVIPDF" == "x"; then
-+if test "x$DIA" = "x" -o "x$LATEX" = "x" -o "x$BIBTEX" = "x" -o "x$DVIPDF" = "x"; then
-    echo "dia, latex, bibtex, and/or dvipdf is not present or not valid, you cannot regenerate documentation"
-    echo "The documentation comes already generated, so this is generally not a problem"
- fi
+-	 if test "x$FOUND_TCL_HEADER" == "xyes"; then
++	 if test "x$FOUND_TCL_HEADER" = "xyes"; then
+ 	    tclcflags="-I /usr/include/tcl$ver"
+             TCL_CFLAGS="$tclcflags"
+ 	 fi
diff --git a/OpenIPMI/patches/patch-ipmi.init b/OpenIPMI/patches/patch-ipmi.init
deleted file mode 100644
index 81ab6fc7d5..0000000000
--- a/OpenIPMI/patches/patch-ipmi.init
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD$
-#remove == for portability
-
---- ipmi.init.orig     2017-08-03 01:39:15.000000000 +0000
-+++ ipmi.init
-@@ -89,7 +89,7 @@ INTF_NUM=0
- IPMI_SMB_MODULE_NAME="ipmi_smb"
- IPMI_SI_MODULE_NAME="ipmi_si"
- kernel=`uname -r | cut -d. -f1-2`
--if [ "${kernel}" == "2.4" ]; then
-+if [ "${kernel}" = "2.4" ]; then
-     IPMI_SMB_MODULE_NAME="ipmi_smb_intf"
-     IPMI_SI_MODULE_NAME="ipmi_si_drv"
- fi
-@@ -283,7 +283,7 @@ start_powercontrol_common()
- {
-       local poweroff_opts=""
-       load_hw_modules
--      if [ "${IPMI_POWERCYCLE}" == "yes" ]; then
-+      if [ "${IPMI_POWERCYCLE}" = "yes" ]; then
-           modinfo ipmi_poweroff 2>/dev/null | grep poweroff_control > /dev/null 2>&1 && \
-               poweroff_opts="poweroff_control=2"
-           modinfo ipmi_poweroff 2>/dev/null | grep poweroff_powercycle > /dev/null 2>&1 && \