From 3f605c51f9b4e7df3f695036ad67d5d4b3a4e2d9 Mon Sep 17 00:00:00 2001 From: Bernard Spil Date: Fri, 28 Mar 2025 16:35:46 +0100 Subject: [PATCH] security/openssl: Mark CONFLICT with new OpenSSL 3.5 port --- security/openssl111/Makefile | 2 +- security/openssl31/Makefile | 2 +- security/openssl32/Makefile | 2 +- security/openssl33/Makefile | 2 +- security/openssl34/Makefile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/security/openssl111/Makefile b/security/openssl111/Makefile index b88948d4dcc3..3621a9c8a7de 100644 --- a/security/openssl111/Makefile +++ b/security/openssl111/Makefile @@ -17,7 +17,7 @@ DEPRECATED= End-of-life since 2023-09-11, see https://www.openssl.org/blog/blog/ port will be removed when FreeBSD 13 is EoL EXPIRATION_DATE= 2026-04-30 -CONFLICTS_INSTALL= boringssl libressl libressl-devel openssl openssl3[12] openssl-quictls +CONFLICTS_INSTALL= boringssl libressl libressl-devel openssl openssl3* openssl*-quictls USES= cpe perl5 USE_PERL5= build diff --git a/security/openssl31/Makefile b/security/openssl31/Makefile index 9656df916d8b..3f98568e46a7 100644 --- a/security/openssl31/Makefile +++ b/security/openssl31/Makefile @@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt #EXPIRATION_DATE= 2025-03-14 -CONFLICTS_INSTALL= boringssl libressl libressl-devel openssl openssl111 openssl3[234] openssl*-quictls +CONFLICTS_INSTALL= boringssl libressl libressl-devel openssl openssl111 openssl3[2345] openssl*-quictls HAS_CONFIGURE= yes CONFIGURE_SCRIPT= config diff --git a/security/openssl32/Makefile b/security/openssl32/Makefile index 97fab235b7e2..ae59b26936e6 100644 --- a/security/openssl32/Makefile +++ b/security/openssl32/Makefile @@ -11,7 +11,7 @@ WWW= https://www.openssl.org/ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -CONFLICTS_INSTALL= boringssl libressl libressl-devel openssl openssl111 openssl3[134] openssl*-quictls +CONFLICTS_INSTALL= boringssl libressl libressl-devel openssl openssl111 openssl3[1345] openssl*-quictls HAS_CONFIGURE= yes CONFIGURE_SCRIPT= config diff --git a/security/openssl33/Makefile b/security/openssl33/Makefile index 02db454d9cdc..92b2a3b70d07 100644 --- a/security/openssl33/Makefile +++ b/security/openssl33/Makefile @@ -11,7 +11,7 @@ WWW= https://www.openssl.org/ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -CONFLICTS_INSTALL= boringssl libressl libressl-devel openssl openssl111 openssl3[124] openssl*-quictls +CONFLICTS_INSTALL= boringssl libressl libressl-devel openssl openssl111 openssl3[1245] openssl*-quictls HAS_CONFIGURE= yes CONFIGURE_SCRIPT= config diff --git a/security/openssl34/Makefile b/security/openssl34/Makefile index e9bfd2977a94..b1ab27b4efc0 100644 --- a/security/openssl34/Makefile +++ b/security/openssl34/Makefile @@ -11,7 +11,7 @@ WWW= https://www.openssl.org/ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -CONFLICTS_INSTALL= boringssl libressl libressl-devel openssl openssl111 openssl3[123] openssl*-quictls +CONFLICTS_INSTALL= boringssl libressl libressl-devel openssl openssl111 openssl3[1235] openssl*-quictls HAS_CONFIGURE= yes CONFIGURE_SCRIPT= config