Add SybaseDB and SybaseCT database support.

Submitted by:	Yung-Jeng Hung <winard@ritax.dorm.ccu.edu.tw>

6 files changed, 184 insertions, 0 deletions

diff --git a/www/mod_php4/files/patch-aq b/www/mod_php4/files/patch-aq
new file mode 100644
index 000000000000..ab4348c6ca4b
--- /dev/null
+++ b/www/mod_php4/files/patch-aq
@@ -0,0 +1,41 @@
+--- configure.old	Sat Jun  3 02:56:22 2000
++++ configure	Sat Jun  3 02:55:40 2000
+@@ -28966,7 +28966,6 @@
+     eval "LIBRARY$unique=set"
+     
+     if test "cs" != "c"; then
+-      LIBS="-lcs $LIBS"
+     fi
+   
+   fi
+@@ -28994,7 +28993,6 @@
+     eval "LIBRARY$unique=set"
+     
+     if test "comn" != "c"; then
+-      LIBS="-lcomn $LIBS"
+     fi
+   
+   fi
+@@ -29008,13 +29006,12 @@
+     eval "LIBRARY$unique=set"
+     
+     if test "intl" != "c"; then
+-      LIBS="-lintl $LIBS"
+     fi
+   
+   fi
+ 
+ 
+-	SYBASE_CT_LIBS="-lcs -lct -lcomn -lintl"
++	SYBASE_CT_LIBS="-lct"
+     old_LDFLAGS=$LDFLAGS
+     LDFLAGS="$LDFLAGS -L$SYBASE_CT_LIBDIR"
+     echo $ac_n "checking for netg_errstr in -ltcl""... $ac_c" 1>&6
+@@ -29076,7 +29073,6 @@
+     eval "LIBRARY$unique=set"
+     
+     if test "sybtcl" != "c"; then
+-      LIBS="-lsybtcl $LIBS"
+     fi
+   
+   fi
diff --git a/www/mod_php4/files/patch-ar b/www/mod_php4/files/patch-ar
new file mode 100644
index 000000000000..705c48a41f13
--- /dev/null
+++ b/www/mod_php4/files/patch-ar
@@ -0,0 +1,29 @@
+--- ext/sybase/sybase.c.orig	Fri Jun  2 14:14:44 2000
++++ ext/sybase/sybase.c	Fri Jun  2 14:15:27 2000
+@@ -357,7 +357,7 @@
+ 				RETURN_FALSE;
+ 			}
+ 			/* create the link */
+-			if ((sybase.link=dbopen(sybase.login,host))==FAIL) {
++			if ((sybase.link=tdsdbopen(sybase.login,host))==FAIL) {
+ 				/*php_error(E_WARNING,"Sybase:  Unable to connect to server:  %s",sybase_error(sybase));*/
+ 				efree(hashed_details);
+ 				dbloginfree(sybase.login);
+@@ -393,7 +393,7 @@
+ 			sybase_ptr = (sybase_link *) le->ptr;
+ 			/* test that the link hasn't died */
+ 			if (DBDEAD(sybase_ptr->link)==TRUE) {
+-				if ((sybase_ptr->link=dbopen(sybase_ptr->login,host))==FAIL) {
++				if ((sybase_ptr->link=tdsdbopen(sybase_ptr->login,host))==FAIL) {
+ 					/*php_error(E_WARNING,"Sybase:  Link to server lost, unable to reconnect");*/
+ 					zend_hash_del(&EG(persistent_list), hashed_details, hashed_details_length+1);
+ 					efree(hashed_details);
+@@ -440,7 +440,7 @@
+ 			RETURN_FALSE;
+ 		}
+ 		
+-		if ((sybase.link=dbopen(sybase.login,host))==NULL) {
++		if ((sybase.link=tdsdbopen(sybase.login,host))==NULL) {
+ 			/*php_error(E_WARNING,"Sybase:  Unable to connect to server:  %s",sybase_error(sybase));*/
+ 			efree(hashed_details);
+ 			RETURN_FALSE;
diff --git a/www/mod_php4/scripts/configure.php b/www/mod_php4/scripts/configure.php
index 492f6bac000f..03b51e5ace1b 100644
--- a/www/mod_php4/scripts/configure.php
+++ b/www/mod_php4/scripts/configure.php
@@ -21,6 +21,8 @@ IMAP		"IMAP support" OFF \
 MySQL		"MySQL database support" ON \
 PostgreSQL	"PostgreSQL database support" OFF \
 mSQL		"mSQL database support" OFF \
+SybaseDB	"Sybase/MS-SQL database support (DB-lib)" OFF \
+SybaseCT	"Sybase/MS-SQL database support (CT-lib)" OFF \
 dBase		"dBase database support" OFF \
 OpenLDAP	"OpenLDAP support" OFF \
 SNMP		"SNMP support" OFF \
@@ -106,6 +108,26 @@ while [ "$1" ]; do
 			echo "BUILD_DEPENDS+=	msql:\${PORTSDIR}/databases/msql"
 			echo "CONFIGURE_ARGS+=--with-msql=\${PREFIX}"
 			;;
+		\"SybaseDB\")
+			echo "LIB_DEPENDS+=	sybdb.0:\${PORTSDIR}/databases/freetds"
+			echo "CONFIGURE_ARGS+=--with-sybase=\${PREFIX}"
+			if [ "$SYBASECT" ]; then
+				echo "SybaseDB and SybaseCT are mutually exclusive." > /dev/stderr
+				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+				exit 1
+			fi
+			SYBASEDB=1
+			;;
+		\"SybaseCT\")
+			echo "LIB_DEPENDS+=	ct.0:\${PORTSDIR}/databases/freetds"
+			echo "CONFIGURE_ARGS+=--with-sybase-ct=\${PREFIX}"
+			if [ "$SYBASEDB" ]; then
+				echo "SybaseDB and SybaseCT are mutually exclusive." > /dev/stderr
+				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+				exit 1
+			fi
+			SYBASECT=1
+			;;
 		\"dBase\")
 			echo "CONFIGURE_ARGS+=--with-dbase"
 			;;
diff --git a/www/mod_php5/files/patch-aq b/www/mod_php5/files/patch-aq
new file mode 100644
index 000000000000..ab4348c6ca4b
--- /dev/null
+++ b/www/mod_php5/files/patch-aq
@@ -0,0 +1,41 @@
+--- configure.old	Sat Jun  3 02:56:22 2000
++++ configure	Sat Jun  3 02:55:40 2000
+@@ -28966,7 +28966,6 @@
+     eval "LIBRARY$unique=set"
+     
+     if test "cs" != "c"; then
+-      LIBS="-lcs $LIBS"
+     fi
+   
+   fi
+@@ -28994,7 +28993,6 @@
+     eval "LIBRARY$unique=set"
+     
+     if test "comn" != "c"; then
+-      LIBS="-lcomn $LIBS"
+     fi
+   
+   fi
+@@ -29008,13 +29006,12 @@
+     eval "LIBRARY$unique=set"
+     
+     if test "intl" != "c"; then
+-      LIBS="-lintl $LIBS"
+     fi
+   
+   fi
+ 
+ 
+-	SYBASE_CT_LIBS="-lcs -lct -lcomn -lintl"
++	SYBASE_CT_LIBS="-lct"
+     old_LDFLAGS=$LDFLAGS
+     LDFLAGS="$LDFLAGS -L$SYBASE_CT_LIBDIR"
+     echo $ac_n "checking for netg_errstr in -ltcl""... $ac_c" 1>&6
+@@ -29076,7 +29073,6 @@
+     eval "LIBRARY$unique=set"
+     
+     if test "sybtcl" != "c"; then
+-      LIBS="-lsybtcl $LIBS"
+     fi
+   
+   fi
diff --git a/www/mod_php5/files/patch-ar b/www/mod_php5/files/patch-ar
new file mode 100644
index 000000000000..705c48a41f13
--- /dev/null
+++ b/www/mod_php5/files/patch-ar
@@ -0,0 +1,29 @@
+--- ext/sybase/sybase.c.orig	Fri Jun  2 14:14:44 2000
++++ ext/sybase/sybase.c	Fri Jun  2 14:15:27 2000
+@@ -357,7 +357,7 @@
+ 				RETURN_FALSE;
+ 			}
+ 			/* create the link */
+-			if ((sybase.link=dbopen(sybase.login,host))==FAIL) {
++			if ((sybase.link=tdsdbopen(sybase.login,host))==FAIL) {
+ 				/*php_error(E_WARNING,"Sybase:  Unable to connect to server:  %s",sybase_error(sybase));*/
+ 				efree(hashed_details);
+ 				dbloginfree(sybase.login);
+@@ -393,7 +393,7 @@
+ 			sybase_ptr = (sybase_link *) le->ptr;
+ 			/* test that the link hasn't died */
+ 			if (DBDEAD(sybase_ptr->link)==TRUE) {
+-				if ((sybase_ptr->link=dbopen(sybase_ptr->login,host))==FAIL) {
++				if ((sybase_ptr->link=tdsdbopen(sybase_ptr->login,host))==FAIL) {
+ 					/*php_error(E_WARNING,"Sybase:  Link to server lost, unable to reconnect");*/
+ 					zend_hash_del(&EG(persistent_list), hashed_details, hashed_details_length+1);
+ 					efree(hashed_details);
+@@ -440,7 +440,7 @@
+ 			RETURN_FALSE;
+ 		}
+ 		
+-		if ((sybase.link=dbopen(sybase.login,host))==NULL) {
++		if ((sybase.link=tdsdbopen(sybase.login,host))==NULL) {
+ 			/*php_error(E_WARNING,"Sybase:  Unable to connect to server:  %s",sybase_error(sybase));*/
+ 			efree(hashed_details);
+ 			RETURN_FALSE;
diff --git a/www/mod_php5/scripts/configure.php b/www/mod_php5/scripts/configure.php
index 492f6bac000f..03b51e5ace1b 100644
--- a/www/mod_php5/scripts/configure.php
+++ b/www/mod_php5/scripts/configure.php
@@ -21,6 +21,8 @@ IMAP		"IMAP support" OFF \
 MySQL		"MySQL database support" ON \
 PostgreSQL	"PostgreSQL database support" OFF \
 mSQL		"mSQL database support" OFF \
+SybaseDB	"Sybase/MS-SQL database support (DB-lib)" OFF \
+SybaseCT	"Sybase/MS-SQL database support (CT-lib)" OFF \
 dBase		"dBase database support" OFF \
 OpenLDAP	"OpenLDAP support" OFF \
 SNMP		"SNMP support" OFF \
@@ -106,6 +108,26 @@ while [ "$1" ]; do
 			echo "BUILD_DEPENDS+=	msql:\${PORTSDIR}/databases/msql"
 			echo "CONFIGURE_ARGS+=--with-msql=\${PREFIX}"
 			;;
+		\"SybaseDB\")
+			echo "LIB_DEPENDS+=	sybdb.0:\${PORTSDIR}/databases/freetds"
+			echo "CONFIGURE_ARGS+=--with-sybase=\${PREFIX}"
+			if [ "$SYBASECT" ]; then
+				echo "SybaseDB and SybaseCT are mutually exclusive." > /dev/stderr
+				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+				exit 1
+			fi
+			SYBASEDB=1
+			;;
+		\"SybaseCT\")
+			echo "LIB_DEPENDS+=	ct.0:\${PORTSDIR}/databases/freetds"
+			echo "CONFIGURE_ARGS+=--with-sybase-ct=\${PREFIX}"
+			if [ "$SYBASEDB" ]; then
+				echo "SybaseDB and SybaseCT are mutually exclusive." > /dev/stderr
+				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+				exit 1
+			fi
+			SYBASECT=1
+			;;
 		\"dBase\")
 			echo "CONFIGURE_ARGS+=--with-dbase"
 			;;