svn commit: r494790 - in branches/2019Q1/sysutils/cluster-glue: . files

[Rene Ladan]

Author: rene
Date: Wed Mar  6 11:27:39 2019
New Revision: 494790
URL: https://svnweb.freebsd.org/changeset/ports/494790

Log:
  MFH: r494786
  
  sysutils/cluster-glue: unbreak and modernize port
  
  - add USES=gnome
  - sort Makefile
  - disable HPI option because that port is currently broken
  
  PR:		231097
  Submitted by:	w.schwarzenfeld at utanet.at
  
  Approved by:	port-secteam (joneum)

Added:
  branches/2019Q1/sysutils/cluster-glue/files/patch-ipmilan__command.c
     - copied unchanged from r494786, head/sysutils/cluster-glue/files/patch-ipmilan__command.c
  branches/2019Q1/sysutils/cluster-glue/files/patch-md5.h
     - copied unchanged from r494786, head/sysutils/cluster-glue/files/patch-md5.h
Modified:
  branches/2019Q1/sysutils/cluster-glue/Makefile
Directory Properties:
  branches/2019Q1/   (props changed)

Modified: branches/2019Q1/sysutils/cluster-glue/Makefile
==============================================================================
--- branches/2019Q1/sysutils/cluster-glue/Makefile	Wed Mar  6 11:21:14 2019	(r494789)
+++ branches/2019Q1/sysutils/cluster-glue/Makefile	Wed Mar  6 11:27:39 2019	(r494790)
@@ -2,7 +2,7 @@
 
 PORTNAME=	cluster-glue
 PORTVERSION=	1.0.12
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils
 MASTER_SITES=	http://hg.linux-ha.org/glue/archive/
 DISTNAME=	0a7add1d9996
@@ -16,18 +16,12 @@ 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 \
@@ -38,12 +32,17 @@ 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

Copied: branches/2019Q1/sysutils/cluster-glue/files/patch-ipmilan__command.c (from r494786, head/sysutils/cluster-glue/files/patch-ipmilan__command.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2019Q1/sysutils/cluster-glue/files/patch-ipmilan__command.c	Wed Mar  6 11:27:39 2019	(r494790, copy of r494786, head/sysutils/cluster-glue/files/patch-ipmilan__command.c)
@@ -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;

Copied: branches/2019Q1/sysutils/cluster-glue/files/patch-md5.h (from r494786, head/sysutils/cluster-glue/files/patch-md5.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2019Q1/sysutils/cluster-glue/files/patch-md5.h	Wed Mar  6 11:27:39 2019	(r494790, copy of r494786, head/sysutils/cluster-glue/files/patch-md5.h)
@@ -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 )