diff options
| author | Florian Smeets <flo@FreeBSD.org> | 2023-10-22 07:22:14 +0000 |
|---|---|---|
| committer | Florian Smeets <flo@FreeBSD.org> | 2023-10-22 13:13:04 +0000 |
| commit | 58f5f9ccf32b7fc01c903416880e0b9e1e0c3e47 (patch) | |
| tree | 1cfc3902c59dfee98dfa79ebdcae8a834b907d29 | |
| parent | ca4d114d277f490233f5b431079a40cd3dcb8417 (diff) | |
| download | ports-58f5f9ccf32b7fc01c903416880e0b9e1e0c3e47.tar.gz ports-58f5f9ccf32b7fc01c903416880e0b9e1e0c3e47.zip | |
net/corosync*: Make corosync3 the default corosync version
| -rw-r--r-- | Mk/Uses/corosync.mk | 7 | ||||
| -rw-r--r-- | Mk/bsd.default-versions.mk | 2 | ||||
| -rw-r--r-- | net/corosync2/Makefile | 2 | ||||
| -rw-r--r-- | net/corosync3/Makefile | 2 | ||||
| -rw-r--r-- | net/corosync3/Makefile.common (renamed from net/corosync2/Makefile.common) | 0 |
5 files changed, 3 insertions, 10 deletions
diff --git a/Mk/Uses/corosync.mk b/Mk/Uses/corosync.mk index 634ff3cc3bb1..869f671c6bd6 100644 --- a/Mk/Uses/corosync.mk +++ b/Mk/Uses/corosync.mk @@ -22,13 +22,6 @@ _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 diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk index 01695995b5b8..8550328a468a 100644 --- a/Mk/bsd.default-versions.mk +++ b/Mk/bsd.default-versions.mk @@ -37,7 +37,7 @@ APACHE_DEFAULT?= 2.4 # Possible values: 5, 18 BDB_DEFAULT?= 5 # Possible values: 2, 3 -COROSYNC_DEFAULT?= 2 +COROSYNC_DEFAULT?= 3 # Possible values: rust, legacy . if empty(ARCH:Naarch64:Namd64:Narmv7:Ni386:Npowerpc64:Npowerpc64le:Npowerpc:Nriscv64) EBUR128_DEFAULT?= rust diff --git a/net/corosync2/Makefile b/net/corosync2/Makefile index a7d7a7f58ddb..8951bd0587b1 100644 --- a/net/corosync2/Makefile +++ b/net/corosync2/Makefile @@ -6,6 +6,6 @@ WWW= https://corosync.github.io/corosync/ CONFLICTS= corosync3 PORTSCOUT= limit:^2\.[0-9]\.[0-9] -.include "${.CURDIR}/Makefile.common" +.include "${.CURDIR}/../corosync3/Makefile.common" .include <bsd.port.mk> diff --git a/net/corosync3/Makefile b/net/corosync3/Makefile index 8440f12d3194..c12af546f7da 100644 --- a/net/corosync3/Makefile +++ b/net/corosync3/Makefile @@ -3,7 +3,7 @@ PKGNAMESUFFIX= 3 WWW= https://corosync.github.io/corosync/ -.include "${.CURDIR}/../corosync2/Makefile.common" +.include "${.CURDIR}/Makefile.common" LIB_DEPENDS+= libknet.so:devel/kronosnet diff --git a/net/corosync2/Makefile.common b/net/corosync3/Makefile.common index 4d43485368a2..4d43485368a2 100644 --- a/net/corosync2/Makefile.common +++ b/net/corosync3/Makefile.common |