Index: Mk/Uses/corosync.mk
===================================================================
--- Mk/Uses/corosync.mk	(nonexistent)
+++ Mk/Uses/corosync.mk	(working copy)
@@ -0,0 +1,42 @@
+# $FreeBSD#
+#
+# Provide support for corosync ports
+#
+# Feature:		corosync
+# Usage:		USES=coroync
+#
+# MAINTAINER: dpejesh@yahoo.com
+
+.if !defined(_INCLUDE_USES_COROSYNC_MK)
+_INCLUDE_USES_COROSYNC_MK=	yes
+
+# When adding a version, please keep the comment in
+# Mk/bsd.default-versions.mk in sync.
+_VALID_COROSYNC_VER=	2 3
+
+.if ! ${_VALID_COROSYNC_VER:M${COROSYNC_DEFAULT}}
+IGNORE=	Invalid corosync default version ${COROSYNC_DEFAULT}; valid versions are ${_VALID_COROSYNC_VER}
+.endif
+
+.if exists(${LOCALBASE}/sbin/corosync)
+_COROSYNC_INSTALLED_VER!=  ${LOCALBASE}/sbin/corosync -v 2>/dev/null
+_COROSYNC_INSTALLED_VER:=  ${_COROSYNC_INSTALLED_VER:M'*':C/'//g}
+_COROSYNC_INSTALLED_VER_MAJOR=	${_COROSYNC_INSTALLED_VER:C/([0-9]*).[0-9]*.*/\1/g}
+_COROSYNC_INSTALLED_VER_MINOR=	${_COROSYNC_INSTALLED_VER:C/[0-9]*.([0-9]*).*/\1/g}
+
+# Currently corosync 3 is tagged 2.99.x so this is a temporary
+# work around until the final version is released.
+.  if ${_COROSYNC_INSTALLED_VER_MAJOR} == 2 && ${_COROSYNC_INSTALLED_VER_MINOR} == 99
+_COROSYNC_INSTALLED_VER_MAJOR=	3
+_COROSYNC_INSTALLED_VER_MINOR=	0
+.  endif
+
+.  if ${COROSYNC_DEFAULT} != ${_COROSYNC_INSTALLED_VER_MAJOR}
+IGNORE=	DEFAULT_VERSIONS=corosync=${COROSYNC_DEFAULT} but ${_COROSYNC_INSTALLED_VER} is installed
+.  endif
+.endif
+
+BUILD_DEPENDS+=	corosync:net/corosync${COROSYNC_DEFAULT}
+RUN_DEPENDS+=	corosync:net/corosync${COROSYNC_DEFAULT}
+
+.endif

Property changes on: Mk/Uses/corosync.mk
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: Mk/bsd.default-versions.mk
===================================================================
--- Mk/bsd.default-versions.mk	(revision 469728)
+++ Mk/bsd.default-versions.mk	(working copy)
@@ -15,8 +15,8 @@
 
 LOCALBASE?=	/usr/local
 
-.for lang in APACHE BDB EMACS FIREBIRD FORTRAN FPC GCC GHOSTSCRIPT LINUX LUA \
-	MYSQL PERL5 PGSQL PHP PYTHON PYTHON2 PYTHON3 RUBY SSL TCLTK
+.for lang in APACHE BDB COROSYNC EMACS FIREBIRD FORTRAN FPC GCC GHOSTSCRIPT \
+	LINUX LUA MYSQL PERL5 PGSQL PHP PYTHON PYTHON2 PYTHON3 RUBY SSL TCLTK
 .if defined(${lang}_DEFAULT)
 ERROR+=	"The variable ${lang}_DEFAULT is set and it should only be defined through DEFAULT_VERSIONS+=${lang:tl}=${${lang}_DEFAULT} in /etc/make.conf"
 .endif
@@ -32,6 +32,8 @@
 APACHE_DEFAULT?=	2.4
 # Possible values: 48, 5, 6
 BDB_DEFAULT?=		5
+# Possible values: 2, 3
+COROSYNC_DEFAULT?=	2
 # Possible_values: full canna nox devel_full devel_nox
 #EMACS_DEFAULT?=	let the flavor be the default if not explicitly set
 # Possible values: 2.5
Index: net/pacemaker/Makefile
===================================================================
--- net/pacemaker/Makefile	(revision 469728)
+++ net/pacemaker/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	pacemaker
 PORTVERSION=	1.1.16
-PORTREVISION=	3
+PORTREVISION=	4
 DISTVERSIONPREFIX=	Pacemaker-
 CATEGORIES=	net
 
@@ -15,7 +15,6 @@
 BROKEN_armv6=		fails to install: help2man: can't get '--help' info from pacemakerd
 
 BUILD_DEPENDS=	bash:shells/bash \
-		corosync:net/corosync2 \
 		getopt>=0:misc/getopt
 LIB_DEPENDS=	libgnutls.so:security/gnutls \
 		libltdl.so:devel/libltdl \
@@ -24,7 +23,6 @@
 		libxml2.so:textproc/libxml2 \
 		libxslt.so:textproc/libxslt
 RUN_DEPENDS=	bash:shells/bash \
-		corosync:net/corosync2 \
 		getopt>=0:misc/getopt \
 		ocf-tester:net-mgmt/resource-agents
 
@@ -36,7 +34,7 @@
 USE_GITHUB=	yes
 GH_ACCOUNT=	ClusterLabs
 
-USES=		autoreconf gmake libtool pathfix pkgconfig python shebangfix
+USES=		autoreconf corosync gmake libtool pathfix pkgconfig python shebangfix
 USE_BINUTILS=	yes
 USE_GNOME=	glib20
 USE_LDCONFIG=	yes