3 files changed, 102 insertions, 5 deletions

diff --git a/databases/sqlrelay/Makefile b/databases/sqlrelay/Makefile
index c9bcafdd24c8..256b728814f2 100644
--- a/databases/sqlrelay/Makefile
+++ b/databases/sqlrelay/Makefile
@@ -45,6 +45,7 @@ WITH_POSTGRESQL?=	yes
 WITH_ODBC?=		yes
 WITH_FREETDS?=		yes
 WITH_GTK?=		yes
+WITH_INTERBASE?=	yes
 .else
 WITH_SQLITE?=		no
 WITH_MYSQL?=		yes
@@ -53,6 +54,7 @@ WITH_POSTGRESQL?=	yes
 WITH_ODBC?=		no
 WITH_FREETDS?=		no
 WITH_GTK?=		yes
+WITH_INTERBASE?=	no
 .endif
 
 .if defined(WITH_SQLITE) && ${WITH_SQLITE:L} != no
@@ -76,6 +78,15 @@ CONFIGURE_ARGS+=	--without-mysql-prefix
 IF_MYSQL=	"@comment "
 .endif
 
+.if defined(WITH_INTERBASE) && ${WITH_INTERBASE:L} != no
+LIB_DEPENDS+=		gds.1:${PORTSDIR}/databases/firebird
+CONFIGURE_ARGS+=	--with-interbase-prefix="${LOCALBASE}/firebird"
+IF_INTERBASE=	""
+.else
+CONFIGURE_ARGS+=	--without-interbase-prefix
+IF_INTERBASE=	"@comment "
+.endif
+
 .if defined(WITH_MSQL) && ${WITH_MSQL:L} != no
 LIB_DEPENDS+=		msql.1:${PORTSDIR}/databases/msql
 CONFIGURE_ARGS+=	--with-msql-prefix="${LOCALBASE}"
@@ -128,6 +139,7 @@ PLIST_SUB=	IF_SQLITE=${IF_SQLITE} \
 		IF_POSTGRESQL=${IF_POSTGRESQL} \
 		IF_ODBC=${IF_ODBC} \
 		IF_FREETDS=${IF_FREETDS} \
+		IF_INTERBASE=${IF_INTERBASE} \
 		IF_GTK=${IF_GTK}
 
 #  --with-sybase-prefix          Location of Sybase
diff --git a/databases/sqlrelay/files/patch-configure b/databases/sqlrelay/files/patch-configure
index 7af01c335b0f..7506249be732 100644
--- a/databases/sqlrelay/files/patch-configure
+++ b/databases/sqlrelay/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Fri Oct 19 11:58:59 2001
-+++ configure	Sun Feb 24 02:29:56 2002
-@@ -1604,7 +1604,7 @@
+--- 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
@@ -9,7 +9,7 @@
  else
    echo "$ac_t""no" 1>&6
  
-@@ -1629,7 +1629,7 @@
+@@ -1784,7 +1784,7 @@
  fi
  if eval "test \"`echo '$ac_cv_file_'$ac_safe`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -18,7 +18,90 @@
  else
    echo "$ac_t""no" 1>&6
  
-@@ -6882,10 +6882,7 @@
+@@ -7314,7 +7314,7 @@
+ 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 @@
+ 
+ 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
diff --git a/databases/sqlrelay/pkg-plist b/databases/sqlrelay/pkg-plist
index 9f1a89945db8..c389992e3ba1 100644
--- a/databases/sqlrelay/pkg-plist
+++ b/databases/sqlrelay/pkg-plist
@@ -15,6 +15,8 @@ bin/sqlr-cachemanager
 %%IF_POSTGRESQL%%bin/sqlr-connection-postgresql-debug
 %%IF_SQLITE%%bin/sqlr-connection-sqlite
 %%IF_SQLITE%%bin/sqlr-connection-sqlite-debug
+%%IF_INTERBASE%%bin/sqlr-connection-interbase
+%%IF_INTERBASE%%bin/sqlr-connection-interbase-debug
 bin/sqlr-listener
 bin/sqlr-listener-debug
 bin/sqlr-scaler