php: fix broken 5.2.6

* drop broken 5.1.4
* not linking with mysql for now because oe build mysql with --enable-embedded-server
*     http://bugs.mysql.com/bug.php?id=16513
*     no fix is available for mysql4.1, waiting for mysql5.x in oe to link with mysql

8 files changed, 65 insertions, 192 deletions

diff --git a/packages/php/php-5.1.4/.mtn2git_empty b/packages/php/php-5.1.4/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/php/php-5.1.4/.mtn2git_empty
+++ /dev/null
diff --git a/packages/php/php-5.1.4/acinclude-xml2-config.patch b/packages/php/php-5.1.4/acinclude-xml2-config.patch
deleted file mode 100644
index 84d180ea8c..0000000000
--- a/packages/php/php-5.1.4/acinclude-xml2-config.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- /orig-acinclude.m4	2007-02-20 15:03:25.000000000 +0200
-+++ /acinclude.m4	2007-02-20 15:03:24.000000000 +0200
-@@ -2359,12 +2359,9 @@
- AC_DEFUN([PHP_SETUP_LIBXML], [
- AC_CACHE_CHECK([for xml2-config path], ac_cv_php_xml2_config_path,
- [
--  for i in $PHP_LIBXML_DIR /usr/local /usr; do
--    if test -x "$i/bin/xml2-config"; then
--      ac_cv_php_xml2_config_path="$i/bin/xml2-config"
--      break
--    fi
--  done
-+
-+      ac_cv_php_xml2_config_path="$PHP_LIBXML_DIR/xml2-config"
-+
- ])
- 
-   if test -x "$ac_cv_php_xml2_config_path"; then
diff --git a/packages/php/php-5.1.4/autotools.patch b/packages/php/php-5.1.4/autotools.patch
deleted file mode 100644
index d198c8e36d..0000000000
--- a/packages/php/php-5.1.4/autotools.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-diff -u'rNF^function' php-5.1.4~/acinclude.m4 php-5.1.4/acinclude.m4
---- php-5.1.4~/acinclude.m4	2006-04-10 08:17:36.000000000 -0400
-+++ php-5.1.4/acinclude.m4	2006-08-16 22:32:58.000000000 -0400
-@@ -818,10 +818,10 @@
-   OVERALL_TARGET=[]ifelse($1,,php,$1)
-   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
--  php_c_post=
-+  php_c_post=' && echo "[#] Generated by PHP badness - GNU libtool" > $[@] && echo "pic_object=none" >> $[@] && echo "non_pic_object=$[@]" | sed -e "s,=.*/,=,; s,\.lo,\.o,g" >> $[@]'
-   php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-   php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
--  php_cxx_post=
-+  php_cxx_post=' && echo "[#] Generated by PHP badness - GNU libtool" > $[@] && echo "pic_object=none" >> $[@] && echo "non_pic_object=$[@]" | sed -e "s,=.*/,=,; s,\.lo,\.o,g" >> $[@]'
-   php_lo=lo
- 
-   case $with_pic in
-@@ -1670,6 +1670,7 @@
-       have_fopen_cookie=yes
- 
- dnl even newer glibcs have a different seeker definition...
-+AC_CACHE_CHECK([if cookie io functions use off64_t], php_cv_lib_cookie_io_functions_use_off64_t,
- AC_TRY_RUN([
- #define _GNU_SOURCE
- #include <stdio.h>
-@@ -1702,10 +1703,11 @@
-   cookie_io_functions_use_off64_t=yes
- ], [
-   cookie_io_functions_use_off64_t=no
--], [
--  cookie_io_functions_use_off64_t=no
--])
--    
-+],
-+[ php_cv_lib_cookie_io_functions_use_off64_t=yes ],
-+[ php_cv_lib_cookie_io_functions_use_off64_t=no ] ))
-+
-+
-     else
- 
- dnl older glibc versions (up to 2.1.2 ?)
-diff -u'rNF^function' php-5.1.4~/configure.in php-5.1.4/configure.in
---- php-5.1.4~/configure.in	2006-05-03 19:30:02.000000000 -0400
-+++ php-5.1.4/configure.in	2006-08-16 20:39:19.000000000 -0400
-@@ -209,6 +209,7 @@
- 
- sinclude(Zend/Zend.m4)
- sinclude(TSRM/tsrm.m4)
-+sinclude(TSRM/threads.m4)
- 
- 
- divert(2)
-diff -u'rNF^function' php-5.1.4~/scripts/phpize.m4 php-5.1.4/scripts/phpize.m4
---- php-5.1.4~/scripts/phpize.m4	2006-04-10 08:16:17.000000000 -0400
-+++ php-5.1.4/scripts/phpize.m4	2006-08-16 20:39:19.000000000 -0400
-@@ -3,7 +3,6 @@
- divert(1)
- 
- AC_PREREQ(2.13)
--AC_INIT(config.m4)
- 
- PHP_CONFIG_NICE(config.nice)
- 
-@@ -69,8 +68,6 @@
- PHP_PROG_RE2C
- PHP_PROG_AWK
-     
--sinclude(config.m4)
--
- enable_static=no
- enable_shared=yes
- 
-diff -u'rNF^function' php-5.1.4~/TSRM/threads.m4 php-5.1.4/TSRM/threads.m4
---- php-5.1.4~/TSRM/threads.m4	2005-04-27 09:22:18.000000000 -0400
-+++ php-5.1.4/TSRM/threads.m4	2006-08-16 20:39:19.000000000 -0400
-@@ -86,7 +86,7 @@
-   pthreads_working=no
-   ], [
-   dnl For cross compiling running this test is of no use. NetWare supports pthreads
--  pthreads_working=no
-+  pthreads_working=yes
-   case $host_alias in
-   *netware*)
-     pthreads_working=yes
-diff -u'rNF^function' php-5.1.4~/TSRM/tsrm.m4 php-5.1.4/TSRM/tsrm.m4
---- php-5.1.4~/TSRM/tsrm.m4	2005-05-29 19:16:40.000000000 -0400
-+++ php-5.1.4/TSRM/tsrm.m4	2006-08-16 20:39:19.000000000 -0400
-@@ -68,7 +68,6 @@
- ])
- 
- sinclude(threads.m4)
--sinclude(TSRM/threads.m4)
- 
- AC_DEFUN([TSRM_CHECK_PTHREADS],[
- 		
diff --git a/packages/php/php-native.inc b/packages/php/php-native.inc
new file mode 100644
index 0000000000..84f9a1a0ee
--- /dev/null
+++ b/packages/php/php-native.inc
@@ -0,0 +1,15 @@
+require php.inc
+
+DEPENDS = "zlib-native libxml2-native"
+
+inherit autotools native pkgconfig
+export LIBS=" -lxml2 "
+export LD_LIBRARY_PATH = "${STAGING_LIBDIR_NATIVE}"
+
+EXTRA_OECONF = "--with-cgi --enable-sockets --enable-pcntl \
+                --with-zlib --with-zlib-dir=${STAGING_LIBDIR_NATIVE} \
+                --without-libpng --without-libjpeg \
+                --with-libxml-dir=${STAGING_BINDIR_NATIVE} \
+               "
+
+FILESPATH = "${FILE_DIRNAME}/php-${PV}:${FILE_DIRNAME}/php:${FILE_DIRNAME}/files"
diff --git a/packages/php/php-native_5.2.6.bb b/packages/php/php-native_5.2.6.bb
index d165f7a4a7..97064a6510 100644
--- a/packages/php/php-native_5.2.6.bb
+++ b/packages/php/php-native_5.2.6.bb
@@ -1,13 +1,3 @@
-require php_${PV}.bb
+require php-native.inc
 
-SECTION = "console/network"
-DEPENDS = "zlib-native libxml2-native mysql-native"
-PR = "r1"
-
-S = "${WORKDIR}/php-${PV}"
-
-inherit autotools native pkgconfig
-export LIBS=" -lxml2 "
-export LD_LIBRARY_PATH = "${STAGING_LIBDIR}"
-
-FILESPATH = "${FILE_DIRNAME}/php-${PV}:${FILE_DIRNAME}/php:${FILE_DIRNAME}/files"
+PR = "r2"
diff --git a/packages/php/php.inc b/packages/php/php.inc
index e2ab04f486..e9d49a3269 100644
--- a/packages/php/php.inc
+++ b/packages/php/php.inc
@@ -2,24 +2,15 @@ DESCRIPTION = "A server-side, HTML-embedded scripting language. This package pro
 HOMEPAGE = "http://www.php.net"
 SECTION = "console/network"
 LICENSE = "PHP"
-DEPENDS = "zlib libxml2 mysql mysql-native virtual/libiconv php-native"
 
 SRC_URI =     "http://us2.php.net/distributions/php-${PV}.tar.bz2\
                file://acinclude-xml2-config.patch;patch=1"
 
+S = "${WORKDIR}/php-${PV}"
+
 inherit autotools
 
 CFLAGS += " -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED"
-EXTRA_OECONF = "--with-cgi --enable-sockets --enable-pcntl \
-                --with-mysql \
-                --with-zlib --with-zlib-dir=${STAGING_LIBDIR}/.. \
-                --without-libpng --without-libjpeg \
-                --with-config-file-path=${sysconfdir}/php4"
-
-EXTRA_OECONF += " --without-pear"
-# Uncomment the following two lines, and comment the above to enable PEAR
-#EXTRA_OECONF += " --with-pear-php-cli=${STAGING_BINDIR_NATIVE}/php"
-#DEPENDS += " php-native"
 
 acpaths = ""
 
diff --git a/packages/php/php_5.1.4.bb b/packages/php/php_5.1.4.bb
deleted file mode 100644
index e639bf5acf..0000000000
--- a/packages/php/php_5.1.4.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-require php.inc
-
-PR = "r3"
-
-SRC_URI += "file://autotools.patch;patch=1"
-
-inherit autotools
-
-export THREADS="pthread"
-export LIBS=" -lpthread "
-
-EXTRA_OECONF = "--without-iconv \
- 	        --enable-discard-path \
-	        --enable-sockets \
-    	        --enable-memory-limit \
-    	        --enable-wddx \
-    	         --with-zlib"
-
-EXTRA_OECONF += " --without-pear --with-libxml-dir=${STAGING_BINDIR} "
-# Uncomment the following two lines, and comment the above to enable PEAR
-#EXTRA_OECONF += " --with-pear-php-cli=${STAGING_BINDIR_NATIVE}/php"
-#DEPENDS += " php-native"
-
-do_configure_append() {
-    find ${S} -type f | xargs sed -i 's:/usr/lib:${STAGING_LIBDIR}:'
-    find ${S} -type f | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:'
-}
diff --git a/packages/php/php_5.2.6.bb b/packages/php/php_5.2.6.bb
index 6281cfe04e..17073e1eaf 100644
--- a/packages/php/php_5.2.6.bb
+++ b/packages/php/php_5.2.6.bb
@@ -1,6 +1,8 @@
 require php.inc
 
-PR = "r1"
+DEPENDS = "zlib libxml2 virtual/libiconv php-native"
+
+PR = "r2"
 
 SRC_URI += "file://pear-makefile.patch;patch=1 "
 
@@ -10,56 +12,70 @@ export LIBS=" -lpthread "
 EXTRA_OECONF = "    --without-iconv \
  		    --enable-discard-path \
 		    --enable-sockets \
+                    --enable-pcntl \
     		    --enable-memory-limit \
     		    --enable-wddx \
                     --enable-embedded-mysqli \
                     --enable-magic-quotes \
-		    --with-zlib \
-                    --with-mysql="${STAGING_DIR_TARGET}${layout_exec_prefix}" \
-                    --with-mysqli="${STAGING_BINDIR_NATIVE}/mysql_config" \
-"
-
-EXTRA_OECONF += " --with-pear-php-cli=${STAGING_BINDIR} --with-libxml-dir=${STAGING_BINDIR_CROSS}"
+		    --with-zlib --with-zlib-dir = ${STAGING_LIBDIR}/.. \
+                    --with-libxml-dir = ${STAGING_BINDIR_CROSS} \
+#                   --with-mysql = "${STAGING_DIR_TARGET}${layout_exec_prefix}" \
+#                   --with-mysqli = "${STAGING_BINDIR_NATIVE}/mysql_config" \
+               "
 
 export LD_LIBRARY_PATH = "${STAGING_LIBDIR}"
-export PHP_NATIVE_DIR="${STAGING_BINDIR_NATIVE}"
-export PHP_PEAR_PHP_BIN="/usr/bin/php"
+export PHP_NATIVE_DIR = "${STAGING_BINDIR_NATIVE}"
+export PHP_PEAR_PHP_BIN = "${bindir}/php"
 
 do_configure_append() {
     find ${S} -type f | xargs sed -i 's:I/usr/include:I${STAGING_INCDIR}:g'
 }
 
+# fixme
+do_install_append() {
+    mv ${D}/${STAGING_DIR_NATIVE}/${sysconfdir} ${D}/${sysconfdir}
+    rm -rf ${D}/${STAGING_DIR_NATIVE}
+    rm -rf ${D}/.registry
+    rm -rf ${D}/.channels
+    rm -rf ${D}/.[a-z]*
+}
+
 PACKAGES = "${PN}-dbg \
             ${PN}-cli \
             ${PN}-pear \
             ${PN}-dev \
+            ${PN}-doc \
             ${PN} \
 "
 
 
-FILES_${PN}-dbg            =+"/usr/bin/.debug"
+FILES_${PN}-dbg            =+ "${bindir}/.debug"
+
+FILES_${PN}-doc            += "${libdir}/php/doc" 
+
+FILES_${PN}-cli            = "${bindir}/php"
 
-FILES_${PN}-cli            ="/usr/bin/php"
+FILES_${PN}-pear            = "${bindir}/pear* ${bindir}/pecl \
+                             ${libdir}/php/PEAR \
+                             ${libdir}/php/PEAR.php \
+                             ${libdir}/php/System.php ${libdir}php/peclcmd.php ${libdir}/php/pearcmd.php \
+                             ${libdir}/php/.channels  ${libdir}/php/.channels/.alias  \
+                             ${libdir}/php/.channels\__uri.reg \
+                             ${libdir}/php/.channels\pear.php.net.reg ${libdir}/php/.channels/pecl.php.net.reg \
+                             ${libdir}/php/.registry \
+                             ${libdir}/php/Archive/Tar.php \
+                             ${libdir}/php/Console/Getopt.php ${libdir}/php/OS/Guess.php \
+                             ${sysconfdir}/pear.conf"
 
-FILES_${PN}-pear            ="/usr/bin/pear* /usr/bin/pecl \
-                             /usr/lib/php/PEAR \
-                             /usr/lib/php/PEAR.php \
-                             /usr/lib/php/System.php /usr/lib/php/peclcmd.php /usr/lib/php/pearcmd.php \
-                             /usr/lib/php/.channels  /usr/lib/php/.channels/.alias  \
-                             /usr/lib/php/.channels\__uri.reg \
-                             /usr/lib/php/.channels\pear.php.net.reg /usr/lib/php/.channels/pecl.php.net.reg \
-                             /usr/lib/php/.registry \
-                             /usr/lib/php/Archive/Tar.php \
-                             /usr/lib/php/Console/Getopt.php /usr/lib/php/OS/Guess.php \
-                             /usr/lib/php/.depdb /usr/lib/php/.depdblock /usr/lib/php/.filemap \
-                             /usr/lib/php/.lock"
 
-FILES_${PN}-dev            ="/usr/include/php /usr/include/build \
-                            /usr/bin/phpize /usr/bin/php-config"
+FILES_${PN}-dev            = "${includedir}/php ${libdir}/build \
+                             ${bindir}/phpize ${bindir}/php-config \
+                             ${libdir}/php/.depdb ${libdir}/php/.depdblock ${libdir}/php/.filemap ${libdir}/php/.lock \
+                             ${libdir}/php/test "
 
-FILES_${PN}                 ="/usr/lib/php"
-FILES_${PN}                +="/usr/bin"
+FILES_${PN}                 = "${libdir}/php"
+FILES_${PN}                += "${bindir}"
 
-RDEPENDS_${PN}-pear         =${PN}
-RDEPENDS_${PN}-cli          =${PN}
-RDEPENDS_${PN}-dev          =${PN}
+RDEPENDS_${PN}-pear         = ${PN}
+RDEPENDS_${PN}-cli          = ${PN}
+RDEPENDS_${PN}-dev          = ${PN}