4 files changed, 32 insertions, 40 deletions

diff --git a/databases/kdb/Makefile b/databases/kdb/Makefile
index f5ff708a8d75..f4edce795b06 100644
--- a/databases/kdb/Makefile
+++ b/databases/kdb/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=		kdb
-DISTVERSION=		3.0.2
-PORTREVISION=	3
+DISTVERSION=		3.1.0
 CATEGORIES=		databases kde
 MASTER_SITES=		KDE/stable/${PORTNAME}/src
 DIST_SUBDIR=		KDE/${PORTNAME}
diff --git a/databases/kdb/distinfo b/databases/kdb/distinfo
index 111d862fa8ad..f2559df96b48 100644
--- a/databases/kdb/distinfo
+++ b/databases/kdb/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1506099432
-SHA256 (KDE/kdb/kdb-3.0.2.tar.xz) = 896804959f4e203cbafb3d345127c6d80721d79136dbfd6d51c4e93131ec21d8
-SIZE (KDE/kdb/kdb-3.0.2.tar.xz) = 478576
+TIMESTAMP = 1520616671
+SHA256 (KDE/kdb/kdb-3.1.0.tar.xz) = 175645a149ae4d758ff2746900f6eabe4734b2bdac4d8c95893c650be4f929f2
+SIZE (KDE/kdb/kdb-3.1.0.tar.xz) = 543780
diff --git a/databases/kdb/files/patch-src_CMakeLists.txt b/databases/kdb/files/patch-src_CMakeLists.txt
deleted file mode 100644
index 647f1820b9c3..000000000000
--- a/databases/kdb/files/patch-src_CMakeLists.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-This has been submitted upstream; the # TODO (GEN) is a comment used
-elsewhere upstream to mark things commented-out for generated files.
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index c63ab1f2..73d15fce 100644
---- src/CMakeLists.txt
-+++ src/CMakeLists.txt
-@@ -56,18 +56,18 @@ endif()
- # Mark files as generated, set compile flags
- set_source_files_properties(${PARSER_SOURCE_DIR}/generated/sqlparser.cpp
-     PROPERTIES
--        GENERATED TRUE
-+        #TODO(GEN) GENERATED TRUE
-         # YYERROR_VERBOSE=1 needed to get a token table for tokenName() even for release builds
-         COMPILE_FLAGS "-DYYERROR_VERBOSE=1 ${EXTRA_PARSER_COMPILE_FLAGS} "
- )
--set_source_files_properties(${PARSER_SOURCE_DIR}/generated/sqlparser.h PROPERTIES GENERATED TRUE)
--set_source_files_properties(${PARSER_SOURCE_DIR}/generated/KDbToken.h PROPERTIES GENERATED TRUE)
--set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/KDbConnectionData_sdc.cpp PROPERTIES GENERATED TRUE)
-+# TODO(GEN) set_source_files_properties(${PARSER_SOURCE_DIR}/generated/sqlparser.h PROPERTIES GENERATED TRUE)
-+# TODO(GEN) set_source_files_properties(${PARSER_SOURCE_DIR}/generated/KDbToken.h PROPERTIES GENERATED TRUE)
-+# TODO(GEN) set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/KDbConnectionData_sdc.cpp PROPERTIES GENERATED TRUE)
- 
- set_source_files_properties(
-     ${PARSER_SOURCE_DIR}/generated/sqlscanner.cpp
-     PROPERTIES
--        GENERATED TRUE
-+        #TODO(GEN) GENERATED TRUE
-         COMPILE_FLAGS "${EXTRA_SCANNER_COMPILE_FLAGS} "
- )
- 
diff --git a/databases/kdb/pkg-plist b/databases/kdb/pkg-plist
index d4450088bb5f..9c9fbc5a43cb 100644
--- a/databases/kdb/pkg-plist
+++ b/databases/kdb/pkg-plist
@@ -55,6 +55,8 @@ include/KDb3/KDbObject
 include/KDb3/KDbObject.h
 include/KDb3/KDbObjectNameValidator
 include/KDb3/KDbObjectNameValidator.h
+include/KDb3/KDbOrderByColumn
+include/KDb3/KDbOrderByColumn.h
 include/KDb3/KDbParser
 include/KDb3/KDbParser.h
 include/KDb3/KDbPreparedStatement
@@ -63,6 +65,8 @@ include/KDb3/KDbPreparedStatementInterface
 include/KDb3/KDbPreparedStatementInterface.h
 include/KDb3/KDbProperties
 include/KDb3/KDbProperties.h
+include/KDb3/KDbQueryAsterisk
+include/KDb3/KDbQueryAsterisk.h
 include/KDb3/KDbQueryColumnInfo
 include/KDb3/KDbQueryColumnInfo.h
 include/KDb3/KDbQuerySchema
@@ -77,6 +81,8 @@ include/KDb3/KDbRelationship
 include/KDb3/KDbRelationship.h
 include/KDb3/KDbResult
 include/KDb3/KDbResult.h
+include/KDb3/KDbSelectStatementOptions
+include/KDb3/KDbSelectStatementOptions.h
 include/KDb3/KDbSqlField
 include/KDb3/KDbSqlField.h
 include/KDb3/KDbSqlRecord
@@ -89,6 +95,8 @@ include/KDb3/KDbTableOrQuerySchema
 include/KDb3/KDbTableOrQuerySchema.h
 include/KDb3/KDbTableSchema
 include/KDb3/KDbTableSchema.h
+include/KDb3/KDbTableSchemaChangeListener
+include/KDb3/KDbTableSchemaChangeListener.h
 include/KDb3/KDbTableViewColumn
 include/KDb3/KDbTableViewColumn.h
 include/KDb3/KDbTableViewData
@@ -97,6 +105,10 @@ include/KDb3/KDbToken
 include/KDb3/KDbToken.h
 include/KDb3/KDbTransaction
 include/KDb3/KDbTransaction.h
+include/KDb3/KDbTransactionData
+include/KDb3/KDbTransactionData.h
+include/KDb3/KDbTransactionGuard
+include/KDb3/KDbTransactionGuard.h
 include/KDb3/KDbTristate
 include/KDb3/KDbTristate.h
 include/KDb3/KDbUtils
@@ -110,17 +122,18 @@ include/KDb3/kdb_export.h
 include/KDb3/kdb_version.h
 lib/cmake/KDb3/KDbConfig.cmake
 lib/cmake/KDb3/KDbConfigVersion.cmake
+lib/cmake/KDb3/KDbQCHTargets.cmake
 lib/cmake/KDb3/KDbTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/KDb3/KDbTargets.cmake
 lib/libKDb3.so
-lib/libKDb3.so.3
-lib/libKDb3.so.3.0
-libdata/pkgconfig/KDb3.pc
+lib/libKDb3.so.4
+lib/libKDb3.so.4.1.0
 %%QT_MKSPECDIR%%/modules/qt_KDb3.pri
 %%MYSQL%%%%QT_PLUGINDIR%%/kdb3/kdb_mysqldriver.so
 %%PGSQL%%%%QT_PLUGINDIR%%/kdb3/kdb_postgresqldriver.so
 %%SQLITE%%%%QT_PLUGINDIR%%/kdb3/kdb_sqlitedriver.so
-%%SQLITE%%%%QT_PLUGINDIR%%/kdb3/sqlite3/kdb_sqlite_icu.so
+%%QT_PLUGINDIR%%/kdb3/sqlite3/kdb_sqlite_icu.so
+libdata/pkgconfig/KDb3.pc
 %%MYSQL%%share/locale/ast/LC_MESSAGES/kdb_mysqldriver_qt.qm
 %%PGSQL%%share/locale/ast/LC_MESSAGES/kdb_postgresqldriver_qt.qm
 share/locale/ast/LC_MESSAGES/kdb_qt.qm
@@ -153,11 +166,18 @@ share/locale/es/LC_MESSAGES/kdb_qt.qm
 %%PGSQL%%share/locale/fi/LC_MESSAGES/kdb_postgresqldriver_qt.qm
 share/locale/fi/LC_MESSAGES/kdb_qt.qm
 %%SQLITE%%share/locale/fi/LC_MESSAGES/kdb_sqlitedriver_qt.qm
+%%MYSQL%%share/locale/fr/LC_MESSAGES/kdb_mysqldriver_qt.qm
+%%PGSQL%%share/locale/fr/LC_MESSAGES/kdb_postgresqldriver_qt.qm
+share/locale/fr/LC_MESSAGES/kdb_qt.qm
+%%SQLITE%%share/locale/fr/LC_MESSAGES/kdb_sqlitedriver_qt.qm
 %%MYSQL%%share/locale/gl/LC_MESSAGES/kdb_mysqldriver_qt.qm
 %%PGSQL%%share/locale/gl/LC_MESSAGES/kdb_postgresqldriver_qt.qm
 share/locale/gl/LC_MESSAGES/kdb_qt.qm
 %%SQLITE%%share/locale/gl/LC_MESSAGES/kdb_sqlitedriver_qt.qm
 %%MYSQL%%share/locale/hu/LC_MESSAGES/kdb_mysqldriver_qt.qm
+%%MYSQL%%share/locale/ia/LC_MESSAGES/kdb_mysqldriver_qt.qm
+share/locale/ia/LC_MESSAGES/kdb_qt.qm
+%%SQLITE%%share/locale/ia/LC_MESSAGES/kdb_sqlitedriver_qt.qm
 %%MYSQL%%share/locale/it/LC_MESSAGES/kdb_mysqldriver_qt.qm
 %%PGSQL%%share/locale/it/LC_MESSAGES/kdb_postgresqldriver_qt.qm
 share/locale/it/LC_MESSAGES/kdb_qt.qm
@@ -198,6 +218,10 @@ share/locale/sk/LC_MESSAGES/kdb_qt.qm
 %%PGSQL%%share/locale/sv/LC_MESSAGES/kdb_postgresqldriver_qt.qm
 share/locale/sv/LC_MESSAGES/kdb_qt.qm
 %%SQLITE%%share/locale/sv/LC_MESSAGES/kdb_sqlitedriver_qt.qm
+%%MYSQL%%share/locale/tr/LC_MESSAGES/kdb_mysqldriver_qt.qm
+%%PGSQL%%share/locale/tr/LC_MESSAGES/kdb_postgresqldriver_qt.qm
+share/locale/tr/LC_MESSAGES/kdb_qt.qm
+%%SQLITE%%share/locale/tr/LC_MESSAGES/kdb_sqlitedriver_qt.qm
 %%MYSQL%%share/locale/uk/LC_MESSAGES/kdb_mysqldriver_qt.qm
 %%PGSQL%%share/locale/uk/LC_MESSAGES/kdb_postgresqldriver_qt.qm
 share/locale/uk/LC_MESSAGES/kdb_qt.qm