Index: branches/2019Q1/sysutils/cluster-glue/Makefile
===================================================================
--- branches/2019Q1/sysutils/cluster-glue/Makefile	(revision 494789)
+++ branches/2019Q1/sysutils/cluster-glue/Makefile	(revision 494790)
@@ -1,81 +1,80 @@
 # $FreeBSD$
 
 PORTNAME=	cluster-glue
 PORTVERSION=	1.0.12
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils
 MASTER_SITES=	http://hg.linux-ha.org/glue/archive/
 DISTNAME=	0a7add1d9996
 DIST_SUBDIR=	linux-ha
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	High availability cluster libraries and utilities
 
 LICENSE=	GPLv2+ LGPL21+
 LICENSE_COMB=	multi
 LICENSE_FILE_GPLv2+ =	${WRKSRC}/COPYING
 LICENSE_FILE_LGPL21+ =	${WRKSRC}/COPYING.LIB
 
-BROKEN=		fails to build
-
 LIB_DEPENDS=	libltdl.so:devel/libltdl \
 		libuuid.so:misc/e2fsprogs-libuuid \
 		libnet.so:net/libnet
 
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-fatal-warnings \
-		--with-initdir=${PREFIX}/etc/rc.d \
-		--with-ocf-root=${PREFIX}/etc/ocf
-INSTALL_TARGET=	install-strip
-USES=		autoreconf gettext gmake libtool localbase perl5 pkgconfig python shebangfix tar:bz2 ssl
+USES=		autoreconf gettext gmake gnome libtool localbase perl5 pkgconfig python shebangfix \
+		tar:bz2 ssl
 SHEBANG_FILES=	lib/plugins/stonith/external/ibmrsa-telnet \
 		lib/plugins/stonith/external/vmware \
 		lib/plugins/stonith/external/xen0-ha.in \
 		lib/plugins/stonith/external/xen0-ha-dom0-stonith-helper \
 		lib/plugins/stonith/external/riloe \
 		lib/plugins/stonith/external/dracmc-telnet
 USE_GNOME=	glib20 libxml2
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	ha_logd
 WRKSRC=		${WRKDIR}/Reusable-Cluster-Components-glue--${DISTNAME}
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--disable-fatal-warnings \
+		--with-initdir=${PREFIX}/etc/rc.d \
+		--with-ocf-root=${PREFIX}/etc/ocf
+INSTALL_TARGET=	install-strip
 
 USERS=		hacluster
 GROUPS=		haclient
 
 OPTIONS_DEFINE=		DOCS DRAC3 HPI IPMI MANPAGES SNMP
-OPTIONS_DEFAULT=	DRAC3 HPI IPMI MANPAGES SNMP
+OPTIONS_DEFAULT=	DRAC3 IPMI MANPAGES SNMP
 OPTIONS_SUB=		yes
 
 DRAC3_CONFIGURE_OFF=	ac_cv_header_curl_curl_h=no
 DRAC3_DESC=		Dell DRAC III support
 DRAC3_LIB_DEPENDS=	libcurl.so:ftp/curl
 
 HPI_CONFIGURE_OFF=	ac_cv_header_openhpi_SaHpi_h=no
 HPI_DESC=		SAF Hardware Platform Interface support
 HPI_LIB_DEPENDS=	libopenhpi.so:sysutils/openhpi
 
 IPMI_CONFIGURE_ENABLE=	ipmilan
 IPMI_DESC=		Intelligent Platform Management Interface support
 IPMI_LIB_DEPENDS=	libOpenIPMI.so:sysutils/openipmi
 
 MANPAGES_BUILD_DEPENDS=	asciidoc:textproc/asciidoc \
 			help2man:misc/help2man \
 			xsltproc:textproc/libxslt
 MANPAGES_CONFIGURE_ENABLE=doc
 
 SNMP_CONFIGURE_ENABLE=	snmp
 SNMP_LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
 
 .include <bsd.port.options.mk>
 
 .if exists(${LOCALBASE}/include/vacmclient_api.h)
 PLIST_SUB+=	VACM=""
 .else
 PLIST_SUB+=	VACM="@comment "
 .endif
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/logd/logd.cf \
 		${STAGEDIR}${PREFIX}/etc/ha_logd.cf.sample
 
 .include <bsd.port.mk>
Index: branches/2019Q1/sysutils/cluster-glue/files/patch-ipmilan__command.c
===================================================================
--- branches/2019Q1/sysutils/cluster-glue/files/patch-ipmilan__command.c	(nonexistent)
+++ branches/2019Q1/sysutils/cluster-glue/files/patch-ipmilan__command.c	(revision 494790)
@@ -0,0 +1,10 @@
+--- lib/plugins/stonith/ipmilan_command.c.orig	2018-09-02 01:03:28 UTC
++++ lib/plugins/stonith/ipmilan_command.c
+@@ -47,6 +47,7 @@ extern const PILPluginImports*  PluginIm
+ 
+ /* #define DUMP_MSG 0 */
+ #define OPERATION_TIME_OUT 10
++typedef struct selector_s selector_t;
+ 
+ os_handler_t *os_hnd=NULL;
+ selector_t *os_sel;

Property changes on: branches/2019Q1/sysutils/cluster-glue/files/patch-ipmilan__command.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2019Q1/sysutils/cluster-glue/files/patch-md5.h
===================================================================
--- branches/2019Q1/sysutils/cluster-glue/files/patch-md5.h	(nonexistent)
+++ branches/2019Q1/sysutils/cluster-glue/files/patch-md5.h	(revision 494790)
@@ -0,0 +1,11 @@
+--- include/clplumbing/md5.h.orig	2018-09-02 16:05:48 UTC
++++ include/clplumbing/md5.h
+@@ -21,7 +21,7 @@
+  */
+ 
+ #ifndef _MD5_H_
+-#define _MD5_H__
++#define _MD5_H_
+ 
+ /*
+  *      MD5:		The MD5 Message-Digest Algorithm ( RFC 1321 )

Property changes on: branches/2019Q1/sysutils/cluster-glue/files/patch-md5.h
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2019Q1
===================================================================
--- branches/2019Q1	(revision 494789)
+++ branches/2019Q1	(revision 494790)

Property changes on: branches/2019Q1
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r494786