packages (DEVEL): php/php-tds.patch, php/php.spec - last hunk of tds patch ...

[arekm]

Author: arekm                        Date: Mon Jul  6 17:02:47 2009 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- last hunk of tds patch is still needed, reapply

---- Files affected:
packages/php:
   php-tds.patch (1.2 -> 1.2.4.1) , php.spec (1.688.2.38 -> 1.688.2.39) 

---- Diffs:

================================================================
Index: packages/php/php-tds.patch
diff -u packages/php/php-tds.patch:1.2 packages/php/php-tds.patch:1.2.4.1
--- packages/php/php-tds.patch:1.2	Mon Jun 16 10:44:01 2008
+++ packages/php/php-tds.patch	Mon Jul  6 19:02:41 2009
@@ -1,83 +1,3 @@
---- php/ext/mssql/config.m4~	2007-07-03 19:25:34.000000000 +0200
-+++ php/ext/mssql/config.m4	2008-06-16 10:28:41.960540536 +0200
-@@ -10,11 +10,11 @@
- 
-   if test "$PHP_MSSQL" = "yes"; then
-     for i in /usr/local /usr; do
--      if test -f $i/include/tds.h; then
-+      if test -f $i/include/sybdb.h; then
-         FREETDS_INSTALLATION_DIR=$i
-         FREETDS_INCLUDE_DIR=$i/include
-         break
--      elif test -f $i/include/freetds/tds.h; then
-+      elif test -f $i/include/freetds/sybdb.h; then
-         FREETDS_INSTALLATION_DIR=$i
-         FREETDS_INCLUDE_DIR=$i/include/freetds
-         break
-@@ -27,10 +27,10 @@
- 
-   elif test "$PHP_MSSQL" != "no"; then
- 
--    if test -f $PHP_MSSQL/include/tds.h; then
-+    if test -f $PHP_MSSQL/include/sybdb.h; then
-       FREETDS_INSTALLATION_DIR=$PHP_MSSQL
-       FREETDS_INCLUDE_DIR=$PHP_MSSQL/include
--    elif test -f $PHP_MSSQL/include/freetds/tds.h; then
-+    elif test -f $PHP_MSSQL/include/freetds/sybdb.h; then
-       FREETDS_INSTALLATION_DIR=$PHP_MSSQL
-       FREETDS_INCLUDE_DIR=$PHP_MSSQL/include/freetds
-     else
-@@ -38,8 +38,8 @@
-     fi
-   fi  
- 
--  if test ! -r "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds.a" && test ! -r "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds.so"; then
--     AC_MSG_ERROR(Could not find $FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds.[a|so])
-+  if test ! -r "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.a" && test ! -r "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.so"; then
-+     AC_MSG_ERROR(Could not find $FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.[a|so])
-   fi
- 
-   PHP_ADD_INCLUDE($FREETDS_INCLUDE_DIR)
---- php/ext/pdo_dblib/config.m4~	2007-07-03 19:25:34.000000000 +0200
-+++ php/ext/pdo_dblib/config.m4	2008-06-16 10:31:41.526355657 +0200
-@@ -13,11 +13,11 @@
-   if test "$PHP_PDO_DBLIB" = "yes"; then
- 
-     for i in /usr/local /usr; do
--      if test -f $i/include/tds.h; then
-+      if test -f $i/include/sybdb.h; then
-         PDO_FREETDS_INSTALLATION_DIR=$i
-         PDO_FREETDS_INCLUDE_DIR=$i/include
-         break
--      elif test -f $i/include/freetds/tds.h; then
-+      elif test -f $i/include/freetds/sybdb.h; then
-         PDO_FREETDS_INSTALLATION_DIR=$i
-         PDO_FREETDS_INCLUDE_DIR=$i/include/freetds
-         break;
-@@ -30,10 +30,10 @@
- 
-   elif test "$PHP_PDO_DBLIB" != "no"; then
- 
--    if test -f $PHP_PDO_DBLIB/include/tds.h; then
-+    if test -f $PHP_PDO_DBLIB/include/sybdb.h; then
-       PDO_FREETDS_INSTALLATION_DIR=$PHP_PDO_DBLIB
-       PDO_FREETDS_INCLUDE_DIR=$PHP_PDO_DBLIB/include
--    elif test -f $PHP_PDO_DBLIB/include/freetds/tds.h; then
-+    elif test -f $PHP_PDO_DBLIB/include/freetds/sybdb.h; then
-       PDO_FREETDS_INSTALLATION_DIR=$PHP_PDO_DBLIB
-       PDO_FREETDS_INCLUDE_DIR=$PHP_PDO_DBLIB/include/freetds
-     else
-@@ -45,8 +45,8 @@
-     PHP_LIBDIR=lib
-   fi
- 
--  if test ! -r "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds.a" && test ! -r "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds.so"; then
--     AC_MSG_ERROR(Could not find $PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds.[a|so])
-+  if test ! -r "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.a" && test ! -r "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.so"; then
-+     AC_MSG_ERROR(Could not find $PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.[a|so])
-   fi
- 
-   PHP_ADD_INCLUDE($PDO_FREETDS_INCLUDE_DIR)
 --- php/ext/sybase_ct/config.m4~	2007-07-03 19:25:35.000000000 +0200
 +++ php/ext/sybase_ct/config.m4	2008-06-16 10:42:20.463792334 +0200
 @@ -31,7 +31,7 @@

================================================================
Index: packages/php/php.spec
diff -u packages/php/php.spec:1.688.2.38 packages/php/php.spec:1.688.2.39
--- packages/php/php.spec:1.688.2.38	Mon Jul  6 17:51:37 2009
+++ packages/php/php.spec	Mon Jul  6 19:02:41 2009
@@ -1617,7 +1617,7 @@
 
 %patch29 -p1
 %patch31 -p1
-#%patch38 -p1
+%patch38 -p1
 
 %patch43 -p1
 
@@ -2718,6 +2718,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.688.2.39  2009/07/06 17:02:41  arekm
+- last hunk of tds patch is still needed, reapply
+
 Revision 1.688.2.38  2009/07/06 15:51:37  arekm
 - drop todo items
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php-tds.patch?r1=1.2&r2=1.2.4.1&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php.spec?r1=1.688.2.38&r2=1.688.2.39&f=u