CVS commit: pkgsrc/security

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Sun Jun  9 21:02:56 UTC 2024

Modified Files:
        pkgsrc/security/qca2-qt5: Makefile.common
        pkgsrc/security/qca2-qt5-gnupg: Makefile
        pkgsrc/security/qca2-qt5-ossl: Makefile

Log Message:
qca2-qt5*: switch to cmake/build.mk


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/security/qca2-qt5/Makefile.common
cvs rdiff -u -r1.31 -r1.32 pkgsrc/security/qca2-qt5-gnupg/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/security/qca2-qt5-ossl/Makefile

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

Modified files:

Index: pkgsrc/security/qca2-qt5/Makefile.common
diff -u pkgsrc/security/qca2-qt5/Makefile.common:1.3 pkgsrc/security/qca2-qt5/Makefile.common:1.4
--- pkgsrc/security/qca2-qt5/Makefile.common:1.3        Sun May 26 10:33:26 2024
+++ pkgsrc/security/qca2-qt5/Makefile.common    Sun Jun  9 21:02:56 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2024/05/26 10:33:26 markd Exp $
+# $NetBSD: Makefile.common,v 1.4 2024/06/09 21:02:56 markd Exp $
 #
 # used by security/qca2-qt5-gnupg/Makefile
 # used by security/qca2-qt5-ossl/Makefile
@@ -16,7 +16,7 @@ LICENSE=      gnu-lgpl-v2.1
 PATCHDIR=      ${.CURDIR}/../../security/qca2-qt5/patches
 DISTINFO_FILE= ${.CURDIR}/../../security/qca2-qt5/distinfo
 
-USE_CMAKE=     yes
+.include "../../devel/cmake/build.mk"
 USE_LANGUAGES= c c++
 
 # install under qt5 prefix to not clash with qca 1.x

Index: pkgsrc/security/qca2-qt5-gnupg/Makefile
diff -u pkgsrc/security/qca2-qt5-gnupg/Makefile:1.31 pkgsrc/security/qca2-qt5-gnupg/Makefile:1.32
--- pkgsrc/security/qca2-qt5-gnupg/Makefile:1.31        Wed May 29 16:34:19 2024
+++ pkgsrc/security/qca2-qt5-gnupg/Makefile     Sun Jun  9 21:02:56 2024
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.31 2024/05/29 16:34:19 adam Exp $
+# $NetBSD: Makefile,v 1.32 2024/06/09 21:02:56 markd Exp $
 
 PKGNAME=       qca2-qt5-gnupg-${DISTNAME:C/.*-//}
 PKGREVISION=   1
 
 COMMENT=       Cross-platform crypto API for Qt5 - GnuPG plugin
 
+BUILD_DIRS=    plugins/qca-gnupg
+
 .include "../../security/qca2-qt5/Makefile.common"
 
 DEPENDS+=      gnupg2-[0-9]*:../../security/gnupg2
 
-BUILD_DIRS=    plugins/qca-gnupg
-
 CMAKE_ARGS+=   -DBUILD_PLUGINS=gnupg
 CMAKE_ARGS+=   -DBUILD_TOOLS=OFF
 CMAKE_ARGS+=   -DINST_QCA_LIB_NAME=-lqca-qt5

Index: pkgsrc/security/qca2-qt5-ossl/Makefile
diff -u pkgsrc/security/qca2-qt5-ossl/Makefile:1.31 pkgsrc/security/qca2-qt5-ossl/Makefile:1.32
--- pkgsrc/security/qca2-qt5-ossl/Makefile:1.31 Wed May 29 16:34:19 2024
+++ pkgsrc/security/qca2-qt5-ossl/Makefile      Sun Jun  9 21:02:56 2024
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.31 2024/05/29 16:34:19 adam Exp $
+# $NetBSD: Makefile,v 1.32 2024/06/09 21:02:56 markd Exp $
 
 PKGNAME=       qca2-qt5-ossl-${DISTNAME:C/.*-//}
 PKGREVISION=   1
 
 COMMENT=       Cross-platform crypto API for Qt5 - OpenSSL plugin
 
-.include "../../security/qca2-qt5/Makefile.common"
-
 BUILD_DIRS=    plugins/qca-ossl
 
+.include "../../security/qca2-qt5/Makefile.common"
+
 CMAKE_ARGS+=   -DBUILD_PLUGINS=ossl
 CMAKE_ARGS+=   -DBUILD_TOOLS=OFF
 CMAKE_ARGS+=   -DINST_QCA_LIB_NAME=-lqca-qt5