git: 91ea784ea7dd - main - security/softhsm2: strip botan2 option

The branch main has been updated by mandree:

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

commit 91ea784ea7dddacc8aefc97e8bf9605b84ceff89
Author:     Matthias Andree <mandree@FreeBSD.org>
AuthorDate: 2025-10-01 11:42:03 +0000
Commit:     Matthias Andree <mandree@FreeBSD.org>
CommitDate: 2025-10-01 11:52:55 +0000

    security/softhsm2: strip botan2 option
    
    and unconditionally build with OpenSSL, which has been default
    already.  botan-2 has been EOL for many months; the original softhsm2
    software doesn't support botan-3 and botan-2 has been EOL, upstream
    issues about botan-3 haven't been tended to in three years.
    
    softhsm2 is the last user of botan2 in our tree does not require it.
    
    While here, simplify and rearrange Makefile to use canonical
    item order. portclippy and portlint -C come up clean now.
    I did not run portfmt which would damage indentation.
    
    I've attempted to get the test suite running, and it's as simple
    as TEST_TARGET=check, but the cryptotest fails on desKey(56) related
    matter (probably harmless to patch out) and p11tests also fail for
    reasons I haven't investigated, so I'm not adding this.
    
    Approved by:    portmgr@ (blanket)
---
 security/softhsm2/Makefile | 54 ++++++++++++++++------------------------------
 1 file changed, 19 insertions(+), 35 deletions(-)

diff --git a/security/softhsm2/Makefile b/security/softhsm2/Makefile
index 9a6aea3a5aa2..e1209054b8ec 100644
--- a/security/softhsm2/Makefile
+++ b/security/softhsm2/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	softhsm
 PORTVERSION=	2.6.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	security
 MASTER_SITES=	http://dist.opendnssec.org/source/ \
 		http://dist.opendnssec.org/source/testing/
@@ -13,53 +13,37 @@ WWW=		https://www.opendnssec.org/
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-GNU_CONFIGURE=	yes
-GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
-INSTALL_TARGET=	install-strip
-USES=		compiler:c++11-lang libtool ssl pkgconfig
-
-SUB_FILES=	pkg-message
-
-CONFLICTS=	softhsm-1.*
-
-USE_LDCONFIG=	yes
-
-LIB_DEPENDS+=		libcppunit.so:devel/cppunit
 MY_DEPENDS+=		p11-kit:security/p11-kit
 BUILD_DEPENDS+=		${MY_DEPENDS}
 RUN_DEPENDS+=		${MY_DEPENDS}
 
-OPTIONS_DEFINE=		SQLITE MIGRATE
-MIGRATE_IMPLIES=	SQLITE
-OPTIONS_SUB=		yes
-SQLITE_DESC=		Build with object store backend DB support (SQLITE3)
-MIGRATE_DESC=		Build the migration tool
+USES=		compiler:c++11-lang libtool pkgconfig ssl
 
-OPTIONS_SINGLE=		CRYP
-OPTIONS_SINGLE_CRYP=	CRYP_OPEN CRYP_BOTAN
+GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 
-CRYP_OPEN_DESC=		Build with OpenSSL crypto library
-CRYP_BOTAN_DESC=	Build with Botan crypto library
+CONFIGURE_ARGS+=	--with-crypto-backend=openssl \
+			--with-openssl=${OPENSSLBASE} \
+			--disable-gost
 
-OPTIONS_DEFAULT=	CRYP_OPEN SQLITE MIGRATE
+INSTALL_TARGET=	install-strip
 
-SQLITE_CONFIGURE_WITH=	sqlite3=${LOCALBASE} objectstore-backend-db
-SQLITE_USES=		sqlite
-MIGRATE_CONFIGURE_WITH=	migrate
+CONFLICTS=	softhsm-1.*
 
-CRYP_BOTAN_CONFIGURE_ON=	--with-crypto-backend=botan
-CRYP_BOTAN_LIB_DEPENDS=	libbotan-2.so:security/botan2
+SUB_FILES=	pkg-message
 
-CRYP_OPEN_CONFIGURE_ON=	--with-crypto-backend=openssl --with-openssl=${OPENSSLBASE}
+OPTIONS_DEFINE=		SQLITE MIGRATE
+OPTIONS_DEFAULT=	CRYP_OPEN SQLITE MIGRATE
 
-.include <bsd.port.options.mk>
+OPTIONS_SUB=		yes
+MIGRATE_DESC=		Build the migration tool
+SQLITE_DESC=		Build with object store backend DB support (SQLITE3)
 
-.if ${SSL_DEFAULT:Mlibressl*} || ${SSL_DEFAULT:Mopenssl}
-CONFIGURE_ARGS+=	--disable-gost
-.endif
+MIGRATE_IMPLIES=	SQLITE
+MIGRATE_CONFIGURE_WITH=	migrate
 
-# openssl-1.1.1 (default after 1200080) doesn't  support GHOST (yet), punt for now.
-CONFIGURE_ARGS+=	--disable-gost
+SQLITE_USES=		sqlite
+SQLITE_CONFIGURE_WITH=	sqlite3=${LOCALBASE} objectstore-backend-db
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/p11-kit/modules