summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathieu Arnold <mat@FreeBSD.org>2016-03-17 16:20:16 +0000
committerMathieu Arnold <mat@FreeBSD.org>2016-03-17 16:20:16 +0000
commit1538f66f411fc3d9549e7804f7d410dcbd362260 (patch)
tree3c6b146a0542aae27edfd09c8daf5668cb99912e
parentUpdate to 1.0.20160315. (diff)
Update to 2.1.0. [1]
While there, use options helpers. PR: 208089 [1] Submitted by: maintainer Sponsored by: Absolight
Notes
Notes: svn path=/head/; revision=411289
-rw-r--r--security/softhsm2/Makefile20
-rw-r--r--security/softhsm2/distinfo4
-rw-r--r--security/softhsm2/pkg-plist3
3 files changed, 9 insertions, 18 deletions
diff --git a/security/softhsm2/Makefile b/security/softhsm2/Makefile
index 608b5fa5e66b..ef6cd5a1889c 100644
--- a/security/softhsm2/Makefile
+++ b/security/softhsm2/Makefile
@@ -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 library
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>
diff --git a/security/softhsm2/distinfo b/security/softhsm2/distinfo
index d22bbd7fbc22..e71f0434a631 100644
--- a/security/softhsm2/distinfo
+++ b/security/softhsm2/distinfo
@@ -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
diff --git a/security/softhsm2/pkg-plist b/security/softhsm2/pkg-plist
index 98040873b756..c3854f6ea5f2 100644
--- a/security/softhsm2/pkg-plist
+++ b/security/softhsm2/pkg-plist
@@ -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