Update databases/sqlrelay to 0.65.0

- SQL Relay now supports Kerberos encryption and authentication
- SQL Relay now supports TLS/SSL encryption and authentication
- Python 3 support
- Node.js 4.x and higher are now correctly detected and supported.
- Separate "database" and "proxied" Authentication Options
- Various ODBC-related bugs have been fixed
- A subtle bug that caused incompatibilities with the popular
  logrotate utility has been fixed
- A long standing problem that occurred when using a
  listenertimeout with a threaded listener (the default) has been
  fixed.
- After a graceful restart, Apache workers would get stuck in the
  Closing Connection state after running a PHP script that used
  SQL Relay. This is now fixed.

See full changelog:

  http://software.firstworks.com/2016/03/sql-relay-0650-release-announcement.html

19 files changed, 126 insertions, 130 deletions

diff --git a/databases/p5-sqlrelay/Makefile b/databases/p5-sqlrelay/Makefile
index c2d5b60ec09..1211ae11cc6 100644
--- a/databases/p5-sqlrelay/Makefile
+++ b/databases/p5-sqlrelay/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2016/06/08 19:22:31 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2016/07/01 17:02:38 fhajny Exp $
 
 PKGNAME=		p5-${DISTNAME}
-PKGREVISION=		2
 COMMENT=		Perl module for SQL Relay
 
 .include "../../databases/sqlrelay/Makefile.common"
diff --git a/databases/php-sqlrelay/Makefile b/databases/php-sqlrelay/Makefile
index a997fa5859c..6698ccb5c47 100644
--- a/databases/php-sqlrelay/Makefile
+++ b/databases/php-sqlrelay/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2016/03/05 11:28:13 jperkin Exp $
+# $NetBSD: Makefile,v 1.4 2016/07/01 17:02:38 fhajny Exp $
 
 PKGNAME=		${PHP_PKG_PREFIX}-${DISTNAME}
-PKGREVISION=		1
 COMMENT=		PHP extension for SQL Relay
 EXTRACT_SUFX=		.tar.gz
 
diff --git a/databases/py-sqlrelay/Makefile b/databases/py-sqlrelay/Makefile
index f8dae01341a..26a13126fec 100644
--- a/databases/py-sqlrelay/Makefile
+++ b/databases/py-sqlrelay/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2016/03/05 11:28:18 jperkin Exp $
+# $NetBSD: Makefile,v 1.5 2016/07/01 17:02:38 fhajny Exp $
 
 PKGNAME=		${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=		1
 COMMENT=		Python extension for SQL Relay
 
 .include "../../databases/sqlrelay/Makefile.common"
diff --git a/databases/ruby-sqlrelay/Makefile b/databases/ruby-sqlrelay/Makefile
index bfc58a3ab67..3f0e52a7933 100644
--- a/databases/ruby-sqlrelay/Makefile
+++ b/databases/ruby-sqlrelay/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2016/03/05 11:28:19 jperkin Exp $
+# $NetBSD: Makefile,v 1.4 2016/07/01 17:02:39 fhajny Exp $
 
 COMMENT=		Ruby extension for SQL Relay
-PKGREVISION=		1
 
 .include "../../databases/sqlrelay/Makefile.common"
 
diff --git a/databases/sqlrelay-freetds/Makefile b/databases/sqlrelay-freetds/Makefile
index 4b81ff96c30..3106284957f 100644
--- a/databases/sqlrelay-freetds/Makefile
+++ b/databases/sqlrelay-freetds/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2016/03/05 11:28:19 jperkin Exp $
+# $NetBSD: Makefile,v 1.6 2016/07/01 17:02:39 fhajny Exp $
 
 PKGNAME=		${DISTNAME:S/sqlrelay/sqlrelay-freetds/}
-PKGREVISION=		1
 COMMENT=		FreeTDS support for SQL Relay
 
 .include "../../databases/sqlrelay/Makefile.common"
diff --git a/databases/sqlrelay-mysql/Makefile b/databases/sqlrelay-mysql/Makefile
index f74dd6685cc..a0fc1802363 100644
--- a/databases/sqlrelay-mysql/Makefile
+++ b/databases/sqlrelay-mysql/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2016/03/05 11:28:19 jperkin Exp $
+# $NetBSD: Makefile,v 1.4 2016/07/01 17:02:39 fhajny Exp $
 
 PKGNAME=		${DISTNAME:S/sqlrelay/sqlrelay-mysql/}
-PKGREVISION=		1
 COMMENT=		MySQL support for SQL Relay
 
 .include "../../databases/sqlrelay/Makefile.common"
diff --git a/databases/sqlrelay-nodejs/Makefile b/databases/sqlrelay-nodejs/Makefile
index aa9f4289ee4..16fda836947 100644
--- a/databases/sqlrelay-nodejs/Makefile
+++ b/databases/sqlrelay-nodejs/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2016/03/05 11:28:19 jperkin Exp $
+# $NetBSD: Makefile,v 1.4 2016/07/01 17:02:39 fhajny Exp $
 
 PKGNAME=		${DISTNAME:S/sqlrelay/sqlrelay-nodejs/}
-PKGREVISION=		1
 COMMENT=		node.js API for SQL Relay
 
 .include "../../databases/sqlrelay/Makefile.common"
@@ -18,6 +17,8 @@ CONFIGURE_ARGS+=	--disable-mysql
 
 BUILD_DIRS=		src/api/nodejs
 
+CXXFLAGS+=		-std=c++11
+
 # Benign reference inside an object file
 CHECK_WRKREF_SKIP+=	lib/node_modules/sqlrelay/sqlrelay.node
 
diff --git a/databases/sqlrelay-odbc/Makefile b/databases/sqlrelay-odbc/Makefile
index 571fc35df5b..c27ff709eee 100644
--- a/databases/sqlrelay-odbc/Makefile
+++ b/databases/sqlrelay-odbc/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2016/03/05 11:28:20 jperkin Exp $
+# $NetBSD: Makefile,v 1.7 2016/07/01 17:02:39 fhajny Exp $
 
 PKGNAME=		${DISTNAME:S/sqlrelay/sqlrelay-odbc/}
-PKGREVISION=		1
 COMMENT=		ODBC support for SQL Relay
 
 .include "../../databases/sqlrelay/Makefile.common"
diff --git a/databases/sqlrelay-pgsql/Makefile b/databases/sqlrelay-pgsql/Makefile
index 06f4e30b207..832260b640a 100644
--- a/databases/sqlrelay-pgsql/Makefile
+++ b/databases/sqlrelay-pgsql/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2016/03/05 11:28:20 jperkin Exp $
+# $NetBSD: Makefile,v 1.4 2016/07/01 17:02:39 fhajny Exp $
 
 PKGNAME=		${DISTNAME:S/sqlrelay/sqlrelay-pgsql/}
-PKGREVISION=		1
 COMMENT=		PostgreSQL support for SQL Relay
 
 .include "../../databases/sqlrelay/Makefile.common"
diff --git a/databases/sqlrelay-sqlite/Makefile b/databases/sqlrelay-sqlite/Makefile
index d34bd123706..f06e08ebe73 100644
--- a/databases/sqlrelay-sqlite/Makefile
+++ b/databases/sqlrelay-sqlite/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2016/04/11 19:01:46 ryoon Exp $
+# $NetBSD: Makefile,v 1.8 2016/07/01 17:02:39 fhajny Exp $
 
 PKGNAME=		${DISTNAME:S/sqlrelay/sqlrelay-sqlite/}
-PKGREVISION=		2
 COMMENT=		SQLite support for SQL Relay
 
 .include "../../databases/sqlrelay/Makefile.common"
diff --git a/databases/sqlrelay/Makefile b/databases/sqlrelay/Makefile
index a5997e011ab..c22eca1c367 100644
--- a/databases/sqlrelay/Makefile
+++ b/databases/sqlrelay/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.46 2016/03/05 11:27:44 jperkin Exp $
+# $NetBSD: Makefile,v 1.47 2016/07/01 17:02:39 fhajny Exp $
 
 COMMENT=		Database connection pooling middleware and API
-PKGREVISION=		1
 
 .include "../../databases/sqlrelay/Makefile.common"
 
@@ -17,7 +16,7 @@ CONFIGURE_ARGS+=	--disable-db2 --disable-erlang --disable-firebird	\
 INSTALL_MAKE_FLAGS+=	EXAMPLEDIR=${DESTDIR}${EGDIR}
 
 CONF_FILES+=		${EGDIR}/sqlrelay.conf ${PKG_SYSCONFDIR}/sqlrelay.conf
-CONF_FILES+=		${EGDIR}/sqlrelay.dtd ${PKG_SYSCONFDIR}/sqlrelay.dtd
+CONF_FILES+=		${EGDIR}/sqlrelay.xsd ${PKG_SYSCONFDIR}/sqlrelay.xsd
 
 SQLR_USER?=		sqlrelay
 SQLR_GROUP?=		${SQLR_USER}
@@ -57,11 +56,4 @@ RCD_SCRIPTS+=				sqlrelay sqlrcachemanager
 RCD_SCRIPT_SRC.sqlrelay=		${WRKSRC}/init/rc.sqlrelay
 RCD_SCRIPT_SRC.sqlrcachemanager=	${WRKSRC}/init/rc.sqlrcachemanager
 
-.include "../../mk/compiler.mk"
-
-.if !empty(PKGSRC_COMPILER:Mclang)
-_WRAP_EXTRA_ARGS.CXX+=	-Wno-error=unused-private-field -Wno-error=mismatched-tags
-CWRAPPERS_APPEND.cxx+=	-Wno-error=unused-private-field -Wno-error=mismatched-tags
-.endif
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/sqlrelay/Makefile.common b/databases/sqlrelay/Makefile.common
index 1ae056a1372..3db0f86ded9 100644
--- a/databases/sqlrelay/Makefile.common
+++ b/databases/sqlrelay/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.11 2015/11/10 10:10:39 fhajny Exp $
+# $NetBSD: Makefile.common,v 1.12 2016/07/01 17:02:39 fhajny Exp $
 # used by databases/p5-sqlrelay/Makefile
 # used by databases/php-sqlrelay/Makefile
 # used by databases/py-sqlrelay/Makefile
@@ -11,7 +11,7 @@
 # used by databases/sqlrelay-sqlite/Makefile
 # used by databases/sqlrelay/Makefile
 
-DISTNAME=		sqlrelay-0.64
+DISTNAME=		sqlrelay-0.65.0
 CATEGORIES=		databases
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=sqlrelay/}
 
diff --git a/databases/sqlrelay/PLIST b/databases/sqlrelay/PLIST
index 07433b548e9..8b3561941d0 100644
--- a/databases/sqlrelay/PLIST
+++ b/databases/sqlrelay/PLIST
@@ -1,12 +1,10 @@
-@comment $NetBSD: PLIST,v 1.16 2016/02/29 17:35:10 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.17 2016/07/01 17:02:39 fhajny Exp $
 bin/sqlr-cachemanager
 bin/sqlr-connection
 bin/sqlr-export
-bin/sqlr-fields
 bin/sqlr-import
 bin/sqlr-listener
 bin/sqlr-pwdenc
-bin/sqlr-query
 bin/sqlr-scaler
 bin/sqlr-start
 bin/sqlr-status
@@ -15,47 +13,40 @@ bin/sqlrclient-config
 bin/sqlrclientwrapper-config
 bin/sqlrserver-config
 bin/sqlrsh
-include/sqlrelay/private/bindvar.h
-include/sqlrelay/private/column.h
-include/sqlrelay/private/dll.h
-include/sqlrelay/private/listformat.h
-include/sqlrelay/private/row.h
+include/sqlrelay/private/sqlrclientincludes.h
 include/sqlrelay/private/sqlrclientwrapper.h
+include/sqlrelay/private/sqlrclientwrapperincludes.h
 include/sqlrelay/private/sqlrconnection.h
 include/sqlrelay/private/sqlrcursor.h
-include/sqlrelay/private/sqlrdefines.h
-include/sqlrelay/private/sqlrincludes.h
 include/sqlrelay/private/sqlrlistener.h
 include/sqlrelay/private/sqlrserverconnection.h
 include/sqlrelay/private/sqlrservercontroller.h
 include/sqlrelay/private/sqlrservercursor.h
-include/sqlrelay/private/sqlrserverdll.h
 include/sqlrelay/private/sqlrserverincludes.h
 include/sqlrelay/private/sqlrshmdata.h
-include/sqlrelay/private/sqlrutildll.h
-include/sqlrelay/private/wrapperdll.h
+include/sqlrelay/private/sqlrutilincludes.h
 include/sqlrelay/sqlrclient.h
 include/sqlrelay/sqlrclientwrapper.h
 include/sqlrelay/sqlrserver.h
 include/sqlrelay/sqlrutil.h
-lib/libmysql3${PKGNAME}.so.1
-lib/libmysql3${PKGNAME}.so.1.0.0
 lib/libmysql3sqlrelay.so
-lib/libmysql40${PKGNAME}.so.1
-lib/libmysql40${PKGNAME}.so.1.0.0
+lib/libmysql3sqlrelay.so.2
+lib/libmysql3sqlrelay.so.2.0.0
 lib/libmysql40sqlrelay.so
-lib/libmysql41${PKGNAME}.so.1
-lib/libmysql41${PKGNAME}.so.1.0.0
+lib/libmysql40sqlrelay.so.2
+lib/libmysql40sqlrelay.so.2.0.0
 lib/libmysql41sqlrelay.so
-lib/libmysql50${PKGNAME}.so.1
-lib/libmysql50${PKGNAME}.so.1.0.0
+lib/libmysql41sqlrelay.so.2
+lib/libmysql41sqlrelay.so.2.0.0
 lib/libmysql50sqlrelay.so
-lib/libmysql51${PKGNAME}.so.1
-lib/libmysql51${PKGNAME}.so.1.0.0
+lib/libmysql50sqlrelay.so.2
+lib/libmysql50sqlrelay.so.2.0.0
 lib/libmysql51sqlrelay.so
-lib/libpq${PKGNAME}.so.1
-lib/libpq${PKGNAME}.so.1.0.0
+lib/libmysql51sqlrelay.so.2
+lib/libmysql51sqlrelay.so.2.0.0
 lib/libpqsqlrelay.so
+lib/libpqsqlrelay.so.2
+lib/libpqsqlrelay.so.2.0.0
 lib/libsqlrclient.la
 lib/libsqlrclientwrapper.la
 lib/libsqlrserver.la
@@ -63,9 +54,12 @@ lib/libsqlrutil.la
 lib/pkgconfig/sqlrelay-c++.pc
 lib/pkgconfig/sqlrelay-c.pc
 libexec/sqlrelay/sqlrauth_database.${SOEXT}
+libexec/sqlrelay/sqlrauth_krb_userlist.${SOEXT}
+libexec/sqlrelay/sqlrauth_proxied.${SOEXT}
 libexec/sqlrelay/sqlrauth_sqlrelay.${SOEXT}
+libexec/sqlrelay/sqlrauth_tls_userlist.${SOEXT}
 libexec/sqlrelay/sqlrauth_userlist.${SOEXT}
-libexec/sqlrelay/sqlrconfig_xml.${SOEXT}
+libexec/sqlrelay/sqlrconfig_xmldom.${SOEXT}
 libexec/sqlrelay/sqlrconnection_router.${SOEXT}
 libexec/sqlrelay/sqlrfilter_patterns.${SOEXT}
 libexec/sqlrelay/sqlrfilter_regex.${SOEXT}
@@ -83,24 +77,28 @@ libexec/sqlrelay/sqlrquery_sqlrcmdcstat.${SOEXT}
 libexec/sqlrelay/sqlrquery_sqlrcmdgstat.${SOEXT}
 libexec/sqlrelay/sqlrresultsettranslation_reformatdatetime.${SOEXT}
 libexec/sqlrelay/sqlrtranslation_normalize.${SOEXT}
-man/man1/sqlr-fields.1
-man/man1/sqlr-query.1
+man/man1/sqlr-export.1
+man/man1/sqlr-import.1
 man/man1/sqlrsh.1
 man/man8/sqlr-cachemanager.8
 man/man8/sqlr-connection.8
 man/man8/sqlr-listener.8
+man/man8/sqlr-pwdenc.8
 man/man8/sqlr-scaler.8
 man/man8/sqlr-start.8
+man/man8/sqlr-status.8
 man/man8/sqlr-stop.8
 share/doc/sqlrelay/admin/configguide.html
 share/doc/sqlrelay/admin/configreference.html
 share/doc/sqlrelay/admin/installing.html
-share/doc/sqlrelay/admin/loadbalfailover.html
 share/doc/sqlrelay/admin/oraclentier.html
+share/doc/sqlrelay/admin/prerequisites.html
 share/doc/sqlrelay/admin/router.html
 share/doc/sqlrelay/admin/running.html
 share/doc/sqlrelay/admin/tuning.html
 share/doc/sqlrelay/api/ado.net/html/annotated.html
+share/doc/sqlrelay/api/ado.net/html/arrowdown.png
+share/doc/sqlrelay/api/ado.net/html/arrowright.png
 share/doc/sqlrelay/api/ado.net/html/bc_s.png
 share/doc/sqlrelay/api/ado.net/html/bdwn.png
 share/doc/sqlrelay/api/ado.net/html/class_s_q_l_r_client_1_1_s_q_l_relay_command-members.html
@@ -129,9 +127,12 @@ share/doc/sqlrelay/api/ado.net/html/dir_68267d1309a1af8e8297ef4c3efbcdba.html
 share/doc/sqlrelay/api/ado.net/html/dir_c80a175e0fe38d5268efa0e9cdea41f9.html
 share/doc/sqlrelay/api/ado.net/html/dir_da61e3e9a357748887e3ca8d7c5a0c16.html
 share/doc/sqlrelay/api/ado.net/html/dir_dc5893416c2ccfb32b121666cb6e0b59.html
+share/doc/sqlrelay/api/ado.net/html/doc.png
 share/doc/sqlrelay/api/ado.net/html/doxygen.css
 share/doc/sqlrelay/api/ado.net/html/doxygen.png
 share/doc/sqlrelay/api/ado.net/html/dynsections.js
+share/doc/sqlrelay/api/ado.net/html/folderclosed.png
+share/doc/sqlrelay/api/ado.net/html/folderopen.png
 share/doc/sqlrelay/api/ado.net/html/ftv2blank.png
 share/doc/sqlrelay/api/ado.net/html/ftv2cl.png
 share/doc/sqlrelay/api/ado.net/html/ftv2doc.png
@@ -159,6 +160,7 @@ share/doc/sqlrelay/api/ado.net/html/nav_f.png
 share/doc/sqlrelay/api/ado.net/html/nav_g.png
 share/doc/sqlrelay/api/ado.net/html/nav_h.png
 share/doc/sqlrelay/api/ado.net/html/open.png
+share/doc/sqlrelay/api/ado.net/html/splitbar.png
 share/doc/sqlrelay/api/ado.net/html/sync_off.png
 share/doc/sqlrelay/api/ado.net/html/sync_on.png
 share/doc/sqlrelay/api/ado.net/html/tab_a.png
@@ -167,6 +169,8 @@ share/doc/sqlrelay/api/ado.net/html/tab_h.png
 share/doc/sqlrelay/api/ado.net/html/tab_s.png
 share/doc/sqlrelay/api/ado.net/html/tabs.css
 share/doc/sqlrelay/api/c++/html/annotated.html
+share/doc/sqlrelay/api/c++/html/arrowdown.png
+share/doc/sqlrelay/api/c++/html/arrowright.png
 share/doc/sqlrelay/api/c++/html/bc_s.png
 share/doc/sqlrelay/api/c++/html/bdwn.png
 share/doc/sqlrelay/api/c++/html/classes.html
@@ -180,10 +184,14 @@ share/doc/sqlrelay/api/c++/html/dir_0912e6c65b091fa41da70873249342a4.html
 share/doc/sqlrelay/api/c++/html/dir_440cbb352fefbdb83d89768c287ae784.html
 share/doc/sqlrelay/api/c++/html/dir_68267d1309a1af8e8297ef4c3efbcdba.html
 share/doc/sqlrelay/api/c++/html/dir_da61e3e9a357748887e3ca8d7c5a0c16.html
+share/doc/sqlrelay/api/c++/html/dir_df9c11e719b8a1decaf23932e3bc215f.html
+share/doc/sqlrelay/api/c++/html/doc.png
 share/doc/sqlrelay/api/c++/html/doxygen.css
 share/doc/sqlrelay/api/c++/html/doxygen.png
 share/doc/sqlrelay/api/c++/html/dynsections.js
 share/doc/sqlrelay/api/c++/html/files.html
+share/doc/sqlrelay/api/c++/html/folderclosed.png
+share/doc/sqlrelay/api/c++/html/folderopen.png
 share/doc/sqlrelay/api/c++/html/ftv2blank.png
 share/doc/sqlrelay/api/c++/html/ftv2cl.png
 share/doc/sqlrelay/api/c++/html/ftv2doc.png
@@ -208,6 +216,7 @@ share/doc/sqlrelay/api/c++/html/nav_f.png
 share/doc/sqlrelay/api/c++/html/nav_g.png
 share/doc/sqlrelay/api/c++/html/nav_h.png
 share/doc/sqlrelay/api/c++/html/open.png
+share/doc/sqlrelay/api/c++/html/splitbar.png
 share/doc/sqlrelay/api/c++/html/sqlrclient_8h_source.html
 share/doc/sqlrelay/api/c++/html/sync_off.png
 share/doc/sqlrelay/api/c++/html/sync_on.png
@@ -216,19 +225,26 @@ share/doc/sqlrelay/api/c++/html/tab_b.png
 share/doc/sqlrelay/api/c++/html/tab_h.png
 share/doc/sqlrelay/api/c++/html/tab_s.png
 share/doc/sqlrelay/api/c++/html/tabs.css
+share/doc/sqlrelay/api/c/html/arrowdown.png
+share/doc/sqlrelay/api/c/html/arrowright.png
 share/doc/sqlrelay/api/c/html/bc_s.png
 share/doc/sqlrelay/api/c/html/bdwn.png
 share/doc/sqlrelay/api/c/html/closed.png
 share/doc/sqlrelay/api/c/html/dir_364b2640bd7349a10e593fb505dc3717.html
 share/doc/sqlrelay/api/c/html/dir_68267d1309a1af8e8297ef4c3efbcdba.html
+share/doc/sqlrelay/api/c/html/dir_759bf2703135d3cee912a827a7fe4121.html
 share/doc/sqlrelay/api/c/html/dir_7bb915b94a9886845d4043db4913a3c0.html
 share/doc/sqlrelay/api/c/html/dir_b9c8ab2e387146131f9b9e79af70de42.html
 share/doc/sqlrelay/api/c/html/dir_da61e3e9a357748887e3ca8d7c5a0c16.html
 share/doc/sqlrelay/api/c/html/dir_e8d73255ec7feed8fb64227e7a4ab864.html
+share/doc/sqlrelay/api/c/html/dir_faf22fd1ab495b8361a309ea8c224c7c.html
+share/doc/sqlrelay/api/c/html/doc.png
 share/doc/sqlrelay/api/c/html/doxygen.css
 share/doc/sqlrelay/api/c/html/doxygen.png
 share/doc/sqlrelay/api/c/html/dynsections.js
 share/doc/sqlrelay/api/c/html/files.html
+share/doc/sqlrelay/api/c/html/folderclosed.png
+share/doc/sqlrelay/api/c/html/folderopen.png
 share/doc/sqlrelay/api/c/html/ftv2blank.png
 share/doc/sqlrelay/api/c/html/ftv2cl.png
 share/doc/sqlrelay/api/c/html/ftv2doc.png
@@ -254,7 +270,9 @@ share/doc/sqlrelay/api/c/html/nav_g.png
 share/doc/sqlrelay/api/c/html/nav_h.png
 share/doc/sqlrelay/api/c/html/open.png
 share/doc/sqlrelay/api/c/html/private_2sqlrclientwrapper_8h_source.html
+share/doc/sqlrelay/api/c/html/splitbar.png
 share/doc/sqlrelay/api/c/html/sqlrclientwrapper_8h_source.html
+share/doc/sqlrelay/api/c/html/sqlrclientwrapperincludes_8h_source.html
 share/doc/sqlrelay/api/c/html/sync_off.png
 share/doc/sqlrelay/api/c/html/sync_on.png
 share/doc/sqlrelay/api/c/html/tab_a.png
@@ -264,6 +282,8 @@ share/doc/sqlrelay/api/c/html/tab_s.png
 share/doc/sqlrelay/api/c/html/tabs.css
 share/doc/sqlrelay/api/c/html/wrapperdll_8h_source.html
 share/doc/sqlrelay/api/cs/html/annotated.html
+share/doc/sqlrelay/api/cs/html/arrowdown.png
+share/doc/sqlrelay/api/cs/html/arrowright.png
 share/doc/sqlrelay/api/cs/html/bc_s.png
 share/doc/sqlrelay/api/cs/html/bdwn.png
 share/doc/sqlrelay/api/cs/html/class_s_q_l_r_client_1_1_s_q_l_r_connection-members.html
@@ -276,9 +296,12 @@ share/doc/sqlrelay/api/cs/html/dir_68267d1309a1af8e8297ef4c3efbcdba.html
 share/doc/sqlrelay/api/cs/html/dir_c80a175e0fe38d5268efa0e9cdea41f9.html
 share/doc/sqlrelay/api/cs/html/dir_da61e3e9a357748887e3ca8d7c5a0c16.html
 share/doc/sqlrelay/api/cs/html/dir_dc5893416c2ccfb32b121666cb6e0b59.html
+share/doc/sqlrelay/api/cs/html/doc.png
 share/doc/sqlrelay/api/cs/html/doxygen.css
 share/doc/sqlrelay/api/cs/html/doxygen.png
 share/doc/sqlrelay/api/cs/html/dynsections.js
+share/doc/sqlrelay/api/cs/html/folderclosed.png
+share/doc/sqlrelay/api/cs/html/folderopen.png
 share/doc/sqlrelay/api/cs/html/ftv2blank.png
 share/doc/sqlrelay/api/cs/html/ftv2cl.png
 share/doc/sqlrelay/api/cs/html/ftv2doc.png
@@ -305,6 +328,7 @@ share/doc/sqlrelay/api/cs/html/nav_f.png
 share/doc/sqlrelay/api/cs/html/nav_g.png
 share/doc/sqlrelay/api/cs/html/nav_h.png
 share/doc/sqlrelay/api/cs/html/open.png
+share/doc/sqlrelay/api/cs/html/splitbar.png
 share/doc/sqlrelay/api/cs/html/sync_off.png
 share/doc/sqlrelay/api/cs/html/sync_on.png
 share/doc/sqlrelay/api/cs/html/tab_a.png
@@ -571,8 +595,8 @@ share/doc/sqlrelay/features/connectionpooling.html
 share/doc/sqlrelay/features/databases.html
 share/doc/sqlrelay/features/dbabstractionlayers.html
 share/doc/sqlrelay/features/dropinreplacementlibs.html
+share/doc/sqlrelay/features/ha.html
 share/doc/sqlrelay/features/languages.html
-share/doc/sqlrelay/features/loadbalancing.html
 share/doc/sqlrelay/features/multirowfetches.html
 share/doc/sqlrelay/features/proxying.html
 share/doc/sqlrelay/features/queryfiltering.html
@@ -604,6 +628,7 @@ share/doc/sqlrelay/images/i386-linux-uclibc-thumb.png
 share/doc/sqlrelay/images/i386-linux-uclibc.png
 share/doc/sqlrelay/images/ibm.png
 share/doc/sqlrelay/images/iodbc.png
+share/doc/sqlrelay/images/loadbalancer.png
 share/doc/sqlrelay/images/mdbtools.png
 share/doc/sqlrelay/images/minix-thumb.png
 share/doc/sqlrelay/images/minix.png
@@ -633,6 +658,8 @@ share/doc/sqlrelay/images/redhat62-sparc-thumb.png
 share/doc/sqlrelay/images/redhat62-sparc.png
 share/doc/sqlrelay/images/replicated-disproportionate.png
 share/doc/sqlrelay/images/replicated.png
+share/doc/sqlrelay/images/router.png
+share/doc/sqlrelay/images/rrdns.png
 share/doc/sqlrelay/images/sco-osr6-i386-thumb.png
 share/doc/sqlrelay/images/sco-osr6-i386.png
 share/doc/sqlrelay/images/sqlite.png
@@ -680,7 +707,6 @@ share/doc/sqlrelay/programming/tcl.html
 share/examples/sqlrelay/sample-mssqlserver-mysql-errors.map
 share/examples/sqlrelay/sample-oracle-mysql-errors.map
 share/examples/sqlrelay/sqlrelay.conf
-share/examples/sqlrelay/sqlrelay.conf.example
-share/examples/sqlrelay/sqlrelay.dtd
 share/examples/sqlrelay/sqlrelay.xsd
 share/licenses/sqlrelay/COPYING
+@pkgdir share/examples/sqlrelay/sqlrelay.conf.d
diff --git a/databases/sqlrelay/buildlink3.mk b/databases/sqlrelay/buildlink3.mk
index f15151def44..649c729f0d1 100644
--- a/databases/sqlrelay/buildlink3.mk
+++ b/databases/sqlrelay/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2016/03/05 11:27:44 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2016/07/01 17:02:39 fhajny Exp $
 
 BUILDLINK_TREE+=	sqlrelay
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	sqlrelay
 SQLRELAY_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.sqlrelay+=	sqlrelay>=0.43
-BUILDLINK_ABI_DEPENDS.sqlrelay?=		sqlrelay>=0.64nb1
+BUILDLINK_ABI_DEPENDS.sqlrelay+=	sqlrelay>=0.65
 BUILDLINK_PKGSRCDIR.sqlrelay?=		../../databases/sqlrelay
 
 .include "../../devel/rudiments/buildlink3.mk"
diff --git a/databases/sqlrelay/distinfo b/databases/sqlrelay/distinfo
index f120eb09dca..bf11aa4cec5 100644
--- a/databases/sqlrelay/distinfo
+++ b/databases/sqlrelay/distinfo
@@ -1,15 +1,14 @@
-$NetBSD: distinfo,v 1.19 2015/11/10 10:10:39 fhajny Exp $
+$NetBSD: distinfo,v 1.20 2016/07/01 17:02:39 fhajny Exp $
 
-SHA1 (sqlrelay-0.64.tar.gz) = d285957f9e170186774b8e2ab9d58913b7785831
-RMD160 (sqlrelay-0.64.tar.gz) = 85eb9ee66cf78bcd94d63b951233f1b29e738c01
-SHA512 (sqlrelay-0.64.tar.gz) = 43fda7954b595d580126ab94207c056a0d284666cfa73691ce0fa9606f5c49c7d53ab7fc69bee51257d1f2d0d4c422e93de5568a663b97834a325b4d571b8694
-Size (sqlrelay-0.64.tar.gz) = 3450843 bytes
+SHA1 (sqlrelay-0.65.0.tar.gz) = 7649fc14a95009ffaeb56f12abe70e526c4eb099
+RMD160 (sqlrelay-0.65.0.tar.gz) = f83b9372da1283bd35f62761c522c0cdd25dd536
+SHA512 (sqlrelay-0.65.0.tar.gz) = 7d5d18dbfd7b0c4bb39466489726c2d401b08e2c63af13c9bfb75f9c6839b7ac86caf3d03e3152cb73cf86d03b2de2f5880b41c40ffb5ef6c357886fb2aedcf7
+Size (sqlrelay-0.65.0.tar.gz) = 3970412 bytes
 SHA1 (patch-ad) = cc4a94941ec737abede98bdd7b19bc902f755609
-SHA1 (patch-config.mk.in) = 297ac15bc1d59bdff7236107df8b5ad7b03737e5
+SHA1 (patch-config.mk.in) = 22e8459f49e20529289e1a99b10cebaa449af0c0
 SHA1 (patch-configure) = 29bc9087fc814d0879c99b2772632a3034bec502
-SHA1 (patch-etc_Makefile) = 128102a3eaaeba96425060f82dc8e5e94edeabd0
-SHA1 (patch-src_api_nodejs_sqlrelay.cpp) = 61ae166cbb384d32dd1d2c500cce82e54a228c05
-SHA1 (patch-src_api_php_sql__relay.cpp) = d589837f05e86d614bc3b71bc0459ae786193d88
+SHA1 (patch-etc_Makefile) = 28e9cac18314f1fc725603d47cb92ec6e54d7c63
+SHA1 (patch-src_api_php_sql__relay.cpp) = 9e33260f4e4331874187e5b30db17d4478710385
 SHA1 (patch-src_api_ruby_getcflags.rb) = 033e26ef03db4851f493d831c37ec947662d47ee
 SHA1 (patch-src_api_ruby_getsitearchdir.rb) = 603c66ed45f854b833eefbcdbd58e41465fb8120
 SHA1 (patch-src_loggers_custom__sc.cpp) = 79e2b0a54b151e76175f549747e3392accd0b4d9
diff --git a/databases/sqlrelay/patches/patch-config.mk.in b/databases/sqlrelay/patches/patch-config.mk.in
index 7e3126e2d38..158d987fafe 100644
--- a/databases/sqlrelay/patches/patch-config.mk.in
+++ b/databases/sqlrelay/patches/patch-config.mk.in
@@ -1,13 +1,14 @@
-$NetBSD: patch-config.mk.in,v 1.2 2015/09/02 12:39:33 fhajny Exp $
+$NetBSD: patch-config.mk.in,v 1.3 2016/07/01 17:02:39 fhajny Exp $
 
---- config.mk.in.orig	2015-08-24 07:39:39.000000000 +0000
+We install init scripts ourselves.
+--- config.mk.in.orig	2016-03-24 00:59:48.000000000 +0000
 +++ config.mk.in
-@@ -861,7 +861,7 @@ MODULERENAME = $(top_builddir)/moduleren
+@@ -921,7 +921,7 @@ MODULERENAME = $(top_builddir)/moduleren
  
  
  # build directories
--INSTALLSUBDIRS = install-src install-bin install-etc install-init install-man install-doc install-license install-pkgconfig
-+INSTALLSUBDIRS = install-src install-bin install-etc install-man install-doc install-license install-pkgconfig
- UNINSTALLSUBDIRS = uninstall-src uninstall-bin uninstall-etc uninstall-init uninstall-man uninstall-doc uninstall-license uninstall-pkgconfig
- 
- ifeq ($(SQLRELAY_ENABLE_SHARED),yes)
+-INSTALLSUBDIRS = install-src install-bin install-etc install-init install-license
++INSTALLSUBDIRS = install-src install-bin install-etc install-license
+ ifeq ($(ENABLE_CPP),yes)
+ INSTALLSUBDIRS += install-pkgconfig
+ endif
diff --git a/databases/sqlrelay/patches/patch-etc_Makefile b/databases/sqlrelay/patches/patch-etc_Makefile
index 7f0049ddcd0..272ea38de13 100644
--- a/databases/sqlrelay/patches/patch-etc_Makefile
+++ b/databases/sqlrelay/patches/patch-etc_Makefile
@@ -1,24 +1,16 @@
-$NetBSD: patch-etc_Makefile,v 1.2 2015/05/20 13:26:45 ryoon Exp $
+$NetBSD: patch-etc_Makefile,v 1.3 2016/07/01 17:02:39 fhajny Exp $
 
 Install config file examples properly.
---- etc/Makefile.orig	2015-03-16 04:08:11.000000000 +0000
+--- etc/Makefile.orig	2016-01-28 19:28:21.000000000 +0000
 +++ etc/Makefile
-@@ -5,12 +5,12 @@ include ../config.mk
- install:
- 	$(MKINSTALLDIRS) $(sysconfdir)
- 	$(MKINSTALLDIRS) $(sysconfdir)/sqlrelay.conf.d
--	$(CP) sqlrelay.conf.example $(sysconfdir)
--	$(CHMOD) 644 $(sysconfdir)/sqlrelay.conf.example
--	$(CP) sqlrelay.dtd $(sysconfdir)
--	$(CHMOD) 644 $(sysconfdir)/sqlrelay.dtd
--	$(CP) sqlrelay.xsd $(sysconfdir)
--	$(CHMOD) 644 $(sysconfdir)/sqlrelay.xsd
-+	$(CP) sqlrelay.conf.example $(EXAMPLEDIR)
-+	$(CHMOD) 644 $(EXAMPLEDIR)/sqlrelay.conf.example
-+	$(CP) sqlrelay.dtd $(EXAMPLEDIR)
-+	$(CHMOD) 644 $(EXAMPLEDIR)/sqlrelay.dtd
-+	$(CP) sqlrelay.xsd $(EXAMPLEDIR)
-+	$(CHMOD) 644 $(EXAMPLEDIR)/sqlrelay.xsd
- 	$(CP) sqlrelay.conf.example $(EXAMPLEDIR)/sqlrelay.conf
- 	$(CHMOD) 644 $(EXAMPLEDIR)/sqlrelay.conf
+@@ -3,8 +3,8 @@ top_builddir = ..
+ include ../config.mk
  
+ install:
+-	$(MKINSTALLDIRS) $(sysconfdir)/$(SQLRELAY).conf.d
+-	$(CP) sqlrelay.xsd $(sysconfdir)/$(SQLRELAY).xsd
++	$(MKINSTALLDIRS) $(EXAMPLEDIR)/$(SQLRELAY).conf.d
++	$(CP) sqlrelay.xsd $(EXAMPLEDIR)/$(SQLRELAY).xsd
+ 	$(MKINSTALLDIRS) $(EXAMPLEDIR)
+ 	$(CP) sqlrelay.conf $(EXAMPLEDIR)/$(SQLRELAY).conf
+ 	$(CHMOD) 644 $(EXAMPLEDIR)/$(SQLRELAY).conf
diff --git a/databases/sqlrelay/patches/patch-src_api_nodejs_sqlrelay.cpp b/databases/sqlrelay/patches/patch-src_api_nodejs_sqlrelay.cpp
deleted file mode 100644
index 327c6975335..00000000000
--- a/databases/sqlrelay/patches/patch-src_api_nodejs_sqlrelay.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-src_api_nodejs_sqlrelay.cpp,v 1.1 2015/09/21 17:46:36 fhajny Exp $
-
-Add support for nodejs>=4.0.0.
-
---- src/api/nodejs/sqlrelay.cpp.orig	2015-07-05 02:55:20.000000000 +0000
-+++ src/api/nodejs/sqlrelay.cpp
-@@ -13,7 +13,7 @@ using namespace v8;
- using namespace node;
- 
- // macros to deal with differences between major versions of node.js
--#if NODE_MINOR_VERSION >= 12
-+#if NODE_MAJOR_VERSION >= 4 || ( NODE_MAJOR_VERSION < 1 && NODE_MINOR_VERSION >= 12 )
- 
- 	#define RET void
- 	#define ARGS FunctionCallbackInfo<Value>
-@@ -84,7 +84,7 @@ using namespace node;
- #define toString(arg) ((arg->IsNull())?NULL:*(String::Utf8Value(arg)))
- #define toArray(arg) Handle<Array>::Cast(arg);
- 
--#if NODE_MINOR_VERSION >= 12
-+#if NODE_MAJOR_VERSION >= 4 || ( NODE_MAJOR_VERSION < 1 && NODE_MINOR_VERSION >= 12 )
- 	#define throwWrongNumberOfArguments() isolate->ThrowException(Exception::TypeError(newString("Wrong number of arguments")))
- 	#define throwInvalidArgumentType() isolate->ThrowException(Exception::TypeError(newString("Invalid argument type")))
- #else
diff --git a/databases/sqlrelay/patches/patch-src_api_php_sql__relay.cpp b/databases/sqlrelay/patches/patch-src_api_php_sql__relay.cpp
index d05d4dba139..48f3acf8c4f 100644
--- a/databases/sqlrelay/patches/patch-src_api_php_sql__relay.cpp
+++ b/databases/sqlrelay/patches/patch-src_api_php_sql__relay.cpp
@@ -1,13 +1,23 @@
-$NetBSD: patch-src_api_php_sql__relay.cpp,v 1.3 2015/07/05 12:52:39 joerg Exp $
+$NetBSD: patch-src_api_php_sql__relay.cpp,v 1.4 2016/07/01 17:02:39 fhajny Exp $
 
---- src/api/php/sql_relay.cpp.orig	2015-07-05 10:40:12.000000000 +0000
+--- src/api/php/sql_relay.cpp.orig	2016-03-13 19:20:25.000000000 +0000
 +++ src/api/php/sql_relay.cpp
-@@ -16,29 +16,7 @@
+@@ -24,39 +24,15 @@
  	#define ZTS 1
  #endif
  
 -extern "C" {
 -	#ifndef WIN32
+-
+-		// On some platforms (solaris), stdio.h must be included prior
+-		// to including math.h or FILE will get redefined.
+-		#include <stdio.h>
+-
+-		// php.h ultimately includes math.h and on some platforms,
+-		// __cplusplus to be defined when including it.  Manually
+-		// including it prior to including php.h solves this problem.
+-		#include <math.h>
+-
 -		#ifdef __cplusplus
 -			#undef __cplusplus
 -			#define cpluspluswasdefined
@@ -29,6 +39,14 @@ $NetBSD: patch-src_api_php_sql__relay.cpp,v 1.3 2015/07/05 12:52:39 joerg Exp $
 -		#endif
 -	#endif
 -}
++// On some platforms (solaris), stdio.h must be included prior
++// to including math.h or FILE will get redefined.
++#include <stdio.h>
++
++// php.h ultimately includes math.h and on some platforms,
++// __cplusplus to be defined when including it.  Manually
++// including it prior to including php.h solves this problem.
++#include <math.h>
 +#include <php.h>
  
  #include <config.h>