4 files changed, 47 insertions, 39 deletions

diff --git a/databases/sqlrelay/Makefile b/databases/sqlrelay/Makefile
index 564e8732c5d0..f5fdfb9e1b2c 100644
--- a/databases/sqlrelay/Makefile
+++ b/databases/sqlrelay/Makefile
@@ -11,10 +11,12 @@ COMMENT=	Persistent DB connection pooling/proxying/load balancing system
 
 LICENSE=	LGPL20
 
-LIB_DEPENDS=	librudiments.so:devel/rudiments
+LIB_DEPENDS=	librudiments.so:devel/rudiments \
+		libkrb5.so:security/krb5 \
+		libcurl.so:ftp/curl
 
 WANT_GNOME=	yes
-USES=		gmake libtool pathfix python
+USES=		gmake libtool pathfix python readline
 PATHFIX_MAKEFILEIN=	Makefile
 CPPFLAGS+=	-I${LOCALBASE}/include
 GNU_CONFIGURE=	yes
@@ -46,17 +48,17 @@ TOSTRIP=	bin/sqlr-start \
 		bin/sqlr-pwdenc \
 		bin/sqlr-status \
 		bin/sqlrsh \
-		lib/libsqlrodbc.so.2.0.0 \
-		lib/libsqlrutil.so.2.0.0 \
-		lib/libsqlrclient.so.2.0.0 \
-		lib/libsqlrclientwrapper.so.2.0.0 \
-		lib/libpqsqlrelay.so.2.0.0 \
-		lib/libmysql3sqlrelay.so.2.0.0 \
-		lib/libmysql40sqlrelay.so.2.0.0 \
-		lib/libmysql41sqlrelay.so.2.0.0 \
-		lib/libmysql50sqlrelay.so.2.0.0 \
-		lib/libmysql51sqlrelay.so.2.0.0 \
-		lib/libsqlrserver.so.2.0.0 \
+		lib/libsqlrodbc.so.4.0.0 \
+		lib/libsqlrutil.so.4.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.4.0.0 \
 		libexec/sqlrelay/sqlrauth_database.so \
 		libexec/sqlrelay/sqlrauth_krb_userlist.so \
 		libexec/sqlrelay/sqlrauth_proxied.so \
@@ -73,6 +75,7 @@ TOSTRIP=	bin/sqlr-start \
 		libexec/sqlrelay/sqlrlogger_custom_sc.so \
 		libexec/sqlrelay/sqlrlogger_debug.so \
 		libexec/sqlrelay/sqlrlogger_slowqueries.so \
+		libexec/sqlrelay/sqlrnotification_events.so \
 		libexec/sqlrelay/sqlrparser_default.so \
 		libexec/sqlrelay/sqlrprotocol_sqlrclient.so \
 		libexec/sqlrelay/sqlrpwdenc_crypt.so \
@@ -81,6 +84,11 @@ TOSTRIP=	bin/sqlr-start \
 		libexec/sqlrelay/sqlrquery_sqlrcmdcstat.so \
 		libexec/sqlrelay/sqlrquery_sqlrcmdgstat.so \
 		libexec/sqlrelay/sqlrresultsettranslation_reformatdatetime.so \
+		libexec/sqlrelay/sqlrresultsettranslation_test.so \
+		libexec/sqlrelay/sqlrrouter_clientiplist.so \
+		libexec/sqlrelay/sqlrrouter_regex.so \
+		libexec/sqlrelay/sqlrrouter_userlist.so \
+		libexec/sqlrelay/sqlrschedule_cron_userlist.so \
 		libexec/sqlrelay/sqlrtranslation_normalize.so
 
 .include "${.CURDIR}/Makefile.common"
diff --git a/databases/sqlrelay/Makefile.common b/databases/sqlrelay/Makefile.common
index 590fe8893d58..d80ab7845974 100644
--- a/databases/sqlrelay/Makefile.common
+++ b/databases/sqlrelay/Makefile.common
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 SQLRELAY_PORTNAME=	sqlrelay
-SQLRELAY_PORTVERSION=	0.67.0
+SQLRELAY_PORTVERSION=	1.0.0
 
 SQLRELAY_PORTDIR=	${PORTSDIR}/databases/${SQLRELAY_PORTNAME}
 SQLRELAY_WRKSRC_CMD=	cd ${SQLRELAY_PORTDIR} && ${MAKE} -V WRKSRC
diff --git a/databases/sqlrelay/distinfo b/databases/sqlrelay/distinfo
index 5f3204253444..bae89620dfce 100644
--- a/databases/sqlrelay/distinfo
+++ b/databases/sqlrelay/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1479760331
-SHA256 (sqlrelay-0.67.0.tar.gz) = 1121685bbe43b292885a6d89f2f7f1efaaf7cc4bd05baa591e2c1e72d9ba6e6f
-SIZE (sqlrelay-0.67.0.tar.gz) = 4241603
+TIMESTAMP = 1484807374
+SHA256 (sqlrelay-1.0.0.tar.gz) = a62e1479f428381b8f8e3ed34c8b4d3223fbe86aff1ef29f305b53c482f50f8b
+SIZE (sqlrelay-1.0.0.tar.gz) = 4194484
diff --git a/databases/sqlrelay/pkg-plist b/databases/sqlrelay/pkg-plist
index 663df5b1af67..afe48ecee0a5 100644
--- a/databases/sqlrelay/pkg-plist
+++ b/databases/sqlrelay/pkg-plist
@@ -65,42 +65,42 @@ include/sqlrelay/sqlrclientwrapper.h
 include/sqlrelay/sqlrserver.h
 include/sqlrelay/sqlrutil.h
 lib/libmysql3sqlrelay.so
-lib/libmysql3sqlrelay.so.3
-lib/libmysql3sqlrelay.so.3.0.0
+lib/libmysql3sqlrelay.so.4
+lib/libmysql3sqlrelay.so.4.0.0
 lib/libmysql40sqlrelay.so
-lib/libmysql40sqlrelay.so.3
-lib/libmysql40sqlrelay.so.3.0.0
+lib/libmysql40sqlrelay.so.4
+lib/libmysql40sqlrelay.so.4.0.0
 lib/libmysql41sqlrelay.so
-lib/libmysql41sqlrelay.so.3
-lib/libmysql41sqlrelay.so.3.0.0
+lib/libmysql41sqlrelay.so.4
+lib/libmysql41sqlrelay.so.4.0.0
 lib/libmysql50sqlrelay.so
-lib/libmysql50sqlrelay.so.3
-lib/libmysql50sqlrelay.so.3.0.0
+lib/libmysql50sqlrelay.so.4
+lib/libmysql50sqlrelay.so.4.0.0
 lib/libmysql51sqlrelay.so
-lib/libmysql51sqlrelay.so.3
-lib/libmysql51sqlrelay.so.3.0.0
+lib/libmysql51sqlrelay.so.4
+lib/libmysql51sqlrelay.so.4.0.0
 lib/libpqsqlrelay.so
-lib/libpqsqlrelay.so.3
-lib/libpqsqlrelay.so.3.0.0
+lib/libpqsqlrelay.so.4
+lib/libpqsqlrelay.so.4.0.0
 lib/libsqlrclient.a
 lib/libsqlrclient.so
-lib/libsqlrclient.so.3
-lib/libsqlrclient.so.3.0.0
+lib/libsqlrclient.so.4
+lib/libsqlrclient.so.4.0.0
 lib/libsqlrclientwrapper.a
 lib/libsqlrclientwrapper.so
-lib/libsqlrclientwrapper.so.3
-lib/libsqlrclientwrapper.so.3.0.0
+lib/libsqlrclientwrapper.so.4
+lib/libsqlrclientwrapper.so.4.0.0
 %%ODBC%%lib/libsqlrodbc.so
-%%ODBC%%lib/libsqlrodbc.so.3
-%%ODBC%%lib/libsqlrodbc.so.3.0.0
+%%ODBC%%lib/libsqlrodbc.so.4
+%%ODBC%%lib/libsqlrodbc.so.4.0.0
 lib/libsqlrserver.a
 lib/libsqlrserver.so
-lib/libsqlrserver.so.3
-lib/libsqlrserver.so.3.0.0
+lib/libsqlrserver.so.4
+lib/libsqlrserver.so.4.0.0
 lib/libsqlrutil.a
 lib/libsqlrutil.so
-lib/libsqlrutil.so.3
-lib/libsqlrutil.so.3.0.0
+lib/libsqlrutil.so.4
+lib/libsqlrutil.so.4.0.0
 libdata/pkgconfig/sqlrelay-c++.pc
 libdata/pkgconfig/sqlrelay-c.pc
 libexec/sqlrelay/sqlrauth_database.so