From ef50dbb213487797f1a2d9f4d0d5636f98bb3894 Mon Sep 17 00:00:00 2001 From: Rene Ladan Date: Sat, 1 Mar 2014 00:06:29 +0000 Subject: [PATCH] PHP 5.2 has reached it end-of-life in the FreeBSD Ports Tree, time to say goodbye. Upstream unsupported it since 2011-01-06 (see http://php.net/eol.php ) Strip PHP 5.2 out of Mk/bsd.php.mk --- MOVED | 72 ++ Mk/bsd.php.mk | 9 +- archivers/Makefile | 3 - archivers/php52-bz2/Makefile | 11 - archivers/php52-zip/Makefile | 11 - archivers/php52-zlib/Makefile | 11 - converters/Makefile | 3 - converters/php52-iconv/Makefile | 11 - converters/php52-mbstring/Makefile | 11 - .../php52-mbstring/files/patch-config.m4 | 10 - .../files/patch-oniguruma_regerror.c | 10 - converters/php52-recode/Makefile | 11 - databases/Makefile | 19 - databases/php52-dba/Makefile | 11 - databases/php52-dba/files/patch-config.m4 | 41 -- databases/php52-dbase/Makefile | 11 - databases/php52-interbase/Makefile | 12 - databases/php52-mssql/Makefile | 11 - databases/php52-mysql/Makefile | 11 - databases/php52-mysqli/Makefile | 11 - databases/php52-oci8/Makefile | 11 - databases/php52-oci8/files/patch-config.m4 | 12 - databases/php52-odbc/Makefile | 11 - databases/php52-odbc/files/patch-config.m4 | 119 ---- databases/php52-pdo/Makefile | 11 - databases/php52-pdo_dblib/Makefile | 11 - databases/php52-pdo_firebird/Makefile | 12 - databases/php52-pdo_mysql/Makefile | 11 - databases/php52-pdo_oci/Makefile | 11 - databases/php52-pdo_oci/files/patch-config.m4 | 19 - databases/php52-pdo_odbc/Makefile | 11 - databases/php52-pdo_pgsql/Makefile | 11 - databases/php52-pdo_sqlite/Makefile | 11 - .../files/patch-sqlite_statement.c | 50 -- databases/php52-pgsql/Makefile | 11 - databases/php52-pgsql/files/patch-pgsql.c | 30 - databases/php52-sqlite/Makefile | 11 - databases/php52-sqlite/files/patch-config.m4 | 44 -- databases/php52-sybase_ct/Makefile | 11 - devel/Makefile | 12 - devel/php52-gettext/Makefile | 11 - devel/php52-gettext/files/patch-config.m4 | 17 - devel/php52-json/Makefile | 11 - devel/php52-ncurses/Makefile | 11 - devel/php52-pcntl/Makefile | 11 - devel/php52-pcre/Makefile | 11 - devel/php52-pcre/files/patch-php_pcre.c | 34 - devel/php52-readline/Makefile | 11 - devel/php52-readline/files/patch-config.m4 | 38 -- devel/php52-shmop/Makefile | 11 - devel/php52-spl/Makefile | 11 - devel/php52-spl/files/patch-config.m4 | 28 - devel/php52-sysvmsg/Makefile | 11 - devel/php52-sysvsem/Makefile | 11 - devel/php52-sysvshm/Makefile | 11 - devel/php52-tokenizer/Makefile | 11 - ftp/Makefile | 2 - ftp/php52-curl/Makefile | 12 - ftp/php52-ftp/Makefile | 11 - graphics/Makefile | 3 - graphics/php52-exif/Makefile | 11 - graphics/php52-gd/Makefile | 11 - graphics/php52-gd/files/patch-config.m4 | 20 - graphics/php52-gd/files/patch-libgd_gd_png.c | 14 - graphics/php52-ming/Makefile | 11 - lang/Makefile | 2 - lang/php52-extensions/Makefile | 97 --- lang/php52-extensions/pkg-descr | 6 - lang/php52/Makefile | 234 ------- lang/php52/Makefile.ext | 635 ------------------ lang/php52/distinfo | 10 - lang/php52/files/patch-TSRM_threads.m4 | 11 - lang/php52/files/patch-Zend::zend.h | 11 - lang/php52/files/patch-Zend_zend_list.c | 38 -- lang/php52/files/patch-Zend_zend_list.h | 24 - lang/php52/files/patch-acinclude.m4 | 53 -- lang/php52/files/patch-configure.in | 55 -- lang/php52/files/patch-ext_standard_array.c | 33 - .../patch-ext_standard_basic_functions.c | 28 - lang/php52/files/patch-ext_standard_image.c | 50 -- lang/php52/files/patch-ext_standard_php_dns.h | 13 - lang/php52/files/patch-main::php_config.h.in | 12 - lang/php52/files/patch-php.ini-dist | 18 - lang/php52/files/patch-php.ini-recommended | 18 - .../files/patch-sapi-apache2handler_config.m4 | 15 - lang/php52/files/patch-sapi_cgi_Makefile.frag | 9 - lang/php52/files/patch-sapi_cgi_config9.m4 | 55 -- lang/php52/files/patch-scripts::phpize.in | 13 - lang/php52/files/php-fpm.conf.sample.in | 157 ----- lang/php52/files/php-fpm.in | 55 -- lang/php52/pkg-descr | 8 - lang/php52/pkg-message.mod | 10 - lang/php52/pkg-plist | 216 ------ mail/Makefile | 1 - mail/php52-imap/Makefile | 11 - math/Makefile | 2 - math/php52-bcmath/Makefile | 11 - math/php52-gmp/Makefile | 11 - math/php52-gmp/files/patch-gmp.c | 11 - misc/Makefile | 1 - misc/php52-calendar/Makefile | 11 - net-mgmt/Makefile | 1 - net-mgmt/php52-snmp/Makefile | 11 - net/Makefile | 4 - net/php52-ldap/Makefile | 11 - net/php52-soap/Makefile | 11 - net/php52-soap/files/patch-soap.c | 56 -- net/php52-sockets/Makefile | 11 - net/php52-xmlrpc/Makefile | 11 - security/Makefile | 5 - security/php52-filter/Makefile | 11 - security/php52-filter/files/patch-config.m4 | 25 - security/php52-hash/Makefile | 11 - security/php52-mcrypt/Makefile | 11 - security/php52-mhash/Makefile | 11 - security/php52-openssl/Makefile | 11 - sysutils/Makefile | 2 - sysutils/pecl-fileinfo/Makefile | 23 - sysutils/pecl-fileinfo/distinfo | 2 - sysutils/pecl-fileinfo/pkg-descr | 8 - sysutils/php52-posix/Makefile | 11 - sysutils/php52-posix/files/patch-posix.c | 38 -- textproc/Makefile | 9 - textproc/php52-ctype/Makefile | 11 - textproc/php52-dom/Makefile | 11 - textproc/php52-pspell/Makefile | 11 - textproc/php52-simplexml/Makefile | 11 - textproc/php52-wddx/Makefile | 11 - textproc/php52-wddx/files/patch-config.m4 | 22 - textproc/php52-wddx/files/patch-wddx.c | 40 -- textproc/php52-xml/Makefile | 11 - textproc/php52-xml/files/patch-compat.c | 13 - textproc/php52-xmlreader/Makefile | 11 - textproc/php52-xmlwriter/Makefile | 11 - textproc/php52-xsl/Makefile | 11 - textproc/php52-xsl/files/patch-php_xsl.h | 11 - www/Makefile | 2 - www/php52-session/Makefile | 11 - www/php52-tidy/Makefile | 11 - 139 files changed, 73 insertions(+), 3449 deletions(-) delete mode 100644 archivers/php52-bz2/Makefile delete mode 100644 archivers/php52-zip/Makefile delete mode 100644 archivers/php52-zlib/Makefile delete mode 100644 converters/php52-iconv/Makefile delete mode 100644 converters/php52-mbstring/Makefile delete mode 100644 converters/php52-mbstring/files/patch-config.m4 delete mode 100644 converters/php52-mbstring/files/patch-oniguruma_regerror.c delete mode 100644 converters/php52-recode/Makefile delete mode 100644 databases/php52-dba/Makefile delete mode 100644 databases/php52-dba/files/patch-config.m4 delete mode 100644 databases/php52-dbase/Makefile delete mode 100644 databases/php52-interbase/Makefile delete mode 100644 databases/php52-mssql/Makefile delete mode 100644 databases/php52-mysql/Makefile delete mode 100644 databases/php52-mysqli/Makefile delete mode 100644 databases/php52-oci8/Makefile delete mode 100644 databases/php52-oci8/files/patch-config.m4 delete mode 100644 databases/php52-odbc/Makefile delete mode 100644 databases/php52-odbc/files/patch-config.m4 delete mode 100644 databases/php52-pdo/Makefile delete mode 100644 databases/php52-pdo_dblib/Makefile delete mode 100644 databases/php52-pdo_firebird/Makefile delete mode 100644 databases/php52-pdo_mysql/Makefile delete mode 100644 databases/php52-pdo_oci/Makefile delete mode 100644 databases/php52-pdo_oci/files/patch-config.m4 delete mode 100644 databases/php52-pdo_odbc/Makefile delete mode 100644 databases/php52-pdo_pgsql/Makefile delete mode 100644 databases/php52-pdo_sqlite/Makefile delete mode 100644 databases/php52-pdo_sqlite/files/patch-sqlite_statement.c delete mode 100644 databases/php52-pgsql/Makefile delete mode 100644 databases/php52-pgsql/files/patch-pgsql.c delete mode 100644 databases/php52-sqlite/Makefile delete mode 100644 databases/php52-sqlite/files/patch-config.m4 delete mode 100644 databases/php52-sybase_ct/Makefile delete mode 100644 devel/php52-gettext/Makefile delete mode 100644 devel/php52-gettext/files/patch-config.m4 delete mode 100644 devel/php52-json/Makefile delete mode 100644 devel/php52-ncurses/Makefile delete mode 100644 devel/php52-pcntl/Makefile delete mode 100644 devel/php52-pcre/Makefile delete mode 100644 devel/php52-pcre/files/patch-php_pcre.c delete mode 100644 devel/php52-readline/Makefile delete mode 100644 devel/php52-readline/files/patch-config.m4 delete mode 100644 devel/php52-shmop/Makefile delete mode 100644 devel/php52-spl/Makefile delete mode 100644 devel/php52-spl/files/patch-config.m4 delete mode 100644 devel/php52-sysvmsg/Makefile delete mode 100644 devel/php52-sysvsem/Makefile delete mode 100644 devel/php52-sysvshm/Makefile delete mode 100644 devel/php52-tokenizer/Makefile delete mode 100644 ftp/php52-curl/Makefile delete mode 100644 ftp/php52-ftp/Makefile delete mode 100644 graphics/php52-exif/Makefile delete mode 100644 graphics/php52-gd/Makefile delete mode 100644 graphics/php52-gd/files/patch-config.m4 delete mode 100644 graphics/php52-gd/files/patch-libgd_gd_png.c delete mode 100644 graphics/php52-ming/Makefile delete mode 100644 lang/php52-extensions/Makefile delete mode 100644 lang/php52-extensions/pkg-descr delete mode 100644 lang/php52/Makefile delete mode 100644 lang/php52/Makefile.ext delete mode 100644 lang/php52/distinfo delete mode 100644 lang/php52/files/patch-TSRM_threads.m4 delete mode 100644 lang/php52/files/patch-Zend::zend.h delete mode 100644 lang/php52/files/patch-Zend_zend_list.c delete mode 100644 lang/php52/files/patch-Zend_zend_list.h delete mode 100644 lang/php52/files/patch-acinclude.m4 delete mode 100644 lang/php52/files/patch-configure.in delete mode 100644 lang/php52/files/patch-ext_standard_array.c delete mode 100644 lang/php52/files/patch-ext_standard_basic_functions.c delete mode 100644 lang/php52/files/patch-ext_standard_image.c delete mode 100644 lang/php52/files/patch-ext_standard_php_dns.h delete mode 100644 lang/php52/files/patch-main::php_config.h.in delete mode 100644 lang/php52/files/patch-php.ini-dist delete mode 100644 lang/php52/files/patch-php.ini-recommended delete mode 100644 lang/php52/files/patch-sapi-apache2handler_config.m4 delete mode 100644 lang/php52/files/patch-sapi_cgi_Makefile.frag delete mode 100644 lang/php52/files/patch-sapi_cgi_config9.m4 delete mode 100644 lang/php52/files/patch-scripts::phpize.in delete mode 100644 lang/php52/files/php-fpm.conf.sample.in delete mode 100644 lang/php52/files/php-fpm.in delete mode 100644 lang/php52/pkg-descr delete mode 100644 lang/php52/pkg-message.mod delete mode 100644 lang/php52/pkg-plist delete mode 100644 mail/php52-imap/Makefile delete mode 100644 math/php52-bcmath/Makefile delete mode 100644 math/php52-gmp/Makefile delete mode 100644 math/php52-gmp/files/patch-gmp.c delete mode 100644 misc/php52-calendar/Makefile delete mode 100644 net-mgmt/php52-snmp/Makefile delete mode 100644 net/php52-ldap/Makefile delete mode 100644 net/php52-soap/Makefile delete mode 100644 net/php52-soap/files/patch-soap.c delete mode 100644 net/php52-sockets/Makefile delete mode 100644 net/php52-xmlrpc/Makefile delete mode 100644 security/php52-filter/Makefile delete mode 100644 security/php52-filter/files/patch-config.m4 delete mode 100644 security/php52-hash/Makefile delete mode 100644 security/php52-mcrypt/Makefile delete mode 100644 security/php52-mhash/Makefile delete mode 100644 security/php52-openssl/Makefile delete mode 100644 sysutils/pecl-fileinfo/Makefile delete mode 100644 sysutils/pecl-fileinfo/distinfo delete mode 100644 sysutils/pecl-fileinfo/pkg-descr delete mode 100644 sysutils/php52-posix/Makefile delete mode 100644 sysutils/php52-posix/files/patch-posix.c delete mode 100644 textproc/php52-ctype/Makefile delete mode 100644 textproc/php52-dom/Makefile delete mode 100644 textproc/php52-pspell/Makefile delete mode 100644 textproc/php52-simplexml/Makefile delete mode 100644 textproc/php52-wddx/Makefile delete mode 100644 textproc/php52-wddx/files/patch-config.m4 delete mode 100644 textproc/php52-wddx/files/patch-wddx.c delete mode 100644 textproc/php52-xml/Makefile delete mode 100644 textproc/php52-xml/files/patch-compat.c delete mode 100644 textproc/php52-xmlreader/Makefile delete mode 100644 textproc/php52-xmlwriter/Makefile delete mode 100644 textproc/php52-xsl/Makefile delete mode 100644 textproc/php52-xsl/files/patch-php_xsl.h delete mode 100644 www/php52-session/Makefile delete mode 100644 www/php52-tidy/Makefile diff --git a/MOVED b/MOVED index 12f32e219e96..30ec990fb099 100644 --- a/MOVED +++ b/MOVED @@ -5505,3 +5505,75 @@ x11-drivers/xf86-video-radeonhd|x11-drivers/xf86-video-ati|2014-02-28|Has expire net/asterisk10||2014-02-28|Has expired: asterisk 10 reached EOL on 2013-12-15 textproc/py-lucene||2014-02-28|Has expired: Broken for more than 6 month lang/gcc44|lang/gcc|2014-02-28|Superseded by GCC 4.6 or later +archivers/php52-bz2||2014-03-01|PHP 5.2 is end-of-life +archivers/php52-zip||2014-03-01|PHP 5.2 is end-of-life +archivers/php52-zlib||2014-03-01|PHP 5.2 is end-of-life +converters/php52-iconv||2014-03-01|PHP 5.2 is end-of-life +converters/php52-mbstring||2014-03-01|PHP 5.2 is end-of-life +converters/php52-recode||2014-03-01|PHP 5.2 is end-of-life +databases/php52-dba||2014-03-01|PHP 5.2 is end-of-life +databases/php52-dbase||2014-03-01|PHP 5.2 is end-of-life +databases/php52-interbase||2014-03-01|PHP 5.2 is end-of-life +databases/php52-mssql||2014-03-01|PHP 5.2 is end-of-life +databases/php52-mysql||2014-03-01|PHP 5.2 is end-of-life +databases/php52-mysqli||2014-03-01|PHP 5.2 is end-of-life +databases/php52-oci8||2014-03-01|PHP 5.2 is end-of-life +databases/php52-odbc||2014-03-01|PHP 5.2 is end-of-life +databases/php52-pdo||2014-03-01|PHP 5.2 is end-of-life +databases/php52-pdo_dblib||2014-03-01|PHP 5.2 is end-of-life +databases/php52-pdo_firebird||2014-03-01|PHP 5.2 is end-of-life +databases/php52-pdo_mysql||2014-03-01|PHP 5.2 is end-of-life +databases/php52-pdo_oci||2014-03-01|PHP 5.2 is end-of-life +databases/php52-pdo_odbc||2014-03-01|PHP 5.2 is end-of-life +databases/php52-pdo_pgsql||2014-03-01|PHP 5.2 is end-of-life +databases/php52-pdo_sqlite||2014-03-01|PHP 5.2 is end-of-life +databases/php52-pgsql||2014-03-01|PHP 5.2 is end-of-life +databases/php52-sqlite||2014-03-01|PHP 5.2 is end-of-life +databases/php52-sybase_ct||2014-03-01|PHP 5.2 is end-of-life +devel/php52-gettext||2014-03-01|PHP 5.2 is end-of-life +devel/php52-json||2014-03-01|PHP 5.2 is end-of-life +devel/php52-ncurses||2014-03-01|PHP 5.2 is end-of-life +devel/php52-pcntl||2014-03-01|PHP 5.2 is end-of-life +devel/php52-pcre||2014-03-01|PHP 5.2 is end-of-life +devel/php52-readline||2014-03-01|PHP 5.2 is end-of-life +devel/php52-shmop||2014-03-01|PHP 5.2 is end-of-life +devel/php52-spl||2014-03-01|PHP 5.2 is end-of-life +devel/php52-sysvmsg||2014-03-01|PHP 5.2 is end-of-life +devel/php52-sysvsem||2014-03-01|PHP 5.2 is end-of-life +devel/php52-sysvshm||2014-03-01|PHP 5.2 is end-of-life +devel/php52-tokenizer||2014-03-01|PHP 5.2 is end-of-life +ftp/php52-curl||2014-03-01|PHP 5.2 is end-of-life +ftp/php52-ftp||2014-03-01|PHP 5.2 is end-of-life +graphics/php52-exif||2014-03-01|PHP 5.2 is end-of-life +graphics/php52-gd||2014-03-01|PHP 5.2 is end-of-life +graphics/php52-ming||2014-03-01|PHP 5.2 is end-of-life +lang/php52||2014-03-01|PHP 5.2 is end-of-life +lang/php52||2014-03-01|PHP 5.2 is end-of-life.ext +lang/php52-extensions||2014-03-01|PHP 5.2 is end-of-life +mail/php52-imap||2014-03-01|PHP 5.2 is end-of-life +math/php52-bcmath||2014-03-01|PHP 5.2 is end-of-life +math/php52-gmp||2014-03-01|PHP 5.2 is end-of-life +misc/php52-calendar||2014-03-01|PHP 5.2 is end-of-life +net/php52-ldap||2014-03-01|PHP 5.2 is end-of-life +net/php52-soap||2014-03-01|PHP 5.2 is end-of-life +net/php52-sockets||2014-03-01|PHP 5.2 is end-of-life +net/php52-xmlrpc||2014-03-01|PHP 5.2 is end-of-life +net-mgmt/php52-snmp||2014-03-01|PHP 5.2 is end-of-life +security/php52-filter||2014-03-01|PHP 5.2 is end-of-life +security/php52-hash||2014-03-01|PHP 5.2 is end-of-life +security/php52-mcrypt||2014-03-01|PHP 5.2 is end-of-life +security/php52-mhash||2014-03-01|PHP 5.2 is end-of-life +security/php52-openssl||2014-03-01|PHP 5.2 is end-of-life +sysutils/pecl-fileinfo||2014-03-01|PHP 5.2 is end-of-life +sysutils/php52-posix||2014-03-01|PHP 5.2 is end-of-life +textproc/php52-ctype||2014-03-01|PHP 5.2 is end-of-life +textproc/php52-dom||2014-03-01|PHP 5.2 is end-of-life +textproc/php52-pspell||2014-03-01|PHP 5.2 is end-of-life +textproc/php52-simplexml||2014-03-01|PHP 5.2 is end-of-life +textproc/php52-wddx||2014-03-01|PHP 5.2 is end-of-life +textproc/php52-xml||2014-03-01|PHP 5.2 is end-of-life +textproc/php52-xmlreader||2014-03-01|PHP 5.2 is end-of-life +textproc/php52-xmlwriter||2014-03-01|PHP 5.2 is end-of-life +textproc/php52-xsl||2014-03-01|PHP 5.2 is end-of-life +www/php52-session||2014-03-01|PHP 5.2 is end-of-life +www/php52-tidy||2014-03-01|PHP 5.2 is end-of-life diff --git a/Mk/bsd.php.mk b/Mk/bsd.php.mk index 1e5bd2d41933..bf3e60e13cc4 100644 --- a/Mk/bsd.php.mk +++ b/Mk/bsd.php.mk @@ -54,9 +54,7 @@ PHP_EXT_DIR!= ${PHPBASE}/bin/php-config --extension-dir | ${SED} -ne 's,^${PHPBA DEFAULT_PHP_VER?= ${PHP_DEFAULT:S/.//} PHP_VER?= ${DEFAULT_PHP_VER} -.if ${PHP_VER} == 52 -PHP_EXT_DIR= 20060613 -.elif ${PHP_VER} == 53 +.if ${PHP_VER} == 53 PHP_EXT_DIR= 20090626 PHP_EXT_INC= pcre spl .elif ${PHP_VER} == 55 @@ -281,7 +279,6 @@ _USE_PHP_ALL= apc bcmath bitset bz2 calendar ctype curl dba dom \ tidy tokenizer wddx xml xmlreader xmlrpc xmlwriter xsl zip zlib # version specific components _USE_PHP_VER5= ${_USE_PHP_ALL} phar sqlite3 -_USE_PHP_VER52= ${_USE_PHP_ALL} dbase mhash ming ncurses oci8 sqlite _USE_PHP_VER53= ${_USE_PHP_ALL} phar sqlite sqlite3 _USE_PHP_VER55= ${_USE_PHP_ALL} phar sqlite3 @@ -296,11 +293,7 @@ dba_DEPENDS= databases/php${PHP_VER}-dba dbase_DEPENDS= databases/php${PHP_VER}-dbase dom_DEPENDS= textproc/php${PHP_VER}-dom exif_DEPENDS= graphics/php${PHP_VER}-exif -.if ${PHP_VER} == 52 -fileinfo_DEPENDS= sysutils/pecl-fileinfo -.else fileinfo_DEPENDS= sysutils/php${PHP_VER}-fileinfo -.endif filter_DEPENDS= security/php${PHP_VER}-filter ftp_DEPENDS= ftp/php${PHP_VER}-ftp gd_DEPENDS= graphics/php${PHP_VER}-gd diff --git a/archivers/Makefile b/archivers/Makefile index eb9b9dbe377e..5c0551eff5f3 100644 --- a/archivers/Makefile +++ b/archivers/Makefile @@ -141,9 +141,6 @@ SUBDIR += php5-phar SUBDIR += php5-zip SUBDIR += php5-zlib - SUBDIR += php52-bz2 - SUBDIR += php52-zip - SUBDIR += php52-zlib SUBDIR += php53-bz2 SUBDIR += php53-phar SUBDIR += php53-zip diff --git a/archivers/php52-bz2/Makefile b/archivers/php52-bz2/Makefile deleted file mode 100644 index c50c9a2e59df..000000000000 --- a/archivers/php52-bz2/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Alex Keda -# $FreeBSD$ - -CATEGORIES= archivers - -NO_STAGE= yes -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -bz2 - -.include "${MASTERDIR}/Makefile" diff --git a/archivers/php52-zip/Makefile b/archivers/php52-zip/Makefile deleted file mode 100644 index 8e07d49e4622..000000000000 --- a/archivers/php52-zip/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Alex Keda -# $FreeBSD$ - -CATEGORIES= archivers - -NO_STAGE= yes -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -zip - -.include "${MASTERDIR}/Makefile" diff --git a/archivers/php52-zlib/Makefile b/archivers/php52-zlib/Makefile deleted file mode 100644 index 556a3aba3be2..000000000000 --- a/archivers/php52-zlib/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Alex Keda -# $FreeBSD$ - -CATEGORIES= archivers - -NO_STAGE= yes -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -zlib - -.include "${MASTERDIR}/Makefile" diff --git a/converters/Makefile b/converters/Makefile index 059d051c0f39..efa876cca95b 100644 --- a/converters/Makefile +++ b/converters/Makefile @@ -130,9 +130,6 @@ SUBDIR += php5-iconv SUBDIR += php5-mbstring SUBDIR += php5-recode - SUBDIR += php52-iconv - SUBDIR += php52-mbstring - SUBDIR += php52-recode SUBDIR += php53-iconv SUBDIR += php53-mbstring SUBDIR += php53-recode diff --git a/converters/php52-iconv/Makefile b/converters/php52-iconv/Makefile deleted file mode 100644 index 389554118453..000000000000 --- a/converters/php52-iconv/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Alex Keda -# $FreeBSD$ - -CATEGORIES= converters - -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -iconv - -NO_STAGE= yes -.include "${MASTERDIR}/Makefile" diff --git a/converters/php52-mbstring/Makefile b/converters/php52-mbstring/Makefile deleted file mode 100644 index 5eeb9bd34060..000000000000 --- a/converters/php52-mbstring/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Alex Keda -# $FreeBSD$ - -CATEGORIES= converters - -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -mbstring - -NO_STAGE= yes -.include "${MASTERDIR}/Makefile" diff --git a/converters/php52-mbstring/files/patch-config.m4 b/converters/php52-mbstring/files/patch-config.m4 deleted file mode 100644 index 433b3e1678be..000000000000 --- a/converters/php52-mbstring/files/patch-config.m4 +++ /dev/null @@ -1,10 +0,0 @@ ---- ext/mbstring/config.m4.orig Fri Sep 8 07:42:50 2006 -+++ ext/mbstring/config.m4 Fri Sep 8 07:43:00 2006 -@@ -66,7 +66,6 @@ - int foo(int x, ...) { - va_list va; - va_start(va, x); -- va_arg(va, int); - va_arg(va, char *); - va_arg(va, double); - return 0; diff --git a/converters/php52-mbstring/files/patch-oniguruma_regerror.c b/converters/php52-mbstring/files/patch-oniguruma_regerror.c deleted file mode 100644 index c2d89988afa3..000000000000 --- a/converters/php52-mbstring/files/patch-oniguruma_regerror.c +++ /dev/null @@ -1,10 +0,0 @@ ---- ext/mbstring/oniguruma/regerror.c.orig Sat Jan 28 09:53:54 2006 -+++ ext/mbstring/oniguruma/regerror.c Sat Jan 28 09:56:58 2006 -@@ -27,6 +27,7 @@ - * SUCH DAMAGE. - */ - -+#include "config.h" - #include "regint.h" - #include /* for vsnprintf() */ - diff --git a/converters/php52-recode/Makefile b/converters/php52-recode/Makefile deleted file mode 100644 index f5213be56adf..000000000000 --- a/converters/php52-recode/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Alex Keda -# $FreeBSD$ - -CATEGORIES= converters - -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -recode - -NO_STAGE= yes -.include "${MASTERDIR}/Makefile" diff --git a/databases/Makefile b/databases/Makefile index c1e50f598f98..3b6f7b823a73 100644 --- a/databases/Makefile +++ b/databases/Makefile @@ -600,25 +600,6 @@ SUBDIR += php5-sqlite3 SUBDIR += php5-sybase_ct SUBDIR += php5-tarantool - SUBDIR += php52-dba - SUBDIR += php52-dbase - SUBDIR += php52-interbase - SUBDIR += php52-mssql - SUBDIR += php52-mysql - SUBDIR += php52-mysqli - SUBDIR += php52-oci8 - SUBDIR += php52-odbc - SUBDIR += php52-pdo - SUBDIR += php52-pdo_dblib - SUBDIR += php52-pdo_firebird - SUBDIR += php52-pdo_mysql - SUBDIR += php52-pdo_oci - SUBDIR += php52-pdo_odbc - SUBDIR += php52-pdo_pgsql - SUBDIR += php52-pdo_sqlite - SUBDIR += php52-pgsql - SUBDIR += php52-sqlite - SUBDIR += php52-sybase_ct SUBDIR += php53-dba SUBDIR += php53-interbase SUBDIR += php53-mssql diff --git a/databases/php52-dba/Makefile b/databases/php52-dba/Makefile deleted file mode 100644 index 8a1de7673f15..000000000000 --- a/databases/php52-dba/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Alex Keda -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -dba - -NO_STAGE= yes -.include "${MASTERDIR}/Makefile" diff --git a/databases/php52-dba/files/patch-config.m4 b/databases/php52-dba/files/patch-config.m4 deleted file mode 100644 index 187871e55052..000000000000 --- a/databases/php52-dba/files/patch-config.m4 +++ /dev/null @@ -1,41 +0,0 @@ ---- ext/dba/config.m4.orig 2010-07-26 00:28:32.111202104 +0200 -+++ ext/dba/config.m4 2010-07-26 00:28:35.656577336 +0200 -@@ -280,6 +280,38 @@ - THIS_PREFIX=$i - THIS_INCLUDE=$i/db4/db.h - break -+ elif test -f "$i/include/db48/db.h"; then -+ THIS_PREFIX=$i -+ THIS_INCLUDE=$i/include/db48/db.h -+ break -+ elif test -f "$i/include/db47/db.h"; then -+ THIS_PREFIX=$i -+ THIS_INCLUDE=$i/include/db47/db.h -+ break -+ elif test -f "$i/include/db46/db.h"; then -+ THIS_PREFIX=$i -+ THIS_INCLUDE=$i/include/db46/db.h -+ break -+ elif test -f "$i/include/db45/db.h"; then -+ THIS_PREFIX=$i -+ THIS_INCLUDE=$i/include/db45/db.h -+ break -+ elif test -f "$i/include/db44/db.h"; then -+ THIS_PREFIX=$i -+ THIS_INCLUDE=$i/include/db44/db.h -+ break -+ elif test -f "$i/include/db43/db.h"; then -+ THIS_PREFIX=$i -+ THIS_INCLUDE=$i/include/db43/db.h -+ break -+ elif test -f "$i/include/db42/db.h"; then -+ THIS_PREFIX=$i -+ THIS_INCLUDE=$i/include/db42/db.h -+ break -+ elif test -f "$i/include/db41/db.h"; then -+ THIS_PREFIX=$i -+ THIS_INCLUDE=$i/include/db41/db.h -+ break - elif test -f "$i/include/db4.8/db.h"; then - THIS_PREFIX=$i - THIS_INCLUDE=$i/include/db4.8/db.h diff --git a/databases/php52-dbase/Makefile b/databases/php52-dbase/Makefile deleted file mode 100644 index a57d5ff6f1b9..000000000000 --- a/databases/php52-dbase/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Alex Keda -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -dbase - -NO_STAGE= yes -.include "${MASTERDIR}/Makefile" diff --git a/databases/php52-interbase/Makefile b/databases/php52-interbase/Makefile deleted file mode 100644 index 42674de96483..000000000000 --- a/databases/php52-interbase/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -# Created by: Alex Keda -# $FreeBSD$ - -PORTREVISION= 1 -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -interbase - -NO_STAGE= yes -.include "${MASTERDIR}/Makefile" diff --git a/databases/php52-mssql/Makefile b/databases/php52-mssql/Makefile deleted file mode 100644 index ba82f9031ea9..000000000000 --- a/databases/php52-mssql/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Alex Keda -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -mssql - -NO_STAGE= yes -.include "${MASTERDIR}/Makefile" diff --git a/databases/php52-mysql/Makefile b/databases/php52-mysql/Makefile deleted file mode 100644 index 34c05980ca0e..000000000000 --- a/databases/php52-mysql/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Alex Keda -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -mysql - -NO_STAGE= yes -.include "${MASTERDIR}/Makefile" diff --git a/databases/php52-mysqli/Makefile b/databases/php52-mysqli/Makefile deleted file mode 100644 index 6ad970f5a168..000000000000 --- a/databases/php52-mysqli/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Alex Keda -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -mysqli - -NO_STAGE= yes -.include "${MASTERDIR}/Makefile" diff --git a/databases/php52-oci8/Makefile b/databases/php52-oci8/Makefile deleted file mode 100644 index 1aee5bde5d05..000000000000 --- a/databases/php52-oci8/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Alex Keda -# $FreeBSD$ - -CATEGORIES= databases -PKGNAMESUFFIX= -oci8 - -MASTERDIR= ${.CURDIR}/../../lang/php52 - -BROKEN= Does not compile -NO_STAGE= yes -.include "${MASTERDIR}/Makefile" diff --git a/databases/php52-oci8/files/patch-config.m4 b/databases/php52-oci8/files/patch-config.m4 deleted file mode 100644 index fc9db0f2eb1c..000000000000 --- a/databases/php52-oci8/files/patch-config.m4 +++ /dev/null @@ -1,12 +0,0 @@ ---- ext/oci8/config.m4.orig Wed Apr 5 11:06:00 2006 -+++ ext/oci8/config.m4 Tue Jul 11 08:20:27 2006 -@@ -177,8 +177,7 @@ - ;; - - 8.1) -- PHP_ADD_LIBRARY(clntsh, 1, OCI8_SHARED_LIBADD) -- PHP_ADD_LIBPATH($OCI8_DIR/$OCI8_LIB_DIR, OCI8_SHARED_LIBADD) -+ PHP_ADD_LIBRARY_WITH_PATH(oci8, ., OCI8_SHARED_LIBADD) - - PHP_CHECK_LIBRARY(clntsh, OCIEnvCreate, - [ diff --git a/databases/php52-odbc/Makefile b/databases/php52-odbc/Makefile deleted file mode 100644 index 0c3871573703..000000000000 --- a/databases/php52-odbc/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Alex Keda -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -odbc - -NO_STAGE= yes -.include "${MASTERDIR}/Makefile" diff --git a/databases/php52-odbc/files/patch-config.m4 b/databases/php52-odbc/files/patch-config.m4 deleted file mode 100644 index f2297aef0918..000000000000 --- a/databases/php52-odbc/files/patch-config.m4 +++ /dev/null @@ -1,119 +0,0 @@ ---- ext/odbc/config.m4.orig 2007-09-14 08:03:08.000000000 +0200 -+++ ext/odbc/config.m4 2007-09-14 08:14:21.000000000 +0200 -@@ -101,7 +101,7 @@ - dnl - if test -z "$ODBC_TYPE"; then - PHP_ARG_WITH(adabas,, --[ --with-adabas[=DIR] Include Adabas D support [/usr/local]]) -+[ --with-adabas[=DIR] Include Adabas D support [/usr/local]], no, no) - - if test "$PHP_ADABAS" != "no"; then - AC_MSG_CHECKING([for Adabas support]) -@@ -128,7 +128,7 @@ - - if test -z "$ODBC_TYPE"; then - PHP_ARG_WITH(sapdb,, --[ --with-sapdb[=DIR] Include SAP DB support [/usr/local]]) -+[ --with-sapdb[=DIR] Include SAP DB support [/usr/local]], no, no) - - if test "$PHP_SAPDB" != "no"; then - AC_MSG_CHECKING([for SAP DB support]) -@@ -146,7 +146,7 @@ - - if test -z "$ODBC_TYPE"; then - PHP_ARG_WITH(solid,, --[ --with-solid[=DIR] Include Solid support [/usr/local/solid]]) -+[ --with-solid[=DIR] Include Solid support [/usr/local/solid]], no, no) - - if test "$PHP_SOLID" != "no"; then - AC_MSG_CHECKING(for Solid support) -@@ -171,7 +171,7 @@ - - if test -z "$ODBC_TYPE"; then - PHP_ARG_WITH(ibm-db2,, --[ --with-ibm-db2[=DIR] Include IBM DB2 support [/home/db2inst1/sqllib]]) -+[ --with-ibm-db2[=DIR] Include IBM DB2 support [/home/db2inst1/sqllib]], no, no) - - if test "$PHP_IBM_DB2" != "no"; then - AC_MSG_CHECKING(for IBM DB2 support) -@@ -208,7 +208,7 @@ - - if test -z "$ODBC_TYPE"; then - PHP_ARG_WITH(ODBCRouter,, --[ --with-ODBCRouter[=DIR] Include ODBCRouter.com support [/usr]]) -+[ --with-ODBCRouter[=DIR] Include ODBCRouter.com support [/usr]], no, no) - - if test "$PHP_ODBCROUTER" != "no"; then - AC_MSG_CHECKING(for ODBCRouter.com support) -@@ -229,7 +229,7 @@ - if test -z "$ODBC_TYPE"; then - PHP_ARG_WITH(empress,, - [ --with-empress[=DIR] Include Empress support [\$EMPRESSPATH] -- (Empress Version >= 8.60 required)]) -+ (Empress Version >= 8.60 required)], no, no) - - if test "$PHP_EMPRESS" != "no"; then - AC_MSG_CHECKING(for Empress support) -@@ -253,7 +253,7 @@ - PHP_ARG_WITH(empress-bcs,, - [ --with-empress-bcs[=DIR] - Include Empress Local Access support [\$EMPRESSPATH] -- (Empress Version >= 8.60 required)]) -+ (Empress Version >= 8.60 required)], no, no) - - if test "$PHP_EMPRESS_BCS" != "no"; then - AC_MSG_CHECKING(for Empress local access support) -@@ -291,7 +291,7 @@ - - if test -z "$ODBC_TYPE"; then - PHP_ARG_WITH(birdstep,, --[ --with-birdstep[=DIR] Include Birdstep support [/usr/local/birdstep]]) -+[ --with-birdstep[=DIR] Include Birdstep support [/usr/local/birdstep]], no, no) - - if test "$PHP_BIRDSTEP" != "no"; then - AC_MSG_CHECKING(for Birdstep support) -@@ -346,7 +346,7 @@ - running this configure script: - CPPFLAGS=\"-DODBC_QNX -DSQLANY_BUG\" - LDFLAGS=-lunix -- CUSTOM_ODBC_LIBS=\"-ldblib -lodbc\"]) -+ CUSTOM_ODBC_LIBS=\"-ldblib -lodbc\"], no, no) - - if test "$PHP_CUSTOM_ODBC" != "no"; then - AC_MSG_CHECKING(for a custom ODBC support) -@@ -366,7 +366,7 @@ - - if test -z "$ODBC_TYPE"; then - PHP_ARG_WITH(iodbc,, --[ --with-iodbc[=DIR] Include iODBC support [/usr/local]]) -+[ --with-iodbc[=DIR] Include iODBC support [/usr/local]], no, no) - - if test "$PHP_IODBC" != "no"; then - AC_MSG_CHECKING(for iODBC support) -@@ -387,7 +387,7 @@ - - if test -z "$ODBC_TYPE"; then - PHP_ARG_WITH(esoob,, --[ --with-esoob[=DIR] Include Easysoft OOB support [/usr/local/easysoft/oob/client]]) -+[ --with-esoob[=DIR] Include Easysoft OOB support [/usr/local/easysoft/oob/client]], no, no) - - if test "$PHP_ESOOB" != "no"; then - AC_MSG_CHECKING(for Easysoft ODBC-ODBC Bridge support) -@@ -407,7 +407,7 @@ - - if test -z "$ODBC_TYPE"; then - PHP_ARG_WITH(unixODBC,, --[ --with-unixODBC[=DIR] Include unixODBC support [/usr/local]]) -+[ --with-unixODBC[=DIR] Include unixODBC support [/usr/local]], no) - - if test "$PHP_UNIXODBC" != "no"; then - AC_MSG_CHECKING(for unixODBC support) -@@ -428,7 +428,7 @@ - - if test -z "$ODBC_TYPE"; then - PHP_ARG_WITH(dbmaker,, --[ --with-dbmaker[=DIR] Include DBMaker support]) -+[ --with-dbmaker[=DIR] Include DBMaker support], no, no) - - if test "$PHP_DBMAKER" != "no"; then - AC_MSG_CHECKING(for DBMaker support) diff --git a/databases/php52-pdo/Makefile b/databases/php52-pdo/Makefile deleted file mode 100644 index 1955d2521c20..000000000000 --- a/databases/php52-pdo/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Alex Keda -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -pdo - -NO_STAGE= yes -.include "${MASTERDIR}/Makefile" diff --git a/databases/php52-pdo_dblib/Makefile b/databases/php52-pdo_dblib/Makefile deleted file mode 100644 index fc0b68a078ef..000000000000 --- a/databases/php52-pdo_dblib/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Alex Keda -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -pdo_dblib - -NO_STAGE= yes -.include "${MASTERDIR}/Makefile" diff --git a/databases/php52-pdo_firebird/Makefile b/databases/php52-pdo_firebird/Makefile deleted file mode 100644 index b35af5c29ec3..000000000000 --- a/databases/php52-pdo_firebird/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -# Created by: Alex Keda -# $FreeBSD$ - -PORTREVISION= 1 -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -pdo_firebird - -NO_STAGE= yes -.include "${MASTERDIR}/Makefile" diff --git a/databases/php52-pdo_mysql/Makefile b/databases/php52-pdo_mysql/Makefile deleted file mode 100644 index a28fc67c3828..000000000000 --- a/databases/php52-pdo_mysql/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Alex Keda -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -pdo_mysql - -NO_STAGE= yes -.include "${MASTERDIR}/Makefile" diff --git a/databases/php52-pdo_oci/Makefile b/databases/php52-pdo_oci/Makefile deleted file mode 100644 index 5a3223a0c7b2..000000000000 --- a/databases/php52-pdo_oci/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Alex Keda -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -pdo_oci - -NO_STAGE= yes -.include "${MASTERDIR}/Makefile" diff --git a/databases/php52-pdo_oci/files/patch-config.m4 b/databases/php52-pdo_oci/files/patch-config.m4 deleted file mode 100644 index c9e88e5b2264..000000000000 --- a/databases/php52-pdo_oci/files/patch-config.m4 +++ /dev/null @@ -1,19 +0,0 @@ ---- ext/pdo_oci/config.m4.orig Thu Feb 16 03:03:13 2006 -+++ ext/pdo_oci/config.m4 Wed Feb 7 15:00:58 2007 -@@ -145,7 +145,6 @@ - ;; - - 8.1) -- PHP_ADD_LIBRARY(clntsh, 1, PDO_OCI_SHARED_LIBADD) - ;; - - 9.0) -@@ -163,7 +162,7 @@ - ;; - esac - -- PHP_ADD_LIBPATH($PDO_OCI_LIB_DIR, PDO_OCI_SHARED_LIBADD) -+ PHP_ADD_LIBRARY_WITH_PATH(oci8, ., PDO_OCI_SHARED_LIBADD) - - PHP_CHECK_LIBRARY(clntsh, OCIEnvCreate, - [ diff --git a/databases/php52-pdo_odbc/Makefile b/databases/php52-pdo_odbc/Makefile deleted file mode 100644 index 5932a361dba5..000000000000 --- a/databases/php52-pdo_odbc/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Alex Keda -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -pdo_odbc - -NO_STAGE= yes -.include "${MASTERDIR}/Makefile" diff --git a/databases/php52-pdo_pgsql/Makefile b/databases/php52-pdo_pgsql/Makefile deleted file mode 100644 index ced1ede62848..000000000000 --- a/databases/php52-pdo_pgsql/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Alex Keda -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -pdo_pgsql - -NO_STAGE= yes -.include "${MASTERDIR}/Makefile" diff --git a/databases/php52-pdo_sqlite/Makefile b/databases/php52-pdo_sqlite/Makefile deleted file mode 100644 index b62ff5faf034..000000000000 --- a/databases/php52-pdo_sqlite/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Alex Keda -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -pdo_sqlite - -NO_STAGE= yes -.include "${MASTERDIR}/Makefile" diff --git a/databases/php52-pdo_sqlite/files/patch-sqlite_statement.c b/databases/php52-pdo_sqlite/files/patch-sqlite_statement.c deleted file mode 100644 index 699778b05866..000000000000 --- a/databases/php52-pdo_sqlite/files/patch-sqlite_statement.c +++ /dev/null @@ -1,50 +0,0 @@ ---- ext/pdo_sqlite/sqlite_statement.c.orig 2007-12-31 08:20:10.000000000 +0100 -+++ ext/pdo_sqlite/sqlite_statement.c 2008-12-07 11:50:35.000000000 +0100 -@@ -104,6 +104,21 @@ - pdo_sqlite_error_stmt(stmt); - return 0; - -+ case PDO_PARAM_INT: -+ case PDO_PARAM_BOOL: -+ if (Z_TYPE_P(param->parameter) == IS_NULL) { -+ if (sqlite3_bind_null(S->stmt, param->paramno + 1) == SQLITE_OK) { -+ return 1; -+ } -+ } else { -+ convert_to_long(param->parameter); -+ if (SQLITE_OK == sqlite3_bind_int(S->stmt, param->paramno + 1, Z_LVAL_P(param->parameter))) { -+ return 1; -+ } -+ } -+ pdo_sqlite_error_stmt(stmt); -+ return 0; -+ - case PDO_PARAM_LOB: - if (Z_TYPE_P(param->parameter) == IS_RESOURCE) { - php_stream *stm; -@@ -117,8 +132,24 @@ - pdo_raise_impl_error(stmt->dbh, stmt, "HY105", "Expected a stream resource" TSRMLS_CC); - return 0; - } -+ } else if (Z_TYPE_P(param->parameter) == IS_NULL) { -+ if (sqlite3_bind_null(S->stmt, param->paramno + 1) == SQLITE_OK) { -+ return 1; -+ } -+ pdo_sqlite_error_stmt(stmt); -+ return 0; -+ } else { -+ convert_to_string(param->parameter); -+ } -+ -+ if (SQLITE_OK == sqlite3_bind_blob(S->stmt, param->paramno + 1, -+ Z_STRVAL_P(param->parameter), -+ Z_STRLEN_P(param->parameter), -+ SQLITE_STATIC)) { -+ return 1; - } -- /* fall through */ -+ pdo_sqlite_error_stmt(stmt); -+ return 0; - - case PDO_PARAM_STR: - default: diff --git a/databases/php52-pgsql/Makefile b/databases/php52-pgsql/Makefile deleted file mode 100644 index bb47a2f56b14..000000000000 --- a/databases/php52-pgsql/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Alex Keda -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -pgsql - -NO_STAGE= yes -.include "${MASTERDIR}/Makefile" diff --git a/databases/php52-pgsql/files/patch-pgsql.c b/databases/php52-pgsql/files/patch-pgsql.c deleted file mode 100644 index 8431926386dc..000000000000 --- a/databases/php52-pgsql/files/patch-pgsql.c +++ /dev/null @@ -1,30 +0,0 @@ ---- ext/pgsql/pgsql.c.orig 2007-10-04 01:31:58.000000000 +0200 -+++ ext/pgsql/pgsql.c 2008-01-29 11:10:15.000000000 +0100 -@@ -62,6 +62,7 @@ - #define PGSQL_MAX_LENGTH_OF_LONG 30 - #define PGSQL_MAX_LENGTH_OF_DOUBLE 60 - -+#if UINT_MAX > LONG_MAX - #define PGSQL_RETURN_OID(oid) do { \ - if (oid > LONG_MAX) { \ - smart_str s = {0}; \ -@@ -71,7 +72,9 @@ - } \ - RETURN_LONG((long)oid); \ - } while(0) -- -+#else -+#define PGSQL_RETURN_OID(oid) RETURN_LONG((long)oid) -+#endif - - #if HAVE_PQSETNONBLOCKING - #define PQ_SETNONBLOCKING(pg_link, flag) PQsetnonblocking(pg_link, flag) -@@ -272,7 +275,7 @@ - static int le_link, le_plink, le_result, le_lofp, le_string; - - /* {{{ _php_pgsql_trim_message */ --static char * _php_pgsql_trim_message(const char *message, int *len) -+static char * _php_pgsql_trim_message(const char *message, size_t *len) - { - register int i = strlen(message)-1; - diff --git a/databases/php52-sqlite/Makefile b/databases/php52-sqlite/Makefile deleted file mode 100644 index abf6c33d0427..000000000000 --- a/databases/php52-sqlite/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Alex Keda -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -sqlite - -NO_STAGE= yes -.include "${MASTERDIR}/Makefile" diff --git a/databases/php52-sqlite/files/patch-config.m4 b/databases/php52-sqlite/files/patch-config.m4 deleted file mode 100644 index cebb380f1e5b..000000000000 --- a/databases/php52-sqlite/files/patch-config.m4 +++ /dev/null @@ -1,44 +0,0 @@ ---- ext/sqlite/config.m4.orig Wed Nov 30 05:50:03 2005 -+++ ext/sqlite/config.m4 Tue Jan 17 12:51:21 2006 -@@ -48,14 +48,6 @@ - - - if test "$PHP_SQLITE" != "no"; then -- if test "$PHP_PDO" != "no"; then -- PHP_CHECK_PDO_INCLUDES([], [AC_MSG_WARN([Cannot find php_pdo_driver.h.])]) -- if test -n "$pdo_inc_path"; then -- AC_DEFINE([PHP_SQLITE2_HAVE_PDO], [1], [Have PDO]) -- pdo_inc_path="-I$pdo_inc_path" -- fi -- fi -- - if test "$PHP_SQLITE" != "yes"; then - SEARCH_PATH="/usr/local /usr" - SEARCH_FOR="/include/sqlite.h" -@@ -85,13 +77,12 @@ - -L$SQLITE_DIR/$PHP_LIBDIR -lm - ]) - SQLITE_MODULE_TYPE=external -- PHP_SQLITE_CFLAGS=$pdo_inc_path - sqlite_extra_sources="libsqlite/src/encode.c" - else - # use bundled library - PHP_PROG_LEMON - SQLITE_MODULE_TYPE=builtin -- PHP_SQLITE_CFLAGS="-I@ext_srcdir@/libsqlite/src -I@ext_builddir@/libsqlite/src $pdo_inc_path" -+ PHP_SQLITE_CFLAGS="-I@ext_srcdir@/libsqlite/src -I@ext_builddir@/libsqlite/src" - sqlite_extra_sources="libsqlite/src/opcodes.c \ - libsqlite/src/parse.c libsqlite/src/encode.c \ - libsqlite/src/auth.c libsqlite/src/btree.c libsqlite/src/build.c \ -@@ -109,10 +100,9 @@ - dnl - dnl Common for both bundled/external - dnl -- sqlite_sources="sqlite.c sess_sqlite.c pdo_sqlite2.c $sqlite_extra_sources" -+ sqlite_sources="sqlite.c sess_sqlite.c $sqlite_extra_sources" - PHP_NEW_EXTENSION(sqlite, $sqlite_sources, $ext_shared,,$PHP_SQLITE_CFLAGS) - PHP_ADD_EXTENSION_DEP(sqlite, spl, true) -- PHP_ADD_EXTENSION_DEP(sqlite, pdo, true) - - PHP_ADD_MAKEFILE_FRAGMENT - PHP_SUBST(SQLITE_SHARED_LIBADD) diff --git a/databases/php52-sybase_ct/Makefile b/databases/php52-sybase_ct/Makefile deleted file mode 100644 index 162b42c7f40f..000000000000 --- a/databases/php52-sybase_ct/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Alex Keda -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -sybase_ct - -NO_STAGE= yes -.include "${MASTERDIR}/Makefile" diff --git a/devel/Makefile b/devel/Makefile index 5c1bb0d5ef84..1915fecac4c1 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -3367,18 +3367,6 @@ SUBDIR += php5-sysvshm SUBDIR += php5-thrift SUBDIR += php5-tokenizer - SUBDIR += php52-gettext - SUBDIR += php52-json - SUBDIR += php52-ncurses - SUBDIR += php52-pcntl - SUBDIR += php52-pcre - SUBDIR += php52-readline - SUBDIR += php52-shmop - SUBDIR += php52-spl - SUBDIR += php52-sysvmsg - SUBDIR += php52-sysvsem - SUBDIR += php52-sysvshm - SUBDIR += php52-tokenizer SUBDIR += php53-gettext SUBDIR += php53-json SUBDIR += php53-pcntl diff --git a/devel/php52-gettext/Makefile b/devel/php52-gettext/Makefile deleted file mode 100644 index 0cea5c82376d..000000000000 --- a/devel/php52-gettext/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Alex Keda -# $FreeBSD$ - -CATEGORIES= devel - -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -gettext - -NO_STAGE= yes -.include "${MASTERDIR}/Makefile" diff --git a/devel/php52-gettext/files/patch-config.m4 b/devel/php52-gettext/files/patch-config.m4 deleted file mode 100644 index ff4ae917c006..000000000000 --- a/devel/php52-gettext/files/patch-config.m4 +++ /dev/null @@ -1,17 +0,0 @@ ---- ext/gettext/config.m4.orig Tue Jul 27 23:58:02 2004 -+++ ext/gettext/config.m4 Tue Jul 27 23:59:44 2004 -@@ -30,7 +30,6 @@ - AC_MSG_ERROR(Unable to find required gettext library) - ]) - ) -- LDFLAGS=$O_LDFLAGS - - AC_DEFINE(HAVE_LIBINTL,1,[ ]) - PHP_NEW_EXTENSION(gettext, gettext.c, $ext_shared) -@@ -46,5 +45,6 @@ - AC_CHECK_LIB($GETTEXT_CHECK_IN_LIB, dngettext, [AC_DEFINE(HAVE_DNGETTEXT, 1, [ ])]) - AC_CHECK_LIB($GETTEXT_CHECK_IN_LIB, dcngettext, [AC_DEFINE(HAVE_DCNGETTEXT, 1, [ ])]) - AC_CHECK_LIB($GETTEXT_CHECK_IN_LIB, bind_textdomain_codeset, [AC_DEFINE(HAVE_BIND_TEXTDOMAIN_CODESET, 1, [ ])]) -+ LDFLAGS=$O_LDFLAGS - - fi diff --git a/devel/php52-json/Makefile b/devel/php52-json/Makefile deleted file mode 100644 index 054f178ab65e..000000000000 --- a/devel/php52-json/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Alex Keda -# $FreeBSD$ - -CATEGORIES= devel - -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -json - -NO_STAGE= yes -.include "${MASTERDIR}/Makefile" diff --git a/devel/php52-ncurses/Makefile b/devel/php52-ncurses/Makefile deleted file mode 100644 index 740fdd970e6a..000000000000 --- a/devel/php52-ncurses/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Alex Keda -# $FreeBSD$ - -CATEGORIES= devel - -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -ncurses - -NO_STAGE= yes -.include "${MASTERDIR}/Makefile" diff --git a/devel/php52-pcntl/Makefile b/devel/php52-pcntl/Makefile deleted file mode 100644 index 2ecfb58a4f2d..000000000000 --- a/devel/php52-pcntl/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Alex Keda -# $FreeBSD$ - -CATEGORIES= devel - -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -pcntl - -NO_STAGE= yes -.include "${MASTERDIR}/Makefile" diff --git a/devel/php52-pcre/Makefile b/devel/php52-pcre/Makefile deleted file mode 100644 index 50eedd06b289..000000000000 --- a/devel/php52-pcre/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Alex Keda -# $FreeBSD$ - -CATEGORIES= devel - -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -pcre - -NO_STAGE= yes -.include "${MASTERDIR}/Makefile" diff --git a/devel/php52-pcre/files/patch-php_pcre.c b/devel/php52-pcre/files/patch-php_pcre.c deleted file mode 100644 index 489561a71189..000000000000 --- a/devel/php52-pcre/files/patch-php_pcre.c +++ /dev/null @@ -1,34 +0,0 @@ ---- ext/pcre/php_pcre.c.orig 2009-03-06 10:58:43.000000000 +0100 -+++ ext/pcre/php_pcre.c 2009-03-06 10:58:56.000000000 +0100 -@@ -18,6 +18,10 @@ - - /* $Id: php_pcre.c,v 1.168.2.9.2.30 2009/01/13 19:23:31 andrei Exp $ */ - -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif -+ - #include "php.h" - #include "php_ini.h" - #include "php_globals.h" -@@ -241,6 +241,7 @@ - char *pattern; - int do_study = 0; - int poptions = 0; -+ int count = 0; - unsigned const char *tables = NULL; - #if HAVE_SETLOCALE - char *locale = setlocale(LC_CTYPE, NULL); -@@ -252,10 +253,10 @@ - back the compiled pattern, otherwise go on and compile it. */ - if (zend_hash_find(&PCRE_G(pcre_cache), regex, regex_len+1, (void **)&pce) == SUCCESS) { - /* -- * We use a quick pcre_info() check to see whether cache is corrupted, and if it -+ * We use a quick pcre_fullinfo() check to see whether cache is corrupted, and if it - * is, we flush it and compile the pattern from scratch. - */ -- if (pcre_info(pce->re, NULL, NULL) == PCRE_ERROR_BADMAGIC) { -+ if (pcre_fullinfo(pce->re, NULL, PCRE_INFO_CAPTURECOUNT, &count) == PCRE_ERROR_BADMAGIC) { - zend_hash_clean(&PCRE_G(pcre_cache)); - } else { - #if HAVE_SETLOCALE diff --git a/devel/php52-readline/Makefile b/devel/php52-readline/Makefile deleted file mode 100644 index 3f6c7dc8ec73..000000000000 --- a/devel/php52-readline/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Alex Keda -# $FreeBSD$ - -CATEGORIES= devel - -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -readline - -NO_STAGE= yes -.include "${MASTERDIR}/Makefile" diff --git a/devel/php52-readline/files/patch-config.m4 b/devel/php52-readline/files/patch-config.m4 deleted file mode 100644 index 4befe2d99a9f..000000000000 --- a/devel/php52-readline/files/patch-config.m4 +++ /dev/null @@ -1,38 +0,0 @@ ---- ext/readline/config.m4.orig 2009-08-04 13:20:49.000000000 +0200 -+++ ext/readline/config.m4 2009-09-22 11:13:12.000000000 +0200 -@@ -5,13 +5,8 @@ - PHP_ARG_WITH(libedit,for libedit readline replacement, - [ --with-libedit[=DIR] Include libedit readline replacement (CLI/CGI only)]) - --if test "$PHP_LIBEDIT" = "no"; then - PHP_ARG_WITH(readline,for readline support, - [ --with-readline[=DIR] Include readline support (CLI/CGI only)]) --else -- dnl "register" the --with-readline option to preven invalid "unknown configure option" warning -- php_with_readline=no --fi - - if test "$PHP_READLINE" && test "$PHP_READLINE" != "no"; then - for i in $PHP_READLINE /usr/local /usr; do -@@ -60,6 +55,13 @@ - -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS - ]) - -+ PHP_CHECK_LIBRARY(readline, rl_completion_matches, -+ [ -+ AC_DEFINE(HAVE_RL_COMPLETION_MATCHES, 1, [ ]) -+ ],[],[ -+ -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS -+ ]) -+ - AC_DEFINE(HAVE_LIBREADLINE, 1, [ ]) - - elif test "$PHP_LIBEDIT" != "no"; then -@@ -97,7 +99,6 @@ - fi - - if test "$PHP_READLINE" != "no" || test "$PHP_LIBEDIT" != "no"; then -- AC_CHECK_FUNCS([rl_completion_matches]) - PHP_NEW_EXTENSION(readline, readline.c, $ext_shared, cli) - PHP_SUBST(READLINE_SHARED_LIBADD) - fi diff --git a/devel/php52-shmop/Makefile b/devel/php52-shmop/Makefile deleted file mode 100644 index 730e5c6ccd8e..000000000000 --- a/devel/php52-shmop/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Alex Keda -# $FreeBSD$ - -CATEGORIES= devel - -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -shmop - -NO_STAGE= yes -.include "${MASTERDIR}/Makefile" diff --git a/devel/php52-spl/Makefile b/devel/php52-spl/Makefile deleted file mode 100644 index 418e0dd7c27c..000000000000 --- a/devel/php52-spl/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Alex Keda -# $FreeBSD$ - -CATEGORIES= devel - -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -spl - -NO_STAGE= yes -.include "${MASTERDIR}/Makefile" diff --git a/devel/php52-spl/files/patch-config.m4 b/devel/php52-spl/files/patch-config.m4 deleted file mode 100644 index a5fcb45fa0db..000000000000 --- a/devel/php52-spl/files/patch-config.m4 +++ /dev/null @@ -1,28 +0,0 @@ ---- ext/spl/config.m4.orig Mon Dec 4 19:01:53 2006 -+++ ext/spl/config.m4 Wed Feb 7 12:21:20 2007 -@@ -4,6 +4,11 @@ - PHP_ARG_ENABLE(spl, enable SPL suppport, - [ --disable-spl Disable Standard PHP Library], yes) - -+if test -z "$PHP_LIBXML_DIR"; then -+ PHP_ARG_WITH(libxml-dir, libxml2 install dir, -+ [ --with-libxml-dir=DIR SPL: libxml2 install prefix], no, no) -+fi -+ - if test "$PHP_SPL" != "no"; then - AC_MSG_CHECKING(whether zend_object_value is packed) - old_CPPFLAGS=$CPPFLAGS -@@ -25,8 +30,12 @@ - ]) - CPPFLAGS=$old_CPPFLAGS - AC_DEFINE_UNQUOTED(HAVE_PACKED_OBJECT_VALUE, $ac_result, [Whether struct _zend_object_value is packed]) -+ PHP_SETUP_LIBXML(DOM_SHARED_LIBADD, [ - AC_DEFINE(HAVE_SPL, 1, [Whether you want SPL (Standard PHP Library) support]) -- PHP_NEW_EXTENSION(spl, php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_sxe.c spl_exceptions.c spl_observer.c, no) -+ PHP_NEW_EXTENSION(spl, php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_sxe.c spl_exceptions.c spl_observer.c, yes) - PHP_INSTALL_HEADERS([ext/spl], [php_spl.h spl_array.h spl_directory.h spl_engine.h spl_exceptions.h spl_functions.h spl_iterators.h spl_observer.h spl_sxe.h]) - PHP_ADD_EXTENSION_DEP(spl, pcre, true) -+ ], [ -+ AC_MSG_ERROR([xml2-config not found. Please check your libxml2 installation.]) -+ ]) - fi diff --git a/devel/php52-sysvmsg/Makefile b/devel/php52-sysvmsg/Makefile deleted file mode 100644 index b9855d738881..000000000000 --- a/devel/php52-sysvmsg/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Alex Keda -# $FreeBSD$ - -CATEGORIES= devel - -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -sysvmsg - -NO_STAGE= yes -.include "${MASTERDIR}/Makefile" diff --git a/devel/php52-sysvsem/Makefile b/devel/php52-sysvsem/Makefile deleted file mode 100644 index 979262807a70..000000000000 --- a/devel/php52-sysvsem/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Alex Keda -# $FreeBSD$ - -CATEGORIES= devel - -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -sysvsem - -NO_STAGE= yes -.include "${MASTERDIR}/Makefile" diff --git a/devel/php52-sysvshm/Makefile b/devel/php52-sysvshm/Makefile deleted file mode 100644 index d439a186f546..000000000000 --- a/devel/php52-sysvshm/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Alex Keda -# $FreeBSD$ - -CATEGORIES= devel - -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -sysvshm - -NO_STAGE= yes -.include "${MASTERDIR}/Makefile" diff --git a/devel/php52-tokenizer/Makefile b/devel/php52-tokenizer/Makefile deleted file mode 100644 index 59c79a4c2b3e..000000000000 --- a/devel/php52-tokenizer/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Alex Keda -# $FreeBSD$ - -CATEGORIES= devel - -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -tokenizer - -NO_STAGE= yes -.include "${MASTERDIR}/Makefile" diff --git a/ftp/Makefile b/ftp/Makefile index f332189bcead..84cfc74d2071 100644 --- a/ftp/Makefile +++ b/ftp/Makefile @@ -66,8 +66,6 @@ SUBDIR += pftpd SUBDIR += php5-curl SUBDIR += php5-ftp - SUBDIR += php52-curl - SUBDIR += php52-ftp SUBDIR += php53-curl SUBDIR += php53-ftp SUBDIR += php55-curl diff --git a/ftp/php52-curl/Makefile b/ftp/php52-curl/Makefile deleted file mode 100644 index 841fd0bcec4a..000000000000 --- a/ftp/php52-curl/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -# Created by: Alex Keda -# $FreeBSD$ - -CATEGORIES= ftp -PORTREVISION= 15 - -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -curl - -NO_STAGE= yes -.include "${MASTERDIR}/Makefile" diff --git a/ftp/php52-ftp/Makefile b/ftp/php52-ftp/Makefile deleted file mode 100644 index d01c98416604..000000000000 --- a/ftp/php52-ftp/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Alex Keda -# $FreeBSD$ - -CATEGORIES= ftp - -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -ftp - -NO_STAGE= yes -.include "${MASTERDIR}/Makefile" diff --git a/graphics/Makefile b/graphics/Makefile index bc66edf2a876..6274ee174b86 100644 --- a/graphics/Makefile +++ b/graphics/Makefile @@ -764,9 +764,6 @@ SUBDIR += php5-ffmpeg SUBDIR += php5-gd SUBDIR += php5-swfed - SUBDIR += php52-exif - SUBDIR += php52-gd - SUBDIR += php52-ming SUBDIR += php53-exif SUBDIR += php53-gd SUBDIR += php55-exif diff --git a/graphics/php52-exif/Makefile b/graphics/php52-exif/Makefile deleted file mode 100644 index 8647d875c39b..000000000000 --- a/graphics/php52-exif/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Alex Keda -# $FreeBSD$ - -CATEGORIES= graphics - -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -exif - -NO_STAGE= yes -.include "${MASTERDIR}/Makefile" diff --git a/graphics/php52-gd/Makefile b/graphics/php52-gd/Makefile deleted file mode 100644 index 933828e3023e..000000000000 --- a/graphics/php52-gd/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Alex Keda -# $FreeBSD$ - -CATEGORIES= graphics - -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -gd - -NO_STAGE= yes -.include "${MASTERDIR}/Makefile" diff --git a/graphics/php52-gd/files/patch-config.m4 b/graphics/php52-gd/files/patch-config.m4 deleted file mode 100644 index 32fa887c5da6..000000000000 --- a/graphics/php52-gd/files/patch-config.m4 +++ /dev/null @@ -1,20 +0,0 @@ ---- ext/gd/config.m4.orig 2007-07-03 19:25:43.000000000 +0200 -+++ ext/gd/config.m4 2013-12-24 21:04:48.000000000 +0100 -@@ -204,7 +204,7 @@ - if test "$PHP_FREETYPE_DIR" != "no"; then - - for i in $PHP_FREETYPE_DIR /usr/local /usr; do -- if test -f "$i/include/freetype2/freetype/freetype.h"; then -+ if test -f "$i/include/freetype2/freetype.h"; then - FREETYPE2_DIR=$i - FREETYPE2_INC_DIR=$i/include/freetype2 - break -@@ -251,7 +251,7 @@ - ],[ - AC_MSG_ERROR([Problem with libt1.(a|so). Please check config.log for more information.]) - ],[ -- -L$GD_T1_DIR/$PHP_LIBDIR -+ -L$GD_T1_DIR/$PHP_LIBDIR -lm - ]) - fi - ]) diff --git a/graphics/php52-gd/files/patch-libgd_gd_png.c b/graphics/php52-gd/files/patch-libgd_gd_png.c deleted file mode 100644 index d0bbe4ec5100..000000000000 --- a/graphics/php52-gd/files/patch-libgd_gd_png.c +++ /dev/null @@ -1,14 +0,0 @@ ---- ext/gd/libgd/gd_png.c.orig 2009-03-14 18:48:42.000000000 +0100 -+++ ext/gd/libgd/gd_png.c 2010-04-05 19:54:05.000000000 +0200 -@@ -139,7 +139,11 @@ - return NULL; - } - -+#if PNG_LIBPNG_VER >= 10400 -+ if (png_sig_cmp (sig, 0, 8)) { /* bad signature */ -+#else - if (!png_check_sig (sig, 8)) { /* bad signature */ -+#endif - return NULL; - } - diff --git a/graphics/php52-ming/Makefile b/graphics/php52-ming/Makefile deleted file mode 100644 index c3bc36ad1bc9..000000000000 --- a/graphics/php52-ming/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Alex Keda -# $FreeBSD$ - -CATEGORIES= graphics - -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -ming - -NO_STAGE= yes -.include "${MASTERDIR}/Makefile" diff --git a/lang/Makefile b/lang/Makefile index 602f90ddbc7c..6fe59803415e 100644 --- a/lang/Makefile +++ b/lang/Makefile @@ -244,8 +244,6 @@ SUBDIR += php-mode.el SUBDIR += php5 SUBDIR += php5-extensions - SUBDIR += php52 - SUBDIR += php52-extensions SUBDIR += php53 SUBDIR += php53-extensions SUBDIR += php55 diff --git a/lang/php52-extensions/Makefile b/lang/php52-extensions/Makefile deleted file mode 100644 index 92ee39714776..000000000000 --- a/lang/php52-extensions/Makefile +++ /dev/null @@ -1,97 +0,0 @@ -# Created by: Alex Keda -# $FreeBSD$ - -PORTNAME= php52 -PORTVERSION= 1.3 -PORTREVISION= 1 -CATEGORIES= lang -MASTER_SITES= # none -PKGNAMESUFFIX= -extensions -DISTFILES= # none -EXTRACT_ONLY= # none - -MAINTAINER= admin@lissyara.su -COMMENT= A "meta-port" to install PHP extensions - -DEFAULT_PHP_VER=52 -IGNORE_WITH_PHP=5 53 -USE_PHP_BUILD= yes - -NO_BUILD= yes - -OPTIONS_DEFINE= BCMATH BZ2 CALENDAR CTYPE CURL DBA DBASE DOM EXIF FILEINFO \ - FILTER FTP GD GETTEXT GMP HASH ICONV IMAP INTERBASE JSON LDAP \ - MBSTRING MCRYPT MHASH MING MSSQL MYSQL MYSQLI NCURSES ODBC \ - OPENSSL PCNTL PCRE PDF PDO PDO_SQLITE PDO_MYSQL PGSQL POSIX \ - PSPELL READLINE RECODE SESSION SHMOP SIMPLEXML SNMP SOAP SOCKETS \ - SPL SQLITE SYBASE_CT SYSVMSH SYSVSEM SYSVSHM TIDY TOKENIZER \ - WDDX XML XMLREADER XMLRPC XMLWRITER XSL ZIP ZLIB -OPTIONS_DEFAULT= CTYPE DOM FILTER HASH ICONV JSON PCRE PDO PDO_SQLITE \ - PDO_MYSQL POSIX SESSION SIMPLEXML SPL SQLITE TOKENIZER \ - XML XMLREADER XMLWRITER -BCMATH_DESC= bc style precision math functions -BZ2_DESC= bzip2 library support -CALENDAR_DESC= calendar conversion support -CTYPE_DESC= ctype functions -DBA_DESC= dba support -DBASE_DESC= dBase library support -DOM_DESC= DOM support -EXIF_DESC= EXIF support -FILEINFO_DESC= fileinfo support -FILTER_DESC= input filter support -GETTEXT_DESC= gettext library support -HASH_DESC= HASH Message Digest Framework -IMAP_DESC= IMAP support -INTERBASE_DESC= Interbase 6 database support (Firebird) -MBSTRING_DESC= multibyte string support -MCRYPT_DESC= Encryption support -MHASH_DESC= Crypto-hashing support -MING_DESC= ming shockwave flash support -MYSQLI_DESC= MySQLi database support -NCURSES_DESC= ncurses support (CLI only) -ODBC_DESC= unixODBC support -PCNTL_DESC= pcntl support (CLI only) -PDF_DESC= PDFlib support (implies GD) -PDO_DESC= PHP Data Objects Interface (PDO) -PDO_SQLITE_DESC= PDO sqlite driver -PDO_MYSQL_DESC= PDO mysql driver -POSIX_DESC= POSIX-like functions -PSPELL_DESC= pspell support -READLINE_DESC= readline support (CLI only) -RECODE_DESC= recode support -SESSION_DESC= session support -SHMOP_DESC= shmop support -SIMPLEXML_DESC= simplexml support -SOAP_DESC= SOAP support -SOCKETS_DESC= sockets support -SPL_DESC= Standard PHP Library -SYBASE_CT_DESC= Sybase database support -SYSVMSG_DESC= System V message support -SYSVSEM_DESC= System V semaphore support -SYSVSHM_DESC= System V shared memory support -TIDY_DESC= TIDY support -TOKENIZER_DESC= tokenizer support -WDDX_DESC= WDDX support (implies XML) -XMLREADER_DESC= XMLReader support -XMLRPC_DESC= XMLRPC-EPI support -XMLWRITER_DESC= XMLWriter support -XSL_DESC= XSL support (Implies DOM) -ZIP_DESC= ZIP support - -PORT_DBDIR?= /var/db/ports -LATEST_LINK= ${PORTNAME}${PKGNAMESUFFIX} -OPTIONSFILE?= ${PORT_DBDIR}/${LATEST_LINK}/options - -NO_STAGE= yes -.include - -.for opt in ${OPTIONS_DEFINE} -. if ${PORT_OPTIONS:M${opt}} -USE_PHP+= ${opt:L} -. endif -.endfor - -do-install: build - @${DO_NADA} - -.include diff --git a/lang/php52-extensions/pkg-descr b/lang/php52-extensions/pkg-descr deleted file mode 100644 index 5418bd0942d7..000000000000 --- a/lang/php52-extensions/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -This is a "meta-port" to install the extensions for PHP 5. - -Defaults to: -ctype, dom, iconv, pcre, posix, session, simplexml, sqlite, tokenizer and xml. - -WWW: http://www.php.net/ diff --git a/lang/php52/Makefile b/lang/php52/Makefile deleted file mode 100644 index 0bb50d0d4710..000000000000 --- a/lang/php52/Makefile +++ /dev/null @@ -1,234 +0,0 @@ -# Created by: Alex Keda -# $FreeBSD$ - -PORTNAME= php52 -PORTVERSION= 5.2.17 -PORTREVISION?= 15 -CATEGORIES?= lang devel www -MASTER_SITES= ${MASTER_SITE_PHP} -MASTER_SITE_SUBDIR= distributions -DISTNAME= php-${PORTVERSION} - -MAINTAINER= admin@lissyara.su -COMMENT= PHP Scripting Language - -DEPRECATED= PHP 5.2 series is strongly discouraged for new \ - installations, migrate now -EXPIRATION_DATE= 2014-03-01 - -LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} - -USE_BZIP2= yes - -# BACKPORTS patch for lang/php52 and all php52-extensions -PATCHFILES= php52-backports-security-20130717.patch -PATCH_SITES+= http://php52-backports.googlecode.com/files/ - -.if !defined(PKGNAMESUFFIX) -USE_AUTOTOOLS= autoconf -AUTOTOOLSFILES= scripts/phpize.in - -CONFIGURE_ARGS= \ - --with-layout=GNU \ - --with-config-file-scan-dir=${PREFIX}/etc/php \ - --disable-all \ - --enable-libxml \ - --with-libxml-dir=${LOCALBASE} \ - --enable-reflection \ - --program-prefix="" - -USE_GNOME= libxml2 - -OPTIONS_DEFINE= CLI CGI APACHE DEBUG SUHOSIN MULTIBYTE IPV6 MAILHEAD REDIRECT DISCARD \ - FASTCGI FPM PATHINFO LINKTHR - -OPTIONS_DEFAULT= CLI CGI SUHOSIN PATHINFO FASTCGI PATHINFO - -CLI_DESC= Build CLI version -CGI_DESC= Build CGI version -FPM_DESC= Build FPM version (experimental) -APACHE_DESC= Build Apache module -AP2FILTER_DESC= Use Apache 2.x filter interface (experimental) -SUHOSIN_DESC= Suhosin protection system -MULTIBYTE_DESC= zend multibyte support -MAILHEAD_DESC= mail header patch -LINKTHR_DESC= Link thread lib (for threaded extensions) -REDIRECT_DESC= force-cgi-redirect support (CGI only) -DISCARD_DESC= discard-path support (CGI only) -FASTCGI_DESC= fastcgi support (CGI only) -FPM_DESC= fastcgi process manager (CGI only) -PATHINFO_DESC= path-info-check support (CGI only) - -CONFLICTS= php53-5* php5-5* - -MAN1= php-config.1 phpize.1 - -NO_STAGE= yes -.include - -PATCH_DIST_STRIP= -p1 - -.if ${PORT_OPTIONS:MFPM} && ${PORT_OPTIONS:MCGI} -. if ! ${PORT_OPTIONS:MFASTCGI} -IGNORE= FPM requires FastCGI support -. endif -PATCHFILES+= php-5.2.14-fpm-0.5.14-freebsd.patch.gz -PATCH_SITES+= ${MASTER_SITE_LOCAL} -PATCH_SITE_SUBDIR+= mm -LIB_DEPENDS+= event-1.4:${PORTSDIR}/devel/libevent -PHP_FPM_UID?= www -PHP_FPM_GID?= www -PHP_FPM_PID?= /var/run/php-fpm/php-fpm.pid -PHP_FPM_LOG?= /var/log/php-fpm/php-fpm.log -SUB_FILES+= php-fpm.conf.sample -SUB_LIST+= PHP_FPM_UID=${PHP_FPM_UID} \ - PHP_FPM_GID=${PHP_FPM_GID} \ - PHP_FPM_PID=${PHP_FPM_PID} \ - PHP_FPM_LOG=${PHP_FPM_LOG} -USE_RC_SUBR+= php-fpm -PLIST_SUB+= FPM="" \ - PHP_FPM_PID=${PHP_FPM_PID} \ - PHP_FPM_LOG=${PHP_FPM_LOG} - -CONFIGURE_ARGS+= --enable-fpm \ - --with-fpm-conf=${PREFIX}/etc/php-fpm.conf \ - --with-fpm-pid=${PHP_FPM_PID} \ - --with-fpm-log=${PHP_FPM_LOG} \ - --with-libevent=${LOCALBASE} -.else -PLIST_SUB+= FPM="@comment " -.endif - -.if ${PORT_OPTIONS:MSUHOSIN} -PATCHFILES+= suhosin-patch-5.2.16-0.9.7.patch.gz:suhosin -PATCH_SITES+= http://download.suhosin.org/:suhosin -PLIST_SUB+= SUHOSIN="" -.else -PLIST_SUB+= SUHOSIN="@comment " -.endif - -.if ${PORT_OPTIONS:MMAILHEAD} -#PATCHFILES+= php-${PORTVERSION}-mail-header.patch:mail -PATCHFILES+= php-5.2.10-mail-header.patch:mail -PATCH_SITES+= http://choon.net/opensource/php/:mail -.endif - -.if ${PORT_OPTIONS:MCLI} -PHP_SAPI+= cli -PLIST_SUB+= CLI="" -MAN1+= php.1 -.else -PLIST_SUB+= CLI="@comment " -CONFIGURE_ARGS+=--disable-cli -.endif - -.if ${PORT_OPTIONS:MCGI} -PHP_SAPI+= cgi -PLIST_SUB+= CGI="" -.if ${PORT_OPTIONS:MREDIRECT} -CONFIGURE_ARGS+=--enable-force-cgi-redirect -.endif -.if ${PORT_OPTIONS:MDISCARD} -CONFIGURE_ARGS+=--enable-discard-path -.endif -.if ${PORT_OPTIONS:MFASTCGI} -CONFIGURE_ARGS+=--enable-fastcgi -.endif -.if ! ${PORT_OPTIONS:MPATHINFO} -CONFIGURE_ARGS+=--disable-path-info-check -.endif -.else -PLIST_SUB+= CGI="@comment " -CONFIGURE_ARGS+=--disable-cgi -.endif - -.if ${PORT_OPTIONS:MAPACHE} -PHP_SAPI+= mod -USE_APACHE= 22+ -.include "${PORTSDIR}/Mk/bsd.apache.mk" -CONFIGURE_ARGS+=--with-apxs2=${APXS} -PKGMESSAGE= ${PKGDIR}/pkg-message.mod -MODULENAME= libphp5 -SHORTMODNAME= php5 -PLIST_SUB+= APACHE="" -.else -PLIST_SUB+= APACHE="@comment " -.endif - -.if ! ${PORT_OPTIONS:MREGEX_TYPE} || ${WITH_REGEX_TYPE} == "php" -CONFIGURE_ARGS+=--with-regex=php -.elif ${PORT_OPTIONS:MREGEX_TYPE} && ${WITH_REGEX_TYPE} == "system" -CONFIGURE_ARGS+=--with-regex=system -.elif ${PORT_OPTIONS:MREGEX_TYPE} && ${WITH_REGEX_TYPE} == "apache" -CONFIGURE_ARGS+=--with-regex=apache -.endif - -.if ! ${PORT_OPTIONS:MZEND_VM} || ${WITH_ZEND_VM} == "CALL" -CONFIGURE_ARGS+=--with-zend-vm=CALL -.elif ${PORT_OPTIONS:MZEND_VM} && ${WITH_ZEND_VM} == "SWITCH" -CONFIGURE_ARGS+=--with-zend-vm=SWITCH -.elif ${PORT_OPTIONS:MZEND_VM} && ${WITH_ZEND_VM} == "GOTO" -CONFIGURE_ARGS+=--with-zend-vm=GOTO -.endif - -CONFIGURE_ENV+= ac_cv_pthreads_lib="" \ - ac_cv_pthreads_cflags="" \ - pthreads_working="yes" \ - lt_cv_path_SED="sed" - -.if ${PORT_OPTIONS:MLINKTHR} -CONFIGURE_ENV+= LIBS="${LIBS} ${PTHREAD_LIBS}" -.endif - -.if ${PORT_OPTIONS:MDEBUG} -CONFIGURE_ARGS+=--enable-debug -.endif - -.if ${PORT_OPTIONS:MMULTIBYTE} -CONFIGURE_ARGS+=--enable-zend-multibyte -.endif - -.if ! ${PORT_OPTIONS:MIPV6} -CONFIGURE_ARGS+=--disable-ipv6 -.endif - -post-patch: - @${TOUCH} ${WRKSRC}/ext/php_config.h - @${REINPLACE_CMD} -e 's|freetype/||g' ${WRKSRC}/configure - @${REINPLACE_CMD} "s|^\(extension_dir\)|; \1|" ${WRKSRC}/php.ini-* -.if ${PORT_OPTIONS:MFPM} && ${PORT_OPTIONS:MCGI} - @${REINPLACE_CMD} -e 's,BUILD_CGI=\"\\$$\(.*\)\\$$(EXTRA_LIBS),BUILD_CGI=\"\\$$\1\\$$(EXTRA_LIBS) \\$$(SAPI_EXTRA_LIBS),g' \ - ${WRKSRC}/sapi/cgi/config9.m4 -.endif - -# Work around issues with newer (>=2.64) autoconf -pre-configure: - @${REINPLACE_CMD} -E 's:^((m4_)?divert)[(]([0-9]*)[)]:\1(600\3):' \ - ${WRKSRC}/configure.in `${FIND} ${WRKSRC} -name '*.m4'` - @${RM} ${WRKSRC}/configure - @${CAT} ${WRKSRC}/acinclude.m4 ${WRKSRC}/build/libtool.m4 > ${WRKSRC}/aclocal.m4 - -post-build: - @${ECHO_CMD} "PHP_VER=52" > ${WRKDIR}/php.conf - @${ECHO_CMD} "PHP_VERSION=${PORTVERSION}" >> ${WRKDIR}/php.conf - @${ECHO_CMD} "PHP_SAPI=${PHP_SAPI}" >> ${WRKDIR}/php.conf - -post-install: - @${INSTALL_DATA} ${WRKSRC}/php.ini-dist ${PREFIX}/etc - @${INSTALL_DATA} ${WRKSRC}/php.ini-recommended ${PREFIX}/etc - @${INSTALL_DATA} ${WRKDIR}/php.conf ${PREFIX}/etc - @${TOUCH} ${PREFIX}/include/php/ext/php_config.h -.if ${PORT_OPTIONS:MFPM} && ${PORT_OPTIONS:MCGI} - @${INSTALL_DATA} ${WRKDIR}/php-fpm.conf.sample ${PREFIX}/etc - @${MKDIR} `dirname ${PHP_FPM_PID}` - @${MKDIR} `dirname ${PHP_FPM_LOG}` - @cd ${PREFIX}/etc && ${CP} -n php-fpm.conf.sample php-fpm.conf || ${TRUE} -.endif -.if ${PORT_OPTIONS:MAPACHE} - @${CAT} ${PKGMESSAGE} -.endif - -.else -.include "${MASTERDIR}/Makefile.ext" -.endif -.include diff --git a/lang/php52/Makefile.ext b/lang/php52/Makefile.ext deleted file mode 100644 index feefc55cd63b..000000000000 --- a/lang/php52/Makefile.ext +++ /dev/null @@ -1,635 +0,0 @@ -COMMENT= The ${PHP_MODNAME} shared extension for php - -USE_PHP= yes -USE_PHPEXT= yes -PHP_MODNAME= ${PKGNAMESUFFIX:S/-//} -DEFAULT_PHP_VER=52 -IGNORE_WITH_PHP=4 5 - -EXTSUBDIR= ${DISTNAME}/ext/${PHP_MODNAME} -WRKSRC= ${WRKDIR}/${EXTSUBDIR} -PATCHDIR= ${.CURDIR}/files -PLIST= ${NONEXISTENT} - -#EXTRACT_AFTER_ARGS?= | ${TAR} -xf - ${EXTSUBDIR} -PATCH_WRKSRC= ${WRKDIR}/${DISTNAME} -PATCH_DIST_STRIP+= -p1 - -.if ${PHP_MODNAME} == "bcmath" -CONFIGURE_ARGS+=--enable-bcmath - -PHP_HEADER_DIRS=libbcmath libbcmath/src -.endif - -.if ${PHP_MODNAME} == "bz2" -.if exists(/usr/bin/bzip2) -BZ2BASE= /usr -.else -BZ2BASE= ${LOCALBASE} -LIB_DEPENDS+= bz2.1:${PORTSDIR}/archivers/bzip2 -.endif -CONFIGURE_ARGS+=--with-bz2=${BZ2BASE} -.endif - -.if ${PHP_MODNAME} == "calendar" -CONFIGURE_ARGS+=--enable-calendar -.endif - -.if ${PHP_MODNAME} == "ctype" -CONFIGURE_ARGS+=--enable-ctype -.endif - -.if ${PHP_MODNAME} == "curl" -LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl - -CONFIGURE_ARGS+=--with-curl=${LOCALBASE} -.endif - -.if ${PHP_MODNAME} == "dba" -CONFIGURE_ARGS+=--enable-dba - -OPTIONS_DEFINE= CDB DB4 INIFILE FLATFILE -OPTIONS_DEFAULT= CDB INIFILE FLATFILE -OPTIONS_RADIO= DBM -OPTIONS_RADIO_DBM= GDBM QDBM - -CDB_DESC= cdb database support -DB4_DESC= Berkeley DB4 support -GDBM_DESC= GDBM database support -QDBM_DESC= QDBM database support -INIFILE_DESC= INI file support -FLATFILE_DESC= flatfile support - -PHP_HEADER_DIRS= libcdb libflatfile libinifile -.endif - -.if ${PHP_MODNAME} == "dbase" -CONFIGURE_ARGS+=--enable-dbase -.endif - -.if ${PHP_MODNAME} == "dom" -CONFIGURE_ARGS+=--enable-dom \ - --with-libxml-dir=${LOCALBASE} - -USE_GNOME= libxml2 - -USE_PHP= spl -USE_PHP_BUILD= yes -.endif - -.if ${PHP_MODNAME} == "exif" -CONFIGURE_ARGS+=--enable-exif -.endif - -.if ${PHP_MODNAME} == "filter" -CONFIGURE_ARGS+=--enable-filter \ - --with-pcre-dir=${LOCALBASE} - -USE_PHP= pcre -USE_PHP_BUILD= yes -.endif - -.if ${PHP_MODNAME} == "ftp" -CONFIGURE_ARGS+=--enable-ftp \ - --with-openssl-dir=${OPENSSLBASE} - -LDFLAGS+= -L${OPENSSLLIB} -lcrypto -lssl -USE_OPENSSL= yes -.endif - -.if ${PHP_MODNAME} == "gd" -LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \ - png15:${PORTSDIR}/graphics/png \ - jpeg.11:${PORTSDIR}/graphics/jpeg - -CONFIGURE_ARGS+=--with-gd \ - --with-freetype-dir=${LOCALBASE} \ - --with-jpeg-dir=${LOCALBASE} \ - --with-png-dir=${LOCALBASE} \ - --with-zlib-dir=/usr - -OPTIONS_DEFINE= T1LIB TRUETYPE JIS X11 -OPTIONS_DEFAULT= T1LIB TRUETYPE X11 - -T1LIB_DESC= Include T1lib support -TRUETYPE_DESC= TrueType string function -JIS_DESC= JIS-mapped Japanese font support - -PHP_HEADER_DIRS=libgd -.endif - -.if ${PHP_MODNAME} == "gettext" -CONFIGURE_ARGS+=--with-gettext=${LOCALBASE} - -USES+= gettext -.endif - -.if ${PHP_MODNAME} == "gmp" -LIB_DEPENDS+= gmp.10:${PORTSDIR}/math/gmp - -CONFIGURE_ARGS+=--with-gmp=${LOCALBASE} -.endif - -.if ${PHP_MODNAME} == "hash" -CONFIGURE_ARGS+=--enable-hash -.endif - -.if ${PHP_MODNAME} == "iconv" -CONFIGURE_ARGS+=--with-iconv - -USES+= iconv -.endif - -.if ${PHP_MODNAME} == "imap" -OPTIONS_DEFINE= SSL -OPTIONS_DEFAULT= SSL -LIB_DEPENDS+= c-client4.9:${PORTSDIR}/mail/cclient - -CONFIGURE_ARGS+=--with-imap=${LOCALBASE} -USE_OPENSSL= yes -.endif - -.if ${PHP_MODNAME} == "interbase" -CONFIGURE_ARGS+=--with-interbase=${LOCALBASE} - -USE_FIREBIRD= yes -.endif - -.if ${PHP_MODNAME} == "json" -CONFIGURE_ARGS+=--enable-json -.endif - -.if ${PHP_MODNAME} == "ldap" -CONFIGURE_ARGS+=--with-ldap=${LOCALBASE} - -USE_OPENLDAP= yes - -. ifdef(WANT_OPENLDAP_SASL) -CONFIGURE_ARGS+=--with-ldap-sasl -. endif -.endif - -.if ${PHP_MODNAME} == "mbstring" -CONFIGURE_ARGS+=--enable-mbstring - -OPTIONS_DEFINE= REGEX -OPTIONS_DEFAULT= REGEX - -REGEX_DESC= multibyte regex support - -PHP_HEADER_DIRS=libmbfl libmbfl/filters libmbfl/mbfl libmbfl/nls oniguruma -.endif - -.if ${PHP_MODNAME} == "mcrypt" -LIB_DEPENDS+= mcrypt.8:${PORTSDIR}/security/libmcrypt - -CONFIGURE_ARGS+=--with-mcrypt=${LOCALBASE} - -USE_AUTOTOOLS= libltdl -.endif - -.if ${PHP_MODNAME} == "mhash" -LIB_DEPENDS+= mhash.2:${PORTSDIR}/security/mhash - -CONFIGURE_ARGS+=--with-mhash=${LOCALBASE} -.endif - -.if ${PHP_MODNAME} == "ming" -LIB_DEPENDS+= ming.5:${PORTSDIR}/graphics/ming - -CONFIGURE_ARGS+=--with-ming=${LOCALBASE} -.endif - -.if ${PHP_MODNAME} == "mssql" -LIB_DEPENDS+= sybdb.5:${PORTSDIR}/databases/freetds-msdblib - -CONFIGURE_ARGS+=--with-mssql=${LOCALBASE} -.endif - -.if ${PHP_MODNAME} == "mysql" -CONFIGURE_ARGS+=--with-mysql=${LOCALBASE} \ - --with-zlib-dir=/usr - -USE_MYSQL= yes -.endif - -.if ${PHP_MODNAME} == "mysqli" -CONFIGURE_ARGS+=--with-mysqli=${LOCALBASE}/bin/mysql_config - -USE_MYSQL= yes - -USE_PHP= spl -USE_PHP_BUILD= yes -.endif - -.if ${PHP_MODNAME} == "ncurses" -CONFIGURE_ARGS+=--with-ncurses=/usr -.endif - -.if ${PHP_MODNAME} == "oci8" -BUILD_DEPENDS+= ${LOCALBASE}/oracle8-client/lib/libclntsh.a:${PORTSDIR}/databases/oracle8-client - -RUN_DEPENDS+= ${BUILD_DEPENDS} - -CONFIGURE_ARGS+=--with-oci8=${LOCALBASE}/oracle8-client -.endif - -.if ${PHP_MODNAME} == "odbc" -LIB_DEPENDS+= odbc.2:${PORTSDIR}/databases/unixODBC - -CONFIGURE_ARGS+=--with-unixODBC=${LOCALBASE} -.endif - -.if ${PHP_MODNAME} == "openssl" -CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE} - -LDFLAGS+= -L${OPENSSLLIB} -lcrypto -lssl -USE_OPENSSL= yes -.endif - -.if ${PHP_MODNAME} == "pcntl" -CONFIGURE_ARGS+=--enable-pcntl -.endif - -.if ${PHP_MODNAME} == "pcre" -OPTIONS_DEFINE= BUNDLE_PCRE -BUNDLED_PCRE_DESC= Select if you use apache 2.0.x -.endif - -.if ${PHP_MODNAME} == "pdo" -CONFIGURE_ARGS+=--enable-pdo -.endif - -.if ${PHP_MODNAME} == "pdo_dblib" -CONFIGURE_ARGS+=--with-pdo-dblib=${LOCALBASE} - -USE_PHP= pdo -USE_PHP_BUILD= yes - -OPTIONS_DEFINE= MSSQL - -MSSQL_DESC= Microsoft SQL Server support -.endif - -.if ${PHP_MODNAME} == "pdo_firebird" -CONFIGURE_ARGS+=--with-pdo-firebird=${LOCALBASE} - -USE_PHP= pdo -USE_PHP_BUILD= yes - -USE_FIREBIRD= yes -.endif - -.if ${PHP_MODNAME} == "pdo_mysql" -CONFIGURE_ARGS+=--with-pdo-mysql=${LOCALBASE} \ - --with-zlib-dir=/usr - -USE_MYSQL= yes - -USE_PHP= pdo -USE_PHP_BUILD= yes -.endif - -.if ${PHP_MODNAME} == "pdo_oci" -BUILD_DEPENDS+= ${LOCALBASE}/oracle8-client/lib/libclntsh.a:${PORTSDIR}/databases/oracle8-client - -RUN_DEPENDS+= ${BUILD_DEPENDS} - -CONFIGURE_ARGS+=--with-pdo-oci=${LOCALBASE}/oracle8-client - -USE_PHP= pdo -USE_PHP_BUILD= yes -.endif - -.if ${PHP_MODNAME} == "pdo_odbc" -LIB_DEPENDS+= odbc.2:${PORTSDIR}/databases/unixODBC - -CONFIGURE_ARGS+=--with-pdo-odbc=unixODBC,${LOCALBASE} - -USE_PHP= pdo -USE_PHP_BUILD= yes -.endif - -.if ${PHP_MODNAME} == "pdo_pgsql" -USE_PGSQL= yes - -CONFIGURE_ARGS+=--with-pdo-pgsql=${LOCALBASE} - -USE_PHP= pdo -USE_PHP_BUILD= yes -.endif - -.if ${PHP_MODNAME} == "pdo_sqlite" -. if defined(WITH_SQLITE_PORT) -USE_SQLITE= yes -CONFIGURE_ARGS+=--with-pdo-sqlite=${LOCALBASE} -. else -CONFIGURE_ARGS+=--with-pdo-sqlite -. endif -USE_PHP= pdo -USE_PHP_BUILD= yes -PHP_HEADER_DIRS=sqlite/src -.endif - - -.if ${PHP_MODNAME} == "pgsql" -USE_PGSQL= yes - -CONFIGURE_ARGS+=--with-pgsql=${LOCALBASE} -.endif - -.if ${PHP_MODNAME} == "posix" -CONFIGURE_ARGS+=--enable-posix -.endif - -.if ${PHP_MODNAME} == "pspell" -LIB_DEPENDS+= aspell.16:${PORTSDIR}/textproc/aspell - -CONFIGURE_ARGS+=--with-pspell=${LOCALBASE} - -# Ugly hack to load session before psell to avoid crashes -USE_PHP= session -USE_PHP_BUILD= yes -.endif - -.if ${PHP_MODNAME} == "readline" -CONFIGURE_ARGS+=--with-readline=/usr -.endif - -.if ${PHP_MODNAME} == "recode" -LIB_DEPENDS+= recode.3:${PORTSDIR}/converters/recode - -CONFIGURE_ARGS+=--with-recode=${LOCALBASE} -.endif - -.if ${PHP_MODNAME} == "session" -CONFIGURE_ARGS+=--enable-session -.endif - -.if ${PHP_MODNAME} == "shmop" -CONFIGURE_ARGS+=--enable-shmop -.endif - -.if ${PHP_MODNAME} == "simplexml" -CONFIGURE_ARGS+=--enable-simplexml \ - --with-libxml-dir=${LOCALBASE} - -USES+= pkgconfig -USE_GNOME= libxml2 -.endif - -.if ${PHP_MODNAME} == "snmp" -CONFIGURE_ARGS+=--with-snmp=${LOCALBASE} \ - --with-openssl-dir=${OPENSSLBASE} \ - --enable-ucd-snmp-hack - -LIB_DEPENDS+= netsnmp.30:${PORTSDIR}/net-mgmt/net-snmp -LDFLAGS+= -L${OPENSSLLIB} -lcrypto -lssl -USE_OPENSSL= yes -.endif - -.if ${PHP_MODNAME} == "soap" -CONFIGURE_ARGS+=--enable-soap \ - --with-libxml-dir=${LOCALBASE} - -USE_GNOME= libxml2 - -USE_PHP= session -USE_PHP_BUILD= yes -.endif - -.if ${PHP_MODNAME} == "spl" -CONFIGURE_ARGS+=--enable-spl \ - --with-libxml-dir=${LOCALBASE} - -CFLAGS+= -I${LOCALBASE}/include -USE_GNOME= libxml2 - -USE_PHP= pcre simplexml -USE_PHP_BUILD= yes -.endif - -.if ${PHP_MODNAME} == "sockets" -CONFIGURE_ARGS+=--enable-sockets -.endif - -.if ${PHP_MODNAME} == "sqlite" -CONFIGURE_ARGS+=--with-sqlite - -USE_PHP= session -USE_PHP_BUILD= yes -PHP_HEADER_DIRS=libsqlite/src - -USE_PHP= spl -USE_PHP_BUILD= yes - -OPTIONS_DEFINE= UTF8 -.endif - -.if ${PHP_MODNAME} == "sybase_ct" -LIB_DEPENDS+= ct.4:${PORTSDIR}/databases/freetds - -CONFIGURE_ARGS+=--with-sybase-ct=${LOCALBASE} -.endif - -.if ${PHP_MODNAME} == "sysvmsg" -CONFIGURE_ARGS+=--enable-sysvmsg -.endif - -.if ${PHP_MODNAME} == "sysvsem" -CONFIGURE_ARGS+=--enable-sysvsem -.endif - -.if ${PHP_MODNAME} == "sysvshm" -CONFIGURE_ARGS+=--enable-sysvshm -.endif - -.if ${PHP_MODNAME} == "tidy" -CONFIGURE_ARGS+=--with-tidy=${LOCALBASE} - -LIB_DEPENDS+= tidy-0.99.0:${PORTSDIR}/www/tidy-lib -.endif - -.if ${PHP_MODNAME} == "tokenizer" -CONFIGURE_ARGS+=--enable-tokenizer -.endif - -.if ${PHP_MODNAME} == "wddx" -CONFIGURE_ARGS+=--enable-wddx \ - --with-libxml-dir=${LOCALBASE} - -USE_GNOME= libxml2 - -USE_PHP= xml session -USE_PHP_BUILD= yes -.endif - -.if ${PHP_MODNAME} == "xml" -CONFIGURE_ARGS+=--enable-xml \ - --with-libxml-dir=${LOCALBASE} - -USE_GNOME= libxml2 -.endif - -.if ${PHP_MODNAME} == "xmlreader" -CONFIGURE_ARGS+=--enable-xmlreader \ - --with-libxml-dir=${LOCALBASE} - -USE_GNOME= libxml2 - -USE_PHP= dom -USE_PHP_BUILD= yes -.endif - -.if ${PHP_MODNAME} == "xmlrpc" -CONFIGURE_ARGS+=--with-xmlrpc \ - --with-libxml-dir=${LOCALBASE} - -USES+= iconv -USE_GNOME= libxml2 - -PHP_HEADER_DIRS=libxmlrpc - -USE_PHP= xml -USE_PHP_BUILD= yes -.endif - -.if ${PHP_MODNAME} == "xmlwriter" -CONFIGURE_ARGS+=--enable-xmlwriter \ - --with-libxml-dir=${LOCALBASE} - -USE_GNOME= libxml2 -.endif - -.if ${PHP_MODNAME} == "xsl" -CONFIGURE_ARGS+=--with-xsl=${LOCALBASE} - -USE_GNOME= libxslt -USE_PHP= dom xml -USE_PHP_BUILD= yes -.endif - -.if ${PHP_MODNAME} == "zip" -CONFIGURE_ARGS+=--enable-zip \ - --with-zlib-dir=/usr -.endif - -.if ${PHP_MODNAME} == "zlib" -CONFIGURE_ARGS+=--with-zlib=/usr -.endif - -.include - -.if ${PHP_MODNAME} == "dba" -. if ! ${PORT_OPTIONS:MCDB} -CONFIGURE_ARGS+=--without-cdb -. endif -. if ${PORT_OPTIONS:MDB4} -CONFIGURE_ARGS+=--with-db4=${LOCALBASE} - -USE_BDB= 40+ -WITH_BDB_HIGHEST= yes -. endif -. if ${PORT_OPTIONS:MGDBM} -LIB_DEPENDS+= gdbm.4:${PORTSDIR}/databases/gdbm - -CONFIGURE_ARGS+=--with-gdbm=${LOCALBASE} -. endif -. if ${PORT_OPTIONS:MQDBM} -LIB_DEPENDS+= qdbm.14:${PORTSDIR}/databases/qdbm - -CONFIGURE_ARGS+=--with-qdbm=${LOCALBASE} -. endif -. if ! ${PORT_OPTIONS:MINIFILE} -CONFIGURE_ARGS+=--disable-inifile -. endif -. if ! ${PORT_OPTIONS:MFLATFILE} -CONFIGURE_ARGS+=--disable-flatfile -. endif -.endif - -.if ${PHP_MODNAME} == "gd" -. if ${PORT_OPTIONS:MX11} -USE_XORG= xpm -CONFIGURE_ARGS+=--with-xpm-dir=${LOCALBASE} -. endif -. if ${PORT_OPTIONS:MT1LIB} -LIB_DEPENDS+= t1.5:${PORTSDIR}/devel/t1lib - -CONFIGURE_ARGS+=--with-t1lib=${LOCALBASE} -. endif -. if ${PORT_OPTIONS:MTRUETYPE} -CONFIGURE_ARGS+=--enable-gd-native-ttf -. endif -. if ${PORT_OPTIONS:MJIS} -CONFIGURE_ARGS+=--enable-gd-jis-conv -. endif -.endif - -.if ${PHP_MODNAME} == "imap" -. if ${PORT_OPTIONS:MSSL} -CONFIGURE_ARGS+=--with-imap-ssl=${OPENSSLBASE} -LDFLAGS+= -L${OPENSSLLIB} -lcrypto -lssl -. endif -.endif - -.if ${PHP_MODNAME} == "mbstring" -. if ! ${PORT_OPTIONS:MREGEX} -CONFIGURE_ARGS+=--disable-mbregex -. endif -.endif - -.if ${PHP_MODNAME} == "openssl" -post-extract: - @${MV} ${WRKSRC}/config0.m4 ${WRKSRC}/config.m4 -.endif - -.if ${PHP_MODNAME} == "oci8" || ${PHP_MODNAME} == "pdo_oci" -pre-configure: - @cd ${WRKSRC}; \ - for lib in ${LOCALBASE}/oracle8-client/lib/libclntsh /usr/lib/libpthread; do \ - /usr/bin/ar x $${lib}.a; \ - done; \ - /usr/bin/ar rcs liboci8.a *.o -.endif - -.if ${PHP_MODNAME} == "pcre" -. if ${PORT_OPTIONS:MBUNDLED_PCRE} -CONFIGURE_ARGS+=--with-pcre-regex=yes - -PHP_HEADER_DIRS=pcrelib -. else -LIB_DEPENDS+= pcre.3:${PORTSDIR}/devel/pcre - -CONFIGURE_ARGS+=--with-pcre-regex=${LOCALBASE} -. endif - -post-extract: - @${MV} ${WRKSRC}/config0.m4 ${WRKSRC}/config.m4 -.endif - - -.if ${PHP_MODNAME} == "pdo_dblib" -.if ${PORT_OPTIONS:MMSSQL} -LIB_DEPENDS+= sybdb.5:${PORTSDIR}/databases/freetds-msdblib -.else -LIB_DEPENDS+= ct.4:${PORTSDIR}/databases/freetds -.endif -.endif - -.if ${PHP_MODNAME} == "sqlite" -. if ${PORT_OPTIONS:MUTF8} -CONFIGURE_ARGS+=--enable-sqlite-utf8 -. endif -.endif - -.if ${PHP_MODNAME} == "xml" -post-extract: - @${MKDIR} ${WRKSRC}/ext/xml - @${CP} ${WRKSRC}/expat_compat.h ${WRKSRC}/ext/xml -.endif - -.if ${PHP_MODNAME} == "zlib" -post-extract: - @${MV} ${WRKSRC}/config0.m4 ${WRKSRC}/config.m4 -.endif diff --git a/lang/php52/distinfo b/lang/php52/distinfo deleted file mode 100644 index 873c76e7ff72..000000000000 --- a/lang/php52/distinfo +++ /dev/null @@ -1,10 +0,0 @@ -SHA256 (php-5.2.17.tar.bz2) = e81beb13ec242ab700e56f366e9da52fd6cf18961d155b23304ca870e53f116c -SIZE (php-5.2.17.tar.bz2) = 9092312 -SHA256 (php52-backports-security-20130717.patch) = 75282dc7dd60d0d74be24691ae7de38c5e02582e0570e29295d543ab07906ba0 -SIZE (php52-backports-security-20130717.patch) = 481057 -SHA256 (php-5.2.14-fpm-0.5.14-freebsd.patch.gz) = 354ce451417d14ef47761ae55147e9cee30fa0ff6f59447da021194c539f4d7f -SIZE (php-5.2.14-fpm-0.5.14-freebsd.patch.gz) = 43550 -SHA256 (suhosin-patch-5.2.16-0.9.7.patch.gz) = aae115a318d80b3f32cedf876e7a8e4b932febb1b0c743c0b398003ebe122f91 -SIZE (suhosin-patch-5.2.16-0.9.7.patch.gz) = 23069 -SHA256 (php-5.2.10-mail-header.patch) = a61d50540f4aae32390118453845c380fe935b6d1e46cef6819c8561946e942f -SIZE (php-5.2.10-mail-header.patch) = 3383 diff --git a/lang/php52/files/patch-TSRM_threads.m4 b/lang/php52/files/patch-TSRM_threads.m4 deleted file mode 100644 index 227f6d26c9d5..000000000000 --- a/lang/php52/files/patch-TSRM_threads.m4 +++ /dev/null @@ -1,11 +0,0 @@ ---- TSRM/threads.m4.orig 2005-04-27 15:22:18.000000000 +0200 -+++ TSRM/threads.m4 2009-09-22 10:01:37.000000000 +0200 -@@ -79,7 +79,7 @@ - pthread_mutexattr_t mattr; - int data = 1; - pthread_mutexattr_init(&mattr); -- return pthread_create(&thd, NULL, thread_routine, &data); -+ return 0; - } ], [ - pthreads_working=yes - ], [ diff --git a/lang/php52/files/patch-Zend::zend.h b/lang/php52/files/patch-Zend::zend.h deleted file mode 100644 index 49d678719636..000000000000 --- a/lang/php52/files/patch-Zend::zend.h +++ /dev/null @@ -1,11 +0,0 @@ ---- Zend/zend.h.orig Tue Nov 15 14:35:22 2005 -+++ Zend/zend.h Fri Nov 25 09:31:48 2005 -@@ -178,7 +178,7 @@ - #endif - - --#if (HAVE_ALLOCA || (defined (__GNUC__) && __GNUC__ >= 2)) && !(defined(ZTS) && defined(ZEND_WIN32)) && !(defined(ZTS) && defined(NETWARE)) && !(defined(ZTS) && defined(HPUX)) && !defined(DARWIN) -+#if (HAVE_ALLOCA || (defined (__GNUC__) && __GNUC__ >= 2)) && !(defined(ZTS) && defined(ZEND_WIN32)) && !(defined(ZTS) && defined(NETWARE)) && !(defined(ZTS) && defined(HPUX)) && !defined(DARWIN) && !(defined(ZTS) && defined(__FreeBSD__)) - # define do_alloca(p) alloca(p) - # define free_alloca(p) - #else diff --git a/lang/php52/files/patch-Zend_zend_list.c b/lang/php52/files/patch-Zend_zend_list.c deleted file mode 100644 index efa8862d1ce8..000000000000 --- a/lang/php52/files/patch-Zend_zend_list.c +++ /dev/null @@ -1,38 +0,0 @@ ---- Zend/zend_list.c.orig 2007-01-01 10:35:46.000000000 +0100 -+++ Zend/zend_list.c 2008-01-29 11:05:14.000000000 +0100 -@@ -48,7 +48,7 @@ - return index; - } - --ZEND_API int _zend_list_delete(int id TSRMLS_DC) -+ZEND_API int _zend_list_delete(ulong id TSRMLS_DC) - { - zend_rsrc_list_entry *le; - -@@ -65,7 +65,7 @@ - } - - --ZEND_API void *_zend_list_find(int id, int *type TSRMLS_DC) -+ZEND_API void *_zend_list_find(ulong id, int *type TSRMLS_DC) - { - zend_rsrc_list_entry *le; - -@@ -78,7 +78,7 @@ - } - } - --ZEND_API int _zend_list_addref(int id TSRMLS_DC) -+ZEND_API int _zend_list_addref(ulong id TSRMLS_DC) - { - zend_rsrc_list_entry *le; - -@@ -350,7 +350,7 @@ - } - - --char *zend_rsrc_list_get_rsrc_type(int resource TSRMLS_DC) -+char *zend_rsrc_list_get_rsrc_type(ulong resource TSRMLS_DC) - { - zend_rsrc_list_dtors_entry *lde; - int rsrc_type; diff --git a/lang/php52/files/patch-Zend_zend_list.h b/lang/php52/files/patch-Zend_zend_list.h deleted file mode 100644 index 308ac56b33b2..000000000000 --- a/lang/php52/files/patch-Zend_zend_list.h +++ /dev/null @@ -1,24 +0,0 @@ ---- Zend/zend_list.h.orig 2007-01-01 10:35:46.000000000 +0100 -+++ Zend/zend_list.h 2008-01-29 11:05:12.000000000 +0100 -@@ -71,9 +71,9 @@ - void zend_destroy_rsrc_list_dtors(void); - - ZEND_API int zend_list_insert(void *ptr, int type); --ZEND_API int _zend_list_addref(int id TSRMLS_DC); --ZEND_API int _zend_list_delete(int id TSRMLS_DC); --ZEND_API void *_zend_list_find(int id, int *type TSRMLS_DC); -+ZEND_API int _zend_list_addref(ulong id TSRMLS_DC); -+ZEND_API int _zend_list_delete(ulong id TSRMLS_DC); -+ZEND_API void *_zend_list_find(ulong id, int *type TSRMLS_DC); - - #define zend_list_addref(id) _zend_list_addref(id TSRMLS_CC) - #define zend_list_delete(id) _zend_list_delete(id TSRMLS_CC) -@@ -82,7 +82,7 @@ - ZEND_API int zend_register_resource(zval *rsrc_result, void *rsrc_pointer, int rsrc_type); - ZEND_API void *zend_fetch_resource(zval **passed_id TSRMLS_DC, int default_id, char *resource_type_name, int *found_resource_type, int num_resource_types, ...); - --ZEND_API char *zend_rsrc_list_get_rsrc_type(int resource TSRMLS_DC); -+ZEND_API char *zend_rsrc_list_get_rsrc_type(ulong resource TSRMLS_DC); - ZEND_API int zend_fetch_list_dtor_id(char *type_name); - - extern ZEND_API int le_index_ptr; /* list entry type for index pointers */ diff --git a/lang/php52/files/patch-acinclude.m4 b/lang/php52/files/patch-acinclude.m4 deleted file mode 100644 index 4f9a9462f947..000000000000 --- a/lang/php52/files/patch-acinclude.m4 +++ /dev/null @@ -1,53 +0,0 @@ ---- acinclude.m4.orig 2009-05-09 22:28:02.000000000 +0200 -+++ acinclude.m4 2009-06-25 08:08:05.000000000 +0200 -@@ -194,7 +194,7 @@ - dnl - dnl which array to append to? - AC_DEFUN([PHP_ADD_SOURCES],[ -- PHP_ADD_SOURCES_X($1, $2, $3, ifelse($4,cli,PHP_CLI_OBJS,ifelse($4,sapi,PHP_SAPI_OBJS,PHP_GLOBAL_OBJS))) -+ PHP_ADD_SOURCES_X($1, $2, $3, ifelse($4,cli,PHP_CLI_OBJS,ifelse($4,sapi,PHP_SAPI_OBJS,ifelse($4,cgi,PHP_CGI_OBJS,PHP_GLOBAL_OBJS)))) - ]) - - dnl -@@ -968,15 +968,8 @@ - if test "$3" != "shared" && test "$3" != "yes" && test "$4" = "cli"; then - dnl ---------------------------------------------- CLI static module - [PHP_]translit($1,a-z_-,A-Z__)[_SHARED]=no -- case "$PHP_SAPI" in -- cgi|embed[)] -- PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,) -- EXT_STATIC="$EXT_STATIC $1" -- ;; -- *[)] - PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,cli) -- ;; -- esac -+ PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,cgi) - EXT_CLI_STATIC="$EXT_CLI_STATIC $1" - fi - PHP_ADD_BUILD_DIR($ext_builddir) -@@ -1026,12 +1019,6 @@ - build to be successful. - ]) - fi -- if test "x$is_it_enabled" = "xno" && test "x$3" != "xtrue"; then -- AC_MSG_ERROR([ --You've configured extension $1, which depends on extension $2, --but you've either not enabled $2, or have disabled it. --]) -- fi - dnl Some systems require that we link $2 to $1 when building - ]) - -@@ -2303,9 +2290,9 @@ - test -z "$PHP_IMAP_SSL" && PHP_IMAP_SSL=no - - dnl Fallbacks for different configure options -- if test "$PHP_OPENSSL" != "no"; then -+ if test -n "$PHP_OPENSSL" && test "$PHP_OPENSSL" != "no"; then - PHP_OPENSSL_DIR=$PHP_OPENSSL -- elif test "$PHP_IMAP_SSL" != "no"; then -+ elif test -n "$PHP_IMAP_SSL" && test "$PHP_IMAP_SSL" != "no"; then - PHP_OPENSSL_DIR=$PHP_IMAP_SSL - fi - diff --git a/lang/php52/files/patch-configure.in b/lang/php52/files/patch-configure.in deleted file mode 100644 index f5f5c5a113c9..000000000000 --- a/lang/php52/files/patch-configure.in +++ /dev/null @@ -1,55 +0,0 @@ ---- configure.in.orig 2008-12-05 07:58:47.000000000 +0100 -+++ configure.in 2008-12-05 08:02:26.000000000 +0100 -@@ -270,7 +270,6 @@ - dnl . - dnl ------------------------------------------------------------------------- - --PTHREADS_CHECK - PHP_HELP_SEPARATOR([SAPI modules:]) - PHP_SHLIB_SUFFIX_NAMES - PHP_SAPI=default -@@ -295,7 +294,6 @@ - - if test "$enable_maintainer_zts" = "yes"; then - PTHREADS_ASSIGN_VARS -- PTHREADS_FLAGS - fi - - divert(3) -@@ -1136,7 +1134,7 @@ - EXPANDED_DATADIR=$datadir - EXPANDED_PHP_CONFIG_FILE_PATH=`eval echo "$PHP_CONFIG_FILE_PATH"` - EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=`eval echo "$PHP_CONFIG_FILE_SCAN_DIR"` --INCLUDE_PATH=.:$EXPANDED_PEAR_INSTALLDIR -+INCLUDE_PATH=.:${prefix}/share/pear - - exec_prefix=$old_exec_prefix - libdir=$old_libdir -@@ -1344,22 +1342,19 @@ - INLINE_CFLAGS="$INLINE_CFLAGS $standard_libtool_flag" - CXXFLAGS="$CXXFLAGS $standard_libtool_flag" - --all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_ZEND_EX) \$(PHP_CLI_TARGET)" --install_targets="$install_modules install-build install-headers install-programs $install_pear" -+all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_ZEND_EX) \$(PHP_CLI_TARGET) \$(PHP_CGI_TARGET)" -+install_targets="$PHP_INSTALL_CLI_TARGET $PHP_INSTALL_CGI_TARGET $install_modules install-build install-headers install-programs $install_pear" - - case $PHP_SAPI in -- cli) -- install_targets="$PHP_INSTALL_CLI_TARGET $install_targets" -- ;; -- *) -- install_targets="install-sapi $PHP_INSTALL_CLI_TARGET $install_targets" -+ apache|apache2handler) -+ install_targets="install-sapi $install_targets" - ;; - esac - - PHP_SUBST(all_targets) - PHP_SUBST(install_targets) - --PHP_INSTALL_HEADERS([Zend/ TSRM/ include/ main/ main/streams/ regex/]) -+PHP_INSTALL_HEADERS([Zend/ TSRM/ main/ main/streams/ regex/]) - - PHP_ADD_SOURCES(TSRM, TSRM.c tsrm_strtok_r.c tsrm_virtual_cwd.c) - diff --git a/lang/php52/files/patch-ext_standard_array.c b/lang/php52/files/patch-ext_standard_array.c deleted file mode 100644 index bd6d4d0c95d4..000000000000 --- a/lang/php52/files/patch-ext_standard_array.c +++ /dev/null @@ -1,33 +0,0 @@ ---- ext/standard/array.c.orig Mon Feb 12 20:20:48 2007 -+++ ext/standard/array.c Mon Feb 12 20:22:14 2007 -@@ -295,6 +295,7 @@ - PHP_FUNCTION(count) - { - zval *array; -+ zend_class_entry **ce_Countable; - long mode = COUNT_NORMAL; - - if (zend_parse_parameters (ZEND_NUM_ARGS() TSRMLS_CC, "z|l", &array, &mode) == FAILURE) -@@ -308,11 +309,11 @@ - RETURN_LONG (php_count_recursive (array, mode TSRMLS_CC)); - break; - case IS_OBJECT: { --#ifdef HAVE_SPL - /* it the object implements Countable we call its count() method */ - zval *retval; - -- if (Z_OBJ_HT_P(array)->get_class_entry && instanceof_function(Z_OBJCE_P(array), spl_ce_Countable TSRMLS_CC)) { -+ if (zend_lookup_class_ex("Countable", 9, 0, &ce_Countable TSRMLS_CC) != FAILURE) { -+ if (Z_OBJ_HT_P(array)->get_class_entry && instanceof_function(Z_OBJCE_P(array), *ce_Countable TSRMLS_CC)) { - zend_call_method_with_0_params(&array, NULL, NULL, "count", &retval); - if (retval) { - convert_to_long(retval); -@@ -321,7 +322,7 @@ - } - return; - } --#endif -+ } - /* if not we return the number of properties (not taking visibility into account) */ - if (Z_OBJ_HT_P(array)->count_elements) { - RETVAL_LONG(1); diff --git a/lang/php52/files/patch-ext_standard_basic_functions.c b/lang/php52/files/patch-ext_standard_basic_functions.c deleted file mode 100644 index 9ef6dd343cbf..000000000000 --- a/lang/php52/files/patch-ext_standard_basic_functions.c +++ /dev/null @@ -1,28 +0,0 @@ ---- ext/standard/basic_functions.c.orig 2008-06-09 14:06:40.000000000 +0200 -+++ ext/standard/basic_functions.c 2008-06-09 14:08:28.000000000 +0200 -@@ -87,6 +87,7 @@ - # include - #endif - -+#define HARTMUT_0 - #ifdef HARTMUT_0 - #include - #endif -@@ -3859,7 +3860,7 @@ - SetEnvironmentVariable(pe->key, "bugbug"); - #endif - putenv(pe->previous_value); --# if defined(PHP_WIN32) -+# if defined(PHP_WIN32) || __FreeBSD_version < 700050 - efree(pe->previous_value); - # endif - } else { -@@ -4461,7 +4462,7 @@ - pe.previous_value = NULL; - for (env = environ; env != NULL && *env != NULL; env++) { - if (!strncmp(*env, pe.key, pe.key_len) && (*env)[pe.key_len] == '=') { /* found it */ --#if defined(PHP_WIN32) -+#if defined(PHP_WIN32) || __FreeBSD_version < 700050 - /* must copy previous value because MSVCRT's putenv can free the string without notice */ - pe.previous_value = estrdup(*env); - #else diff --git a/lang/php52/files/patch-ext_standard_image.c b/lang/php52/files/patch-ext_standard_image.c deleted file mode 100644 index be29b54b2650..000000000000 --- a/lang/php52/files/patch-ext_standard_image.c +++ /dev/null @@ -1,50 +0,0 @@ ---- ext/standard/image.c.orig 2007-10-04 15:31:11.000000000 +0200 -+++ ext/standard/image.c 2007-11-13 22:47:04.000000000 +0100 -@@ -31,9 +31,7 @@ - #endif - #include "php_image.h" - --#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB) - #include "zlib.h" --#endif - - /* file type markers */ - PHPAPI const char php_sig_gif[3] = {'G', 'I', 'F'}; -@@ -80,9 +78,7 @@ - REGISTER_LONG_CONSTANT("IMAGETYPE_JP2", IMAGE_FILETYPE_JP2, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("IMAGETYPE_JPX", IMAGE_FILETYPE_JPX, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("IMAGETYPE_JB2", IMAGE_FILETYPE_JB2, CONST_CS | CONST_PERSISTENT); --#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB) - REGISTER_LONG_CONSTANT("IMAGETYPE_SWC", IMAGE_FILETYPE_SWC, CONST_CS | CONST_PERSISTENT); --#endif - REGISTER_LONG_CONSTANT("IMAGETYPE_IFF", IMAGE_FILETYPE_IFF, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("IMAGETYPE_WBMP", IMAGE_FILETYPE_WBMP, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("IMAGETYPE_JPEG2000",IMAGE_FILETYPE_JPC, CONST_CS | CONST_PERSISTENT); /* keep alias */ -@@ -184,7 +180,6 @@ - } - /* }}} */ - --#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB) - /* {{{ php_handle_swc - */ - static struct gfxinfo *php_handle_swc(php_stream * stream TSRMLS_DC) -@@ -255,7 +250,6 @@ - return result; - } - /* }}} */ --#endif - - /* {{{ php_handle_swf - */ -@@ -1314,11 +1308,7 @@ - result = php_handle_swf(stream TSRMLS_CC); - break; - case IMAGE_FILETYPE_SWC: --#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB) - result = php_handle_swc(stream TSRMLS_CC); --#else -- php_error_docref(NULL TSRMLS_CC, E_NOTICE, "The image is a compressed SWF file, but you do not have a static version of the zlib extension enabled"); --#endif - break; - case IMAGE_FILETYPE_PSD: - result = php_handle_psd(stream TSRMLS_CC); diff --git a/lang/php52/files/patch-ext_standard_php_dns.h b/lang/php52/files/patch-ext_standard_php_dns.h deleted file mode 100644 index 8ab9e9c01d38..000000000000 --- a/lang/php52/files/patch-ext_standard_php_dns.h +++ /dev/null @@ -1,13 +0,0 @@ ---- ext/standard/php_dns.h.orig Sun Jun 19 11:57:31 2005 -+++ ext/standard/php_dns.h Sun Jun 19 12:03:37 2005 -@@ -25,6 +25,10 @@ - - #if HAVE_RES_NMKQUERY && HAVE_RES_NSEND && HAVE_DN_EXPAND && HAVE_DN_SKIPNAME - #define HAVE_DNS_FUNCS 1 -+#define res_ninit __res_ninit -+#define res_nmkquery __res_nmkquery -+#define res_nsend __res_nsend -+#define res_nclose __res_nclose - #endif - - PHP_FUNCTION(gethostbyaddr); diff --git a/lang/php52/files/patch-main::php_config.h.in b/lang/php52/files/patch-main::php_config.h.in deleted file mode 100644 index 8e9938876421..000000000000 --- a/lang/php52/files/patch-main::php_config.h.in +++ /dev/null @@ -1,12 +0,0 @@ ---- main/php_config.h.in.orig Wed Jan 11 15:25:52 2006 -+++ main/php_config.h.in Wed May 3 09:38:09 2006 -@@ -2760,6 +2760,9 @@ - /* Define if uint32_t type is present. */ - #undef HAVE_UINT32_T - -+/* Include external shared modules configurations */ -+#include "ext/php_config.h" -+ - /* Whether sprintf is broken */ - #undef ZEND_BROKEN_SPRINTF - diff --git a/lang/php52/files/patch-php.ini-dist b/lang/php52/files/patch-php.ini-dist deleted file mode 100644 index 6d84f3a80891..000000000000 --- a/lang/php52/files/patch-php.ini-dist +++ /dev/null @@ -1,18 +0,0 @@ ---- php.ini-dist.orig Fri Dec 30 18:19:43 2005 -+++ php.ini-dist Mon Oct 16 08:12:28 2006 -@@ -165,6 +165,15 @@ - - ; Safe Mode - ; -+; SECURITY NOTE: The FreeBSD Security Officer strongly recommend that -+; the PHP Safe Mode feature not be relied upon for security, since the -+; issues Safe Mode tries to handle cannot properly be handled in PHP -+; (primarily due to PHP's use of external libraries). While many bugs -+; in Safe Mode has been fixed it's very likely that more issues exist -+; which allows a user to bypass Safe Mode restrictions. -+; For increased security we always recommend to install the Suhosin -+; extension. -+; - safe_mode = Off - - ; By default, Safe Mode does a UID compare check when diff --git a/lang/php52/files/patch-php.ini-recommended b/lang/php52/files/patch-php.ini-recommended deleted file mode 100644 index 7b648b1ea0b5..000000000000 --- a/lang/php52/files/patch-php.ini-recommended +++ /dev/null @@ -1,18 +0,0 @@ ---- php.ini-recommended.orig Fri Dec 30 18:19:43 2005 -+++ php.ini-recommended Mon Oct 16 08:13:05 2006 -@@ -223,6 +223,15 @@ - ; - ; Safe Mode - ; -+; SECURITY NOTE: The FreeBSD Security Officer strongly recommend that -+; the PHP Safe Mode feature not be relied upon for security, since the -+; issues Safe Mode tries to handle cannot properly be handled in PHP -+; (primarily due to PHP's use of external libraries). While many bugs -+; in Safe Mode has been fixed it's very likely that more issues exist -+; which allows a user to bypass Safe Mode restrictions. -+; For increased security we recommend to always install the Suhosin -+; extension. -+; - safe_mode = Off - - ; By default, Safe Mode does a UID compare check when diff --git a/lang/php52/files/patch-sapi-apache2handler_config.m4 b/lang/php52/files/patch-sapi-apache2handler_config.m4 deleted file mode 100644 index 70d9c7b73149..000000000000 --- a/lang/php52/files/patch-sapi-apache2handler_config.m4 +++ /dev/null @@ -1,15 +0,0 @@ - ---- sapi/apache2handler/config.m4.old 2010-03-18 14:52:27.000000000 +0000 -+++ sapi/apache2handler/config.m4 2010-03-18 14:52:56.000000000 +0000 -@@ -117,7 +117,7 @@ - ;; - esac - -- if test "$APXS_MPM" != "prefork"; then -+ if test "$APXS_MPM" != "itk" -a "$APXS_MPM" != "prefork"; then - PHP_BUILD_THREAD_SAFE - fi - AC_MSG_RESULT(yes) -~ - - diff --git a/lang/php52/files/patch-sapi_cgi_Makefile.frag b/lang/php52/files/patch-sapi_cgi_Makefile.frag deleted file mode 100644 index 26a0e4b1a3ba..000000000000 --- a/lang/php52/files/patch-sapi_cgi_Makefile.frag +++ /dev/null @@ -1,9 +0,0 @@ ---- sapi/cgi/Makefile.frag.orig Wed May 3 10:09:02 2006 -+++ sapi/cgi/Makefile.frag Wed May 3 10:08:54 2006 -@@ -1,2 +1,5 @@ --$(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) -+$(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_CGI_OBJS) - $(BUILD_CGI) -+ -+install-cgi: $(SAPI_CGI_PATH) -+ @$(INSTALL_CGI) diff --git a/lang/php52/files/patch-sapi_cgi_config9.m4 b/lang/php52/files/patch-sapi_cgi_config9.m4 deleted file mode 100644 index c40894155cc8..000000000000 --- a/lang/php52/files/patch-sapi_cgi_config9.m4 +++ /dev/null @@ -1,55 +0,0 @@ ---- sapi/cgi/config9.m4.orig Thu Jul 12 01:20:36 2007 -+++ sapi/cgi/config9.m4 Wed Sep 5 07:55:06 2007 -@@ -25,7 +25,6 @@ - dnl - dnl CGI setup - dnl --if test "$PHP_SAPI" = "default"; then - AC_MSG_CHECKING(whether to build CGI binary) - if test "$PHP_CGI" != "no"; then - AC_MSG_RESULT(yes) -@@ -85,8 +84,9 @@ - AC_MSG_RESULT($PHP_PATH_INFO_CHECK) - - dnl Set install target and select SAPI -- INSTALL_IT="@echo \"Installing PHP CGI binary: \$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php-cgi\$(program_suffix)\$(EXEEXT)" -- PHP_SELECT_SAPI(cgi, program, $PHP_FCGI_FILES cgi_main.c getopt.c,, '$(SAPI_CGI_PATH)') -+ INSTALL_CGI="@echo \"Installing PHP CGI binary: \$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php-cgi\$(program_suffix)\$(EXEEXT)" -+ PHP_ADD_SOURCES(sapi/cgi, $PHP_FCGI_FILES cgi_main.c getopt.c,, cgi) -+ PHP_ADD_SOURCES(/main, internal_functions.c,,cgi) - - case $host_alias in - *aix*) -@@ -96,17 +96,29 @@ - BUILD_CGI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_SAPI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)" - ;; - *) -- BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)" -+ BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CGI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)" - ;; - esac - -+ PHP_CGI_TARGET="\$(SAPI_CGI_PATH)" -+ PHP_INSTALL_CGI_TARGET="install-cgi" - PHP_SUBST(BUILD_CGI) -+ PHP_SUBST(INSTALL_CGI) -+ PHP_SUBST(PHP_CGI_OBJS) -+ PHP_SUBST(PHP_CGI_TARGET) -+ PHP_SUBST(PHP_INSTALL_CGI_TARGET) - -- elif test "$PHP_CLI" != "no"; then -- AC_MSG_RESULT(no) -+ if test "$PHP_SAPI" = "default" ; then -+ PHP_BUILD_PROGRAM($SAPI_CGI_PATH) -+ fi -+ else -+ AC_MSG_RESULT(no) -+ if test "$PHP_SAPI" = "default" ; then -+ if test "$PHP_CLI" != "no" ; then - OVERALL_TARGET= - PHP_SAPI=cli - else - AC_MSG_ERROR([No SAPIs selected.]) - fi -+ fi - fi diff --git a/lang/php52/files/patch-scripts::phpize.in b/lang/php52/files/patch-scripts::phpize.in deleted file mode 100644 index 532c098674ae..000000000000 --- a/lang/php52/files/patch-scripts::phpize.in +++ /dev/null @@ -1,13 +0,0 @@ ---- scripts/phpize.in.orig Mon Dec 12 12:51:45 2005 -+++ scripts/phpize.in Wed May 3 09:38:09 2006 -@@ -99,8 +99,8 @@ - - phpize_check_autotools() - { -- test -z "$PHP_AUTOCONF" && PHP_AUTOCONF=autoconf -- test -z "$PHP_AUTOHEADER" && PHP_AUTOHEADER=autoheader -+ test -z "$PHP_AUTOCONF" && PHP_AUTOCONF=%%AUTOCONF%% -+ test -z "$PHP_AUTOHEADER" && PHP_AUTOHEADER=%%AUTOHEADER%% - - if test ! -x "`$php_shtool path $PHP_AUTOCONF`"; then - cat < - - - - All relative paths in this config are relative to php's install prefix - -
- - Pid file - %%PHP_FPM_PID%% - - Error log file - %%PHP_FPM_LOG%% - - Log level - notice - - When this amount of php processes exited with SIGSEGV or SIGBUS ... - 10 - - ... in a less than this interval of time, a graceful restart will be initiated. - Useful to work around accidental curruptions in accelerator's shared memory. - 1m - - Time limit on waiting child's reaction on signals from master - 5s - - Set to 'no' to debug fpm - yes - -
- - - -
- - Name of pool. Used in logs and stats. - default - - Address to accept fastcgi requests on. - Valid syntax is 'ip.ad.re.ss:port' or just 'port' or '/path/to/unix/socket' - 127.0.0.1:9000 - - - - Set listen(2) backlog - -1 - - Set permissions for unix socket, if one used. - In Linux read/write permissions must be set in order to allow connections from web server. - Many BSD-derrived systems allow connections regardless of permissions. - %%PHP_FPM_UID%% - %%PHP_FPM_GID%% - 0666 - - - Additional php.ini defines, specific to this pool of workers. - - - - - - Unix user of processes - %%PHP_FPM_UID%% - - Unix group of processes - %%PHP_FPM_GID%% - - Process manager settings - - - Sets style of controling worker process count. - Valid values are 'static' and 'apache-like' - static - - Sets the limit on the number of simultaneous requests that will be served. - Equivalent to Apache MaxClients directive. - Equivalent to PHP_FCGI_CHILDREN environment in original php.fcgi - Used with any pm_style. - 5 - - Settings group for 'apache-like' pm style - - - Sets the number of server processes created on startup. - Used only when 'apache-like' pm_style is selected - 20 - - Sets the desired minimum number of idle server processes. - Used only when 'apache-like' pm_style is selected - 5 - - Sets the desired maximum number of idle server processes. - Used only when 'apache-like' pm_style is selected - 35 - - - - - - The timeout (in seconds) for serving a single request after which the worker process will be terminated - Should be used when 'max_execution_time' ini option does not stop script execution for some reason - '0s' means 'off' - 0s - - The timeout (in seconds) for serving of single request after which a php backtrace will be dumped to slow.log file - '0s' means 'off' - 0s - - The log file for slow requests - logs/slow.log - - Set open file desc rlimit - 1024 - - Set max core size rlimit - 0 - - Chroot to this directory at the start, absolute path - - - Chdir to this directory at the start, absolute path - - - Redirect workers' stdout and stderr into main error log. - If not set, they will be redirected to /dev/null, according to FastCGI specs - yes - - How much requests each process should execute before respawn. - Useful to work around memory leaks in 3rd party libraries. - For endless request processing please specify 0 - Equivalent to PHP_FCGI_MAX_REQUESTS - 500 - - Comma separated list of ipv4 addresses of FastCGI clients that allowed to connect. - Equivalent to FCGI_WEB_SERVER_ADDRS environment in original php.fcgi (5.2.2+) - Makes sense only with AF_INET listening socket. - 127.0.0.1 - - Pass environment variables like LD_LIBRARY_PATH - All $VARIABLEs are taken from current environment - - $HOSTNAME - /usr/local/bin:/usr/bin:/bin - /tmp - /tmp - /tmp - $OSTYPE - $MACHTYPE - 2 - - -
- - - - diff --git a/lang/php52/files/php-fpm.in b/lang/php52/files/php-fpm.in deleted file mode 100644 index ffa3234405ec..000000000000 --- a/lang/php52/files/php-fpm.in +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# PROVIDE: php-fpm -# REQUIRE: LOGIN -# BEFORE: securelevel -# KEYWORD: shutdown - -# Add the following lines to /etc/rc.conf to enable php-fpm: -# -# php_fpm_enable="YES" -# php_fpm_config="" -# - -. /etc/rc.subr - -name="php_fpm" -rcvar=php_fpm_enable - -extra_commands="reload logrotate" - -command="%%PREFIX%%/bin/php-cgi" -pidfile="%%PHP_FPM_PID%%" -reload_cmd="php_fpm_reload_cmd" -logrotate_cmd="php_fpm_logrotate_cmd" - -# read configuration and set defaults -load_rc_config "$name" -: ${php_fpm_enable="NO"} -: ${php_fpm_config="%%PREFIX%%/etc/php-fpm.conf"} - -required_files="${php_fpm_config}" -command_args="--fpm --fpm-config ${php_fpm_config}" - -php_fpm_reload_cmd () { - if [ -z "$rc_pid" ]; then - _run_rc_notrunning - return 1 - fi - echo "Reloading $name." - kill -USR2 $rc_pid -} - -php_fpm_logrotate_cmd () { - if [ -z "$rc_pid" ]; then - _run_rc_notrunning - return 1 - fi - echo "Rotating logs $name." - kill -USR1 $rc_pid -} - -run_rc_command "$1" diff --git a/lang/php52/pkg-descr b/lang/php52/pkg-descr deleted file mode 100644 index a53cdb1bde68..000000000000 --- a/lang/php52/pkg-descr +++ /dev/null @@ -1,8 +0,0 @@ -PHP, which stands for "PHP: Hypertext Preprocessor" is a widely-used Open -Source general-purpose scripting language that is especially suited for -Web development and can be embedded into HTML. Its syntax draws upon C, -Java, and Perl, and is easy to learn. The main goal of the language is to -allow web developers to write dynamically generated webpages quickly, but -you can do much more with PHP. - -WWW: http://www.php.net/ diff --git a/lang/php52/pkg-message.mod b/lang/php52/pkg-message.mod deleted file mode 100644 index 555f5b053ae8..000000000000 --- a/lang/php52/pkg-message.mod +++ /dev/null @@ -1,10 +0,0 @@ -*************************************************************** - -Make sure index.php is part of your DirectoryIndex. - -You should add the following to your Apache configuration file: - -AddType application/x-httpd-php .php -AddType application/x-httpd-php-source .phps - -*************************************************************** diff --git a/lang/php52/pkg-plist b/lang/php52/pkg-plist deleted file mode 100644 index a744f3cc2168..000000000000 --- a/lang/php52/pkg-plist +++ /dev/null @@ -1,216 +0,0 @@ -%%CLI%%bin/php -%%CGI%%bin/php-cgi -bin/php-config -bin/phpize -etc/php.conf -%%FPM%%@unexec if cmp -s %D/etc/php-fpm.conf %D/etc/php-fpm.conf.sample; then rm -f %D/etc/php-fpm.conf; fi -%%FPM%%etc/php-fpm.conf.sample -%%FPM%%@exec cp -n %D/%F %B/php-fpm.conf -etc/php.ini-dist -etc/php.ini-recommended -include/php/TSRM/TSRM.h -include/php/TSRM/acconfig.h -include/php/TSRM/readdir.h -include/php/TSRM/tsrm_config.h -include/php/TSRM/tsrm_config.w32.h -include/php/TSRM/tsrm_config_common.h -include/php/TSRM/tsrm_nw.h -include/php/TSRM/tsrm_strtok_r.h -include/php/TSRM/tsrm_virtual_cwd.h -include/php/TSRM/tsrm_win32.h -include/php/Zend/FlexLexer.h -include/php/Zend/acconfig.h -include/php/Zend/zend.h -include/php/Zend/zend_API.h -include/php/Zend/zend_alloc.h -include/php/Zend/zend_builtin_functions.h -include/php/Zend/zend_compile.h -include/php/Zend/zend_config.h -include/php/Zend/zend_config.nw.h -include/php/Zend/zend_config.w32.h -include/php/Zend/zend_constants.h -include/php/Zend/zend_dynamic_array.h -include/php/Zend/zend_errors.h -include/php/Zend/zend_exceptions.h -include/php/Zend/zend_execute.h -include/php/Zend/zend_extensions.h -include/php/Zend/zend_fast_cache.h -include/php/Zend/zend_globals.h -include/php/Zend/zend_globals_macros.h -include/php/Zend/zend_hash.h -include/php/Zend/zend_highlight.h -include/php/Zend/zend_indent.h -include/php/Zend/zend_ini.h -include/php/Zend/zend_ini_parser.h -include/php/Zend/zend_ini_scanner.h -include/php/Zend/zend_interfaces.h -include/php/Zend/zend_istdiostream.h -include/php/Zend/zend_iterators.h -include/php/Zend/zend_language_parser.h -include/php/Zend/zend_language_scanner.h -include/php/Zend/zend_list.h -include/php/Zend/zend_llist.h -include/php/Zend/zend_modules.h -include/php/Zend/zend_multibyte.h -include/php/Zend/zend_multiply.h -include/php/Zend/zend_object_handlers.h -include/php/Zend/zend_objects.h -include/php/Zend/zend_objects_API.h -include/php/Zend/zend_operators.h -include/php/Zend/zend_ptr_stack.h -include/php/Zend/zend_qsort.h -include/php/Zend/zend_stack.h -include/php/Zend/zend_static_allocator.h -include/php/Zend/zend_stream.h -include/php/Zend/zend_strtod.h -include/php/Zend/zend_ts_hash.h -include/php/Zend/zend_types.h -include/php/Zend/zend_variables.h -include/php/Zend/zend_vm.h -include/php/Zend/zend_vm_def.h -include/php/Zend/zend_vm_execute.h -include/php/Zend/zend_vm_opcodes.h -include/php/ext/date/lib/timelib.h -include/php/ext/date/lib/timelib_config.h -include/php/ext/date/lib/timelib_structs.h -include/php/ext/date/php_date.h -include/php/ext/libxml/php_libxml.h -include/php/ext/standard/base64.h -include/php/ext/standard/basic_functions.h -include/php/ext/standard/crc32.h -include/php/ext/standard/credits.h -include/php/ext/standard/credits_ext.h -include/php/ext/standard/credits_sapi.h -include/php/ext/standard/css.h -include/php/ext/standard/cyr_convert.h -include/php/ext/standard/datetime.h -include/php/ext/standard/dl.h -include/php/ext/standard/exec.h -include/php/ext/standard/file.h -include/php/ext/standard/flock_compat.h -include/php/ext/standard/fsock.h -include/php/ext/standard/head.h -include/php/ext/standard/html.h -include/php/ext/standard/info.h -include/php/ext/standard/md5.h -include/php/ext/standard/microtime.h -include/php/ext/standard/pack.h -include/php/ext/standard/pageinfo.h -include/php/ext/standard/php_array.h -include/php/ext/standard/php_assert.h -include/php/ext/standard/php_browscap.h -include/php/ext/standard/php_crypt.h -include/php/ext/standard/php_dir.h -include/php/ext/standard/php_dns.h -include/php/ext/standard/php_ext_syslog.h -include/php/ext/standard/php_filestat.h -include/php/ext/standard/php_fopen_wrappers.h -include/php/ext/standard/php_ftok.h -include/php/ext/standard/php_http.h -include/php/ext/standard/php_image.h -include/php/ext/standard/php_incomplete_class.h -include/php/ext/standard/php_iptc.h -include/php/ext/standard/php_lcg.h -include/php/ext/standard/php_link.h -include/php/ext/standard/php_mail.h -include/php/ext/standard/php_math.h -include/php/ext/standard/php_metaphone.h -include/php/ext/standard/php_rand.h -include/php/ext/standard/php_smart_str.h -include/php/ext/standard/php_smart_str_public.h -include/php/ext/standard/php_standard.h -include/php/ext/standard/php_string.h -include/php/ext/standard/php_type.h -include/php/ext/standard/php_uuencode.h -include/php/ext/standard/php_var.h -include/php/ext/standard/php_versioning.h -include/php/ext/standard/proc_open.h -include/php/ext/standard/quot_print.h -include/php/ext/standard/reg.h -include/php/ext/standard/scanf.h -include/php/ext/standard/sha1.h -include/php/ext/standard/streamsfuncs.h -include/php/ext/standard/uniqid.h -include/php/ext/standard/url.h -include/php/ext/standard/url_scanner_ex.h -@exec touch %D/include/php/ext/php_config.h -@unexec [ -s %D/include/php/ext/php_config.h ] || rm %D/include/php/ext/php_config.h -include/php/main/SAPI.h -include/php/main/build-defs.h -include/php/main/config.w32.h -include/php/main/fopen_wrappers.h -include/php/main/logos.h -include/php/main/php.h -include/php/main/php3_compat.h -include/php/main/php_compat.h -include/php/main/php_config.h -include/php/main/php_content_types.h -include/php/main/php_globals.h -include/php/main/php_ini.h -include/php/main/php_logos.h -include/php/main/php_main.h -include/php/main/php_memory_streams.h -include/php/main/php_network.h -include/php/main/php_open_temporary_file.h -include/php/main/php_output.h -include/php/main/php_reentrancy.h -include/php/main/php_regex.h -include/php/main/php_scandir.h -include/php/main/php_streams.h -include/php/main/php_syslog.h -include/php/main/php_ticks.h -include/php/main/php_variables.h -include/php/main/php_version.h -include/php/main/rfc1867.h -include/php/main/safe_mode.h -include/php/main/snprintf.h -include/php/main/spprintf.h -include/php/main/streams/php_stream_context.h -include/php/main/streams/php_stream_filter_api.h -include/php/main/streams/php_stream_mmap.h -include/php/main/streams/php_streams_int.h -include/php/main/streams/php_stream_transport.h -include/php/main/streams/php_stream_userspace.h -include/php/main/streams/php_stream_plain_wrapper.h -%%SUHOSIN%%include/php/main/suhosin_globals.h -%%SUHOSIN%%include/php/main/suhosin_logo.h -%%SUHOSIN%%include/php/main/suhosin_patch.h -include/php/main/win95nt.h -include/php/regex/cclass.h -include/php/regex/cname.h -include/php/regex/regex.h -include/php/regex/regex2.h -include/php/regex/regex_extra.h -include/php/regex/utils.h -lib/php/build/Makefile.global -lib/php/build/acinclude.m4 -lib/php/build/config.guess -lib/php/build/config.sub -lib/php/build/libtool.m4 -lib/php/build/ltmain.sh -lib/php/build/mkdep.awk -lib/php/build/phpize.m4 -lib/php/build/run-tests.php -lib/php/build/scan_makefile_in.awk -lib/php/build/shtool -%%APACHE%%%%APACHEMODDIR%%/%%AP_MODULE%% -%%APACHE%%@exec %D/sbin/apxs -e -a -n %%AP_NAME%% %f -%%APACHE%%@unexec %D/sbin/apxs -e -A -n %%AP_NAME%% %f -@dirrm include/php/TSRM -@dirrm include/php/Zend -@dirrm include/php/ext/date/lib -@dirrm include/php/ext/date -@dirrm include/php/ext/libxml -@dirrm include/php/ext/standard -@dirrmtry include/php/ext -@dirrm include/php/main/streams -@dirrm include/php/main -@dirrm include/php/regex -@dirrmtry include/php -@dirrm lib/php/build -@dirrmtry lib/php -%%FPM%%@cwd / -%%FPM%%@exec mkdir -p `dirname %%PHP_FPM_PID%%` -%%FPM%%@exec mkdir -p `dirname %%PHP_FPM_LOG%%` -%%FPM%%@dirrmtry `dirname %%PHP_FPM_PID%%` -%%FPM%%@dirrmtry `dirname %%PHP_FPM_LOG%%` diff --git a/mail/Makefile b/mail/Makefile index 4745644caa16..dd9183f4ac22 100644 --- a/mail/Makefile +++ b/mail/Makefile @@ -485,7 +485,6 @@ SUBDIR += pfqueue SUBDIR += pgpsendmail SUBDIR += php5-imap - SUBDIR += php52-imap SUBDIR += php53-imap SUBDIR += php55-imap SUBDIR += phplist diff --git a/mail/php52-imap/Makefile b/mail/php52-imap/Makefile deleted file mode 100644 index dd197a64cc33..000000000000 --- a/mail/php52-imap/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Alex Keda -# $FreeBSD$ - -CATEGORIES= mail - -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -imap - -NO_STAGE= yes -.include "${MASTERDIR}/Makefile" diff --git a/math/Makefile b/math/Makefile index 068e63c4300e..c2efc82dea96 100644 --- a/math/Makefile +++ b/math/Makefile @@ -526,8 +526,6 @@ SUBDIR += petsc SUBDIR += php5-bcmath SUBDIR += php5-gmp - SUBDIR += php52-bcmath - SUBDIR += php52-gmp SUBDIR += php53-bcmath SUBDIR += php53-gmp SUBDIR += php55-bcmath diff --git a/math/php52-bcmath/Makefile b/math/php52-bcmath/Makefile deleted file mode 100644 index 32222dcf7297..000000000000 --- a/math/php52-bcmath/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Alex Keda -# $FreeBSD$ - -CATEGORIES= math - -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -bcmath - -NO_STAGE= yes -.include "${MASTERDIR}/Makefile" diff --git a/math/php52-gmp/Makefile b/math/php52-gmp/Makefile deleted file mode 100644 index 2611be50f1dd..000000000000 --- a/math/php52-gmp/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Alex Keda -# $FreeBSD$ - -CATEGORIES= math - -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -gmp - -NO_STAGE= yes -.include "${MASTERDIR}/Makefile" diff --git a/math/php52-gmp/files/patch-gmp.c b/math/php52-gmp/files/patch-gmp.c deleted file mode 100644 index 74b95c01878d..000000000000 --- a/math/php52-gmp/files/patch-gmp.c +++ /dev/null @@ -1,11 +0,0 @@ ---- ext/gmp/gmp.c.orig 2010-04-21 22:00:31.841602968 +0000 -+++ ext/gmp/gmp.c 2010-04-21 22:00:46.412804473 +0000 -@@ -1396,7 +1396,7 @@ - - GMPG(rand_initialized) = 1; - } -- mpz_urandomb(*gmpnum_result, GMPG(rand_state), GMP_ABS (limiter) * __GMP_BITS_PER_MP_LIMB); -+ mpz_urandomb(*gmpnum_result, GMPG(rand_state), GMP_ABS (limiter) * GMP_LIMB_BITS); - - ZEND_REGISTER_RESOURCE(return_value, gmpnum_result, le_gmp); - } diff --git a/misc/Makefile b/misc/Makefile index 5d9f0f7a1ad2..6f43875655be 100644 --- a/misc/Makefile +++ b/misc/Makefile @@ -363,7 +363,6 @@ SUBDIR += pear-Text_Figlet SUBDIR += pecl-timezonedb SUBDIR += php5-calendar - SUBDIR += php52-calendar SUBDIR += php53-calendar SUBDIR += php55-calendar SUBDIR += phraze diff --git a/misc/php52-calendar/Makefile b/misc/php52-calendar/Makefile deleted file mode 100644 index ee3d1946677a..000000000000 --- a/misc/php52-calendar/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Alex Keda -# $FreeBSD$ - -CATEGORIES= misc - -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -calendar - -NO_STAGE= yes -.include "${MASTERDIR}/Makefile" diff --git a/net-mgmt/Makefile b/net-mgmt/Makefile index 9326b089e14e..222957a4484e 100644 --- a/net-mgmt/Makefile +++ b/net-mgmt/Makefile @@ -257,7 +257,6 @@ SUBDIR += percona-monitoring-plugins SUBDIR += pftabled SUBDIR += php5-snmp - SUBDIR += php52-snmp SUBDIR += php53-snmp SUBDIR += php55-snmp SUBDIR += phpip diff --git a/net-mgmt/php52-snmp/Makefile b/net-mgmt/php52-snmp/Makefile deleted file mode 100644 index d01894def0dc..000000000000 --- a/net-mgmt/php52-snmp/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Alex Keda -# $FreeBSD$ - -CATEGORIES= net-mgmt - -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -snmp - -NO_STAGE= yes -.include "${MASTERDIR}/Makefile" diff --git a/net/Makefile b/net/Makefile index 879683feb574..bc1be821abdb 100644 --- a/net/Makefile +++ b/net/Makefile @@ -869,10 +869,6 @@ SUBDIR += php5-soap SUBDIR += php5-sockets SUBDIR += php5-xmlrpc - SUBDIR += php52-ldap - SUBDIR += php52-soap - SUBDIR += php52-sockets - SUBDIR += php52-xmlrpc SUBDIR += php53-ldap SUBDIR += php53-soap SUBDIR += php53-sockets diff --git a/net/php52-ldap/Makefile b/net/php52-ldap/Makefile deleted file mode 100644 index 92b633f34ad9..000000000000 --- a/net/php52-ldap/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Alex Keda -# $FreeBSD$ - -CATEGORIES= net - -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -ldap - -NO_STAGE= yes -.include "${MASTERDIR}/Makefile" diff --git a/net/php52-soap/Makefile b/net/php52-soap/Makefile deleted file mode 100644 index 9a689879b877..000000000000 --- a/net/php52-soap/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Alex Keda -# $FreeBSD$ - -CATEGORIES= net - -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -soap - -NO_STAGE= yes -.include "${MASTERDIR}/Makefile" diff --git a/net/php52-soap/files/patch-soap.c b/net/php52-soap/files/patch-soap.c deleted file mode 100644 index 924bb3bf7405..000000000000 --- a/net/php52-soap/files/patch-soap.c +++ /dev/null @@ -1,56 +0,0 @@ ---- ext/soap/soap.c.orig Tue Oct 3 21:51:01 2006 -+++ ext/soap/soap.c Sat Nov 4 11:38:29 2006 -@@ -23,7 +23,7 @@ - #include "config.h" - #endif - #include "php_soap.h" --#if HAVE_PHP_SESSION && !defined(COMPILE_DL_SESSION) -+#if HAVE_PHP_SESSION - #include "ext/session/php_session.h" - #endif - #ifdef ZEND_ENGINE_2 -@@ -1577,7 +1577,7 @@ - soap_obj = service->soap_object; - function_table = &((Z_OBJCE_P(soap_obj))->function_table); - } else if (service->type == SOAP_CLASS) { --#if HAVE_PHP_SESSION && !defined(COMPILE_DL_SESSION) -+#if HAVE_PHP_SESSION - /* If persistent then set soap_obj from from the previous created session (if available) */ - if (service->soap_class.persistance == SOAP_PERSISTENCE_SESSION) { - zval **tmp_soap; -@@ -1664,7 +1664,7 @@ - } - efree(class_name); - } --#if HAVE_PHP_SESSION && !defined(COMPILE_DL_SESSION) -+#if HAVE_PHP_SESSION - /* If session then update session hash with new object */ - if (service->soap_class.persistance == SOAP_PERSISTENCE_SESSION) { - zval **tmp_soap_pp; -@@ -1762,7 +1762,7 @@ - if (service->type == SOAP_CLASS || service->type == SOAP_OBJECT) { - call_status = call_user_function(NULL, &soap_obj, &function_name, &retval, num_params, params TSRMLS_CC); - if (service->type == SOAP_CLASS) { --#if HAVE_PHP_SESSION && !defined(COMPILE_DL_SESSION) -+#if HAVE_PHP_SESSION - if (service->soap_class.persistance != SOAP_PERSISTENCE_SESSION) { - zval_ptr_dtor(&soap_obj); - soap_obj = NULL; -@@ -1788,7 +1788,7 @@ - soap_server_fault_ex(function, EG(exception), NULL TSRMLS_CC); - } - if (service->type == SOAP_CLASS) { --#if HAVE_PHP_SESSION && !defined(COMPILE_DL_SESSION) -+#if HAVE_PHP_SESSION - if (soap_obj && service->soap_class.persistance != SOAP_PERSISTENCE_SESSION) { - #else - if (soap_obj) { -@@ -1830,7 +1830,7 @@ - soap_server_fault_ex(function, EG(exception), NULL TSRMLS_CC); - } - if (service->type == SOAP_CLASS) { --#if HAVE_PHP_SESSION && !defined(COMPILE_DL_SESSION) -+#if HAVE_PHP_SESSION - if (soap_obj && service->soap_class.persistance != SOAP_PERSISTENCE_SESSION) { - #else - if (soap_obj) { diff --git a/net/php52-sockets/Makefile b/net/php52-sockets/Makefile deleted file mode 100644 index 4e8ddc8d6979..000000000000 --- a/net/php52-sockets/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Alex Keda -# $FreeBSD$ - -CATEGORIES= net - -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -sockets - -NO_STAGE= yes -.include "${MASTERDIR}/Makefile" diff --git a/net/php52-xmlrpc/Makefile b/net/php52-xmlrpc/Makefile deleted file mode 100644 index 0d59fa73fe46..000000000000 --- a/net/php52-xmlrpc/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Alex Keda -# $FreeBSD$ - -CATEGORIES= net - -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -xmlrpc - -NO_STAGE= yes -.include "${MASTERDIR}/Makefile" diff --git a/security/Makefile b/security/Makefile index 669a89e03dd9..1d1c1c09e6bb 100644 --- a/security/Makefile +++ b/security/Makefile @@ -691,11 +691,6 @@ SUBDIR += php5-hash SUBDIR += php5-mcrypt SUBDIR += php5-openssl - SUBDIR += php52-filter - SUBDIR += php52-hash - SUBDIR += php52-mcrypt - SUBDIR += php52-mhash - SUBDIR += php52-openssl SUBDIR += php53-filter SUBDIR += php53-hash SUBDIR += php53-mcrypt diff --git a/security/php52-filter/Makefile b/security/php52-filter/Makefile deleted file mode 100644 index 3ccd05532aa0..000000000000 --- a/security/php52-filter/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Alex Keda -# $FreeBSD$ - -CATEGORIES= security - -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -filter - -NO_STAGE= yes -.include "${MASTERDIR}/Makefile" diff --git a/security/php52-filter/files/patch-config.m4 b/security/php52-filter/files/patch-config.m4 deleted file mode 100644 index 7037298bc08f..000000000000 --- a/security/php52-filter/files/patch-config.m4 +++ /dev/null @@ -1,25 +0,0 @@ ---- ext/filter/config.m4.orig 2009-03-06 08:25:45.000000000 +0100 -+++ ext/filter/config.m4 2009-03-06 08:28:10.000000000 +0100 -@@ -19,7 +19,7 @@ - CPPFLAGS=$INCLUDES - AC_EGREP_CPP(yes,[ - #include
--#if defined(HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE) -+#if defined(HAVE_BUNDLED_PCRE) - yes - #endif - ],[ -@@ -27,11 +27,12 @@ - ],[ - AC_EGREP_CPP(yes,[ - #include
--#if defined(HAVE_PCRE) && !defined(COMPILE_DL_PCRE) -+#if defined(HAVE_PCRE) - yes - #endif - ],[ - PHP_PCRE_REGEX=pecl -+ PHP_ADD_INCLUDE($PHP_PCRE_DIR/include) - ],[ - PHP_PCRE_REGEX=no - ]) diff --git a/security/php52-hash/Makefile b/security/php52-hash/Makefile deleted file mode 100644 index 186603e6418e..000000000000 --- a/security/php52-hash/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Alex Keda -# $FreeBSD$ - -CATEGORIES= security - -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -hash - -NO_STAGE= yes -.include "${MASTERDIR}/Makefile" diff --git a/security/php52-mcrypt/Makefile b/security/php52-mcrypt/Makefile deleted file mode 100644 index a97732770b38..000000000000 --- a/security/php52-mcrypt/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Alex Keda -# $FreeBSD$ - -CATEGORIES= security - -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -mcrypt - -NO_STAGE= yes -.include "${MASTERDIR}/Makefile" diff --git a/security/php52-mhash/Makefile b/security/php52-mhash/Makefile deleted file mode 100644 index 732d3838a20c..000000000000 --- a/security/php52-mhash/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Alex Keda -# $FreeBSD$ - -CATEGORIES= security - -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -mhash - -NO_STAGE= yes -.include "${MASTERDIR}/Makefile" diff --git a/security/php52-openssl/Makefile b/security/php52-openssl/Makefile deleted file mode 100644 index 56135bae820b..000000000000 --- a/security/php52-openssl/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Alex Keda -# $FreeBSD$ - -CATEGORIES= security - -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -openssl - -NO_STAGE= yes -.include "${MASTERDIR}/Makefile" diff --git a/sysutils/Makefile b/sysutils/Makefile index 6aee7d36640c..bf0ab5f93c3e 100644 --- a/sysutils/Makefile +++ b/sysutils/Makefile @@ -678,7 +678,6 @@ SUBDIR += pear-I18Nv2 SUBDIR += pear-Log SUBDIR += pear-Translation2 - SUBDIR += pecl-fileinfo SUBDIR += pecl-mogilefs SUBDIR += pecl-proctitle SUBDIR += pefs-kmod @@ -692,7 +691,6 @@ SUBDIR += philesight SUBDIR += php5-fileinfo SUBDIR += php5-posix - SUBDIR += php52-posix SUBDIR += php53-fileinfo SUBDIR += php53-posix SUBDIR += php55-fileinfo diff --git a/sysutils/pecl-fileinfo/Makefile b/sysutils/pecl-fileinfo/Makefile deleted file mode 100644 index f1d8df2605a4..000000000000 --- a/sysutils/pecl-fileinfo/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# Created by: Alex Dupre -# $FreeBSD$ - -PORTNAME= fileinfo -PORTVERSION= 1.0.4 -CATEGORIES= sysutils pear -MASTER_SITES= http://pecl.php.net/get/ -PKGNAMEPREFIX= pecl- -DISTNAME= Fileinfo-${PORTVERSION} -EXTRACT_SUFX= .tgz -DIST_SUBDIR= PECL - -MAINTAINER= ale@FreeBSD.org -COMMENT= A PECL extension to retrieve info about files - -USE_PHP= yes -USE_PHPEXT= yes -DEFAULT_PHP_VER=52 -IGNORE_WITH_PHP=5 53 - -CONFIGURE_ARGS= --with-fileinfo=/usr - -.include diff --git a/sysutils/pecl-fileinfo/distinfo b/sysutils/pecl-fileinfo/distinfo deleted file mode 100644 index 006e81c0123f..000000000000 --- a/sysutils/pecl-fileinfo/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (PECL/Fileinfo-1.0.4.tgz) = df35ee00fce6483c58b2f37dbded33831ba84fdae92829dbe03f7331bec0aa3f -SIZE (PECL/Fileinfo-1.0.4.tgz) = 5835 diff --git a/sysutils/pecl-fileinfo/pkg-descr b/sysutils/pecl-fileinfo/pkg-descr deleted file mode 100644 index 3943ede7db9d..000000000000 --- a/sysutils/pecl-fileinfo/pkg-descr +++ /dev/null @@ -1,8 +0,0 @@ -The Fileinfo extension allows retrieval of information regarding -vast majority of file. -This information may include dimensions, quality, length etc... - -Additionally it can also be used to retrieve the mime type for a -particular file and for text files proper language encoding. - -WWW: http://pecl.php.net/package/Fileinfo/ diff --git a/sysutils/php52-posix/Makefile b/sysutils/php52-posix/Makefile deleted file mode 100644 index 7ca6d5b7ef97..000000000000 --- a/sysutils/php52-posix/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Alex Keda -# $FreeBSD$ - -CATEGORIES= sysutils - -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -posix - -NO_STAGE= yes -.include "${MASTERDIR}/Makefile" diff --git a/sysutils/php52-posix/files/patch-posix.c b/sysutils/php52-posix/files/patch-posix.c deleted file mode 100644 index a5b3bd1109f5..000000000000 --- a/sysutils/php52-posix/files/patch-posix.c +++ /dev/null @@ -1,38 +0,0 @@ ---- ext/posix/posix.c.orig Fri Feb 23 00:40:39 2007 -+++ ext/posix/posix.c Sun May 13 17:52:27 2007 -@@ -838,7 +838,7 @@ - #if defined(ZTS) && defined(HAVE_GETGRNAM_R) && defined(_SC_GETGR_R_SIZE_MAX) - buflen = sysconf(_SC_GETGR_R_SIZE_MAX); - if (buflen < 1) { -- RETURN_FALSE; -+ buflen = 1024; - } - buf = emalloc(buflen); - g = &gbuf; -@@ -888,7 +888,7 @@ - - grbuflen = sysconf(_SC_GETGR_R_SIZE_MAX); - if (grbuflen < 1) { -- RETURN_FALSE; -+ grbuflen = 1024; - } - - grbuf = emalloc(grbuflen); -@@ -955,7 +955,7 @@ - #if defined(ZTS) && defined(_SC_GETPW_R_SIZE_MAX) && defined(HAVE_GETPWNAM_R) - buflen = sysconf(_SC_GETPW_R_SIZE_MAX); - if (buflen < 1) { -- RETURN_FALSE; -+ buflen = 1024; - } - buf = emalloc(buflen); - pw = &pwbuf; -@@ -1004,7 +1004,7 @@ - #if defined(ZTS) && defined(_SC_GETPW_R_SIZE_MAX) && defined(HAVE_GETPWUID_R) - pwbuflen = sysconf(_SC_GETPW_R_SIZE_MAX); - if (pwbuflen < 1) { -- RETURN_FALSE; -+ pwbuflen = 1024; - } - pwbuf = emalloc(pwbuflen); - diff --git a/textproc/Makefile b/textproc/Makefile index fd3d95c51118..44d399e8dd07 100644 --- a/textproc/Makefile +++ b/textproc/Makefile @@ -1092,15 +1092,6 @@ SUBDIR += php5-xmlreader SUBDIR += php5-xmlwriter SUBDIR += php5-xsl - SUBDIR += php52-ctype - SUBDIR += php52-dom - SUBDIR += php52-pspell - SUBDIR += php52-simplexml - SUBDIR += php52-wddx - SUBDIR += php52-xml - SUBDIR += php52-xmlreader - SUBDIR += php52-xmlwriter - SUBDIR += php52-xsl SUBDIR += php53-ctype SUBDIR += php53-dom SUBDIR += php53-pspell diff --git a/textproc/php52-ctype/Makefile b/textproc/php52-ctype/Makefile deleted file mode 100644 index 00e730d8b590..000000000000 --- a/textproc/php52-ctype/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Alex Keda -# $FreeBSD$ - -CATEGORIES= textproc - -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -ctype - -NO_STAGE= yes -.include "${MASTERDIR}/Makefile" diff --git a/textproc/php52-dom/Makefile b/textproc/php52-dom/Makefile deleted file mode 100644 index 524578e3c625..000000000000 --- a/textproc/php52-dom/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Alex Keda -# $FreeBSD$ - -CATEGORIES= textproc - -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -dom - -NO_STAGE= yes -.include "${MASTERDIR}/Makefile" diff --git a/textproc/php52-pspell/Makefile b/textproc/php52-pspell/Makefile deleted file mode 100644 index fabb80b596e9..000000000000 --- a/textproc/php52-pspell/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Alex Keda -# $FreeBSD$ - -CATEGORIES= textproc - -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -pspell - -NO_STAGE= yes -.include "${MASTERDIR}/Makefile" diff --git a/textproc/php52-simplexml/Makefile b/textproc/php52-simplexml/Makefile deleted file mode 100644 index 163f3f055072..000000000000 --- a/textproc/php52-simplexml/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Alex Keda -# $FreeBSD$ - -CATEGORIES= textproc - -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -simplexml - -NO_STAGE= yes -.include "${MASTERDIR}/Makefile" diff --git a/textproc/php52-wddx/Makefile b/textproc/php52-wddx/Makefile deleted file mode 100644 index 63530b340007..000000000000 --- a/textproc/php52-wddx/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Alex Keda -# $FreeBSD$ - -CATEGORIES= textproc - -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -wddx - -NO_STAGE= yes -.include "${MASTERDIR}/Makefile" diff --git a/textproc/php52-wddx/files/patch-config.m4 b/textproc/php52-wddx/files/patch-config.m4 deleted file mode 100644 index a2e1cfb18d8a..000000000000 --- a/textproc/php52-wddx/files/patch-config.m4 +++ /dev/null @@ -1,22 +0,0 @@ ---- ext/wddx/config.m4.orig Mon Jul 26 09:05:10 2004 -+++ ext/wddx/config.m4 Mon Jul 26 09:07:46 2004 -@@ -5,6 +5,9 @@ - PHP_ARG_ENABLE(wddx,whether to enable WDDX support, - [ --enable-wddx Enable WDDX support.]) - -+PHP_ARG_WITH(libxml-dir, libxml2 install dir, -+[ --with-libxml-dir= WDDX: libxml2 install prefix], no, no) -+ - if test "$PHP_WDDX" != "no"; then - if test "$ext_shared" != "yes" && test "$enable_xml" = "no"; then - AC_MSG_WARN(Activating XML) -@@ -12,4 +15,9 @@ - fi - AC_DEFINE(HAVE_WDDX, 1, [ ]) - PHP_NEW_EXTENSION(wddx, wddx.c, $ext_shared) -+ -+ PHP_SETUP_LIBXML(WDDX_SHARED_LIBADD, [ -+ ], [ -+ AC_MSG_ERROR([xml2-config not found. Please check your libxml2 installation.]) -+ ]) - fi diff --git a/textproc/php52-wddx/files/patch-wddx.c b/textproc/php52-wddx/files/patch-wddx.c deleted file mode 100644 index c76939ae2edf..000000000000 --- a/textproc/php52-wddx/files/patch-wddx.c +++ /dev/null @@ -1,40 +0,0 @@ ---- ext/wddx/wddx.c.orig Sun Jan 1 13:50:16 2006 -+++ ext/wddx/wddx.c Mon Jan 16 12:56:21 2006 -@@ -18,6 +18,10 @@ - - /* $Id: wddx.c,v 1.119.2.8 2006/01/01 12:50:16 sniper Exp $ */ - -+#ifdef HAVE_CONFIG_H -+# include "config.h" -+#endif -+ - #include "php.h" - - #if HAVE_WDDX -@@ -223,7 +227,7 @@ - - #include "ext/session/php_session.h" - --#if HAVE_PHP_SESSION && !defined(COMPILE_DL_SESSION) -+#if HAVE_PHP_SESSION - /* {{{ PS_SERIALIZER_ENCODE_FUNC - */ - PS_SERIALIZER_ENCODE_FUNC(wddx) -@@ -302,7 +306,7 @@ - { - le_wddx = zend_register_list_destructors_ex(release_wddx_packet_rsrc, NULL, "wddx", module_number); - --#if HAVE_PHP_SESSION && !defined(COMPILE_DL_SESSION) -+#if HAVE_PHP_SESSION - php_session_register_serializer("wddx", - PS_SERIALIZER_ENCODE_NAME(wddx), - PS_SERIALIZER_DECODE_NAME(wddx)); -@@ -317,7 +321,7 @@ - PHP_MINFO_FUNCTION(wddx) - { - php_info_print_table_start(); --#if HAVE_PHP_SESSION && !defined(COMPILE_DL_SESSION) -+#if HAVE_PHP_SESSION - php_info_print_table_header(2, "WDDX Support", "enabled" ); - php_info_print_table_row(2, "WDDX Session Serializer", "enabled" ); - #else diff --git a/textproc/php52-xml/Makefile b/textproc/php52-xml/Makefile deleted file mode 100644 index 7cb5e88ea084..000000000000 --- a/textproc/php52-xml/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Alex Keda -# $FreeBSD$ - -CATEGORIES= textproc - -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -xml - -NO_STAGE= yes -.include "${MASTERDIR}/Makefile" diff --git a/textproc/php52-xml/files/patch-compat.c b/textproc/php52-xml/files/patch-compat.c deleted file mode 100644 index 8265e24959ad..000000000000 --- a/textproc/php52-xml/files/patch-compat.c +++ /dev/null @@ -1,13 +0,0 @@ ---- ext/xml/compat.c.orig Tue Jul 20 10:55:02 2004 -+++ ext/xml/compat.c Tue Jul 20 10:55:55 2004 -@@ -16,6 +16,10 @@ - +----------------------------------------------------------------------+ - */ - -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif -+ - #include "php.h" - #if defined(HAVE_LIBXML) && defined(HAVE_XML) && !defined(HAVE_LIBEXPAT) - #include "expat_compat.h" diff --git a/textproc/php52-xmlreader/Makefile b/textproc/php52-xmlreader/Makefile deleted file mode 100644 index 705b195be5ee..000000000000 --- a/textproc/php52-xmlreader/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Alex Keda -# $FreeBSD$ - -CATEGORIES= textproc - -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -xmlreader - -NO_STAGE= yes -.include "${MASTERDIR}/Makefile" diff --git a/textproc/php52-xmlwriter/Makefile b/textproc/php52-xmlwriter/Makefile deleted file mode 100644 index 76e1042ede36..000000000000 --- a/textproc/php52-xmlwriter/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Alex Keda -# $FreeBSD$ - -CATEGORIES= textproc - -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -xmlwriter - -NO_STAGE= yes -.include "${MASTERDIR}/Makefile" diff --git a/textproc/php52-xsl/Makefile b/textproc/php52-xsl/Makefile deleted file mode 100644 index 8f08fd8772e4..000000000000 --- a/textproc/php52-xsl/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Alex Keda -# $FreeBSD$ - -CATEGORIES= textproc - -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -xsl - -NO_STAGE= yes -.include "${MASTERDIR}/Makefile" diff --git a/textproc/php52-xsl/files/patch-php_xsl.h b/textproc/php52-xsl/files/patch-php_xsl.h deleted file mode 100644 index 9547fa9a5cf6..000000000000 --- a/textproc/php52-xsl/files/patch-php_xsl.h +++ /dev/null @@ -1,11 +0,0 @@ ---- ext/xsl/php_xsl.h.orig Sun Jan 1 13:50:17 2006 -+++ ext/xsl/php_xsl.h Tue Jan 17 16:23:10 2006 -@@ -43,7 +43,7 @@ - #include - #endif - --#include "../dom/xml_common.h" -+#include "ext/dom/xml_common.h" - #include "xsl_fe.h" - - #include diff --git a/www/Makefile b/www/Makefile index 1f52577c067e..7c9852e56812 100644 --- a/www/Makefile +++ b/www/Makefile @@ -1427,8 +1427,6 @@ SUBDIR += php-templates SUBDIR += php5-session SUBDIR += php5-tidy - SUBDIR += php52-session - SUBDIR += php52-tidy SUBDIR += php53-session SUBDIR += php53-tidy SUBDIR += php55-opcache diff --git a/www/php52-session/Makefile b/www/php52-session/Makefile deleted file mode 100644 index 7c10960ac3df..000000000000 --- a/www/php52-session/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Alex Keda -# $FreeBSD$ - -CATEGORIES= www - -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -session - -NO_STAGE= yes -.include "${MASTERDIR}/Makefile" diff --git a/www/php52-tidy/Makefile b/www/php52-tidy/Makefile deleted file mode 100644 index d07018fe2369..000000000000 --- a/www/php52-tidy/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Alex Keda -# $FreeBSD$ - -CATEGORIES= www - -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -tidy - -NO_STAGE= yes -.include "${MASTERDIR}/Makefile"