CVS commit: pkgsrc

["Niclas Rosenvik" <nros%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nros
Date:           Thu Nov 24 11:26:20 UTC 2022

Modified Files:
        pkgsrc/databases: Makefile
        pkgsrc/meta-pkgs/qt6: Makefile
        pkgsrc/x11/qt6-qtbase: Makefile.common
Added Files:
        pkgsrc/databases/qt6-odbc: DESCR Makefile PLIST buildlink3.mk distinfo

Log Message:
Add qt6-odbc version 6.4.1 to pkgsrc-current

qt6-odbc is the odbc driver qt6


To generate a diff of this commit:
cvs rdiff -u -r1.668 -r1.669 pkgsrc/databases/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/databases/qt6-odbc/DESCR \
    pkgsrc/databases/qt6-odbc/Makefile pkgsrc/databases/qt6-odbc/PLIST \
    pkgsrc/databases/qt6-odbc/buildlink3.mk \
    pkgsrc/databases/qt6-odbc/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/meta-pkgs/qt6/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/qt6-qtbase/Makefile.common

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

Modified files:

Index: pkgsrc/databases/Makefile
diff -u pkgsrc/databases/Makefile:1.668 pkgsrc/databases/Makefile:1.669
--- pkgsrc/databases/Makefile:1.668     Sun Nov 20 23:21:14 2022
+++ pkgsrc/databases/Makefile   Thu Nov 24 11:26:19 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.668 2022/11/20 23:21:14 adam Exp $
+# $NetBSD: Makefile,v 1.669 2022/11/24 11:26:19 nros Exp $
 
 COMMENT=       Databases
 
@@ -421,6 +421,7 @@ SUBDIR+=    qore-mysql-module
 SUBDIR+=       qore-openldap-module
 SUBDIR+=       qore-pgsql-module
 SUBDIR+=       qore-sqlite3-module
+SUBDIR+=       qt6-odbc
 SUBDIR+=       quicklist
 SUBDIR+=       rdb
 SUBDIR+=       redis

Index: pkgsrc/meta-pkgs/qt6/Makefile
diff -u pkgsrc/meta-pkgs/qt6/Makefile:1.1 pkgsrc/meta-pkgs/qt6/Makefile:1.2
--- pkgsrc/meta-pkgs/qt6/Makefile:1.1   Thu Nov 24 11:11:38 2022
+++ pkgsrc/meta-pkgs/qt6/Makefile       Thu Nov 24 11:26:19 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2022/11/24 11:11:38 nros Exp $
+# $NetBSD: Makefile,v 1.2 2022/11/24 11:26:19 nros Exp $
 
 DISTNAME=      qt6-${QTVERSION}
 
@@ -10,6 +10,7 @@ META_PACKAGE= yes
 
 .include "Makefile.common"
 
+DEPENDS+=      qt6-odbc-${QTVERSION}{,nb[0-9]*}:../../databases/qt6-odbc
 DEPENDS+=      qt6-qtbase-${QTVERSION}{,nb[0-9]*}:../../x11/qt6-qtbase
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/x11/qt6-qtbase/Makefile.common
diff -u pkgsrc/x11/qt6-qtbase/Makefile.common:1.1 pkgsrc/x11/qt6-qtbase/Makefile.common:1.2
--- pkgsrc/x11/qt6-qtbase/Makefile.common:1.1   Thu Nov 24 11:11:38 2022
+++ pkgsrc/x11/qt6-qtbase/Makefile.common       Thu Nov 24 11:26:19 2022
@@ -1,4 +1,5 @@
-# $NetBSD: Makefile.common,v 1.1 2022/11/24 11:11:38 nros Exp $
+# $NetBSD: Makefile.common,v 1.2 2022/11/24 11:26:19 nros Exp $
+# used by databases/qt6-odbc/Makefile
 # used by x11/qt6-qtbase/Makefile
 
 .include "../../meta-pkgs/qt6/Makefile.common"

Added files:

Index: pkgsrc/databases/qt6-odbc/DESCR
diff -u /dev/null pkgsrc/databases/qt6-odbc/DESCR:1.1
--- /dev/null   Thu Nov 24 11:26:20 2022
+++ pkgsrc/databases/qt6-odbc/DESCR     Thu Nov 24 11:26:19 2022
@@ -0,0 +1 @@
+Qt6 odbc SQL driver
Index: pkgsrc/databases/qt6-odbc/Makefile
diff -u /dev/null pkgsrc/databases/qt6-odbc/Makefile:1.1
--- /dev/null   Thu Nov 24 11:26:20 2022
+++ pkgsrc/databases/qt6-odbc/Makefile  Thu Nov 24 11:26:19 2022
@@ -0,0 +1,24 @@
+# $NetBSD: Makefile,v 1.1 2022/11/24 11:26:19 nros Exp $
+
+DISTNAME=      qtbase-everywhere-src-${QTVERSION}
+PKGNAME=       qt6-odbc-${QTVERSION}
+COMMENT=       Qt6 odbc SQL driver
+CATEGORIES=    databases
+
+LICENSE=       gnu-lgpl-v3 OR gnu-gpl-v2 OR gnu-gpl-v3
+
+CONFIGURE_ARGS+=       -sql-odbc
+CONFIGURE_ARGS+=       -no-sql-db2
+CONFIGURE_ARGS+=       -no-sql-ibase
+CONFIGURE_ARGS+=       -no-sql-mysql
+CONFIGURE_ARGS+=       -no-sql-oci
+CONFIGURE_ARGS+=       -no-sql-psql
+CONFIGURE_ARGS+=       -no-sql-sqlite
+
+QTCONFDIR=             src/plugins/sqldrivers
+
+.include "../../x11/qt6-qtbase/Makefile.common"
+
+.include "../../databases/unixodbc/buildlink3.mk"
+.include "../../x11/qt6-qtbase/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/databases/qt6-odbc/PLIST
diff -u /dev/null pkgsrc/databases/qt6-odbc/PLIST:1.1
--- /dev/null   Thu Nov 24 11:26:20 2022
+++ pkgsrc/databases/qt6-odbc/PLIST     Thu Nov 24 11:26:19 2022
@@ -0,0 +1,8 @@
+@comment $NetBSD: PLIST,v 1.1 2022/11/24 11:26:19 nros Exp $
+qt6/lib/cmake/Qt6Sql/Qt6QODBCDriverPluginAdditionalTargetInfo.cmake
+qt6/lib/cmake/Qt6Sql/Qt6QODBCDriverPluginConfig.cmake
+qt6/lib/cmake/Qt6Sql/Qt6QODBCDriverPluginConfigVersion.cmake
+qt6/lib/cmake/Qt6Sql/Qt6QODBCDriverPluginConfigVersionImpl.cmake
+qt6/lib/cmake/Qt6Sql/Qt6QODBCDriverPluginTargets-release.cmake
+qt6/lib/cmake/Qt6Sql/Qt6QODBCDriverPluginTargets.cmake
+qt6/plugins/sqldrivers/libqsqlodbc.so
Index: pkgsrc/databases/qt6-odbc/buildlink3.mk
diff -u /dev/null pkgsrc/databases/qt6-odbc/buildlink3.mk:1.1
--- /dev/null   Thu Nov 24 11:26:20 2022
+++ pkgsrc/databases/qt6-odbc/buildlink3.mk     Thu Nov 24 11:26:19 2022
@@ -0,0 +1,15 @@
+# $NetBSD: buildlink3.mk,v 1.1 2022/11/24 11:26:19 nros Exp $
+
+BUILDLINK_TREE+=       qt6-odbc
+
+.if !defined(QT6_ODBC_BUILDLINK3_MK)
+QT6_ODBC_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.qt6-odbc+=       qt6-odbc>=6.4.1
+BUILDLINK_PKGSRCDIR.qt6-odbc?=         ../../databases/qt6-odbc
+
+BUILDLINK_LIBDIRS.qt6-odbc+=           qt6/plugins/sqldrivers
+
+.endif # QT6_ODBC_BUILDLINK3_MK
+
+BUILDLINK_TREE+=       -qt6-odbc
Index: pkgsrc/databases/qt6-odbc/distinfo
diff -u /dev/null pkgsrc/databases/qt6-odbc/distinfo:1.1
--- /dev/null   Thu Nov 24 11:26:20 2022
+++ pkgsrc/databases/qt6-odbc/distinfo  Thu Nov 24 11:26:19 2022
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2022/11/24 11:26:19 nros Exp $
+
+BLAKE2s (qtbase-everywhere-src-6.4.1.tar.xz) = edd9109f0862cc1ea719e84d0aa85c15a1e28f0ad55ba9881a374828ee8ee7b8
+SHA512 (qtbase-everywhere-src-6.4.1.tar.xz) = d5c85a8b05dd32912e213b1c51c928e6bde0ac64cdef1649419f02522604988add9d8e45baa770f53790b5477e6e43e4e66e69db7f2e0c1081a48cfa4052b4af
+Size (qtbase-everywhere-src-6.4.1.tar.xz) = 47988872 bytes