Import of pkgsrc-2015Q3

2015-10-03 03:37:01 -07:00
parent f641581404
commit 9d819b6d54
7578 changed files with 228314 additions and 80018 deletions
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.487 2015/06/13 15:28:22 fhajny Exp $
+# $NetBSD: Makefile,v 1.498 2015/09/03 07:31:17 fhajny Exp $

 COMMENT=	Databases

@@ -50,6 +50,8 @@ SUBDIR+=	jdbc-mysql31
 SUBDIR+=	jdbc-mysql5
 SUBDIR+=	jdbc-postgresql84
 SUBDIR+=	jdbc-postgresql92
+SUBDIR+=	jdbc-postgresql93
+SUBDIR+=	jdbc-postgresql94
 SUBDIR+=	kmysqladmin
 SUBDIR+=	krecipes
 SUBDIR+=	kyotocabinet
@@ -68,6 +70,7 @@ SUBDIR+=	libgda-postgres
 SUBDIR+=	libmongo-client
 SUBDIR+=	libpqxx
 SUBDIR+=	libpqxx-doc
+SUBDIR+=	libzdb
 SUBDIR+=	lmdb
 SUBDIR+=	lua-sqlite
 SUBDIR+=	lua-sqlite3
@@ -187,6 +190,7 @@ SUBDIR+=	p5-Net-MySQL
 SUBDIR+=	p5-ORLite
 SUBDIR+=	p5-ORLite-Migrate
 SUBDIR+=	p5-Palm
+SUBDIR+=	p5-Parse-Dia-SQL
 SUBDIR+=	p5-RRD-Simple
 SUBDIR+=	p5-Redis
 SUBDIR+=	p5-Rose-DB
@@ -244,6 +248,7 @@ SUBDIR+=	php-pdo_pgsql
 SUBDIR+=	php-pdo_sqlite
 SUBDIR+=	php-pgsql
 SUBDIR+=	php-redis
+SUBDIR+=	php-rrd
 SUBDIR+=	php-sqlrelay
 SUBDIR+=	phpldapadmin
 SUBDIR+=	phpmyadmin
@@ -357,6 +362,7 @@ SUBDIR+=	py-cx_Oracle
 SUBDIR+=	py-datapkg
 SUBDIR+=	py-elasticsearch
 SUBDIR+=	py-elixir
+SUBDIR+=	py-firebase
 SUBDIR+=	py-gdbm
 SUBDIR+=	py-ldap
 SUBDIR+=	py-metakit
@@ -473,6 +479,7 @@ SUBDIR+=	shared-mime-info
 SUBDIR+=	skytools
 SUBDIR+=	slony1
 SUBDIR+=	soci
+SUBDIR+=	sql-workbench
 SUBDIR+=	sqlite
 SUBDIR+=	sqlite3
 SUBDIR+=	sqlite3-docs
@@ -481,12 +488,14 @@ SUBDIR+=	sqlitebrowser
 SUBDIR+=	sqlrelay
 SUBDIR+=	sqlrelay-freetds
 SUBDIR+=	sqlrelay-mysql
+SUBDIR+=	sqlrelay-nodejs
 SUBDIR+=	sqlrelay-odbc
 SUBDIR+=	sqlrelay-pgsql
 SUBDIR+=	sqlrelay-sqlite
 SUBDIR+=	sqsh
 SUBDIR+=	sqsh-motif
 SUBDIR+=	sqsh-x11
+SUBDIR+=	squirrelsql
 SUBDIR+=	tcl-fbsql
 SUBDIR+=	tcl-gdbm
 SUBDIR+=	tdb
--- a/databases/abook/Makefile
+++ b/databases/abook/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.27 2014/10/09 14:06:04 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2015/08/18 07:31:04 wiz Exp $
 #

 DISTNAME=	abook-0.6.0pre2
 PKGNAME=	abook-0.6.0rc2
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	databases
 MASTER_SITES=	http://abook.sourceforge.net/devel/

--- a/databases/cdb/distinfo
+++ b/databases/cdb/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 16:33:05 agc Exp $
+$NetBSD: distinfo,v 1.4 2015/08/30 08:18:14 dholland Exp $

 SHA1 (cdb-0.75.tar.gz) = 555749be5b2617e29e44b5326a2536813d62c248
 RMD160 (cdb-0.75.tar.gz) = d52288ee6df58fdc5a79efc16693cd5e305f9c65
 Size (cdb-0.75.tar.gz) = 54162 bytes
 SHA1 (patch-aa) = 7e7a4e20ca36c3e773c729c0f0d751ac6340ccda
+SHA1 (patch-cdbmake.c) = 08dfa3ab166bb7467d022a0ea20cac9426f30368
--- a/databases/cdb/patches/patch-cdbmake.c
+++ b/databases/cdb/patches/patch-cdbmake.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-cdbmake.c,v 1.1 2015/08/30 08:18:15 dholland Exp $
+
+fix build if the compiler decides not to inline.
+
+--- cdbmake.c~	2000-02-19 20:42:05.000000000 +0000
+++ cdbmake.c
+@@ -26,7 +26,7 @@ void die_readformat(void)
+   strerr_die2x(111,FATAL,"unable to read input: bad format");
+ }
+ 
+-inline void get(char *ch)
+static inline void get(char *ch)
+ {
+   switch(buffer_GETC(buffer_0,ch)) {
+     case 0: die_readformat();
--- a/databases/couchdb/distinfo
+++ b/databases/couchdb/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.11 2014/10/02 07:42:06 fhajny Exp $
+$NetBSD: distinfo,v 1.12 2015/07/18 07:36:35 fhajny Exp $

 SHA1 (apache-couchdb-1.6.1.tar.gz) = 6275f3818579d7b307052e9735c42a8a64313229
 RMD160 (apache-couchdb-1.6.1.tar.gz) = 9701c8cb7f712ce792ede3fc73e9cf028cea54b5
 Size (apache-couchdb-1.6.1.tar.gz) = 12085350 bytes
-SHA1 (patch-aa) = 2e3d48a1fc7650c04e640420155d2a68d5bbfaba
+SHA1 (patch-aa) = 57db9ee375e15667b6a653d2440be5dcad0cca5a
 SHA1 (patch-ab) = f07acca555013b1bfde95bdd056cccd9a551440a
 SHA1 (patch-ac) = b5dd1be18110655b1494278b168cf1971e1ca872
 SHA1 (patch-ad) = ce73b043244b5a3f657bd7e13e11d686d8f77f92
--- a/databases/couchdb/patches/patch-aa
+++ b/databases/couchdb/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.6 2014/01/02 17:10:23 fhajny Exp $
+$NetBSD: patch-aa,v 1.7 2015/07/18 07:36:35 fhajny Exp $

 Set pkgsrc standard paths.
--- configure.orig	2013-10-20 09:38:47.000000000 +0000
+--- configure.orig	2014-08-21 23:15:40.000000000 +0000
 +++ configure
@@ -647,6 +647,7 @@ localstatelogdir
 localstatelibdir
@@ -11,7 +11,7 @@ Set pkgsrc standard paths.
 localdatadir
 localconfdir
 bug_uri
-@@ -18326,7 +18327,7 @@ fi
+@@ -18383,7 +18384,7 @@ fi
 done
 test -n "$CURL_CONFIG" || CURL_CONFIG="no"
 
@@ -20,7 +20,7 @@ Set pkgsrc standard paths.
 
       :
 
-@@ -18338,7 +18339,7 @@ $as_echo "$as_me: WARNING: You will be u
+@@ -18395,7 +18396,7 @@ $as_echo "$as_me: WARNING: You will be u
 
 else
 
@@ -29,7 +29,7 @@ Set pkgsrc standard paths.
 
 	CURL_CFLAGS="`$CURL_CONFIG $curl_config_args --cflags`"
 
-@@ -18348,7 +18349,7 @@ else
+@@ -18405,7 +18406,7 @@ else
 
 fi
 
@@ -38,7 +38,43 @@ Set pkgsrc standard paths.
 
 	CURL_LIBS="`$CURL_CONFIG $curl_config_args --libs`"
 
-@@ -19153,13 +19154,15 @@ localdatadir=${datadir}/${package_identi
+@@ -18532,7 +18533,7 @@ esac
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking Erlang version compatibility" >&5
+ $as_echo_n "checking Erlang version compatibility... " >&6; }
+-erlang_version_error="The installed Erlang version must be >= R14B (erts-5.8.1) and =< 17 (erts-6.0)"
+erlang_version_error="The installed Erlang version must be >= R14B (erts-5.8.1) and =< 18 (erts-7.0)"
+ 
+ version="`${ERL} -version 2>&1 | ${SED} 's/[^0-9]/ /g'` 0 0 0"
+ major_version=`echo $version | ${AWK} "{print \\$1}"`
+@@ -18540,7 +18541,7 @@ minor_version=`echo $version | ${AWK} "{
+ patch_version=`echo $version | ${AWK} "{print \\$3}"`
+ echo -n "detected Erlang version: $major_version.$minor_version.$patch_version..."
+ 
+-if test $major_version -lt 5 -o $major_version -gt 6; then
+if test $major_version -lt 5 -o $major_version -gt 7; then
+     as_fn_error $? "$erlang_version_error major_version does not match" "$LINENO" 5
+ fi
+ 
+@@ -18559,7 +18560,7 @@ otp_release="`\
+ 
+ 
+ 
+- if can_use_nifs=$(echo $otp_release | grep -E "^(R14B|R15|R16|17)"); then
+ if can_use_nifs=$(echo $otp_release | grep -E "^(R14B|R15|R16|17|18)"); then
+   USE_OTP_NIFS_TRUE=
+   USE_OTP_NIFS_FALSE='#'
+ else
+@@ -18567,7 +18568,7 @@ else
+   USE_OTP_NIFS_FALSE=
+ fi
+ 
+- if can_use_ejson=$(echo $otp_release | grep -E "^(R14B03|R15|R16|17)"); then
+ if can_use_ejson=$(echo $otp_release | grep -E "^(R14B03|R15|R16|17|18)"); then
+   USE_EJSON_COMPARE_NIF_TRUE=
+   USE_EJSON_COMPARE_NIF_FALSE='#'
+ else
+@@ -19212,13 +19213,15 @@ localdatadir=${datadir}/${package_identi
 
 localdocdir=${datadir}/doc/${package_identifier}
 
@@ -57,7 +93,7 @@ Set pkgsrc standard paths.
 
 erlangversion=${erlangversion}
 
-@@ -19174,9 +19177,9 @@ if test x${IS_WINDOWS} = xTRUE; then
+@@ -19233,9 +19236,9 @@ if test x${IS_WINDOWS} = xTRUE; then
     localerlanglibdir=${libdir}
 
 else
--- a/databases/db4/distinfo
+++ b/databases/db4/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.43 2014/07/23 00:22:42 ryoon Exp $
+$NetBSD: distinfo,v 1.44 2015/09/08 18:51:27 joerg Exp $

 SHA1 (db-4.8.30.tar.gz) = ab36c170dda5b2ceaad3915ced96e41c6b7e493c
 RMD160 (db-4.8.30.tar.gz) = dd2fcd4c9b857a91e2f491fd4fadb0c51b993a9c
@@ -7,7 +7,12 @@ SHA1 (patch-aa) = 1004feec022eefbf3fd57b6d9af99edc5a2bf17a
 SHA1 (patch-ab) = 961c4ef5ad84739bd7eae57f407b89f42864b66e
 SHA1 (patch-ac) = 045a3b83b9c6c164382ec546b06ae248620552cf
 SHA1 (patch-ae) = 43e574154de93dba60392b09d6ebddbca1036849
-SHA1 (patch-dbinc_atomic.h) = ff60e3af41ac1b000ebccc91bc673adde5c7463b
+SHA1 (patch-dbinc_atomic.h) = d68db1b7e07b35ec070a18f0195b9f3b386114dd
 SHA1 (patch-dist_s__sig) = d891a6fabd27a07776bdaa21843563638ecb89f2
 SHA1 (patch-env_env__sig.c) = 93199a4147de946d1285fa006c751f4569f2cdb5
+SHA1 (patch-mp_mp__fget.c) = 697955fec5e492ba22c1bf6832527d115c3782ad
+SHA1 (patch-mp_mp__mvcc.c) = 72ceab20696d0391823c02b0f6b6cd485f40249b
+SHA1 (patch-mp_mp__region.c) = ac9f5934864b14027b417ab032679aee237208e3
+SHA1 (patch-mutex_mut__method.c) = 6134e13ea1d9c30e3f6ad61bd043f0add56f5c95
+SHA1 (patch-mutex_mut__tas.c) = a07b51a18d04cb3ab4abd5b0c675cf0170083210
 SHA1 (patch-repmgr_repmgr__posix.c) = 98ca8bbb1a82b02db2be6f0a69c5d74d8563fe74
--- a/databases/db4/patches/patch-dbinc_atomic.h
+++ b/databases/db4/patches/patch-dbinc_atomic.h
@@ -1,10 +1,21 @@
-$NetBSD: patch-dbinc_atomic.h,v 1.1 2012/05/29 20:18:28 joerg Exp $
+$NetBSD: patch-dbinc_atomic.h,v 1.2 2015/09/08 18:51:27 joerg Exp $

 Don't define inline functions in the protected namespace.
 This conflicts with Clang builtins.

--- dbinc/atomic.h.orig	2012-05-24 10:38:34.000000000 +0000
+Avoid overlap with stdatomic.h, the C++ binding uses <atomic>.
+
+--- dbinc/atomic.h.orig	2010-04-12 20:25:22.000000000 +0000
 +++ dbinc/atomic.h
+@@ -70,7 +70,7 @@ typedef struct {
+  * These have no memory barriers; the caller must include them when necessary.
+  */
+ #define	atomic_read(p)		((p)->value)
+-#define	atomic_init(p, val)	((p)->value = (val))
+#define	db_atomic_init(p, val)	((p)->value = (val))
+ 
+ #ifdef HAVE_ATOMIC_SUPPORT
+ 
@@ -141,11 +141,7 @@ typedef LONG volatile *interlocked_val;
 
 #if defined(HAVE_ATOMIC_X86_GCC_ASSEMBLY)
@@ -36,3 +47,12 @@ This conflicts with Clang builtins.
 	db_atomic_t *p, atomic_value_t oldval, atomic_value_t newval)
 {
 	atomic_value_t was;
+@@ -206,7 +202,7 @@ static inline int __atomic_compare_excha
+ #define	atomic_dec(env, p)	(--(p)->value)
+ #define	atomic_compare_exchange(env, p, oldval, newval)		\
+ 	(DB_ASSERT(env, atomic_read(p) == (oldval)),		\
+-	atomic_init(p, (newval)), 1)
+	db_atomic_init(p, (newval)), 1)
+ #else
+ #define atomic_inc(env, p)	__atomic_inc(env, p)
+ #define atomic_dec(env, p)	__atomic_dec(env, p)
--- a/databases/db4/patches/patch-mp_mp__fget.c
+++ b/databases/db4/patches/patch-mp_mp__fget.c
@@ -0,0 +1,22 @@
+$NetBSD: patch-mp_mp__fget.c,v 1.1 2015/09/08 18:51:27 joerg Exp $
+
+--- mp/mp_fget.c.orig	2015-08-29 23:35:11.000000000 +0000
+++ mp/mp_fget.c
+@@ -617,7 +617,7 @@ alloc:		/* Allocate a new buffer header 
+ 
+ 		/* Initialize enough so we can call __memp_bhfree. */
+ 		alloc_bhp->flags = 0;
+-		atomic_init(&alloc_bhp->ref, 1);
+		db_atomic_init(&alloc_bhp->ref, 1);
+ #ifdef DIAGNOSTIC
+ 		if ((uintptr_t)alloc_bhp->buf & (sizeof(size_t) - 1)) {
+ 			__db_errx(env,
+@@ -911,7 +911,7 @@ alloc:		/* Allocate a new buffer header 
+ 			MVCC_MPROTECT(bhp->buf, mfp->stat.st_pagesize,
+ 			    PROT_READ);
+ 
+-		atomic_init(&alloc_bhp->ref, 1);
+		db_atomic_init(&alloc_bhp->ref, 1);
+ 		MUTEX_LOCK(env, alloc_bhp->mtx_buf);
+ 		alloc_bhp->priority = bhp->priority;
+ 		alloc_bhp->pgno = bhp->pgno;
--- a/databases/db4/patches/patch-mp_mp__mvcc.c
+++ b/databases/db4/patches/patch-mp_mp__mvcc.c
@@ -0,0 +1,22 @@
+$NetBSD: patch-mp_mp__mvcc.c,v 1.1 2015/09/08 18:51:27 joerg Exp $
+
+--- mp/mp_mvcc.c.orig	2015-08-29 23:35:09.000000000 +0000
+++ mp/mp_mvcc.c
+@@ -276,7 +276,7 @@ __memp_bh_freeze(dbmp, infop, hp, bhp, n
+ #else
+ 	memcpy(frozen_bhp, bhp, SSZA(BH, buf));
+ #endif
+-	atomic_init(&frozen_bhp->ref, 0);
+	db_atomic_init(&frozen_bhp->ref, 0);
+ 	if (mutex != MUTEX_INVALID)
+ 		frozen_bhp->mtx_buf = mutex;
+ 	else if ((ret = __mutex_alloc(env, MTX_MPOOL_BH,
+@@ -428,7 +428,7 @@ __memp_bh_thaw(dbmp, infop, hp, frozen_b
+ #endif
+ 		alloc_bhp->mtx_buf = mutex;
+ 		MUTEX_LOCK(env, alloc_bhp->mtx_buf);
+-		atomic_init(&alloc_bhp->ref, 1);
+		db_atomic_init(&alloc_bhp->ref, 1);
+ 		F_CLR(alloc_bhp, BH_FROZEN);
+ 	}
+ 
--- a/databases/db4/patches/patch-mp_mp__region.c
+++ b/databases/db4/patches/patch-mp_mp__region.c
@@ -0,0 +1,22 @@
+$NetBSD: patch-mp_mp__region.c,v 1.1 2015/09/08 18:51:27 joerg Exp $
+
+--- mp/mp_region.c.orig	2015-08-29 23:35:05.000000000 +0000
+++ mp/mp_region.c
+@@ -224,7 +224,7 @@ __memp_init(env, dbmp, reginfo_off, htab
+ 			     MTX_MPOOL_FILE_BUCKET, 0, &htab[i].mtx_hash)) != 0)
+ 				return (ret);
+ 			SH_TAILQ_INIT(&htab[i].hash_bucket);
+-			atomic_init(&htab[i].hash_page_dirty, 0);
+			db_atomic_init(&htab[i].hash_page_dirty, 0);
+ 		}
+ 
+ 		/*
+@@ -269,7 +269,7 @@ __memp_init(env, dbmp, reginfo_off, htab
+ 		hp->mtx_hash = (mtx_base == MUTEX_INVALID) ? MUTEX_INVALID :
+ 		    mtx_base + i;
+ 		SH_TAILQ_INIT(&hp->hash_bucket);
+-		atomic_init(&hp->hash_page_dirty, 0);
+		db_atomic_init(&hp->hash_page_dirty, 0);
+ #ifdef HAVE_STATISTICS
+ 		hp->hash_io_wait = 0;
+ 		hp->hash_frozen = hp->hash_thawed = hp->hash_frozen_freed = 0;
--- a/databases/db4/patches/patch-mutex_mut__method.c
+++ b/databases/db4/patches/patch-mutex_mut__method.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-mutex_mut__method.c,v 1.1 2015/09/08 18:51:27 joerg Exp $
+
+--- mutex/mut_method.c.orig	2015-08-29 23:35:02.000000000 +0000
+++ mutex/mut_method.c
+@@ -426,7 +426,7 @@ atomic_compare_exchange(env, v, oldval, 
+ 	MUTEX_LOCK(env, mtx);
+ 	ret = atomic_read(v) == oldval;
+ 	if (ret)
+-		atomic_init(v, newval);
+		db_atomic_init(v, newval);
+ 	MUTEX_UNLOCK(env, mtx);
+ 
+ 	return (ret);
--- a/databases/db4/patches/patch-mutex_mut__tas.c
+++ b/databases/db4/patches/patch-mutex_mut__tas.c
@@ -0,0 +1,22 @@
+$NetBSD: patch-mutex_mut__tas.c,v 1.1 2015/09/09 11:11:45 joerg Exp $
+
+--- mutex/mut_tas.c.orig	2015-08-29 23:35:00.000000000 +0000
+++ mutex/mut_tas.c
+@@ -46,7 +46,7 @@ __db_tas_mutex_init(env, mutex, flags)
+ 
+ #ifdef HAVE_SHARED_LATCHES
+ 	if (F_ISSET(mutexp, DB_MUTEX_SHARED))
+-		atomic_init(&mutexp->sharecount, 0);
+		db_atomic_init(&mutexp->sharecount, 0);
+ 	else
+ #endif
+ 	if (MUTEX_INIT(&mutexp->tas)) {
+@@ -486,7 +486,7 @@ __db_tas_mutex_unlock(env, mutex)
+ 			F_CLR(mutexp, DB_MUTEX_LOCKED);
+ 			/* Flush flag update before zeroing count */
+ 			MEMBAR_EXIT();
+-			atomic_init(&mutexp->sharecount, 0);
+			db_atomic_init(&mutexp->sharecount, 0);
+ 		} else {
+ 			DB_ASSERT(env, sharecount > 0);
+ 			MEMBAR_EXIT();
--- a/databases/db5/distinfo
+++ b/databases/db5/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2014/10/06 14:29:45 adam Exp $
+$NetBSD: distinfo,v 1.11 2015/09/08 18:51:27 joerg Exp $

 SHA1 (db-5.3.28.tar.gz) = fa3f8a41ad5101f43d08bc0efb6241c9b6fc1ae9
 RMD160 (db-5.3.28.tar.gz) = a4898908ef6dccb137df02e43843f7d3cfab6a3c
@@ -7,4 +7,9 @@ SHA1 (patch-aa) = 9450e95f46787ddc1d661beaa239ea0ff4673f20
 SHA1 (patch-ab) = b09fac68d7d847c5660078de90a16f27268e9858
 SHA1 (patch-ac) = 0a243583ae2b66290fb83b112c539001bf3feef2
 SHA1 (patch-dist_aclocal_libtool.m4) = 2d56b318b4f0d14a9352f6c1eb14a4c2b8315fc0
-SHA1 (patch-src_dbinc_atomic.h) = 6d1e97317c20021d13ff5b59f587730301b4a795
+SHA1 (patch-src_dbinc_atomic.h) = c4fbe421d2c8ba68dc81aeeda1cad09a2c68fbe5
+SHA1 (patch-src_mp_mp__fget.c) = c5050193279db979d51d47f5e2c8d7c5cace0fa7
+SHA1 (patch-src_mp_mp__mvcc.c) = 2e8b4e5ff7a7534681597261ba82ca08e9231567
+SHA1 (patch-src_mp_mp__region.c) = 1c33dc783660515ff24ba018d1ef99cedf9eb3f8
+SHA1 (patch-src_mutex_mut__method.c) = 0d13673db042bc0a3d2a49f6636b12f8d2b6e7ca
+SHA1 (patch-src_mutex_mut__tas.c) = 873d5b4ef69ad0e792c28567e54beda76f1b126c
--- a/databases/db5/patches/patch-src_dbinc_atomic.h
+++ b/databases/db5/patches/patch-src_dbinc_atomic.h
@@ -1,9 +1,18 @@
-$NetBSD: patch-src_dbinc_atomic.h,v 1.1 2012/05/31 09:37:21 adam Exp $
+$NetBSD: patch-src_dbinc_atomic.h,v 1.2 2015/09/08 18:51:28 joerg Exp $

 Avoid 'definition of builtin function' error.

--- src/dbinc/atomic.h.orig	2012-05-30 14:59:06.000000000 +0000
+--- src/dbinc/atomic.h.orig	2013-09-09 15:35:08.000000000 +0000
 +++ src/dbinc/atomic.h
+@@ -70,7 +70,7 @@ typedef struct {
+  * These have no memory barriers; the caller must include them when necessary.
+  */
+ #define	atomic_read(p)		((p)->value)
+-#define	atomic_init(p, val)	((p)->value = (val))
+#define	db_atomic_init(p, val)	((p)->value = (val))
+ 
+ #ifdef HAVE_ATOMIC_SUPPORT
+ 
@@ -144,7 +144,7 @@ typedef LONG volatile *interlocked_val;
 #define	atomic_inc(env, p)	__atomic_inc(p)
 #define	atomic_dec(env, p)	__atomic_dec(p)
@@ -22,3 +31,12 @@ Avoid 'definition of builtin function' error.
 	db_atomic_t *p, atomic_value_t oldval, atomic_value_t newval)
 {
 	atomic_value_t was;
+@@ -206,7 +206,7 @@ static inline int __atomic_compare_excha
+ #define	atomic_dec(env, p)	(--(p)->value)
+ #define	atomic_compare_exchange(env, p, oldval, newval)		\
+ 	(DB_ASSERT(env, atomic_read(p) == (oldval)),		\
+-	atomic_init(p, (newval)), 1)
+	db_atomic_init(p, (newval)), 1)
+ #else
+ #define atomic_inc(env, p)	__atomic_inc(env, p)
+ #define atomic_dec(env, p)	__atomic_dec(env, p)
--- a/databases/db5/patches/patch-src_mp_mp__fget.c
+++ b/databases/db5/patches/patch-src_mp_mp__fget.c
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_mp_mp__fget.c,v 1.1 2015/09/08 18:51:28 joerg Exp $
+
+--- src/mp/mp_fget.c.orig	2015-09-02 11:12:45.000000000 +0000
+++ src/mp/mp_fget.c
+@@ -649,7 +649,7 @@ alloc:		/* Allocate a new buffer header 
+ 
+ 		/* Initialize enough so we can call __memp_bhfree. */
+ 		alloc_bhp->flags = 0;
+-		atomic_init(&alloc_bhp->ref, 1);
+		db_atomic_init(&alloc_bhp->ref, 1);
+ #ifdef DIAGNOSTIC
+ 		if ((uintptr_t)alloc_bhp->buf & (sizeof(size_t) - 1)) {
+ 			__db_errx(env, DB_STR("3025",
+@@ -955,7 +955,7 @@ alloc:		/* Allocate a new buffer header 
+ 			MVCC_MPROTECT(bhp->buf, mfp->pagesize,
+ 			    PROT_READ);
+ 
+-		atomic_init(&alloc_bhp->ref, 1);
+		db_atomic_init(&alloc_bhp->ref, 1);
+ 		MUTEX_LOCK(env, alloc_bhp->mtx_buf);
+ 		alloc_bhp->priority = bhp->priority;
+ 		alloc_bhp->pgno = bhp->pgno;
--- a/databases/db5/patches/patch-src_mp_mp__mvcc.c
+++ b/databases/db5/patches/patch-src_mp_mp__mvcc.c
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_mp_mp__mvcc.c,v 1.1 2015/09/08 18:51:28 joerg Exp $
+
+--- src/mp/mp_mvcc.c.orig	2015-09-02 11:12:47.000000000 +0000
+++ src/mp/mp_mvcc.c
+@@ -276,7 +276,7 @@ __memp_bh_freeze(dbmp, infop, hp, bhp, n
+ #else
+ 	memcpy(frozen_bhp, bhp, SSZA(BH, buf));
+ #endif
+-	atomic_init(&frozen_bhp->ref, 0);
+	db_atomic_init(&frozen_bhp->ref, 0);
+ 	if (mutex != MUTEX_INVALID)
+ 		frozen_bhp->mtx_buf = mutex;
+ 	else if ((ret = __mutex_alloc(env, MTX_MPOOL_BH,
+@@ -428,7 +428,7 @@ __memp_bh_thaw(dbmp, infop, hp, frozen_b
+ #endif
+ 		alloc_bhp->mtx_buf = mutex;
+ 		MUTEX_LOCK(env, alloc_bhp->mtx_buf);
+-		atomic_init(&alloc_bhp->ref, 1);
+		db_atomic_init(&alloc_bhp->ref, 1);
+ 		F_CLR(alloc_bhp, BH_FROZEN);
+ 	}
+ 
--- a/databases/db5/patches/patch-src_mp_mp__region.c
+++ b/databases/db5/patches/patch-src_mp_mp__region.c
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_mp_mp__region.c,v 1.1 2015/09/08 18:51:28 joerg Exp $
+
+--- src/mp/mp_region.c.orig	2015-09-02 11:12:49.000000000 +0000
+++ src/mp/mp_region.c
+@@ -245,7 +245,7 @@ __memp_init(env, dbmp, reginfo_off, htab
+ 			     MTX_MPOOL_FILE_BUCKET, 0, &htab[i].mtx_hash)) != 0)
+ 				return (ret);
+ 			SH_TAILQ_INIT(&htab[i].hash_bucket);
+-			atomic_init(&htab[i].hash_page_dirty, 0);
+			db_atomic_init(&htab[i].hash_page_dirty, 0);
+ 		}
+ 
+ 		/*
+@@ -302,7 +302,7 @@ no_prealloc:
+ 		} else
+ 			hp->mtx_hash = mtx_base + (i % dbenv->mp_mtxcount);
+ 		SH_TAILQ_INIT(&hp->hash_bucket);
+-		atomic_init(&hp->hash_page_dirty, 0);
+		db_atomic_init(&hp->hash_page_dirty, 0);
+ #ifdef HAVE_STATISTICS
+ 		hp->hash_io_wait = 0;
+ 		hp->hash_frozen = hp->hash_thawed = hp->hash_frozen_freed = 0;
--- a/databases/db5/patches/patch-src_mutex_mut__method.c
+++ b/databases/db5/patches/patch-src_mutex_mut__method.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_mutex_mut__method.c,v 1.1 2015/09/08 18:51:28 joerg Exp $
+
+--- src/mutex/mut_method.c.orig	2015-09-02 11:12:53.000000000 +0000
+++ src/mutex/mut_method.c
+@@ -474,7 +474,7 @@ atomic_compare_exchange(env, v, oldval, 
+ 	MUTEX_LOCK(env, mtx);
+ 	ret = atomic_read(v) == oldval;
+ 	if (ret)
+-		atomic_init(v, newval);
+		db_atomic_init(v, newval);
+ 	MUTEX_UNLOCK(env, mtx);
+ 
+ 	return (ret);
--- a/databases/db5/patches/patch-src_mutex_mut__tas.c
+++ b/databases/db5/patches/patch-src_mutex_mut__tas.c
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_mutex_mut__tas.c,v 1.1 2015/09/08 18:51:28 joerg Exp $
+
+--- src/mutex/mut_tas.c.orig	2015-09-02 11:12:55.000000000 +0000
+++ src/mutex/mut_tas.c
+@@ -47,7 +47,7 @@ __db_tas_mutex_init(env, mutex, flags)
+ 
+ #ifdef HAVE_SHARED_LATCHES
+ 	if (F_ISSET(mutexp, DB_MUTEX_SHARED))
+-		atomic_init(&mutexp->sharecount, 0);
+		db_atomic_init(&mutexp->sharecount, 0);
+ 	else
+ #endif
+ 	if (MUTEX_INIT(&mutexp->tas)) {
+@@ -536,7 +536,7 @@ __db_tas_mutex_unlock(env, mutex)
+ 			F_CLR(mutexp, DB_MUTEX_LOCKED);
+ 			/* Flush flag update before zeroing count */
+ 			MEMBAR_EXIT();
+-			atomic_init(&mutexp->sharecount, 0);
+			db_atomic_init(&mutexp->sharecount, 0);
+ 		} else {
+ 			DB_ASSERT(env, sharecount > 0);
+ 			MEMBAR_EXIT();
--- a/databases/db6/Makefile
+++ b/databases/db6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2015/01/01 18:52:52 ryoon Exp $
+# $NetBSD: Makefile,v 1.2 2015/09/14 10:52:57 adam Exp $
 #
 # NOTE:
 # When updating this package, a change in the minor (6.n -> 6.(n+1))
@@ -6,7 +6,7 @@
 # ABI depends in buildlink3.mk and bump PKGREVISIONs for all dependencies.
 # In particular, take care to include BDB_ACCEPTED=db6 packages.

-DISTNAME=	db-6.1.19
+DISTNAME=	db-6.1.26
 PKGNAME=	${DISTNAME:S/db/db6/}
 CATEGORIES=	databases
 MASTER_SITES=	http://download.oracle.com/berkeley-db/
--- a/databases/db6/PLIST
+++ b/databases/db6/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2015/01/01 18:52:52 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.2 2015/09/14 10:52:57 adam Exp $
 bin/db6_archive
 bin/db6_checkpoint
 bin/db6_deadlock
@@ -5037,7 +5037,10 @@ share/doc/db6/java/overview-frame.html
 share/doc/db6/java/overview-summary.html
 share/doc/db6/java/overview-tree.html
 share/doc/db6/java/package-list
-share/doc/db6/java/resources/inherit.gif
+share/doc/db6/java/resources/background.gif
+share/doc/db6/java/resources/tab.gif
+share/doc/db6/java/resources/titlebar.gif
+share/doc/db6/java/resources/titlebar_end.gif
 share/doc/db6/java/serialized-form.html
 share/doc/db6/java/style.css
 share/doc/db6/license/license_db.html
--- a/databases/db6/distinfo
+++ b/databases/db6/distinfo
@@ -1,10 +1,15 @@
-$NetBSD: distinfo,v 1.1 2015/01/01 18:52:52 ryoon Exp $
+$NetBSD: distinfo,v 1.3 2015/09/14 10:52:57 adam Exp $

-SHA1 (db-6.1.19.tar.gz) = e266f8ab73f4f1ea276d203ce85426e5a6831501
-RMD160 (db-6.1.19.tar.gz) = fcb5fbe20e18339e18a244afbcfa13819aecad36
-Size (db-6.1.19.tar.gz) = 37492835 bytes
+SHA1 (db-6.1.26.tar.gz) = 5ae05c6c4a1766270fd5cfb28539e2b7a19c33b2
+RMD160 (db-6.1.26.tar.gz) = 6d242b65cd316060c5ed4634bb11e621f3cc6d93
+Size (db-6.1.26.tar.gz) = 37495772 bytes
 SHA1 (patch-dist_Makefile.in) = dbc5f8fd26e715f6dff8ff261a08b2856ea3c46e
 SHA1 (patch-dist_aclocal_libtool.m4) = 37367e10d9d856cf233b7a0efd3680f35728039e
 SHA1 (patch-dist_configure) = 2fb4c6cdd29ac5a9ad520af411517660b24e8768
-SHA1 (patch-src_dbinc_atomic.h) = da39a3ee5e6b4b0d3255bfef95601890afd80709
+SHA1 (patch-src_dbinc_atomic.h) = 240a4a6ec094e868d9a5e95ec4ab72d5b9ddfc23
 SHA1 (patch-src_hmac_sha1.c) = 0e98e6383c214adbb939839bb345e55efe8d89da
+SHA1 (patch-src_mp_mp__fget.c) = 059ecdb74bef29c17b445c305b6d4934b5a3c59b
+SHA1 (patch-src_mp_mp__mvcc.c) = 7a543c4e56d72bba607d6e8ec6b667b944e418f1
+SHA1 (patch-src_mp_mp__region.c) = bba0d8e3046d5d571ec00e8b07d7d10a375e6057
+SHA1 (patch-src_mutex_mut__method.c) = 5a8695160913f6a70be39c02aff7a4c7240fec6b
+SHA1 (patch-src_mutex_mut__tas.c) = 3bf893026bfc0878fe35050b8339c5a6a59f95e6
--- a/databases/db6/patches/patch-src_dbinc_atomic.h
+++ b/databases/db6/patches/patch-src_dbinc_atomic.h
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_dbinc_atomic.h,v 1.2 2015/09/08 18:51:28 joerg Exp $
+
+--- src/dbinc/atomic.h.orig	2015-09-02 11:18:22.000000000 +0000
+++ src/dbinc/atomic.h
+@@ -70,7 +70,7 @@ typedef struct {
+  * These have no memory barriers; the caller must include them when necessary.
+  */
+ #define	atomic_read(p)		((p)->value)
+-#define	atomic_init(p, val)	((p)->value = (val))
+#define	db_atomic_init(p, val)	((p)->value = (val))
+ 
+ #ifdef HAVE_ATOMIC_SUPPORT
+ 
+@@ -205,7 +205,7 @@ static inline int __atomic_compare_excha
+ #define	atomic_dec(env, p)	(--(p)->value)
+ #define	atomic_compare_exchange(env, p, oldval, newval)		\
+ 	(DB_ASSERT(env, atomic_read(p) == (oldval)),		\
+-	atomic_init(p, (newval)), 1)
+	db_atomic_init(p, (newval)), 1)
+ #else
+ #define atomic_inc(env, p)	__atomic_inc(env, p)
+ #define atomic_dec(env, p)	__atomic_dec(env, p)
--- a/databases/db6/patches/patch-src_mp_mp__fget.c
+++ b/databases/db6/patches/patch-src_mp_mp__fget.c
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_mp_mp__fget.c,v 1.1 2015/09/08 18:51:28 joerg Exp $
+
+--- src/mp/mp_fget.c.orig	2015-09-02 11:18:18.000000000 +0000
+++ src/mp/mp_fget.c
+@@ -654,7 +654,7 @@ alloc:		/* Allocate a new buffer header 
+ 
+ 		/* Initialize enough so we can call __memp_bhfree. */
+ 		alloc_bhp->flags = 0;
+-		atomic_init(&alloc_bhp->ref, 1);
+		db_atomic_init(&alloc_bhp->ref, 1);
+ #ifdef DIAGNOSTIC
+ 		if ((uintptr_t)alloc_bhp->buf & (sizeof(size_t) - 1)) {
+ 			__db_errx(env, DB_STR("3025",
+@@ -969,7 +969,7 @@ alloc:		/* Allocate a new buffer header 
+ 			MVCC_MPROTECT(bhp->buf, mfp->pagesize,
+ 			    PROT_READ);
+ 
+-		atomic_init(&alloc_bhp->ref, 1);
+		db_atomic_init(&alloc_bhp->ref, 1);
+ 		MUTEX_LOCK(env, alloc_bhp->mtx_buf);
+ 		alloc_bhp->priority = bhp->priority;
+ 		alloc_bhp->pgno = bhp->pgno;
--- a/databases/db6/patches/patch-src_mp_mp__mvcc.c
+++ b/databases/db6/patches/patch-src_mp_mp__mvcc.c
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_mp_mp__mvcc.c,v 1.1 2015/09/08 18:51:28 joerg Exp $
+
+--- src/mp/mp_mvcc.c.orig	2015-09-02 11:18:15.000000000 +0000
+++ src/mp/mp_mvcc.c
+@@ -281,7 +281,7 @@ __memp_bh_freeze(dbmp, infop, hp, bhp, n
+ #else
+ 	memcpy(frozen_bhp, bhp, SSZA(BH, buf));
+ #endif
+-	atomic_init(&frozen_bhp->ref, 0);
+	db_atomic_init(&frozen_bhp->ref, 0);
+ 	if (mutex != MUTEX_INVALID)
+ 		frozen_bhp->mtx_buf = mutex;
+ 	else if ((ret = __mutex_alloc(env, MTX_MPOOL_BH,
+@@ -440,7 +440,7 @@ __memp_bh_thaw(dbmp, infop, hp, frozen_b
+ #endif
+ 		alloc_bhp->mtx_buf = mutex;
+ 		MUTEX_LOCK(env, alloc_bhp->mtx_buf);
+-		atomic_init(&alloc_bhp->ref, 1);
+		db_atomic_init(&alloc_bhp->ref, 1);
+ 		F_CLR(alloc_bhp, BH_FROZEN);
+ 	}
+ 
--- a/databases/db6/patches/patch-src_mp_mp__region.c
+++ b/databases/db6/patches/patch-src_mp_mp__region.c
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_mp_mp__region.c,v 1.1 2015/09/08 18:51:28 joerg Exp $
+
+--- src/mp/mp_region.c.orig	2015-09-02 11:18:13.000000000 +0000
+++ src/mp/mp_region.c
+@@ -278,7 +278,7 @@ __memp_init(env, dbmp, reginfo_off, htab
+ 			     MTX_MPOOL_FILE_BUCKET, 0, &htab[i].mtx_hash)) != 0)
+ 				return (ret);
+ 			SH_TAILQ_INIT(&htab[i].hash_bucket);
+-			atomic_init(&htab[i].hash_page_dirty, 0);
+			db_atomic_init(&htab[i].hash_page_dirty, 0);
+ 		}
+ 
+ 		mtx_base = mtx_prev = MUTEX_INVALID;
+@@ -332,7 +332,7 @@ no_prealloc:
+ 		    DB_MUTEX_SHARED, &hp->mtx_hash)) != 0)
+ 			return (ret);
+ 		SH_TAILQ_INIT(&hp->hash_bucket);
+-		atomic_init(&hp->hash_page_dirty, 0);
+		db_atomic_init(&hp->hash_page_dirty, 0);
+ #ifdef HAVE_STATISTICS
+ 		hp->hash_io_wait = 0;
+ 		hp->hash_frozen = hp->hash_thawed = hp->hash_frozen_freed = 0;
--- a/databases/db6/patches/patch-src_mutex_mut__method.c
+++ b/databases/db6/patches/patch-src_mutex_mut__method.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_mutex_mut__method.c,v 1.1 2015/09/08 18:51:28 joerg Exp $
+
+--- src/mutex/mut_method.c.orig	2015-09-02 11:18:11.000000000 +0000
+++ src/mutex/mut_method.c
+@@ -501,7 +501,7 @@ atomic_compare_exchange(env, v, oldval, 
+ 	MUTEX_LOCK(env, mtx);
+ 	ret = atomic_read(v) == oldval;
+ 	if (ret)
+-		atomic_init(v, newval);
+		db_atomic_init(v, newval);
+ 	MUTEX_UNLOCK(env, mtx);
+ 
+ 	return (ret);
--- a/databases/db6/patches/patch-src_mutex_mut__tas.c
+++ b/databases/db6/patches/patch-src_mutex_mut__tas.c
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_mutex_mut__tas.c,v 1.1 2015/09/08 18:51:28 joerg Exp $
+
+--- src/mutex/mut_tas.c.orig	2015-09-02 11:18:09.000000000 +0000
+++ src/mutex/mut_tas.c
+@@ -47,7 +47,7 @@ __db_tas_mutex_init(env, mutex, flags)
+ 
+ #ifdef HAVE_SHARED_LATCHES
+ 	if (F_ISSET(mutexp, DB_MUTEX_SHARED))
+-		atomic_init(&mutexp->sharecount, 0);
+		db_atomic_init(&mutexp->sharecount, 0);
+ 	else
+ #endif
+ 	if (MUTEX_INIT(&mutexp->tas)) {
+@@ -642,7 +642,7 @@ was_not_locked:
+ 			F_CLR(mutexp, DB_MUTEX_LOCKED);
+ 			/* Flush flag update before zeroing count */
+ 			MEMBAR_EXIT();
+-			atomic_init(&mutexp->sharecount, 0);
+			db_atomic_init(&mutexp->sharecount, 0);
+ 		} else {
+ 			DB_ASSERT(env, sharecount > 0);
+ 			MEMBAR_EXIT();
--- a/databases/deforaos-libdatabase/Makefile
+++ b/databases/deforaos-libdatabase/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2015/04/06 08:17:22 adam Exp $
+# $NetBSD: Makefile,v 1.11 2015/08/31 22:23:12 khorben Exp $

-DISTNAME=	libDatabase-0.0.0
-PKGNAME=	deforaos-libdatabase-0.0.0
-PKGREVISION=	7
+DISTNAME=	libDatabase-0.0.1
+PKGNAME=	deforaos-libdatabase-0.0.1
 CATEGORIES=	databases
-MASTER_SITES=	http://www.defora.org/os/download/download/4287/
+MASTER_SITES=	http://www.defora.org/os/download/download/4373/

 MAINTAINER=	khorben@defora.org
 HOMEPAGE=	http://www.defora.org/
@@ -14,6 +13,8 @@ LICENSE=	gnu-gpl-v3

 MAKE_FLAGS+=	DESTDIR=${DESTDIR}
 MAKE_FLAGS+=	PREFIX=${PREFIX}
+MAKE_FLAGS+=	CFLAGS=${CFLAGS:Q}
+MAKE_FLAGS+=	LDFLAGS=${LDFLAGS:Q}

 .include "../../devel/deforaos-libsystem/buildlink3.mk"
 .include "../../mk/pgsql.buildlink3.mk" # this one defines PGSQL_VERSION among others
--- a/databases/deforaos-libdatabase/PLIST
+++ b/databases/deforaos-libdatabase/PLIST
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.2 2014/02/24 16:17:15 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2015/08/31 22:23:12 khorben Exp $
 include/Database.h
 include/Database/database.h
 include/Database/engine.h
 lib/Database/engine/pdo.so
 lib/Database/engine/pgsql.so
+lib/Database/engine/pgsqlpool.so
 lib/Database/engine/sqlite2.so
 lib/Database/engine/sqlite3.so
 lib/libDatabase.a
@@ -17,12 +18,12 @@ share/gtk-doc/html/libDatabase/deprecated-api-index.html
 share/gtk-doc/html/libDatabase/home.png
 share/gtk-doc/html/libDatabase/index.html
 share/gtk-doc/html/libDatabase/index.sgml
-share/gtk-doc/html/libDatabase/left.png
 share/gtk-doc/html/libDatabase/left-insensitive.png
+share/gtk-doc/html/libDatabase/left.png
 share/gtk-doc/html/libDatabase/libDatabase-database.html
 share/gtk-doc/html/libDatabase/libDatabase.devhelp2
-share/gtk-doc/html/libDatabase/right.png
 share/gtk-doc/html/libDatabase/right-insensitive.png
+share/gtk-doc/html/libDatabase/right.png
 share/gtk-doc/html/libDatabase/style.css
-share/gtk-doc/html/libDatabase/up.png
 share/gtk-doc/html/libDatabase/up-insensitive.png
+share/gtk-doc/html/libDatabase/up.png
--- a/databases/deforaos-libdatabase/buildlink3.mk
+++ b/databases/deforaos-libdatabase/buildlink3.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.1 2013/03/04 23:13:49 khorben Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2015/08/31 22:24:05 khorben Exp $

 BUILDLINK_TREE+=	deforaos-libdatabase

 .if !defined(DEFORAOS_LIBDATABASE_BUILDLINK3_MK)
 DEFORAOS_LIBDATABASE_BUILDLINK3_MK:=

-BUILDLINK_API_DEPENDS.deforaos-libdatabase+=	deforaos-libdatabase>=0.0.0
+BUILDLINK_API_DEPENDS.deforaos-libdatabase+=	deforaos-libdatabase>=0.0.1
 BUILDLINK_PKGSRCDIR.deforaos-libdatabase?=	../../databases/deforaos-libdatabase

 .include "../../devel/deforaos-libsystem/buildlink3.mk"
--- a/databases/deforaos-libdatabase/distinfo
+++ b/databases/deforaos-libdatabase/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.2 2014/03/21 13:59:27 jperkin Exp $
+$NetBSD: distinfo,v 1.3 2015/08/31 22:23:12 khorben Exp $

-SHA1 (libDatabase-0.0.0.tar.gz) = cde77d40a2046109a93527ba061db1fc160c665b
-RMD160 (libDatabase-0.0.0.tar.gz) = 71996997cd9e37767f01ce441ce4da855d5f5d07
-Size (libDatabase-0.0.0.tar.gz) = 14614 bytes
-SHA1 (patch-data_pkgconfig.sh) = 49d2a718140d5f1f938392b317f5861929c9797d
+SHA1 (libDatabase-0.0.1.tar.gz) = 6f65b444cdc8bc314f1f004bafbf469f45a4efe0
+RMD160 (libDatabase-0.0.1.tar.gz) = 43823431becbe6decb8b610e502eddaba821dadf
+Size (libDatabase-0.0.1.tar.gz) = 18743 bytes
--- a/databases/deforaos-libdatabase/patches/patch-data_pkgconfig.sh
+++ b/databases/deforaos-libdatabase/patches/patch-data_pkgconfig.sh
@@ -1,16 +0,0 @@
-$NetBSD: patch-data_pkgconfig.sh,v 1.1 2014/03/21 13:59:27 jperkin Exp $
-
-Use correct rpath flag on SunOS.
-
--- data/pkgconfig.sh.orig	2013-01-27 03:39:44.000000000 +0000
-+++ data/pkgconfig.sh
-@@ -114,6 +114,9 @@ while [ $# -gt 0 ]; do
- 			Darwin)
- 				RPATH="-Wl,-rpath,\${libdir}"
- 				;;
-+			SunOS)
-+				RPATH="-Wl,-R\${libdir}"
-+				;;
- 		esac
- 	fi
- 
--- a/databases/edb/Makefile
+++ b/databases/edb/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.26 2014/09/11 07:22:46 dholland Exp $
+# $NetBSD: Makefile,v 1.28 2015/08/18 07:31:04 wiz Exp $

 DISTNAME=		edb-1.0.5
 CATEGORIES=		databases
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=enlightenment/}
-PKGREVISION=		2
+PKGREVISION=		4

 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.enlightenment.org/Libraries/Edb/
--- a/databases/elasticsearch/Makefile
+++ b/databases/elasticsearch/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2015/02/23 12:42:12 fhajny Exp $
+# $NetBSD: Makefile,v 1.11 2015/08/03 11:57:43 fhajny Exp $

-DISTNAME=	elasticsearch-1.4.4
+DISTNAME=	elasticsearch-1.7.1
 CATEGORIES=	textproc
 MASTER_SITES=	https://download.elasticsearch.org/elasticsearch/elasticsearch/

--- a/databases/elasticsearch/PLIST
+++ b/databases/elasticsearch/PLIST
@@ -1,25 +1,26 @@
-@comment $NetBSD: PLIST,v 1.4 2015/02/23 12:42:12 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.6 2015/08/03 11:57:43 fhajny Exp $
 lib/elasticsearch/antlr-runtime-3.5.jar
+lib/elasticsearch/apache-log4j-extras-1.2.17.jar
 lib/elasticsearch/asm-4.1.jar
 lib/elasticsearch/asm-commons-4.1.jar
 lib/elasticsearch/${PKGNAME}.jar
-lib/elasticsearch/groovy-all-2.3.2.jar
+lib/elasticsearch/groovy-all-2.4.4.jar
 lib/elasticsearch/jna-4.1.0.jar
 lib/elasticsearch/jts-1.13.jar
 lib/elasticsearch/log4j-1.2.17.jar
-lib/elasticsearch/lucene-analyzers-common-4.10.3.jar
-lib/elasticsearch/lucene-core-4.10.3.jar
-lib/elasticsearch/lucene-expressions-4.10.3.jar
-lib/elasticsearch/lucene-grouping-4.10.3.jar
-lib/elasticsearch/lucene-highlighter-4.10.3.jar
-lib/elasticsearch/lucene-join-4.10.3.jar
-lib/elasticsearch/lucene-memory-4.10.3.jar
-lib/elasticsearch/lucene-misc-4.10.3.jar
-lib/elasticsearch/lucene-queries-4.10.3.jar
-lib/elasticsearch/lucene-queryparser-4.10.3.jar
-lib/elasticsearch/lucene-sandbox-4.10.3.jar
-lib/elasticsearch/lucene-spatial-4.10.3.jar
-lib/elasticsearch/lucene-suggest-4.10.3.jar
+lib/elasticsearch/lucene-analyzers-common-4.10.4.jar
+lib/elasticsearch/lucene-core-4.10.4.jar
+lib/elasticsearch/lucene-expressions-4.10.4.jar
+lib/elasticsearch/lucene-grouping-4.10.4.jar
+lib/elasticsearch/lucene-highlighter-4.10.4.jar
+lib/elasticsearch/lucene-join-4.10.4.jar
+lib/elasticsearch/lucene-memory-4.10.4.jar
+lib/elasticsearch/lucene-misc-4.10.4.jar
+lib/elasticsearch/lucene-queries-4.10.4.jar
+lib/elasticsearch/lucene-queryparser-4.10.4.jar
+lib/elasticsearch/lucene-sandbox-4.10.4.jar
+lib/elasticsearch/lucene-spatial-4.10.4.jar
+lib/elasticsearch/lucene-suggest-4.10.4.jar
 ${PLIST.sigar}lib/elasticsearch/sigar/${SIGAR_FILE}
 ${PLIST.sigar}lib/elasticsearch/sigar/sigar-1.6.4.jar
 lib/elasticsearch/spatial4j-0.4.1.jar
@@ -31,4 +32,3 @@ share/elasticsearch/elasticsearch.in.sh
 share/elasticsearch/plugin
 share/examples/elasticsearch/elasticsearch.yml
 share/examples/elasticsearch/logging.yml
-@pkgdir lib/elasticsearch/plugins
--- a/databases/elasticsearch/distinfo
+++ b/databases/elasticsearch/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.8 2015/02/23 12:42:12 fhajny Exp $
+$NetBSD: distinfo,v 1.10 2015/08/03 11:57:43 fhajny Exp $

-SHA1 (elasticsearch-1.4.4.tar.gz) = 963415a9114ecf0b7dd1ae43a316e339534b8f31
-RMD160 (elasticsearch-1.4.4.tar.gz) = e12133d7493a903869720c63416ba23c501765de
-Size (elasticsearch-1.4.4.tar.gz) = 27900004 bytes
+SHA1 (elasticsearch-1.7.1.tar.gz) = 0984ae27624e57c12c33d4a559c3ebae25e74508
+RMD160 (elasticsearch-1.7.1.tar.gz) = 56ff82b4f53b3244da69befdd762553666d1b8a2
+Size (elasticsearch-1.7.1.tar.gz) = 28500556 bytes
 SHA1 (patch-config_elasticsearch.yml) = 769fdd62aacdc4743979edbc986e983a5c42a7f8
--- a/databases/freetds/Makefile
+++ b/databases/freetds/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.53 2015/04/26 11:52:18 ryoon Exp $
+# $NetBSD: Makefile,v 1.54 2015/08/23 14:30:35 wiz Exp $

 DISTNAME=	freetds-0.91
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	databases
 MASTER_SITES=	ftp://ftp.ibiblio.org/pub/Linux/ALPHA/freetds/stable/

--- a/databases/freetds/buildlink3.mk
+++ b/databases/freetds/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2014/02/12 23:17:38 tron Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2015/08/23 14:30:35 wiz Exp $

 BUILDLINK_TREE+=	freetds

@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	freetds
 FREETDS_BUILDLINK3_MK:=

 BUILDLINK_API_DEPENDS.freetds+=	freetds>=0.82
-BUILDLINK_ABI_DEPENDS.freetds+=	freetds>=0.91nb2
+BUILDLINK_ABI_DEPENDS.freetds+=	freetds>=0.91nb4
 BUILDLINK_PKGSRCDIR.freetds?=	../../databases/freetds

 .include "../../converters/libiconv/buildlink3.mk"
--- a/databases/geneweb/Makefile
+++ b/databases/geneweb/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.40 2015/01/20 14:24:35 jaapb Exp $
+# $NetBSD: Makefile,v 1.42 2015/08/07 11:20:33 jaapb Exp $
 #

 DISTNAME=	geneweb-5.01
-PKGREVISION=	6
+PKGREVISION=	8
 CATEGORIES=	databases
 EXTRACT_SUFX=	.tgz
 MASTER_SITES=	ftp://ftp.inria.fr/INRIA/Projects/cristal/geneweb/Src/ \
--- a/databases/gtksql/Makefile
+++ b/databases/gtksql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2012/10/02 21:25:18 asau Exp $
+# $NetBSD: Makefile,v 1.47 2015/07/04 16:18:29 joerg Exp $
 #

 DISTNAME=		gtksql-0.3
@@ -12,7 +12,6 @@ COMMENT=		Query tool for PostgreSQL written with GTK

 INSTALLATION_DIRS+=	bin

-USE_X11BASE=		yes
 MAKE_ENV+=		MCFLAGS=${CFLAGS:M*:Q} PGSQL_PREFIX=${PGSQL_PREFIX:Q}

 .include "../../mk/pgsql.buildlink3.mk"
--- a/databases/hiredis/Makefile
+++ b/databases/hiredis/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2015/06/05 14:07:27 wiedi Exp $
+# $NetBSD: Makefile,v 1.3 2015/09/02 15:12:37 wiedi Exp $

-DISTNAME=	hiredis-0.13.1
+DISTNAME=	hiredis-0.13.2
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_GITHUB:=redis/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
--- a/databases/hiredis/PLIST
+++ b/databases/hiredis/PLIST
@@ -1,9 +1,12 @@
-@comment $NetBSD: PLIST,v 1.2 2015/06/05 14:07:27 wiedi Exp $
+@comment $NetBSD: PLIST,v 1.3 2015/09/02 15:12:37 wiedi Exp $
 include/hiredis/adapters/ae.h
 include/hiredis/adapters/glib.h
+include/hiredis/adapters/ivykis.h
 include/hiredis/adapters/libev.h
 include/hiredis/adapters/libevent.h
 include/hiredis/adapters/libuv.h
+include/hiredis/adapters/macosx.h
+include/hiredis/adapters/qt.h
 include/hiredis/async.h
 include/hiredis/hiredis.h
 include/hiredis/read.h
--- a/databases/hiredis/distinfo
+++ b/databases/hiredis/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2015/06/05 14:07:27 wiedi Exp $
+$NetBSD: distinfo,v 1.3 2015/09/02 15:12:37 wiedi Exp $

-SHA1 (hiredis-0.13.1.tar.gz) = 737c4ed101096c5ec47fcaeba847664352d16204
-RMD160 (hiredis-0.13.1.tar.gz) = c2324cc857ada5b8864a4f73330e409fb80a3972
-Size (hiredis-0.13.1.tar.gz) = 54912 bytes
-SHA1 (patch-Makefile) = 1249d256bf9ac81c4d985cc4a5e81dea47b21a58
+SHA1 (hiredis-0.13.2.tar.gz) = 49481f5807e46713dcec6bde8a9b2a40f4ba7b59
+RMD160 (hiredis-0.13.2.tar.gz) = bb5e389aefdcba2e64cca285b24e824645437a23
+Size (hiredis-0.13.2.tar.gz) = 58206 bytes
+SHA1 (patch-Makefile) = f0c189ce10ed32d9a31a30b2067a03460e852fd1
--- a/databases/hiredis/patches/patch-Makefile
+++ b/databases/hiredis/patches/patch-Makefile
@@ -1,9 +1,9 @@
-$NetBSD: patch-Makefile,v 1.2 2015/06/05 14:07:27 wiedi Exp $
+$NetBSD: patch-Makefile,v 1.3 2015/09/02 15:12:37 wiedi Exp $
 use libtool

--- Makefile.orig	2015-05-03 20:58:11.000000000 +0000
+--- Makefile.orig	2015-08-25 12:16:20.000000000 +0000
 +++ Makefile
-@@ -49,6 +49,7 @@ DYLIB_MAJOR_NAME=$(LIBNAME).$(DYLIBSUFFI
+@@ -51,6 +51,7 @@ DYLIB_MAJOR_NAME=$(LIBNAME).$(DYLIBSUFFI
 DYLIBNAME=$(LIBNAME).$(DYLIBSUFFIX)
 DYLIB_MAKE_CMD=$(CC) -shared -Wl,-soname,$(DYLIB_MINOR_NAME) -o $(DYLIBNAME) $(LDFLAGS)
 STLIBNAME=$(LIBNAME).$(STLIBSUFFIX)
@@ -11,7 +11,7 @@ use libtool
 STLIB_MAKE_CMD=ar rcs $(STLIBNAME)
 
 # Platform-specific overrides
-@@ -65,7 +66,7 @@ ifeq ($(uname_S),Darwin)
+@@ -66,7 +67,7 @@ ifeq ($(uname_S),Darwin)
   DYLIB_MAKE_CMD=$(CC) -shared -Wl,-install_name,$(DYLIB_MINOR_NAME) -o $(DYLIBNAME) $(LDFLAGS)
 endif
 
@@ -20,7 +20,7 @@ use libtool
 
 # Deps (use make dep to generate this)
 async.o: async.c fmacros.h async.h hiredis.h read.h sds.h net.h dict.c dict.h
-@@ -82,6 +83,11 @@ $(DYLIBNAME): $(OBJ)
+@@ -83,6 +84,11 @@ $(DYLIBNAME): $(OBJ)
 $(STLIBNAME): $(OBJ)
 	$(STLIB_MAKE_CMD) $(OBJ)
 
@@ -32,7 +32,7 @@ use libtool
 dynamic: $(DYLIBNAME)
 static: $(STLIBNAME)
 
-@@ -133,7 +139,7 @@ check: hiredis-test
+@@ -153,7 +159,7 @@ check: hiredis-test
 	kill `cat /tmp/hiredis-test-redis.pid`
 
 .c.o:
@@ -41,13 +41,12 @@ use libtool
 
 clean:
 	rm -rf $(DYLIBNAME) $(STLIBNAME) $(TESTS) $(PKGCONFNAME) examples/hiredis-example* *.o *.gcda *.gcno *.gcov
-@@ -163,10 +169,7 @@ $(PKGCONFNAME): hiredis.h
+@@ -183,9 +189,7 @@ $(PKGCONFNAME): hiredis.h
 install: $(DYLIBNAME) $(STLIBNAME) $(PKGCONFNAME)
 	mkdir -p $(INSTALL_INCLUDE_PATH) $(INSTALL_LIBRARY_PATH)
 	$(INSTALL) hiredis.h async.h read.h sds.h adapters $(INSTALL_INCLUDE_PATH)
 -	$(INSTALL) $(DYLIBNAME) $(INSTALL_LIBRARY_PATH)/$(DYLIB_MINOR_NAME)
-	cd $(INSTALL_LIBRARY_PATH) && ln -sf $(DYLIB_MINOR_NAME) $(DYLIB_MAJOR_NAME)
-	cd $(INSTALL_LIBRARY_PATH) && ln -sf $(DYLIB_MAJOR_NAME) $(DYLIBNAME)
+-	cd $(INSTALL_LIBRARY_PATH) && ln -sf $(DYLIB_MINOR_NAME) $(DYLIBNAME)
 -	$(INSTALL) $(STLIBNAME) $(INSTALL_LIBRARY_PATH)
 +	$(LIBTOOL) --mode=install $(BSD_INSTALL_LIB) $(LANAME) $(INSTALL_LIBRARY_PATH)
 	mkdir -p $(INSTALL_PKGCONF_PATH)
--- a/databases/jdbc-postgresql93/DESCR
+++ b/databases/jdbc-postgresql93/DESCR
@@ -0,0 +1,7 @@
+This is a pure Java (Type IV) JDBC driver for the PostgreSQL
+database.  It allows Java programs to connect to a PostgreSQL
+database using standard, database independent Java code.
+
+The driver provides a reasonably complete implementation of the
+JDBC 4 specification in addition to some PostgreSQL specific
+extensions.
--- a/databases/jdbc-postgresql93/Makefile
+++ b/databases/jdbc-postgresql93/Makefile
@@ -0,0 +1,34 @@
+# $NetBSD: Makefile,v 1.1.1.1 2015/07/19 11:01:41 asau Exp $
+
+DISTNAME=		postgresql-jdbc-9.3-${PGBUILD}.src
+PKGNAME=		jdbc-postgresql93-${PGBUILD}
+DISTFILES+=		${DISTNAME}.tar.gz ${JARDIST}
+CATEGORIES=		databases
+MASTER_SITES=		http://jdbc.postgresql.org/download/
+
+MAINTAINER=		pkgsrc-users@NetBSD.org
+HOMEPAGE=		http://jdbc.postgresql.org/
+COMMENT=		PostgreSQL 9.3 JDBC4 driver
+
+PGBUILD=		1103
+JARDIST=		postgresql-9.3-${PGBUILD}.jdbc4.jar
+JARFILE=		postgresql93.jar
+EXTRACT_ONLY=           ${DISTFILES:N*.jar}
+
+INSTALLATION_DIRS=	lib/java ${DOCDIR}
+
+USE_JAVA=		run
+USE_JAVA2=		6
+NO_BUILD=       	YES
+
+DOCDIR=                 share/doc/java/${PKGBASE}
+PLIST_SUBST+=		JARFILE=${JARFILE:Q}
+PLIST_SUBST+=		DOCDIR=${DOCDIR:Q}
+
+do-install:
+	${INSTALL_DATA} ${DISTDIR}/${JARDIST} \
+		${DESTDIR}${PREFIX}/lib/java/${JARFILE}
+	${INSTALL_DATA} ${WRKSRC}/README.md ${DESTDIR}${PREFIX}/${DOCDIR}
+
+.include "../../mk/java-vm.mk"
+.include "../../mk/bsd.pkg.mk"
--- a/databases/jdbc-postgresql93/PLIST
+++ b/databases/jdbc-postgresql93/PLIST
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2015/07/19 11:01:41 asau Exp $
+lib/java/${JARFILE}
+${DOCDIR}/README.md
--- a/databases/jdbc-postgresql93/distinfo
+++ b/databases/jdbc-postgresql93/distinfo
@@ -0,0 +1,8 @@
+$NetBSD: distinfo,v 1.1.1.1 2015/07/19 11:01:41 asau Exp $
+
+SHA1 (postgresql-9.3-1103.jdbc4.jar) = 4ce3b83f08d1700d0589c186a49f17e5568237bc
+RMD160 (postgresql-9.3-1103.jdbc4.jar) = 2b704ad53cfcba101406514a7e5692f80af9256f
+Size (postgresql-9.3-1103.jdbc4.jar) = 594361 bytes
+SHA1 (postgresql-jdbc-9.3-1103.src.tar.gz) = b131e1ff56e01be54f87e21b79d148c857d75fdf
+RMD160 (postgresql-jdbc-9.3-1103.src.tar.gz) = 0a135a3ced0819ea1582dcfb5e8823a5ebbe389c
+Size (postgresql-jdbc-9.3-1103.src.tar.gz) = 1864016 bytes
--- a/databases/jdbc-postgresql94/DESCR
+++ b/databases/jdbc-postgresql94/DESCR
@@ -0,0 +1,7 @@
+This is a pure Java (Type IV) JDBC driver for the PostgreSQL
+database.  It allows Java programs to connect to a PostgreSQL
+database using standard, database independent Java code.
+
+The driver provides a reasonably complete implementation of the
+JDBC 4 specification in addition to some PostgreSQL specific
+extensions.
--- a/databases/jdbc-postgresql94/Makefile
+++ b/databases/jdbc-postgresql94/Makefile
@@ -0,0 +1,34 @@
+# $NetBSD: Makefile,v 1.1.1.1 2015/07/19 13:14:58 asau Exp $
+
+DISTNAME=		postgresql-jdbc-9.4-${PGBUILD}.src
+PKGNAME=		jdbc-postgresql94-${PGBUILD}
+DISTFILES+=		${DISTNAME}.tar.gz ${JARDIST}
+CATEGORIES=		databases
+MASTER_SITES=		http://jdbc.postgresql.org/download/
+
+MAINTAINER=		pkgsrc-users@NetBSD.org
+HOMEPAGE=		http://jdbc.postgresql.org/
+COMMENT=		PostgreSQL 9.4 JDBC4 driver
+
+PGBUILD=		1201
+JARDIST=		postgresql-9.4-${PGBUILD}.jdbc4.jar
+JARFILE=		postgresql94.jar
+EXTRACT_ONLY=           ${DISTFILES:N*.jar}
+
+INSTALLATION_DIRS=	lib/java ${DOCDIR}
+
+USE_JAVA=		run
+USE_JAVA2=		6
+NO_BUILD=       	YES
+
+DOCDIR=                 share/doc/java/${PKGBASE}
+PLIST_SUBST+=		JARFILE=${JARFILE:Q}
+PLIST_SUBST+=		DOCDIR=${DOCDIR:Q}
+
+do-install:
+	${INSTALL_DATA} ${DISTDIR}/${JARDIST} \
+		${DESTDIR}${PREFIX}/lib/java/${JARFILE}
+	${INSTALL_DATA} ${WRKSRC}/README.md ${DESTDIR}${PREFIX}/${DOCDIR}
+
+.include "../../mk/java-vm.mk"
+.include "../../mk/bsd.pkg.mk"
--- a/databases/jdbc-postgresql94/PLIST
+++ b/databases/jdbc-postgresql94/PLIST
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2015/07/19 13:14:58 asau Exp $
+lib/java/${JARFILE}
+${DOCDIR}/README.md
--- a/databases/jdbc-postgresql94/distinfo
+++ b/databases/jdbc-postgresql94/distinfo
@@ -0,0 +1,8 @@
+$NetBSD: distinfo,v 1.1.1.1 2015/07/19 13:14:58 asau Exp $
+
+SHA1 (postgresql-9.4-1201.jdbc4.jar) = b46544ef0eaf0405504089dcc71f36e3f190ef09
+RMD160 (postgresql-9.4-1201.jdbc4.jar) = ef058b1e1f5458f7e97ac089a7582141210682da
+Size (postgresql-9.4-1201.jdbc4.jar) = 642809 bytes
+SHA1 (postgresql-jdbc-9.4-1201.src.tar.gz) = a014b5c32b97cf2087830fcc9e01e521a06a4c0e
+RMD160 (postgresql-jdbc-9.4-1201.src.tar.gz) = 556dadb94f6eb871562a8beeeb0a66c186a30a34
+Size (postgresql-jdbc-9.4-1201.src.tar.gz) = 1909810 bytes
--- a/databases/ldapvi/Makefile
+++ b/databases/ldapvi/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2014/02/12 23:17:38 tron Exp $
+# $NetBSD: Makefile,v 1.19 2015/08/18 07:31:04 wiz Exp $

 DISTNAME=		ldapvi-1.7
-PKGREVISION=		10
+PKGREVISION=		12
 CATEGORIES=		databases
 MASTER_SITES=		http://www.lichteblau.com/download/

--- a/databases/libzdb/DESCR
+++ b/databases/libzdb/DESCR
@@ -0,0 +1,5 @@
+The Zild Database Library implements a small, fast, and easy to
+use database API with thread-safe connection pooling. The library
+can connect transparently to multiple database systems, has zero
+configuration and connections are specified via a standard URL
+scheme.
--- a/databases/libzdb/Makefile
+++ b/databases/libzdb/Makefile
@@ -0,0 +1,20 @@
+# $NetBSD: Makefile,v 1.2 2015/09/12 15:20:19 tnn Exp $
+
+DISTNAME=	libzdb-3.1
+CATEGORIES=	databases
+MASTER_SITES=	http://www.tildeslash.com/libzdb/dist/
+
+MAINTAINER=	evaldo@gardenali.biz
+HOMEPAGE=	http://www.tildeslash.com/libzdb/
+COMMENT=	Zild Database Library, a fast thread-safe connection pooling library
+LICENSE=	gnu-gpl-v3
+
+GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
+USE_TOOLS+=	gmake
+
+PKGCONFIG_OVERRIDE+=	zdb.pc.in
+
+.include "options.mk"
+
+.include "../../mk/bsd.pkg.mk"
--- a/databases/libzdb/PLIST
+++ b/databases/libzdb/PLIST
@@ -0,0 +1,11 @@
+@comment $NetBSD: PLIST,v 1.1 2015/08/30 17:41:51 wiz Exp $
+include/zdb/Connection.h
+include/zdb/ConnectionPool.h
+include/zdb/Exception.h
+include/zdb/PreparedStatement.h
+include/zdb/ResultSet.h
+include/zdb/SQLException.h
+include/zdb/URL.h
+include/zdb/zdb.h
+lib/libzdb.la
+lib/pkgconfig/zdb.pc
--- a/databases/libzdb/buildlink3.mk
+++ b/databases/libzdb/buildlink3.mk
@@ -0,0 +1,29 @@
+# $NetBSD: buildlink3.mk,v 1.1 2015/08/30 17:41:51 wiz Exp $
+
+BUILDLINK_TREE+=	libzdb
+
+.if !defined(LIBZDB_BUILDLINK3_MK)
+LIBZDB_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.libzdb+=	libzdb>=2.6
+BUILDLINK_PKGSRCDIR.libzdb?=	../../databases/libzdb
+
+pkgbase := libzdb
+.include "../../mk/pkg-build-options.mk"
+
+.if !empty(PKG_BUILD_OPTIONS.libzdb:Msqlite)
+.  include "../../databases/sqlite3/buildlink3.mk"
+.endif
+.if !empty(PKG_BUILD_OPTIONS.libzdb:Mpgsql)
+.  include "../../mk/pgsql.buildlink3.mk"
+.endif
+.if !empty(PKG_BUILD_OPTIONS.libzdb:Mmysql)
+.  include "../../mk/mysql.buildlink3.mk"
+.endif
+.if !empty(PKG_BUILD_OPTIONS.libzdb:Mssl)
+.  include "../../security/openssl/buildlink3.mk"
+.endif
+
+.endif	# LIBZDB_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-libzdb
--- a/databases/libzdb/distinfo
+++ b/databases/libzdb/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.2 2015/09/12 15:20:19 tnn Exp $
+
+SHA1 (libzdb-3.1.tar.gz) = 83136684c6dff5e4bb3cc69fe04219c2e39c0609
+RMD160 (libzdb-3.1.tar.gz) = a8be00d56ea631a181a9b03a88c87411890455dd
+Size (libzdb-3.1.tar.gz) = 720162 bytes
--- a/databases/libzdb/options.mk
+++ b/databases/libzdb/options.mk
@@ -0,0 +1,50 @@
+# $NetBSD: options.mk,v 1.1 2015/08/30 17:41:51 wiz Exp $
+
+PKG_OPTIONS_VAR=		PKG_OPTIONS.libzdb
+PKG_SUPPORTED_OPTIONS=		ssl libzdb-sqliteunlock
+PKG_SUGGESTED_OPTIONS=		ssl mysql pgsql sqlite
+PKG_OPTIONS_NONEMPTY_SETS=	database
+PKG_OPTIONS_SET.database=	mysql pgsql sqlite
+
+.include "../../mk/bsd.options.mk"
+
+###
+### Support using a MySQL database server
+###
+.if !empty(PKG_OPTIONS:Mmysql)
+.  include "../../mk/mysql.buildlink3.mk"
+CONFIGURE_ARGS+=	--with-mysql=${BUILDLINK_PREFIX.mysql-client}/bin/mysql_config
+.else
+CONFIGURE_ARGS+=	--without-mysql
+.endif
+
+###
+### Support using a PostgreSQL database server
+###
+.if !empty(PKG_OPTIONS:Mpgsql)
+.  include "../../mk/pgsql.buildlink3.mk"
+CONFIGURE_ARGS+=	--with-postgresql=${BUILDLINK_PREFIX.postgresql-lib}
+.else
+CONFIGURE_ARGS+=	--without-postgresql
+.endif
+
+###
+### Support using a SQLite database
+###
+.if !empty(PKG_OPTIONS:Msqlite)
+.  include "../../databases/sqlite3/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-sqlite=${BUILDLINK_PREFIX.sqlite3}
+.  if !empty(PKG_OPTIONS:Mlibzdb-sqliteunlock)
+CONFIGURE_ARGS+=	--enable-sqliteunlock
+.  endif
+.else
+CONFIGURE_ARGS+=	--without-sqlite
+.endif
+
+###
+### Support OpenSSL cryptographic library
+###
+.if !empty(PKG_OPTIONS:Mssl)
+CONFIGURE_ARGS+=	--enable-openssl
+.  include "../../security/openssl/buildlink3.mk"
+.endif
--- a/databases/maatkit/Makefile
+++ b/databases/maatkit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2015/06/12 10:48:36 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2015/07/12 18:56:07 wiz Exp $
 #

 DISTNAME=	maatkit-7540
@@ -16,7 +16,7 @@ USE_TOOLS+=	perl
 REPLACE_PERL+=	bin/*

 DEPENDS+=	p5-DBD-mysql-[0-9]*:../../databases/p5-DBD-mysql
-DEPENDS+=	{perl>=5.7.3,p5-Time-HiRes-[0-9]*}:../../time/p5-Time-HiRes
+#DEPENDS+=	{perl>=5.7.3,p5-Time-HiRes-[0-9]*}:../../time/p5-Time-HiRes

 PERL5_PACKLIST=	auto/maatkit/.packlist
 .include "../../lang/perl5/module.mk"
--- a/databases/mariadb55-client/Makefile
+++ b/databases/mariadb55-client/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2015/06/12 10:48:36 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2015/08/03 14:51:29 manu Exp $

 PKGNAME=	${DISTNAME:S/-/-client-/}
-PKGREVISION=	1
+PKGREVISION=	2
 COMMENT=	MarisDB 5.5, a free SQL database (client)

 CONFLICTS=	mysql3-client-[0-9]*
--- a/databases/mariadb55-client/buildlink3.mk
+++ b/databases/mariadb55-client/buildlink3.mk
@@ -1,18 +1,22 @@
-# $NetBSD: buildlink3.mk,v 1.2 2015/05/07 12:45:28 fhajny Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2015/08/10 14:19:11 manu Exp $

-BUILDLINK_TREE+=	mariadb-client
+# This buildlink file uses mysql-client and not mariadb-client, 
+# because some packages depending on it expect BUILDLINK_*.mysql-client
+# to be set and will fail build if they get BUILDLINK_*.mariadb-client
+# instead.
+BUILDLINK_TREE+=	mysql-client

 .if !defined(MARIADB_CLIENT_BUILDLINK3_MK)
 MARIADB_CLIENT_BUILDLINK3_MK:=

-BUILDLINK_API_DEPENDS.mariadb-client+=	mariadb-client>=5.5.43
-BUILDLINK_PKGSRCDIR.mariadb-client?=	../../databases/mariadb55-client
-BUILDLINK_PKGSRCDIR.mariadb-client?=	../../databases/mariadb55-client
-BUILDLINK_INCDIRS.mariadb-client?=	include/mysql
-BUILDLINK_LIBDIRS.mariadb-client?=	lib
+BUILDLINK_API_DEPENDS.mysql-client+=	mariadb-client>=5.5.43
+BUILDLINK_PKGSRCDIR.mysql-client?=	../../databases/mariadb55-client
+BUILDLINK_PKGSRCDIR.mysql-client?=	../../databases/mariadb55-client
+BUILDLINK_INCDIRS.mysql-client?=	include/mysql
+BUILDLINK_LIBDIRS.mysql-client?=	lib

 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .endif	# MARIADB_CLIENT_BUILDLINK3_MK

-BUILDLINK_TREE+=	-mariadb-client
+BUILDLINK_TREE+=	-mysql-client
--- a/databases/mariadb55-client/distinfo
+++ b/databases/mariadb55-client/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2015/05/07 12:45:28 fhajny Exp $
+$NetBSD: distinfo,v 1.3 2015/08/03 14:51:29 manu Exp $

 SHA1 (mariadb-5.5.43.tar.gz) = 80223c91ecda64ec30a5056af225eee39a3782fd
 RMD160 (mariadb-5.5.43.tar.gz) = 93296e8d9e14949d47d4d0195f566891ba83bc76
@@ -24,7 +24,7 @@ SHA1 (patch-include_my_compare.h) = 9d04f444d56d705f3a57add7ad5f8fc5c7ce8341
 SHA1 (patch-include_my_net.h) = b6361a0871afdf66feabc82c5ad3559ff5b34c37
 SHA1 (patch-include_my_pthread.h) = 6d4ec91f90e717b0a075133fea535ee62d64d3ef
 SHA1 (patch-include_myisam.h) = 4cc8fd0bcba5ae8fdc4882048351b6225f00d2c5
-SHA1 (patch-include_violite.h) = 89c21f49751e06324fd32773e03561bd9cce33d7
+SHA1 (patch-include_violite.h) = 31555632c2f48ae2cf9670f94a8233bfcad25083
 SHA1 (patch-libmysql_CMakeLists.txt) = bca5243b76ea783e5b39e619528b28095aa1392a
 SHA1 (patch-mysys_my__getopt.c) = 76ed2ffb774a7171bb547b3098db148329cbe21d
 SHA1 (patch-mysys_stacktrace.c) = 9f18875126208c30d41f896f0e6edc7000df0c73
@@ -54,3 +54,4 @@ SHA1 (patch-strings_decimal.c) = 4b22180d1766352673a648f76302780b1c06bca5
 SHA1 (patch-strtoll.c) = 53a3c0172487ee68f621328b16aa1742af4ae737
 SHA1 (patch-strtoull.c) = 7126be697036a588d29e21a6e1a472863d285f4a
 SHA1 (patch-vio_viosocket.c) = bf6d57ee04db57b7ac508b18653b0955ef8a6a2b
+SHA1 (patch-vio_viosslfactories.c) = a2e38d211d6dfdbf83d729f195bf81b8c7620103
--- a/databases/mariadb55-client/patches/patch-include_violite.h
+++ b/databases/mariadb55-client/patches/patch-include_violite.h
@@ -1,8 +1,35 @@
-$NetBSD: patch-include_violite.h,v 1.1 2015/04/16 20:20:15 ryoon Exp $
+$NetBSD: patch-include_violite.h,v 1.2 2015/08/03 14:51:30 manu Exp $

--- include/violite.h.orig	2015-02-13 12:07:01.000000000 +0000
-+++ include/violite.h
-@@ -212,8 +212,14 @@ struct st_vio
+1) SCO support
+
+2) Port from mysql to fix SSL connexions with OpenSSL >= 1.0.1p
+https://github.com/mysql/mysql-server/commit/866b988a76e8e7e217017a7883a52a12ec5024b9
+
+From 866b988a76e8e7e217017a7883a52a12ec5024b9 Mon Sep 17 00:00:00 2001
+From: Marek Szymczak <marek.szymczak@oracle.com>
+Date: Thu, 9 Oct 2014 16:39:43 +0200
+Subject: [PATCH] Bug#18367167 DH KEY LENGTH OF 1024 BITS TO MEET MINIMUM REQ
+ OF FIPS 140-2
+
+Perfect Forward Secrecy (PFS) requires Diffie-Hellman (DH) parameters to be set.
+ Current implementation uses DH key of 512 bit.
+
+--- include/violite.h.orig	2015-08-03 16:42:17.000000000 +0200
+++ include/violite.h	2015-08-03 16:42:06.000000000 +0200
+@@ -126,9 +126,10 @@
+ enum enum_ssl_init_error
+ {
+   SSL_INITERR_NOERROR= 0, SSL_INITERR_CERT, SSL_INITERR_KEY, 
+   SSL_INITERR_NOMATCH, SSL_INITERR_BAD_PATHS, SSL_INITERR_CIPHERS, 
+-  SSL_INITERR_MEMFAIL, SSL_INITERR_LASTERR
+  SSL_INITERR_MEMFAIL, SSL_INITERR_NO_USABLE_CTX, SSL_INITERR_DHFAIL,
+  SSL_INITERR_LASTERR
+ };
+ const char* sslGetErrString(enum enum_ssl_init_error err);
+ 
+ struct st_VioSSLFd
+@@ -211,10 +212,16 @@
+   my_socket		sd;		/* my_socket - real or imaginary */
   HANDLE hPipe;
   my_bool		localhost;	/* Are we from localhost? */
   int			fcntl_mode;	/* Buffered fcntl(sd,F_GETFL) */
@@ -17,7 +44,9 @@ $NetBSD: patch-include_violite.h,v 1.1 2015/04/16 20:20:15 ryoon Exp $
   int addrLen;                          /* Length of remote address */
   enum enum_vio_type	type;		/* Type of connection */
   char			desc[30];	/* String description */
-@@ -233,7 +239,12 @@ struct st_vio
+   char                  *read_buffer;   /* buffer for vio_read_buff */
+@@ -232,9 +239,14 @@
+   my_bool (*is_blocking)(Vio*);
   int     (*viokeepalive)(Vio*, my_bool);
   int     (*fastsend)(Vio*);
   my_bool (*peer_addr)(Vio*, char *, uint16*, size_t);
@@ -30,3 +59,4 @@ $NetBSD: patch-include_violite.h,v 1.1 2015/04/16 20:20:15 ryoon Exp $
   my_bool (*should_retry)(Vio*);
   my_bool (*was_interrupted)(Vio*);
   int     (*vioclose)(Vio*);
+   void	  (*timeout)(Vio*, unsigned int which, unsigned int timeout);
--- a/databases/mariadb55-client/patches/patch-vio_viosslfactories.c
+++ b/databases/mariadb55-client/patches/patch-vio_viosslfactories.c
@@ -0,0 +1,123 @@
+$NetBSD: patch-vio_viosslfactories.c,v 1.1 2015/08/03 14:51:30 manu Exp $
+
+Port from mysql:
+https://github.com/mysql/mysql-server/commit/866b988a76e8e7e217017a7883a52a12ec5024b9
+
+From 866b988a76e8e7e217017a7883a52a12ec5024b9 Mon Sep 17 00:00:00 2001
+From: Marek Szymczak <marek.szymczak@oracle.com>
+Date: Thu, 9 Oct 2014 16:39:43 +0200
+Subject: [PATCH] Bug#18367167 DH KEY LENGTH OF 1024 BITS TO MEET MINIMUM REQ
+ OF FIPS 140-2
+
+Perfect Forward Secrecy (PFS) requires Diffie-Hellman (DH) parameters to be set.
+ Current implementation uses DH key of 512 bit.
+
+--- vio/viosslfactories.c.orig	2015-04-29 20:55:39.000000000 +0200
+++ vio/viosslfactories.c	2015-08-02 14:40:21.000000000 +0200
+@@ -20,29 +20,58 @@
+ 
+ static my_bool     ssl_algorithms_added    = FALSE;
+ static my_bool     ssl_error_strings_loaded= FALSE;
+ 
+-static unsigned char dh512_p[]=
+-{
+-  0xDA,0x58,0x3C,0x16,0xD9,0x85,0x22,0x89,0xD0,0xE4,0xAF,0x75,
+-  0x6F,0x4C,0xCA,0x92,0xDD,0x4B,0xE5,0x33,0xB8,0x04,0xFB,0x0F,
+-  0xED,0x94,0xEF,0x9C,0x8A,0x44,0x03,0xED,0x57,0x46,0x50,0xD3,
+-  0x69,0x99,0xDB,0x29,0xD7,0x76,0x27,0x6B,0xA2,0xD3,0xD4,0x12,
+-  0xE2,0x18,0xF4,0xDD,0x1E,0x08,0x4C,0xF6,0xD8,0x00,0x3E,0x7C,
+-  0x47,0x74,0xE8,0x33,
+/*
+  Diffie-Hellman key.
+  Generated using: >openssl dhparam -5 -C 2048
+ 
+  -----BEGIN DH PARAMETERS-----
+  MIIBCAKCAQEAil36wGZ2TmH6ysA3V1xtP4MKofXx5n88xq/aiybmGnReZMviCPEJ
+  46+7VCktl/RZ5iaDH1XNG1dVQmznt9pu2G3usU+k1/VB4bQL4ZgW4u0Wzxh9PyXD
+  glm99I9Xyj4Z5PVE4MyAsxCRGA1kWQpD9/zKAegUBPLNqSo886Uqg9hmn8ksyU9E
+  BV5eAEciCuawh6V0O+Sj/C3cSfLhgA0GcXp3OqlmcDu6jS5gWjn3LdP1U0duVxMB
+  h/neTSCSvtce4CAMYMjKNVh9P1nu+2d9ZH2Od2xhRIqMTfAS1KTqF3VmSWzPFCjG
+  mjxx/bg6bOOjpgZapvB6ABWlWmRmAAWFtwIBBQ==
+  -----END DH PARAMETERS-----
+ */
+static unsigned char dh2048_p[]=
+{
+  0x8A, 0x5D, 0xFA, 0xC0, 0x66, 0x76, 0x4E, 0x61, 0xFA, 0xCA, 0xC0, 0x37,
+  0x57, 0x5C, 0x6D, 0x3F, 0x83, 0x0A, 0xA1, 0xF5, 0xF1, 0xE6, 0x7F, 0x3C,
+  0xC6, 0xAF, 0xDA, 0x8B, 0x26, 0xE6, 0x1A, 0x74, 0x5E, 0x64, 0xCB, 0xE2,
+  0x08, 0xF1, 0x09, 0xE3, 0xAF, 0xBB, 0x54, 0x29, 0x2D, 0x97, 0xF4, 0x59,
+  0xE6, 0x26, 0x83, 0x1F, 0x55, 0xCD, 0x1B, 0x57, 0x55, 0x42, 0x6C, 0xE7,
+  0xB7, 0xDA, 0x6E, 0xD8, 0x6D, 0xEE, 0xB1, 0x4F, 0xA4, 0xD7, 0xF5, 0x41,
+  0xE1, 0xB4, 0x0B, 0xE1, 0x98, 0x16, 0xE2, 0xED, 0x16, 0xCF, 0x18, 0x7D,
+  0x3F, 0x25, 0xC3, 0x82, 0x59, 0xBD, 0xF4, 0x8F, 0x57, 0xCA, 0x3E, 0x19,
+  0xE4, 0xF5, 0x44, 0xE0, 0xCC, 0x80, 0xB3, 0x10, 0x91, 0x18, 0x0D, 0x64,
+  0x59, 0x0A, 0x43, 0xF7, 0xFC, 0xCA, 0x01, 0xE8, 0x14, 0x04, 0xF2, 0xCD,
+  0xA9, 0x2A, 0x3C, 0xF3, 0xA5, 0x2A, 0x83, 0xD8, 0x66, 0x9F, 0xC9, 0x2C,
+  0xC9, 0x4F, 0x44, 0x05, 0x5E, 0x5E, 0x00, 0x47, 0x22, 0x0A, 0xE6, 0xB0,
+  0x87, 0xA5, 0x74, 0x3B, 0xE4, 0xA3, 0xFC, 0x2D, 0xDC, 0x49, 0xF2, 0xE1,
+  0x80, 0x0D, 0x06, 0x71, 0x7A, 0x77, 0x3A, 0xA9, 0x66, 0x70, 0x3B, 0xBA,
+  0x8D, 0x2E, 0x60, 0x5A, 0x39, 0xF7, 0x2D, 0xD3, 0xF5, 0x53, 0x47, 0x6E,
+  0x57, 0x13, 0x01, 0x87, 0xF9, 0xDE, 0x4D, 0x20, 0x92, 0xBE, 0xD7, 0x1E,
+  0xE0, 0x20, 0x0C, 0x60, 0xC8, 0xCA, 0x35, 0x58, 0x7D, 0x3F, 0x59, 0xEE,
+  0xFB, 0x67, 0x7D, 0x64, 0x7D, 0x8E, 0x77, 0x6C, 0x61, 0x44, 0x8A, 0x8C,
+  0x4D, 0xF0, 0x12, 0xD4, 0xA4, 0xEA, 0x17, 0x75, 0x66, 0x49, 0x6C, 0xCF,
+  0x14, 0x28, 0xC6, 0x9A, 0x3C, 0x71, 0xFD, 0xB8, 0x3A, 0x6C, 0xE3, 0xA3,
+  0xA6, 0x06, 0x5A, 0xA6, 0xF0, 0x7A, 0x00, 0x15, 0xA5, 0x5A, 0x64, 0x66,
+  0x00, 0x05, 0x85, 0xB7,
+ };
+ 
+-static unsigned char dh512_g[]={
+-  0x02,
+static unsigned char dh2048_g[]={
+  0x05,
+ };
+ 
+-static DH *get_dh512(void)
+static DH *get_dh2048(void)
+ {
+   DH *dh;
+   if ((dh=DH_new()))
+   {
+-    dh->p=BN_bin2bn(dh512_p,sizeof(dh512_p),NULL);
+-    dh->g=BN_bin2bn(dh512_g,sizeof(dh512_g),NULL);
+    dh->p=BN_bin2bn(dh2048_p,sizeof(dh2048_p),NULL);
+    dh->g=BN_bin2bn(dh2048_g,sizeof(dh2048_g),NULL);
+     if (! dh->p || ! dh->g)
+     {
+       DH_free(dh);
+       dh=0;
+@@ -81,9 +110,11 @@
+   "Unable to get private key",
+   "Private key does not match the certificate public key",
+   "SSL_CTX_set_default_verify_paths failed",
+   "Failed to set ciphers to use",
+-  "SSL_CTX_new failed"
+  "SSL_CTX_new failed",
+  "SSL context is not usable without certificate and private key",
+  "SSL_CTX_set_tmp_dh failed"
+ };
+ 
+ const char*
+ sslGetErrString(enum enum_ssl_init_error e)
+@@ -258,10 +289,19 @@
+     DBUG_RETURN(0);
+   }
+ 
+   /* DH stuff */
+-  dh=get_dh512();
+-  SSL_CTX_set_tmp_dh(ssl_fd->ssl_context, dh);
+  dh= get_dh2048();
+  if (SSL_CTX_set_tmp_dh(ssl_fd->ssl_context, dh) == 0)
+  {
+    *error= SSL_INITERR_DHFAIL;
+    DBUG_PRINT("error", ("%s", sslGetErrString(*error)));
+    report_errors();
+    DH_free(dh);
+    SSL_CTX_free(ssl_fd->ssl_context);
+    my_free(ssl_fd);
+    DBUG_RETURN(0);
+  }
+   DH_free(dh);
+ 
+   DBUG_PRINT("exit", ("OK 1"));
+ 
--- a/databases/mongo-c-driver/Makefile
+++ b/databases/mongo-c-driver/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2015/06/10 17:22:57 fhajny Exp $
+# $NetBSD: Makefile,v 1.11 2015/08/24 16:06:08 fhajny Exp $

-DISTNAME=	mongo-c-driver-1.1.7
+DISTNAME=	mongo-c-driver-1.1.10
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_GITHUB:=mongodb/}

@@ -30,6 +30,6 @@ CONFIGURE_ARGS+=		--enable-man-pages=yes
 PKGCONFIG_OVERRIDE+=	src/libmongoc-1.0.pc.in
 PKGCONFIG_OVERRIDE+=	src/libmongoc-ssl-1.0.pc.in

-BUILDLINK_API_DEPENDS.libbson+=	libbson>=1.1.7
+BUILDLINK_API_DEPENDS.libbson+=	libbson>=1.1.10
 .include "../../devel/libbson/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
--- a/databases/mongo-c-driver/distinfo
+++ b/databases/mongo-c-driver/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.8 2015/06/10 17:22:57 fhajny Exp $
+$NetBSD: distinfo,v 1.10 2015/08/24 16:06:08 fhajny Exp $

-SHA1 (mongo-c-driver-1.1.7.tar.gz) = ec073042f5279741d7790a376b6eae2965975600
-RMD160 (mongo-c-driver-1.1.7.tar.gz) = d6445345f4e7b30697400a880057328556532021
-Size (mongo-c-driver-1.1.7.tar.gz) = 5316539 bytes
+SHA1 (mongo-c-driver-1.1.10.tar.gz) = fd6ad5e8c4e50faf94de63560372ce442aad4d5a
+RMD160 (mongo-c-driver-1.1.10.tar.gz) = bac46fb98ab0bed5c2e826691af2a3a0bb8acd4c
+Size (mongo-c-driver-1.1.10.tar.gz) = 5321144 bytes
--- a/databases/mongodb/Makefile
+++ b/databases/mongodb/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2015/06/23 13:31:24 ryoon Exp $
+# $NetBSD: Makefile,v 1.7 2015/08/26 05:03:00 fhajny Exp $

-DISTNAME=	mongodb-src-r3.0.4
+DISTNAME=	mongodb-src-r3.0.6
 PKGNAME=	${DISTNAME:S/src-r//:S/-rc/rc/}
 CATEGORIES=	databases
 MASTER_SITES=	http://fastdl.mongodb.org/src/
@@ -15,8 +15,6 @@ USE_LANGUAGES=	c c++

 BUILD_DEPENDS+=	scons-[0-9]*:../../devel/scons

-GCC_REQD+=	4.8.2
-
 SCONS_BIN=	${PREFIX}/bin/scons
 SCONS_ARGS=	${_MAKE_JOBS}
 SCONS_ARGS+=	--c++11=on
@@ -30,8 +28,12 @@ SCONS_ARGS+=	--js-engine=v8-3.25
 # Avoid Argument list too long from mongod linking
 SCONS_ARGS+=	--variant-dir=pkgsrc

+PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # not yet supported as of 3.0.4
+
 .include "../../mk/bsd.prefs.mk"

+GCC_REQD+=	4.8.2
+
 .if ${MACHINE_ARCH} == "x86_64"
 SCONS_ARGS+=	--64
 .else
@@ -121,7 +123,7 @@ post-install:

 .include "../../devel/boost-headers/buildlink3.mk"
 .include "../../devel/boost-libs/buildlink3.mk"
-.include "../../devel/boost-python/buildlink3.mk"
+.include "../../devel/py-boost/buildlink3.mk"
 .include "../../devel/libexecinfo/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../devel/snappy/buildlink3.mk"
--- a/databases/mongodb/distinfo
+++ b/databases/mongodb/distinfo
@@ -1,17 +1,18 @@
-$NetBSD: distinfo,v 1.3 2015/06/23 13:31:24 ryoon Exp $
+$NetBSD: distinfo,v 1.7 2015/09/08 07:48:19 fhajny Exp $

-SHA1 (mongodb-src-r3.0.4.tar.gz) = 5df86eabb1631dfb3cd29a1424f7c65f70277e58
-RMD160 (mongodb-src-r3.0.4.tar.gz) = e67ad3559cbe1c2ee56ed4f5b33cf1901c0b76c2
-Size (mongodb-src-r3.0.4.tar.gz) = 26615962 bytes
+SHA1 (mongodb-src-r3.0.6.tar.gz) = b80acf2cd63b3bce27d860581ce17a3aad2b8ea8
+RMD160 (mongodb-src-r3.0.6.tar.gz) = 3e3dc920c0790826b54d02e5a82faace48da9e9f
+Size (mongodb-src-r3.0.6.tar.gz) = 26241944 bytes
 SHA1 (patch-SConstruct) = 71f06ac82474f81a6b1b6660cd9e23cd5a63d55f
 SHA1 (patch-debian_mongod.conf) = 35f3d7e7da4f573458bef0fe742c1790adec8200
 SHA1 (patch-src_mongo_base_initializer.h) = add32c5940c922a98122d0e6883eb3ad52dc25c5
-SHA1 (patch-src_mongo_db_repl_isself.c) = 93001bf0616c0fd64ac5e7ea03113885671540b0
-SHA1 (patch-src_mongo_platform_random.cpp) = ab275e90347a9d2e767f031df4e56a204647ddfe
-SHA1 (patch-src_mongo_shell_linenoise__utf8.h) = d505c22aeeee09b482bf3d3a6bd0cdc45c9ec0bc
+SHA1 (patch-src_mongo_db_repl_isself.c) = c27e7ac0f19158eff9d5bf59d5d07835ab222bc4
+SHA1 (patch-src_mongo_platform_random.cpp) = 4e962e0ffdcbd80956bacebfcb052cb25508d4ca
+SHA1 (patch-src_mongo_shell_linenoise__utf8.h) = 2d18e46cb63313e6fb09714e0662c98347f4f74e
 SHA1 (patch-src_mongo_util_intrusive__counter.h) = d242db05708c999bd19f2751bdc881db50ea81f0
 SHA1 (patch-src_third__party_s2_base_port.h) = 8e715efbfcacaba51d957c21aa32ccfd3cc4f736
 SHA1 (patch-src_third__party_v8-3.25_SConscript) = a8da59130c36b2be3b89498ba0b23b1c7c9ab9e6
 SHA1 (patch-src_third__party_v8-3.25_src_platform-posix.cc) = 2fa27016a9af828d1c01815739770918a2d53d16
+SHA1 (patch-src_third__party_v8-3.25_src_platform_semaphore.cc) = 92447c13b379eeb4d9f8bac9455d78d54b4f9e32
 SHA1 (patch-src_third__party_wiredtiger_SConscript) = b9ed24d0c05e812d66941f94a77cf4c91f55d43b
 SHA1 (patch-src_third__party_wiredtiger_build__netbsd_wiredtiger__config.h) = e41064c0ff7268efc795782312ff413295cbcba7
--- a/databases/mongodb/patches/patch-src_mongo_db_repl_isself.c
+++ b/databases/mongodb/patches/patch-src_mongo_db_repl_isself.c
@@ -1,19 +1,19 @@
-$NetBSD: patch-src_mongo_db_repl_isself.c,v 1.1 2015/05/02 08:10:33 ryoon Exp $
+$NetBSD: patch-src_mongo_db_repl_isself.c,v 1.2 2015/08/26 05:03:00 fhajny Exp $

 * Add NetBSD support.

--- src/mongo/db/repl/isself.cpp.orig	2015-04-08 20:28:08.000000000 +0000
+--- src/mongo/db/repl/isself.cpp.orig	2015-08-24 00:39:52.000000000 +0000
 +++ src/mongo/db/repl/isself.cpp
-@@ -47,7 +47,7 @@
- #include "mongo/util/scopeguard.h"
+@@ -48,7 +48,7 @@
 #include "mongo/util/log.h"
 
-#if defined(__linux__) || defined(__APPLE__) || defined(__freebsd__) || defined(__sunos__) || defined(__openbsd__)
-+#if defined(__linux__) || defined(__APPLE__) || defined(__freebsd__) || defined(__sunos__) || defined(__openbsd__) || defined(__netbsd__)
+ #if defined(__linux__) || defined(__APPLE__) || defined(__freebsd__) || defined(__sunos__) || \
+-    defined(__openbsd__)
+    defined(__openbsd__) || defined(__netbsd__)
 #define FASTPATH_UNIX 1
 #endif
 
-@@ -60,7 +60,7 @@
+@@ -61,7 +61,7 @@
 #include <ifaddrs.h>
 #include <netdb.h>
 
--- a/databases/mongodb/patches/patch-src_mongo_platform_random.cpp
+++ b/databases/mongodb/patches/patch-src_mongo_platform_random.cpp
@@ -1,14 +1,14 @@
-$NetBSD: patch-src_mongo_platform_random.cpp,v 1.1 2015/05/02 08:10:33 ryoon Exp $
+$NetBSD: patch-src_mongo_platform_random.cpp,v 1.2 2015/08/26 05:03:00 fhajny Exp $

 Add NetBSD support.
--- src/mongo/platform/random.cpp.orig	2015-04-08 20:28:08.000000000 +0000
+--- src/mongo/platform/random.cpp.orig	2015-08-24 00:39:52.000000000 +0000
 +++ src/mongo/platform/random.cpp
-@@ -117,7 +117,7 @@ namespace mongo {
-         return new WinSecureRandom();
-     }
+@@ -116,7 +116,7 @@ SecureRandom* SecureRandom::create() {
+     return new WinSecureRandom();
+ }
 
 -#elif defined(__linux__) || defined(__sunos__) || defined(__APPLE__) || defined(__freebsd__)
 +#elif defined(__linux__) || defined(__sunos__) || defined(__APPLE__) || defined(__freebsd__) || defined(__netbsd__)
 
-     class InputStreamSecureRandom : public SecureRandom {
-     public:
+ class InputStreamSecureRandom : public SecureRandom {
+ public:
--- a/databases/mongodb/patches/patch-src_mongo_shell_linenoise__utf8.h
+++ b/databases/mongodb/patches/patch-src_mongo_shell_linenoise__utf8.h
@@ -1,7 +1,7 @@
-$NetBSD: patch-src_mongo_shell_linenoise__utf8.h,v 1.1 2015/05/02 08:10:33 ryoon Exp $
+$NetBSD: patch-src_mongo_shell_linenoise__utf8.h,v 1.2 2015/08/26 05:03:00 fhajny Exp $

 Use Boost swap instead of std. Fixes build on SunOS.
--- src/mongo/shell/linenoise_utf8.h.orig	2015-04-08 20:28:08.000000000 +0000
+--- src/mongo/shell/linenoise_utf8.h.orig	2015-08-24 00:39:52.000000000 +0000
 +++ src/mongo/shell/linenoise_utf8.h
@@ -27,6 +27,7 @@
  *    then also delete it in the license file.
@@ -11,16 +11,16 @@ Use Boost swap instead of std. Fixes build on SunOS.
 #include <boost/smart_ptr/scoped_array.hpp>
 #include <algorithm>
 #include <string.h>
-@@ -155,9 +156,9 @@ struct UtfStringMixin {
-     size_t chars() const { return _chars; }
- 
-     void swap( UtfStringMixin& other ) {
-        std::swap( _len, other._len );
-        std::swap( _cap, other._cap );
-        std::swap( _chars, other._chars );
-+        boost::swap( _len, other._len );
-+        boost::swap( _cap, other._cap );
-+        boost::swap( _chars, other._chars );
-         _str.swap( other._str );
+@@ -173,9 +174,9 @@ struct UtfStringMixin {
+     }
+ 
+     void swap(UtfStringMixin& other) {
+-        std::swap(_len, other._len);
+-        std::swap(_cap, other._cap);
+-        std::swap(_chars, other._chars);
+        boost::swap(_len, other._len);
+        boost::swap(_cap, other._cap);
+        boost::swap(_chars, other._chars);
+         _str.swap(other._str);
     }
 
--- a/databases/mongodb/patches/patch-src_third__party_v8-3.25_src_platform_semaphore.cc
+++ b/databases/mongodb/patches/patch-src_third__party_v8-3.25_src_platform_semaphore.cc
@@ -0,0 +1,48 @@
+$NetBSD: patch-src_third__party_v8-3.25_src_platform_semaphore.cc,v 1.2 2015/09/08 07:48:19 fhajny Exp $
+
+Work around lack of sem_timedwait(3) in NetBSD < 6.99.4.
+Adapted from d4f11c0cf476dd854eaebec1cbacb1afc7bea18e of the Chromium V8 sources.
+
+--- src/third_party/v8-3.25/src/platform/semaphore.cc.orig	2015-08-24 00:39:52.000000000 +0000
+++ src/third_party/v8-3.25/src/platform/semaphore.cc
+@@ -32,9 +32,14 @@
+ #include <mach/task.h>
+ #endif
+ 
+#if V8_OS_NETBSD
+#include <sys/param.h>  // for __NetBSD_Version__
+#endif
+
+ #include <errno.h>
+ 
+ #include "checks.h"
+#include "platform/elapsed-timer.h"
+ #include "platform/time.h"
+ 
+ namespace v8 {
+@@ -129,6 +134,17 @@ void Semaphore::Wait() {
+ 
+ 
+ bool Semaphore::WaitFor(const TimeDelta& rel_time) {
+#if V8_OS_NACL || (V8_OS_NETBSD && __NetBSD_Version__ - 0 < 699000400)
+  // PNaCL and older NetBSD doesn't support sem_timedwait, do ugly busy waiting.
+  ElapsedTimer timer;
+  timer.Start();
+  do {
+    int result = sem_trywait(&native_handle_);
+    if (result == 0) return true;
+      ASSERT(errno == EAGAIN || errno == EINTR);
+  } while (!timer.HasExpired(rel_time));
+  return false;
+#else
+   // Compute the time for end of timeout.
+   const Time time = Time::NowFromSystemTime() + rel_time;
+   const struct timespec ts = time.ToTimespec();
+@@ -152,6 +168,7 @@ bool Semaphore::WaitFor(const TimeDelta&
+     ASSERT_EQ(-1, result);
+     ASSERT_EQ(EINTR, errno);
+   }
+#endif
+ }
+ 
+ #elif V8_OS_WIN
--- a/databases/mysql-cluster/Makefile
+++ b/databases/mysql-cluster/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2015/06/12 10:48:36 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2015/09/07 04:33:06 jnemeth Exp $

 PKGNAME=		${DISTNAME:S/-gpl//}
-PKGREVISION=		1
-COMMENT=		MySQL 5, a free SQL database (client)
+COMMENT=		MySQL Cluster 7.4, a free SQL clustered database

 CONFLICTS=		mysql*-{client,server}-[0-9]*

--- a/databases/mysql-cluster/Makefile.common
+++ b/databases/mysql-cluster/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.7 2015/06/22 15:16:24 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.8 2015/09/07 04:33:06 jnemeth Exp $
 #
 # used by databases/mysql-cluster/Makefile

-DISTNAME=	mysql-cluster-gpl-7.4.6
+DISTNAME=	mysql-cluster-gpl-7.4.7
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL:=MySQL-Cluster-7.4/}

--- a/databases/mysql-cluster/PLIST
+++ b/databases/mysql-cluster/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2015/05/25 22:17:36 jnemeth Exp $
+@comment $NetBSD: PLIST,v 1.6 2015/09/07 04:33:06 jnemeth Exp $
 bin/innochecksum
 bin/mcc_config.py
 bin/memclient
@@ -6294,6 +6294,7 @@ share/mysql/test/include/analyze-sync_with_master.test
 share/mysql/test/include/analyze-timeout.test
 share/mysql/test/include/assert.inc
 share/mysql/test/include/assert_command_output.inc
+share/mysql/test/include/assert_grep.inc
 share/mysql/test/include/begin_include_file.inc
 share/mysql/test/include/big_test.inc
 share/mysql/test/include/binlog_inject_error.inc
@@ -6551,6 +6552,7 @@ share/mysql/test/include/ndb_restore_master.inc
 share/mysql/test/include/ndb_restore_slave_eoption.inc
 share/mysql/test/include/ndb_setup_slave.inc
 share/mysql/test/include/ndb_wait_connected.inc
+share/mysql/test/include/no_protocol.inc
 share/mysql/test/include/no_running_event_scheduler.inc
 share/mysql/test/include/no_running_events.inc
 share/mysql/test/include/no_valgrind_without_big.inc
@@ -6716,6 +6718,7 @@ share/mysql/test/include/wait_for_slave_sql_to_start.inc
 share/mysql/test/include/wait_for_slave_sql_to_stop.inc
 share/mysql/test/include/wait_for_slave_to_start.inc
 share/mysql/test/include/wait_for_slave_to_stop.inc
+share/mysql/test/include/wait_for_slave_to_sync_with_master.inc
 share/mysql/test/include/wait_for_status_var.inc
 share/mysql/test/include/wait_innodb_all_purged.inc
 share/mysql/test/include/wait_show_condition.inc
@@ -7183,6 +7186,7 @@ share/mysql/test/r/lock_multi_bug38499.result
 share/mysql/test/r/lock_multi_bug38691.result
 share/mysql/test/r/lock_sync.result
 share/mysql/test/r/lock_tables_lost_commit.result
+share/mysql/test/r/log_empty_name.result
 share/mysql/test/r/log_errchk.result
 share/mysql/test/r/log_state.result
 share/mysql/test/r/log_state_bug33693.result
@@ -7320,6 +7324,7 @@ share/mysql/test/r/packet.result
 share/mysql/test/r/parser.result
 share/mysql/test/r/parser_bug21114_innodb.result
 share/mysql/test/r/parser_not_embedded.result
+share/mysql/test/r/parser_old_temporals.result
 share/mysql/test/r/parser_precedence.result
 share/mysql/test/r/parser_stack.result
 share/mysql/test/r/partition.result
@@ -9556,7 +9561,9 @@ share/mysql/test/suite/innodb/r/insert_debug.result
 share/mysql/test/suite/innodb/r/monitor.result
 share/mysql/test/suite/innodb/r/monitor_debug.result
 share/mysql/test/suite/innodb/r/sp_temp_table.result
+share/mysql/test/suite/innodb/r/strict_checksum.result
 share/mysql/test/suite/innodb/r/strict_mode.result
+share/mysql/test/suite/innodb/r/xa_recovery.result
 share/mysql/test/suite/innodb/t/add_foreign_key.test
 share/mysql/test/suite/innodb/t/blob-update-debug.test
 share/mysql/test/suite/innodb/t/blob_redo-master.opt
@@ -9772,7 +9779,9 @@ share/mysql/test/suite/innodb/t/monitor_debug.test
 share/mysql/test/suite/innodb/t/portability_wl5980_linux.zip
 share/mysql/test/suite/innodb/t/portability_wl5980_windows.zip
 share/mysql/test/suite/innodb/t/sp_temp_table.test
+share/mysql/test/suite/innodb/t/strict_checksum.test
 share/mysql/test/suite/innodb/t/strict_mode.test
+share/mysql/test/suite/innodb/t/xa_recovery.test
 share/mysql/test/suite/innodb_fts/r/fts_compatibility.result
 share/mysql/test/suite/innodb_fts/r/fts_compatibility_win.result
 share/mysql/test/suite/innodb_fts/r/fulltext.result
@@ -9841,6 +9850,105 @@ share/mysql/test/suite/innodb_fts/t/innodb_fts_stopword_charset.test
 share/mysql/test/suite/innodb_fts/t/innodb_fts_transaction.test
 share/mysql/test/suite/innodb_fts/t/phrase.test
 share/mysql/test/suite/innodb_fts/t/subexpr.test
+share/mysql/test/suite/innodb_stress/include/innodb_stress.inc
+share/mysql/test/suite/innodb_stress/r/innodb_bigstress.result
+share/mysql/test/suite/innodb_stress/r/innodb_bigstress_blob.result
+share/mysql/test/suite/innodb_stress/r/innodb_bigstress_blob_nocompress.result
+share/mysql/test/suite/innodb_stress/r/innodb_bigstress_crash.result
+share/mysql/test/suite/innodb_stress/r/innodb_bigstress_crash_blob.result
+share/mysql/test/suite/innodb_stress/r/innodb_bigstress_crash_blob_nocompress.result
+share/mysql/test/suite/innodb_stress/r/innodb_bigstress_crash_nocompress.result
+share/mysql/test/suite/innodb_stress/r/innodb_bigstress_nocompress.result
+share/mysql/test/suite/innodb_stress/r/innodb_hugestress.result
+share/mysql/test/suite/innodb_stress/r/innodb_hugestress_blob.result
+share/mysql/test/suite/innodb_stress/r/innodb_hugestress_blob_nocompress.result
+share/mysql/test/suite/innodb_stress/r/innodb_hugestress_crash.result
+share/mysql/test/suite/innodb_stress/r/innodb_hugestress_crash_blob.result
+share/mysql/test/suite/innodb_stress/r/innodb_hugestress_crash_blob_nocompress.result
+share/mysql/test/suite/innodb_stress/r/innodb_hugestress_crash_nocompress.result
+share/mysql/test/suite/innodb_stress/r/innodb_hugestress_nocompress.result
+share/mysql/test/suite/innodb_stress/r/innodb_stress.result
+share/mysql/test/suite/innodb_stress/r/innodb_stress_blob.result
+share/mysql/test/suite/innodb_stress/r/innodb_stress_blob_nocompress.result
+share/mysql/test/suite/innodb_stress/r/innodb_stress_crash.result
+share/mysql/test/suite/innodb_stress/r/innodb_stress_crash_blob.result
+share/mysql/test/suite/innodb_stress/r/innodb_stress_crash_blob_nocompress.result
+share/mysql/test/suite/innodb_stress/r/innodb_stress_crash_nocompress.result
+share/mysql/test/suite/innodb_stress/r/innodb_stress_nocompress.result
+share/mysql/test/suite/innodb_stress/t/Readme
+share/mysql/test/suite/innodb_stress/t/innodb_bigstress-master.opt
+share/mysql/test/suite/innodb_stress/t/innodb_bigstress-slave.opt
+share/mysql/test/suite/innodb_stress/t/innodb_bigstress.test
+share/mysql/test/suite/innodb_stress/t/innodb_bigstress_blob-master.opt
+share/mysql/test/suite/innodb_stress/t/innodb_bigstress_blob-slave.opt
+share/mysql/test/suite/innodb_stress/t/innodb_bigstress_blob.test
+share/mysql/test/suite/innodb_stress/t/innodb_bigstress_blob_nocompress-master.opt
+share/mysql/test/suite/innodb_stress/t/innodb_bigstress_blob_nocompress-slave.opt
+share/mysql/test/suite/innodb_stress/t/innodb_bigstress_blob_nocompress.test
+share/mysql/test/suite/innodb_stress/t/innodb_bigstress_crash-master.opt
+share/mysql/test/suite/innodb_stress/t/innodb_bigstress_crash-slave.opt
+share/mysql/test/suite/innodb_stress/t/innodb_bigstress_crash.test
+share/mysql/test/suite/innodb_stress/t/innodb_bigstress_crash_blob-master.opt
+share/mysql/test/suite/innodb_stress/t/innodb_bigstress_crash_blob-slave.opt
+share/mysql/test/suite/innodb_stress/t/innodb_bigstress_crash_blob.test
+share/mysql/test/suite/innodb_stress/t/innodb_bigstress_crash_blob_nocompress-master.opt
+share/mysql/test/suite/innodb_stress/t/innodb_bigstress_crash_blob_nocompress-slave.opt
+share/mysql/test/suite/innodb_stress/t/innodb_bigstress_crash_blob_nocompress.test
+share/mysql/test/suite/innodb_stress/t/innodb_bigstress_crash_nocompress-master.opt
+share/mysql/test/suite/innodb_stress/t/innodb_bigstress_crash_nocompress-slave.opt
+share/mysql/test/suite/innodb_stress/t/innodb_bigstress_crash_nocompress.test
+share/mysql/test/suite/innodb_stress/t/innodb_bigstress_nocompress-master.opt
+share/mysql/test/suite/innodb_stress/t/innodb_bigstress_nocompress-slave.opt
+share/mysql/test/suite/innodb_stress/t/innodb_bigstress_nocompress.test
+share/mysql/test/suite/innodb_stress/t/innodb_hugestress-master.opt
+share/mysql/test/suite/innodb_stress/t/innodb_hugestress-slave.opt
+share/mysql/test/suite/innodb_stress/t/innodb_hugestress.test
+share/mysql/test/suite/innodb_stress/t/innodb_hugestress_blob-master.opt
+share/mysql/test/suite/innodb_stress/t/innodb_hugestress_blob-slave.opt
+share/mysql/test/suite/innodb_stress/t/innodb_hugestress_blob.test
+share/mysql/test/suite/innodb_stress/t/innodb_hugestress_blob_nocompress-master.opt
+share/mysql/test/suite/innodb_stress/t/innodb_hugestress_blob_nocompress-slave.opt
+share/mysql/test/suite/innodb_stress/t/innodb_hugestress_blob_nocompress.test
+share/mysql/test/suite/innodb_stress/t/innodb_hugestress_crash-master.opt
+share/mysql/test/suite/innodb_stress/t/innodb_hugestress_crash-slave.opt
+share/mysql/test/suite/innodb_stress/t/innodb_hugestress_crash.test
+share/mysql/test/suite/innodb_stress/t/innodb_hugestress_crash_blob-master.opt
+share/mysql/test/suite/innodb_stress/t/innodb_hugestress_crash_blob-slave.opt
+share/mysql/test/suite/innodb_stress/t/innodb_hugestress_crash_blob.test
+share/mysql/test/suite/innodb_stress/t/innodb_hugestress_crash_blob_nocompress-master.opt
+share/mysql/test/suite/innodb_stress/t/innodb_hugestress_crash_blob_nocompress-slave.opt
+share/mysql/test/suite/innodb_stress/t/innodb_hugestress_crash_blob_nocompress.test
+share/mysql/test/suite/innodb_stress/t/innodb_hugestress_crash_nocompress-master.opt
+share/mysql/test/suite/innodb_stress/t/innodb_hugestress_crash_nocompress-slave.opt
+share/mysql/test/suite/innodb_stress/t/innodb_hugestress_crash_nocompress.test
+share/mysql/test/suite/innodb_stress/t/innodb_hugestress_nocompress-master.opt
+share/mysql/test/suite/innodb_stress/t/innodb_hugestress_nocompress-slave.opt
+share/mysql/test/suite/innodb_stress/t/innodb_hugestress_nocompress.test
+share/mysql/test/suite/innodb_stress/t/innodb_stress-master.opt
+share/mysql/test/suite/innodb_stress/t/innodb_stress-slave.opt
+share/mysql/test/suite/innodb_stress/t/innodb_stress.test
+share/mysql/test/suite/innodb_stress/t/innodb_stress_blob-master.opt
+share/mysql/test/suite/innodb_stress/t/innodb_stress_blob-slave.opt
+share/mysql/test/suite/innodb_stress/t/innodb_stress_blob.test
+share/mysql/test/suite/innodb_stress/t/innodb_stress_blob_nocompress-master.opt
+share/mysql/test/suite/innodb_stress/t/innodb_stress_blob_nocompress-slave.opt
+share/mysql/test/suite/innodb_stress/t/innodb_stress_blob_nocompress.test
+share/mysql/test/suite/innodb_stress/t/innodb_stress_crash-master.opt
+share/mysql/test/suite/innodb_stress/t/innodb_stress_crash-slave.opt
+share/mysql/test/suite/innodb_stress/t/innodb_stress_crash.test
+share/mysql/test/suite/innodb_stress/t/innodb_stress_crash_blob-master.opt
+share/mysql/test/suite/innodb_stress/t/innodb_stress_crash_blob-slave.opt
+share/mysql/test/suite/innodb_stress/t/innodb_stress_crash_blob.test
+share/mysql/test/suite/innodb_stress/t/innodb_stress_crash_blob_nocompress-master.opt
+share/mysql/test/suite/innodb_stress/t/innodb_stress_crash_blob_nocompress-slave.opt
+share/mysql/test/suite/innodb_stress/t/innodb_stress_crash_blob_nocompress.test
+share/mysql/test/suite/innodb_stress/t/innodb_stress_crash_nocompress-master.opt
+share/mysql/test/suite/innodb_stress/t/innodb_stress_crash_nocompress-slave.opt
+share/mysql/test/suite/innodb_stress/t/innodb_stress_crash_nocompress.test
+share/mysql/test/suite/innodb_stress/t/innodb_stress_nocompress-master.opt
+share/mysql/test/suite/innodb_stress/t/innodb_stress_nocompress-slave.opt
+share/mysql/test/suite/innodb_stress/t/innodb_stress_nocompress.test
+share/mysql/test/suite/innodb_stress/t/load_generator.py
 share/mysql/test/suite/innodb_zip/include/innodb_create_tab_indx.inc
 share/mysql/test/suite/innodb_zip/include/innodb_fetch_records.inc
 share/mysql/test/suite/innodb_zip/include/innodb_load_data.inc
@@ -10437,6 +10545,8 @@ share/mysql/test/suite/ndb/r/ndb_types.result
 share/mysql/test/suite/ndb/r/ndb_update.result
 share/mysql/test/suite/ndb/r/ndb_update_no_read.result
 share/mysql/test/suite/ndb/r/ndb_view.result
+share/mysql/test/suite/ndb/r/ndb_wait_until_ready.result
+share/mysql/test/suite/ndb/r/ndb_wl946_compat.result
 share/mysql/test/suite/ndb/r/ndb_wl946_main.result
 share/mysql/test/suite/ndb/r/ndb_wl946_post.result
 share/mysql/test/suite/ndb/r/ndb_wl946_pre.result
@@ -10691,7 +10801,11 @@ share/mysql/test/suite/ndb/t/ndb_update_no_read.test
 share/mysql/test/suite/ndb/t/ndb_view.test
 share/mysql/test/suite/ndb/t/ndb_wait_nostart.inc
 share/mysql/test/suite/ndb/t/ndb_wait_started.inc
+share/mysql/test/suite/ndb/t/ndb_wait_until_ready.cnf
+share/mysql/test/suite/ndb/t/ndb_wait_until_ready.test
 share/mysql/test/suite/ndb/t/ndb_waiter.inc
+share/mysql/test/suite/ndb/t/ndb_wl946_compat-master.opt
+share/mysql/test/suite/ndb/t/ndb_wl946_compat.test
 share/mysql/test/suite/ndb/t/ndb_wl946_create.inc
 share/mysql/test/suite/ndb/t/ndb_wl946_main.test
 share/mysql/test/suite/ndb/t/ndb_wl946_main_query.inc
@@ -10763,6 +10877,8 @@ share/mysql/test/suite/ndb_binlog/r/ndb_binlog_multi.result
 share/mysql/test/suite/ndb_binlog/r/ndb_binlog_purge.result
 share/mysql/test/suite/ndb_binlog/r/ndb_binlog_restore.result
 share/mysql/test/suite/ndb_binlog/r/ndb_binlog_size_based_rotate.result
+share/mysql/test/suite/ndb_binlog/r/ndb_binlog_temporals_new.result
+share/mysql/test/suite/ndb_binlog/r/ndb_binlog_temporals_old.result
 share/mysql/test/suite/ndb_binlog/r/ndb_binlog_test_conflict_flags.result
 share/mysql/test/suite/ndb_binlog/r/ndb_binlog_unique_epoch.result
 share/mysql/test/suite/ndb_binlog/r/ndb_binlog_variants.result
@@ -10803,6 +10919,10 @@ share/mysql/test/suite/ndb_binlog/t/ndb_binlog_purge.test
 share/mysql/test/suite/ndb_binlog/t/ndb_binlog_restore-master.opt
 share/mysql/test/suite/ndb_binlog/t/ndb_binlog_restore.test
 share/mysql/test/suite/ndb_binlog/t/ndb_binlog_size_based_rotate.test
+share/mysql/test/suite/ndb_binlog/t/ndb_binlog_temporals.inc
+share/mysql/test/suite/ndb_binlog/t/ndb_binlog_temporals_new.test
+share/mysql/test/suite/ndb_binlog/t/ndb_binlog_temporals_old-master.opt
+share/mysql/test/suite/ndb_binlog/t/ndb_binlog_temporals_old.test
 share/mysql/test/suite/ndb_binlog/t/ndb_binlog_test_conflict_flags.test
 share/mysql/test/suite/ndb_binlog/t/ndb_binlog_unique_epoch.cnf
 share/mysql/test/suite/ndb_binlog/t/ndb_binlog_unique_epoch.test
@@ -11609,7 +11729,6 @@ share/mysql/test/suite/perfschema/include/event_aggregate_setup.inc
 share/mysql/test/suite/perfschema/include/have_aligned_memory.inc
 share/mysql/test/suite/perfschema/include/hostcache_dump.inc
 share/mysql/test/suite/perfschema/include/hostcache_set_state.inc
-share/mysql/test/suite/perfschema/include/no_protocol.inc
 share/mysql/test/suite/perfschema/include/privilege.inc
 share/mysql/test/suite/perfschema/include/rpl_statements_truncate.inc
 share/mysql/test/suite/perfschema/include/schema.inc
@@ -12521,9 +12640,12 @@ share/mysql/test/suite/rpl/r/rpl_gtid_ignore_table_filter_insensitive.result
 share/mysql/test/suite/rpl/r/rpl_gtid_ignore_table_filter_sensitive.result
 share/mysql/test/suite/rpl/r/rpl_gtid_loaddata_s.result
 share/mysql/test/suite/rpl/r/rpl_gtid_mode.result
+share/mysql/test/suite/rpl/r/rpl_gtid_mode_off_new_master.result
+share/mysql/test/suite/rpl/r/rpl_gtid_mode_on_new_master.result
 share/mysql/test/suite/rpl/r/rpl_gtid_parallel.result
 share/mysql/test/suite/rpl/r/rpl_gtid_purged_fail_to_connect.result
 share/mysql/test/suite/rpl/r/rpl_gtid_purged_maintained.result
+share/mysql/test/suite/rpl/r/rpl_gtid_replay_relaylog.result
 share/mysql/test/suite/rpl/r/rpl_gtid_row_event_max_size.result
 share/mysql/test/suite/rpl/r/rpl_gtid_row_show_relaylog_events.result
 share/mysql/test/suite/rpl/r/rpl_gtid_server_sighup.result
@@ -13026,11 +13148,14 @@ share/mysql/test/suite/rpl/t/rpl_gtid_ignore_table_filter_sensitive.test
 share/mysql/test/suite/rpl/t/rpl_gtid_loaddata_s-slave.opt
 share/mysql/test/suite/rpl/t/rpl_gtid_loaddata_s.test
 share/mysql/test/suite/rpl/t/rpl_gtid_mode.test
+share/mysql/test/suite/rpl/t/rpl_gtid_mode_off_new_master.test
+share/mysql/test/suite/rpl/t/rpl_gtid_mode_on_new_master.test
 share/mysql/test/suite/rpl/t/rpl_gtid_parallel.test
 share/mysql/test/suite/rpl/t/rpl_gtid_purged_fail_to_connect-master.opt
 share/mysql/test/suite/rpl/t/rpl_gtid_purged_fail_to_connect-slave.opt
 share/mysql/test/suite/rpl/t/rpl_gtid_purged_fail_to_connect.test
 share/mysql/test/suite/rpl/t/rpl_gtid_purged_maintained.test
+share/mysql/test/suite/rpl/t/rpl_gtid_replay_relaylog.test
 share/mysql/test/suite/rpl/t/rpl_gtid_row_event_max_size-master.opt
 share/mysql/test/suite/rpl/t/rpl_gtid_row_event_max_size-slave.opt
 share/mysql/test/suite/rpl/t/rpl_gtid_row_event_max_size.test
@@ -15305,6 +15430,8 @@ share/mysql/test/t/lock_sync-master.opt
 share/mysql/test/t/lock_sync.test
 share/mysql/test/t/lock_tables_lost_commit-master.opt
 share/mysql/test/t/lock_tables_lost_commit.test
+share/mysql/test/t/log_empty_name.opt
+share/mysql/test/t/log_empty_name.test
 share/mysql/test/t/log_errchk.test
 share/mysql/test/t/log_state-master.opt
 share/mysql/test/t/log_state.test
@@ -15478,6 +15605,8 @@ share/mysql/test/t/packet.test
 share/mysql/test/t/parser.test
 share/mysql/test/t/parser_bug21114_innodb.test
 share/mysql/test/t/parser_not_embedded.test
+share/mysql/test/t/parser_old_temporals-master.opt
+share/mysql/test/t/parser_old_temporals.test
 share/mysql/test/t/parser_precedence.test
 share/mysql/test/t/parser_stack.test
 share/mysql/test/t/partition.test
--- a/databases/mysql-cluster/distinfo
+++ b/databases/mysql-cluster/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2015/05/25 22:17:36 jnemeth Exp $
+$NetBSD: distinfo,v 1.5 2015/09/07 04:33:06 jnemeth Exp $

-SHA1 (mysql-cluster-gpl-7.4.6.tar.gz) = 7b2ccaf9b0a473b7e46994cd3687b31689fc4e65
-RMD160 (mysql-cluster-gpl-7.4.6.tar.gz) = 4cad13015557f1befbceed2b9ccd85d3b371d49c
-Size (mysql-cluster-gpl-7.4.6.tar.gz) = 42752111 bytes
+SHA1 (mysql-cluster-gpl-7.4.7.tar.gz) = be4d697eae16c1c75b287a07cf758f9e3bd00e0f
+RMD160 (mysql-cluster-gpl-7.4.7.tar.gz) = bc36b6758ca1bb4ccfd026ffc0abf630fb5f2d1e
+Size (mysql-cluster-gpl-7.4.7.tar.gz) = 42943769 bytes
 SHA1 (patch-CMakeLists.txt) = fabc427d8e7974cb8af1ce057f994b1436628443
 SHA1 (patch-client_completion_hash.cc) = b86ec80beac624b2aa21c7587e351ff126400ecb
 SHA1 (patch-client_mysqladmin.cc) = e1650ef3695675bcc01375bacdebcb7318218b93
@@ -36,4 +36,3 @@ SHA1 (patch-storage_myisammrg_CMakeLists.txt) = 0a56a16ccaff3fa9de996fec6ffc324a
 SHA1 (patch-storage_ndb_mcc_frontend_dojo_dojox_mobile_build_build.sh) = 1aa09b34d5f9cef6fb244a2ca8d675a22f30a9a8
 SHA1 (patch-storage_ndb_mcc_host__info_CMakeLists.txt) = c21711c96387d0e9ddda9eff01691f7fbf08cab3
 SHA1 (patch-strings_decimal.c) = 069c9d930c735f74510702baa9bef38aec425903
-SHA1 (patch-vio_viossl.c) = 538c08e6ec85d02a7eeead2bb940c91c7f701321
--- a/databases/mysql-cluster/patches/patch-vio_viossl.c
+++ b/databases/mysql-cluster/patches/patch-vio_viossl.c
@@ -1,15 +0,0 @@
-$NetBSD: patch-vio_viossl.c,v 1.1.1.1 2014/12/01 05:58:03 jnemeth Exp $
-
-Compatibility fix.
-
--- vio/viossl.c.orig	2013-04-05 12:27:17.000000000 +0000
-+++ vio/viossl.c
-@@ -391,7 +391,7 @@ static int ssl_do(struct st_VioSSLFd *pt
-   SSL_clear(ssl);
-   SSL_SESSION_set_timeout(SSL_get_session(ssl), timeout);
-   SSL_set_fd(ssl, sd);
-#ifndef HAVE_YASSL
-+#if !defined(HAVE_YASSL) && defined(SSL_OP_NO_COMPRESSION)
-   SSL_set_options(ssl, SSL_OP_NO_COMPRESSION);
- #endif
- 
--- a/databases/mysql-connector-c++/Makefile
+++ b/databases/mysql-connector-c++/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2014/11/29 16:41:25 adam Exp $
+# $NetBSD: Makefile,v 1.5 2015/08/01 09:35:52 adam Exp $

-DISTNAME=	mysql-connector-c++-1.1.5
+DISTNAME=	mysql-connector-c++-1.1.6
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL:=Connector-C++/}

--- a/databases/mysql-connector-c++/distinfo
+++ b/databases/mysql-connector-c++/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2014/11/29 16:41:25 adam Exp $
+$NetBSD: distinfo,v 1.4 2015/08/01 09:35:52 adam Exp $

-SHA1 (mysql-connector-c++-1.1.5.tar.gz) = 0b33f74049227d330da0a37ce919b8cd695a9584
-RMD160 (mysql-connector-c++-1.1.5.tar.gz) = f429bc23bc78a8adc382706f61c032a7010caa3d
-Size (mysql-connector-c++-1.1.5.tar.gz) = 519440 bytes
+SHA1 (mysql-connector-c++-1.1.6.tar.gz) = a28a90bc04797df0d2fefe147eab8735a340afb4
+RMD160 (mysql-connector-c++-1.1.6.tar.gz) = 70be3edd02a7cb3fa3d46195ad1582ba3d06f232
+Size (mysql-connector-c++-1.1.6.tar.gz) = 522236 bytes
--- a/databases/mysql-workbench/Makefile
+++ b/databases/mysql-workbench/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2015/05/04 21:14:24 wiz Exp $
+# $NetBSD: Makefile,v 1.47 2015/07/07 11:43:47 joerg Exp $

 DISTNAME=	mysql-workbench-gpl-5.2.33b-src
 PKGNAME=	${DISTNAME:S/-gpl//:S/b-src$//}
@@ -18,7 +18,7 @@ USE_LIBTOOL=		yes
 USE_TOOLS+=		bash gmake pkg-config
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-system-ctemplate
-LUA_VERSIONS_INCOMPATIBLE=	52
+LUA_VERSIONS_INCOMPATIBLE=	52 53

 CHECK_PORTABILITY_SKIP=	build/make_dmg.sh
 CHECK_PORTABILITY_SKIP+=ext/ctemplate/ctemplate-src/configure.ac
--- a/databases/mysql-workbench/distinfo
+++ b/databases/mysql-workbench/distinfo
@@ -1,19 +1,23 @@
-$NetBSD: distinfo,v 1.9 2013/06/27 15:48:42 joerg Exp $
+$NetBSD: distinfo,v 1.10 2015/07/07 11:45:52 joerg Exp $

 SHA1 (mysql-workbench-gpl-5.2.33b-src.tar.gz) = 1d47598fb0f956ce1a0c6b1afb462e8d6beeb1ed
 RMD160 (mysql-workbench-gpl-5.2.33b-src.tar.gz) = 60213dd583da6034d5c4f7766b0a7dbafe57100c
 Size (mysql-workbench-gpl-5.2.33b-src.tar.gz) = 17873523 bytes
 SHA1 (patch-backend_wbprivate_model_wb__component__physical.cpp) = 710cfb3f90f1112536d86461291531cdbe25a61b
+SHA1 (patch-backend_wbprivate_sqlide_wb__sql__editor__form.cpp) = 11d65a32058c646602a6caecbef05883efad85c2
 SHA1 (patch-backend_wbprivate_sqlide_wb__sqlide__module.cpp) = b5f422fb5de8f9853c3536a08ee2470ab17cbe96
 SHA1 (patch-backend_wbprivate_workbench_stdafx_h) = 3bfeffdbbf7b8c3922ba514c436cb5a6f92c614b
 SHA1 (patch-backend_wbprivate_workbench_wb__context.cpp) = c215ac28cf4a1a41eae4dec0eb54c2c14c5b52fb
 SHA1 (patch-backend_wbprivate_workbench_wb__model__file.cpp) = 96231a6cc7969a70196a1e4505549d1a75d7f485
 SHA1 (patch-backend_wbprivate_workbench_wb__module.cpp) = 4a7869cf1a223eaa57904801477a258f3c526319
+SHA1 (patch-backend_wbpublic_grt_grt__structs__tree.cpp) = 46a5f6e66c1bf154ce0e759b8d1671ba889cfe82
+SHA1 (patch-backend_wbpublic_sqlide_recordset__text__storage.cpp) = 709217d0421ebdb4074157f69fa68af12ba0b02e
 SHA1 (patch-backend_wbpublic_sqlide_sqlide__generics.cpp) = 08df04e135eb45bd7d4f071e40ad7a22b17b6f63
 SHA1 (patch-backend_wbpublic_sqlide_var__grid__model.cpp) = b2e6cd40a2d785e904ff0fbafd501eb754aabef4
 SHA1 (patch-backend_windows_wbprivate_wr_src_stdafx_h) = a42d1c33c627dd52e73f6841d759be5922950984
 SHA1 (patch-ext_scintilla_gtk_ScintillaGTK.cxx) = 5900ce9f440a59833d3779c6f3700a2b47f74edf
 SHA1 (patch-frontend_linux_linux_utilities_toolbar_manager.cpp) = cc2ecf41802836c1ce799ebdff26ad89b70f3459
+SHA1 (patch-frontend_linux_workbench_Makefile.in) = ad1146700a3d657089b73d86daf8e1da1b6722c6
 SHA1 (patch-frontend_linux_workbench_main.cpp) = 0ffcf6695f8aaf52be437d2d9281f788692cccaf
 SHA1 (patch-library_base_file_utilities.cpp) = af34c32bec2e194b9e8e96c264dd7b036c380978
 SHA1 (patch-library_base_international_file.cpp) = 702e1465cbe2eec2b21d5b308e9c1184edb5c03b
@@ -24,6 +28,7 @@ SHA1 (patch-library_canvas_src_mdc__text.cpp) = 376bea4a00e321a9972a299652f6cf38
 SHA1 (patch-library_canvas_src_stdafx_h) = 2e10af126271958857bdb77ca400d5e2d7e9a9ce
 SHA1 (patch-library_forms_gtk_lf_panel.h) = b381ffd107e23c1c099f89ff8175b64754d88fa1
 SHA1 (patch-library_forms_mforms.cpp) = de621a3d2604ab3b3807758a432cc6762ee30559
+SHA1 (patch-library_grt_src_grtpp.h) = a5c0dd74ffb9352329f2e3b123f46edbaf7220a6
 SHA1 (patch-library_grt_src_grtpp__shell.cpp) = f2d31b23c1966d256d9a139cd328742da562654d
 SHA1 (patch-library_grt_src_grtpp__shell__lua.cpp) = 48b0d96c7a847f444629b921773a1735935b93a2
 SHA1 (patch-library_grt_src_grtpp__shell__lua__help.cpp) = 526f90d787e7fb64fc51a8cd63382e1c9e15b316
--- a/databases/mysql-workbench/patches/patch-backend_wbprivate_sqlide_wbsqleditor__form.cpp
+++ b/databases/mysql-workbench/patches/patch-backend_wbprivate_sqlide_wbsqleditor__form.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-backend_wbprivate_sqlide_wb__sql__editor__form.cpp,v 1.1 2015/07/07 11:45:52 joerg Exp $
+
+Can't use dynamic_cast as the type information is normally not present.
+
+--- backend/wbprivate/sqlide/wb_sql_editor_form.cpp.orig	2015-06-28 18:41:49.000000000 +0000
+++ backend/wbprivate/sqlide/wb_sql_editor_form.cpp
+@@ -1728,7 +1728,7 @@ grt::StringRef Db_sql_editor::do_exec_sq
+               goto stop_processing_sql_script;
+           }
+ 
+-          sql::mysql::MySQL_Connection* mysql_connection = dynamic_cast<sql::mysql::MySQL_Connection*>(dbc_statement->getConnection());
+          sql::mysql::MySQL_Connection* mysql_connection = reinterpret_cast<sql::mysql::MySQL_Connection*>(dbc_statement->getConnection());
+           sql::SQLString last_statement_info;
+           if (mysql_connection != NULL)
+             last_statement_info = mysql_connection->getLastStatementInfo();
--- a/databases/mysql-workbench/patches/patch-backend_wbpublic_grt_grtstructstree.cpp
+++ b/databases/mysql-workbench/patches/patch-backend_wbpublic_grt_grtstructstree.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-backend_wbpublic_grt_grt__structs__tree.cpp,v 1.1 2015/07/07 11:45:52 joerg Exp $
+
+--- backend/wbpublic/grt/grt_structs_tree.cpp.orig	2015-06-28 17:50:16.000000000 +0000
+++ backend/wbpublic/grt/grt_structs_tree.cpp
+@@ -140,7 +140,7 @@ std::string StructsTreeBE::get_field_des
+   Node *n= get_node_for_id(node);
+   
+   if (n == NULL)
+-    return false;
+    return "";
+ 
+   switch (n->type)
+   {
--- a/databases/mysql-workbench/patches/patch-backend_wbpublic_sqlide_recordsettextstorage.cpp
+++ b/databases/mysql-workbench/patches/patch-backend_wbpublic_sqlide_recordsettextstorage.cpp
@@ -0,0 +1,31 @@
+$NetBSD: patch-backend_wbpublic_sqlide_recordset__text__storage.cpp,v 1.1 2015/07/07 11:45:52 joerg Exp $
+
+--- backend/wbpublic/sqlide/recordset_text_storage.cpp.orig	2015-06-28 17:59:17.000000000 +0000
+++ backend/wbpublic/sqlide/recordset_text_storage.cpp
+@@ -162,7 +162,7 @@ void Recordset_text_storage::do_serializ
+       if (!pre_tpl)
+         g_warning("Failed to open template file: `%s`", pre_tpl_path.c_str()); 
+       else
+-        pre_tpl->ReloadIfChanged();
+        pre_tpl->ReloadAllIfChanged();
+     }      
+     if (g_file_test((name+".post.tpl").c_str(), G_FILE_TEST_EXISTS))
+     {
+@@ -171,7 +171,7 @@ void Recordset_text_storage::do_serializ
+       if (!post_tpl)
+         g_warning("Failed to open template file: `%s`", post_tpl_path.c_str());
+       else
+-        post_tpl->ReloadIfChanged();
+        post_tpl->ReloadAllIfChanged();
+     }
+   }    
+   
+@@ -180,7 +180,7 @@ void Recordset_text_storage::do_serializ
+       throw std::runtime_error(strfmt("Failed to open output file: `%s`", _file_path.c_str()));
+   }
+ 
+-  tpl->ReloadIfChanged();
+  tpl->ReloadAllIfChanged();
+ 
+   std::auto_ptr<TemplateDictionary> dict(new TemplateDictionary("/"));
+   BOOST_FOREACH (const Parameters::value_type &param, _parameters)
--- a/databases/mysql-workbench/patches/patch-frontend_linux_workbench_Makefile.in
+++ b/databases/mysql-workbench/patches/patch-frontend_linux_workbench_Makefile.in
@@ -0,0 +1,27 @@
+$NetBSD: patch-frontend_linux_workbench_Makefile.in,v 1.1 2015/07/07 11:45:52 joerg Exp $
+
+--- frontend/linux/workbench/Makefile.in.orig	2015-06-28 18:32:27.000000000 +0000
+++ frontend/linux/workbench/Makefile.in
+@@ -71,10 +71,8 @@ mysql_workbench_bin_DEPENDENCIES =  \
+ 	$(top_srcdir)/library/base/libwbbase.la \
+ 	$(top_srcdir)/library/grt/src/libgrt.la \
+ 	$(top_srcdir)/library/dbc/libcdbc.la \
+-	$(top_srcdir)/ext/cppconn/driver/mysqlcppconn.la \
+ 	$(top_srcdir)/library/canvas/src/libmdcanvasgtk.la \
+-	$(top_srcdir)/library/canvas/src/libmdcanvas.la \
+-	$(top_srcdir)/ext/cppconn/driver/mysqlcppconn.la
+	$(top_srcdir)/library/canvas/src/libmdcanvas.la
+ binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+ SCRIPTS = $(bin_SCRIPTS)
+ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+@@ -315,10 +313,8 @@ mysql_workbench_bin_LDADD = \
+ 	$(top_srcdir)/library/base/libwbbase.la\
+ 	$(top_srcdir)/library/grt/src/libgrt.la\
+ 	$(top_srcdir)/library/dbc/libcdbc.la\
+-	$(top_srcdir)/ext/cppconn/driver/mysqlcppconn.la\
+ 	$(top_srcdir)/library/canvas/src/libmdcanvasgtk.la\
+ 	$(top_srcdir)/library/canvas/src/libmdcanvas.la\
+-	$(top_srcdir)/ext/cppconn/driver/mysqlcppconn.la\
+ 	@CTEMPLATE_LIBS@\
+ 	@GNOME_LIBS@ @GRT_LIBS@ @PCRE_LIBS@ @GLIB_LIBS@ @CAIRO_LIBS@ @ZIP_LIBS@ @MYSQL_LIBS@ @SQLITE3_LIBS@\
+ 	-lX11
--- a/databases/mysql-workbench/patches/patch-library_grt_src_grtpp.h
+++ b/databases/mysql-workbench/patches/patch-library_grt_src_grtpp.h
@@ -0,0 +1,42 @@
+$NetBSD: patch-library_grt_src_grtpp.h,v 1.1 2015/07/07 11:45:52 joerg Exp $
+
+--- library/grt/src/grtpp.h.orig	2015-06-28 17:13:25.000000000 +0000
+++ library/grt/src/grtpp.h
+@@ -855,8 +855,6 @@ namespace grt {
+ 
+     IterType iter;
+     
+-    TypedListConstIterator() : iter(0) {}
+-
+     TypedListConstIterator(const TypedListConstIterator &content) : iter(content.iter) {}
+     
+     TypedListConstIterator(const IterType &content)
+@@ -895,6 +893,9 @@ namespace grt {
+       ++iter;
+       return temp;
+     }
+
+    private:
+      TypedListConstIterator() {}
+   };
+ 
+   template<class C>
+@@ -909,8 +910,6 @@ namespace grt {
+     
+     IterType iter;
+     
+-    TypedListConstReverseIterator() {}
+-    
+     TypedListConstReverseIterator(const TypedListConstReverseIterator &content) : iter(content.iter) {}
+     
+     TypedListConstReverseIterator(const IterType &content)
+@@ -949,6 +948,9 @@ namespace grt {
+       ++iter;
+       return temp;
+     }
+
+    private:
+      TypedListConstReverseIterator() {}
+   };
+   
+   
--- a/databases/mysql55-client/Makefile
+++ b/databases/mysql55-client/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.21 2015/06/12 10:48:36 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2015/07/30 14:36:34 adam Exp $

 PKGNAME=	${DISTNAME:S/-/-client-/}
-PKGREVISION=	1
 COMMENT=	MySQL 5, a free SQL database (client)

 CONFLICTS=	mysql3-client-[0-9]*
--- a/databases/mysql55-client/Makefile.common
+++ b/databases/mysql55-client/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.45 2015/06/22 15:16:24 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.46 2015/07/30 14:36:34 adam Exp $
 #
 # used by databases/mysql55-client/Makefile
 # used by databases/mysql55-server/Makefile

-DISTNAME=	mysql-5.5.44
+DISTNAME=	mysql-5.5.45
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL:=MySQL-5.5/}

--- a/databases/mysql55-client/distinfo
+++ b/databases/mysql55-client/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.43 2015/06/01 07:40:36 adam Exp $
+$NetBSD: distinfo,v 1.44 2015/07/30 14:36:34 adam Exp $

-SHA1 (mysql-5.5.44.tar.gz) = 1882c53d078ffb2e50339a8d9f5ba44c3eb155ea
-RMD160 (mysql-5.5.44.tar.gz) = 72faecbd2cae73ac109253e4a512086e74058128
-Size (mysql-5.5.44.tar.gz) = 21789766 bytes
-SHA1 (sphinx-2.2.7-release.tar.gz) = dedae28c0deafda90109745230dacbe0dc441e1a
-RMD160 (sphinx-2.2.7-release.tar.gz) = d9f0150f6779b43457e30c77be50aa9bc658b03a
-Size (sphinx-2.2.7-release.tar.gz) = 2969037 bytes
+SHA1 (mysql-5.5.45.tar.gz) = 225f7979d37c5877696c89195acc8e70df03d702
+RMD160 (mysql-5.5.45.tar.gz) = dbdf56a703c10722bae01e2707a9fcccf769edcd
+Size (mysql-5.5.45.tar.gz) = 21832364 bytes
+SHA1 (sphinx-2.2.9-release.tar.gz) = 7ddde51bb1d428406acb278c615a2c2fda819daf
+RMD160 (sphinx-2.2.9-release.tar.gz) = e600bb0fcbb3fe9838dc60bd8b00ca2bedd0ce05
+Size (sphinx-2.2.9-release.tar.gz) = 2992905 bytes
 SHA1 (patch-BUILD_compile-pentium-gcov) = a1ac666efa953a98455a726e5db359c903d699b6
 SHA1 (patch-CMakeLists.txt) = 2040dc4904270327c9d64178a3d889ebde2ec5d5
 SHA1 (patch-client_completion_hash.cc) = e27fd7072a8206380f0a932b1a31d2843c985cbf
--- a/databases/mysql55-client/options.mk
+++ b/databases/mysql55-client/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.8 2015/02/07 16:04:46 fhajny Exp $
+# $NetBSD: options.mk,v 1.9 2015/07/30 14:36:34 adam Exp $

 PKG_OPTIONS_VAR=	PKG_OPTIONS.mysql5

@@ -25,9 +25,9 @@ CMAKE_ARGS+=		-DENABLE_DTRACE=ON
 # http://sphinxsearch.com/docs/current.html#sphinxse-overview
 PLIST_VARS+=	sphinx
 .if !empty(PKG_OPTIONS:Msphinx) || make(distinfo) || make(makesum) || make(mdi)
-SPHINX_VER=	2.2.7
+SPHINX_VER=	2.2.9
 DISTFILES=	${DEFAULT_DISTFILES} sphinx-${SPHINX_VER}-release${EXTRACT_SUFX}
-SITES.sphinx-2.2.7-release.tar.gz=	http://sphinxsearch.com/files/
+SITES.sphinx-2.2.9-release.tar.gz=	http://sphinxsearch.com/files/
 .if !empty(PKGPATH:Mdatabases/mysql55-server)
 MESSAGE_SRC=	${PKGDIR}/MESSAGE ${PKGDIR}/MESSAGE.sphinx
 .endif
--- a/databases/mysql55-server/PLIST
+++ b/databases/mysql55-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.36 2015/06/01 07:40:36 adam Exp $
+@comment $NetBSD: PLIST,v 1.37 2015/07/30 14:36:34 adam Exp $
 bin/innochecksum
 bin/my_print_defaults
 bin/myisam_ftdump
@@ -1003,7 +1003,6 @@ share/mysql/test/r/merge-big.result
 share/mysql/test/r/merge.result
 share/mysql/test/r/merge_innodb.result
 share/mysql/test/r/merge_mmap.result
-share/mysql/test/r/merge_recover.result
 share/mysql/test/r/metadata.result
 share/mysql/test/r/mix2_myisam.result
 share/mysql/test/r/mix2_myisam_ucs2.result
@@ -1017,6 +1016,7 @@ share/mysql/test/r/myisam-system.result
 share/mysql/test/r/myisam.result
 share/mysql/test/r/myisam_crash_before_flush_keys.result
 share/mysql/test/r/myisam_debug.result
+share/mysql/test/r/myisam_recover.result
 share/mysql/test/r/myisampack.result
 share/mysql/test/r/mysql-bug41486.result
 share/mysql/test/r/mysql-bug45236.result
@@ -2904,6 +2904,7 @@ share/mysql/test/suite/funcs_2/t/innodb_charset.test
 share/mysql/test/suite/funcs_2/t/memory_charset.test
 share/mysql/test/suite/funcs_2/t/myisam_charset.test
 share/mysql/test/suite/funcs_2/t/suite.opt
+share/mysql/test/suite/innodb/r/add_constraint.result
 share/mysql/test/suite/innodb/r/blob-update-debug.result
 share/mysql/test/suite/innodb/r/create-index.result
 share/mysql/test/suite/innodb/r/foreign-keys.result
@@ -3009,6 +3010,7 @@ share/mysql/test/suite/innodb/r/insert_debug.result
 share/mysql/test/suite/innodb/r/sp_temp_table.result
 share/mysql/test/suite/innodb/r/strict_mode.result
 share/mysql/test/suite/innodb/r/xa_recovery.result
+share/mysql/test/suite/innodb/t/add_constraint.test
 share/mysql/test/suite/innodb/t/blob-update-debug.test
 share/mysql/test/suite/innodb/t/create-index.test
 share/mysql/test/suite/innodb/t/disabled.def
@@ -3415,6 +3417,8 @@ share/mysql/test/suite/large_tests/t/rpl_slave_net_timeout.test
 share/mysql/test/suite/manual/r/rpl_replication_delay.result
 share/mysql/test/suite/manual/t/rpl_replication_delay-slave.opt
 share/mysql/test/suite/manual/t/rpl_replication_delay.test
+share/mysql/test/suite/ndb/r/ndb_restore_discover.result
+share/mysql/test/suite/ndb/t/ndb_restore_discover.test
 share/mysql/test/suite/parts/inc/methods1.inc
 share/mysql/test/suite/parts/inc/part_blocked_sql_funcs_main.inc
 share/mysql/test/suite/parts/inc/part_supported_sql_funcs_delete.inc
@@ -5970,8 +5974,6 @@ share/mysql/test/t/merge.test
 share/mysql/test/t/merge_innodb.test
 share/mysql/test/t/merge_mmap-master.opt
 share/mysql/test/t/merge_mmap.test
-share/mysql/test/t/merge_recover-master.opt
-share/mysql/test/t/merge_recover.test
 share/mysql/test/t/metadata.test
 share/mysql/test/t/mix2_myisam.test
 share/mysql/test/t/mix2_myisam_ucs2.test
@@ -5991,6 +5993,8 @@ share/mysql/test/t/myisam.test
 share/mysql/test/t/myisam_crash_before_flush_keys-master.opt
 share/mysql/test/t/myisam_crash_before_flush_keys.test
 share/mysql/test/t/myisam_debug.test
+share/mysql/test/t/myisam_recover-master.opt
+share/mysql/test/t/myisam_recover.test
 share/mysql/test/t/myisampack.test
 share/mysql/test/t/mysql-bug41486.test
 share/mysql/test/t/mysql-bug45236.test
--- a/databases/mysql56-client/Makefile
+++ b/databases/mysql56-client/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2015/06/12 10:48:36 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2015/07/30 14:39:18 adam Exp $

 PKGNAME=	${DISTNAME:S/-/-client-/}
-PKGREVISION=	1
 COMMENT=	MySQL 5, a free SQL database (client)

 CONFLICTS=	mysql3-client-[0-9]*
--- a/databases/mysql56-client/Makefile.common
+++ b/databases/mysql56-client/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.25 2015/06/22 15:16:24 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.26 2015/07/30 14:39:18 adam Exp $
 #
 # used by databases/mysql56-client/Makefile
 # used by databases/mysql56-server/Makefile

-DISTNAME=	mysql-5.6.25
+DISTNAME=	mysql-5.6.26
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL:=MySQL-5.6/}

--- a/databases/mysql56-client/distinfo
+++ b/databases/mysql56-client/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.24 2015/06/03 03:20:03 ryoon Exp $
+$NetBSD: distinfo,v 1.26 2015/07/30 14:39:18 adam Exp $

-SHA1 (mysql-5.6.25.tar.gz) = ace53481400a4ad363ee0453a547b8ba07582fd2
-RMD160 (mysql-5.6.25.tar.gz) = a65b1aa209cb2f08295db7cb7259a7ce294c0713
-Size (mysql-5.6.25.tar.gz) = 33203321 bytes
-SHA1 (sphinx-2.2.7-release.tar.gz) = dedae28c0deafda90109745230dacbe0dc441e1a
-RMD160 (sphinx-2.2.7-release.tar.gz) = d9f0150f6779b43457e30c77be50aa9bc658b03a
-Size (sphinx-2.2.7-release.tar.gz) = 2969037 bytes
+SHA1 (mysql-5.6.26.tar.gz) = 1f266a2782e13d4f5a2614d91ed5861e524c9467
+RMD160 (mysql-5.6.26.tar.gz) = 218977e86a92ea7dee15d7705e6ffb9d6b82a28d
+Size (mysql-5.6.26.tar.gz) = 33278710 bytes
+SHA1 (sphinx-2.2.9-release.tar.gz) = 7ddde51bb1d428406acb278c615a2c2fda819daf
+RMD160 (sphinx-2.2.9-release.tar.gz) = e600bb0fcbb3fe9838dc60bd8b00ca2bedd0ce05
+Size (sphinx-2.2.9-release.tar.gz) = 2992905 bytes
 SHA1 (patch-CMakeLists.txt) = 1b5dd5a965f87027a03c5f2eaa1c7e6a43395cff
 SHA1 (patch-client_completion_hash.cc) = b86ec80beac624b2aa21c7587e351ff126400ecb
 SHA1 (patch-client_mysqladmin.cc) = e1650ef3695675bcc01375bacdebcb7318218b93
--- a/databases/mysql56-client/options.mk
+++ b/databases/mysql56-client/options.mk
@@ -1,9 +1,10 @@
-# $NetBSD: options.mk,v 1.7 2015/02/07 19:23:40 adam Exp $
+# $NetBSD: options.mk,v 1.9 2015/08/20 12:24:45 jperkin Exp $

 PKG_OPTIONS_VAR=	PKG_OPTIONS.mysql5

 # ndb-cluster does not configure with cmake
 PKG_SUPPORTED_OPTIONS+=	dtrace embedded-server ndb-cluster sphinx ssl
+PKG_SUPPORTED_OPTIONS+=	memcached
 PKG_SUGGESTED_OPTIONS+=	embedded-server ssl

 .include "../../mk/bsd.options.mk"
@@ -21,13 +22,24 @@ CMAKE_ARGS+=		-DWITH_SSL=no
 CMAKE_ARGS+=		-DENABLE_DTRACE=ON
 .endif

+# Enable InnoDB Memcached support
+PLIST_VARS+=		memcached
+.if !empty(PKG_OPTIONS:Mmemcached)
+PLIST.memcached=	yes
+CMAKE_ARGS+=		-DWITH_INNODB_MEMCACHED=ON
+CMAKE_ARGS+=		-DWITH_BUNDLED_MEMCACHED=ON
+.include "../../devel/libevent/buildlink3.mk"
+.else
+CMAKE_ARGS+=		-DWITH_INNODB_MEMCACHED=OFF
+.endif
+
 # Enable Sphinx SE support
 # http://sphinxsearch.com/docs/current.html#sphinxse-overview
 PLIST_VARS+=	sphinx
 .if !empty(PKG_OPTIONS:Msphinx) || make(distinfo) || make(makesum) || make(mdi)
-SPHINX_VER=	2.2.7
+SPHINX_VER=	2.2.9
 DISTFILES=	${DEFAULT_DISTFILES} sphinx-${SPHINX_VER}-release${EXTRACT_SUFX}
-SITES.sphinx-2.2.7-release.tar.gz=	http://sphinxsearch.com/files/
+SITES.sphinx-2.2.9-release.tar.gz=	http://sphinxsearch.com/files/
 .if !empty(PKGPATH:Mdatabases/mysql56-server)
 MESSAGE_SRC=	${PKGDIR}/MESSAGE ${PKGDIR}/MESSAGE.sphinx
 .endif
--- a/databases/mysql56-server/Makefile
+++ b/databases/mysql56-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2015/04/08 10:38:48 adam Exp $
+# $NetBSD: Makefile,v 1.26 2015/07/30 14:39:18 adam Exp $

 PKGNAME=	${DISTNAME:S/-/-server-/}
 COMMENT=	MySQL 5, a free SQL database (server)
--- a/databases/mysql56-server/PLIST
+++ b/databases/mysql56-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2015/06/01 08:15:05 adam Exp $
+@comment $NetBSD: PLIST,v 1.19 2015/08/20 12:24:45 jperkin Exp $
 bin/innochecksum
 bin/my_print_defaults
 bin/myisam_ftdump
@@ -22,7 +22,9 @@ ${PLIST.auth_socket}lib/mysql/plugin/auth_socket.so
 lib/mysql/plugin/auth_test_plugin.so
 lib/mysql/plugin/daemon_example.ini
 ${PLIST.sphinx}lib/mysql/plugin/ha_sphinx.so
+${PLIST.memcached}lib/mysql/plugin/innodb_engine.so
 lib/mysql/plugin/libdaemon_example.so
+${PLIST.memcached}lib/mysql/plugin/libmemcached.so
 lib/mysql/plugin/mypluglib.so
 lib/mysql/plugin/mysql_no_login.so
 lib/mysql/plugin/qa_auth_client.so
@@ -255,6 +257,7 @@ share/mysql/test/extra/rpl_tests/rpl_flsh_tbls.test
 share/mysql/test/extra/rpl_tests/rpl_foreign_key.test
 share/mysql/test/extra/rpl_tests/rpl_get_master_version_and_clock.test
 share/mysql/test/extra/rpl_tests/rpl_gtid_drop_table.inc
+share/mysql/test/extra/rpl_tests/rpl_gtid_mts_relay_log_recovery.test
 share/mysql/test/extra/rpl_tests/rpl_gtids_restart_slave_io_lost_trx.test
 share/mysql/test/extra/rpl_tests/rpl_heartbeat_2slaves.inc
 share/mysql/test/extra/rpl_tests/rpl_ignore_table_filter_insensitive.inc
@@ -1252,7 +1255,6 @@ share/mysql/test/r/merge-big.result
 share/mysql/test/r/merge.result
 share/mysql/test/r/merge_innodb.result
 share/mysql/test/r/merge_mmap.result
-share/mysql/test/r/merge_recover.result
 share/mysql/test/r/metadata.result
 share/mysql/test/r/mix2_myisam.result
 share/mysql/test/r/mix2_myisam_ucs2.result
@@ -1283,6 +1285,7 @@ share/mysql/test/r/myisam_mrr_cost_all.result
 share/mysql/test/r/myisam_mrr_cost_icp.result
 share/mysql/test/r/myisam_mrr_icp.result
 share/mysql/test/r/myisam_mrr_none.result
+share/mysql/test/r/myisam_recover.result
 share/mysql/test/r/myisam_row_rpl.result
 share/mysql/test/r/myisampack.result
 share/mysql/test/r/mysql-bug41486.result
@@ -1550,6 +1553,7 @@ share/mysql/test/r/ssl_crl_crlpath.result
 share/mysql/test/r/status.result
 share/mysql/test/r/status2.result
 share/mysql/test/r/status_bug17954.result
+share/mysql/test/r/status_debug.result
 share/mysql/test/r/strict.result
 share/mysql/test/r/strict_autoinc_1myisam.result
 share/mysql/test/r/strict_autoinc_2innodb.result
@@ -3418,6 +3422,7 @@ share/mysql/test/suite/funcs_2/t/memory_charset.test
 share/mysql/test/suite/funcs_2/t/myisam_charset.test
 share/mysql/test/suite/funcs_2/t/suite.opt
 share/mysql/test/suite/innodb/include/checksum_not_strict.inc
+share/mysql/test/suite/innodb/include/import.inc
 share/mysql/test/suite/innodb/include/innodb_dict.inc
 share/mysql/test/suite/innodb/include/innodb_stats.inc
 share/mysql/test/suite/innodb/include/innodb_stats_table_flag.inc
@@ -3427,7 +3432,9 @@ share/mysql/test/suite/innodb/r/blob-update-debug.result
 share/mysql/test/suite/innodb/r/blob_redo.result
 share/mysql/test/suite/innodb/r/checksum.result
 share/mysql/test/suite/innodb/r/create-index.result
+share/mysql/test/suite/innodb/r/dropdb.result
 share/mysql/test/suite/innodb/r/foreign_key.result
+share/mysql/test/suite/innodb/r/import.result
 share/mysql/test/suite/innodb/r/index_tree_operation.result
 share/mysql/test/suite/innodb/r/innodb-2byte-collation.result
 share/mysql/test/suite/innodb/r/innodb-ac-non-locking-select.result
@@ -3609,7 +3616,9 @@ share/mysql/test/suite/innodb/t/blob_redo.test
 share/mysql/test/suite/innodb/t/checksum.test
 share/mysql/test/suite/innodb/t/create-index.test
 share/mysql/test/suite/innodb/t/disabled.def
+share/mysql/test/suite/innodb/t/dropdb.test
 share/mysql/test/suite/innodb/t/foreign_key.test
+share/mysql/test/suite/innodb/t/import.test
 share/mysql/test/suite/innodb/t/index_tree_operation.test
 share/mysql/test/suite/innodb/t/innodb-2byte-collation-master.opt
 share/mysql/test/suite/innodb/t/innodb-2byte-collation.test
@@ -4474,6 +4483,7 @@ share/mysql/test/suite/ndb/r/ndb_restore_conv_lossy_charbinary.result
 share/mysql/test/suite/ndb/r/ndb_restore_conv_lossy_integral.result
 share/mysql/test/suite/ndb/r/ndb_restore_conv_padding.result
 share/mysql/test/suite/ndb/r/ndb_restore_conv_promotion.result
+share/mysql/test/suite/ndb/r/ndb_restore_discover.result
 share/mysql/test/suite/ndb/r/ndb_restore_misc.result
 share/mysql/test/suite/ndb/r/ndb_restore_print.result
 share/mysql/test/suite/ndb/r/ndb_restore_schema_blobs.result
@@ -4618,6 +4628,7 @@ share/mysql/test/suite/ndb/t/ndb_restore_conv_lossy_charbinary.test
 share/mysql/test/suite/ndb/t/ndb_restore_conv_lossy_integral.test
 share/mysql/test/suite/ndb/t/ndb_restore_conv_padding.test
 share/mysql/test/suite/ndb/t/ndb_restore_conv_promotion.test
+share/mysql/test/suite/ndb/t/ndb_restore_discover.test
 share/mysql/test/suite/ndb/t/ndb_restore_misc.test
 share/mysql/test/suite/ndb/t/ndb_restore_print.test
 share/mysql/test/suite/ndb/t/ndb_restore_schema_blobs.test
@@ -6303,6 +6314,7 @@ share/mysql/test/suite/rpl/r/rpl_gtid_loaddata_s.result
 share/mysql/test/suite/rpl/r/rpl_gtid_mode.result
 share/mysql/test/suite/rpl/r/rpl_gtid_mode_off_new_master.result
 share/mysql/test/suite/rpl/r/rpl_gtid_mode_on_new_master.result
+share/mysql/test/suite/rpl/r/rpl_gtid_mts_relay_log_recovery_auto_pos_on_off.result
 share/mysql/test/suite/rpl/r/rpl_gtid_parallel.result
 share/mysql/test/suite/rpl/r/rpl_gtid_purged_fail_to_connect.result
 share/mysql/test/suite/rpl/r/rpl_gtid_purged_maintained.result
@@ -6383,6 +6395,7 @@ share/mysql/test/suite/rpl/r/rpl_mts_execute_partial_trx_with_auto_pos_off.resul
 share/mysql/test/suite/rpl/r/rpl_mts_execute_partial_trx_with_auto_pos_on.result
 share/mysql/test/suite/rpl/r/rpl_mts_gtids_restart_slave_io_lost_trx.result
 share/mysql/test/suite/rpl/r/rpl_mts_slave_hang_with_partial_trx.result
+share/mysql/test/suite/rpl/r/rpl_mts_stop_slave.result
 share/mysql/test/suite/rpl/r/rpl_multi_delete.result
 share/mysql/test/suite/rpl/r/rpl_multi_delete2.result
 share/mysql/test/suite/rpl/r/rpl_multi_engine.result
@@ -6812,6 +6825,9 @@ share/mysql/test/suite/rpl/t/rpl_gtid_loaddata_s.test
 share/mysql/test/suite/rpl/t/rpl_gtid_mode.test
 share/mysql/test/suite/rpl/t/rpl_gtid_mode_off_new_master.test
 share/mysql/test/suite/rpl/t/rpl_gtid_mode_on_new_master.test
+share/mysql/test/suite/rpl/t/rpl_gtid_mts_relay_log_recovery_auto_pos_on_off-master.opt
+share/mysql/test/suite/rpl/t/rpl_gtid_mts_relay_log_recovery_auto_pos_on_off-slave.opt
+share/mysql/test/suite/rpl/t/rpl_gtid_mts_relay_log_recovery_auto_pos_on_off.test
 share/mysql/test/suite/rpl/t/rpl_gtid_parallel.test
 share/mysql/test/suite/rpl/t/rpl_gtid_purged_fail_to_connect-master.opt
 share/mysql/test/suite/rpl/t/rpl_gtid_purged_fail_to_connect-slave.opt
@@ -6948,6 +6964,8 @@ share/mysql/test/suite/rpl/t/rpl_mts_gtids_restart_slave_io_lost_trx-slave.opt
 share/mysql/test/suite/rpl/t/rpl_mts_gtids_restart_slave_io_lost_trx.test
 share/mysql/test/suite/rpl/t/rpl_mts_slave_hang_with_partial_trx-slave.opt
 share/mysql/test/suite/rpl/t/rpl_mts_slave_hang_with_partial_trx.test
+share/mysql/test/suite/rpl/t/rpl_mts_stop_slave-slave.opt
+share/mysql/test/suite/rpl/t/rpl_mts_stop_slave.test
 share/mysql/test/suite/rpl/t/rpl_multi_delete-slave.opt
 share/mysql/test/suite/rpl/t/rpl_multi_delete.test
 share/mysql/test/suite/rpl/t/rpl_multi_delete2-slave.opt
@@ -7843,6 +7861,7 @@ share/mysql/test/suite/sys_vars/r/pfs_events_waits_hl_size_basic.result
 share/mysql/test/suite/sys_vars/r/pfs_hosts_size_basic.result
 share/mysql/test/suite/sys_vars/r/pfs_max_cond_classes_basic.result
 share/mysql/test/suite/sys_vars/r/pfs_max_cond_instances_basic.result
+share/mysql/test/suite/sys_vars/r/pfs_max_digest_length_basic.result
 share/mysql/test/suite/sys_vars/r/pfs_max_file_classes_basic.result
 share/mysql/test/suite/sys_vars/r/pfs_max_file_handles_basic.result
 share/mysql/test/suite/sys_vars/r/pfs_max_file_instances_basic.result
@@ -8474,6 +8493,8 @@ share/mysql/test/suite/sys_vars/t/pfs_max_cond_classes_basic-master.opt
 share/mysql/test/suite/sys_vars/t/pfs_max_cond_classes_basic.test
 share/mysql/test/suite/sys_vars/t/pfs_max_cond_instances_basic-master.opt
 share/mysql/test/suite/sys_vars/t/pfs_max_cond_instances_basic.test
+share/mysql/test/suite/sys_vars/t/pfs_max_digest_length_basic-master.opt
+share/mysql/test/suite/sys_vars/t/pfs_max_digest_length_basic.test
 share/mysql/test/suite/sys_vars/t/pfs_max_file_classes_basic-master.opt
 share/mysql/test/suite/sys_vars/t/pfs_max_file_classes_basic.test
 share/mysql/test/suite/sys_vars/t/pfs_max_file_handles_basic-master.opt
@@ -9140,8 +9161,6 @@ share/mysql/test/t/merge.test
 share/mysql/test/t/merge_innodb.test
 share/mysql/test/t/merge_mmap-master.opt
 share/mysql/test/t/merge_mmap.test
-share/mysql/test/t/merge_recover-master.opt
-share/mysql/test/t/merge_recover.test
 share/mysql/test/t/metadata.test
 share/mysql/test/t/mix2_myisam-master.opt
 share/mysql/test/t/mix2_myisam.test
@@ -9182,6 +9201,8 @@ share/mysql/test/t/myisam_mrr_cost_all.test
 share/mysql/test/t/myisam_mrr_cost_icp.test
 share/mysql/test/t/myisam_mrr_icp.test
 share/mysql/test/t/myisam_mrr_none.test
+share/mysql/test/t/myisam_recover-master.opt
+share/mysql/test/t/myisam_recover.test
 share/mysql/test/t/myisam_row_rpl-master.opt
 share/mysql/test/t/myisam_row_rpl-slave.opt
 share/mysql/test/t/myisam_row_rpl.test
@@ -9497,6 +9518,7 @@ share/mysql/test/t/status-master.opt
 share/mysql/test/t/status.test
 share/mysql/test/t/status2.test
 share/mysql/test/t/status_bug17954.test
+share/mysql/test/t/status_debug.test
 share/mysql/test/t/strict-master.opt
 share/mysql/test/t/strict.test
 share/mysql/test/t/strict_autoinc_1myisam.test
--- a/Show More
+++ b/Show More