5 files changed, 35 insertions, 44 deletions

diff --git a/databases/sqlrelay/Makefile b/databases/sqlrelay/Makefile
index 6659f26f6cdc..60ded16720a8 100644
--- a/databases/sqlrelay/Makefile
+++ b/databases/sqlrelay/Makefile
@@ -43,16 +43,16 @@ TOSTRIP=	bin/sqlr-start \
 		bin/sqlr-pwdenc \
 		bin/sqlr-status \
 		bin/sqlrsh \
-		lib/libsqlrutil-0.59.so.1.0.0 \
-		lib/libsqlrclient-0.59.so.1.0.0 \
-		lib/libsqlrclientwrapper-0.59.so.1.0.0 \
-		lib/libpqsqlrelay-0.59.so.1.0.0 \
-		lib/libmysql3sqlrelay-0.59.so.1.0.0 \
-		lib/libmysql40sqlrelay-0.59.so.1.0.0 \
-		lib/libmysql41sqlrelay-0.59.so.1.0.0 \
-		lib/libmysql50sqlrelay-0.59.so.1.0.0 \
-		lib/libmysql51sqlrelay-0.59.so.1.0.0 \
-		lib/libsqlrserver-0.59.so.1.0.0 \
+		lib/libsqlrutil-${SQLRELAY_PORTVERSION}.so.1.0.0 \
+		lib/libsqlrclient-${SQLRELAY_PORTVERSION}.so.1.0.0 \
+		lib/libsqlrclientwrapper-${SQLRELAY_PORTVERSION}.so.1.0.0 \
+		lib/libpqsqlrelay-${SQLRELAY_PORTVERSION}.so.1.0.0 \
+		lib/libmysql3sqlrelay-${SQLRELAY_PORTVERSION}.so.1.0.0 \
+		lib/libmysql40sqlrelay-${SQLRELAY_PORTVERSION}.so.1.0.0 \
+		lib/libmysql41sqlrelay-${SQLRELAY_PORTVERSION}.so.1.0.0 \
+		lib/libmysql50sqlrelay-${SQLRELAY_PORTVERSION}.so.1.0.0 \
+		lib/libmysql51sqlrelay-${SQLRELAY_PORTVERSION}.so.1.0.0 \
+		lib/libsqlrserver-${SQLRELAY_PORTVERSION}.so.1.0.0 \
 		libexec/sqlrelay/sqlrauth_default.so \
 		libexec/sqlrelay/sqlrauth_sqlrelay.so \
 		libexec/sqlrelay/sqlrconnection_router.so \
diff --git a/databases/sqlrelay/Makefile.common b/databases/sqlrelay/Makefile.common
index d48938e203fb..ae74a655698a 100644
--- a/databases/sqlrelay/Makefile.common
+++ b/databases/sqlrelay/Makefile.common
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 SQLRELAY_PORTNAME=	sqlrelay
-SQLRELAY_PORTVERSION=	0.59
+SQLRELAY_PORTVERSION=	0.60
 
 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 1b94d4588118..a863bc9d599b 100644
--- a/databases/sqlrelay/distinfo
+++ b/databases/sqlrelay/distinfo
@@ -1,2 +1,2 @@
-SHA256 (sqlrelay-0.59.tar.gz) = f2e6433a153cd64684980246574654d49a1df8d4b5bcde75634e8fb19f405c02
-SIZE (sqlrelay-0.59.tar.gz) = 3224000
+SHA256 (sqlrelay-0.60.tar.gz) = aa7dc9a11d99d51f4104ee0e5d5040b1bb16034878303336aec75933d12ce06a
+SIZE (sqlrelay-0.60.tar.gz) = 3224288
diff --git a/databases/sqlrelay/files/patch-config.mk.in b/databases/sqlrelay/files/patch-config.mk.in
index 5b21b1787ba8..305ecb069242 100644
--- a/databases/sqlrelay/files/patch-config.mk.in
+++ b/databases/sqlrelay/files/patch-config.mk.in
@@ -9,12 +9,3 @@
  dotnetdir = $(libdir)
  libexecdir = @libexecdir@/sqlrelay
  bindir = @bindir@
-@@ -59,7 +59,7 @@ OBJ = lo
- TMPDIRCPPFLAG = -DTMP_DIR=\"$(tmpdir)\"
- DEBUGDIRCPPFLAG = -DDEBUG_DIR=\"$(debugdir)\"
- LOGDIRCPPFLAG = -DLOG_DIR=\"$(logdir)\"
--CONFIGFILECPPFLAG = -DDEFAULT_CONFIG_FILE=\"$(sysconfdir)/sqlrelay.conf\" -DDEFAULT_CONFIG_DIR=\"$(sysconfdir)/sqlrelay.conf.d\"
-+CONFIGFILECPPFLAG = -DDEFAULT_CONFIG_FILE=\"$(sysconfdir)/sqlrelay.conf\" -DDEFAULT_CONFIG_DIR=\"$(sysconfdir)/sqlrelay\"
- CACHEDIRCPPFLAG = -DCACHE_DIR=\"$(cachedir)\"
- 
- 
diff --git a/databases/sqlrelay/pkg-plist b/databases/sqlrelay/pkg-plist
index 405ad7fac6af..de3ef931353e 100644
--- a/databases/sqlrelay/pkg-plist
+++ b/databases/sqlrelay/pkg-plist
@@ -43,43 +43,43 @@ include/sqlrelay/sqlrclientwrapper.h
 include/sqlrelay/sqlrserver.h
 include/sqlrelay/sqlrutil.h
 lib/libmysql3sqlrelay.so
-lib/libmysql3sqlrelay-0.59.so.1
-lib/libmysql3sqlrelay-0.59.so.1.0.0
+lib/libmysql3sqlrelay-0.60.so.1
+lib/libmysql3sqlrelay-0.60.so.1.0.0
 lib/libmysql40sqlrelay.so
-lib/libmysql40sqlrelay-0.59.so.1
-lib/libmysql40sqlrelay-0.59.so.1.0.0
+lib/libmysql40sqlrelay-0.60.so.1
+lib/libmysql40sqlrelay-0.60.so.1.0.0
 lib/libmysql41sqlrelay.so
-lib/libmysql41sqlrelay-0.59.so.1
-lib/libmysql41sqlrelay-0.59.so.1.0.0
+lib/libmysql41sqlrelay-0.60.so.1
+lib/libmysql41sqlrelay-0.60.so.1.0.0
 lib/libmysql50sqlrelay.so
-lib/libmysql50sqlrelay-0.59.so.1
-lib/libmysql50sqlrelay-0.59.so.1.0.0
+lib/libmysql50sqlrelay-0.60.so.1
+lib/libmysql50sqlrelay-0.60.so.1.0.0
 lib/libmysql51sqlrelay.so
-lib/libmysql51sqlrelay-0.59.so.1
-lib/libmysql51sqlrelay-0.59.so.1.0.0
+lib/libmysql51sqlrelay-0.60.so.1
+lib/libmysql51sqlrelay-0.60.so.1.0.0
 lib/libpqsqlrelay.so
-lib/libpqsqlrelay-0.59.so.1
-lib/libpqsqlrelay-0.59.so.1.0.0
+lib/libpqsqlrelay-0.60.so.1
+lib/libpqsqlrelay-0.60.so.1.0.0
 lib/libsqlrclient.a
 lib/libsqlrclient.so
-lib/libsqlrclient-0.59.so.1
-lib/libsqlrclient-0.59.so.1.0.0
+lib/libsqlrclient-0.60.so.1
+lib/libsqlrclient-0.60.so.1.0.0
 lib/libsqlrclientwrapper.a
 lib/libsqlrclientwrapper.so
-lib/libsqlrclientwrapper-0.59.so.1
-lib/libsqlrclientwrapper-0.59.so.1.0.0
+lib/libsqlrclientwrapper-0.60.so.1
+lib/libsqlrclientwrapper-0.60.so.1.0.0
 %%ODBC%%lib/libsqlrodbc.a
 %%ODBC%%lib/libsqlrodbc.so
-%%ODBC%%lib/libsqlrodbc-0.59.so.1
-%%ODBC%%lib/libsqlrodbc-0.59.so.1.0.0
+%%ODBC%%lib/libsqlrodbc-0.60.so.1
+%%ODBC%%lib/libsqlrodbc-0.60.so.1.0.0
 lib/libsqlrserver.a
 lib/libsqlrserver.so
-lib/libsqlrserver-0.59.so.1
-lib/libsqlrserver-0.59.so.1.0.0
+lib/libsqlrserver-0.60.so.1
+lib/libsqlrserver-0.60.so.1.0.0
 lib/libsqlrutil.a
 lib/libsqlrutil.so
-lib/libsqlrutil-0.59.so.1
-lib/libsqlrutil-0.59.so.1.0.0
+lib/libsqlrutil-0.60.so.1
+lib/libsqlrutil-0.60.so.1.0.0
 libdata/pkgconfig/sqlrelay-c++.pc
 libdata/pkgconfig/sqlrelay-c.pc
 %%FIREBIRD%%libexec/sqlrelay/sqlrconnection_firebird.so