From a3beba889ad4ca54bfe122bba534f072907aea2c Mon Sep 17 00:00:00 2001 From: dirk Date: Tue, 29 Feb 2000 21:46:06 +0000 Subject: Add Sybase/MS-SQL database support for PHP. PR: ports/16980 Submitted by: Yung-Jeng Hung Dmitry Petrov --- www/mod_php3/files/patch-aq | 23 ++++++++++++++++++++--- www/mod_php3/files/patch-ar | 29 +++++++++++++++++++++++++++++ www/mod_php3/scripts/configure.php | 7 +++++++ 3 files changed, 56 insertions(+), 3 deletions(-) create mode 100644 www/mod_php3/files/patch-ar (limited to 'www') diff --git a/www/mod_php3/files/patch-aq b/www/mod_php3/files/patch-aq index 84f0a68b8b1f..466156fea72c 100644 --- a/www/mod_php3/files/patch-aq +++ b/www/mod_php3/files/patch-aq @@ -1,6 +1,6 @@ ---- ../php/configure.orig Sat Jan 1 05:53:20 2000 -+++ ../php/configure Sun Jan 2 17:34:39 2000 -@@ -5261,26 +5261,10 @@ +--- ../php/configure.orig Fri Feb 25 21:49:48 2000 ++++ ../php/configure Tue Feb 29 22:29:05 2000 +@@ -5214,26 +5214,10 @@ if test -n "$unique" && test "`eval $cmd`" = "" ; then eval "LIBPATH$unique=set" @@ -28,3 +28,20 @@ fi +@@ -8961,7 +8945,7 @@ + fi + SYBASE_CT_INCLUDE=-I$SYBASE_CT_INCDIR + SYBASE_CT_LFLAGS="-L$SYBASE_CT_LIBDIR" +- 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 +@@ -9002,7 +8986,6 @@ + SYBASE_CT_LIBS="$SYBASE_CT_LIBS -ltcl" + else + echo "$ac_t""no" 1>&6 +- SYBASE_CT_LIBS="$SYBASE_CT_LIBS -lsybtcl" + fi + + echo $ac_n "checking for insck__getVdate in -linsck""... $ac_c" 1>&6 diff --git a/www/mod_php3/files/patch-ar b/www/mod_php3/files/patch-ar new file mode 100644 index 000000000000..7019b3282c9d --- /dev/null +++ b/www/mod_php3/files/patch-ar @@ -0,0 +1,29 @@ +--- ../php/functions/sybase.c.orig Tue Feb 8 00:54:51 2000 ++++ ../php/functions/sybase.c Tue Feb 29 22:01:07 2000 +@@ -366,7 +366,7 @@ + RETURN_FALSE; + } + /* create the link */ +- if ((sybase.link=dbopen(sybase.login,host))==FAIL) { ++ if ((sybase.link=tdsdbopen(sybase.login,host))==FAIL) { + /*php3_error(E_WARNING,"Sybase: Unable to connect to server: %s",sybase_error(sybase));*/ + efree(hashed_details); + dbloginfree(sybase.login); +@@ -408,7 +408,7 @@ + #if BROKEN_SYBASE_PCONNECTS + log_error("PHP/Sybase: Persistent link died, trying to reconnect...",php3_rqst->server); + #endif +- if ((sybase_ptr->link=dbopen(sybase_ptr->login,host))==FAIL) { ++ if ((sybase_ptr->link=tdsdbopen(sybase_ptr->login,host))==FAIL) { + #if BROKEN_SYBASE_PCONNECTS + log_error("PHP/Sybase: Unable to reconnect!",php3_rqst->server); + #endif +@@ -464,7 +464,7 @@ + RETURN_FALSE; + } + +- if ((sybase.link=dbopen(sybase.login,host))==NULL) { ++ if ((sybase.link=tdsdbopen(sybase.login,host))==NULL) { + /*php3_error(E_WARNING,"Sybase: Unable to connect to server: %s",sybase_error(sybase));*/ + efree(hashed_details); + RETURN_FALSE; diff --git a/www/mod_php3/scripts/configure.php b/www/mod_php3/scripts/configure.php index b0e75512844f..0380f9a54d41 100644 --- a/www/mod_php3/scripts/configure.php +++ b/www/mod_php3/scripts/configure.php @@ -25,6 +25,7 @@ IMAP "PHP: IMAP support" OFF \ MySQL "PHP: MySQL database support" ON \ PostgreSQL "PHP: PostgreSQL database support" OFF \ mSQL "PHP: mSQL database support" OFF \ +Sybase "PHP: Sybase/MS-SQL database support" OFF \ dBase "PHP: dBase database support" OFF \ OpenLDAP "PHP: OpenLDAP support" OFF \ SNMP "PHP: SNMP support" OFF \ @@ -110,6 +111,12 @@ while [ "$1" ]; do echo "BUILD_DEPENDS+= msql:\${PORTSDIR}/databases/msql" echo "PHP_CONF_ARGS+= --with-msql=\${PREFIX}" ;; + \"Sybase\") + echo "LIB_DEPENDS+= sybdb.0:\${PORTSDIR}/databases/freetds" + echo "LIB_DEPENDS+= ct.0:\${PORTSDIR}/databases/freetds" + echo "PHP_CONF_ARGS+= --with-sybase=\${PREFIX}" + echo "PHP_CONF_ARGS+= --with-sybase-ct=\${PREFIX}" + ;; \"dBase\") echo "PHP_CONF_ARGS+= --with-dbase" ;; -- cgit