5 files changed, 61 insertions, 34 deletions

diff --git a/databases/sqlrelay/Makefile b/databases/sqlrelay/Makefile
index c70459498791..774d30bb9570 100644
--- a/databases/sqlrelay/Makefile
+++ b/databases/sqlrelay/Makefile
@@ -3,20 +3,18 @@
 
 PORTNAME=	${SQLRELAY_PORTNAME}
 PORTVERSION=	${SQLRELAY_PORTVERSION}
-PORTREVISION=	2
 CATEGORIES=	databases
 MASTER_SITES=	SF
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	pi@FreeBSD.org
 COMMENT=	Persistent DB connection pooling/proxying/load balancing system
 
 LIB_DEPENDS=	librudiments.so:${PORTSDIR}/devel/rudiments
 
-BROKEN=		Does not build
 WANT_GNOME=	yes
-USES=		gmake
-USE_AUTOTOOLS=	autoconf libtool
+USES=		gmake autoreconf libtool
 CPPFLAGS+=	-I${LOCALBASE}/include
+GNU_CONFIGURE=	yes
 CONFIGURE_ENV=		${SQLRELAY_CONFIGURE_ENV}
 CONFIGURE_ARGS=		${SQLRELAY_CONFIGURE_ARGS} \
 			--disable-tcl \
@@ -26,12 +24,48 @@ CONFIGURE_ARGS=		${SQLRELAY_CONFIGURE_ARGS} \
 			--disable-php \
 			--disable-python \
 			--disable-ruby \
+			--disable-erlang \
 			--disable-zope
 MAKE_JOBS_UNSAFE=yes
 USE_LDCONFIG=	yes
 
 PORTDOCS=	*
 
+TOSTRIP=	bin/sqlr-start \
+		bin/sqlr-listener \
+		bin/sqlr-connection \
+		bin/sqlr-scaler \
+		bin/sqlr-cachemanager \
+		bin/sqlr-fields \
+		bin/sqlr-query \
+		bin/sqlr-export \
+		bin/sqlr-import \
+		bin/sqlr-pwdenc \
+		bin/sqlr-status \
+		bin/sqlrsh \
+		lib/libsqlrutil.so.0.0.0 \
+		lib/libsqlrclient.so.0.0.0 \
+		lib/libsqlrclientwrapper.so.0.0.0 \
+		lib/libpqsqlrelay.so.0.0.0 \
+		lib/libmysql3sqlrelay.so.0.0.0 \
+		lib/libmysql40sqlrelay.so.0.0.0 \
+		lib/libmysql41sqlrelay.so.0.0.0 \
+		lib/libmysql50sqlrelay.so.0.0.0 \
+		lib/libmysql51sqlrelay.so.0.0.0 \
+		lib/libsqlrserver.so.0.0.0 \
+		libexec/sqlrelay/sqlrquery_sqlrcmdgstat.so \
+		libexec/sqlrelay/sqlrquery_sqlrcmdcstat.so \
+		libexec/sqlrelay/sqlrlogger_debug.so \
+		libexec/sqlrelay/sqlrlogger_slowqueries.so \
+		libexec/sqlrelay/sqlrlogger_custom_nw.so \
+		libexec/sqlrelay/sqlrlogger_custom_sc.so \
+		libexec/sqlrelay/sqlrpwdenc_rot.so \
+		libexec/sqlrelay/sqlrpwdenc_md5.so \
+		libexec/sqlrelay/sqlrpwdenc_crypt.so \
+		libexec/sqlrelay/sqlrauth_default.so \
+		libexec/sqlrelay/sqlrauth_sqlrelay.so \
+		libexec/sqlrelay/sqlrconnection_router.so
+
 .include "${.CURDIR}/Makefile.common"
 
 OPTIONS_DEFINE=	MYSQL ODBC ORACLE PGSQL SQLITE3 FREETDS FIREBIRD DOCS
@@ -54,6 +88,7 @@ CONFIGURE_ARGS+=	--without-gdbm-prefix \
 .if ${PORT_OPTIONS:MMYSQL}
 USE_MYSQL=	yes
 CONFIGURE_ARGS+=	--with-mysql-prefix="${LOCALBASE}"
+TOSTRIP+=		libexec/sqlrelay/sqlrconnection_mysql.so
 .else
 CONFIGURE_ARGS+=	--disable-mysql
 .endif
@@ -102,4 +137,9 @@ post-patch:
 post-configure:
 	@${REINPLACE_CMD} 's,-Werror,,' ${WRKSRC}/config.mk
 
+post-stage:
+.for f in ${TOSTRIP}
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${f}
+.endfor
+
 .include <bsd.port.mk>
diff --git a/databases/sqlrelay/Makefile.common b/databases/sqlrelay/Makefile.common
index 7a4df997025b..93db51fb4cb3 100644
--- a/databases/sqlrelay/Makefile.common
+++ b/databases/sqlrelay/Makefile.common
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 SQLRELAY_PORTNAME=	sqlrelay
-SQLRELAY_PORTVERSION=	0.53.1
+SQLRELAY_PORTVERSION=	0.56
 
 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 75de05ab5e20..22da6daacc41 100644
--- a/databases/sqlrelay/distinfo
+++ b/databases/sqlrelay/distinfo
@@ -1,2 +1,2 @@
-SHA256 (sqlrelay-0.53.1.tar.gz) = 9608c4a398658a5085f9040959ac7d17ae100d0e4cf99c54fadecccbe6283931
-SIZE (sqlrelay-0.53.1.tar.gz) = 3376307
+SHA256 (sqlrelay-0.56.tar.gz) = 3dca390fb434d7116fc443e23578c7cf2101be29169ec088640f15775ad8d391
+SIZE (sqlrelay-0.56.tar.gz) = 3717761
diff --git a/databases/sqlrelay/files/patch-config.mk.in b/databases/sqlrelay/files/patch-config.mk.in
index a57b5ca8dd54..e5c0b21c6869 100644
--- a/databases/sqlrelay/files/patch-config.mk.in
+++ b/databases/sqlrelay/files/patch-config.mk.in
@@ -14,7 +14,7 @@
  RUDIMENTSPATH = @RUDIMENTSPATH@
  RUDIMENTSINCLUDES = @RUDIMENTSINCLUDES@
 -RUDIMENTSLIBS = @RUDIMENTSLIBS@
-+RUDIMENTSLIBS = @RUDIMENTSLIBS@ -lssl -lcrypto
++RUDIMENTSLIBS = @RUDIMENTSLIBS@ -lssl -lcrypto -lpthread
  RUDIMENTSLIBSPATH = @RUDIMENTSLIBSPATH@ 
  
  #iconv
diff --git a/databases/sqlrelay/pkg-plist b/databases/sqlrelay/pkg-plist
index 1e8da47e6188..380971cb4a80 100644
--- a/databases/sqlrelay/pkg-plist
+++ b/databases/sqlrelay/pkg-plist
@@ -36,34 +36,40 @@ include/sqlrelay/sqlrclientwrapper.h
 include/sqlrelay/sqlrpwdenc.h
 lib/libmysql3sqlrelay.so
 lib/libmysql3sqlrelay.so.0
+lib/libmysql3sqlrelay.so.0.0.0
 lib/libmysql40sqlrelay.so
 lib/libmysql40sqlrelay.so.0
+lib/libmysql40sqlrelay.so.0.0.0
 lib/libmysql41sqlrelay.so
 lib/libmysql41sqlrelay.so.0
+lib/libmysql41sqlrelay.so.0.0.0
 lib/libmysql50sqlrelay.so
 lib/libmysql50sqlrelay.so.0
+lib/libmysql50sqlrelay.so.0.0.0
 lib/libmysql51sqlrelay.so
 lib/libmysql51sqlrelay.so.0
+lib/libmysql51sqlrelay.so.0.0.0
 lib/libpqsqlrelay.so
 lib/libpqsqlrelay.so.0
+lib/libpqsqlrelay.so.0.0.0
 lib/libsqlrclient.a
-lib/libsqlrclient.la
 lib/libsqlrclient.so
 lib/libsqlrclient.so.0
+lib/libsqlrclient.so.0.0.0
 lib/libsqlrclientwrapper.a
-lib/libsqlrclientwrapper.la
 lib/libsqlrclientwrapper.so
 lib/libsqlrclientwrapper.so.0
+lib/libsqlrclientwrapper.so.0.0.0
 %%ODBC%%lib/libsqlrodbc.so
 %%ODBC%%lib/libsqlrodbc.so.0
 lib/libsqlrserver.a
-lib/libsqlrserver.la
 lib/libsqlrserver.so
 lib/libsqlrserver.so.0
+lib/libsqlrserver.so.0.0.0
 lib/libsqlrutil.a
-lib/libsqlrutil.la
 lib/libsqlrutil.so
 lib/libsqlrutil.so.0
+lib/libsqlrutil.so.0.0.0
 libdata/pkgconfig/sqlrelay-c++.pc
 libdata/pkgconfig/sqlrelay-c.pc
 %%FIREBIRD%%libexec/sqlrelay/sqlrconnection_firebird.so
@@ -72,6 +78,8 @@ libdata/pkgconfig/sqlrelay-c.pc
 %%ODBC%%libexec/sqlrelay/sqlrconnection_odbc.so
 %%PGSQL%%libexec/sqlrelay/sqlrconnection_postgresql.so
 %%SQLITE3%%libexec/sqlrelay/sqlrconnection_sqlite.so
+libexec/sqlrelay/sqlrauth_default.so
+libexec/sqlrelay/sqlrauth_sqlrelay.so
 libexec/sqlrelay/sqlrconnection_router.so
 libexec/sqlrelay/sqlrlogger_custom_nw.so
 libexec/sqlrelay/sqlrlogger_custom_sc.so
@@ -82,27 +90,6 @@ libexec/sqlrelay/sqlrpwdenc_md5.so
 libexec/sqlrelay/sqlrpwdenc_rot.so
 libexec/sqlrelay/sqlrquery_sqlrcmdcstat.so
 libexec/sqlrelay/sqlrquery_sqlrcmdgstat.so
-libexec/sqlrelay/sqltranslation_concat.so
-libexec/sqlrelay/sqltranslation_doublequotestosinglequotes.so
-libexec/sqlrelay/sqltranslation_forupdatemssqlserverize.so
-libexec/sqlrelay/sqltranslation_informixtomssqlserverdate.so
-libexec/sqlrelay/sqltranslation_informixtomssqlserverselectinto.so
-libexec/sqlrelay/sqltranslation_informixtooracledate.so
-libexec/sqlrelay/sqltranslation_locksmssqlserverize.so
-libexec/sqlrelay/sqltranslation_locksnowaitbydefault.so
-libexec/sqlrelay/sqltranslation_matchestolike.so
-libexec/sqlrelay/sqltranslation_oracleize.so
-libexec/sqlrelay/sqltranslation_serialtoautoincrement.so
-libexec/sqlrelay/sqltranslation_serialtoidentity.so
-libexec/sqlrelay/sqltranslation_show.so
-libexec/sqlrelay/sqltranslation_temptablesaddmissingcolumns.so
-libexec/sqlrelay/sqltranslation_temptableslocalize.so
-libexec/sqlrelay/sqltranslation_temptablessybaseize.so
-libexec/sqlrelay/sqltranslation_translatedatetimes.so
-libexec/sqlrelay/sqltranslation_uniquetodistinct.so
-libexec/sqlrelay/sqltrigger_createtableautoincrementoracle.so
-libexec/sqlrelay/sqltrigger_droplocalizedtemptables.so
-libexec/sqlrelay/sqltrigger_droptableautoincrementoracle.so
 man/man1/sqlr-fields.1.gz
 man/man1/sqlr-query.1.gz
 man/man1/sqlrsh.1.gz