Index: head/sysutils/openipmi/Makefile =================================================================== --- head/sysutils/openipmi/Makefile (revision 491922) +++ head/sysutils/openipmi/Makefile (revision 491923) @@ -1,145 +1,132 @@ # Created by: Alex Deiter # $FreeBSD$ PORTNAME= openipmi PORTVERSION= 2.0.26 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= SF/${PORTNAME}/OpenIPMI%202.0%20Library DISTNAME= OpenIPMI-${PORTVERSION} MAINTAINER= egypcio@FreeBSD.org COMMENT= Complex IPMI management software LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libpopt.so:devel/popt USES= gmake libtool localbase:ldflags ncurses pathfix \ pkgconfig readline USE_LDCONFIG= yes GNU_CONFIGURE= yes INSTALL_TARGET= install-strip -OPTIONS_DEFINE= SSL SNMP PERL PYTHON TCL TKINTER GDBM -OPTIONS_RADIO= GLIB -OPTIONS_RADIO_GLIB= GLIB12 GLIB20 +OPTIONS_DEFINE= GDBM GLIB20 PERL PYTHON SNMP SSL TCL TKINTER SSL_DESC= IPMI 2.0 RMCP+ encryption and authentication SNMP_DESC= SNMP trap support for the sample programs PERL_DESC= Perl interface for OpenIPMI library PYTHON_DESC= Python interface for OpenIPMI library TCL_DESC= TCL interface for OpenIPMI library TKINTER_DESC= GUI for OpenIPMI, written in Python GDBM_DESC= Local SDR caching on startup -GLIB12_DESC= Simply OS handler for glib 1.2 GLIB20_DESC= Simply OS handler for glib 2.0 .include .if exists(${LOCALBASE}/lib/libgdbm.so.3) PORT_OPTIONS+= GDBM .endif .if ${PORT_OPTIONS:MSNMP} PORT_OPTIONS+= SSL LIB_DEPENDS+= libnetsnmp.so:net-mgmt/net-snmp CONFIGURE_ARGS+= --with-ucdsnmp=${LOCALBASE} .else CONFIGURE_ARGS+= --with-ucdsnmp=no .endif .if ${PORT_OPTIONS:MSSL} USES+= ssl CONFIGURE_ARGS+= --with-openssl=${OPENSSLBASE} .else CONFIGURE_ARGS+= --with-openssl=no .endif .if ${PORT_OPTIONS:MTKINTER} 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 PLIST_SUB+= TKINTER="" .else CONFIGURE_ARGS+= --with-tkinter=no PLIST_SUB+= TKINTER="@comment " .endif .if ${PORT_OPTIONS:MPERL} WITH_SWIG= yes USES+= perl5 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+= OIPMIPERL="@comment " .endif .if ${PORT_OPTIONS:MPYTHON} USES+= python CONFIGURE_ARGS+= --with-python --with-swig ac_cv_path_pythonprog=${PYTHON_CMD} BUILD_DEPENDS+= swig3.0:devel/swig30 PLIST_SUB+= PYTHON="" BINARY_ALIAS= swig=swig3.0 .else CONFIGURE_ARGS+= --with-python=no --with-swig=no PLIST_SUB+= PYTHON="@comment " .endif .if ${PORT_OPTIONS:MTCL} USES+= tcl CONFIGURE_ARGS+= --with-tcl \ --with-tclcflags=-I${TCL_INCLUDEDIR} \ --with-tcllibs=-ltcl${TCL_SHLIB_VER} PLIST_SUB+= TCL="" .else CONFIGURE_ARGS+= --with-tcl=no PLIST_SUB+= TCL="@comment " .endif .if ${PORT_OPTIONS:MGDBM} LIB_DEPENDS+= libgdbm.so:databases/gdbm .endif -.if ${PORT_OPTIONS:MGLIB12} -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 -PLIST_SUB+= GLIB="@comment " -.endif - .if ${PORT_OPTIONS:MGLIB20} -USE_GNOME= glib20 +USES+= gnome +USE_GNOME+= glib20 CONFIGURE_ARGS+= --with-glib --with-glibver=2.0 PLIST_SUB+= GLIB="" .else PLIST_SUB+= GLIB="@comment " .endif 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 ${REINPLACE_CMD} 's|editline/readline.h|edit/readline/readline.h|' \ ${WRKSRC}/sample/ipmi_serial_bmc_emu.c .include Index: head/sysutils/openipmi/files/extra-patch-glib_glib__os__hnd.c =================================================================== --- head/sysutils/openipmi/files/extra-patch-glib_glib__os__hnd.c (revision 491922) +++ head/sysutils/openipmi/files/extra-patch-glib_glib__os__hnd.c (nonexistent) @@ -1,33 +0,0 @@ ---- 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; - } - Property changes on: head/sysutils/openipmi/files/extra-patch-glib_glib__os__hnd.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property