7 files changed, 105 insertions, 104 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
diff --git a/databases/kexi/Makefile b/databases/kexi/Makefile
index 9300033e1d61..fd5f8c2d4979 100644
--- a/databases/kexi/Makefile
+++ b/databases/kexi/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=		kexi
-DISTVERSION=		3.0.2
+DISTVERSION=		3.1.0
 CATEGORIES=		databases kde
 MASTER_SITES=		KDE/stable/${PORTNAME}/src
 DIST_SUBDIR=		KDE/${PORTNAME}
diff --git a/databases/kexi/distinfo b/databases/kexi/distinfo
index 96c9289dffc3..c85ee6c8cd89 100644
--- a/databases/kexi/distinfo
+++ b/databases/kexi/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1506101424
-SHA256 (KDE/kexi/kexi-3.0.2.tar.xz) = 8eaea8ba6b833d9413a05496c9099d278f0ea410cf7d2af42bfdf9125d945bba
-SIZE (KDE/kexi/kexi-3.0.2.tar.xz) = 3676556
+TIMESTAMP = 1520616685
+SHA256 (KDE/kexi/kexi-3.1.0.tar.xz) = 6d55cd4af177bcb060673a0977d52bc91cc2dd1b1420d008a78f9783312152fb
+SIZE (KDE/kexi/kexi-3.1.0.tar.xz) = 3028492
diff --git a/databases/kexi/pkg-plist b/databases/kexi/pkg-plist
index a3836a65de34..27ee33ddcca2 100644
--- a/databases/kexi/pkg-plist
+++ b/databases/kexi/pkg-plist
@@ -1,62 +1,68 @@
-bin/kexi
-lib/libkexicore.so
-lib/libkexicore.so.15
-lib/libkexicore.so.15.0.0
-lib/libkexidatatable.so
-lib/libkexidatatable.so.15
-lib/libkexidatatable.so.15.0.0
-lib/libkexidataviewcommon.so
-lib/libkexidataviewcommon.so.15
-lib/libkexidataviewcommon.so.15.0.0
-lib/libkexiextendedwidgets.so
-lib/libkexiextendedwidgets.so.15
-lib/libkexiextendedwidgets.so.15.0.0
-lib/libkexiformutils.so
-lib/libkexiformutils.so.15
-lib/libkexiformutils.so.15.0.0
-lib/libkexiguiutils.so
-lib/libkexiguiutils.so.15
-lib/libkexiguiutils.so.15.0.0
-lib/libkeximain.so
-lib/libkeximain.so.15
-lib/libkeximain.so.15.0.0
-lib/libkeximigrate.so
-lib/libkeximigrate.so.15
-lib/libkeximigrate.so.15.0.0
-lib/libkexirelationsview.so
-lib/libkexirelationsview.so.15
-lib/libkexirelationsview.so.15.0.0
-lib/libkexiundo.so
-lib/libkexiundo.so.15
-lib/libkexiundo.so.15.0.0
-lib/libkexiutils.so
-lib/libkexiutils.so.15
-lib/libkexiutils.so.15.0.0
-lib/libkformdesigner.so
-lib/libkformdesigner.so.15
-lib/libkformdesigner.so.15.0.0
-%%QT_PLUGINDIR%%/kexi/forms/widgets/kexiforms_dbwidgetsplugin.so
-%%QT_PLUGINDIR%%/kexi/forms/widgets/kexiforms_standardwidgetsplugin.so
-%%QT_PLUGINDIR%%/kexi/forms/widgets/kexiforms_webbrowserwidgetplugin.so
-%%QT_PLUGINDIR%%/kexi/kexi_csvimportexportplugin.so
-%%QT_PLUGINDIR%%/kexi/kexi_formplugin.so
-%%QT_PLUGINDIR%%/kexi/kexi_migrationplugin.so
-%%QT_PLUGINDIR%%/kexi/kexi_queryplugin.so
-%%QT_PLUGINDIR%%/kexi/kexi_reportplugin.so
-%%QT_PLUGINDIR%%/kexi/kexi_tableplugin.so
-%%QT_PLUGINDIR%%/kexi/migrate/keximigrate_mdb.so
-%%QT_PLUGINDIR%%/kexi/migrate/keximigrate_mysql.so
-%%QT_PLUGINDIR%%/kexi/migrate/keximigrate_postgresql.so
-%%QT_PLUGINDIR%%/kexi/migrate/keximigrate_tsv.so
-share/applications/org.kde.kexi.desktop
-%%DATADIR%%/icons/hicolor/16x16/actions/web_browser.png
-%%DATADIR%%/icons/hicolor/22x22/actions/web_browser.png
-%%DATADIR%%/icons/kexi_breeze.rcc
-%%DATADIR%%/status/3.0.0/contribution_details.ui
-%%DATADIR%%/status/3.0.0/contribution_help.ui
-%%DATADIR%%/status/3.0.0/status.rcc
-%%DATADIR%%/status/3.0.0/status.ui
-%%DATADIR%%/status/3.0.0/status_strings.ui
+bin/kexi-3.1
+lib/libkexicore3.1.so
+lib/libkexicore3.1.so.3.1
+lib/libkexicore3.1.so.3.1.0
+lib/libkexidatatable3.1.so
+lib/libkexidatatable3.1.so.3.1
+lib/libkexidatatable3.1.so.3.1.0
+lib/libkexidataviewcommon3.1.so
+lib/libkexidataviewcommon3.1.so.3.1
+lib/libkexidataviewcommon3.1.so.3.1.0
+lib/libkexiextendedwidgets3.1.so
+lib/libkexiextendedwidgets3.1.so.3.1
+lib/libkexiextendedwidgets3.1.so.3.1.0
+lib/libkexiformutils3.1.so
+lib/libkexiformutils3.1.so.3.1
+lib/libkexiformutils3.1.so.3.1.0
+lib/libkexiguiutils3.1.so
+lib/libkexiguiutils3.1.so.3.1
+lib/libkexiguiutils3.1.so.3.1.0
+lib/libkeximain3.1.so
+lib/libkeximain3.1.so.3.1
+lib/libkeximain3.1.so.3.1.0
+lib/libkeximigrate3.1.so
+lib/libkeximigrate3.1.so.3.1
+lib/libkeximigrate3.1.so.3.1.0
+lib/libkexirelationsview3.1.so
+lib/libkexirelationsview3.1.so.3.1
+lib/libkexirelationsview3.1.so.3.1.0
+lib/libkexiundo3.1.so
+lib/libkexiundo3.1.so.3.1
+lib/libkexiundo3.1.so.3.1.0
+lib/libkexiutils3.1.so
+lib/libkexiutils3.1.so.3.1
+lib/libkexiutils3.1.so.3.1.0
+lib/libkformdesigner3.1.so
+lib/libkformdesigner3.1.so.3.1
+lib/libkformdesigner3.1.so.3.1.0
+%%QT_PLUGINDIR%%/kexi/3.1/forms/widgets/org.kexi-project.form.widgets.main.so
+%%QT_PLUGINDIR%%/kexi/3.1/forms/widgets/org.kexi-project.form.widgets.web-browser.so
+%%QT_PLUGINDIR%%/kexi/3.1/kexi_csvimportexportplugin.so
+%%QT_PLUGINDIR%%/kexi/3.1/kexi_formplugin.so
+%%QT_PLUGINDIR%%/kexi/3.1/kexi_migrationplugin.so
+%%QT_PLUGINDIR%%/kexi/3.1/kexi_queryplugin.so
+%%QT_PLUGINDIR%%/kexi/3.1/kexi_reportplugin.so
+%%QT_PLUGINDIR%%/kexi/3.1/kexi_tableplugin.so
+%%QT_PLUGINDIR%%/kexi/3.1/migrate/keximigrate_mdb.so
+%%QT_PLUGINDIR%%/kexi/3.1/migrate/keximigrate_mysql.so
+%%QT_PLUGINDIR%%/kexi/3.1/migrate/keximigrate_postgresql.so
+%%QT_PLUGINDIR%%/kexi/3.1/migrate/keximigrate_tsv.so
+share/applications/org.kde.kexi-3.1.desktop
+share/doc/HTML/de/kexi/index.cache.bz2
+share/doc/HTML/de/kexi/index.docbook
+share/doc/HTML/nl/kexi/index.cache.bz2
+share/doc/HTML/nl/kexi/index.docbook
+share/doc/HTML/it/kexi/index.cache.bz2
+share/doc/HTML/it/kexi/index.docbook
+%%DATADIR%%/3.1/examples/Simple_Database.kexi
+%%DATADIR%%/3.1/icons/kexi_breeze.rcc
+%%DATADIR%%/3.1/icons/org.kexi-project.form.widgets.main_breeze.rcc
+%%DATADIR%%/3.1/icons/org.kexi-project.form.widgets.web-browser_breeze.rcc
+%%DATADIR%%/3.1/status/contribution_details.ui
+%%DATADIR%%/3.1/status/contribution_help.ui
+%%DATADIR%%/3.1/status/status.rcc
+%%DATADIR%%/3.1/status/status.ui
+%%DATADIR%%/3.1/status/status_strings.ui
 share/locale/ar/LC_MESSAGES/kexi.mo
 share/locale/ast/LC_MESSAGES/kexi.mo
 share/locale/ast/LC_MESSAGES/kexiforms_mapwidgetplugin.mo
@@ -91,6 +97,7 @@ share/locale/de/LC_MESSAGES/keximigrate_mdb.mo
 share/locale/el/LC_MESSAGES/kexi.mo
 share/locale/el/LC_MESSAGES/kexiforms_mapwidgetplugin.mo
 share/locale/el/LC_MESSAGES/kexiforms_webbrowserwidgetplugin.mo
+share/locale/el/LC_MESSAGES/keximigrate_mdb.mo
 share/locale/en_GB/LC_MESSAGES/kexi.mo
 share/locale/en_GB/LC_MESSAGES/kexiforms_mapwidgetplugin.mo
 share/locale/en_GB/LC_MESSAGES/kexiforms_webbrowserwidgetplugin.mo
@@ -119,6 +126,7 @@ share/locale/ga/LC_MESSAGES/kexiforms_webbrowserwidgetplugin.mo
 share/locale/gl/LC_MESSAGES/kexi.mo
 share/locale/gl/LC_MESSAGES/kexiforms_mapwidgetplugin.mo
 share/locale/gl/LC_MESSAGES/kexiforms_webbrowserwidgetplugin.mo
+share/locale/gl/LC_MESSAGES/keximigrate_mdb.mo
 share/locale/he/LC_MESSAGES/kexi.mo
 share/locale/hi/LC_MESSAGES/kexi.mo
 share/locale/hne/LC_MESSAGES/kexi.mo
@@ -199,6 +207,7 @@ share/locale/tg/LC_MESSAGES/kexi.mo
 share/locale/tr/LC_MESSAGES/kexi.mo
 share/locale/tr/LC_MESSAGES/kexiforms_mapwidgetplugin.mo
 share/locale/tr/LC_MESSAGES/kexiforms_webbrowserwidgetplugin.mo
+share/locale/tr/LC_MESSAGES/keximigrate_mdb.mo
 share/locale/ug/LC_MESSAGES/kexi.mo
 share/locale/ug/LC_MESSAGES/kexiforms_mapwidgetplugin.mo
 share/locale/ug/LC_MESSAGES/kexiforms_webbrowserwidgetplugin.mo
@@ -217,4 +226,4 @@ share/locale/zh_TW/LC_MESSAGES/kexi.mo
 share/locale/zh_TW/LC_MESSAGES/kexiforms_mapwidgetplugin.mo
 share/locale/zh_TW/LC_MESSAGES/kexiforms_webbrowserwidgetplugin.mo
 share/locale/zh_TW/LC_MESSAGES/keximigrate_mdb.mo
-share/metainfo/org.kde.kexi.appdata.xml
+share/metainfo/org.kde.kexi-3.1.appdata.xml