Add patch files to the repository, finally.

14 files changed, 308 insertions, 24 deletions

diff --git a/www/mod_php4/Makefile b/www/mod_php4/Makefile
index e2d8276f93d9..165cbdbdba0d 100644
--- a/www/mod_php4/Makefile
+++ b/www/mod_php4/Makefile
@@ -20,12 +20,6 @@ MASTER_SITES=	http://us.php.net/${PHP_DISTDIR}/ \
 		http://php3.globe.de/${PHP_DISTDIR}/
 DISTNAME=	php-${PORTVERSION}
 
-PATCHFILES=	patch-ext_gd_config.m4 patch-ext_gd_gd.c patch-ext_sybase_ct_config.m4 \
-		patch-ext_gd_gd_2.c patch-ext_domxml_config.m4 \
-		patch-ext_imap_config.m4
-PATCH_SITES=	http://www.physik.tu-berlin.de/~ibex/ports/distfiles/ \
-		${MASTER_SITE_LOCAL}/dirk/
-
 MAINTAINER=	dirk@FreeBSD.org
 
 .if !defined(STANDALONE)
diff --git a/www/mod_php4/distinfo b/www/mod_php4/distinfo
index a1ce307c569c..db01ee6dac3c 100644
--- a/www/mod_php4/distinfo
+++ b/www/mod_php4/distinfo
@@ -1,8 +1,2 @@
 MD5 (php-4.0.6.tar.gz) = 5f698521cf2b392cf9bfa87fc1a0fe90
 MD5 (php4_mbregex-1.2.1.tar.gz) = 46d151afa9ab668df880a70cf786a2c2
-MD5 (patch-ext_domxml_config.m4) = a623491aa6c019b00817633487778e4d
-MD5 (patch-ext_gd_config.m4) = b4fb911d11e6bb4e8e712407de7600bb
-MD5 (patch-ext_gd_gd.c) = f83c2a0433c744c7b7b03fe2533ed7d9
-MD5 (patch-ext_gd_gd_2.c) = 0f159bbbec96c43671bd9097ff6b067e
-MD5 (patch-ext_imap_config.m4) = 3600207f043d658dc71457d736aee7ba
-MD5 (patch-ext_sybase_ct_config.m4) = ec731e9b05af2eb3e8ac12a0231d9a8b
diff --git a/www/mod_php4/files/patch-ext_domxml_config.m4 b/www/mod_php4/files/patch-ext_domxml_config.m4
new file mode 100644
index 000000000000..736fe2957f41
--- /dev/null
+++ b/www/mod_php4/files/patch-ext_domxml_config.m4
@@ -0,0 +1,29 @@
+--- ext/domxml/config.m4.orig	Sun May 27 11:37:40 2001
++++ ext/domxml/config.m4	Sun Nov 18 23:20:57 2001
+@@ -3,7 +3,7 @@
+ 
+ AC_DEFUN(PHP_DOM_CHECK_VERSION,[
+   old_CPPFLAGS=$CPPFLAGS
+-  CPPFLAGS=-I$DOMXML_DIR/include
++  CPPFLAGS=-I$DOMXML_DIR/include/libxml2
+   AC_MSG_CHECKING(for libxml version)
+   AC_EGREP_CPP(yes,[
+   #include <libxml/xmlversion.h>
+@@ -25,7 +25,7 @@
+ 
+ if test "$PHP_DOM" != "no"; then
+ 
+-  if test -r $PHP_DOM/include/libxml/tree.h; then
++  if test -r $PHP_DOM/include/libxml2/libxml/tree.h; then
+     DOMXML_DIR=$PHP_DOM
+   else
+     AC_MSG_CHECKING(for DOM in default path)
+@@ -44,6 +44,8 @@
+ 
+   PHP_DOM_CHECK_VERSION
+ 
++  PHP_ADD_INCLUDE($DOMXML_DIR/include/libxml2)
++dnl next line is for giconv.h
+   PHP_ADD_INCLUDE($DOMXML_DIR/include)
+ 
+   if test -f $DOMXML_DIR/lib/libxml2.a -o -f $DOMXML_DIR/lib/libxml2.s? ; then
diff --git a/www/mod_php4/files/patch-ext_gd_config.m4 b/www/mod_php4/files/patch-ext_gd_config.m4
new file mode 100644
index 000000000000..ee6d54937268
--- /dev/null
+++ b/www/mod_php4/files/patch-ext_gd_config.m4
@@ -0,0 +1,13 @@
+--- ext/gd/config.m4.orig	Mon Jun  4 10:36:47 2001
++++ ext/gd/config.m4	Fri Oct 26 20:30:41 2001
+@@ -174,7 +174,9 @@
+   AC_CHECK_LIB(gd, gdImageString16,        [AC_DEFINE(HAVE_LIBGD13, 1, [ ])])
+   AC_CHECK_LIB(gd, gdImagePaletteCopy,     [AC_DEFINE(HAVE_LIBGD15, 1, [ ])])
+   AC_CHECK_LIB(gd, gdImageCreateFromPng,   [AC_DEFINE(HAVE_GD_PNG,  1, [ ])])
+-  AC_CHECK_LIB(gd, gdImageCreateFromGif,   [AC_DEFINE(HAVE_GD_GIF,  1, [ ])])
++  AC_CHECK_LIB(gd, gdImageCreateFromGif,   [AC_DEFINE(HAVE_GD_GIF_READ,  1, [ ])])
++  AC_CHECK_LIB(gd, gdImageGif,             [AC_DEFINE(HAVE_GD_GIF_CREATE,  1, [ ])])
++  AC_CHECK_LIB(gd, gdImageCreateFromGd2,   [AC_DEFINE(HAVE_GD_GD2,  1, [ ])])
+   AC_CHECK_LIB(gd, gdImageWBMP,            [AC_DEFINE(HAVE_GD_WBMP, 1, [ ])])
+   AC_CHECK_LIB(gd, gdImageCreateFromJpeg,  [AC_DEFINE(HAVE_GD_JPG,  1, [ ])])
+   AC_CHECK_LIB(gd, gdImageCreateFromXpm,   [AC_DEFINE(HAVE_GD_XPM,  1, [ ])])
diff --git a/www/mod_php4/files/patch-ext_gd_gd.c b/www/mod_php4/files/patch-ext_gd_gd.c
new file mode 100644
index 000000000000..336a12257153
--- /dev/null
+++ b/www/mod_php4/files/patch-ext_gd_gd.c
@@ -0,0 +1,81 @@
+--- ext/gd/gd.c.orig	Mon Jun 11 17:22:10 2001
++++ ext/gd/gd.c	Fri Nov 30 10:14:50 2001
+@@ -335,8 +335,11 @@
+ 
+ /* this next part is stupid ... if I knew better, I'd put them all on one row (cmv) */
+ 
+-#ifdef HAVE_GD_GIF
+-	php_info_print_table_row(2, "GIF Support", "enabled");
++#ifdef HAVE_GD_GIF_READ
++	php_info_print_table_row(2, "GIF Read Support", "enabled");
++#endif
++#ifdef(HAVE_GD_GID_CREATE)
++	php_info_print_table_row(2, "GIF Create Support", "enabled");
+ #endif
+ #ifdef HAVE_GD_JPG
+ 	php_info_print_table_row(2, "JPG Support", "enabled");
+@@ -1088,7 +1091,7 @@
+ 			break;
+ 			
+ 		case PHP_GDIMG_TYPE_GIF:
+-#ifdef HAVE_GD_GIF
++#ifdef HAVE_GD_GIF_READ
+ 			im = _php_image_create_from_string (data, "GIF", gdImageCreateFromGifCtx);
+ #else
+ 			php_error(E_WARNING, "No GIF support in this PHP build");
+@@ -1205,9 +1208,9 @@
+    Create a new image from GIF file or URL */
+ PHP_FUNCTION(imagecreatefromgif)
+ {
+-#ifdef HAVE_GD_GIF
++#ifdef HAVE_GD_GIF_READ
+ 	_php_image_create_from(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_GIF, "GIF", gdImageCreateFromGif,gdImageCreateFromGifCtx);
+-#else /* HAVE_GD_GIF */
++#else /* HAVE_GD_GIF_READ */
+ 	php_error(E_WARNING, "ImageCreateFromGif: No GIF support in this PHP build");
+ 	RETURN_FALSE;
+ #endif /* HAVE_GD_GIF */
+@@ -1397,14 +1400,14 @@
+    Output GIF image to browser or file */
+ PHP_FUNCTION(imagegif)
+ {
+-#ifdef HAVE_GD_GIF
++#ifdef HAVE_GD_GIF_CREATE
+ #ifdef HAVE_GD_GIF_CTX
+ 	_php_image_output_ctx(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_GIF, "GIF", gdImageGifCtx);
+ #else
+ 	_php_image_output(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_GIF, "GIF", gdImageGif);
+ #endif
+ #else /* HAVE_GD_GIF */
+-	php_error(E_WARNING, "ImageGif: No GIF support in this PHP build");
++	php_error(E_WARNING, "ImageGif: No GIF create support in this PHP build");
+ 	RETURN_FALSE;
+ #endif /* HAVE_GD_GIF */
+ }
+@@ -2662,7 +2665,7 @@
+ 	fontname = (unsigned char *) Z_STRVAL_PP(FONTNAME);
+ 
+ #ifdef USE_GD_IMGSTRTTF
+-# if HAVE_LIBGD20 & HAVE_LIBFREETYPE
++# if HAVE_LIBFREETYPE
+ 	error = gdImageStringFT(im, brect, col, fontname, ptsize, angle, x, y, str);
+ # else
+ 	error = gdImageStringTTF(im, brect, col, fontname, ptsize, angle, x, y, str);
+@@ -3356,7 +3359,7 @@
+ 		}
+ 
+ 		switch (image_type) {
+-#ifdef HAVE_GD_GIF
++#ifdef HAVE_GD_GIF_READ
+ 			case PHP_GDIMG_TYPE_GIF:
+ 				im_org = gdImageCreateFromGif (org);
+ 				if (im_org == NULL) {
+@@ -3364,7 +3367,7 @@
+ 					RETURN_FALSE;
+ 				}
+ 				break;
+-#endif /* HAVE_GD_GIF */
++#endif /* HAVE_GD_GIF_READ */
+ 
+ #ifdef HAVE_GD_JPG
+ 			case PHP_GDIMG_TYPE_JPG:
diff --git a/www/mod_php4/files/patch-ext_imap_config.m4 b/www/mod_php4/files/patch-ext_imap_config.m4
new file mode 100644
index 000000000000..ccdfb4c947e2
--- /dev/null
+++ b/www/mod_php4/files/patch-ext_imap_config.m4
@@ -0,0 +1,11 @@
+--- ext/imap/config.m4.orig	Tue May 22 02:38:46 2001
++++ ext/imap/config.m4	Fri Nov 23 19:40:39 2001
+@@ -53,7 +53,7 @@
+     PHP_ADD_LIBRARY_DEFER(ssl)
+ 
+     old_LIBS=$LIBS
+-    LIBS="$LIBS -lc-client"
++    LIBS="$LIBS -lc-client4"
+     if test $PHP_KERBEROS != "no"; then
+       LIBS="$LIBS -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err"
+     fi
diff --git a/www/mod_php4/files/patch-ext_sybase_ct_config.m4 b/www/mod_php4/files/patch-ext_sybase_ct_config.m4
new file mode 100644
index 000000000000..8b4692e3c98d
--- /dev/null
+++ b/www/mod_php4/files/patch-ext_sybase_ct_config.m4
@@ -0,0 +1,20 @@
+--- ext/sybase_ct/config.m4.orig	Wed Mar 28 05:34:43 2001
++++ ext/sybase_ct/config.m4	Fri Oct 26 21:35:50 2001
+@@ -20,16 +20,12 @@
+     fi
+ 	PHP_ADD_INCLUDE($SYBASE_CT_INCDIR)
+ 	PHP_ADD_LIBPATH($SYBASE_CT_LIBDIR)
+-	PHP_ADD_LIBRARY(cs)
+ 	PHP_ADD_LIBRARY(ct)
+-	PHP_ADD_LIBRARY(comn)
+-	PHP_ADD_LIBRARY(intl)
+-	SYBASE_CT_LIBS="-lcs -lct -lcomn -lintl"
++	SYBASE_CT_LIBS="-lct"
+     old_LDFLAGS=$LDFLAGS
+     LDFLAGS="$LDFLAGS -L$SYBASE_CT_LIBDIR"
+     AC_CHECK_LIB(tcl, netg_errstr,
+               [ PHP_ADD_LIBRARY(tcl) ],
+-              [ PHP_ADD_LIBRARY(sybtcl) ],
+               [ $SYBASE_CT_LIBS ])
+     AC_CHECK_LIB(insck, insck__getVdate,
+               [ PHP_ADD_LIBRARY(insck) ])
diff --git a/www/mod_php5/Makefile b/www/mod_php5/Makefile
index e2d8276f93d9..165cbdbdba0d 100644
--- a/www/mod_php5/Makefile
+++ b/www/mod_php5/Makefile
@@ -20,12 +20,6 @@ MASTER_SITES=	http://us.php.net/${PHP_DISTDIR}/ \
 		http://php3.globe.de/${PHP_DISTDIR}/
 DISTNAME=	php-${PORTVERSION}
 
-PATCHFILES=	patch-ext_gd_config.m4 patch-ext_gd_gd.c patch-ext_sybase_ct_config.m4 \
-		patch-ext_gd_gd_2.c patch-ext_domxml_config.m4 \
-		patch-ext_imap_config.m4
-PATCH_SITES=	http://www.physik.tu-berlin.de/~ibex/ports/distfiles/ \
-		${MASTER_SITE_LOCAL}/dirk/
-
 MAINTAINER=	dirk@FreeBSD.org
 
 .if !defined(STANDALONE)
diff --git a/www/mod_php5/distinfo b/www/mod_php5/distinfo
index a1ce307c569c..db01ee6dac3c 100644
--- a/www/mod_php5/distinfo
+++ b/www/mod_php5/distinfo
@@ -1,8 +1,2 @@
 MD5 (php-4.0.6.tar.gz) = 5f698521cf2b392cf9bfa87fc1a0fe90
 MD5 (php4_mbregex-1.2.1.tar.gz) = 46d151afa9ab668df880a70cf786a2c2
-MD5 (patch-ext_domxml_config.m4) = a623491aa6c019b00817633487778e4d
-MD5 (patch-ext_gd_config.m4) = b4fb911d11e6bb4e8e712407de7600bb
-MD5 (patch-ext_gd_gd.c) = f83c2a0433c744c7b7b03fe2533ed7d9
-MD5 (patch-ext_gd_gd_2.c) = 0f159bbbec96c43671bd9097ff6b067e
-MD5 (patch-ext_imap_config.m4) = 3600207f043d658dc71457d736aee7ba
-MD5 (patch-ext_sybase_ct_config.m4) = ec731e9b05af2eb3e8ac12a0231d9a8b
diff --git a/www/mod_php5/files/patch-ext_domxml_config.m4 b/www/mod_php5/files/patch-ext_domxml_config.m4
new file mode 100644
index 000000000000..736fe2957f41
--- /dev/null
+++ b/www/mod_php5/files/patch-ext_domxml_config.m4
@@ -0,0 +1,29 @@
+--- ext/domxml/config.m4.orig	Sun May 27 11:37:40 2001
++++ ext/domxml/config.m4	Sun Nov 18 23:20:57 2001
+@@ -3,7 +3,7 @@
+ 
+ AC_DEFUN(PHP_DOM_CHECK_VERSION,[
+   old_CPPFLAGS=$CPPFLAGS
+-  CPPFLAGS=-I$DOMXML_DIR/include
++  CPPFLAGS=-I$DOMXML_DIR/include/libxml2
+   AC_MSG_CHECKING(for libxml version)
+   AC_EGREP_CPP(yes,[
+   #include <libxml/xmlversion.h>
+@@ -25,7 +25,7 @@
+ 
+ if test "$PHP_DOM" != "no"; then
+ 
+-  if test -r $PHP_DOM/include/libxml/tree.h; then
++  if test -r $PHP_DOM/include/libxml2/libxml/tree.h; then
+     DOMXML_DIR=$PHP_DOM
+   else
+     AC_MSG_CHECKING(for DOM in default path)
+@@ -44,6 +44,8 @@
+ 
+   PHP_DOM_CHECK_VERSION
+ 
++  PHP_ADD_INCLUDE($DOMXML_DIR/include/libxml2)
++dnl next line is for giconv.h
+   PHP_ADD_INCLUDE($DOMXML_DIR/include)
+ 
+   if test -f $DOMXML_DIR/lib/libxml2.a -o -f $DOMXML_DIR/lib/libxml2.s? ; then
diff --git a/www/mod_php5/files/patch-ext_gd_config.m4 b/www/mod_php5/files/patch-ext_gd_config.m4
new file mode 100644
index 000000000000..ee6d54937268
--- /dev/null
+++ b/www/mod_php5/files/patch-ext_gd_config.m4
@@ -0,0 +1,13 @@
+--- ext/gd/config.m4.orig	Mon Jun  4 10:36:47 2001
++++ ext/gd/config.m4	Fri Oct 26 20:30:41 2001
+@@ -174,7 +174,9 @@
+   AC_CHECK_LIB(gd, gdImageString16,        [AC_DEFINE(HAVE_LIBGD13, 1, [ ])])
+   AC_CHECK_LIB(gd, gdImagePaletteCopy,     [AC_DEFINE(HAVE_LIBGD15, 1, [ ])])
+   AC_CHECK_LIB(gd, gdImageCreateFromPng,   [AC_DEFINE(HAVE_GD_PNG,  1, [ ])])
+-  AC_CHECK_LIB(gd, gdImageCreateFromGif,   [AC_DEFINE(HAVE_GD_GIF,  1, [ ])])
++  AC_CHECK_LIB(gd, gdImageCreateFromGif,   [AC_DEFINE(HAVE_GD_GIF_READ,  1, [ ])])
++  AC_CHECK_LIB(gd, gdImageGif,             [AC_DEFINE(HAVE_GD_GIF_CREATE,  1, [ ])])
++  AC_CHECK_LIB(gd, gdImageCreateFromGd2,   [AC_DEFINE(HAVE_GD_GD2,  1, [ ])])
+   AC_CHECK_LIB(gd, gdImageWBMP,            [AC_DEFINE(HAVE_GD_WBMP, 1, [ ])])
+   AC_CHECK_LIB(gd, gdImageCreateFromJpeg,  [AC_DEFINE(HAVE_GD_JPG,  1, [ ])])
+   AC_CHECK_LIB(gd, gdImageCreateFromXpm,   [AC_DEFINE(HAVE_GD_XPM,  1, [ ])])
diff --git a/www/mod_php5/files/patch-ext_gd_gd.c b/www/mod_php5/files/patch-ext_gd_gd.c
new file mode 100644
index 000000000000..336a12257153
--- /dev/null
+++ b/www/mod_php5/files/patch-ext_gd_gd.c
@@ -0,0 +1,81 @@
+--- ext/gd/gd.c.orig	Mon Jun 11 17:22:10 2001
++++ ext/gd/gd.c	Fri Nov 30 10:14:50 2001
+@@ -335,8 +335,11 @@
+ 
+ /* this next part is stupid ... if I knew better, I'd put them all on one row (cmv) */
+ 
+-#ifdef HAVE_GD_GIF
+-	php_info_print_table_row(2, "GIF Support", "enabled");
++#ifdef HAVE_GD_GIF_READ
++	php_info_print_table_row(2, "GIF Read Support", "enabled");
++#endif
++#ifdef(HAVE_GD_GID_CREATE)
++	php_info_print_table_row(2, "GIF Create Support", "enabled");
+ #endif
+ #ifdef HAVE_GD_JPG
+ 	php_info_print_table_row(2, "JPG Support", "enabled");
+@@ -1088,7 +1091,7 @@
+ 			break;
+ 			
+ 		case PHP_GDIMG_TYPE_GIF:
+-#ifdef HAVE_GD_GIF
++#ifdef HAVE_GD_GIF_READ
+ 			im = _php_image_create_from_string (data, "GIF", gdImageCreateFromGifCtx);
+ #else
+ 			php_error(E_WARNING, "No GIF support in this PHP build");
+@@ -1205,9 +1208,9 @@
+    Create a new image from GIF file or URL */
+ PHP_FUNCTION(imagecreatefromgif)
+ {
+-#ifdef HAVE_GD_GIF
++#ifdef HAVE_GD_GIF_READ
+ 	_php_image_create_from(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_GIF, "GIF", gdImageCreateFromGif,gdImageCreateFromGifCtx);
+-#else /* HAVE_GD_GIF */
++#else /* HAVE_GD_GIF_READ */
+ 	php_error(E_WARNING, "ImageCreateFromGif: No GIF support in this PHP build");
+ 	RETURN_FALSE;
+ #endif /* HAVE_GD_GIF */
+@@ -1397,14 +1400,14 @@
+    Output GIF image to browser or file */
+ PHP_FUNCTION(imagegif)
+ {
+-#ifdef HAVE_GD_GIF
++#ifdef HAVE_GD_GIF_CREATE
+ #ifdef HAVE_GD_GIF_CTX
+ 	_php_image_output_ctx(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_GIF, "GIF", gdImageGifCtx);
+ #else
+ 	_php_image_output(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_GIF, "GIF", gdImageGif);
+ #endif
+ #else /* HAVE_GD_GIF */
+-	php_error(E_WARNING, "ImageGif: No GIF support in this PHP build");
++	php_error(E_WARNING, "ImageGif: No GIF create support in this PHP build");
+ 	RETURN_FALSE;
+ #endif /* HAVE_GD_GIF */
+ }
+@@ -2662,7 +2665,7 @@
+ 	fontname = (unsigned char *) Z_STRVAL_PP(FONTNAME);
+ 
+ #ifdef USE_GD_IMGSTRTTF
+-# if HAVE_LIBGD20 & HAVE_LIBFREETYPE
++# if HAVE_LIBFREETYPE
+ 	error = gdImageStringFT(im, brect, col, fontname, ptsize, angle, x, y, str);
+ # else
+ 	error = gdImageStringTTF(im, brect, col, fontname, ptsize, angle, x, y, str);
+@@ -3356,7 +3359,7 @@
+ 		}
+ 
+ 		switch (image_type) {
+-#ifdef HAVE_GD_GIF
++#ifdef HAVE_GD_GIF_READ
+ 			case PHP_GDIMG_TYPE_GIF:
+ 				im_org = gdImageCreateFromGif (org);
+ 				if (im_org == NULL) {
+@@ -3364,7 +3367,7 @@
+ 					RETURN_FALSE;
+ 				}
+ 				break;
+-#endif /* HAVE_GD_GIF */
++#endif /* HAVE_GD_GIF_READ */
+ 
+ #ifdef HAVE_GD_JPG
+ 			case PHP_GDIMG_TYPE_JPG:
diff --git a/www/mod_php5/files/patch-ext_imap_config.m4 b/www/mod_php5/files/patch-ext_imap_config.m4
new file mode 100644
index 000000000000..ccdfb4c947e2
--- /dev/null
+++ b/www/mod_php5/files/patch-ext_imap_config.m4
@@ -0,0 +1,11 @@
+--- ext/imap/config.m4.orig	Tue May 22 02:38:46 2001
++++ ext/imap/config.m4	Fri Nov 23 19:40:39 2001
+@@ -53,7 +53,7 @@
+     PHP_ADD_LIBRARY_DEFER(ssl)
+ 
+     old_LIBS=$LIBS
+-    LIBS="$LIBS -lc-client"
++    LIBS="$LIBS -lc-client4"
+     if test $PHP_KERBEROS != "no"; then
+       LIBS="$LIBS -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err"
+     fi
diff --git a/www/mod_php5/files/patch-ext_sybase_ct_config.m4 b/www/mod_php5/files/patch-ext_sybase_ct_config.m4
new file mode 100644
index 000000000000..8b4692e3c98d
--- /dev/null
+++ b/www/mod_php5/files/patch-ext_sybase_ct_config.m4
@@ -0,0 +1,20 @@
+--- ext/sybase_ct/config.m4.orig	Wed Mar 28 05:34:43 2001
++++ ext/sybase_ct/config.m4	Fri Oct 26 21:35:50 2001
+@@ -20,16 +20,12 @@
+     fi
+ 	PHP_ADD_INCLUDE($SYBASE_CT_INCDIR)
+ 	PHP_ADD_LIBPATH($SYBASE_CT_LIBDIR)
+-	PHP_ADD_LIBRARY(cs)
+ 	PHP_ADD_LIBRARY(ct)
+-	PHP_ADD_LIBRARY(comn)
+-	PHP_ADD_LIBRARY(intl)
+-	SYBASE_CT_LIBS="-lcs -lct -lcomn -lintl"
++	SYBASE_CT_LIBS="-lct"
+     old_LDFLAGS=$LDFLAGS
+     LDFLAGS="$LDFLAGS -L$SYBASE_CT_LIBDIR"
+     AC_CHECK_LIB(tcl, netg_errstr,
+               [ PHP_ADD_LIBRARY(tcl) ],
+-              [ PHP_ADD_LIBRARY(sybtcl) ],
+               [ $SYBASE_CT_LIBS ])
+     AC_CHECK_LIB(insck, insck__getVdate,
+               [ PHP_ADD_LIBRARY(insck) ])