svn commit: r477959 - in head/sysutils/openipmi: . files
Renato Botelho
garga at FreeBSD.org
Fri Aug 24 12:46:10 UTC 2018
Author: garga
Date: Fri Aug 24 12:46:07 2018
New Revision: 477959
URL: https://svnweb.freebsd.org/changeset/ports/477959
Log:
sysutils/openipmi: Update to 2.0.25
Pass maintainership to submitter
PR: 230052
Submitted by: Vinícius Zavam <egypcio at googlemail.com>
Sponsored by: Rubicon Communications, LLC (Netgate)
Added:
head/sysutils/openipmi/files/extra-patch-glib_glib__os__hnd.c (contents, props changed)
head/sysutils/openipmi/files/extra-patch-swig_perl_Makefile.in (contents, props changed)
Deleted:
head/sysutils/openipmi/files/patch-OpenIPMIpthread.pc.in
head/sysutils/openipmi/files/patch-configure
head/sysutils/openipmi/files/patch-lib_rakp.c
head/sysutils/openipmi/files/patch-swig_perl_Makefile.in
Modified:
head/sysutils/openipmi/Makefile
head/sysutils/openipmi/distinfo
head/sysutils/openipmi/files/patch-lanserv_extcmd.c
head/sysutils/openipmi/pkg-plist
Modified: head/sysutils/openipmi/Makefile
==============================================================================
--- head/sysutils/openipmi/Makefile Fri Aug 24 11:50:32 2018 (r477958)
+++ head/sysutils/openipmi/Makefile Fri Aug 24 12:46:07 2018 (r477959)
@@ -2,27 +2,24 @@
# $FreeBSD$
PORTNAME= openipmi
-PORTVERSION= 2.0.21
-PORTREVISION= 1
+PORTVERSION= 2.0.25
CATEGORIES= sysutils
MASTER_SITES= SF/${PORTNAME}/OpenIPMI%202.0%20Library
DISTNAME= OpenIPMI-${PORTVERSION}
-MAINTAINER= ports at FreeBSD.org
+MAINTAINER= egypcio at googlemail.com
COMMENT= Complex IPMI management software
LICENSE= GPLv2
+LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libpopt.so:devel/popt
GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
-USES= gmake libtool ncurses pathfix pkgconfig
+USES= gmake libtool ncurses pathfix pkgconfig localbase:ldflags
USE_LDCONFIG= yes
-CPPFLAGS+= -I../include -I${LOCALBASE}/include
-LIBS+= -L${LOCALBASE}/lib
-
OPTIONS_DEFINE= SSL SNMP PERL PYTHON TCL TKINTER GDBM
OPTIONS_RADIO= GLIB
OPTIONS_RADIO_GLIB= GLIB12 GLIB20
@@ -58,8 +55,8 @@ CONFIGURE_ARGS+= --with-openssl=no
.endif
.if ${PORT_OPTIONS:MTKINTER}
-USES+= python
-WITH_PYTHON= yes
+USES+= python shebangfix
+SHEBANG_FILES= swig/python/openipmigui.py
BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR} \
${LOCALBASE}/lib/Tix8.4.3/Tix.tcl:x11-toolkits/tix
CONFIGURE_ARGS+= --with-tkinter
@@ -72,11 +69,14 @@ PLIST_SUB+= TKINTER="@comment "
.if ${PORT_OPTIONS:MPERL}
WITH_SWIG= yes
USES+= perl5
-CONFIGURE_ARGS+= --with-perl
-PLIST_SUB+= PERL=""
+CONFIGURE_ARGS+= --with-perl ac_cv_path_perlprog=${PERL}
+LDFLAGS+= -L${SITE_ARCH}
+LIBS+= -L${SITE_ARCH}
+PLIST_SUB+= OIPMIPERL=""
+EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-swig_perl_Makefile.in
.else
CONFIGURE_ARGS+= --with-perl=no
-PLIST_SUB+= PERL="@comment "
+PLIST_SUB+= OIPMIPERL="@comment "
.endif
.if ${PORT_OPTIONS:MPYTHON}
@@ -106,21 +106,23 @@ LIB_DEPENDS+= libgdbm.so:databases/gdbm
.endif
.if ${PORT_OPTIONS:MGLIB12}
-USE_GNOME+= glib12
-CONFIGURE_ARGS+= --with-glib12 --with-glibver=1.2
-PLIST_SUB+= GLIB12=""
+USE_GNOME= glib12
+CONFIGURE_ARGS+= --with-glib --with-glibver=1.2 \
+ --with-glibcflags=-I${LOCALBASE}/include/glib-1.2 \
+ --with-gliblibs="-L${LOCALBASE}/lib -lglib -lgthread"
+MAKE_ENV+= GLIB_MAJOR_VERSION=1
+EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-glib_glib__os__hnd.c
+PLIST_SUB+= GLIB=""
.else
-CONFIGURE_ARGS+= --with-glib12=no
-PLIST_SUB+= GLIB12="@comment "
+PLIST_SUB+= GLIB="@comment "
.endif
.if ${PORT_OPTIONS:MGLIB20}
-USE_GNOME+= glib20
+USE_GNOME= glib20
CONFIGURE_ARGS+= --with-glib --with-glibver=2.0
-PLIST_SUB+= GLIB20=""
+PLIST_SUB+= GLIB=""
.else
-CONFIGURE_ARGS+= --with-glib=no
-PLIST_SUB+= GLIB20="@comment "
+PLIST_SUB+= GLIB="@comment "
.endif
post-patch:
Modified: head/sysutils/openipmi/distinfo
==============================================================================
--- head/sysutils/openipmi/distinfo Fri Aug 24 11:50:32 2018 (r477958)
+++ head/sysutils/openipmi/distinfo Fri Aug 24 12:46:07 2018 (r477959)
@@ -1,2 +1,3 @@
-SHA256 (OpenIPMI-2.0.21.tar.gz) = 37b844d02119b94b31e2bb2bd8062ffdf6cd3eb4bc75fa6c47184e8b14fe95b8
-SIZE (OpenIPMI-2.0.21.tar.gz) = 3473323
+TIMESTAMP = 1532529450
+SHA256 (OpenIPMI-2.0.25.tar.gz) = f0f1a0ec732409930b7a31a6daa6cf39b585f52059b62a5f092b7ece21aa75a5
+SIZE (OpenIPMI-2.0.25.tar.gz) = 3212723
Added: head/sysutils/openipmi/files/extra-patch-glib_glib__os__hnd.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sysutils/openipmi/files/extra-patch-glib_glib__os__hnd.c Fri Aug 24 12:46:07 2018 (r477959)
@@ -0,0 +1,33 @@
+--- glib/glib_os_hnd.c.orig 2015-06-25 22:51:39.000000000 +0000
++++ glib/glib_os_hnd.c 2018-07-30 13:30:17.799255000 +0000
+@@ -777,23 +777,21 @@
+ {
+ gint64 now;
+
+- now = g_get_monotonic_time();
+- tv->tv_sec = now / G_TIME_SPAN_SECOND;
+- tv->tv_usec = now % G_TIME_SPAN_SECOND;
++ g_get_current_time(&now);
++ tv->tv_sec = now / 1000000;
++ tv->tv_usec = now % 1000000;
+ return 0;
+ }
+
+ static int get_glib_time(os_handler_t *handler,
+ struct timeval *tv)
+ {
+- GDateTime *now;
++ GTimeVal now;
+ GTimeVal gtv;
+
+- now = g_date_time_new_now_utc();
+- g_date_time_to_timeval(now, >v);
+- g_date_time_unref(now);
+- tv->tv_sec = gtv.tv_sec;
+- tv->tv_usec = gtv.tv_usec;
++ g_get_current_time(&now);
++ tv->tv_sec = now.tv_sec;
++ tv->tv_usec = now.tv_usec;
+ return 0;
+ }
+
Added: head/sysutils/openipmi/files/extra-patch-swig_perl_Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sysutils/openipmi/files/extra-patch-swig_perl_Makefile.in Fri Aug 24 12:46:07 2018 (r477959)
@@ -0,0 +1,13 @@
+--- swig/perl/Makefile.in.orig 2018-08-23 20:18:14 UTC
++++ swig/perl/Makefile.in
+@@ -115,8 +115,8 @@
+ am__v_lt_1 =
+ libOpenIPMI_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+- $(AM_CFLAGS) $(CFLAGS) $(libOpenIPMI_la_LDFLAGS) $(LDFLAGS) -o \
+- $@
++ $(AM_CFLAGS) $(CFLAGS) $(libOpenIPMI_la_LDFLAGS) $(LDFLAGS) \
++ `perl -MConfig -e 'print $$Config{lddlflags}'` -o $@
+ libdummystuff_la_LIBADD =
+ am_libdummystuff_la_OBJECTS = dummystuff.lo
+ libdummystuff_la_OBJECTS = $(am_libdummystuff_la_OBJECTS)
Modified: head/sysutils/openipmi/files/patch-lanserv_extcmd.c
==============================================================================
--- head/sysutils/openipmi/files/patch-lanserv_extcmd.c Fri Aug 24 11:50:32 2018 (r477958)
+++ head/sysutils/openipmi/files/patch-lanserv_extcmd.c Fri Aug 24 12:46:07 2018 (r477959)
@@ -1,14 +1,20 @@
---- lanserv/extcmd.c.orig 2015-07-30 03:31:16 UTC
+--- lanserv/extcmd.c.orig 2018-07-30 08:08:12 UTC
+++ lanserv/extcmd.c
-@@ -52,10 +52,11 @@
- * products derived from this software without specific prior
+@@ -53,16 +53,11 @@
* written permission.
*/
+ #include <config.h>
+#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
+-#ifdef HAVE_NETINET_ETHER_H
-#include <netinet/ether.h>
+-#elif defined(HAVE_SYS_ETHERNET_H)
+-#include <sys/ethernet.h>
+-#else
+-#error "either netinet/ether.h or sys/ethernet.h must exist."
+-#endif
+#include <net/ethernet.h>
#include <ctype.h>
#include <string.h>
Modified: head/sysutils/openipmi/pkg-plist
==============================================================================
--- head/sysutils/openipmi/pkg-plist Fri Aug 24 11:50:32 2018 (r477958)
+++ head/sysutils/openipmi/pkg-plist Fri Aug 24 12:46:07 2018 (r477959)
@@ -2,7 +2,6 @@
bin/ipmi_sim
bin/ipmi_ui
bin/ipmicmd
-bin/ipmilan
bin/ipmish
bin/openipmicmd
bin/openipmish
@@ -11,6 +10,7 @@ bin/sdrcomp
bin/solterm
etc/ipmi/ipmisim1.emu
etc/ipmi/lan.conf
+include/OpenIPMI/deprecator.h
include/OpenIPMI/extcmd.h
include/OpenIPMI/internal/ilist.h
include/OpenIPMI/internal/ipmi_control.h
@@ -103,8 +103,8 @@ libdata/pkgconfig/OpenIPMIui.pc
libdata/pkgconfig/OpenIPMIutils.pc
man/man1/ipmi_sim.1.gz
man/man1/ipmi_ui.1.gz
+man/man1/openipmi_eventd.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
@@ -112,28 +112,21 @@ 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
-%%GLIB12%%@comment files list for GLIB12
-%%GLIB12%%lib/libOpenIPMIglib12.a
-%%GLIB12%%lib/libOpenIPMIglib12.so
-%%GLIB12%%lib/libOpenIPMIglib12.so.0
-%%GLIB12%%lib/libOpenIPMIglib12.so.0.0.1
-%%GLIB12%%libdata/pkgconfig/OpenIPMIglib12.pc
-%%GLIB20%%@comment files list for GLIB20
-%%GLIB20%%lib/libOpenIPMIglib.a
-%%GLIB20%%lib/libOpenIPMIglib.so
-%%GLIB20%%lib/libOpenIPMIglib.so.0
-%%GLIB20%%lib/libOpenIPMIglib.so.0.0.1
-%%GLIB20%%libdata/pkgconfig/OpenIPMIglib.pc
+%%GLIB%%@comment files list for GLIB12/GLIB20
+%%GLIB%%lib/libOpenIPMIglib.a
+%%GLIB%%lib/libOpenIPMIglib.so
+%%GLIB%%lib/libOpenIPMIglib.so.0
+%%GLIB%%lib/libOpenIPMIglib.so.0.0.1
+%%GLIB%%libdata/pkgconfig/OpenIPMIglib.pc
%%TCL%%@comment files list for TCL
%%TCL%%lib/libOpenIPMItcl.a
%%TCL%%lib/libOpenIPMItcl.so
%%TCL%%lib/libOpenIPMItcl.so.0
%%TCL%%lib/libOpenIPMItcl.so.0.0.1
%%TCL%%libdata/pkgconfig/OpenIPMItcl.pc
-%%PERL%%@comment files list for PERL
-%%PERL%%%%SITE_ARCH%%/OpenIPMI.pm
-%%PERL%%%%SITE_ARCH%%/auto/OpenIPMI/OpenIPMI.so
+%%OIPMIPERL%%@comment files list for PERL
+%%OIPMIPERL%%%%SITE_ARCH%%/OpenIPMI.pm
+%%OIPMIPERL%%%%SITE_ARCH%%/auto/OpenIPMI/OpenIPMI.so
%%PYTHON%%@comment files list for PYTHON
%%PYTHON%%%%PYTHON_SITELIBDIR%%/OpenIPMI.py
%%PYTHON%%%%PYTHON_SITELIBDIR%%/OpenIPMI.pyc
@@ -229,3 +222,7 @@ man/man8/ipmilan.8.gz
%%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/gui_treelist.py
%%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/gui_treelist.pyc
%%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/gui_treelist.pyo
+%%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/gui_winsys.py
+%%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/gui_winsys.pyc
+%%TKINTER%%%%PYTHON_SITELIBDIR%%/openipmigui/gui_winsys.pyo
+%%TKINTER%%man/man1/openipmigui.1.gz
More information about the svn-ports-head
mailing list