From: Adam Gołębiowski <adamg@pld-linux.org>
Date: Thu, 5 Feb 2004 12:16:01 +0000 (+0000)
Subject: - outdated
X-Git-Tag: auto/ac/php-4_3_5-2~2
X-Git-Url: https://git.pld-linux.org/?a=commitdiff_plain;h=d4d459c836a511c77694ec6ab2b3ea2a69bf7117;p=packages%2Fphp.git

- outdated

Changed files:
    php-ncurses.patch -> 1.3
    php-phpize_fixes.patch -> 1.2
---

diff --git a/php-ncurses.patch b/php-ncurses.patch
deleted file mode 100644
index bb50f8d..0000000
--- a/php-ncurses.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-diff -urN php-4.3.4RC2.orig/ext/ncurses/config.m4 php-4.3.4RC2/ext/ncurses/config.m4
---- php-4.3.4RC2.orig/ext/ncurses/config.m4	2003-10-22 11:15:33.000000000 +0200
-+++ php-4.3.4RC2/ext/ncurses/config.m4	2003-10-22 13:11:00.000000000 +0200
-@@ -11,24 +11,29 @@
- 
-    for i in $SEARCH_PATH ; do
-      if test -d $i/include; then
-+       NCURSES_DIR=$i
-        if test -r $i/include/ncurses.h; then
--         NCURSES_DIR=$i
-+	 NCURSES_INC=$i/include
-+         AC_DEFINE(HAVE_NCURSES_H,1,[ ])
-+         break
-+       elif test -r $i/include/ncurses/ncurses.h; then
-+	 NCURSES_INC=$i/include/ncurses;
-          AC_DEFINE(HAVE_NCURSES_H,1,[ ])
-          break
-        elif test -r $i/include/curses.h; then
--         NCURSES_DIR=$i
-+         NCURSES_INC=$i/include
-          break
-        fi
-      fi
-    done
-   
--   if test -z "$NCURSES_DIR"; then
-+   if test -z "$NCURSES_INC"; then
-      AC_MSG_RESULT(not found)
-      AC_MSG_ERROR(Please reinstall the ncurses distribution)
-    fi
- 
-    # --with-ncurses -> add include path
--   PHP_ADD_INCLUDE($NCURSES_DIR/include)
-+   PHP_ADD_INCLUDE($NCURSES_INC)
- 
-    # --with-ncurses -> chech for lib and symbol presence
-    LIBNAME=ncurses 
-diff -urN php-4.3.4RC2.orig/ext/readline/config.m4 php-4.3.4RC2/ext/readline/config.m4
---- php-4.3.4RC2.orig/ext/readline/config.m4	2003-10-22 11:15:34.000000000 +0200
-+++ php-4.3.4RC2/ext/readline/config.m4	2003-10-22 13:12:04.000000000 +0200
-@@ -19,6 +19,10 @@
- 
-   PHP_ADD_INCLUDE($READLINE_DIR/include)
- 
-+  AC_CHECK_LIB(tinfo, tgetent,
-+  [
-+    PHP_ADD_LIBRARY(tinfo,,READLINE_SHARED_LIBADD)
-+  ],[
-   AC_CHECK_LIB(ncurses, tgetent,
-   [
-     PHP_ADD_LIBRARY(ncurses,,READLINE_SHARED_LIBADD)
-@@ -28,6 +32,7 @@
-       PHP_ADD_LIBRARY(termcap,,READLINE_SHARED_LIBADD)
-     ])
-   ])
-+  ])
- 
-   PHP_CHECK_LIBRARY(readline, readline,
-   [
-@@ -63,6 +68,10 @@
- 
-   PHP_ADD_INCLUDE($LIBEDIT_DIR/include)
- 
-+  AC_CHECK_LIB(tinfo, tgetent,
-+  [
-+    PHP_ADD_LIBRARY(tinfo,,READLINE_SHARED_LIBADD)
-+  ],[
-   AC_CHECK_LIB(ncurses, tgetent,
-   [
-     PHP_ADD_LIBRARY(ncurses,,READLINE_SHARED_LIBADD)
-@@ -72,6 +81,7 @@
-       PHP_ADD_LIBRARY(termcap,,READLINE_SHARED_LIBADD)
-     ])
-   ])
-+  ])
- 
-   PHP_CHECK_LIBRARY(edit, readline,
-   [
diff --git a/php-phpize_fixes.patch b/php-phpize_fixes.patch
deleted file mode 100644
index 1e6ad6a..0000000
--- a/php-phpize_fixes.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-===================================================================
-RCS file: /repository/php-src/scripts/phpize.in,v
-retrieving revision 1.1.2.7
-retrieving revision 1.1.2.9
-diff -p --unified=3 -r1.1.2.7 -r1.1.2.9
---- scripts/phpize.in	2003/08/27 17:57:32	1.1.2.7
-+++ scripts/phpize.in	2003/11/14 03:21:15	1.1.2.9
-@@ -10,7 +10,7 @@ FILES="acinclude.m4 Makefile.global"
- CLEAN_FILES="$FILES *.lo *.la *.o .deps .libs/ build/ include/ modules/ install-sh \
-     mkinstalldirs missing config.nice config.sub config.guess configure configure.in \
- 	aclocal.m4 config.h config.h.in conftest* ltmain.sh libtool config.cache \
--	config.log config.status Makefile Makefile.fragments Makefile.objects"
-+	config.log config.status Makefile Makefile.fragments Makefile.objects confdefs.h"
-
- case "$1" in
-   # Cleanup
-@@ -57,6 +57,13 @@ touch install-sh mkinstalldirs missing
- aclocal || exit 1
- autoconf || exit 1
- autoheader || exit 1
-+test -x $builddir/build/shtool || chmod +x $builddir/build/shtool
-+if test ! -x $builddir/build/shtool; then
-+  echo "shtool at '$builddir/build/shtool' not executable. "
-+  echo "Make sure that the file exists and is executable and then rerun this script. "
-+  echo
-+  exit 1
-+fi
- libtoolize=`$builddir/build/shtool path glibtoolize libtoolize`
- $libtoolize -f -c || exit 1
-