CVS commit: pkgsrc

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Apr  1 08:07:29 UTC 2022

Modified Files:
        pkgsrc/devel/monotone: Makefile
        pkgsrc/net/powerdns: options.mk
        pkgsrc/security: Makefile
        pkgsrc/security/keepassxc: Makefile
        pkgsrc/security/opendnssec: options.mk
        pkgsrc/security/opendnssec2: options.mk
        pkgsrc/security/softhsm: Makefile buildlink3.mk
        pkgsrc/security/softhsm2: Makefile buildlink3.mk
Removed Files:
        pkgsrc/security/botan: DESCR Makefile PLIST buildlink3.mk distinfo
        pkgsrc/security/botan-devel: DESCR Makefile PLIST buildlink3.mk
            distinfo
        pkgsrc/security/botan-devel/patches: patch-configure.py
            patch-src_build-data_os_openbsd.txt
            patch-src_lib_utils_os__utils.cpp
        pkgsrc/security/botan/patches: patch-src_build-data_arch_arm.txt
            patch-src_build-data_makefile_unix.in
            patch-src_build-data_makefile_unix__shr.in
            patch-src_build-data_os_solaris.txt
            patch-src_entropy_unix_procs_info.txt patch-src_ssl_rec__wri.cpp
            patch-src_ssl_tls__client.cpp patch-src_ssl_tls__client.h
            patch-src_ssl_tls__record.h patch-src_ssl_tls__server.cpp
            patch-src_ssl_tls__server.h

Log Message:
*: finish move of botan to versioned directories


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

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/monotone/Makefile
diff -u pkgsrc/devel/monotone/Makefile:1.120 pkgsrc/devel/monotone/Makefile:1.121
--- pkgsrc/devel/monotone/Makefile:1.120        Wed Dec  8 16:04:02 2021
+++ pkgsrc/devel/monotone/Makefile      Fri Apr  1 08:07:28 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.120 2021/12/08 16:04:02 adam Exp $
+# $NetBSD: Makefile,v 1.121 2022/04/01 08:07:28 wiz Exp $
 
 DISTNAME=      monotone-1.1
-PKGREVISION=   27
+PKGREVISION=   28
 CATEGORIES=    devel scm
 MASTER_SITES=  http://www.monotone.ca/downloads/1.1/
 EXTRACT_SUFX=  .tar.bz2
@@ -56,7 +56,6 @@ BUILDLINK_API_DEPENDS.pcre+=  pcre>=7.6
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../lang/lua/buildlink3.mk"
-# botan-devel is probably also fine
-.include "../../security/botan/buildlink3.mk"
+.include "../../security/botan1/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/powerdns/options.mk
diff -u pkgsrc/net/powerdns/options.mk:1.8 pkgsrc/net/powerdns/options.mk:1.9
--- pkgsrc/net/powerdns/options.mk:1.8  Thu Jul  2 13:01:38 2020
+++ pkgsrc/net/powerdns/options.mk      Fri Apr  1 08:07:28 2022
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.8 2020/07/02 13:01:38 otis Exp $
+# $NetBSD: options.mk,v 1.9 2022/04/01 08:07:28 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.powerdns
 PKG_SUPPORTED_OPTIONS= bind botan luarecords pipe random remote sqlite tools zeromq
@@ -15,7 +15,7 @@ PLIST.bind=           yes
 
 .if !empty(PKG_OPTIONS:Mbotan)
 .include "../../devel/gmp/buildlink3.mk"
-.include "../../security/botan-devel/buildlink3.mk"
+.include "../../security/botan2/buildlink3.mk"
 .endif
 
 .if !empty(PKG_OPTIONS:Mluarecords)

Index: pkgsrc/security/Makefile
diff -u pkgsrc/security/Makefile:1.851 pkgsrc/security/Makefile:1.852
--- pkgsrc/security/Makefile:1.851      Tue Mar 15 18:18:55 2022
+++ pkgsrc/security/Makefile    Fri Apr  1 08:07:28 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.851 2022/03/15 18:18:55 nia Exp $
+# $NetBSD: Makefile,v 1.852 2022/04/01 08:07:28 wiz Exp $
 #
 
 COMMENT=       Security and cryptography tools and libraries
@@ -39,8 +39,8 @@ SUBDIR+=      bcrypt
 SUBDIR+=       bearssl
 SUBDIR+=       beecrypt
 SUBDIR+=       bitstir
-SUBDIR+=       botan
-SUBDIR+=       botan-devel
+SUBDIR+=       botan1
+SUBDIR+=       botan2
 SUBDIR+=       ca-certificates
 SUBDIR+=       caff
 SUBDIR+=       ccid

Index: pkgsrc/security/keepassxc/Makefile
diff -u pkgsrc/security/keepassxc/Makefile:1.41 pkgsrc/security/keepassxc/Makefile:1.42
--- pkgsrc/security/keepassxc/Makefile:1.41     Thu Mar 31 23:30:16 2022
+++ pkgsrc/security/keepassxc/Makefile  Fri Apr  1 08:07:28 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.41 2022/03/31 23:30:16 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2022/04/01 08:07:28 wiz Exp $
 
 DISTNAME=      keepassxc-${GITHUB_RELEASE}-src
 PKGNAME=       ${DISTNAME:S/-src//}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    security
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=keepassxreboot/}
 GITHUB_RELEASE=        2.7.0
@@ -41,7 +41,7 @@ pre-configure:
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../security/argon2/buildlink3.mk"
-.include "../../security/botan-devel/buildlink3.mk"
+.include "../../security/botan2/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
 .include "../../x11/qt5-qtsvg/buildlink3.mk"

Index: pkgsrc/security/opendnssec/options.mk
diff -u pkgsrc/security/opendnssec/options.mk:1.2 pkgsrc/security/opendnssec/options.mk:1.3
--- pkgsrc/security/opendnssec/options.mk:1.2   Mon Jan 24 20:30:28 2011
+++ pkgsrc/security/opendnssec/options.mk       Fri Apr  1 08:07:28 2022
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2011/01/24 20:30:28 pettai Exp $
+# $NetBSD: options.mk,v 1.3 2022/04/01 08:07:28 wiz Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.opendnssec
 PKG_SUPPORTED_OPTIONS=         softhsm
@@ -10,6 +10,5 @@ PKG_SUGGESTED_OPTIONS=                softhsm
 ### SoftHSM
 ###
 .if !empty(PKG_OPTIONS:Msofthsm)
-DEPENDS+=      softhsm-[0-9]*:../../security/softhsm
 .include "../../security/softhsm/buildlink3.mk"
 .endif

Index: pkgsrc/security/opendnssec2/options.mk
diff -u pkgsrc/security/opendnssec2/options.mk:1.1 pkgsrc/security/opendnssec2/options.mk:1.2
--- pkgsrc/security/opendnssec2/options.mk:1.1  Wed Nov  6 13:44:38 2019
+++ pkgsrc/security/opendnssec2/options.mk      Fri Apr  1 08:07:28 2022
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2019/11/06 13:44:38 he Exp $
+# $NetBSD: options.mk,v 1.2 2022/04/01 08:07:28 wiz Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.opendnssec
 PKG_SUPPORTED_OPTIONS=         softhsm2
@@ -10,6 +10,5 @@ PKG_SUGGESTED_OPTIONS=                softhsm2
 ### SoftHSM
 ###
 .if !empty(PKG_OPTIONS:Msofthsm2)
-DEPENDS+=      softhsm2-[0-9]*:../../security/softhsm2
 .include "../../security/softhsm2/buildlink3.mk"
 .endif

Index: pkgsrc/security/softhsm/Makefile
diff -u pkgsrc/security/softhsm/Makefile:1.49 pkgsrc/security/softhsm/Makefile:1.50
--- pkgsrc/security/softhsm/Makefile:1.49       Wed Dec  8 16:02:36 2021
+++ pkgsrc/security/softhsm/Makefile    Fri Apr  1 08:07:28 2022
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.49 2021/12/08 16:02:36 adam Exp $
-#
+# $NetBSD: Makefile,v 1.50 2022/04/01 08:07:28 wiz Exp $
 
 DISTNAME=      softhsm-1.3.7
-PKGREVISION=   19
+PKGREVISION=   20
 CATEGORIES=    security
 MASTER_SITES=  https://www.opendnssec.org/files/source/
 
@@ -38,5 +37,5 @@ pre-install:
        ${INSTALL_DATA} ${WRKSRC}/softhsm.conf ${DESTDIR}${EGDIR}
 
 .include "../../databases/sqlite3/buildlink3.mk"
-.include "../../security/botan/buildlink3.mk"
+.include "../../security/botan1/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/security/softhsm/buildlink3.mk
diff -u pkgsrc/security/softhsm/buildlink3.mk:1.23 pkgsrc/security/softhsm/buildlink3.mk:1.24
--- pkgsrc/security/softhsm/buildlink3.mk:1.23  Wed Apr 21 11:40:37 2021
+++ pkgsrc/security/softhsm/buildlink3.mk       Fri Apr  1 08:07:28 2022
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.23 2021/04/21 11:40:37 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.24 2022/04/01 08:07:28 wiz Exp $
 
 BUILDLINK_TREE+=       softhsm
 
@@ -10,7 +10,7 @@ BUILDLINK_ABI_DEPENDS.softhsm+=       softhsm>
 BUILDLINK_PKGSRCDIR.softhsm?=  ../../security/softhsm
 
 .include "../../databases/sqlite3/buildlink3.mk"
-.include "../../security/botan/buildlink3.mk"
+.include "../../security/botan1/buildlink3.mk"
 .endif # SOFTHSM_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -softhsm

Index: pkgsrc/security/softhsm2/Makefile
diff -u pkgsrc/security/softhsm2/Makefile:1.14 pkgsrc/security/softhsm2/Makefile:1.15
--- pkgsrc/security/softhsm2/Makefile:1.14      Thu Mar 31 23:30:16 2022
+++ pkgsrc/security/softhsm2/Makefile   Fri Apr  1 08:07:28 2022
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2022/03/31 23:30:16 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.15 2022/04/01 08:07:28 wiz Exp $
 
 VERSION=       2.6.1
 DISTNAME=      softhsm-${VERSION}
 PKGNAME=       softhsm2-${VERSION}
-PKGREVISION=   6
+PKGREVISION=   7
 CATEGORIES=    security
 MASTER_SITES=  http://www.opendnssec.org/files/source/
 
@@ -47,6 +46,6 @@ pre-install:
 
 USE_BUILTIN.sqlite3=NO
 .include "../../databases/sqlite3/buildlink3.mk"
-.include "../../security/botan-devel/buildlink3.mk"
+.include "../../security/botan2/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/security/softhsm2/buildlink3.mk
diff -u pkgsrc/security/softhsm2/buildlink3.mk:1.10 pkgsrc/security/softhsm2/buildlink3.mk:1.11
--- pkgsrc/security/softhsm2/buildlink3.mk:1.10 Thu Mar 31 23:30:16 2022
+++ pkgsrc/security/softhsm2/buildlink3.mk      Fri Apr  1 08:07:28 2022
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2022/03/31 23:30:16 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2022/04/01 08:07:28 wiz Exp $
 
 BUILDLINK_TREE+=       softhsm2
 
@@ -10,7 +10,7 @@ BUILDLINK_ABI_DEPENDS.softhsm2+=      softhsm
 BUILDLINK_PKGSRCDIR.softhsm2?=         ../../security/softhsm2
 
 .include "../../databases/sqlite3/buildlink3.mk"
-.include "../../security/botan-devel/buildlink3.mk"
+.include "../../security/botan2/buildlink3.mk"
 .endif # SOFTHSM2_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -softhsm2