diff --git a/www/php4/Makefile b/www/php4/Makefile index 72245535161..573b5a3aba9 100644 --- a/www/php4/Makefile +++ b/www/php4/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.62 2001/12/27 22:09:32 avsm Exp $ +# $OpenBSD: Makefile,v 1.63 2002/01/09 16:00:51 jcs Exp $ MULTI_PACKAGES= -pear SUBPACKAGE?= @@ -54,7 +54,7 @@ USE_LIBTOOL= Yes FLAVORS+= gdbm gettext imap ldap mhash mm recode snmp FLAVORS+= gd no_x11 pdflib mcrypt curl -FLAVORS+= dbase filepro mysql mysql_bundled postgresql iodbc +FLAVORS+= dbase filepro mysql mysql_bundled postgresql iodbc freetds FLAVOR?= .if ${FLAVOR:L:Mcurl} @@ -196,6 +196,13 @@ LIB_DEPENDS+= iodbc.2::databases/iodbc CONFIGURE_ARGS+= --without-iodbc .endif +.if ${FLAVOR:L:Mfreetds} +CONFIGURE_ARGS+= --with-sybase-ct=${LOCALBASE} +LIB_DEPENDS+= tds.0,ct.0::databases/freetds +.else +CONFIGURE_ARGS+= --without-sybase-ct +.endif + .if ${SUBPACKAGE} == "-pear" LIB_DEPENDS= RUN_DEPENDS= diff --git a/www/php4/patches/patch-configure b/www/php4/patches/patch-configure index f437d5c5840..57cec83472e 100644 --- a/www/php4/patches/patch-configure +++ b/www/php4/patches/patch-configure @@ -1,6 +1,5 @@ -$OpenBSD: patch-configure,v 1.8 2001/12/18 01:40:48 avsm Exp $ ---- configure.orig Sat Dec 8 19:40:35 2001 -+++ configure Mon Dec 17 21:35:09 2001 +--- configure.orig Wed Dec 26 04:43:05 2001 ++++ configure Fri Dec 28 11:47:29 2001 @@ -24893,22 +24893,22 @@ EOF fi @@ -91,7 +90,343 @@ $OpenBSD: patch-configure,v 1.8 2001/12/18 01:40:48 avsm Exp $ fi if test "$cross_compiling" = yes; then -@@ -57538,7 +57538,7 @@ unset with_pic +@@ -52283,33 +52283,6 @@ EOF + fi + + +- case cs in +- c|c_r|pthread*) ;; +- *) +- +- if test "$ext_shared" = "yes"; then +- +- SYBASE_CT_SHARED_LIBADD="-lcs $SYBASE_CT_SHARED_LIBADD" +- +- else +- +- case cs in +- c|c_r|pthread*) ;; +- *) +- +- +- LIBS="-lcs $LIBS" +- +- +- ;; +- esac +- +- fi +- +- ;; +- esac +- +- + case ct in + c|c_r|pthread*) ;; + *) +@@ -52337,214 +52310,22 @@ EOF + esac + + +- case comn in +- c|c_r|pthread*) ;; +- *) +- +- if test "$ext_shared" = "yes"; then +- +- SYBASE_CT_SHARED_LIBADD="-lcomn $SYBASE_CT_SHARED_LIBADD" +- +- else +- +- case comn in +- c|c_r|pthread*) ;; +- *) +- +- +- LIBS="-lcomn $LIBS" +- +- +- ;; +- esac +- +- fi +- +- ;; +- esac +- +- +- case intl in +- c|c_r|pthread*) ;; +- *) +- +- if test "$ext_shared" = "yes"; then +- +- SYBASE_CT_SHARED_LIBADD="-lintl $SYBASE_CT_SHARED_LIBADD" +- +- else +- +- case intl in +- c|c_r|pthread*) ;; +- *) +- +- +- LIBS="-lintl $LIBS" +- +- +- ;; +- esac +- +- fi +- +- ;; +- esac +- +- +- SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lcs -lct -lcomn -lintl" +- +- echo $ac_n "checking for netg_errstr in -ltcl""... $ac_c" 1>&6 +-echo "configure:52398: checking for netg_errstr in -ltcl" >&5 +-ac_lib_var=`echo tcl'_'netg_errstr | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- ac_save_LIBS="$LIBS" +-LIBS="-ltcl +- $SYBASE_CT_LIBS +- $LIBS" +-cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=yes" +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=no" +-fi +-rm -f conftest* +-LIBS="$ac_save_LIBS" +- +-fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- +- +- case tcl in +- c|c_r|pthread*) ;; +- *) +- +- if test "$ext_shared" = "yes"; then +- +- SYBASE_CT_SHARED_LIBADD="-ltcl $SYBASE_CT_SHARED_LIBADD" +- +- else +- +- case tcl in +- c|c_r|pthread*) ;; +- *) +- +- +- LIBS="-ltcl $LIBS" +- +- +- ;; +- esac +- +- fi +- +- ;; +- esac +- +- +-else +- echo "$ac_t""no" 1>&6 +- +- +- case sybtcl in +- c|c_r|pthread*) ;; +- *) +- +- if test "$ext_shared" = "yes"; then +- +- SYBASE_CT_SHARED_LIBADD="-lsybtcl $SYBASE_CT_SHARED_LIBADD" +- +- else +- +- case sybtcl in +- c|c_r|pthread*) ;; +- *) +- +- +- LIBS="-lsybtcl $LIBS" +- +- +- ;; +- esac +- +- fi +- +- ;; +- esac +- +- +-fi +- +- +- echo $ac_n "checking for insck__getVdate in -linsck""... $ac_c" 1>&6 +-echo "configure:52498: checking for insck__getVdate in -linsck" >&5 +-ac_lib_var=`echo insck'_'insck__getVdate | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- ac_save_LIBS="$LIBS" +-LIBS="-linsck -L$SYBASE_CT_LIBDIR $LIBS" +-cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=yes" +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=no" +-fi +-rm -f conftest* +-LIBS="$ac_save_LIBS" +- +-fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- +- case insck in ++ case tds in + c|c_r|pthread*) ;; + *) + + if test "$ext_shared" = "yes"; then + +- SYBASE_CT_SHARED_LIBADD="-linsck $SYBASE_CT_SHARED_LIBADD" ++ SYBASE_CT_SHARED_LIBADD="-ltds $SYBASE_CT_SHARED_LIBADD" + + else + +- case insck in ++ case tds in + c|c_r|pthread*) ;; + *) + + +- LIBS="-linsck $LIBS" ++ LIBS="-ltds $LIBS" + + + ;; +@@ -52555,81 +52336,10 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l + ;; + esac + +-else +- echo "$ac_t""no" 1>&6 +-fi +- +- echo $ac_n "checking for bsd_tcp in -linsck""... $ac_c" 1>&6 +-echo "configure:52564: checking for bsd_tcp in -linsck" >&5 +-ac_lib_var=`echo insck'_'bsd_tcp | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- ac_save_LIBS="$LIBS" +-LIBS="-linsck -L$SYBASE_CT_LIBDIR $LIBS" +-cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=yes" +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=no" +-fi +-rm -f conftest* +-LIBS="$ac_save_LIBS" +- +-fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +- echo "$ac_t""yes" 1>&6 + +- case insck in +- c|c_r|pthread*) ;; +- *) +- +- if test "$ext_shared" = "yes"; then +- +- SYBASE_CT_SHARED_LIBADD="-linsck $SYBASE_CT_SHARED_LIBADD" +- +- else +- +- case insck in +- c|c_r|pthread*) ;; +- *) +- +- +- LIBS="-linsck $LIBS" +- +- +- ;; +- esac +- +- fi +- +- ;; +- esac +- +-else +- echo "$ac_t""no" 1>&6 ++ SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lct -ltds" + fi + +-fi +- +- +- +- + echo $ac_n "checking whether to enable System V semaphore support""... $ac_c" 1>&6 + echo "configure:52635: checking whether to enable System V semaphore support" >&5 + # Check whether --enable-sysvsem or --disable-sysvsem was given. +@@ -57538,7 +57248,7 @@ unset with_pic case $php_build_target in program|static) @@ -100,7 +435,7 @@ $OpenBSD: patch-configure,v 1.8 2001/12/18 01:40:48 avsm Exp $ if test "$lib_build_shared" != "yes"; then enable_shared=no fi -@@ -57547,7 +57547,7 @@ program|static) +@@ -57547,7 +57257,7 @@ program|static) ;; shared) enable_static=no @@ -109,7 +444,7 @@ $OpenBSD: patch-configure,v 1.8 2001/12/18 01:40:48 avsm Exp $ EXTRA_LDFLAGS="$EXTRA_LDFLAGS -avoid-version" ;; esac -@@ -60620,7 +60620,14 @@ old_postuninstall_cmds= +@@ -60620,7 +60330,14 @@ old_postuninstall_cmds= if test -n "$RANLIB"; then old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" @@ -125,7 +460,7 @@ $OpenBSD: patch-configure,v 1.8 2001/12/18 01:40:48 avsm Exp $ fi # Allow CC to be a program name with arguments. -@@ -61117,7 +61124,9 @@ cygwin* | mingw* | pw32* ) +@@ -61117,7 +60834,9 @@ cygwin* | mingw* | pw32* ) with_gnu_ld=no fi ;; @@ -136,7 +471,7 @@ $OpenBSD: patch-configure,v 1.8 2001/12/18 01:40:48 avsm Exp $ esac ld_shlibs=yes -@@ -61521,10 +61530,24 @@ else +@@ -61521,10 +61240,24 @@ else ;; openbsd*) @@ -163,7 +498,7 @@ $OpenBSD: patch-configure,v 1.8 2001/12/18 01:40:48 avsm Exp $ ;; os2*) -@@ -62001,9 +62024,25 @@ newsos6) +@@ -62001,9 +61734,25 @@ newsos6) openbsd*) version_type=sunos diff --git a/www/php4/patches/patch-ext_sybase_ct_config_m4 b/www/php4/patches/patch-ext_sybase_ct_config_m4 new file mode 100644 index 00000000000..6a97ffcc869 --- /dev/null +++ b/www/php4/patches/patch-ext_sybase_ct_config_m4 @@ -0,0 +1,45 @@ +$OpenBSD: patch-ext_sybase_ct_config_m4,v 1.1 2002/01/09 16:00:51 jcs Exp $ +--- ext/sybase_ct/config.m4.orig Fri Jun 22 10:52:25 2001 ++++ ext/sybase_ct/config.m4 Fri Dec 28 11:50:14 2001 +@@ -19,21 +19,27 @@ if test "$PHP_SYBASE_CT" != "no"; then + + PHP_ADD_INCLUDE($SYBASE_CT_INCDIR) + PHP_ADD_LIBPATH($SYBASE_CT_LIBDIR, SYBASE_CT_SHARED_LIBADD) +- PHP_ADD_LIBRARY(cs,, SYBASE_CT_SHARED_LIBADD) +- PHP_ADD_LIBRARY(ct,, SYBASE_CT_SHARED_LIBADD) +- PHP_ADD_LIBRARY(comn,, SYBASE_CT_SHARED_LIBADD) +- PHP_ADD_LIBRARY(intl,, SYBASE_CT_SHARED_LIBADD) ++ if test -f $SYBASE_CT_INCDIR/tds.h; then ++ PHP_ADD_LIBRARY(ct,, SYBASE_CT_SHARED_LIBADD) ++ PHP_ADD_LIBRARY(tds,, SYBASE_CT_SHARED_LIBADD) ++ SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lct -ltds" ++ else ++ PHP_ADD_LIBRARY(cs,, SYBASE_CT_SHARED_LIBADD) ++ PHP_ADD_LIBRARY(ct,, SYBASE_CT_SHARED_LIBADD) ++ PHP_ADD_LIBRARY(comn,, SYBASE_CT_SHARED_LIBADD) ++ PHP_ADD_LIBRARY(intl,, SYBASE_CT_SHARED_LIBADD) + +- SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lcs -lct -lcomn -lintl" ++ SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lcs -lct -lcomn -lintl" + +- AC_CHECK_LIB(tcl, netg_errstr, [ +- PHP_ADD_LIBRARY(tcl,,SYBASE_CT_SHARED_LIBADD) +- ],[ +- PHP_ADD_LIBRARY(sybtcl,,SYBASE_CT_SHARED_LIBADD) +- ],[ +- $SYBASE_CT_LIBS +- ]) ++ PHP_CHECK_LIBRARY(tcl, netg_errstr, [ ++ PHP_ADD_LIBRARY(tcl,,SYBASE_CT_SHARED_LIBADD) ++ ],[ ++ PHP_ADD_LIBRARY(sybtcl,,SYBASE_CT_SHARED_LIBADD) ++ ],[ ++ $SYBASE_CT_LIBS ++ ]) + +- AC_CHECK_LIB(insck, insck__getVdate, [PHP_ADD_LIBRARY(insck,, SYBASE_CT_SHARED_LIBADD)],[],[-L$SYBASE_CT_LIBDIR]) +- AC_CHECK_LIB(insck, bsd_tcp, [PHP_ADD_LIBRARY(insck,, SYBASE_CT_SHARED_LIBADD)],[],[-L$SYBASE_CT_LIBDIR]) ++ PHP_CHECK_LIBRARY(insck, insck__getVdate, [PHP_ADD_LIBRARY(insck,, SYBASE_CT_SHARED_LIBADD)],[],[-L$SYBASE_CT_LIBDIR]) ++ PHP_CHECK_LIBRARY(insck, bsd_tcp, [PHP_ADD_LIBRARY(insck,, SYBASE_CT_SHARED_LIBADD)],[],[-L$SYBASE_CT_LIBDIR]) ++ fi + fi