Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 17 Mar 2016 16:20:16 +0000 (UTC)
From:      Mathieu Arnold <mat@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r411289 - head/security/softhsm2
Message-ID:  <201603171620.u2HGKGKM070922@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mat
Date: Thu Mar 17 16:20:16 2016
New Revision: 411289
URL: https://svnweb.freebsd.org/changeset/ports/411289

Log:
  Update to 2.1.0. [1]
  
  While there, use options helpers.
  
  PR:		208089 [1]
  Submitted by:	maintainer
  Sponsored by:	Absolight

Modified:
  head/security/softhsm2/Makefile
  head/security/softhsm2/distinfo
  head/security/softhsm2/pkg-plist

Modified: head/security/softhsm2/Makefile
==============================================================================
--- head/security/softhsm2/Makefile	Thu Mar 17 16:20:07 2016	(r411288)
+++ head/security/softhsm2/Makefile	Thu Mar 17 16:20:16 2016	(r411289)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	softhsm
-PORTVERSION=	2.0.0
+PORTVERSION=	2.1.0
 CATEGORIES=	security
 MASTER_SITES=	http://dist.opendnssec.org/source/ \
 		http://dist.opendnssec.org/source/testing/
@@ -32,22 +32,14 @@ CRYP_BOTAN_DESC=	Build with Botan crypto
 
 OPTIONS_DEFAULT=	CRYP_OPEN
 
-CRYP_BOTAN_CONFIGURE_WITH=	crypto-backend=botan
+CRYP_BOTAN_CONFIGURE_ON=	--with-crypto-backend=botan
+CRYP_BOTAN_LIB_DEPENDS=	libbotan-1.10.so:${PORTSDIR}/security/botan110
+CRYP_OPEN_USE=		openssl=yes
+CRYP_OPEN_VARS=		WITH_OPENSSL_PORT=yes
+CRYP_OPEN_CONFIGURE_ON=	--with-crypto-backend=openssl
 
 .if defined(OPENSSL_PORT) && ${OPENSSL_PORT} == security/libressl
 CONFIGURE_ARGS+=	--disable-gost
 .endif
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MCRYP_BOTAN}
-LIB_DEPENDS+=	libbotan-1.10.so:${PORTSDIR}/security/botan110
-.endif
-
-.if ${PORT_OPTIONS:MCRYP_OPEN}
-USE_OPENSSL=	yes
-WITH_OPENSSL_PORT=	yes
-CONFIGURE_ARGS+=	--with-crypto-backend=openssl
-.endif
-
 .include <bsd.port.mk>

Modified: head/security/softhsm2/distinfo
==============================================================================
--- head/security/softhsm2/distinfo	Thu Mar 17 16:20:07 2016	(r411288)
+++ head/security/softhsm2/distinfo	Thu Mar 17 16:20:16 2016	(r411289)
@@ -1,2 +1,2 @@
-SHA256 (softhsm-2.0.0.tar.gz) = eae8065f6c472af24f4c056d6728edda0fd34306f41a818697f765a6a662338d
-SIZE (softhsm-2.0.0.tar.gz) = 936954
+SHA256 (softhsm-2.1.0.tar.gz) = 0399b06f196fbfaebe73b4aeff2e2d65d0dc1901161513d0d6a94f031dcd827e
+SIZE (softhsm-2.1.0.tar.gz) = 943969

Modified: head/security/softhsm2/pkg-plist
==============================================================================
--- head/security/softhsm2/pkg-plist	Thu Mar 17 16:20:07 2016	(r411288)
+++ head/security/softhsm2/pkg-plist	Thu Mar 17 16:20:16 2016	(r411289)
@@ -1,8 +1,7 @@
 bin/softhsm2-dump-file
 bin/softhsm2-keyconv
 bin/softhsm2-util
-%%ETCDIR%%2.conf
-%%ETCDIR%%2.conf.sample
+@sample %%ETCDIR%%2.conf.sample
 lib/softhsm/libsofthsm2.a
 lib/softhsm/libsofthsm2.so
 man/man1/softhsm2-dump-file.1.gz



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603171620.u2HGKGKM070922>