From a1cf1af23e1eef443904d31a4fd08c647f906688 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Thu, 15 Jan 2015 01:13:25 -0500 Subject: [PATCH] php: remove old versions. --- dev-lang/php/patches/php-5.3.1.patch | 27 ------ dev-lang/php/patches/php-5.3.5.patch | 103 ----------------------- dev-lang/php/patches/php-5.4.34.patchset | 35 -------- dev-lang/php/php-5.3.4.recipe | 25 ------ dev-lang/php/php-5.3.5.recipe | 57 ------------- dev-lang/php/php-5.4.34.recipe | 73 ---------------- 6 files changed, 320 deletions(-) delete mode 100644 dev-lang/php/patches/php-5.3.1.patch delete mode 100644 dev-lang/php/patches/php-5.3.5.patch delete mode 100644 dev-lang/php/patches/php-5.4.34.patchset delete mode 100644 dev-lang/php/php-5.3.4.recipe delete mode 100644 dev-lang/php/php-5.3.5.recipe delete mode 100644 dev-lang/php/php-5.4.34.recipe diff --git a/dev-lang/php/patches/php-5.3.1.patch b/dev-lang/php/patches/php-5.3.1.patch deleted file mode 100644 index e4f86559b..000000000 --- a/dev-lang/php/patches/php-5.3.1.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -urN php-5.3.1/configure.in php-5.3.1-haiku/configure.in ---- php-5.3.1/configure.in 2009-11-18 19:43:33.000000000 +0000 -+++ php-5.3.1-haiku/configure.in 2009-11-28 07:39:12.000000000 +0000 -@@ -392,6 +392,11 @@ - PHP_CHECK_FUNC(gethostbyaddr, nsl) - PHP_CHECK_FUNC(yp_get_default_domain, nsl) - -+PHP_CHECK_FUNC(socket, network) -+PHP_CHECK_FUNC(socketpair, network) -+PHP_CHECK_FUNC(gethostname, network) -+PHP_CHECK_FUNC(gethostbyaddr, network) -+ - PHP_CHECK_FUNC(dlopen, dl) - if test "$ac_cv_func_dlopen" = "yes"; then - AC_DEFINE(HAVE_LIBDL, 1, [ ]) -diff -urN php-5.3.1/ext/standard/microtime.c php-5.3.1-haiku/ext/standard/microtime.c ---- php-5.3.1/ext/standard/microtime.c 2009-05-21 14:21:40.000000000 +0000 -+++ php-5.3.1-haiku/ext/standard/microtime.c 2009-11-28 07:39:20.000000000 +0000 -@@ -131,7 +131,7 @@ - array_init(return_value); - #define PHP_RUSAGE_PARA(a) \ - add_assoc_long(return_value, #a, usg.a) --#if !defined( _OSD_POSIX) && !defined(__BEOS__) /* BS2000 has only a few fields in the rusage struct */ -+#if !defined( _OSD_POSIX) && !defined(__BEOS__) && !defined(__HAIKU__)/* BS2000 has only a few fields in the rusage struct */ - PHP_RUSAGE_PARA(ru_oublock); - PHP_RUSAGE_PARA(ru_inblock); - PHP_RUSAGE_PARA(ru_msgsnd); diff --git a/dev-lang/php/patches/php-5.3.5.patch b/dev-lang/php/patches/php-5.3.5.patch deleted file mode 100644 index c7c9ed758..000000000 --- a/dev-lang/php/patches/php-5.3.5.patch +++ /dev/null @@ -1,103 +0,0 @@ -diff -urN php-5.3.5/configure.in php-5.3.5-haiku/configure.in ---- php-5.3.5/configure.in 2011-01-05 16:35:33.016515072 +0000 -+++ php-5.3.5-haiku/configure.in 2011-02-04 13:58:33.000000000 +0000 -@@ -1,7 +1,7 @@ - ## $Id: configure.in 307133 2011-01-05 16:35:33Z johannes $ -*- autoconf -*- - dnl ## Process this file with autoconf to produce a configure script. - --divert(1) -+divert(1001) - - dnl ## Diversion 1 is the autoconf + automake setup phase. We also - dnl ## set the PHP version, deal with platform-specific compile -@@ -290,7 +290,7 @@ - sinclude(TSRM/tsrm.m4) - - --divert(2) -+divert(1002) - - dnl ## Diversion 2 is where we set PHP-specific options and come up - dnl ## with reasonable default values for them. We check for pthreads here -@@ -329,7 +329,7 @@ - PTHREADS_FLAGS - fi - --divert(3) -+divert(1003) - - dnl ## In diversion 3 we check for compile-time options to the PHP - dnl ## core and how to deal with different system dependencies. -@@ -675,7 +675,7 @@ - PHP_CRYPT_R_STYLE - fi - --divert(4) -+divert(1004) - - dnl ## In diversion 4 we check user-configurable general settings. - -@@ -916,7 +916,7 @@ - AC_MSG_RESULT([using system default]) - fi - --divert(5) -+divert(1005) - - dnl ## In diversion 5 we check which extensions should be compiled. - dnl ## All of these are normally in the extension directories. -diff -urN php-5.3.5/ext/date/php_date.c php-5.3.5-haiku/ext/date/php_date.c ---- php-5.3.5/ext/date/php_date.c 2010-11-18 11:33:42.044302336 +0000 -+++ php-5.3.5-haiku/ext/date/php_date.c 2011-02-04 14:09:21.000000000 +0000 -@@ -33,7 +33,7 @@ - - #ifdef PHP_WIN32 - static __inline __int64 php_date_llabs( __int64 i ) { return i >= 0? i: -i; } --#elif defined(__GNUC__) && __GNUC__ < 3 -+#elif (defined(__GNUC__) && __GNUC__ < 3) && (!defined __HAIKU__) - static __inline __int64_t php_date_llabs( __int64_t i ) { return i >= 0 ? i : -i; } - #else - static inline long long php_date_llabs( long long i ) { return i >= 0 ? i : -i; } -diff -urN php-5.3.5/ext/standard/config.m4 php-5.3.5-haiku/ext/standard/config.m4 ---- php-5.3.5/ext/standard/config.m4 2010-06-17 10:22:03.023592960 +0000 -+++ php-5.3.5-haiku/ext/standard/config.m4 2011-02-04 13:58:33.000000000 +0000 -@@ -1,6 +1,6 @@ - dnl $Id: config.m4 300511 2010-06-17 10:22:03Z pajoye $ -*- autoconf -*- - --divert(3)dnl -+divert(1003)dnl - - dnl - dnl Check if flush should be called explicitly after buffered io -@@ -342,7 +342,7 @@ - AC_CHECK_FUNCS(getcwd getwd asinh acosh atanh log1p hypot glob strfmon nice fpclass isinf isnan mempcpy strpncpy) - AC_FUNC_FNMATCH - --divert(5)dnl -+divert(1005)dnl - - dnl - dnl Check if there is a support means of creating a new process -diff -urN php-5.3.5/ext/standard/microtime.c php-5.3.5-haiku/ext/standard/microtime.c ---- php-5.3.5/ext/standard/microtime.c 2010-01-03 09:23:27.029097984 +0000 -+++ php-5.3.5-haiku/ext/standard/microtime.c 2011-02-04 14:18:46.000000000 +0000 -@@ -131,7 +131,7 @@ - array_init(return_value); - #define PHP_RUSAGE_PARA(a) \ - add_assoc_long(return_value, #a, usg.a) --#if !defined( _OSD_POSIX) && !defined(__BEOS__) /* BS2000 has only a few fields in the rusage struct */ -+#if !defined( _OSD_POSIX) && !defined(__BEOS__) & !defined(__HAIKU__)/* BS2000 has only a few fields in the rusage struct */ - PHP_RUSAGE_PARA(ru_oublock); - PHP_RUSAGE_PARA(ru_inblock); - PHP_RUSAGE_PARA(ru_msgsnd); -diff -urN php-5.3.5/scripts/phpize.m4 php-5.3.5-haiku/scripts/phpize.m4 ---- php-5.3.5/scripts/phpize.m4 2010-11-02 09:58:08.015204352 +0000 -+++ php-5.3.5-haiku/scripts/phpize.m4 2011-02-04 13:58:33.000000000 +0000 -@@ -1,6 +1,6 @@ - dnl This file becomes configure.in for self-contained extensions. - --divert(1) -+divert(1001) - - AC_PREREQ(2.13) - AC_INIT(config.m4) diff --git a/dev-lang/php/patches/php-5.4.34.patchset b/dev-lang/php/patches/php-5.4.34.patchset deleted file mode 100644 index 6fa8283bb..000000000 --- a/dev-lang/php/patches/php-5.4.34.patchset +++ /dev/null @@ -1,35 +0,0 @@ -From 252717d13be2d08cfc4546b0135b01e35f4e8082 Mon Sep 17 00:00:00 2001 -From: Adrien Destugues -Date: Mon, 20 Oct 2014 11:29:08 +0200 -Subject: Fix build on Haiku. - - -diff --git a/ext/date/php_date.c b/ext/date/php_date.c -index 92e9480..0172809 100644 ---- a/ext/date/php_date.c -+++ b/ext/date/php_date.c -@@ -33,8 +33,6 @@ - - #ifdef PHP_WIN32 - static __inline __int64 php_date_llabs( __int64 i ) { return i >= 0? i: -i; } --#elif defined(__GNUC__) && __GNUC__ < 3 --static __inline __int64_t php_date_llabs( __int64_t i ) { return i >= 0 ? i : -i; } - #else - static inline long long php_date_llabs( long long i ) { return i >= 0 ? i : -i; } - #endif -diff --git a/ext/standard/microtime.c b/ext/standard/microtime.c -index fe22366..14298fb 100644 ---- a/ext/standard/microtime.c -+++ b/ext/standard/microtime.c -@@ -131,7 +131,7 @@ PHP_FUNCTION(getrusage) - array_init(return_value); - #define PHP_RUSAGE_PARA(a) \ - add_assoc_long(return_value, #a, usg.a) --#if !defined( _OSD_POSIX) && !defined(__BEOS__) /* BS2000 has only a few fields in the rusage struct */ -+#if !defined( _OSD_POSIX) && !defined(__BEOS__) && !defined(__HAIKU__) /* BS2000 has only a few fields in the rusage struct */ - PHP_RUSAGE_PARA(ru_oublock); - PHP_RUSAGE_PARA(ru_inblock); - PHP_RUSAGE_PARA(ru_msgsnd); --- -1.8.3.4 - diff --git a/dev-lang/php/php-5.3.4.recipe b/dev-lang/php/php-5.3.4.recipe deleted file mode 100644 index 794224740..000000000 --- a/dev-lang/php/php-5.3.4.recipe +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION="php - hypertext preprocessor" -HOMEPAGE="http://www.php.net" -SRC_URI="http://php.net/distributions/php-5.3.4.tar.bz2" -CHECKSUM_MD5="2c069d8f690933e3bf6a8741ed818150" -REVISION="1" -STATUS_HAIKU="broken" -DEPEND="dev-libs/libpcre >= 8.00" -BUILD() -{ - cd php-5.3.4 - cat $(aclocal --print-ac-dir)/libtool.m4 > build/libtool.m4 - autoreconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` --enable-shared --enable-static - make -} - -INSTALL() -{ - cd php-5.3.4 - make install -} - -COPYRIGHT="2001-2010 PHP Group" -LICENSE="PHP License v3.01" - diff --git a/dev-lang/php/php-5.3.5.recipe b/dev-lang/php/php-5.3.5.recipe deleted file mode 100644 index 03db2e432..000000000 --- a/dev-lang/php/php-5.3.5.recipe +++ /dev/null @@ -1,57 +0,0 @@ -DESCRIPTION="php - hypertext preprocessor" -HOMEPAGE="http://www.php.net" -SRC_URI="http://php.net/distributions/php-5.3.5.tar.bz2" -CHECKSUM_MD5="8aaf20c95e91f25c5b6a591e5d6d61b9" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-libs/libpcre >= 8.00 - " -BUILD() -{ - cd php-5.3.5 - libtoolize --force --copy --install - aclocal - autoconf - export LIBS="-lnetwork" - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --includedir=`finddir B_COMMON_DIRECTORY`/include \ - --libdir=`finddir B_COMMON_LIB_DIRECTORY` \ - --enable-shared \ - --enable-static \ - --enable-dom \ - --enable-sqlite-utf8 \ - --enable-xml=shared \ - --enable-dba=shared \ - --enable-ftp \ - --enable-sqlite-utf8 \ -# --enable-sockets \ - --with-bz2=`finddir B_COMMON_DIRECTORY` \ - --with-zlib-dir=`finddir B_COMMON_DIRECTORY` \ - --with-icu-dir=/boot/system/lib \ - --with-libxml-dir=`finddir B_COMMON_DIRECTORY` \ - --with-gd-dir=`finddir B_COMMON_DIRECTORY` \ - --with-png-dir=`finddir B_COMMON_DIRECTORY` \ - --with-jpeg-dir=`finddir B_COMMON_LIB_DIRECTORY` \ - --with-readline=`finddir B_COMMON_DIRECTORY` \ - --with-freetype-dir=/boot/develop/headers/3rdparty/freetype \ - --with-openssl-dir=`finddir B_COMMON_DIRECTORY` \ - --with-openssl=`finddir B_COMMON_DIRECTORY` \ - --without-iconv - - make -} - -INSTALL() -{ - cd php-5.3.5 - make install INSTALL_ROOT=${DESTDIR} -} - -TEST() -{ - cd php-5.3.5 - make test -} - -COPYRIGHT="2001-2011 PHP Group" -LICENSE="PHP License v3.01" diff --git a/dev-lang/php/php-5.4.34.recipe b/dev-lang/php/php-5.4.34.recipe deleted file mode 100644 index 8cfc6940f..000000000 --- a/dev-lang/php/php-5.4.34.recipe +++ /dev/null @@ -1,73 +0,0 @@ -SUMMARY="A popular general-purpose scripting language" -DESCRIPTION="PHP is a popular general-purpose scripting language that is \ -especially suited to web development. - -Fast, flexible and pragmatic, PHP powers everything from your blog to the most \ -popular websites in the world. -" -HOMEPAGE="http://www.php.net" -REVISION="1" -COPYRIGHT="2001-2014 PHP Group" -LICENSE="PHP License v3.01" -ARCHITECTURES="x86_gcc2" - -SRC_URI="http://php.net/get/php-$portVersion.tar.bz2/from/this/mirror" -SRC_FILENAME="php-$portVersion.tar.bz2" -CHECKSUM_SHA256="57d4ea10f0c18b096a7c8fd0a98dcbe40c8f4dc94453fd3ca0a10e35fb2f8234" -PATCHES="php-$portVersion.patchset" - -PROVIDES=" - php = $portVersion - cmd:pear - cmd:peardev - cmd:pecl - cmd:phar - cmd:phar.phar - cmd:php - cmd:php_cgi - cmd:php_config - cmd:phpize -" - -GLOBAL_WRITABLE_FILES=" - settings/pear.conf keep-old -" - -REQUIRES=" - haiku - lib:libxml2 - lib:libz -" - -BUILD_REQUIRES=" - devel:libxml2 - devel:libz -" - -BUILD_PREREQUIRES=" - haiku_devel - cmd:awk - cmd:bison - cmd:dos2unix - cmd:gcc - cmd:make -" - -BUILD() -{ - runConfigure ./configure --with-libxml-dir=/system --without-iconv - dos2unix Zend/zend_language_scanner.l - dos2unix Zend/zend_language_scanner.c - make $jobArgs -} - -INSTALL() -{ - make install -} - -TEST() -{ - make test -} -