Fri Apr 1 08:07:29 2022 UTC ()
*: finish move of botan to versioned directories


(wiz)
diff -r1.120 -r1.121 pkgsrc/devel/monotone/Makefile
diff -r1.8 -r1.9 pkgsrc/net/powerdns/options.mk
diff -r1.851 -r1.852 pkgsrc/security/Makefile
diff -r1.2 -r0 pkgsrc/security/botan/DESCR
diff -r1.54 -r0 pkgsrc/security/botan/Makefile
diff -r1.8 -r0 pkgsrc/security/botan/PLIST
diff -r1.10 -r0 pkgsrc/security/botan/buildlink3.mk
diff -r1.23 -r0 pkgsrc/security/botan/distinfo
diff -r1.1 -r0 pkgsrc/security/botan-devel/DESCR
diff -r1.45 -r0 pkgsrc/security/botan-devel/Makefile
diff -r1.13 -r0 pkgsrc/security/botan-devel/PLIST
diff -r1.24 -r0 pkgsrc/security/botan-devel/buildlink3.mk
diff -r1.20 -r0 pkgsrc/security/botan-devel/distinfo
diff -r1.2 -r0 pkgsrc/security/botan-devel/patches/patch-configure.py
diff -r1.4 -r0 pkgsrc/security/botan-devel/patches/patch-src_build-data_os_openbsd.txt
diff -r1.7 -r0 pkgsrc/security/botan-devel/patches/patch-src_lib_utils_os__utils.cpp
diff -r1.2 -r0 pkgsrc/security/botan/patches/patch-src_build-data_arch_arm.txt
diff -r1.2 -r0 pkgsrc/security/botan/patches/patch-src_entropy_unix_procs_info.txt
diff -r1.1 -r0 pkgsrc/security/botan/patches/patch-src_build-data_makefile_unix.in
diff -r1.1 -r0 pkgsrc/security/botan/patches/patch-src_build-data_makefile_unix__shr.in
diff -r1.1 -r0 pkgsrc/security/botan/patches/patch-src_build-data_os_solaris.txt
diff -r1.1 -r0 pkgsrc/security/botan/patches/patch-src_ssl_rec__wri.cpp
diff -r1.1 -r0 pkgsrc/security/botan/patches/patch-src_ssl_tls__client.cpp
diff -r1.1 -r0 pkgsrc/security/botan/patches/patch-src_ssl_tls__client.h
diff -r1.1 -r0 pkgsrc/security/botan/patches/patch-src_ssl_tls__record.h
diff -r1.1 -r0 pkgsrc/security/botan/patches/patch-src_ssl_tls__server.cpp
diff -r1.1 -r0 pkgsrc/security/botan/patches/patch-src_ssl_tls__server.h
diff -r1.41 -r1.42 pkgsrc/security/keepassxc/Makefile
diff -r1.2 -r1.3 pkgsrc/security/opendnssec/options.mk
diff -r1.1 -r1.2 pkgsrc/security/opendnssec2/options.mk
diff -r1.49 -r1.50 pkgsrc/security/softhsm/Makefile
diff -r1.23 -r1.24 pkgsrc/security/softhsm/buildlink3.mk
diff -r1.14 -r1.15 pkgsrc/security/softhsm2/Makefile
diff -r1.10 -r1.11 pkgsrc/security/softhsm2/buildlink3.mk
cvs diff -r1.120 -r1.121 pkgsrc/devel/monotone/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/monotone/Makefile 2021/12/08 16:04:02 1.120
+++ pkgsrc/devel/monotone/Makefile 2022/04/01 08:07:28 1.121
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.120 2021/12/08 16:04:02 adam Exp $ 1# $NetBSD: Makefile,v 1.121 2022/04/01 08:07:28 wiz Exp $
2 2
3DISTNAME= monotone-1.1 3DISTNAME= monotone-1.1
4PKGREVISION= 27 4PKGREVISION= 28
5CATEGORIES= devel scm 5CATEGORIES= devel scm
6MASTER_SITES= http://www.monotone.ca/downloads/1.1/ 6MASTER_SITES= http://www.monotone.ca/downloads/1.1/
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://monotone.ca/ 10HOMEPAGE= http://monotone.ca/
11COMMENT= Free distributed version control system 11COMMENT= Free distributed version control system
12LICENSE= gnu-gpl-v2 OR gnu-gpl-v3 # OR newer 12LICENSE= gnu-gpl-v2 OR gnu-gpl-v3 # OR newer
13 13
14GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
15INFO_FILES= yes 15INFO_FILES= yes
16TEST_TARGET= check 16TEST_TARGET= check
17UNLIMIT_RESOURCES+= datasize 17UNLIMIT_RESOURCES+= datasize
@@ -46,17 +46,16 @@ CONFIGURE_ARGS+= --disable-ipv6 @@ -46,17 +46,16 @@ CONFIGURE_ARGS+= --disable-ipv6
46 46
47INSTALLATION_DIRS+= share/monotone 47INSTALLATION_DIRS+= share/monotone
48 48
49BUILDLINK_API_DEPENDS.pcre+= pcre>=7.6 49BUILDLINK_API_DEPENDS.pcre+= pcre>=7.6
50 50
51.include "../../converters/libiconv/buildlink3.mk" 51.include "../../converters/libiconv/buildlink3.mk"
52.include "../../databases/sqlite3/buildlink3.mk" 52.include "../../databases/sqlite3/buildlink3.mk"
53.include "../../devel/boost-headers/buildlink3.mk" 53.include "../../devel/boost-headers/buildlink3.mk"
54.include "../../devel/gettext-lib/buildlink3.mk" 54.include "../../devel/gettext-lib/buildlink3.mk"
55.include "../../devel/libidn/buildlink3.mk" 55.include "../../devel/libidn/buildlink3.mk"
56.include "../../devel/pcre/buildlink3.mk" 56.include "../../devel/pcre/buildlink3.mk"
57.include "../../devel/zlib/buildlink3.mk" 57.include "../../devel/zlib/buildlink3.mk"
58.include "../../lang/lua/buildlink3.mk" 58.include "../../lang/lua/buildlink3.mk"
59# botan-devel is probably also fine 59.include "../../security/botan1/buildlink3.mk"
60.include "../../security/botan/buildlink3.mk" 
61.include "../../mk/pthread.buildlink3.mk" 60.include "../../mk/pthread.buildlink3.mk"
62.include "../../mk/bsd.pkg.mk" 61.include "../../mk/bsd.pkg.mk"
cvs diff -r1.8 -r1.9 pkgsrc/net/powerdns/options.mk (expand / switch to unified diff)

--- pkgsrc/net/powerdns/options.mk 2020/07/02 13:01:38 1.8
+++ pkgsrc/net/powerdns/options.mk 2022/04/01 08:07:28 1.9
@@ -1,31 +1,31 @@ @@ -1,31 +1,31 @@
1# $NetBSD: options.mk,v 1.8 2020/07/02 13:01:38 otis Exp $ 1# $NetBSD: options.mk,v 1.9 2022/04/01 08:07:28 wiz Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.powerdns 3PKG_OPTIONS_VAR= PKG_OPTIONS.powerdns
4PKG_SUPPORTED_OPTIONS= bind botan luarecords pipe random remote sqlite tools zeromq 4PKG_SUPPORTED_OPTIONS= bind botan luarecords pipe random remote sqlite tools zeromq
5PKG_SUGGESTED_OPTIONS= bind luarecords pipe random 5PKG_SUGGESTED_OPTIONS= bind luarecords pipe random
6 6
7.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
8 8
9PLIST_VARS+= bind luarecords pipe random remote sqlite tools 9PLIST_VARS+= bind luarecords pipe random remote sqlite tools
10 10
11.if !empty(PKG_OPTIONS:Mbind) 11.if !empty(PKG_OPTIONS:Mbind)
12PDNS_MODULES+= bind 12PDNS_MODULES+= bind
13PLIST.bind= yes 13PLIST.bind= yes
14.endif 14.endif
15 15
16.if !empty(PKG_OPTIONS:Mbotan) 16.if !empty(PKG_OPTIONS:Mbotan)
17.include "../../devel/gmp/buildlink3.mk" 17.include "../../devel/gmp/buildlink3.mk"
18.include "../../security/botan-devel/buildlink3.mk" 18.include "../../security/botan2/buildlink3.mk"
19.endif 19.endif
20 20
21.if !empty(PKG_OPTIONS:Mluarecords) 21.if !empty(PKG_OPTIONS:Mluarecords)
22CONFIGURE_ARGS+= --enable-lua-records 22CONFIGURE_ARGS+= --enable-lua-records
23.else 23.else
24CONFIGURE_ARGS+= --disable-lua-records 24CONFIGURE_ARGS+= --disable-lua-records
25.endif 25.endif
26 26
27.if !empty(PKG_OPTIONS:Mpipe) 27.if !empty(PKG_OPTIONS:Mpipe)
28PLIST.pipe= yes 28PLIST.pipe= yes
29PDNS_MODULES+= pipe 29PDNS_MODULES+= pipe
30.endif 30.endif
31 31
cvs diff -r1.851 -r1.852 pkgsrc/security/Makefile (expand / switch to unified diff)

--- pkgsrc/security/Makefile 2022/03/15 18:18:55 1.851
+++ pkgsrc/security/Makefile 2022/04/01 08:07:28 1.852
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.851 2022/03/15 18:18:55 nia Exp $ 1# $NetBSD: Makefile,v 1.852 2022/04/01 08:07:28 wiz Exp $
2# 2#
3 3
4COMMENT= Security and cryptography tools and libraries 4COMMENT= Security and cryptography tools and libraries
5 5
6SUBDIR+= 2fa 6SUBDIR+= 2fa
7SUBDIR+= Bastille 7SUBDIR+= Bastille
8SUBDIR+= CSP 8SUBDIR+= CSP
9SUBDIR+= CoolKey 9SUBDIR+= CoolKey
10SUBDIR+= EasyPG 10SUBDIR+= EasyPG
11SUBDIR+= HElib 11SUBDIR+= HElib
12SUBDIR+= KeePass 12SUBDIR+= KeePass
13SUBDIR+= PACK 13SUBDIR+= PACK
14SUBDIR+= PortableSigner 14SUBDIR+= PortableSigner
@@ -29,28 +29,28 @@ SUBDIR+= amap @@ -29,28 +29,28 @@ SUBDIR+= amap
29SUBDIR+= amass 29SUBDIR+= amass
30SUBDIR+= antonym 30SUBDIR+= antonym
31SUBDIR+= ap-modsecurity2 31SUBDIR+= ap-modsecurity2
32SUBDIR+= apg 32SUBDIR+= apg
33SUBDIR+= argon2 33SUBDIR+= argon2
34SUBDIR+= arirang 34SUBDIR+= arirang
35SUBDIR+= asignify 35SUBDIR+= asignify
36SUBDIR+= authelia 36SUBDIR+= authelia
37SUBDIR+= avcheck 37SUBDIR+= avcheck
38SUBDIR+= bcrypt 38SUBDIR+= bcrypt
39SUBDIR+= bearssl 39SUBDIR+= bearssl
40SUBDIR+= beecrypt 40SUBDIR+= beecrypt
41SUBDIR+= bitstir 41SUBDIR+= bitstir
42SUBDIR+= botan 42SUBDIR+= botan1
43SUBDIR+= botan-devel 43SUBDIR+= botan2
44SUBDIR+= ca-certificates 44SUBDIR+= ca-certificates
45SUBDIR+= caff 45SUBDIR+= caff
46SUBDIR+= ccid 46SUBDIR+= ccid
47SUBDIR+= cfs 47SUBDIR+= cfs
48SUBDIR+= chkrootkit 48SUBDIR+= chkrootkit
49SUBDIR+= clamav 49SUBDIR+= clamav
50SUBDIR+= clamav-doc 50SUBDIR+= clamav-doc
51SUBDIR+= clusterssh 51SUBDIR+= clusterssh
52SUBDIR+= codecrypt 52SUBDIR+= codecrypt
53SUBDIR+= courier-authlib 53SUBDIR+= courier-authlib
54SUBDIR+= crack 54SUBDIR+= crack
55SUBDIR+= cracklib 55SUBDIR+= cracklib
56SUBDIR+= crypto++ 56SUBDIR+= crypto++
File Deleted: pkgsrc/security/botan/Attic/DESCR
File Deleted: pkgsrc/security/botan/Attic/Makefile
File Deleted: pkgsrc/security/botan/Attic/PLIST
File Deleted: pkgsrc/security/botan/Attic/buildlink3.mk
File Deleted: pkgsrc/security/botan/Attic/distinfo
File Deleted: pkgsrc/security/botan-devel/Attic/DESCR
File Deleted: pkgsrc/security/botan-devel/Attic/Makefile
File Deleted: pkgsrc/security/botan-devel/Attic/PLIST
File Deleted: pkgsrc/security/botan-devel/Attic/buildlink3.mk
File Deleted: pkgsrc/security/botan-devel/Attic/distinfo
File Deleted: pkgsrc/security/botan-devel/patches/Attic/patch-configure.py
File Deleted: pkgsrc/security/botan-devel/patches/Attic/patch-src_build-data_os_openbsd.txt
File Deleted: pkgsrc/security/botan-devel/patches/Attic/patch-src_lib_utils_os__utils.cpp
File Deleted: pkgsrc/security/botan/patches/Attic/patch-src_build-data_arch_arm.txt
File Deleted: pkgsrc/security/botan/patches/Attic/patch-src_entropy_unix_procs_info.txt
File Deleted: pkgsrc/security/botan/patches/Attic/patch-src_build-data_makefile_unix.in
File Deleted: pkgsrc/security/botan/patches/Attic/patch-src_build-data_makefile_unix__shr.in
File Deleted: pkgsrc/security/botan/patches/Attic/patch-src_build-data_os_solaris.txt
File Deleted: pkgsrc/security/botan/patches/Attic/patch-src_ssl_rec__wri.cpp
File Deleted: pkgsrc/security/botan/patches/Attic/patch-src_ssl_tls__client.cpp
File Deleted: pkgsrc/security/botan/patches/Attic/patch-src_ssl_tls__client.h
File Deleted: pkgsrc/security/botan/patches/Attic/patch-src_ssl_tls__record.h
File Deleted: pkgsrc/security/botan/patches/Attic/patch-src_ssl_tls__server.cpp
File Deleted: pkgsrc/security/botan/patches/Attic/patch-src_ssl_tls__server.h
cvs diff -r1.41 -r1.42 pkgsrc/security/keepassxc/Makefile (expand / switch to unified diff)

--- pkgsrc/security/keepassxc/Makefile 2022/03/31 23:30:16 1.41
+++ pkgsrc/security/keepassxc/Makefile 2022/04/01 08:07:28 1.42
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.41 2022/03/31 23:30:16 wiz Exp $ 1# $NetBSD: Makefile,v 1.42 2022/04/01 08:07:28 wiz Exp $
2 2
3DISTNAME= keepassxc-${GITHUB_RELEASE}-src 3DISTNAME= keepassxc-${GITHUB_RELEASE}-src
4PKGNAME= ${DISTNAME:S/-src//} 4PKGNAME= ${DISTNAME:S/-src//}
5PKGREVISION= 1 5PKGREVISION= 2
6CATEGORIES= security 6CATEGORIES= security
7MASTER_SITES= ${MASTER_SITE_GITHUB:=keepassxreboot/} 7MASTER_SITES= ${MASTER_SITE_GITHUB:=keepassxreboot/}
8GITHUB_RELEASE= 2.7.0 8GITHUB_RELEASE= 2.7.0
9EXTRACT_SUFX= .tar.xz 9EXTRACT_SUFX= .tar.xz
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= https://keepassxc.org/ 12HOMEPAGE= https://keepassxc.org/
13COMMENT= Password generator and manager 13COMMENT= Password generator and manager
14LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2 AND gnu-lgpl-v2 AND gnu-lgpl-v3 AND mit AND cc0-1.0-universal 14LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2 AND gnu-lgpl-v2 AND gnu-lgpl-v3 AND mit AND cc0-1.0-universal
15 15
16SUPERSEDES+= keepassx-[0-9]* 16SUPERSEDES+= keepassx-[0-9]*
17SUPERSEDES+= keepassx0-[0-9]* 17SUPERSEDES+= keepassx0-[0-9]*
18 18
@@ -31,22 +31,22 @@ NOT_PAX_MPROTECT_SAFE+= bin/keepassxc @@ -31,22 +31,22 @@ NOT_PAX_MPROTECT_SAFE+= bin/keepassxc
31.PHONY: qmake-bin-add 31.PHONY: qmake-bin-add
32pre-configure: qmake-bin-add 32pre-configure: qmake-bin-add
33 33
34qmake-bin-add: 34qmake-bin-add:
35 ${LN} -sf ${QTDIR}/bin/qmake ${BUILDLINK_DIR}/bin/ 35 ${LN} -sf ${QTDIR}/bin/qmake ${BUILDLINK_DIR}/bin/
36 36
37pre-configure: 37pre-configure:
38 ${MKDIR} ${WRKSRC}/build 38 ${MKDIR} ${WRKSRC}/build
39 39
40.include "../../converters/qrencode/buildlink3.mk" 40.include "../../converters/qrencode/buildlink3.mk"
41.include "../../devel/zlib/buildlink3.mk" 41.include "../../devel/zlib/buildlink3.mk"
42.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 42.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
43.include "../../security/argon2/buildlink3.mk" 43.include "../../security/argon2/buildlink3.mk"
44.include "../../security/botan-devel/buildlink3.mk" 44.include "../../security/botan2/buildlink3.mk"
45.include "../../sysutils/desktop-file-utils/desktopdb.mk" 45.include "../../sysutils/desktop-file-utils/desktopdb.mk"
46.include "../../x11/qt5-qtbase/buildlink3.mk" 46.include "../../x11/qt5-qtbase/buildlink3.mk"
47.include "../../x11/qt5-qtsvg/buildlink3.mk" 47.include "../../x11/qt5-qtsvg/buildlink3.mk"
48.include "../../x11/qt5-qttools/buildlink3.mk" 48.include "../../x11/qt5-qttools/buildlink3.mk"
49.include "../../x11/qt5-qtx11extras/buildlink3.mk" 49.include "../../x11/qt5-qtx11extras/buildlink3.mk"
50# does not support editline 50# does not support editline
51.include "../../devel/readline/buildlink3.mk" 51.include "../../devel/readline/buildlink3.mk"
52.include "../../mk/bsd.pkg.mk" 52.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/security/opendnssec/options.mk (expand / switch to unified diff)

--- pkgsrc/security/opendnssec/options.mk 2011/01/24 20:30:28 1.2
+++ pkgsrc/security/opendnssec/options.mk 2022/04/01 08:07:28 1.3
@@ -1,15 +1,14 @@ @@ -1,15 +1,14 @@
1# $NetBSD: options.mk,v 1.2 2011/01/24 20:30:28 pettai Exp $ 1# $NetBSD: options.mk,v 1.3 2022/04/01 08:07:28 wiz Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.opendnssec 3PKG_OPTIONS_VAR= PKG_OPTIONS.opendnssec
4PKG_SUPPORTED_OPTIONS= softhsm 4PKG_SUPPORTED_OPTIONS= softhsm
5PKG_SUGGESTED_OPTIONS= softhsm 5PKG_SUGGESTED_OPTIONS= softhsm
6 6
7.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
8 8
9### 9###
10### SoftHSM 10### SoftHSM
11### 11###
12.if !empty(PKG_OPTIONS:Msofthsm) 12.if !empty(PKG_OPTIONS:Msofthsm)
13DEPENDS+= softhsm-[0-9]*:../../security/softhsm 
14.include "../../security/softhsm/buildlink3.mk" 13.include "../../security/softhsm/buildlink3.mk"
15.endif 14.endif
cvs diff -r1.1 -r1.2 pkgsrc/security/opendnssec2/options.mk (expand / switch to unified diff)

--- pkgsrc/security/opendnssec2/options.mk 2019/11/06 13:44:38 1.1
+++ pkgsrc/security/opendnssec2/options.mk 2022/04/01 08:07:28 1.2
@@ -1,15 +1,14 @@ @@ -1,15 +1,14 @@
1# $NetBSD: options.mk,v 1.1 2019/11/06 13:44:38 he Exp $ 1# $NetBSD: options.mk,v 1.2 2022/04/01 08:07:28 wiz Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.opendnssec 3PKG_OPTIONS_VAR= PKG_OPTIONS.opendnssec
4PKG_SUPPORTED_OPTIONS= softhsm2 4PKG_SUPPORTED_OPTIONS= softhsm2
5PKG_SUGGESTED_OPTIONS= softhsm2 5PKG_SUGGESTED_OPTIONS= softhsm2
6 6
7.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
8 8
9### 9###
10### SoftHSM 10### SoftHSM
11### 11###
12.if !empty(PKG_OPTIONS:Msofthsm2) 12.if !empty(PKG_OPTIONS:Msofthsm2)
13DEPENDS+= softhsm2-[0-9]*:../../security/softhsm2 
14.include "../../security/softhsm2/buildlink3.mk" 13.include "../../security/softhsm2/buildlink3.mk"
15.endif 14.endif
cvs diff -r1.49 -r1.50 pkgsrc/security/softhsm/Makefile (expand / switch to unified diff)

--- pkgsrc/security/softhsm/Makefile 2021/12/08 16:02:36 1.49
+++ pkgsrc/security/softhsm/Makefile 2022/04/01 08:07:28 1.50
@@ -1,18 +1,17 @@ @@ -1,18 +1,17 @@
1# $NetBSD: Makefile,v 1.49 2021/12/08 16:02:36 adam Exp $ 1# $NetBSD: Makefile,v 1.50 2022/04/01 08:07:28 wiz Exp $
2# 
3 2
4DISTNAME= softhsm-1.3.7 3DISTNAME= softhsm-1.3.7
5PKGREVISION= 19 4PKGREVISION= 20
6CATEGORIES= security 5CATEGORIES= security
7MASTER_SITES= https://www.opendnssec.org/files/source/ 6MASTER_SITES= https://www.opendnssec.org/files/source/
8 7
9MAINTAINER= pettai@NetBSD.org 8MAINTAINER= pettai@NetBSD.org
10HOMEPAGE= https://www.opendnssec.org/softhsm/ 9HOMEPAGE= https://www.opendnssec.org/softhsm/
11COMMENT= Cryptographic store accessible through a PKCS\#11 interface 10COMMENT= Cryptographic store accessible through a PKCS\#11 interface
12LICENSE= 2-clause-bsd 11LICENSE= 2-clause-bsd
13 12
14BUILD_DEFS+= VARBASE 13BUILD_DEFS+= VARBASE
15 14
16USE_LANGUAGES= c c++ 15USE_LANGUAGES= c c++
17USE_LIBTOOL= yes 16USE_LIBTOOL= yes
18 17
@@ -28,15 +27,15 @@ SUBST_STAGE.paths= pre-configure @@ -28,15 +27,15 @@ SUBST_STAGE.paths= pre-configure
28SUBST_VARS.paths= EGDIR 27SUBST_VARS.paths= EGDIR
29 28
30CXXFLAGS.NetBSD+= -D_NETBSD_SOURCE 29CXXFLAGS.NetBSD+= -D_NETBSD_SOURCE
31 30
32CONF_FILES= ${EGDIR}/softhsm.conf ${PKG_SYSCONFDIR}/softhsm.conf 31CONF_FILES= ${EGDIR}/softhsm.conf ${PKG_SYSCONFDIR}/softhsm.conf
33 32
34INSTALLATION_DIRS= ${EGDIR} etc bin lib 33INSTALLATION_DIRS= ${EGDIR} etc bin lib
35OWN_DIRS= ${VARBASE}/softhsm 34OWN_DIRS= ${VARBASE}/softhsm
36 35
37pre-install: 36pre-install:
38 ${INSTALL_DATA} ${WRKSRC}/softhsm.conf ${DESTDIR}${EGDIR} 37 ${INSTALL_DATA} ${WRKSRC}/softhsm.conf ${DESTDIR}${EGDIR}
39 38
40.include "../../databases/sqlite3/buildlink3.mk" 39.include "../../databases/sqlite3/buildlink3.mk"
41.include "../../security/botan/buildlink3.mk" 40.include "../../security/botan1/buildlink3.mk"
42.include "../../mk/bsd.pkg.mk" 41.include "../../mk/bsd.pkg.mk"
cvs diff -r1.23 -r1.24 pkgsrc/security/softhsm/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/security/softhsm/buildlink3.mk 2021/04/21 11:40:37 1.23
+++ pkgsrc/security/softhsm/buildlink3.mk 2022/04/01 08:07:28 1.24
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: buildlink3.mk,v 1.23 2021/04/21 11:40:37 adam Exp $ 1# $NetBSD: buildlink3.mk,v 1.24 2022/04/01 08:07:28 wiz Exp $
2 2
3BUILDLINK_TREE+= softhsm 3BUILDLINK_TREE+= softhsm
4 4
5.if !defined(SOFTHSM_BUILDLINK3_MK) 5.if !defined(SOFTHSM_BUILDLINK3_MK)
6SOFTHSM_BUILDLINK3_MK:= 6SOFTHSM_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.softhsm+= softhsm>=1.1.3 8BUILDLINK_API_DEPENDS.softhsm+= softhsm>=1.1.3
9BUILDLINK_ABI_DEPENDS.softhsm+= softhsm>=1.3.7nb18 9BUILDLINK_ABI_DEPENDS.softhsm+= softhsm>=1.3.7nb18
10BUILDLINK_PKGSRCDIR.softhsm?= ../../security/softhsm 10BUILDLINK_PKGSRCDIR.softhsm?= ../../security/softhsm
11 11
12.include "../../databases/sqlite3/buildlink3.mk" 12.include "../../databases/sqlite3/buildlink3.mk"
13.include "../../security/botan/buildlink3.mk" 13.include "../../security/botan1/buildlink3.mk"
14.endif # SOFTHSM_BUILDLINK3_MK 14.endif # SOFTHSM_BUILDLINK3_MK
15 15
16BUILDLINK_TREE+= -softhsm 16BUILDLINK_TREE+= -softhsm
cvs diff -r1.14 -r1.15 pkgsrc/security/softhsm2/Makefile (expand / switch to unified diff)

--- pkgsrc/security/softhsm2/Makefile 2022/03/31 23:30:16 1.14
+++ pkgsrc/security/softhsm2/Makefile 2022/04/01 08:07:28 1.15
@@ -1,20 +1,19 @@ @@ -1,20 +1,19 @@
1# $NetBSD: Makefile,v 1.14 2022/03/31 23:30:16 wiz Exp $ 1# $NetBSD: Makefile,v 1.15 2022/04/01 08:07:28 wiz Exp $
2# 
3 2
4VERSION= 2.6.1 3VERSION= 2.6.1
5DISTNAME= softhsm-${VERSION} 4DISTNAME= softhsm-${VERSION}
6PKGNAME= softhsm2-${VERSION} 5PKGNAME= softhsm2-${VERSION}
7PKGREVISION= 6 6PKGREVISION= 7
8CATEGORIES= security 7CATEGORIES= security
9MASTER_SITES= http://www.opendnssec.org/files/source/ 8MASTER_SITES= http://www.opendnssec.org/files/source/
10 9
11MAINTAINER= he@NetBSD.org 10MAINTAINER= he@NetBSD.org
12HOMEPAGE= https://www.opendnssec.org/softhsm/ 11HOMEPAGE= https://www.opendnssec.org/softhsm/
13COMMENT= Cryptographic store accessible through a PKCS\#11 interface 12COMMENT= Cryptographic store accessible through a PKCS\#11 interface
14LICENSE= 2-clause-bsd 13LICENSE= 2-clause-bsd
15 14
16BUILD_DEFS+= VARBASE 15BUILD_DEFS+= VARBASE
17 16
18USE_LANGUAGES= c c++ 17USE_LANGUAGES= c c++
19USE_LIBTOOL= yes 18USE_LIBTOOL= yes
20 19
@@ -37,16 +36,16 @@ CXXFLAGS.NetBSD+= -D_NETBSD_SOURCE @@ -37,16 +36,16 @@ CXXFLAGS.NetBSD+= -D_NETBSD_SOURCE
37CXXFLAGS+= -g 36CXXFLAGS+= -g
38INSTALL_UNSTRIPPED= YES 37INSTALL_UNSTRIPPED= YES
39 38
40CONF_FILES= ${EGDIR}/softhsm2.conf ${PKG_SYSCONFDIR}/softhsm2.conf 39CONF_FILES= ${EGDIR}/softhsm2.conf ${PKG_SYSCONFDIR}/softhsm2.conf
41 40
42INSTALLATION_DIRS= ${EGDIR} etc bin lib 41INSTALLATION_DIRS= ${EGDIR} etc bin lib
43OWN_DIRS= ${VARBASE}/softhsm 42OWN_DIRS= ${VARBASE}/softhsm
44 43
45pre-install: 44pre-install:
46 ${INSTALL_DATA} ${WRKSRC}/src/lib/common/softhsm2.conf ${DESTDIR}${EGDIR} 45 ${INSTALL_DATA} ${WRKSRC}/src/lib/common/softhsm2.conf ${DESTDIR}${EGDIR}
47 46
48USE_BUILTIN.sqlite3=NO 47USE_BUILTIN.sqlite3=NO
49.include "../../databases/sqlite3/buildlink3.mk" 48.include "../../databases/sqlite3/buildlink3.mk"
50.include "../../security/botan-devel/buildlink3.mk" 49.include "../../security/botan2/buildlink3.mk"
51.include "../../security/openssl/buildlink3.mk" 50.include "../../security/openssl/buildlink3.mk"
52.include "../../mk/bsd.pkg.mk" 51.include "../../mk/bsd.pkg.mk"
cvs diff -r1.10 -r1.11 pkgsrc/security/softhsm2/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/security/softhsm2/buildlink3.mk 2022/03/31 23:30:16 1.10
+++ pkgsrc/security/softhsm2/buildlink3.mk 2022/04/01 08:07:28 1.11
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: buildlink3.mk,v 1.10 2022/03/31 23:30:16 wiz Exp $ 1# $NetBSD: buildlink3.mk,v 1.11 2022/04/01 08:07:28 wiz Exp $
2 2
3BUILDLINK_TREE+= softhsm2 3BUILDLINK_TREE+= softhsm2
4 4
5.if !defined(SOFTHSM2_BUILDLINK3_MK) 5.if !defined(SOFTHSM2_BUILDLINK3_MK)
6SOFTHSM2_BUILDLINK3_MK:= 6SOFTHSM2_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.softhsm2+= softhsm2>=2.0.0 8BUILDLINK_API_DEPENDS.softhsm2+= softhsm2>=2.0.0
9BUILDLINK_ABI_DEPENDS.softhsm2+= softhsm2>=2.6.1nb6 9BUILDLINK_ABI_DEPENDS.softhsm2+= softhsm2>=2.6.1nb6
10BUILDLINK_PKGSRCDIR.softhsm2?= ../../security/softhsm2 10BUILDLINK_PKGSRCDIR.softhsm2?= ../../security/softhsm2
11 11
12.include "../../databases/sqlite3/buildlink3.mk" 12.include "../../databases/sqlite3/buildlink3.mk"
13.include "../../security/botan-devel/buildlink3.mk" 13.include "../../security/botan2/buildlink3.mk"
14.endif # SOFTHSM2_BUILDLINK3_MK 14.endif # SOFTHSM2_BUILDLINK3_MK
15 15
16BUILDLINK_TREE+= -softhsm2 16BUILDLINK_TREE+= -softhsm2