git: f63fc9b47d8c - main - security/openssl111: Chase addition/removal in CONFLICTS

The branch main has been updated by brnrd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=f63fc9b47d8cb1d0f85376a279ca6a2acfc2d62c

commit f63fc9b47d8cb1d0f85376a279ca6a2acfc2d62c
Author:     Bernard Spil <brnrd@FreeBSD.org>
AuthorDate: 2023-10-14 17:18:52 +0000
Commit:     Bernard Spil <brnrd@FreeBSD.org>
CommitDate: 2023-10-14 17:23:12 +0000

    security/openssl111: Chase addition/removal in CONFLICTS
---
 security/libressl-devel/Makefile  | 2 +-
 security/libressl/Makefile        | 4 +---
 security/openssl-quictls/Makefile | 2 +-
 security/openssl31/Makefile       | 4 +++-
 security/openssl32/Makefile       | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/security/libressl-devel/Makefile b/security/libressl-devel/Makefile
index be23b1c50546..f8e305bdabed 100644
--- a/security/libressl-devel/Makefile
+++ b/security/libressl-devel/Makefile
@@ -28,7 +28,7 @@ NC_DESC=	Install TLS-enabled netcat
 
 CONFLICTS_INSTALL=		libressl \
 				libretls
-default_CONFLICTS_INSTALL=	openssl openssl3[012] openssl-quictls
+default_CONFLICTS_INSTALL=	openssl openssl111 openssl3[12] openssl-quictls
 
 .if ${FLAVOR:U} == default
 OPTIONS_EXCLUDE=	LIBTLS
diff --git a/security/libressl/Makefile b/security/libressl/Makefile
index ee7101d2e1b8..57333a08172e 100644
--- a/security/libressl/Makefile
+++ b/security/libressl/Makefile
@@ -27,9 +27,7 @@ NC_DESC=	Install TLS-enabled netcat
 
 CONFLICTS_INSTALL=		libressl-devel
 libtls_CONFLICTS_INSTALL=	libretls
-default_CONFLICTS_INSTALL=	openssl \
-				openssl3[012] \
-				openssl-quictls
+default_CONFLICTS_INSTALL=	openssl openssl111 openssl3[12] openssl-quictls
 
 .if ${FLAVOR:U} == default
 OPTIONS_EXCLUDE=	LIBTLS
diff --git a/security/openssl-quictls/Makefile b/security/openssl-quictls/Makefile
index 9e2e1f996919..9ff5f6b8321e 100644
--- a/security/openssl-quictls/Makefile
+++ b/security/openssl-quictls/Makefile
@@ -10,7 +10,7 @@ WWW=		https://www.github.com/quictls/openssl
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-CONFLICTS_INSTALL=	boringssl libressl libressl-devel openssl openssl3[012]
+CONFLICTS_INSTALL=	boringssl libressl libressl-devel openssl openssl111 openssl3[12]
 
 BROKEN_i386=	ld: error: undefined symbol: __atomic_is_lock_free
 
diff --git a/security/openssl31/Makefile b/security/openssl31/Makefile
index bea63e395a88..24f931e4160a 100644
--- a/security/openssl31/Makefile
+++ b/security/openssl31/Makefile
@@ -13,7 +13,9 @@ WWW=		https://www.openssl.org/
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-CONFLICTS_INSTALL=	boringssl libressl libressl-devel openssl openssl3[02] openssl-quictls
+#EXPIRES=	2026-09-07
+
+CONFLICTS_INSTALL=	boringssl libressl libressl-devel openssl openssl111 openssl32 openssl-quictls
 
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	config
diff --git a/security/openssl32/Makefile b/security/openssl32/Makefile
index 65f09ce01729..097de7e7e6c4 100644
--- a/security/openssl32/Makefile
+++ b/security/openssl32/Makefile
@@ -12,7 +12,7 @@ WWW=		https://www.openssl.org/
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-CONFLICTS_INSTALL=	boringssl libressl libressl-devel openssl openssl3[01] openssl-quictls
+CONFLICTS_INSTALL=	boringssl libressl libressl-devel openssl openssl111 openssl31 openssl-quictls
 
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	config