CVS commit: pkgsrc/databases

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/databases
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Tue, 16 Feb 2021 13:12:40 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Tue Feb 16 13:12:40 UTC 2021

Modified Files:
        pkgsrc/databases/p5-sqlrelay: Makefile
        pkgsrc/databases/php-sqlrelay: Makefile
        pkgsrc/databases/py-sqlrelay: Makefile
        pkgsrc/databases/ruby-sqlrelay: Makefile
        pkgsrc/databases/sqlrelay: Makefile Makefile.common PLIST distinfo
        pkgsrc/databases/sqlrelay-freetds: Makefile
        pkgsrc/databases/sqlrelay-mysql: Makefile
        pkgsrc/databases/sqlrelay-nodejs: Makefile
        pkgsrc/databases/sqlrelay-odbc: Makefile
        pkgsrc/databases/sqlrelay-pgsql: Makefile
        pkgsrc/databases/sqlrelay-sqlite: Makefile
        pkgsrc/databases/sqlrelay/patches: patch-config.mk.in patch-configure
            patch-etc_Makefile patch-src_api_nodejs_Makefile
Added Files:
        pkgsrc/databases/sqlrelay/patches: patch-Makefile
Removed Files:
        pkgsrc/databases/sqlrelay/patches: patch-ad

Log Message:
sqlrelay: updated to 1.8.0

SQL Relay 1.8.0

This release mainly lays the groundwork for some future features, including a generic import/export framework. Some notable progress was also made on the JDBC driver, though it's still not finished. 
The most significant (finshed) new feature is an aes128 password encryption module.

There are some bugfixes as well. A long-standing issue with postgresql that could cause results from multiple open cursors to get confused has been resolved. A subtle error that could cause counting 
of bind variables on the client-side to hang has been fixed. A long-standing, but apparently obscure, issue that could cause tables from other MySQL schemas to be included in a "show tables" command 
has been fixed. As well as various other issues.

Full ChangeLog follows:

unattended tests
added sqlrresultsetdomnode class to c++ client API
fixed datedelimiters parameter
added support for SQLParamOptions with SQLUINTEGER arguments
sqlr-import detects uppercase .CSV suffix now
fixed a csv number-detection but in sqlr-import
fixed a delete[] of a const in sqlr-import
it's possible to specify a commitcount of 0 with sqlr-import now
moved sqlrimportxml/csv classes into libsqlrclient
moved sqlrexportxml/csv classes into libsqlrclient
csv import/export is consistent now
added some event methods to sqlrexport
migrated parsedatetime functions to rudiments datetime class
different postgresql cursors use different stmtNames now
sqlrimportcsv can create a primary key that's not in the CSV now
sqlrexportcsv quotes 12+ digit numbers now
fixed subtle, count-related issues when validating bind variables on the client side, that could cause a hang
added an aes128 pwdenc module
applied a patch to fix a crash in the debug logger (missing "%s")
added a tweak to getsitearchdir.rb to fix incorrect lib/lib64 reporting on some centos x64 systems
fixed mysql getColumnList to distinquish proper db/schema

SQL Relay 1.7.0

This release adds 2 significant features: support for the PostgreSQL client-server protocol, and a "replay" module to help automatically recover from deadlocks and lock-timeouts, but also has the 
usual assortment of minor bugfixes and internal changes.

Full ChangeLog follows:

added postgresql protocol module
updated postgresql connection module to get column info pre-execute
fixed postgresql connection module type oid bug
added tag filter/moduledata
added moduledata(s)::closeResultSet()/endTransaction()/endSession()
mysql protocol returns empty lobs correctly now (not as nulls)
configure replaces -lfbclient with -lgds on freebsd/firebird-2.0.3
fixed a bug that could cause sqlr-stop to try to kill pid 0
fixed unixodbc detection on solaris 11.4
added configure test for PQdescribePrepared
test improvements
documentation improvements
split sqlrelay-crash directive into its own module
deprecated drop-in replacement libraries in favor of protocol support
fixed various mysql 4.x bugs
sqlr-status creates statistics on heap now instead of stack, to work on platforms with a small default ulimit stack
mysql stored procedure test is bypassed for older mysql
tls test is bypassed for older openssl
added NULL handoff socket workaround
improved shutdown/crash handlers for sqlr-listener/connection
fixed hang when more-than-one address was specified in the instance:addresses attribute
*_null used instead of *_unset on PHP 7.4

SQL Relay 1.6.0

This release mainly addresses some recently discovered regressions, but also adds some internal features that required the minor version to be bumped.

ChangeLog follows:

added begin, commit, rollback events
fixed array_init() calls for php-7.3
integrated my_bool fix for mysql 8.0.1+
mysql sslmode=require/prefer + bad sslca/sslcapath generates warning rather than error now (like the mysql cli)
refactored various routines that parse bind variables out of queries
added bindvariabledelimiters config option to define supported bind variable delimiters
added fakeinputbindvariablesunicodestrings config option
added bind variable delimiters config methods to c++ api
replay trigger can now run a query (eg. "show engine innodb status") and log the reslits to a file when a replay condition occurs
replay trigger doesn't log/replay selects by defalit now (but this is configurable)
updated normalize translation to support queries containing binary data
fixed a backslash-escape bug in the normalize translation
refactored some sqlrclient api private methods
refactored various bind-manipliation/detection methods
sqlr-listener creates tmpdir now on start, if it doesn't exist (because this is often in /run, which is often a tmpfs)
postgresql connection modlie forces re-fetch of column data after execute now
everything uses charstring::isYes/isNo now, instead of direct comparisons against "yes" or "no"
fixed subtle sqlexecdirect bug
fixed subtle sqlserver max-varchar bind length bug
fixed various subtle sqlserver bugs where column-info isn't valid until after execute
odbc connection modlie sets column precision = column length if column precision = -1
when using odbc on front and back end, the object type works in SQLTables now
reslit set translations work with "show databases/tables/etc." queries with an ODBC backend now
increased oid buffer sizes in postgresql connection
fixed typemangling->tablemangling typo in postgresql connection - tablemangling sholid work without typemangling now
fixed a '...\\''...' parsing bug
non-odbc connection modlies now return odbc-compatible(ish) table lists
client info is no longer reset during endSession
fixed a bug that colid cause sqlite "show tables like '...'" to crash
fixed odbc unicode nlil user/password bug
fixed PyString_AsString for python 3.<3
fixed bug that caused some MSSQL lobs to sometimes be returned as nlils when using ODBC on the backend
fixed bug that caused some MSSQL date fields to get returned as garbage
fixed a few older sqlrclient compatibility bugs
fixed SQLFetch parameter type mismatch in ODBC api
removed a non-c++17-compliant "register" from custom_nw logger
added support for nodejs 12
SQLDriverConnect can take an inline DSN now
fixed odbc maxcolumncount=-1 crash
odbc, db2, and informix set bind format error now


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 pkgsrc/databases/p5-sqlrelay/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/databases/php-sqlrelay/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/databases/py-sqlrelay/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/databases/ruby-sqlrelay/Makefile
cvs rdiff -u -r1.69 -r1.70 pkgsrc/databases/sqlrelay/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/databases/sqlrelay/Makefile.common
cvs rdiff -u -r1.19 -r1.20 pkgsrc/databases/sqlrelay/PLIST
cvs rdiff -u -r1.25 -r1.26 pkgsrc/databases/sqlrelay/distinfo
cvs rdiff -u -r1.29 -r1.30 pkgsrc/databases/sqlrelay-freetds/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/databases/sqlrelay-mysql/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/databases/sqlrelay-nodejs/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/databases/sqlrelay-odbc/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/databases/sqlrelay-pgsql/Makefile
cvs rdiff -u -r1.39 -r1.40 pkgsrc/databases/sqlrelay-sqlite/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/databases/sqlrelay/patches/patch-Makefile
cvs rdiff -u -r1.4 -r0 pkgsrc/databases/sqlrelay/patches/patch-ad
cvs rdiff -u -r1.3 -r1.4 pkgsrc/databases/sqlrelay/patches/patch-config.mk.in \
    pkgsrc/databases/sqlrelay/patches/patch-etc_Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/databases/sqlrelay/patches/patch-configure
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/databases/sqlrelay/patches/patch-src_api_nodejs_Makefile

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

Modified files:

Index: pkgsrc/databases/p5-sqlrelay/Makefile
diff -u pkgsrc/databases/p5-sqlrelay/Makefile:1.31 pkgsrc/databases/p5-sqlrelay/Makefile:1.32
--- pkgsrc/databases/p5-sqlrelay/Makefile:1.31  Mon Aug 31 18:07:08 2020
+++ pkgsrc/databases/p5-sqlrelay/Makefile       Tue Feb 16 13:12:38 2021
@@ -1,18 +1,20 @@
-# $NetBSD: Makefile,v 1.31 2020/08/31 18:07:08 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2021/02/16 13:12:38 adam Exp $
 
-PKGNAME=               p5-${DISTNAME}
-PKGREVISION=           18
-COMMENT=               Perl module for SQL Relay
+PKGNAME=       p5-${DISTNAME}
+COMMENT=       Perl module for SQL Relay
 
 .include "../../databases/sqlrelay/Makefile.common"
 
-LICENSE=               artistic
+LICENSE=       artistic
 
 USE_TOOLS+=            perl
 
+CONFIGURE_ARGS+=       --with-perl-install-man3-dir=${PERL5_INSTALLVENDORMAN3DIR}
+CONFIGURE_ARGS+=       --with-perl-prefix=${BUILDLINK_PREFIX.perl}
 CONFIGURE_ARGS+=       --with-perl-site-arch=${PERL5_INSTALLVENDORARCH}
 CONFIGURE_ARGS+=       --with-perl-site-lib=${PERL5_INSTALLVENDORLIB}
-CONFIGURE_ARGS+=       --with-perl-install-man3-dir=${PERL5_INSTALLVENDORMAN3DIR}
+
+LIBS+=         -lperl
 
 BUILD_DIRS=            src/api/perl
 

Index: pkgsrc/databases/php-sqlrelay/Makefile
diff -u pkgsrc/databases/php-sqlrelay/Makefile:1.28 pkgsrc/databases/php-sqlrelay/Makefile:1.29
--- pkgsrc/databases/php-sqlrelay/Makefile:1.28 Sun Jan  3 15:26:11 2021
+++ pkgsrc/databases/php-sqlrelay/Makefile      Tue Feb 16 13:12:39 2021
@@ -1,18 +1,18 @@
-# $NetBSD: Makefile,v 1.28 2021/01/03 15:26:11 taca Exp $
+# $NetBSD: Makefile,v 1.29 2021/02/16 13:12:39 adam Exp $
 
-PKGNAME=               ${PHP_PKG_PREFIX}-${DISTNAME}
-PKGREVISION=           14
-COMMENT=               PHP extension for SQL Relay
-EXTRACT_SUFX=          .tar.gz
+PKGNAME=       ${PHP_PKG_PREFIX}-${DISTNAME}
+COMMENT=       PHP extension for SQL Relay
+EXTRACT_SUFX=  .tar.gz
 
 .include "../../databases/sqlrelay/Makefile.common"
 
-LICENSE=               gnu-gpl-v2 AND php
+LICENSE=       gnu-gpl-v2 AND php
 
-PHP_VERSIONS_ACCEPTED= 56 73
+PHP_VERSIONS_ACCEPTED= 56 73 74
 
 TOOLS_BROKEN+=         perl
 CONFIGURE_ARGS+=       --with-php-prefix=${BUILDLINK_PREFIX.php}
+MAKE_FLAGS+=           PHPCONFSTYLE="bogus"  # do not install .ini
 
 BUILD_DIRS=            src/api/php
 BUILD_DIRS+=           src/api/phppdo

Index: pkgsrc/databases/py-sqlrelay/Makefile
diff -u pkgsrc/databases/py-sqlrelay/Makefile:1.27 pkgsrc/databases/py-sqlrelay/Makefile:1.28
--- pkgsrc/databases/py-sqlrelay/Makefile:1.27  Mon Aug 31 18:07:14 2020
+++ pkgsrc/databases/py-sqlrelay/Makefile       Tue Feb 16 13:12:39 2021
@@ -1,27 +1,25 @@
-# $NetBSD: Makefile,v 1.27 2020/08/31 18:07:14 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2021/02/16 13:12:39 adam Exp $
 
-PKGNAME=               ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=           15
-COMMENT=               Python extension for SQL Relay
+PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
+COMMENT=       Python extension for SQL Relay
 
 .include "../../databases/sqlrelay/Makefile.common"
 
-LICENSE=               modified-bsd
+LICENSE=       modified-bsd
 
 # TODO: switch to PYTHON_VERSIONS_INCOMPATIBLE
-PYTHON_VERSIONS_ACCEPTED=      36 27 # 37 fails as of 1.0.0
+#PYTHON_VERSIONS_ACCEPTED=     37 36 27 # 37 fails as of 1.0.0
 
 .include "../../lang/python/pyversion.mk"
 
 CONFIGURE_ARGS+=       --disable-perl
 
-.if ${_PYTHON_VERSION} == 27
-CONFIGURE_ARGS+=       --disable-python3
+#.if ${_PYTHON_VERSION} == 27
+#CONFIGURE_ARGS+=      --disable-python3
+#.else
+#CONFIGURE_ARGS+=      --disable-python
+#.endif
 CONFIGURE_ARGS+=       --with-python-prefix=${PREFIX}
-.else
-CONFIGURE_ARGS+=       --disable-python
-CONFIGURE_ARGS+=       --with-python3-prefix=${PREFIX}
-.endif
 CONFIGURE_ENV+=                PYVERSSUFFIX=${PYVERSSUFFIX}
 
 BUILD_DIRS=            src/api/python

Index: pkgsrc/databases/ruby-sqlrelay/Makefile
diff -u pkgsrc/databases/ruby-sqlrelay/Makefile:1.24 pkgsrc/databases/ruby-sqlrelay/Makefile:1.25
--- pkgsrc/databases/ruby-sqlrelay/Makefile:1.24        Mon Aug 31 18:07:14 2020
+++ pkgsrc/databases/ruby-sqlrelay/Makefile     Tue Feb 16 13:12:39 2021
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.24 2020/08/31 18:07:14 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2021/02/16 13:12:39 adam Exp $
 
-COMMENT=               Ruby extension for SQL Relay
-PKGREVISION=           15
+COMMENT=       Ruby extension for SQL Relay
 
 .include "../../databases/sqlrelay/Makefile.common"
 
 CONFIGURE_ARGS+=       --disable-perl
-CONFIGURE_ARGS+=       ac_cv_prog_RUBY=${RUBY}
+CONFIGURE_ARGS+=       --with-ruby-prefix=${PREFIX}
 CONFIGURE_ARGS+=       --with-ruby-site-arch-dir=${PREFIX}/${RUBY_VENDORARCHLIB}
+CONFIGURE_ARGS+=       ac_cv_prog_RUBY=${RUBY}
 
 BUILD_DIRS=            src/api/ruby
 

Index: pkgsrc/databases/sqlrelay/Makefile
diff -u pkgsrc/databases/sqlrelay/Makefile:1.69 pkgsrc/databases/sqlrelay/Makefile:1.70
--- pkgsrc/databases/sqlrelay/Makefile:1.69     Mon Aug 31 18:07:14 2020
+++ pkgsrc/databases/sqlrelay/Makefile  Tue Feb 16 13:12:39 2021
@@ -1,18 +1,29 @@
-# $NetBSD: Makefile,v 1.69 2020/08/31 18:07:14 wiz Exp $
+# $NetBSD: Makefile,v 1.70 2021/02/16 13:12:39 adam Exp $
 
-COMMENT=               Database connection pooling middleware and API
-PKGREVISION=           17
+COMMENT=       Database connection pooling middleware and API
 
 .include "../../databases/sqlrelay/Makefile.common"
 
 .include "../../mk/bsd.prefs.mk"
 
-CONFIGURE_ARGS+=       --disable-db2 --disable-erlang --disable-firebird       \
-                       --disable-freetds --disable-java --disable-mdbtools     \
-                       --disable-mysql --disable-odbc --disable-oracle         \
-                       --disable-perl --disable-php --disable-postgresql       \
-                       --disable-python --disable-ruby --disable-sqlite        \
-                       --disable-sap --disable-tcl --disable-nodejs
+CONFIGURE_ARGS+=       --disable-db2
+CONFIGURE_ARGS+=       --disable-erlang
+CONFIGURE_ARGS+=       --disable-firebird
+CONFIGURE_ARGS+=       --disable-freetds
+CONFIGURE_ARGS+=       --disable-java
+CONFIGURE_ARGS+=       --disable-mdbtools
+CONFIGURE_ARGS+=       --disable-mysql
+CONFIGURE_ARGS+=       --disable-nodejs
+CONFIGURE_ARGS+=       --disable-odbc
+CONFIGURE_ARGS+=       --disable-oracle
+CONFIGURE_ARGS+=       --disable-perl
+CONFIGURE_ARGS+=       --disable-php
+CONFIGURE_ARGS+=       --disable-postgresql
+CONFIGURE_ARGS+=       --disable-python
+CONFIGURE_ARGS+=       --disable-ruby
+CONFIGURE_ARGS+=       --disable-sqlite
+CONFIGURE_ARGS+=       --disable-sap
+CONFIGURE_ARGS+=       --disable-tcl
 
 INSTALL_MAKE_FLAGS+=   EXAMPLEDIR=${DESTDIR}${EGDIR}
 
@@ -35,15 +46,6 @@ OWN_DIRS_PERMS+=     ${SQLR_DATA}/tmp/pids $
 OWN_DIRS_PERMS+=       ${SQLR_DATA}/tmp/sockets ${SQLR_USER} ${SQLR_GROUP} 0775
 MAKE_DIRS+=            ${PKG_SYSCONFDIR}/sqlrelay.conf.d
 
-SUBST_CLASSES+=                user
-SUBST_STAGE.user=      pre-configure
-SUBST_MESSAGE.user=    Fixing default nonprivileged user
-SUBST_FILES.user=      etc/sqlrelay.* src/common/defaults.h
-SUBST_SED.user=                -e '/runasuser/s/nobody/${SQLR_USER}/'
-SUBST_SED.user+=       -e '/runasgroup/s/nobody/${SQLR_GROUP}/'
-SUBST_SED.user+=       -e '/RUNASUSER/s/nobody/${SQLR_USER}/'
-SUBST_SED.user+=       -e '/RUNASGROUP/s/nobody/${SQLR_GROUP}/'
-
 OPSYSVARS+=            SOEXT
 SOEXT.Darwin=          bundle
 SOEXT.*=               so

Index: pkgsrc/databases/sqlrelay/Makefile.common
diff -u pkgsrc/databases/sqlrelay/Makefile.common:1.21 pkgsrc/databases/sqlrelay/Makefile.common:1.22
--- pkgsrc/databases/sqlrelay/Makefile.common:1.21      Wed May 27 19:37:39 2020
+++ pkgsrc/databases/sqlrelay/Makefile.common   Tue Feb 16 13:12:39 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.21 2020/05/27 19:37:39 wiz Exp $
+# $NetBSD: Makefile.common,v 1.22 2021/02/16 13:12:39 adam Exp $
 # used by databases/p5-sqlrelay/Makefile
 # used by databases/php-sqlrelay/Makefile
 # used by databases/py-sqlrelay/Makefile
@@ -11,20 +11,20 @@
 # used by databases/sqlrelay-sqlite/Makefile
 # used by databases/sqlrelay/Makefile
 
-DISTNAME=              sqlrelay-1.0.0
-CATEGORIES=            databases
-MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=sqlrelay/}
-
-MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=              http://sqlrelay.sourceforge.net/
-LICENSE=               gnu-gpl-v2 AND gnu-lgpl-v2
+DISTNAME=      sqlrelay-1.8.0
+CATEGORIES=    databases
+MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=sqlrelay/}
+
+MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=      http://sqlrelay.sourceforge.net/
+LICENSE=       gnu-gpl-v2 AND gnu-lgpl-v2
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
-GNU_CONFIGURE=         yes
 USE_LANGUAGES=         c c++03
-USE_TOOLS+=            gmake
 USE_LIBTOOL=           yes
+USE_TOOLS+=            gmake
+GNU_CONFIGURE=         yes
 BUILD_DEFS+=           VARBASE
 MAKE_JOBS_SAFE=                no
 
@@ -32,6 +32,7 @@ DESCR_SRC=            ${.CURDIR}/../../databases/s
 DISTINFO_FILE=         ${.CURDIR}/../../databases/sqlrelay/distinfo
 PATCHDIR=              ${.CURDIR}/../../databases/sqlrelay/patches
 
+CONFIGURE_ARGS+=       --disable-werror
 CONFIGURE_ARGS+=       --localstatedir=${VARBASE}
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=       --with-rudiments-prefix=${BUILDLINK_PREFIX.rudiments}
@@ -39,13 +40,6 @@ CONFIGURE_ARGS+=     --with-rudiments-prefix
 PKG_SYSCONFSUBDIR=     sqlrelay
 EGDIR=                 ${PREFIX}/share/examples/sqlrelay
 
-.include "../../mk/compiler.mk"
-.if !empty(PKGSRC_COMPILER:Mclang)
-_WRAP_EXTRA_ARGS.CXX+= -Wno-error=overloaded-virtual
-CWRAPPERS_APPEND.cxx+= -Wno-error=overloaded-virtual
-.endif
-BUILDLINK_TRANSFORM+=  rm:-Werror
-
 CHECK_SSP_SKIP+=       libexec/sqlrelay/*.a
 
 .include "../../devel/rudiments/buildlink3.mk"

Index: pkgsrc/databases/sqlrelay/PLIST
diff -u pkgsrc/databases/sqlrelay/PLIST:1.19 pkgsrc/databases/sqlrelay/PLIST:1.20
--- pkgsrc/databases/sqlrelay/PLIST:1.19        Mon Jan 16 13:13:13 2017
+++ pkgsrc/databases/sqlrelay/PLIST     Tue Feb 16 13:12:39 2021
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2017/01/16 13:13:13 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.20 2021/02/16 13:12:39 adam Exp $
 bin/sqlr-cachemanager
 bin/sqlr-connection
 bin/sqlr-export
@@ -15,20 +15,41 @@ bin/sqlrserver-config
 bin/sqlrsh
 include/sqlrelay/private/sqlrauth.h
 include/sqlrelay/private/sqlrauths.h
+include/sqlrelay/private/sqlrbindvariabletranslation.h
+include/sqlrelay/private/sqlrbindvariabletranslations.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/sqlrdirective.h
+include/sqlrelay/private/sqlrdirectives.h
+include/sqlrelay/private/sqlrexport.h
+include/sqlrelay/private/sqlrexportcsv.h
+include/sqlrelay/private/sqlrexportcsvincludes.h
+include/sqlrelay/private/sqlrexportincludes.h
+include/sqlrelay/private/sqlrexportxml.h
+include/sqlrelay/private/sqlrexportxmlincludes.h
 include/sqlrelay/private/sqlrfilter.h
 include/sqlrelay/private/sqlrfilters.h
 include/sqlrelay/private/sqlrgsscredentials.h
+include/sqlrelay/private/sqlrimport.h
+include/sqlrelay/private/sqlrimportcsv.h
+include/sqlrelay/private/sqlrimportcsvincludes.h
+include/sqlrelay/private/sqlrimportincludes.h
+include/sqlrelay/private/sqlrimportxml.h
+include/sqlrelay/private/sqlrimportxmlincludes.h
 include/sqlrelay/private/sqlrlistener.h
 include/sqlrelay/private/sqlrlogger.h
 include/sqlrelay/private/sqlrloggers.h
+include/sqlrelay/private/sqlrmoduledata.h
+include/sqlrelay/private/sqlrmoduledata_tag.h
+include/sqlrelay/private/sqlrmoduledatas.h
+include/sqlrelay/private/sqlrmysqlcredentials.h
 include/sqlrelay/private/sqlrnotification.h
 include/sqlrelay/private/sqlrnotifications.h
 include/sqlrelay/private/sqlrparser.h
+include/sqlrelay/private/sqlrpostgresqlcredentials.h
 include/sqlrelay/private/sqlrprotocol.h
 include/sqlrelay/private/sqlrprotocols.h
 include/sqlrelay/private/sqlrpwdenc.h
@@ -36,6 +57,12 @@ include/sqlrelay/private/sqlrpwdencs.h
 include/sqlrelay/private/sqlrqueries.h
 include/sqlrelay/private/sqlrquery.h
 include/sqlrelay/private/sqlrquerycursor.h
+include/sqlrelay/private/sqlrresultsetdomnode.h
+include/sqlrelay/private/sqlrresultsetdomnodeincludes.h
+include/sqlrelay/private/sqlrresultsetheadertranslation.h
+include/sqlrelay/private/sqlrresultsetheadertranslations.h
+include/sqlrelay/private/sqlrresultsetrowblocktranslation.h
+include/sqlrelay/private/sqlrresultsetrowblocktranslations.h
 include/sqlrelay/private/sqlrresultsetrowtranslation.h
 include/sqlrelay/private/sqlrresultsetrowtranslations.h
 include/sqlrelay/private/sqlrresultsettranslation.h
@@ -59,26 +86,15 @@ include/sqlrelay/private/sqlruserpasswor
 include/sqlrelay/private/sqlrutilincludes.h
 include/sqlrelay/sqlrclient.h
 include/sqlrelay/sqlrclientwrapper.h
+include/sqlrelay/sqlrexport.h
+include/sqlrelay/sqlrexportcsv.h
+include/sqlrelay/sqlrexportxml.h
+include/sqlrelay/sqlrimport.h
+include/sqlrelay/sqlrimportcsv.h
+include/sqlrelay/sqlrimportxml.h
+include/sqlrelay/sqlrresultsetdomnode.h
 include/sqlrelay/sqlrserver.h
 include/sqlrelay/sqlrutil.h
-lib/libmysql3sqlrelay.so
-lib/libmysql3sqlrelay.so.4
-lib/libmysql3sqlrelay.so.4.0.0
-lib/libmysql40sqlrelay.so
-lib/libmysql40sqlrelay.so.4
-lib/libmysql40sqlrelay.so.4.0.0
-lib/libmysql41sqlrelay.so
-lib/libmysql41sqlrelay.so.4
-lib/libmysql41sqlrelay.so.4.0.0
-lib/libmysql50sqlrelay.so
-lib/libmysql50sqlrelay.so.4
-lib/libmysql50sqlrelay.so.4.0.0
-lib/libmysql51sqlrelay.so
-lib/libmysql51sqlrelay.so.4
-lib/libmysql51sqlrelay.so.4.0.0
-lib/libpqsqlrelay.so
-lib/libpqsqlrelay.so.4
-lib/libpqsqlrelay.so.4.0.0
 lib/libsqlrclient.la
 lib/libsqlrclientwrapper.la
 lib/libsqlrserver.la
@@ -86,33 +102,51 @@ lib/libsqlrutil.la
 lib/pkgconfig/sqlrelay-c++.pc
 lib/pkgconfig/sqlrelay-c.pc
 libexec/sqlrelay/sqlrauth_database.${SOEXT}
+libexec/sqlrelay/sqlrauth_mysql_database.${SOEXT}
+libexec/sqlrelay/sqlrauth_mysql_userlist.${SOEXT}
+libexec/sqlrelay/sqlrauth_postgresql_userlist.${SOEXT}
 libexec/sqlrelay/sqlrauth_proxied.${SOEXT}
 libexec/sqlrelay/sqlrauth_sqlrelay.${SOEXT}
 libexec/sqlrelay/sqlrauth_userlist.${SOEXT}
+libexec/sqlrelay/sqlrbindvariabletranslation_test.${SOEXT}
 libexec/sqlrelay/sqlrconfig_xmldom.${SOEXT}
 libexec/sqlrelay/sqlrconnection_router.${SOEXT}
+libexec/sqlrelay/sqlrdirective_crash.${SOEXT}
+libexec/sqlrelay/sqlrdirective_custom_wf.${SOEXT}
 libexec/sqlrelay/sqlrfilter_patterns.${SOEXT}
 libexec/sqlrelay/sqlrfilter_regex.${SOEXT}
 libexec/sqlrelay/sqlrfilter_string.${SOEXT}
+libexec/sqlrelay/sqlrfilter_tag.${SOEXT}
 libexec/sqlrelay/sqlrlogger_custom_nw.${SOEXT}
 libexec/sqlrelay/sqlrlogger_custom_sc.${SOEXT}
 libexec/sqlrelay/sqlrlogger_debug.${SOEXT}
 libexec/sqlrelay/sqlrlogger_slowqueries.${SOEXT}
+libexec/sqlrelay/sqlrlogger_sql.${SOEXT}
+libexec/sqlrelay/sqlrlogger_stalecursors.${SOEXT}
+libexec/sqlrelay/sqlrmoduledata_tag.${SOEXT}
 libexec/sqlrelay/sqlrnotification_events.${SOEXT}
 libexec/sqlrelay/sqlrparser_default.${SOEXT}
+libexec/sqlrelay/sqlrprotocol_mysql.${SOEXT}
+libexec/sqlrelay/sqlrprotocol_postgresql.${SOEXT}
 libexec/sqlrelay/sqlrprotocol_sqlrclient.${SOEXT}
+libexec/sqlrelay/sqlrpwdenc_aes128.${SOEXT}
 libexec/sqlrelay/sqlrpwdenc_crypt.${SOEXT}
 libexec/sqlrelay/sqlrpwdenc_md5.${SOEXT}
 libexec/sqlrelay/sqlrpwdenc_rot.${SOEXT}
+libexec/sqlrelay/sqlrpwdenc_sha1.${SOEXT}
+libexec/sqlrelay/sqlrpwdenc_sha256.${SOEXT}
 libexec/sqlrelay/sqlrquery_sqlrcmdcstat.${SOEXT}
 libexec/sqlrelay/sqlrquery_sqlrcmdgstat.${SOEXT}
 libexec/sqlrelay/sqlrresultsettranslation_reformatdatetime.${SOEXT}
-libexec/sqlrelay/sqlrresultsettranslation_test.${SOEXT}
+libexec/sqlrelay/sqlrrouter_clientinfolist.${SOEXT}
 libexec/sqlrelay/sqlrrouter_clientiplist.${SOEXT}
 libexec/sqlrelay/sqlrrouter_regex.${SOEXT}
+libexec/sqlrelay/sqlrrouter_usedatabase.${SOEXT}
 libexec/sqlrelay/sqlrrouter_userlist.${SOEXT}
 libexec/sqlrelay/sqlrschedule_cron_userlist.${SOEXT}
 libexec/sqlrelay/sqlrtranslation_normalize.${SOEXT}
+libexec/sqlrelay/sqlrtranslation_patterns.${SOEXT}
+libexec/sqlrelay/sqlrtrigger_replay.${SOEXT}
 man/man1/sqlr-export.1
 man/man1/sqlr-import.1
 man/man1/sqlrsh.1
@@ -126,7 +160,9 @@ 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/createtlscert.html
 share/doc/sqlrelay/admin/installing.html
+share/doc/sqlrelay/admin/installingpkg.html
 share/doc/sqlrelay/admin/oraclentier.html
 share/doc/sqlrelay/admin/prerequisites.html
 share/doc/sqlrelay/admin/running.html
@@ -134,6 +170,8 @@ share/doc/sqlrelay/admin/sqlr-connection
 share/doc/sqlrelay/admin/sqlr-connection.1871.html
 share/doc/sqlrelay/admin/sqlr-listener.1869.html
 share/doc/sqlrelay/admin/sqlr-listener.1886.html
+share/doc/sqlrelay/admin/tlsca.html
+share/doc/sqlrelay/admin/tlscert.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
@@ -375,6 +413,13 @@ share/doc/sqlrelay/api/cs/html/tab_b.png
 share/doc/sqlrelay/api/cs/html/tab_h.png
 share/doc/sqlrelay/api/cs/html/tab_s.png
 share/doc/sqlrelay/api/cs/html/tabs.css
+share/doc/sqlrelay/api/erlang/html/edoc-info
+share/doc/sqlrelay/api/erlang/html/erlang.png
+share/doc/sqlrelay/api/erlang/html/index.html
+share/doc/sqlrelay/api/erlang/html/modules-frame.html
+share/doc/sqlrelay/api/erlang/html/overview-summary.html
+share/doc/sqlrelay/api/erlang/html/sqlrelay.html
+share/doc/sqlrelay/api/erlang/html/stylesheet.css
 share/doc/sqlrelay/api/java/allclasses-frame.html
 share/doc/sqlrelay/api/java/allclasses-noframe.html
 share/doc/sqlrelay/api/java/com/firstworks/sqlrelay/SQLRConnection.html
@@ -637,9 +682,11 @@ share/doc/sqlrelay/features/dropinreplac
 share/doc/sqlrelay/features/ha.html
 share/doc/sqlrelay/features/languages.html
 share/doc/sqlrelay/features/multirowfetches.html
+share/doc/sqlrelay/features/nativeprotocol.html
 share/doc/sqlrelay/features/proxying.html
 share/doc/sqlrelay/features/queryfiltering.html
 share/doc/sqlrelay/features/queryrouting.html
+share/doc/sqlrelay/features/querytranslation.html
 share/doc/sqlrelay/features/resultsetcaching.html
 share/doc/sqlrelay/features/schedules.html
 share/doc/sqlrelay/features/substitutionandbindvars.html
@@ -655,11 +702,13 @@ share/doc/sqlrelay/images/arm-linux-ucli
 share/doc/sqlrelay/images/blackray.png
 share/doc/sqlrelay/images/cluster.png
 share/doc/sqlrelay/images/dayshift.png
+share/doc/sqlrelay/images/db2-bench.png
 share/doc/sqlrelay/images/fetch-many.png
 share/doc/sqlrelay/images/fetch-one.png
 share/doc/sqlrelay/images/firebird.png
 share/doc/sqlrelay/images/freebsd-i386-thumb.png
 share/doc/sqlrelay/images/freebsd-i386.png
+share/doc/sqlrelay/images/freetds-bench.png
 share/doc/sqlrelay/images/freetds.png
 share/doc/sqlrelay/images/haiku-thumb.png
 share/doc/sqlrelay/images/haiku.png
@@ -668,15 +717,18 @@ share/doc/sqlrelay/images/hurd-i386.png
 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/informix-bench.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
 share/doc/sqlrelay/images/mssqlserver.png
+share/doc/sqlrelay/images/mysql-bench.png
 share/doc/sqlrelay/images/mysql-chain.png
 share/doc/sqlrelay/images/mysql-sqlr-chain.png
 share/doc/sqlrelay/images/mysql.png
+share/doc/sqlrelay/images/mysqlnativeprotocol.png
 share/doc/sqlrelay/images/netbsd-i386-thumb.png
 share/doc/sqlrelay/images/netbsd-i386.png
 share/doc/sqlrelay/images/netbsd-sparc-thumb.png
@@ -688,10 +740,13 @@ share/doc/sqlrelay/images/openbsd-i386-t
 share/doc/sqlrelay/images/openbsd-i386.png
 share/doc/sqlrelay/images/openbsd-sparc-thumb.png
 share/doc/sqlrelay/images/openbsd-sparc.png
+share/doc/sqlrelay/images/oracle-bench.png
 share/doc/sqlrelay/images/oracle.png
+share/doc/sqlrelay/images/postgresql-bench.png
 share/doc/sqlrelay/images/postgresql-chain.png
 share/doc/sqlrelay/images/postgresql-sqlr-chain.png
 share/doc/sqlrelay/images/postgresql.png
+share/doc/sqlrelay/images/postgresqlnativeprotocol.png
 share/doc/sqlrelay/images/proxying.png
 share/doc/sqlrelay/images/query-allowed.png
 share/doc/sqlrelay/images/query-rejected.png
@@ -702,14 +757,20 @@ share/doc/sqlrelay/images/replicated-dis
 share/doc/sqlrelay/images/replicated.png
 share/doc/sqlrelay/images/router.png
 share/doc/sqlrelay/images/rrdns.png
+share/doc/sqlrelay/images/sap-bench.png
 share/doc/sqlrelay/images/sco-osr6-i386-thumb.png
 share/doc/sqlrelay/images/sco-osr6-i386.png
+share/doc/sqlrelay/images/sqlite-bench.png
 share/doc/sqlrelay/images/sqlite.png
 share/doc/sqlrelay/images/sqlr-fetch-many-return-rsbuffersize.png
 share/doc/sqlrelay/images/sqlr-fetch-many-return.png
 share/doc/sqlrelay/images/sqlr-fetch-many.png
 share/doc/sqlrelay/images/sqlr-fetch-one-return-rsbuffersize.png
 share/doc/sqlrelay/images/sqlrelay.png
+share/doc/sqlrelay/images/sqlrelaymysqlprotocol.png
+share/doc/sqlrelay/images/sqlrelaymysqlprotocolbackend.png
+share/doc/sqlrelay/images/sqlrelaynativeprotocol.png
+share/doc/sqlrelay/images/sqlrelaypostgresqlprotocol.png
 share/doc/sqlrelay/images/sybase.png
 share/doc/sqlrelay/images/syllable-thumb.png
 share/doc/sqlrelay/images/syllable.png
@@ -736,9 +797,7 @@ share/doc/sqlrelay/programming/python.ht
 share/doc/sqlrelay/programming/pythondb.html
 share/doc/sqlrelay/programming/ruby.html
 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
+@pkgdir share/examples/sqlrelay/sqlrelay.conf.d
 share/examples/sqlrelay/sqlrelay.xsd
 share/licenses/sqlrelay/COPYING
-@pkgdir share/examples/sqlrelay/sqlrelay.conf.d

Index: pkgsrc/databases/sqlrelay/distinfo
diff -u pkgsrc/databases/sqlrelay/distinfo:1.25 pkgsrc/databases/sqlrelay/distinfo:1.26
--- pkgsrc/databases/sqlrelay/distinfo:1.25     Sat Sep 28 08:42:07 2019
+++ pkgsrc/databases/sqlrelay/distinfo  Tue Feb 16 13:12:39 2021
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.25 2019/09/28 08:42:07 adam Exp $
+$NetBSD: distinfo,v 1.26 2021/02/16 13:12:39 adam Exp $
 
-SHA1 (sqlrelay-1.0.0.tar.gz) = 3f350a71fea8177a8e003524b6833347f741153b
-RMD160 (sqlrelay-1.0.0.tar.gz) = 1bc6c1ac02eb8a58c1aa8e2bacd0c8662a283aad
-SHA512 (sqlrelay-1.0.0.tar.gz) = 2722cd179dfcd6bbc4c78ea9149d00ec70ccd11d44cdcabe7ad48e8cddf07588477ca9edf74660d498b2a6ae9e70a9e68733090c0a2122310995f566b0807349
-Size (sqlrelay-1.0.0.tar.gz) = 4194484 bytes
-SHA1 (patch-ad) = cc4a94941ec737abede98bdd7b19bc902f755609
-SHA1 (patch-config.mk.in) = 22e8459f49e20529289e1a99b10cebaa449af0c0
-SHA1 (patch-configure) = a3c6c2179e5166525fbea9661966c2180668fb46
-SHA1 (patch-etc_Makefile) = 28e9cac18314f1fc725603d47cb92ec6e54d7c63
-SHA1 (patch-src_api_nodejs_Makefile) = fd932cd1c76a34cc5decbe4060fc7c37174631bb
+SHA1 (sqlrelay-1.8.0.tar.gz) = 30fe6bab49b04c091cee61d77c854d8b4674cc1d
+RMD160 (sqlrelay-1.8.0.tar.gz) = 1c87f0da0d8334a23fff35e9ff1edeb3f2093111
+SHA512 (sqlrelay-1.8.0.tar.gz) = cfb430f1eb9de4c8dd5c4ee4a89a1c04ba2449cc302155bbf115cd8b50933f7fb690395cb394ce01bfb8e7d83b79168f898baafd1169383ecdfd961347679561
+Size (sqlrelay-1.8.0.tar.gz) = 4684135 bytes
+SHA1 (patch-Makefile) = 4005ca28daec0180fe298f711b22b3d8dcf02a9a
+SHA1 (patch-config.mk.in) = 172f04e655d31705b107f0889d86c48db9e0919a
+SHA1 (patch-configure) = a2355371cbf9d81f8d17568ed9ff0b6788dd25f9
+SHA1 (patch-etc_Makefile) = 5c768f50a97489ea06ca586b131ef0324878f8d0
+SHA1 (patch-src_api_nodejs_Makefile) = 6f0e569f25fd1e78e088b8e0cd8eb541c2c5d417
 SHA1 (patch-src_api_nodejs_package__in.json) = 76e2ebc4e47d5ef38d0c96059b62460fef687d1e
 SHA1 (patch-src_api_php_sql__relay.cpp) = 9e33260f4e4331874187e5b30db17d4478710385
 SHA1 (patch-src_api_ruby_getcflags.rb) = 033e26ef03db4851f493d831c37ec947662d47ee

Index: pkgsrc/databases/sqlrelay-freetds/Makefile
diff -u pkgsrc/databases/sqlrelay-freetds/Makefile:1.29 pkgsrc/databases/sqlrelay-freetds/Makefile:1.30
--- pkgsrc/databases/sqlrelay-freetds/Makefile:1.29     Mon Aug 31 18:07:14 2020
+++ pkgsrc/databases/sqlrelay-freetds/Makefile  Tue Feb 16 13:12:39 2021
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2020/08/31 18:07:14 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2021/02/16 13:12:39 adam Exp $
 
-PKGNAME=               ${DISTNAME:S/sqlrelay/sqlrelay-freetds/}
-PKGREVISION=           17
-COMMENT=               FreeTDS support for SQL Relay
+PKGNAME=       ${DISTNAME:S/sqlrelay/sqlrelay-freetds/}
+COMMENT=       FreeTDS support for SQL Relay
 
 .include "../../databases/sqlrelay/Makefile.common"
 

Index: pkgsrc/databases/sqlrelay-mysql/Makefile
diff -u pkgsrc/databases/sqlrelay-mysql/Makefile:1.24 pkgsrc/databases/sqlrelay-mysql/Makefile:1.25
--- pkgsrc/databases/sqlrelay-mysql/Makefile:1.24       Mon Aug 31 18:07:15 2020
+++ pkgsrc/databases/sqlrelay-mysql/Makefile    Tue Feb 16 13:12:39 2021
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.24 2020/08/31 18:07:15 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2021/02/16 13:12:39 adam Exp $
 
-PKGNAME=               ${DISTNAME:S/sqlrelay/sqlrelay-mysql/}
-PKGREVISION=           15
-COMMENT=               MySQL support for SQL Relay
+PKGNAME=       ${DISTNAME:S/sqlrelay/sqlrelay-mysql/}
+COMMENT=       MySQL support for SQL Relay
 
 .include "../../databases/sqlrelay/Makefile.common"
 
-LICENSE=               gnu-gpl-v2
+LICENSE=       gnu-gpl-v2
 
 CONFIGURE_ARGS+=       --with-mysql-prefix=${BUILDLINK_PREFIX.mysql-client}
 CONFIGURE_ARGS+=       --disable-postgresql

Index: pkgsrc/databases/sqlrelay-nodejs/Makefile
diff -u pkgsrc/databases/sqlrelay-nodejs/Makefile:1.27 pkgsrc/databases/sqlrelay-nodejs/Makefile:1.28
--- pkgsrc/databases/sqlrelay-nodejs/Makefile:1.27      Sat Jan 23 19:44:05 2021
+++ pkgsrc/databases/sqlrelay-nodejs/Makefile   Tue Feb 16 13:12:39 2021
@@ -1,18 +1,17 @@
-# $NetBSD: Makefile,v 1.27 2021/01/23 19:44:05 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2021/02/16 13:12:39 adam Exp $
 
-PKGNAME=               ${DISTNAME:S/sqlrelay/sqlrelay-nodejs/}
-PKGREVISION=           15
-COMMENT=               node.js API for SQL Relay
+PKGNAME=       ${DISTNAME:S/sqlrelay/sqlrelay-nodejs/}
+COMMENT=       node.js API for SQL Relay
 
 .include "../../databases/sqlrelay/Makefile.common"
 
-USE_LANGUAGES+=                c++11
+USE_LANGUAGES+=                gnu++14
 
 LICENSE=               gnu-lgpl-v2
 
 BUILD_DEPENDS+=                npm-[0-9]*:../../lang/npm
 
-NODE_VERSIONS_ACCEPTED=        8 6
+NODE_VERSIONS_ACCEPTED=        12 10
 
 CONFIGURE_ARGS+=       --with-nodejs-prefix=${BUILDLINK_PREFIX.nodejs}
 CONFIGURE_ARGS+=       --disable-postgresql

Index: pkgsrc/databases/sqlrelay-odbc/Makefile
diff -u pkgsrc/databases/sqlrelay-odbc/Makefile:1.28 pkgsrc/databases/sqlrelay-odbc/Makefile:1.29
--- pkgsrc/databases/sqlrelay-odbc/Makefile:1.28        Mon Aug 31 18:07:15 2020
+++ pkgsrc/databases/sqlrelay-odbc/Makefile     Tue Feb 16 13:12:40 2021
@@ -1,19 +1,18 @@
-# $NetBSD: Makefile,v 1.28 2020/08/31 18:07:15 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2021/02/16 13:12:40 adam Exp $
 
-PKGNAME=               ${DISTNAME:S/sqlrelay/sqlrelay-odbc/}
-PKGREVISION=           15
-COMMENT=               ODBC support for SQL Relay
+PKGNAME=       ${DISTNAME:S/sqlrelay/sqlrelay-odbc/}
+COMMENT=       ODBC support for SQL Relay
 
 .include "../../databases/sqlrelay/Makefile.common"
 
-LICENSE=               gnu-lgpl-v2
+LICENSE=       gnu-lgpl-v2
 
 CONFIGURE_ARGS+=       --with-odbc-prefix=${BUILDLINK_PREFIX.unixodbc}
-CONFIGURE_ARGS+=       --disable-postgresql
-CONFIGURE_ARGS+=       --disable-sqlite
 CONFIGURE_ARGS+=       --disable-freetds
 CONFIGURE_ARGS+=       --disable-mysql
 CONFIGURE_ARGS+=       --disable-perl
+CONFIGURE_ARGS+=       --disable-postgresql
+CONFIGURE_ARGS+=       --disable-sqlite
 
 BUILD_DIRS=            src/connections
 

Index: pkgsrc/databases/sqlrelay-pgsql/Makefile
diff -u pkgsrc/databases/sqlrelay-pgsql/Makefile:1.25 pkgsrc/databases/sqlrelay-pgsql/Makefile:1.26
--- pkgsrc/databases/sqlrelay-pgsql/Makefile:1.25       Mon Aug 31 18:07:15 2020
+++ pkgsrc/databases/sqlrelay-pgsql/Makefile    Tue Feb 16 13:12:40 2021
@@ -1,19 +1,18 @@
-# $NetBSD: Makefile,v 1.25 2020/08/31 18:07:15 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2021/02/16 13:12:40 adam Exp $
 
-PKGNAME=               ${DISTNAME:S/sqlrelay/sqlrelay-pgsql/}
-PKGREVISION=           15
-COMMENT=               PostgreSQL support for SQL Relay
+PKGNAME=       ${DISTNAME:S/sqlrelay/sqlrelay-pgsql/}
+COMMENT=       PostgreSQL support for SQL Relay
 
 .include "../../databases/sqlrelay/Makefile.common"
 
-LICENSE=               postgresql-license
+LICENSE=       postgresql-license
 
-CONFIGURE_ARGS+=       --with-postgresql-prefix=${PGSQL_PREFIX}
-CONFIGURE_ARGS+=       --disable-mysql
-CONFIGURE_ARGS+=       --disable-sqlite
 CONFIGURE_ARGS+=       --disable-freetds
+CONFIGURE_ARGS+=       --disable-mysql
 CONFIGURE_ARGS+=       --disable-odbc
 CONFIGURE_ARGS+=       --disable-perl
+CONFIGURE_ARGS+=       --disable-sqlite
+CONFIGURE_ARGS+=       --with-postgresql-prefix=${PGSQL_PREFIX}
 
 BUILD_DIRS=            src/connections
 

Index: pkgsrc/databases/sqlrelay-sqlite/Makefile
diff -u pkgsrc/databases/sqlrelay-sqlite/Makefile:1.39 pkgsrc/databases/sqlrelay-sqlite/Makefile:1.40
--- pkgsrc/databases/sqlrelay-sqlite/Makefile:1.39      Thu Nov  5 09:07:50 2020
+++ pkgsrc/databases/sqlrelay-sqlite/Makefile   Tue Feb 16 13:12:40 2021
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.39 2020/11/05 09:07:50 ryoon Exp $
+# $NetBSD: Makefile,v 1.40 2021/02/16 13:12:40 adam Exp $
 
-PKGNAME=               ${DISTNAME:S/sqlrelay/sqlrelay-sqlite/}
-PKGREVISION=           25
-COMMENT=               SQLite support for SQL Relay
+PKGNAME=       ${DISTNAME:S/sqlrelay/sqlrelay-sqlite/}
+COMMENT=       SQLite support for SQL Relay
 
 .include "../../databases/sqlrelay/Makefile.common"
 

Index: pkgsrc/databases/sqlrelay/patches/patch-config.mk.in
diff -u pkgsrc/databases/sqlrelay/patches/patch-config.mk.in:1.3 pkgsrc/databases/sqlrelay/patches/patch-config.mk.in:1.4
--- pkgsrc/databases/sqlrelay/patches/patch-config.mk.in:1.3    Fri Jul  1 17:02:39 2016
+++ pkgsrc/databases/sqlrelay/patches/patch-config.mk.in        Tue Feb 16 13:12:39 2021
@@ -1,9 +1,22 @@
-$NetBSD: patch-config.mk.in,v 1.3 2016/07/01 17:02:39 fhajny Exp $
+$NetBSD: patch-config.mk.in,v 1.4 2021/02/16 13:12:39 adam Exp $
 
+Fix PERLLIB.
 We install init scripts ourselves.
---- config.mk.in.orig  2016-03-24 00:59:48.000000000 +0000
+
+--- config.mk.in.orig  2020-08-26 04:29:55.000000000 +0000
 +++ config.mk.in
-@@ -921,7 +921,7 @@ MODULERENAME = $(top_builddir)/moduleren
+@@ -226,8 +226,8 @@ else
+ PERLMAN3EXT_LOCAL = $(OVERRIDEPERLMAN3EXT)
+ endif
+ PERLCPPFLAGS = $(BASECPPFLAGS) $(PERLOPTIMIZE_LOCAL) $(PERLCCFLAGS_LOCAL) -I$(top_builddir) -I$(top_builddir)/src/api/c++ $(RUDIMENTSINCLUDES) $(PERLINC_LOCAL)
+-PERLCONLIBS = $(PERLLIB) -L$(top_builddir)/src/api/c++ -l$(SQLR)client $(RUDIMENTSLIBS) $(LIBDMALLOC) $(LIBEFENCE) -rpath $(PERLSITEARCH_LOCAL)/auto/SQLRelay/Connection
+-PERLCURLIBS = $(PERLLIB) -L$(top_builddir)/src/api/c++ -l$(SQLR)client $(RUDIMENTSLIBS) $(LIBDMALLOC) $(LIBEFENCE) -rpath $(PERLSITEARCH_LOCAL)/auto/SQLRelay/Cursor
++PERLCONLIBS = $(PERLLIB) -lperl -L$(top_builddir)/src/api/c++ -l$(SQLR)client $(RUDIMENTSLIBS) $(LIBDMALLOC) $(LIBEFENCE) -rpath $(PERLSITEARCH_LOCAL)/auto/SQLRelay/Connection
++PERLCURLIBS = $(PERLLIB) -lperl -L$(top_builddir)/src/api/c++ -l$(SQLR)client $(RUDIMENTSLIBS) $(LIBDMALLOC) $(LIBEFENCE) -rpath $(PERLSITEARCH_LOCAL)/auto/SQLRelay/Cursor
+ ifneq ($(strip $(libdir)),)
+ ifeq ($(PERLUSERPATH),yes)
+ PERLCONLIBS += -R $(libdir)
+@@ -883,7 +883,7 @@ MODULERENAME = $(top_builddir)/moduleren
  
  
  # build directories
Index: pkgsrc/databases/sqlrelay/patches/patch-etc_Makefile
diff -u pkgsrc/databases/sqlrelay/patches/patch-etc_Makefile:1.3 pkgsrc/databases/sqlrelay/patches/patch-etc_Makefile:1.4
--- pkgsrc/databases/sqlrelay/patches/patch-etc_Makefile:1.3    Fri Jul  1 17:02:39 2016
+++ pkgsrc/databases/sqlrelay/patches/patch-etc_Makefile        Tue Feb 16 13:12:39 2021
@@ -1,16 +1,19 @@
-$NetBSD: patch-etc_Makefile,v 1.3 2016/07/01 17:02:39 fhajny Exp $
+$NetBSD: patch-etc_Makefile,v 1.4 2021/02/16 13:12:39 adam Exp $
 
 Install config file examples properly.
---- etc/Makefile.orig  2016-01-28 19:28:21.000000000 +0000
+
+--- etc/Makefile.orig  2020-08-26 04:30:03.000000000 +0000
 +++ etc/Makefile
-@@ -3,8 +3,8 @@ top_builddir = ..
+@@ -3,9 +3,9 @@ top_builddir = ..
  include ../config.mk
  
  install:
 -      $(MKINSTALLDIRS) $(sysconfdir)/$(SQLRELAY).conf.d
 -      $(CP) sqlrelay.xsd $(sysconfdir)/$(SQLRELAY).xsd
+-      $(CHMOD) 644 $(sysconfdir)/$(SQLRELAY).xsd
 +      $(MKINSTALLDIRS) $(EXAMPLEDIR)/$(SQLRELAY).conf.d
 +      $(CP) sqlrelay.xsd $(EXAMPLEDIR)/$(SQLRELAY).xsd
++      $(CHMOD) 644 $(EXAMPLEDIR)/$(SQLRELAY).xsd
        $(MKINSTALLDIRS) $(EXAMPLEDIR)
        $(CP) sqlrelay.conf $(EXAMPLEDIR)/$(SQLRELAY).conf
        $(CHMOD) 644 $(EXAMPLEDIR)/$(SQLRELAY).conf

Index: pkgsrc/databases/sqlrelay/patches/patch-configure
diff -u pkgsrc/databases/sqlrelay/patches/patch-configure:1.7 pkgsrc/databases/sqlrelay/patches/patch-configure:1.8
--- pkgsrc/databases/sqlrelay/patches/patch-configure:1.7       Sat Sep 28 08:42:07 2019
+++ pkgsrc/databases/sqlrelay/patches/patch-configure   Tue Feb 16 13:12:39 2021
@@ -1,12 +1,13 @@
-$NetBSD: patch-configure,v 1.7 2019/09/28 08:42:07 adam Exp $
+$NetBSD: patch-configure,v 1.8 2021/02/16 13:12:39 adam Exp $
 
 Cripple iODBC check, we're using UnixODBC and it was getting in the way.
-Fix Python 3 lookup.
+Fix Perl lookup.
+Fix Python lookup.
 Fix Ruby support.
 
---- configure.orig     2016-12-20 08:40:38.000000000 +0000
+--- configure.orig     2020-08-26 04:30:07.000000000 +0000
 +++ configure
-@@ -26775,7 +26775,7 @@ fi
+@@ -28135,7 +28135,7 @@ fi
  
  
  
@@ -15,25 +16,29 @@ Fix Ruby support.
  NAME=iodbc
  HEADER=sql.h
  LIBNAME=iodbc
-@@ -32424,14 +32424,14 @@ then
-               if ( test -n "$PYTHON3PATH" )
-               then
+@@ -33961,7 +33961,7 @@ fi
  
--                      for i in "3.9" "3.8" "3.7" "3.6" "3.5" "3.4" "3.3" "3.2" "3.1" "3.0"
-+                      for i in "${PYVERSSUFFIX}"
-                       do
--                              if ( test -d "$PYTHON3PATH/include/python$i" -a -d "$PYTHON3PATH/lib64/python$i/config" )
-+                              if ( test -d "$PYTHON3PATH/include/python$i" -a -d "$PYTHON3PATH/lib64/python$i/config-$i" )
-                               then
-                                       PYTHON3INCLUDES="-I$PYTHON3PATH/include/python$i"
-                                       PYTHON3DIR="$PYTHON3PATH/lib64/python$i"
-                               else
--                                      if ( test -d "$PYTHON3PATH/include/python$i" -a -d "$PYTHON3PATH/lib/python$i/config" )
-+                                      if ( test -d "$PYTHON3PATH/include/python$i" -a -d "$PYTHON3PATH/lib/python$i/config-$i" )
+                       if ( test -z "$PERL" )
+                       then
+-                              for i in "/usr/bin" "/usr/local/bin" "/usr/pkg/bin" "/usr/local/perl/bin" "/opt/sfw/bin" "/usr/sfw/bin" "/opt/csw/bin" "/sw/bin" "/boot/common/bin" 
"/resources/index/bin"
++                              for i in "${PREFIX}"
+                               do
+                                       if ( test -d "$i" )
                                        then
-                                               PYTHON3INCLUDES="-I$PYTHON3PATH/include/python$i"
-                                               PYTHON3DIR="$PYTHON3PATH/lib/python$i"
-@@ -32938,7 +32938,7 @@ print CONFIG["arch"]
+@@ -34149,10 +34149,10 @@ then
+ 
+               pyext=""
+ 
+-              for pyversion in "3.9" "3.8" "3.7" "3.6" "3.5" "3.4" "3.3" "3.2" "3.1" "3.0" "2.9" "2.8" "2.7" "2.6" "2.5" "2.4" "2.3" "2.2" "2.1"
++              for pyversion in "${PYVERSSUFFIX}"
+               do
+ 
+-                      for pyprefix in "$PYTHONPATH" "/usr" "/usr/local" "/usr/pkg" "/usr/local/python$pyversion" "/opt/sfw" "/usr/sfw" "/opt/csw" "/sw" 
"/System/Library/Frameworks/Python.framework/Versions/Current" "/boot/common"
++                      for pyprefix in "${PREFIX}"
+                       do
+ 
+                               if ( test -n "$pyprefix" )
+@@ -34483,7 +34483,7 @@ print CONFIG["arch"]
  print "\n"
  print "ruby_version = "
  begin

Index: pkgsrc/databases/sqlrelay/patches/patch-src_api_nodejs_Makefile
diff -u pkgsrc/databases/sqlrelay/patches/patch-src_api_nodejs_Makefile:1.1 pkgsrc/databases/sqlrelay/patches/patch-src_api_nodejs_Makefile:1.2
--- pkgsrc/databases/sqlrelay/patches/patch-src_api_nodejs_Makefile:1.1 Fri May  4 14:26:42 2018
+++ pkgsrc/databases/sqlrelay/patches/patch-src_api_nodejs_Makefile     Tue Feb 16 13:12:39 2021
@@ -1,15 +1,15 @@
-$NetBSD: patch-src_api_nodejs_Makefile,v 1.1 2018/05/04 14:26:42 fhajny Exp $
+$NetBSD: patch-src_api_nodejs_Makefile,v 1.2 2021/02/16 13:12:39 adam Exp $
 
 Reuse existing nodejs headers, do not fetch.
 
---- src/api/nodejs/Makefile.orig       2016-12-20 08:40:41.000000000 +0000
+--- src/api/nodejs/Makefile.orig       2020-08-26 04:30:04.000000000 +0000
 +++ src/api/nodejs/Makefile
-@@ -12,7 +12,7 @@ clean:
+@@ -13,7 +13,7 @@ clean:
        $(RM) temp1.gyp temp2.gyp
  
  build/Release/sqlrelay.node: binding.gyp sqlrelay.cpp package.json
--      $(NODEGYP) -v configure build
-+      $(NODEGYP) -v --nodedir $(PREFIX) configure build
+-      $(NODEGYP) $(NODEGYPPYTHON) -v configure build
++      $(NODEGYP) $(NODEGYPPYTHON) -v --nodedir $(PREFIX) configure build
  
  binding.gyp: binding_in.gyp
        $(REPLACE) @NODEJSINCLUDEDIRS@ "$(NODEJSINCLUDEDIRS)" binding_in.gyp > temp1.gyp

Added files:

Index: pkgsrc/databases/sqlrelay/patches/patch-Makefile
diff -u /dev/null pkgsrc/databases/sqlrelay/patches/patch-Makefile:1.1
--- /dev/null   Tue Feb 16 13:12:40 2021
+++ pkgsrc/databases/sqlrelay/patches/patch-Makefile    Tue Feb 16 13:12:39 2021
@@ -0,0 +1,16 @@
+$NetBSD: patch-Makefile,v 1.1 2021/02/16 13:12:39 adam Exp $
+
+We install init scripts ourselves.
+
+--- Makefile.orig      2015-03-31 20:50:58.000000000 +0000
++++ Makefile
+@@ -20,9 +20,6 @@ install-bin:
+ install-etc:
+       cd etc $(AND) $(MAKE) install
+ 
+-install-init:
+-      cd init $(AND) $(MAKE) install
+-
+ install-man:
+       cd man $(AND) $(MAKE) install
+

Prev by Date: CVS commit: pkgsrc/devel/rudiments
Next by Date: CVS commit: pkgsrc/lang
Previous by Thread: CVS commit: pkgsrc/devel/rudiments
Next by Thread: CVS commit: pkgsrc/lang
Indexes:

Home | Main Index | Thread Index | Old Index