4 files changed, 32 insertions, 23 deletions

diff --git a/databases/sqlrelay/Makefile b/databases/sqlrelay/Makefile
index 0e3b25c3aa14..bca7e97eedb6 100644
--- a/databases/sqlrelay/Makefile
+++ b/databases/sqlrelay/Makefile
@@ -3,7 +3,6 @@
 
 PORTNAME=	${SQLRELAY_PORTNAME}
 PORTVERSION=	${SQLRELAY_PORTVERSION}
-PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	SF
 
@@ -14,9 +13,11 @@ LICENSE=	LGPL20
 
 LIB_DEPENDS=	librudiments.so:devel/rudiments \
 		libkrb5.so:security/krb5 \
-		libcurl.so:ftp/curl
+		libcurl.so:ftp/curl \
+		libiconv.so:converters/libiconv
+
+USES=		gmake iconv libedit libtool pathfix python readline ssl
 
-USES=		gmake libtool pathfix python readline
 PATHFIX_MAKEFILEIN=	Makefile
 CPPFLAGS+=	-I${LOCALBASE}/include
 GNU_CONFIGURE=	yes
@@ -46,23 +47,24 @@ TOSTRIP=	bin/sqlr-start \
 		bin/sqlr-pwdenc \
 		bin/sqlr-status \
 		bin/sqlrsh \
-		lib/libsqlrodbc.so.4.0.0 \
-		lib/libsqlrutil.so.6.0.0 \
-		lib/libsqlrclient.so.4.0.0 \
-		lib/libsqlrclientwrapper.so.4.0.0 \
-		lib/libpqsqlrelay.so.4.0.0 \
-		lib/libmysql3sqlrelay.so.4.0.0 \
-		lib/libmysql40sqlrelay.so.4.0.0 \
-		lib/libmysql41sqlrelay.so.4.0.0 \
-		lib/libmysql50sqlrelay.so.4.0.0 \
-		lib/libmysql51sqlrelay.so.4.0.0 \
-		lib/libsqlrserver.so.6.0.0 \
+		lib/libmysql3sqlrelay.so.5.0.0 \
+		lib/libmysql40sqlrelay.so.5.0.0 \
+		lib/libmysql41sqlrelay.so.5.0.0 \
+		lib/libmysql50sqlrelay.so.5.0.0 \
+		lib/libmysql51sqlrelay.so.5.0.0 \
+		lib/libpqsqlrelay.so.5.0.0 \
+		lib/libsqlrclient.so.5.0.0 \
+		lib/libsqlrclientwrapper.so.5.0.0 \
+		lib/libsqlrodbc.so.5.0.0 \
+		lib/libsqlrserver.so.8.0.0 \
+		lib/libsqlrutil.so.8.0.0 \
 		libexec/sqlrelay/sqlrauth_database.so \
 		libexec/sqlrelay/sqlrauth_proxied.so \
 		libexec/sqlrelay/sqlrauth_sqlrelay.so \
 		libexec/sqlrelay/sqlrauth_userlist.so \
 		libexec/sqlrelay/sqlrconfig_xmldom.so \
 		libexec/sqlrelay/sqlrconnection_router.so \
+		libexec/sqlrelay/sqlrdirective_custom_wf.so \
 		libexec/sqlrelay/sqlrfilter_patterns.so \
 		libexec/sqlrelay/sqlrfilter_regex.so \
 		libexec/sqlrelay/sqlrfilter_string.so \
@@ -70,6 +72,7 @@ TOSTRIP=	bin/sqlr-start \
 		libexec/sqlrelay/sqlrlogger_custom_sc.so \
 		libexec/sqlrelay/sqlrlogger_debug.so \
 		libexec/sqlrelay/sqlrlogger_slowqueries.so \
+		libexec/sqlrelay/sqlrlogger_stalecursors.so \
 		libexec/sqlrelay/sqlrnotification_events.so \
 		libexec/sqlrelay/sqlrparser_default.so \
 		libexec/sqlrelay/sqlrprotocol_sqlrclient.so \
@@ -80,11 +83,14 @@ TOSTRIP=	bin/sqlr-start \
 		libexec/sqlrelay/sqlrquery_sqlrcmdgstat.so \
 		libexec/sqlrelay/sqlrresultsettranslation_reformatdatetime.so \
 		libexec/sqlrelay/sqlrresultsettranslation_test.so \
+		libexec/sqlrelay/sqlrrouter_clientinfolist.so \
 		libexec/sqlrelay/sqlrrouter_clientiplist.so \
 		libexec/sqlrelay/sqlrrouter_regex.so \
+		libexec/sqlrelay/sqlrrouter_usedatabase.so \
 		libexec/sqlrelay/sqlrrouter_userlist.so \
 		libexec/sqlrelay/sqlrschedule_cron_userlist.so \
-		libexec/sqlrelay/sqlrtranslation_normalize.so
+		libexec/sqlrelay/sqlrtranslation_normalize.so \
+		libexec/sqlrelay/sqlrtranslation_patterns.so
 
 .include "${.CURDIR}/Makefile.common"
 
diff --git a/databases/sqlrelay/Makefile.common b/databases/sqlrelay/Makefile.common
index 31289934eaee..3324b85e494c 100644
--- a/databases/sqlrelay/Makefile.common
+++ b/databases/sqlrelay/Makefile.common
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 SQLRELAY_PORTNAME=	sqlrelay
-SQLRELAY_PORTVERSION=	1.3.0
+SQLRELAY_PORTVERSION=	1.4.0
 
 SQLRELAY_PORTDIR=	databases/${SQLRELAY_PORTNAME}
 SQLRELAY_WRKSRC_CMD=	cd ${PORTSDIR}/${SQLRELAY_PORTDIR} && ${MAKE} -V WRKSRC
diff --git a/databases/sqlrelay/distinfo b/databases/sqlrelay/distinfo
index dfe62aca9ec6..eef408046a82 100644
--- a/databases/sqlrelay/distinfo
+++ b/databases/sqlrelay/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1529397026
-SHA256 (sqlrelay-1.3.0.tar.gz) = fb06e392af2980da9f9862bcf18dc83fb62917eecc660eaf4361482ee6edcf9a
-SIZE (sqlrelay-1.3.0.tar.gz) = 22126299
+TIMESTAMP = 1545557205
+SHA256 (sqlrelay-1.4.0.tar.gz) = a242ab9bc894594f8722d8cd0b032859637c130c84e430208af2e77b26c90a0c
+SIZE (sqlrelay-1.4.0.tar.gz) = 87347311
diff --git a/databases/sqlrelay/pkg-plist b/databases/sqlrelay/pkg-plist
index 6728a1236138..7b896edb3393 100644
--- a/databases/sqlrelay/pkg-plist
+++ b/databases/sqlrelay/pkg-plist
@@ -72,6 +72,8 @@ include/sqlrelay/private/sqlrquery.h
 include/sqlrelay/private/sqlrquerycursor.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
@@ -107,12 +109,12 @@ lib/libsqlrclientwrapper.so.5
 lib/libsqlrclientwrapper.so.5.0.0
 lib/libsqlrserver.a
 lib/libsqlrserver.so
-lib/libsqlrserver.so.7
-lib/libsqlrserver.so.7.0.0
+lib/libsqlrserver.so.8
+lib/libsqlrserver.so.8.0.0
 lib/libsqlrutil.a
 lib/libsqlrutil.so
-lib/libsqlrutil.so.7
-lib/libsqlrutil.so.7.0.0
+lib/libsqlrutil.so.8
+lib/libsqlrutil.so.8.0.0
 libdata/pkgconfig/sqlrelay-c++.pc
 libdata/pkgconfig/sqlrelay-c.pc
 libexec/sqlrelay/sqlrauth_database.so
@@ -129,6 +131,7 @@ libexec/sqlrelay/sqlrlogger_custom_nw.so
 libexec/sqlrelay/sqlrlogger_custom_sc.so
 libexec/sqlrelay/sqlrlogger_debug.so
 libexec/sqlrelay/sqlrlogger_slowqueries.so
+libexec/sqlrelay/sqlrlogger_stalecursors.so
 libexec/sqlrelay/sqlrnotification_events.so
 libexec/sqlrelay/sqlrparser_default.so
 libexec/sqlrelay/sqlrprotocol_sqlrclient.so