diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2019-03-06 10:16:17 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2019-03-06 10:16:17 +0000 |
| commit | 3e688ca0a4324d12998d2c00eba3a8c9bb646c10 (patch) | |
| tree | 8be919ce017940d2cdc92bdca0f5fb517ce14fd6 /sysutils/cluster-glue | |
| parent | 6807fa621b382ebe861a9512372c9bcf87e7bb20 (diff) | |
| download | ports-3e688ca0a4324d12998d2c00eba3a8c9bb646c10.tar.gz ports-3e688ca0a4324d12998d2c00eba3a8c9bb646c10.zip | |
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@utanet.at
MFH: 2019Q1
Notes
Notes:
svn path=/head/; revision=494786
Diffstat (limited to 'sysutils/cluster-glue')
| -rw-r--r-- | sysutils/cluster-glue/Makefile | 21 | ||||
| -rw-r--r-- | sysutils/cluster-glue/files/patch-ipmilan__command.c | 10 | ||||
| -rw-r--r-- | sysutils/cluster-glue/files/patch-md5.h | 11 |
3 files changed, 30 insertions, 12 deletions
diff --git a/sysutils/cluster-glue/Makefile b/sysutils/cluster-glue/Makefile index a96ae9f2992d..59b0d9af3d66 100644 --- a/sysutils/cluster-glue/Makefile +++ b/sysutils/cluster-glue/Makefile @@ -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,20 +16,12 @@ LICENSE_COMB= multi LICENSE_FILE_GPLv2+ = ${WRKSRC}/COPYING LICENSE_FILE_LGPL21+ = ${WRKSRC}/COPYING.LIB -BROKEN= fails to build -DEPRECATED= Broken for more than 6 months -EXPIRATION_DATE= 2019-03-05 - 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 \ @@ -40,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 diff --git a/sysutils/cluster-glue/files/patch-ipmilan__command.c b/sysutils/cluster-glue/files/patch-ipmilan__command.c new file mode 100644 index 000000000000..47b2d2cd69a2 --- /dev/null +++ b/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; diff --git a/sysutils/cluster-glue/files/patch-md5.h b/sysutils/cluster-glue/files/patch-md5.h new file mode 100644 index 000000000000..bd2aaf93c427 --- /dev/null +++ b/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 ) |