CVS commit: pkgsrc/security/keepassxc

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Jun 26 11:46:13 UTC 2023

Modified Files:
        pkgsrc/security/keepassxc: Makefile
Added Files:
        pkgsrc/security/keepassxc: options.mk

Log Message:
keepassx: switch to botan3, and add yubikey option (default off)

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 pkgsrc/security/keepassxc/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/security/keepassxc/options.mk

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

Modified files:

Index: pkgsrc/security/keepassxc/Makefile
diff -u pkgsrc/security/keepassxc/Makefile:1.58 pkgsrc/security/keepassxc/Makefile:1.59
--- pkgsrc/security/keepassxc/Makefile:1.58     Mon May 22 21:00:43 2023
+++ pkgsrc/security/keepassxc/Makefile  Mon Jun 26 11:46:13 2023
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.58 2023/05/22 21:00:43 wiz Exp $
+# $NetBSD: Makefile,v 1.59 2023/06/26 11:46:13 wiz Exp $
 
 DISTNAME=      keepassxc-2.7.5-src
 PKGNAME=       ${DISTNAME:S/-src//}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    security
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=keepassxreboot/}
 GITHUB_RELEASE=        ${PKGVERSION_NOREV}
@@ -16,6 +16,9 @@ LICENSE=      gnu-gpl-v2 AND gnu-lgpl-v2 AND 
 SUPERSEDES+=   keepassx-[0-9]*
 SUPERSEDES+=   keepassx0-[0-9]*
 
+# botan3
+GCC_REQD+=     11
+
 WRKSRC=                ${WRKDIR}/${DISTNAME:S/-src//}
 
 USE_LANGUAGES= c c++
@@ -31,12 +34,14 @@ pre-configure: qmake-bin-add
 qmake-bin-add:
        ${LN} -sf ${QTDIR}/bin/qmake ${BUILDLINK_DIR}/bin/
 
+.include "options.mk"
+
 .include "../../devel/cmake/build.mk"
 .include "../../converters/qrencode/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../security/argon2/buildlink3.mk"
-.include "../../security/botan2/buildlink3.mk"
+.include "../../security/botan3/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
 .include "../../x11/qt5-qtsvg/buildlink3.mk"

Added files:

Index: pkgsrc/security/keepassxc/options.mk
diff -u /dev/null pkgsrc/security/keepassxc/options.mk:1.1
--- /dev/null   Mon Jun 26 11:46:13 2023
+++ pkgsrc/security/keepassxc/options.mk        Mon Jun 26 11:46:13 2023
@@ -0,0 +1,15 @@
+# $NetBSD: options.mk,v 1.1 2023/06/26 11:46:13 wiz Exp $
+
+PKG_OPTIONS_VAR=               PKG_OPTIONS.keepassxc
+PKG_SUPPORTED_OPTIONS=         yubikey
+PKG_SUGGESTED_OPTIONS=         #
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Myubikey)
+CMAKE_ARGS+=   -DWITH_XC_YUBIKEY=ON
+.include "../../devel/libusb1/buildlink3.mk"
+.include "../../security/pcsc-lite/buildlink3.mk"
+.else
+CMAKE_ARGS+=   -DWITH_XC_YUBIKEY=OFF
+.endif