Update to version 0.34.2.

Remove BROKEN for 5.X.
Leave BROKEN for 4.X since I didn't test there, but I hope it should
work.  More testing is needed.
I switched off all DB variants support but MySQL due to the lack of tests.

Comments welcome.

6 files changed, 70 insertions, 188 deletions

diff --git a/databases/sqlrelay/files/extra-patch-src+api+c+++src+Makefile b/databases/sqlrelay/files/extra-patch-src+api+c+++src+Makefile
deleted file mode 100644
index b20316d8d48e..000000000000
--- a/databases/sqlrelay/files/extra-patch-src+api+c+++src+Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
---- src/api/c++/src/Makefile.orig	Sat Apr 13 16:37:18 2002
-+++ src/api/c++/src/Makefile	Wed Dec 18 21:53:01 2002
-@@ -11,7 +11,6 @@
- 
- all: 
- 	$(MAKE) ../lib/libsqlrclient.a; \
--	$(MAKE) ../lib/libsqlrclient_p.a; \
- 	if ( test "$(MINGW32)" != "yes" -a "$(CYGWIN)" != "yes" -a "$(UWIN)" != "yes" ); then \
- 		$(MAKE) ../lib/libsqlrclient.so.$(SQLR_VERSION); \
- 	else \
-@@ -54,7 +53,6 @@
- install:
- 	$(top_srcdir)/mkinstalldirs $(libdir)
- 	$(INSTALL) -m 644 ../lib/libsqlrclient.a $(libdir); \
--	$(INSTALL) -m 644 ../lib/libsqlrclient_p.a $(libdir); \
- 	if ( test "$(MINGW32)" != "yes" -a "$(CYGWIN)" != "yes" -a "$(UWIN)" != "yes" ); then \
- 		$(RM) $(libdir)/libsqlrclient.so*; \
- 		$(INSTALL) ../lib/libsqlrclient.so.$(SQLR_VERSION) $(libdir); \
-@@ -70,7 +68,6 @@
- uninstall:
- 	$(RM) $(libdir)/libsqlrclient.so*
- 	$(RM) $(libdir)/libsqlrclient.a
--	$(RM) $(libdir)/libsqlrclient_p.a
- 	$(RM) $(libdir)/libsqlrclient.dll
- 	$(RM) $(libdir)/libsqlrclient.lib
- 	$(RMTREE) $(cachedir)
diff --git a/databases/sqlrelay/files/extra-patch-src+api+c+src+Makefile b/databases/sqlrelay/files/extra-patch-src+api+c+src+Makefile
deleted file mode 100644
index 6c0c55424a83..000000000000
--- a/databases/sqlrelay/files/extra-patch-src+api+c+src+Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
---- src/api/c/src/Makefile.orig	Sat Apr 13 16:37:08 2002
-+++ src/api/c/src/Makefile	Wed Dec 18 21:52:24 2002
-@@ -11,7 +11,6 @@
- 
- all:
- 	$(MAKE) ../lib/libsqlrclientwrapper.a; \
--	$(MAKE) ../lib/libsqlrclientwrapper_p.a; \
- 	if ( test "$(MINGW32)" != "yes" -a "$(CYGWIN)" != "yes" -a "$(UWIN)" != "yes" ); then \
- 		$(MAKE) ../lib/libsqlrclientwrapper.so.$(SQLR_VERSION); \
- 	else \
-@@ -51,7 +50,6 @@
- install:
- 	$(top_srcdir)/mkinstalldirs $(libdir)
- 	$(INSTALL) -m 644 ../lib/libsqlrclientwrapper.a $(libdir); \
--	$(INSTALL) -m 644 ../lib/libsqlrclientwrapper_p.a $(libdir); \
- 	if ( test "$(MINGW32)" != "yes" -a "$(CYGWIN)" != "yes" -a "$(UWIN)" != "yes" ); then \
- 		$(RM) $(libdir)/libsqlrclientwrapper.so*; \
- 		$(INSTALL) ../lib/libsqlrclientwrapper.so.$(SQLR_VERSION) $(libdir); \
-@@ -67,7 +65,6 @@
- uninstall:
- 	$(RM) $(libdir)/libsqlrclientwrapper.so*
- 	$(RM) $(libdir)/libsqlrclientwrapper.a
--	$(RM) $(libdir)/libsqlrclientwrapper_p.a
- 	$(RM) $(libdir)/libsqlrclientwrapper.dll
- 	$(RM) $(libdir)/libsqlrclientwrapper.lib
- 	$(RMTREE) $(cachedir)
diff --git a/databases/sqlrelay/files/patch-Makefile b/databases/sqlrelay/files/patch-Makefile
deleted file mode 100644
index 1dcfc92cbb33..000000000000
--- a/databases/sqlrelay/files/patch-Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
---- Makefile.orig	Wed Oct 17 06:20:48 2001
-+++ Makefile	Sun Feb 24 01:42:57 2002
-@@ -24,9 +24,10 @@
- 
- install:
- 	cd bin; $(MAKE) install
--	cd doc; $(MAKE) install
- 	cd etc; $(MAKE) install
- 	cd src; $(MAKE) install
-+install-doc:
-+	cd doc; $(MAKE) install
- 
- uninstall:
- 	cd bin; $(MAKE) uninstall
diff --git a/databases/sqlrelay/files/patch-config.mk.in b/databases/sqlrelay/files/patch-config.mk.in
index 2ad92f17abbf..f08d7a46e42c 100644
--- a/databases/sqlrelay/files/patch-config.mk.in
+++ b/databases/sqlrelay/files/patch-config.mk.in
@@ -1,6 +1,6 @@
---- config.mk.in.orig	Thu Oct 18 11:54:14 2001
-+++ config.mk.in	Sun Feb 24 01:49:43 2002
-@@ -8,13 +8,13 @@
+--- config.mk.in.orig	Tue Dec 16 19:05:34 2003
++++ config.mk.in	Wed May 26 16:34:41 2004
+@@ -14,13 +14,13 @@
  exec_prefix= @exec_prefix@
  incdir = @includedir@
  libdir = @libdir@
@@ -10,9 +10,9 @@
  bindir = @bindir@
  localstatedir = @localstatedir@
  sysconfdir = @sysconfdir@
- localstatedir = @localstatedir@
+ mandir = @mandir@
 -docdir = ${prefix}/doc/sqlrelay
 +docdir = ${prefix}/share/doc/sqlrelay
  tmpdir = ${localstatedir}/sqlrelay/tmp
  cachedir = ${localstatedir}/sqlrelay/cache
- 
+ debugdir = ${localstatedir}/sqlrelay/debug
diff --git a/databases/sqlrelay/files/patch-configure b/databases/sqlrelay/files/patch-configure
index 7506249be732..9ab39e3cb629 100644
--- a/databases/sqlrelay/files/patch-configure
+++ b/databases/sqlrelay/files/patch-configure
@@ -1,115 +1,63 @@
---- configure.orig	Mon Apr 15 14:23:31 2002
-+++ configure	Thu Nov 21 19:00:36 2002
-@@ -1705,7 +1705,7 @@
- fi
- if eval "test \"`echo '$ac_cv_file_'$ac_safe`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--  HAVE_GNOME_XML="yes"; XMLINCLUDES="-I$LIBXMLPATH"
-+  HAVE_GNOME_XML="yes"; XMLINCLUDES="-I$LIBXMLPATH/include"
- else
-   echo "$ac_t""no" 1>&6
+--- configure.orig	Tue Dec 16 19:06:16 2003
++++ configure	Wed May 26 17:56:40 2004
+@@ -37573,13 +37573,7 @@
  
-@@ -1784,7 +1784,7 @@
- fi
- if eval "test \"`echo '$ac_cv_file_'$ac_safe`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--  HAVE_LIBXML="yes"; HAVE_GNOME_XML=""; XMLINCLUDES="-I$LIBXMLPATH"
-+  HAVE_LIBXML="yes"; HAVE_GNOME_XML=""; XMLINCLUDES="-I$LIBXMLPATH/include"
- else
-   echo "$ac_t""no" 1>&6
+ 			if ( test -n "$JAVAINCLUDES" )
+ 			then
+-				for i in `ls -d $JAVAPATH/include/*`
+-				do
+-					if ( test -d "$i" )
+-					then
+-						JAVAINCLUDES="$JAVAINCLUDES -I$i"
+-					fi
+-				done
++			JAVAINCLUDES="$JAVAINCLUDES -I`dirname $JAVAPATH/include/*/jni_md.h`"
+ 			fi
+ 		fi
  
-@@ -7314,7 +7314,7 @@
+@@ -37958,14 +37952,14 @@
+ 		if ( test -n "$GTKPATH" )
+ 		then
+ 
+-if ( test -r ""$GTKPATH/bin/gtk-config"" )
++if ( test -r ""$GTKPATH/bin/gtk12-config"" )
+ then
+-	eval "GTKCONFIG=\"$GTKPATH/bin/gtk-config\""
++	eval "GTKCONFIG=\"$GTKPATH/bin/gtk12-config\""
  fi
- if eval "test \"`echo '$ac_cv_file_'$ac_safe`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--  INTERBASELIBSPATH="$INTERBASPATH/lib"; INTERBASELIBS="-L$INTERBASEPATH/lib -lgds -lcrypt"
-+  INTERBASELIBSPATH="$INTERBASEPATH/lib"; INTERBASELIBS="-L$INTERBASEPATH/lib -lgds -lcrypt"
- else
-   echo "$ac_t""no" 1>&6
  
-@@ -7403,8 +7403,8 @@
+ 		else
+-			# Extract the first word of ""gtk-config"", so it can be a program name with args.
+-set dummy "gtk-config"; ac_word=$2
++			# Extract the first word of ""gtk12-config"", so it can be a program name with args.
++set dummy "gtk12-config"; ac_word=$2
+ echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_GTKCONFIG+set}" = set; then
+@@ -37981,7 +37975,7 @@
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_GTKCONFIG=""gtk-config""
++    ac_cv_prog_GTKCONFIG=""gtk12-config""
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+@@ -38003,7 +37997,7 @@
+ 			then
+ 				for i in "/usr/bin" "/usr/local/bin" "/usr/pkg/bin" "/usr/local/gtk/bin" "/usr/local/gtk+/bin" "/opt/sfw/bin"
+ 				do
+-					for j in "gtk-config" "gtk12-config" "gtk10-config"
++					for j in "gtk12-config" "gtk12-config" "gtk10-config"
+ 					do
+ 
+ if ( test -r ""$i/$j"" )
+@@ -41269,7 +41263,7 @@
+ #define SQLR_VERSION "$SQLR_VERSION"
+ _ACEOF
+ 
+-SONAME_VERSION_INFO="1:0:0"
++SONAME_VERSION_INFO="0:0:0"
  
- LINKFAIL=""
- if ( test -n "$INTERBASESTATIC" -a -n "$INTERBASELIBS" ); then
--	echo $ac_n "checking if Interbase can be statically linked without $DLLIB""... $ac_c" 1>&6
--echo "configure:7408: checking if Interbase can be statically linked without $DLLIB" >&5
-+	echo $ac_n "checking if Interbase can be statically linked without -lcrypt""... $ac_c" 1>&6
-+echo "configure:7408: checking if Interbase can be statically linked without -lcrypt" >&5
- 	TEMPCPPFLAGS="$CPPFLAGS"
- 	CPPFLAGS="$INTERBASESTATIC $INTERBASEINCLUDES"
- 	LIBS="$INTERBASELIBS $SOCKETLIB"
-@@ -7429,12 +7429,12 @@
- rm -f conftest*
- 	LIBS=""
- 	CPPFLAGS="$TEMPCPPFLAGS"
--	if ( test -n "$LINKFAIL" -a -n "$DLLIB" ); then
--		echo $ac_n "checking if Interbase can be statically linked with $DLLIB""... $ac_c" 1>&6
--echo "configure:7435: checking if Interbase can be statically linked with $DLLIB" >&5
-+	if ( test -n "$LINKFAIL" ); then
-+		echo $ac_n "checking if Interbase can be statically linked with -lcrypt""... $ac_c" 1>&6
-+echo "configure:7435: checking if Interbase can be statically linked with -lcrypt" >&5
- 		TEMPCPPFLAGS="$CPPFLAGS"
- 		CPPFLAGS="$INTERBASESTATIC $INTERBASEINCLUDES"
--		LIBS="$INTERBASELIBS $SOCKETLIB $DLLIB"
-+		LIBS="$INTERBASELIBS $SOCKETLIB -lcrypt"
- 		cat > conftest.$ac_ext <<EOF
- #line 7440 "configure"
- #include "confdefs.h"
-@@ -7446,7 +7446,7 @@
- EOF
- if { (eval echo configure:7448: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
--  echo "$ac_t""yes" 1>&6; INTERBASELIBS="$INTERBASELIBS $DLLIB"; LINKFAIL="";
-+  echo "$ac_t""yes" 1>&6; INTERBASELIBS="$INTERBASELIBS -lcrypt"; LINKFAIL="";
- else
-   echo "configure: failed program was:" >&5
-   cat conftest.$ac_ext >&5
-@@ -7463,8 +7463,8 @@
- 	if ( test -n "$RPATHFLAG" -a -n "$INTERBASELIBSPATH" ); then
- 		INTERBASELIBS="-Wl,-rpath $INTERBASELIBSPATH $INTERBASELIBS"
- 	fi
--	echo $ac_n "checking if Interbase can be dynamically linked without $DLLIB""... $ac_c" 1>&6
--echo "configure:7468: checking if Interbase can be dynamically linked without $DLLIB" >&5
-+	echo $ac_n "checking if Interbase can be dynamically linked without -lcrypt""... $ac_c" 1>&6
-+echo "configure:7468: checking if Interbase can be dynamically linked without -lcrypt" >&5
- 	TEMPCPPFLAGS="$CPPFLAGS"
- 	CPPFLAGS="$INTERBASEINCLUDES"
- 	LIBS="$INTERBASELIBS $SOCKETLIB"
-@@ -7489,12 +7489,12 @@
- rm -f conftest*
- 	LIBS=""
- 	CPPFLAGS="$TEMPCPPFLAGS"
--	if ( test -n "$LINKFAIL" -a -n "$DLLIB" ); then
--		echo $ac_n "checking if Interbase can be dynamically linked with $DLLIB""... $ac_c" 1>&6
--echo "configure:7495: checking if Interbase can be dynamically linked with $DLLIB" >&5
-+	if ( test -n "$LINKFAIL" ); then
-+		echo $ac_n "checking if Interbase can be dynamically linked with -lcrypt""... $ac_c" 1>&6
-+echo "configure:7495: checking if Interbase can be dynamically linked with -lcrypt" >&5
- 		TEMPCPPFLAGS="$CPPFLAGS"
- 		CPPFLAGS="$INTERBASEINCLUDES"
--		LIBS="$INTERBASELIBS $SOCKETLIB $DLLIB"
-+		LIBS="$INTERBASELIBS $SOCKETLIB -lcrypt"
- 		cat > conftest.$ac_ext <<EOF
- #line 7500 "configure"
- #include "confdefs.h"
-@@ -7506,7 +7506,7 @@
- EOF
- if { (eval echo configure:7508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
--  echo "$ac_t""yes" 1>&6; INTERBASELIBS="$INTERBASELIBS $DLLIB"; LINKFAIL=""
-+  echo "$ac_t""yes" 1>&6; INTERBASELIBS="$INTERBASELIBS -lcrypt"; LINKFAIL=""
- else
-   echo "configure: failed program was:" >&5
-   cat conftest.$ac_ext >&5
-@@ -8122,10 +8122,7 @@
- fi
  
- 	if ( test -n "$JAVAINCLUDES"); then
--		for i in `ls -l $JAVAPATH/include | grep drw | awk '{print $9}'`
--		do
--			JAVAINCLUDES="$JAVAINCLUDES -I$JAVAPATH/include/$i"
--		done
-+		JAVAINCLUDES="$JAVAINCLUDES -I`dirname $JAVAPATH/include/*/jni_md.h`"
- 	fi
- fi
  
diff --git a/databases/sqlrelay/files/patch-src+api+java+Makefile b/databases/sqlrelay/files/patch-src+api+java+Makefile
index f9be5672d1bc..a232abdcc67d 100644
--- a/databases/sqlrelay/files/patch-src+api+java+Makefile
+++ b/databases/sqlrelay/files/patch-src+api+java+Makefile
@@ -1,11 +1,11 @@
---- src/api/java/Makefile.orig	Sun Mar 24 09:09:19 2002
-+++ src/api/java/Makefile	Mon Oct 28 02:46:52 2002
-@@ -3,7 +3,7 @@
- top_srcdir = ../../..
- INSTALL = $(top_srcdir)/install-sh -c
+--- src/api/java/Makefile.orig	Wed Dec 17 09:29:12 2003
++++ src/api/java/Makefile	Wed May 26 16:41:43 2004
+@@ -2,7 +2,7 @@
  
--CPPFLAGS = $(BASECPPFLAGS) -I./ -I../c++/include $(RUDIMENTSINCLUDES) $(JAVAINCLUDES)
-+CPPFLAGS = $(JAVAINCLUDES) $(BASECPPFLAGS) -I./ -I../c++/include $(RUDIMENTSINCLUDES)
+ include ../../../config.mk
  
- SRCS = SQLRConnection.C SQLRCursor.C
- OBJS = SQLRConnection.o SQLRCursor.o
+-CPPFLAGS = $(BASECPPFLAGS) -I./ -I$(top_builddir)/src/api/c++/include $(RUDIMENTSINCLUDES) $(JAVAINCLUDES)
++CPPFLAGS = $(JAVAINCLUDES) $(BASECPPFLAGS) -I./ -I$(top_builddir)/src/api/c++/include $(RUDIMENTSINCLUDES)
+ RPATH =
+ ifneq ($(strip $(libdir)),)
+ ifeq ($(JAVAUSERPATH),yes)