View | Details | Raw Unified | Return to bug 228165 | Differences between
and this patch

Collapse All | Expand All

(-)Mk/Uses/corosync.mk (+42 lines)
Line 0 Link Here
1
# $FreeBSD#
2
#
3
# Provide support for corosync ports
4
#
5
# Feature:		corosync
6
# Usage:		USES=coroync
7
#
8
# MAINTAINER: dpejesh@yahoo.com
9
10
.if !defined(_INCLUDE_USES_COROSYNC_MK)
11
_INCLUDE_USES_COROSYNC_MK=	yes
12
13
# When adding a version, please keep the comment in
14
# Mk/bsd.default-versions.mk in sync.
15
_VALID_COROSYNC_VER=	2 3
16
17
.if ! ${_VALID_COROSYNC_VER:M${COROSYNC_DEFAULT}}
18
IGNORE=	Invalid corosync default version ${COROSYNC_DEFAULT}; valid versions are ${_VALID_COROSYNC_VER}
19
.endif
20
21
.if exists(${LOCALBASE}/sbin/corosync)
22
_COROSYNC_INSTALLED_VER!=  ${LOCALBASE}/sbin/corosync -v 2>/dev/null
23
_COROSYNC_INSTALLED_VER:=  ${_COROSYNC_INSTALLED_VER:M'*':C/'//g}
24
_COROSYNC_INSTALLED_VER_MAJOR=	${_COROSYNC_INSTALLED_VER:C/([0-9]*).[0-9]*.*/\1/g}
25
_COROSYNC_INSTALLED_VER_MINOR=	${_COROSYNC_INSTALLED_VER:C/[0-9]*.([0-9]*).*/\1/g}
26
27
# Currently corosync 3 is tagged 2.99.x so this is a temporary
28
# work around until the final version is released.
29
.  if ${_COROSYNC_INSTALLED_VER_MAJOR} == 2 && ${_COROSYNC_INSTALLED_VER_MINOR} == 99
30
_COROSYNC_INSTALLED_VER_MAJOR=	3
31
_COROSYNC_INSTALLED_VER_MINOR=	0
32
.  endif
33
34
.  if ${COROSYNC_DEFAULT} != ${_COROSYNC_INSTALLED_VER_MAJOR}
35
IGNORE=	DEFAULT_VERSIONS=corosync=${COROSYNC_DEFAULT} but ${_COROSYNC_INSTALLED_VER} is installed
36
.  endif
37
.endif
38
39
BUILD_DEPENDS+=	corosync:net/corosync${COROSYNC_DEFAULT}
40
RUN_DEPENDS+=	corosync:net/corosync${COROSYNC_DEFAULT}
41
42
.endif
(-)Mk/bsd.default-versions.mk (-2 / +4 lines)
Lines 15-22 Link Here
15
15
16
LOCALBASE?=	/usr/local
16
LOCALBASE?=	/usr/local
17
17
18
.for lang in APACHE BDB EMACS FIREBIRD FORTRAN FPC GCC GHOSTSCRIPT LINUX LUA \
18
.for lang in APACHE BDB COROSYNC EMACS FIREBIRD FORTRAN FPC GCC GHOSTSCRIPT \
19
	MYSQL PERL5 PGSQL PHP PYTHON PYTHON2 PYTHON3 RUBY SSL TCLTK
19
	LINUX LUA MYSQL PERL5 PGSQL PHP PYTHON PYTHON2 PYTHON3 RUBY SSL TCLTK
20
.if defined(${lang}_DEFAULT)
20
.if defined(${lang}_DEFAULT)
21
ERROR+=	"The variable ${lang}_DEFAULT is set and it should only be defined through DEFAULT_VERSIONS+=${lang:tl}=${${lang}_DEFAULT} in /etc/make.conf"
21
ERROR+=	"The variable ${lang}_DEFAULT is set and it should only be defined through DEFAULT_VERSIONS+=${lang:tl}=${${lang}_DEFAULT} in /etc/make.conf"
22
.endif
22
.endif
Lines 32-37 Link Here
32
APACHE_DEFAULT?=	2.4
32
APACHE_DEFAULT?=	2.4
33
# Possible values: 48, 5, 6
33
# Possible values: 48, 5, 6
34
BDB_DEFAULT?=		5
34
BDB_DEFAULT?=		5
35
# Possible values: 2, 3
36
COROSYNC_DEFAULT?=	2
35
# Possible_values: full canna nox devel_full devel_nox
37
# Possible_values: full canna nox devel_full devel_nox
36
#EMACS_DEFAULT?=	let the flavor be the default if not explicitly set
38
#EMACS_DEFAULT?=	let the flavor be the default if not explicitly set
37
# Possible values: 2.5
39
# Possible values: 2.5
(-)net/pacemaker/Makefile (-4 / +2 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	pacemaker
4
PORTNAME=	pacemaker
5
PORTVERSION=	1.1.16
5
PORTVERSION=	1.1.16
6
PORTREVISION=	3
6
PORTREVISION=	4
7
DISTVERSIONPREFIX=	Pacemaker-
7
DISTVERSIONPREFIX=	Pacemaker-
8
CATEGORIES=	net
8
CATEGORIES=	net
9
9
Lines 15-21 Link Here
15
BROKEN_armv6=		fails to install: help2man: can't get '--help' info from pacemakerd
15
BROKEN_armv6=		fails to install: help2man: can't get '--help' info from pacemakerd
16
16
17
BUILD_DEPENDS=	bash:shells/bash \
17
BUILD_DEPENDS=	bash:shells/bash \
18
		corosync:net/corosync2 \
19
		getopt>=0:misc/getopt
18
		getopt>=0:misc/getopt
20
LIB_DEPENDS=	libgnutls.so:security/gnutls \
19
LIB_DEPENDS=	libgnutls.so:security/gnutls \
21
		libltdl.so:devel/libltdl \
20
		libltdl.so:devel/libltdl \
Lines 24-30 Link Here
24
		libxml2.so:textproc/libxml2 \
23
		libxml2.so:textproc/libxml2 \
25
		libxslt.so:textproc/libxslt
24
		libxslt.so:textproc/libxslt
26
RUN_DEPENDS=	bash:shells/bash \
25
RUN_DEPENDS=	bash:shells/bash \
27
		corosync:net/corosync2 \
28
		getopt>=0:misc/getopt \
26
		getopt>=0:misc/getopt \
29
		ocf-tester:net-mgmt/resource-agents
27
		ocf-tester:net-mgmt/resource-agents
30
28
Lines 36-42 Link Here
36
USE_GITHUB=	yes
34
USE_GITHUB=	yes
37
GH_ACCOUNT=	ClusterLabs
35
GH_ACCOUNT=	ClusterLabs
38
36
39
USES=		autoreconf gmake libtool pathfix pkgconfig python shebangfix
37
USES=		autoreconf corosync gmake libtool pathfix pkgconfig python shebangfix
40
USE_BINUTILS=	yes
38
USE_BINUTILS=	yes
41
USE_GNOME=	glib20
39
USE_GNOME=	glib20
42
USE_LDCONFIG=	yes
40
USE_LDCONFIG=	yes

Return to bug 228165