<pre style='margin:0'>
Eric A. Borisch (eborisch) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/7eb4a0e3f3eda86ac9dda5b47417d261076c9a94">https://github.com/macports/macports-ports/commit/7eb4a0e3f3eda86ac9dda5b47417d261076c9a94</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 7eb4a0e OpenIPMI: Update to 2.0.24
</span>7eb4a0e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7eb4a0e3f3eda86ac9dda5b47417d261076c9a94
</span>Author: Eric A. Borisch <eborisch@macports.org>
AuthorDate: Thu Dec 21 13:38:49 2017 -0600
<span style='display:block; white-space:pre;color:#404040;'> OpenIPMI: Update to 2.0.24
</span>---
sysutils/OpenIPMI/Portfile | 19 ++++++++-----
sysutils/OpenIPMI/files/configure.in.patch | 32 ----------------------
sysutils/OpenIPMI/files/disable-lanserv.patch | 15 ++++++++++
.../files/unix_posix_thread_os_hnd.c.patch | 30 ++++++++++++++++++++
sysutils/OpenIPMI/files/weak_symbols.patch | 28 -------------------
5 files changed, 57 insertions(+), 67 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/OpenIPMI/Portfile b/sysutils/OpenIPMI/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c65cbc2..1d24a9e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/OpenIPMI/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/OpenIPMI/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,9 +1,10 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup conflicts_build 1.0
</span>
name OpenIPMI
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.0.19
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.0.24
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> license {GPL-2 LGPL-2}
categories sysutils
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,11 +24,14 @@ universal_variant no
</span> use_parallel_build no
checksums \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 ca624701659416da55a6b96abbec6aef4d323a26 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 5b0de4741f07e350bf53b7d31bb20dd1109c2dc005dfb13969d8a9ff290f3a4e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 8323e56c414cca49ee1897b535d315e19ed470e2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 bca39a27071278a8b74610181ede8df51e155e5e9031bc8eaa3699d1720292b4
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles weak_symbols.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.in.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Grabs old headers from installed version during build...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts_build ${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles disable-lanserv.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unix_posix_thread_os_hnd.c.patch
</span>
depends_lib port:popt \
path:lib/pkgconfig/glib-2.0.pc:glib2 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,7 +46,8 @@ configure.args --with-poptlibs=-lpopt \
</span> variant python description "Build python bindings" {
configure.args-delete --with-swig=no --with-python=no
depends_lib-append port:swig-python \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py27-tkinter
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py27-tkinter \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:tix
</span> }
variant perl description "Build perl bindings" {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/OpenIPMI/files/configure.in.patch b/sysutils/OpenIPMI/files/configure.in.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b07169c..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/OpenIPMI/files/configure.in.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,32 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.in.orig 2012-09-17 12:14:53.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.in 2012-09-17 12:16:00.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -651,7 +651,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "x$pythonprog" != "x"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "x$pythonusepthreads" = "x"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- pythonusepthreads=`echo -e "try:\n import thread\n print 'yes'\nexcept:\n print 'no'\n" | python`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ pythonusepthreads=`echo "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+try:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ import thread
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ print 'yes'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+except:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ print 'no'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+" | python`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "checking for python threads... $pythonusepthreads"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -675,7 +681,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Check for Tkinter/Tix
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "x$tkinter" = "x"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "x$pythonprog" != "x"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- tkinter=`echo -e "try:\n import Tix\n print 'yes'\nexcept:\n print 'no'\n" | python`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ tkinter=`echo "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+try:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ import Tix
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ print 'yes'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+except:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ print 'no'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+" | python`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "checking for tkinter... $tkinter"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/OpenIPMI/files/disable-lanserv.patch b/sysutils/OpenIPMI/files/disable-lanserv.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..3febe02
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/OpenIPMI/files/disable-lanserv.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.am.orig 2017-12-20 12:11:54.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile.am 2017-12-20 12:12:01.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2,10 +2,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RPMFLAGS = -ta
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SUBDIRS = include utils lib unix $(GLIB_DIR) $(TCL_DIR) libedit cmdlang \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ui lanserv sample doc man $(SWIG_DIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ui sample doc man $(SWIG_DIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DIST_SUBDIRS = include utils lib unix glib tcl libedit cmdlang \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ui lanserv sample doc man swig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ui sample doc man swig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EXTRA_DIST = FAQ TODO README.Force README.MotorolaMXP OpenIPMI.spec.in \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OpenIPMI.spec ipmi.init ipmi.sysconf COPYING.BSD \
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/OpenIPMI/files/unix_posix_thread_os_hnd.c.patch b/sysutils/OpenIPMI/files/unix_posix_thread_os_hnd.c.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..5f36652
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/OpenIPMI/files/unix_posix_thread_os_hnd.c.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,30 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- unix/posix_thread_os_hnd.c.orig 2017-12-21 12:55:45.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ unix/posix_thread_os_hnd.c 2017-12-21 13:11:58.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -479,11 +479,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (rv)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return rv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* Not supported on OSX */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rv = pthread_condattr_setclock(&attr, CLOCK_MONOTONIC);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (rv) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pthread_condattr_destroy(&attr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return rv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cond = malloc(sizeof(*cond));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!cond) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -536,7 +539,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct timeval now;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int rv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* OSX pthread_cond_timedwait() is based on REALTIME */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ rv = handler->get_real_time(handler, &now);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rv = handler->get_monotonic_time(handler, &now);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (rv)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return rv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/OpenIPMI/files/weak_symbols.patch b/sysutils/OpenIPMI/files/weak_symbols.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index a867728..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/OpenIPMI/files/weak_symbols.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,28 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- unix/posix_os_hnd.c.orig 2012-09-13 12:00:06.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ unix/posix_os_hnd.c 2012-09-13 12:00:19.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -51,9 +51,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* CHEAP HACK - we don't want the user to have to provide this any
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- more. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--extern void posix_vlog(char *format,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+void posix_vlog(char *format,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- enum ipmi_log_type_e log_type,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- va_list ap);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ va_list ap) {};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #pragma weak posix_vlog
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typedef struct iposix_info_s
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- unix/posix_thread_os_hnd.c.orig 2012-09-13 12:15:55.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ unix/posix_thread_os_hnd.c 2012-09-13 12:16:10.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -59,9 +59,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* CHEAP HACK - we don't want the user to have to provide this any
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- more. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--extern void posix_vlog(char *format,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+void posix_vlog(char *format,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- enum ipmi_log_type_e log_type,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- va_list ap);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ va_list ap) {};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #pragma weak posix_vlog
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typedef struct pt_os_hnd_data_s
</span></pre><pre style='margin:0'>
</pre>