9 files changed, 124 insertions, 173 deletions

diff --git a/databases/sqlrelay/Makefile b/databases/sqlrelay/Makefile
index defbbf248e8f..c164d5eff274 100644
--- a/databases/sqlrelay/Makefile
+++ b/databases/sqlrelay/Makefile
@@ -7,12 +7,12 @@ CATEGORIES=	databases
 MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A persistent DB connection pooling/proxying/load balancing system
+COMMENT=	Persistent DB connection pooling/proxying/load balancing system
 
-LIB_DEPENDS=	rudiments.1:${PORTSDIR}/devel/rudiments
+LIB_DEPENDS=	librudiments.so:${PORTSDIR}/devel/rudiments
 
 WANT_GNOME=	yes
-USE_GMAKE=	yes
+USES=		gmake
 USE_AUTOTOOLS=	autoconf libtool
 CPPFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ENV=		${SQLRELAY_CONFIGURE_ENV}
@@ -24,107 +24,70 @@ CONFIGURE_ARGS=		${SQLRELAY_CONFIGURE_ARGS} \
 			--disable-python \
 			--disable-ruby \
 			--disable-zope
+MAKE_JOBS_UNSAFE=yes
 USE_LDCONFIG=	yes
 
 PORTDOCS=	*
 
-NO_STAGE=	yes
 .include "${.CURDIR}/Makefile.common"
 
-OPTIONS_DEFINE=	MSQL MYSQL ODBC PGSQL SQLITE2 FREETDS INTERBASE GTK1 DOCS
-SQLITE2_DESC=	SQLite 2 database
-INTERBASE_DESC=	Interbase database
+OPTIONS_DEFINE=	MSQL MYSQL ODBC PGSQL SQLITE3 FREETDS FIREBIRD DOCS
+OPTIONS_SUB=	yes
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MSQLITE2}
-LIB_DEPENDS+=		gdbm.4:${PORTSDIR}/databases/gdbm \
-			sqlite.2:${PORTSDIR}/databases/sqlite2
+.if ${PORT_OPTIONS:MSQLITE3}
+LIB_DEPENDS+=		libgdbm.so:${PORTSDIR}/databases/gdbm \
+			libsqlite3.so:${PORTSDIR}/databases/sqlite3
 CONFIGURE_ARGS+=	--with-gdbm-prefix="${LOCALBASE}" \
 			--with-sqlite-prefix="${LOCALBASE}"
-IF_SQLITE=	""
 .else
 CONFIGURE_ARGS+=	--without-gdbm-prefix \
 			--disable-sqlite
-IF_SQLITE=	"@comment "
 .endif
 
 .if ${PORT_OPTIONS:MMYSQL}
 USE_MYSQL=	yes
 CONFIGURE_ARGS+=	--with-mysql-prefix="${LOCALBASE}"
-IF_MYSQL=	""
 .else
 CONFIGURE_ARGS+=	--disable-mysql
-IF_MYSQL=	"@comment "
 .endif
 
-.if ${PORT_OPTIONS:MINTERBASE}
+.if ${PORT_OPTIONS:MFIREBIRD}
 USE_FIREBIRD=	yes
-CONFIGURE_ARGS+=	--with-interbase-prefix="${LOCALBASE}"
-IF_INTERBASE=	""
+CONFIGURE_ARGS+=	--with-firebird-prefix="${LOCALBASE}"
 .else
-CONFIGURE_ARGS+=	--disable-interbase
-IF_INTERBASE=	"@comment "
+CONFIGURE_ARGS+=	--disable-firebird
 .endif
 
 .if ${PORT_OPTIONS:MMSQL}
-LIB_DEPENDS+=		msql.1:${PORTSDIR}/databases/msql
+LIB_DEPENDS+=		libmsql.so:${PORTSDIR}/databases/msql
 CONFIGURE_ARGS+=	--with-msql-prefix="${LOCALBASE}"
-IF_MSQL=	""
 .else
 CONFIGURE_ARGS+=	--disable-msql
-IF_MSQL=	"@comment "
 .endif
 
 .if ${PORT_OPTIONS:MPGSQL}
 USE_PGSQL=	yes
 CONFIGURE_ARGS+=	--with-postgresql-prefix="${LOCALBASE}"
-IF_POSTGRESQL=	""
 .else
 CONFIGURE_ARGS+=	--disable-postgresql
-IF_POSTGRESQL=	"@comment "
 .endif
 
 .if ${PORT_OPTIONS:MODBC}
-LIB_DEPENDS+=		odbc.2:${PORTSDIR}/databases/unixODBC
+LIB_DEPENDS+=		libodbc.so:${PORTSDIR}/databases/unixODBC
 CONFIGURE_ARGS+=	--with-odbc-prefix="${LOCALBASE}"
-IF_ODBC=	""
 .else
 CONFIGURE_ARGS+=	--disable-odbc
-IF_ODBC=	"@comment "
 .endif
 
 .if ${PORT_OPTIONS:MFREETDS}
-LIB_DEPENDS+=		tds.5:${PORTSDIR}/databases/freetds
+LIB_DEPENDS+=		libtds.so:${PORTSDIR}/databases/freetds
 CONFIGURE_ARGS+=	--with-freetds-prefix="${LOCALBASE}"
-IF_FREETDS=	""
 .else
 CONFIGURE_ARGS+=	--disable-freetds
-IF_FREETDS=	"@comment "
 .endif
 
-.if ${PORT_OPTIONS:MGTK1}
-USE_GNOME+=		gtk12
-CONFIGURE_ARGS+=	--with-gtk-prefix="${LOCALBASE}"
-IF_GTK=		""
-.else
-CONFIGURE_ARGS+=	--disable-gtk
-IF_GTK=		"@comment "
-.endif
-
-PLIST_SUB=	IF_SQLITE=${IF_SQLITE} \
-		IF_MYSQL=${IF_MYSQL} \
-		IF_MSQL=${IF_MSQL} \
-		IF_POSTGRESQL=${IF_POSTGRESQL} \
-		IF_ODBC=${IF_ODBC} \
-		IF_FREETDS=${IF_FREETDS} \
-		IF_INTERBASE=${IF_INTERBASE} \
-		IF_GTK=${IF_GTK}
-
-MAN1=		fields.1 query.1 query.py.1 sqlrsh.1
-MAN8=		sqlr-connection.8 sqlr-cachemanager.8 sqlr-ipclean.8 \
-		sqlr-listener.8 sqlr-scaler.8 sqlr-start.8 sqlr-stop.8
-
 post-patch:
 	${REINPLACE_CMD} -E \
 		-e 's,(freebsd.*)/usr/local(.*rc.d),\1${PREFIX}\2/sqlrelay.sh-sample,' \
@@ -137,8 +100,8 @@ post-patch:
 	@${REINPLACE_CMD} -e '/EXAMPLEDIR/d' ${WRKSRC}/etc/Makefile
 	${FIND} ${WRKSRC} -name Makefile | ${XARGS} ${REINPLACE_CMD} -E \
 		-e 's#-release \$$\(SQLR_VERSION\)##g;'
-.if ! ${PORT_OPTIONS:MDOCS}
-	 @${REINPLACE_CMD} '/$$(MAKE) -C doc/d' ${WRKSRC}/Makefile
-.endif
+
+post-configure:
+	@${REINPLACE_CMD} 's,-Werror,,' ${WRKSRC}/config.mk
 
 .include <bsd.port.mk>
diff --git a/databases/sqlrelay/Makefile.common b/databases/sqlrelay/Makefile.common
index 398e1f270316..3fdb8b1d8e5b 100644
--- a/databases/sqlrelay/Makefile.common
+++ b/databases/sqlrelay/Makefile.common
@@ -1,9 +1,9 @@
 # $FreeBSD$
 
 SQLRELAY_PORTNAME=	sqlrelay
-SQLRELAY_PORTVERSION=	0.44
+SQLRELAY_PORTVERSION=	0.52
 
-SQLRELAY_PORTDIR=	${PORTSDIR}/databases/${SQLRELAY_PORTNAME}
+SQLRELAY_PORTDIR=	${.CURDIR}/../${SQLRELAY_PORTNAME}
 SQLRELAY_WRKSRC_CMD=	cd ${SQLRELAY_PORTDIR} && ${MAKE} -V WRKSRC
 
 SQLRELAY_CONFIGURE_ARGS=	\
diff --git a/databases/sqlrelay/distinfo b/databases/sqlrelay/distinfo
index 969d170cd8d0..aaf6ee48b3f1 100644
--- a/databases/sqlrelay/distinfo
+++ b/databases/sqlrelay/distinfo
@@ -1,2 +1,2 @@
-SHA256 (sqlrelay-0.44.tar.gz) = 747392e595aeadb7868509bf325580a311e2755bb8f057026d3df41b8457b6e1
-SIZE (sqlrelay-0.44.tar.gz) = 2120317
+SHA256 (sqlrelay-0.52.tar.gz) = 2682890d2b80214b5dd9884043fe0147e328a27c08ba4f6f8a4a36d4eef6711d
+SIZE (sqlrelay-0.52.tar.gz) = 3376673
diff --git a/databases/sqlrelay/files/patch-acsite.m4 b/databases/sqlrelay/files/patch-acsite.m4
index e4e0e744f203..1b31b565fd04 100644
--- a/databases/sqlrelay/files/patch-acsite.m4
+++ b/databases/sqlrelay/files/patch-acsite.m4
@@ -1,22 +1,21 @@
---- ./acsite.m4.orig	Thu Aug  5 08:04:21 2004
-+++ ./acsite.m4	Sat Dec 11 22:01:02 2004
-@@ -396,7 +396,7 @@
- dnl sets the substitution variable PTHREADLIBS
- AC_DEFUN([FW_CHECK_PTHREAD],
- [
--
+--- acsite.m4.orig	2013-09-21 13:33:47.000000000 +0200
++++ acsite.m4	2013-10-28 19:18:27.846799325 +0100
+@@ -680,6 +680,7 @@
+ 	AC_MSG_RESULT(no)
+ fi
+ 
 +if ( test -z "$PTHREADINCLUDES" -a -z "$PTHREADLIBS" ); then
  HAVE_PTHREAD=""
  PTHREADINCLUDES=""
- PTHREADLIBS=""
-@@ -440,7 +440,9 @@
- 		PTHREADLIBS="-pthread"
- 	fi
+ PTHREADLIB=""
+@@ -808,7 +809,9 @@
+ 		fi
+ 	done
  fi
 -
 +else
 +	HAVE_PTHREAD="yes"
 +fi
  FW_INCLUDES(pthreads,[$PTHREADINCLUDES])
- FW_LIBS(pthreads,[$PTHREADLIBS])
+ FW_LIBS(pthreads,[$PTHREADLIB])
  
diff --git a/databases/sqlrelay/files/patch-config.mk.in b/databases/sqlrelay/files/patch-config.mk.in
index 06b33e5263b3..a57b5ca8dd54 100644
--- a/databases/sqlrelay/files/patch-config.mk.in
+++ b/databases/sqlrelay/files/patch-config.mk.in
@@ -1,15 +1,15 @@
---- config.mk.in.orig	Sun Mar 27 09:48:06 2005
-+++ config.mk.in	Mon May  9 01:51:07 2005
-@@ -16,7 +16,7 @@
+--- config.mk.in.orig	2013-09-22 03:52:29.000000000 +0200
++++ config.mk.in	2013-10-28 18:58:41.039873864 +0100
+@@ -9,7 +9,7 @@
  exec_prefix= @exec_prefix@
  includedir = @includedir@
  libdir = @libdir@
 -javadir = ${exec_prefix}/java
 +javadir = ${exec_prefix}/share/java/classes
- libexecdir = @libexecdir@
+ libexecdir = @libexecdir@/sqlrelay
  bindir = @bindir@
  localstatedir = @localstatedir@
-@@ -88,7 +88,7 @@
+@@ -89,7 +89,7 @@
  # rudiments library
  RUDIMENTSPATH = @RUDIMENTSPATH@
  RUDIMENTSINCLUDES = @RUDIMENTSINCLUDES@
@@ -17,4 +17,4 @@
 +RUDIMENTSLIBS = @RUDIMENTSLIBS@ -lssl -lcrypto
  RUDIMENTSLIBSPATH = @RUDIMENTSLIBSPATH@ 
  
- # perl
+ #iconv
diff --git a/databases/sqlrelay/files/patch-const-char-ptr b/databases/sqlrelay/files/patch-const-char-ptr
deleted file mode 100644
index 8e38b1e4631e..000000000000
--- a/databases/sqlrelay/files/patch-const-char-ptr
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git src/connection/sqlrcursor/queryparse.C src/connection/sqlrcursor/queryparse.C
-index 989cc50..fed0738 100644
---- src/connection/sqlrcursor/queryparse.C
-+++ src/connection/sqlrcursor/queryparse.C
-@@ -61,7 +61,7 @@ void sqlrcursor_svr::checkForTempTable(const char *query, uint32_t length) {
- 	// see if the query matches the pattern for a temporary query that
- 	// creates a temporary table
- 	if (createtemp.match(ptr)) {
--		ptr=createtemp.getSubstringEnd(0);
-+		ptr=(char *)createtemp.getSubstringEnd(0);
- 	} else {
- 		return;
- 	}
-diff --git src/connections/router/routerconnection.C src/connections/router/routerconnection.C
-index b8b4b34..f67fb4b 100644
---- src/connections/router/routerconnection.C
-+++ src/connections/router/routerconnection.C
-@@ -632,7 +632,7 @@ void routercursor::checkForTempTable(const char *query, uint32_t length) {
- 
- 	// look for "create global temporary table "
- 	if (createoratemp.match(ptr)) {
--		ptr=createoratemp.getSubstringEnd(0);
-+		ptr=(char *)createoratemp.getSubstringEnd(0);
- 	} else {
- 		return;
- 	}
diff --git a/databases/sqlrelay/files/patch-src+api+ruby+sqlrelay.C b/databases/sqlrelay/files/patch-src+api+ruby+sqlrelay.C
deleted file mode 100644
index 5804267dd553..000000000000
--- a/databases/sqlrelay/files/patch-src+api+ruby+sqlrelay.C
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/api/ruby/sqlrelay.C.orig	Tue Apr  2 12:46:18 2002
-+++ src/api/ruby/sqlrelay.C	Mon Oct 28 02:51:20 2002
-@@ -4,7 +4,8 @@
- #include <ruby.h>
- #include "../c++/include/sqlrelay/sqlrclient.h"
- 
--#include "rubyincludes.h"
-+#include "rubyincludes1.h"
-+#include "rubyincludes2.h"
- 
- extern "C" {
- 
diff --git a/databases/sqlrelay/files/patch-undeclared-umask b/databases/sqlrelay/files/patch-undeclared-umask
deleted file mode 100644
index 1ce1787ee7fa..000000000000
--- a/databases/sqlrelay/files/patch-undeclared-umask
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git src/util/debugfile.C src/util/debugfile.C
-index 12237ee..965edf7 100644
---- src/util/debugfile.C
-+++ src/util/debugfile.C
-@@ -5,6 +5,7 @@
- #include <rudiments/stringbuffer.h>
- #include <rudiments/process.h>
- #include <config.h>
-+#include <sys/stat.h>
- 
- debugfile::debugfile() {
- 	dbgfile=NULL;
diff --git a/databases/sqlrelay/pkg-plist b/databases/sqlrelay/pkg-plist
index 2c100bb17c93..ee6c5b5e9128 100644
--- a/databases/sqlrelay/pkg-plist
+++ b/databases/sqlrelay/pkg-plist
@@ -1,61 +1,50 @@
 bin/backupschema
-bin/fields
-bin/query
 bin/sqlr-cachemanager
+bin/sqlr-connection
 bin/sqlr-export
+bin/sqlr-fields
 bin/sqlr-import
-bin/sqlrclient-config
-bin/sqlrclientwrapper-config
-%%IF_GTK%%bin/sqlr-config-gtk
-%%IF_FREETDS%%bin/sqlr-connection-freetds
-%%IF_MSQL%%bin/sqlr-connection-msql
-%%IF_MYSQL%%bin/sqlr-connection-mysql
-%%IF_ODBC%%bin/sqlr-connection-odbc
-%%IF_POSTGRESQL%%bin/sqlr-connection-postgresql
-%%IF_SQLITE%%bin/sqlr-connection-sqlite
-%%IF_INTERBASE%%bin/sqlr-connection-interbase
-bin/sqlr-connection-router
 bin/sqlr-listener
-bin/sqlr-status
+bin/sqlr-pwdenc
+bin/sqlr-query
 bin/sqlr-scaler
 bin/sqlr-start
+bin/sqlr-status
 bin/sqlr-stop
+bin/sqlrclient-config
+bin/sqlrclientwrapper-config
+bin/sqlrserver-config
 bin/sqlrsh
+etc/rc.d/sqlrelay.sh-sample
+etc/sqlrelay-sample
 etc/sqlrelay.conf.example
 etc/sqlrelay.dtd
-etc/sqlrelay-sample
-etc/rc.d/sqlrelay.sh-sample
+etc/sqlrelay.xsd
 include/sqlrelay/private/bindvar.h
 include/sqlrelay/private/column.h
+include/sqlrelay/private/dll.h
 include/sqlrelay/private/row.h
+include/sqlrelay/private/sqlrclientwrapper.h
 include/sqlrelay/private/sqlrconnection.h
 include/sqlrelay/private/sqlrcursor.h
 include/sqlrelay/private/sqlrdefines.h
 include/sqlrelay/private/sqlrincludes.h
+include/sqlrelay/private/wrapperdll.h
 include/sqlrelay/sqlrclient.h
 include/sqlrelay/sqlrclientwrapper.h
-@dirrm include/sqlrelay/private
-@dirrm include/sqlrelay
-lib/libmysql3sqlrelay.so.0
+include/sqlrelay/sqlrpwdenc.h
 lib/libmysql3sqlrelay.so
-lib/libmysql3sqlrelay.la
-lib/libmysql3sqlrelay.a
-lib/libmysql40sqlrelay.so.0
+lib/libmysql3sqlrelay.so.0
 lib/libmysql40sqlrelay.so
-lib/libmysql40sqlrelay.la
-lib/libmysql40sqlrelay.a
-lib/libmysql41sqlrelay.so.0
+lib/libmysql40sqlrelay.so.0
 lib/libmysql41sqlrelay.so
-lib/libmysql41sqlrelay.la
-lib/libmysql41sqlrelay.a
-lib/libmysql50sqlrelay.so.0
+lib/libmysql41sqlrelay.so.0
 lib/libmysql50sqlrelay.so
-lib/libmysql50sqlrelay.la
-lib/libmysql50sqlrelay.a
-lib/libmysql51sqlrelay.so.0
+lib/libmysql50sqlrelay.so.0
 lib/libmysql51sqlrelay.so
-lib/libmysql51sqlrelay.la
-lib/libmysql51sqlrelay.a
+lib/libmysql51sqlrelay.so.0
+lib/libpqsqlrelay.so
+lib/libpqsqlrelay.so.0
 lib/libsqlrclient.a
 lib/libsqlrclient.la
 lib/libsqlrclient.so
@@ -64,25 +53,75 @@ lib/libsqlrclientwrapper.a
 lib/libsqlrclientwrapper.la
 lib/libsqlrclientwrapper.so
 lib/libsqlrclientwrapper.so.0
-lib/libpqsqlrelay.a
-lib/libpqsqlrelay.la
-lib/libpqsqlrelay.so
-lib/libpqsqlrelay.so.0
-lib/libsqlrconnection.a
-lib/libsqlrconnection.la
-lib/libsqlrconnection.so
-lib/libsqlrconnection.so.0
+%%ODBC%%lib/libsqlrodbc.so
+%%ODBC%%lib/libsqlrodbc.so.0
+lib/libsqlrserver.a
+lib/libsqlrserver.la
+lib/libsqlrserver.so
+lib/libsqlrserver.so.0
 lib/libsqlrutil.a
 lib/libsqlrutil.la
 lib/libsqlrutil.so
 lib/libsqlrutil.so.0
-libdata/pkgconfig/sqlrelay-c.pc
 libdata/pkgconfig/sqlrelay-c++.pc
+libdata/pkgconfig/sqlrelay-c.pc
+%%FIREBIRD%%libexec/sqlrelay/sqlrconnection_firebird.so
+%%FREETDS%%libexec/sqlrelay/sqlrconnection_freetds.so
+%%MSQL%%libexec/sqlrelay/sqlrconnection_msql.so
+%%MYSQL%%libexec/sqlrelay/sqlrconnection_mysql.so
+%%ODBC%%libexec/sqlrelay/sqlrconnection_odbc.so
+%%PGSQL%%libexec/sqlrelay/sqlrconnection_postgresql.so
+%%SQLITE3%%libexec/sqlrelay/sqlrconnection_sqlite.so
+libexec/sqlrelay/sqlrconnection_router.so
+libexec/sqlrelay/sqlrlogger_custom_nw.so
+libexec/sqlrelay/sqlrlogger_custom_sc.so
+libexec/sqlrelay/sqlrlogger_debug.so
+libexec/sqlrelay/sqlrlogger_slowqueries.so
+libexec/sqlrelay/sqlrpwdenc_crypt.so
+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/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
+man/man8/sqlr-cachemanager.8.gz
+man/man8/sqlr-connection.8.gz
+man/man8/sqlr-ipclean.8.gz
+man/man8/sqlr-listener.8.gz
+man/man8/sqlr-scaler.8.gz
+man/man8/sqlr-start.8.gz
+man/man8/sqlr-stop.8.gz
+share/examples/sample-mssqlserver-mysql-errors.map
+share/examples/sample-oracle-mysql-errors.map
+@dirrm libexec/sqlrelay
+@dirrm include/sqlrelay/private
+@dirrm include/sqlrelay
 @cwd /var
-@dirrmtry sqlrelay/cache
-@dirrmtry sqlrelay/debug
-@dirrmtry sqlrelay/tmp/ipc
-@dirrmtry sqlrelay/tmp/pids
 @dirrmtry sqlrelay/tmp/sockets
+@dirrmtry sqlrelay/tmp/pids
+@dirrmtry sqlrelay/tmp/ipc
 @dirrmtry sqlrelay/tmp
+@dirrmtry sqlrelay/debug
+@dirrmtry sqlrelay/cache
 @dirrmtry sqlrelay