diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2015-04-17 21:00:10 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2015-04-17 21:00:10 +0000 |
| commit | 2af5dcc160f59e3915e6f8a0c19b7650638cbd46 (patch) | |
| tree | 1fdf47022a8f664140594ff7b238feaa6d0dd6db | |
| parent | ea34d39e045f1e179cad055445a6716f05f00773 (diff) | |
Remove expired ports:
2015-04-15 databases/php53-sqlite3: security EOL reached 14 Aug 2014
2015-04-15 textproc/php53-simplexml: security EOL reached 14 Aug 2014
2015-04-15 databases/php53-sybase_ct: security EOL reached 14 Aug 2014
2015-04-15 databases/php53-pdo_mysql: security EOL reached 14 Aug 2014
2015-04-15 textproc/php53-ctype: security EOL reached 14 Aug 2014
2015-04-15 textproc/php53-wddx: security EOL reached 14 Aug 2014
2015-04-15 security/php53-filter: security EOL reached 14 Aug 2014
2015-04-15 ftp/php53-ftp: security EOL reached 14 Aug 2014
2015-04-15 net/php53-soap: security EOL reached 14 Aug 2014
2015-04-15 converters/php53-recode: security EOL reached 14 Aug 2014
2015-04-15 security/php53-openssl: security EOL reached 14 Aug 2014
2015-04-15 databases/php53-dba: security EOL reached 14 Aug 2014
2015-04-15 databases/php53-pdo_pgsql: security EOL reached 14 Aug 2014
2015-04-15 sysutils/php53-fileinfo: security EOL reached 14 Aug 2014
2015-04-15 databases/php53-pdo_odbc: security EOL reached 14 Aug 2014
2015-04-15 databases/php53-sqlite: security EOL reached 14 Aug 2014
2015-04-15 devel/php53-readline: security EOL reached 14 Aug 2014
2015-04-15 mail/php53-imap: security EOL reached 14 Aug 2014
2015-04-15 sysutils/php53-posix: security EOL reached 14 Aug 2014
2015-04-15 archivers/php53-phar: security EOL reached 14 Aug 2014
2015-04-15 graphics/php53-gd: security EOL reached 14 Aug 2014
2015-04-15 textproc/php53-xsl: security EOL reached 14 Aug 2014
2015-04-15 databases/php53-pdo_firebird: security EOL reached 14 Aug 2014
2015-04-15 devel/mingw64-binutils: Obsolete. Migrate to devel/binutils based ports
2015-04-15 devel/cross-binutils: Obsolete. Migrate to devel/binutils based ports
2015-04-15 databases/php53-pdo_dblib: security EOL reached 14 Aug 2014
2015-04-15 devel/php53-sysvshm: security EOL reached 14 Aug 2014
2015-04-15 devel/php53-json: security EOL reached 14 Aug 2014
2015-04-15 databases/php53-redis: requires php53, security EOL reached 14 Aug 2014
2015-04-15 textproc/php53-pspell: security EOL reached 14 Aug 2014
2015-04-15 databases/php53-pgsql: security EOL reached 14 Aug 2014
2015-04-15 textproc/php53-xmlreader: security EOL reached 14 Aug 2014
2015-04-15 converters/php53-iconv: security EOL reached 14 Aug 2014
2015-04-15 databases/php53-odbc: security EOL reached 14 Aug 2014
2015-04-15 ftp/php53-curl: security EOL reached 14 Aug 2014
2015-04-15 math/php53-gmp: security EOL reached 14 Aug 2014
2015-04-15 security/php53-mcrypt: security EOL reached 14 Aug 2014
2015-04-15 devel/php53-shmop: security EOL reached 14 Aug 2014
2015-04-15 math/php53-bcmath: security EOL reached 14 Aug 2014
2015-04-15 security/php53-hash: security EOL reached 14 Aug 2014
2015-04-15 devel/php53-sysvsem: security EOL reached 14 Aug 2014
2015-04-15 archivers/php53-zip: security EOL reached 14 Aug 2014
2015-04-15 graphics/php53-exif: security EOL reached 14 Aug 2014
2015-04-15 devel/php53-gettext: security EOL reached 14 Aug 2014
2015-04-15 databases/php53-mysql: security EOL reached 14 Aug 2014
2015-04-15 textproc/php53-xmlwriter: security EOL reached 14 Aug 2014
2015-04-15 textproc/php53-xml: security EOL reached 14 Aug 2014
2015-04-15 converters/php53-mbstring: security EOL reached 14 Aug 2014
2015-04-15 devel/php53-sysvmsg: security EOL reached 14 Aug 2014
2015-04-15 databases/php53-mysqli: security EOL reached 14 Aug 2014
2015-04-15 misc/php53-calendar: security EOL reached 14 Aug 2014
2015-04-15 devel/php53-tokenizer: security EOL reached 14 Aug 2014
2015-04-15 databases/php53-pdo: security EOL reached 14 Aug 2014
2015-04-15 net/php53-xmlrpc: security EOL reached 14 Aug 2014
2015-04-15 databases/php53-interbase: security EOL reached 14 Aug 2014
2015-04-15 www/php53-session: security EOL reached 14 Aug 2014
2015-04-15 databases/php53-mssql: security EOL reached 14 Aug 2014
2015-04-15 www/php53-tidy: security EOL reached 14 Aug 2014
2015-04-15 archivers/php53-zlib: security EOL reached 14 Aug 2014
2015-04-15 net/php53-ldap: security EOL reached 14 Aug 2014
2015-04-15 net-mgmt/php53-snmp: security EOL reached 14 Aug 2014
2015-04-15 textproc/php53-dom: security EOL reached 14 Aug 2014
2015-04-15 devel/php53-pcntl: security EOL reached 14 Aug 2014
2015-04-15 archivers/php53-bz2: security EOL reached 14 Aug 2014
2015-04-15 net/php53-sockets: security EOL reached 14 Aug 2014
2015-04-15 lang/php53: security EOL reached 14 Aug 2014
2015-04-15 devel/pecl-uuid: requires php53, security EOL reached 14 Aug 2014
2015-04-15 lang/php53-extensions: security EOL reached 14 Aug 2014
2015-04-15 german/pecl-konto_check: requires php53, security EOL reached 14 Aug 2014
2015-04-17 www/moodle26: Deprecated by upstream, use www/moodle2{7,8} instead
Notes
Notes:
svn path=/head/; revision=384186
155 files changed, 70 insertions, 4815 deletions
@@ -7467,3 +7467,73 @@ deskutils/preferencepanes|deskutils/systempreferences|2015-04-08|preferencepanes games/airstrike||2015-04-10|Has expired: never completed, alpha quality, dev site and repo do not resolve www/trac-batchmodify||2015-04-10|Has expired: This functionality was merged into Trac since version 1.0 net/quagga23|net/quagga|2015-04-17|The regression on 8 and 9 has been patched, go back to the regular quagga +databases/php53-sqlite3||2015-04-17|Has expired: security EOL reached 14 Aug 2014 +textproc/php53-simplexml||2015-04-17|Has expired: security EOL reached 14 Aug 2014 +databases/php53-sybase_ct||2015-04-17|Has expired: security EOL reached 14 Aug 2014 +databases/php53-pdo_mysql||2015-04-17|Has expired: security EOL reached 14 Aug 2014 +textproc/php53-ctype||2015-04-17|Has expired: security EOL reached 14 Aug 2014 +textproc/php53-wddx||2015-04-17|Has expired: security EOL reached 14 Aug 2014 +security/php53-filter||2015-04-17|Has expired: security EOL reached 14 Aug 2014 +ftp/php53-ftp||2015-04-17|Has expired: security EOL reached 14 Aug 2014 +net/php53-soap||2015-04-17|Has expired: security EOL reached 14 Aug 2014 +converters/php53-recode||2015-04-17|Has expired: security EOL reached 14 Aug 2014 +security/php53-openssl||2015-04-17|Has expired: security EOL reached 14 Aug 2014 +databases/php53-dba||2015-04-17|Has expired: security EOL reached 14 Aug 2014 +databases/php53-pdo_pgsql||2015-04-17|Has expired: security EOL reached 14 Aug 2014 +sysutils/php53-fileinfo||2015-04-17|Has expired: security EOL reached 14 Aug 2014 +databases/php53-pdo_odbc||2015-04-17|Has expired: security EOL reached 14 Aug 2014 +databases/php53-sqlite||2015-04-17|Has expired: security EOL reached 14 Aug 2014 +devel/php53-readline||2015-04-17|Has expired: security EOL reached 14 Aug 2014 +mail/php53-imap||2015-04-17|Has expired: security EOL reached 14 Aug 2014 +sysutils/php53-posix||2015-04-17|Has expired: security EOL reached 14 Aug 2014 +archivers/php53-phar||2015-04-17|Has expired: security EOL reached 14 Aug 2014 +graphics/php53-gd||2015-04-17|Has expired: security EOL reached 14 Aug 2014 +textproc/php53-xsl||2015-04-17|Has expired: security EOL reached 14 Aug 2014 +databases/php53-pdo_firebird||2015-04-17|Has expired: security EOL reached 14 Aug 2014 +devel/mingw64-binutils||2015-04-17|Has expired: Obsolete. Migrate to devel/binutils based ports +devel/cross-binutils||2015-04-17|Has expired: Obsolete. Migrate to devel/binutils based ports +databases/php53-pdo_dblib||2015-04-17|Has expired: security EOL reached 14 Aug 2014 +devel/php53-sysvshm||2015-04-17|Has expired: security EOL reached 14 Aug 2014 +devel/php53-json||2015-04-17|Has expired: security EOL reached 14 Aug 2014 +databases/php53-redis||2015-04-17|Has expired: requires php53, security EOL reached 14 Aug 2014 +textproc/php53-pspell||2015-04-17|Has expired: security EOL reached 14 Aug 2014 +databases/php53-pgsql||2015-04-17|Has expired: security EOL reached 14 Aug 2014 +textproc/php53-xmlreader||2015-04-17|Has expired: security EOL reached 14 Aug 2014 +converters/php53-iconv||2015-04-17|Has expired: security EOL reached 14 Aug 2014 +databases/php53-odbc||2015-04-17|Has expired: security EOL reached 14 Aug 2014 +ftp/php53-curl||2015-04-17|Has expired: security EOL reached 14 Aug 2014 +math/php53-gmp||2015-04-17|Has expired: security EOL reached 14 Aug 2014 +security/php53-mcrypt||2015-04-17|Has expired: security EOL reached 14 Aug 2014 +devel/php53-shmop||2015-04-17|Has expired: security EOL reached 14 Aug 2014 +math/php53-bcmath||2015-04-17|Has expired: security EOL reached 14 Aug 2014 +security/php53-hash||2015-04-17|Has expired: security EOL reached 14 Aug 2014 +devel/php53-sysvsem||2015-04-17|Has expired: security EOL reached 14 Aug 2014 +archivers/php53-zip||2015-04-17|Has expired: security EOL reached 14 Aug 2014 +graphics/php53-exif||2015-04-17|Has expired: security EOL reached 14 Aug 2014 +devel/php53-gettext||2015-04-17|Has expired: security EOL reached 14 Aug 2014 +databases/php53-mysql||2015-04-17|Has expired: security EOL reached 14 Aug 2014 +textproc/php53-xmlwriter||2015-04-17|Has expired: security EOL reached 14 Aug 2014 +textproc/php53-xml||2015-04-17|Has expired: security EOL reached 14 Aug 2014 +converters/php53-mbstring||2015-04-17|Has expired: security EOL reached 14 Aug 2014 +devel/php53-sysvmsg||2015-04-17|Has expired: security EOL reached 14 Aug 2014 +databases/php53-mysqli||2015-04-17|Has expired: security EOL reached 14 Aug 2014 +misc/php53-calendar||2015-04-17|Has expired: security EOL reached 14 Aug 2014 +devel/php53-tokenizer||2015-04-17|Has expired: security EOL reached 14 Aug 2014 +databases/php53-pdo||2015-04-17|Has expired: security EOL reached 14 Aug 2014 +net/php53-xmlrpc||2015-04-17|Has expired: security EOL reached 14 Aug 2014 +databases/php53-interbase||2015-04-17|Has expired: security EOL reached 14 Aug 2014 +www/php53-session||2015-04-17|Has expired: security EOL reached 14 Aug 2014 +databases/php53-mssql||2015-04-17|Has expired: security EOL reached 14 Aug 2014 +www/php53-tidy||2015-04-17|Has expired: security EOL reached 14 Aug 2014 +archivers/php53-zlib||2015-04-17|Has expired: security EOL reached 14 Aug 2014 +net/php53-ldap||2015-04-17|Has expired: security EOL reached 14 Aug 2014 +net-mgmt/php53-snmp||2015-04-17|Has expired: security EOL reached 14 Aug 2014 +textproc/php53-dom||2015-04-17|Has expired: security EOL reached 14 Aug 2014 +devel/php53-pcntl||2015-04-17|Has expired: security EOL reached 14 Aug 2014 +archivers/php53-bz2||2015-04-17|Has expired: security EOL reached 14 Aug 2014 +net/php53-sockets||2015-04-17|Has expired: security EOL reached 14 Aug 2014 +lang/php53||2015-04-17|Has expired: security EOL reached 14 Aug 2014 +devel/pecl-uuid||2015-04-17|Has expired: requires php53, security EOL reached 14 Aug 2014 +lang/php53-extensions||2015-04-17|Has expired: security EOL reached 14 Aug 2014 +german/pecl-konto_check||2015-04-17|Has expired: requires php53, security EOL reached 14 Aug 2014 +www/moodle26|www/moodle27|2015-04-17|Has expired: Deprecated by upstream, use www/moodle2{7,8} instead diff --git a/archivers/Makefile b/archivers/Makefile index 2d0c878940ca..cff811948a3f 100644 --- a/archivers/Makefile +++ b/archivers/Makefile @@ -145,10 +145,6 @@ SUBDIR += php5-snappy SUBDIR += php5-zip SUBDIR += php5-zlib - SUBDIR += php53-bz2 - SUBDIR += php53-phar - SUBDIR += php53-zip - SUBDIR += php53-zlib SUBDIR += php55-bz2 SUBDIR += php55-phar SUBDIR += php55-zip diff --git a/archivers/php53-bz2/Makefile b/archivers/php53-bz2/Makefile deleted file mode 100644 index 1d6c3fcfd72f..000000000000 --- a/archivers/php53-bz2/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= archivers - -MASTERDIR= ${.CURDIR}/../../lang/php53 - -PKGNAMESUFFIX= -bz2 - -.include "${MASTERDIR}/Makefile" diff --git a/archivers/php53-phar/Makefile b/archivers/php53-phar/Makefile deleted file mode 100644 index d01230bca21b..000000000000 --- a/archivers/php53-phar/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= archivers - -MASTERDIR= ${.CURDIR}/../../lang/php53 - -PKGNAMESUFFIX= -phar - -.include "${MASTERDIR}/Makefile" diff --git a/archivers/php53-phar/files/patch-CVE-2015-2301 b/archivers/php53-phar/files/patch-CVE-2015-2301 deleted file mode 100644 index 896408a16ffc..000000000000 --- a/archivers/php53-phar/files/patch-CVE-2015-2301 +++ /dev/null @@ -1,12 +0,0 @@ ---- phar_object.c 2015-03-16 13:56:47.878348393 -0400 -+++ phar_object.c 2015-03-16 13:56:47.826347993 -0400 -@@ -2320,8 +2320,8 @@ - } - its_ok: - if (SUCCESS == php_stream_stat_path(newpath, &ssb)) { -- efree(oldpath); - zend_throw_exception_ex(spl_ce_BadMethodCallException, 0 TSRMLS_CC, "phar \"%s\" exists and must be unlinked prior to conversion", newpath); -+ efree(oldpath); - return NULL; - } - if (!phar->is_data) { diff --git a/archivers/php53-phar/files/patch-config.m4 b/archivers/php53-phar/files/patch-config.m4 deleted file mode 100644 index 1a981bfefdc1..000000000000 --- a/archivers/php53-phar/files/patch-config.m4 +++ /dev/null @@ -1,41 +0,0 @@ ---- config.m4.orig 2011-11-25 15:31:20.000000000 +0100 -+++ config.m4 2011-11-25 15:47:45.000000000 +0100 -@@ -4,8 +4,38 @@ - PHP_ARG_ENABLE(phar, for phar archive support, - [ --disable-phar Disable phar support], yes) - -+PHP_ARG_WITH(pcre-dir, pcre install prefix, -+[ --with-pcre-dir PHAR: pcre install prefix], no, no) -+ -+ - if test "$PHP_PHAR" != "no"; then -+ -+ dnl This is PECL build, check if bundled PCRE library is used -+ old_CPPFLAGS=$CPPFLAGS -+ CPPFLAGS=$INCLUDES -+ AC_EGREP_CPP(yes,[ -+#include <main/php_config.h> -+#if defined(HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE) -+yes -+#endif -+ ],[ -+ PHP_PCRE_REGEX=yes -+ ],[ -+ AC_EGREP_CPP(yes,[ -+#include <main/php_config.h> -+#if defined(HAVE_PCRE) && !defined(COMPILE_DL_PCRE) -+yes -+#endif -+ ],[ -+ PHP_PCRE_REGEX=pecl -+ PHP_ADD_INCLUDE($PHP_PCRE_DIR/include) -+ ],[ -+ PHP_PCRE_REGEX=no -+ ]) -+ ]) -+ - PHP_NEW_EXTENSION(phar, util.c tar.c zip.c stream.c func_interceptors.c dirstream.c phar.c phar_object.c phar_path_check.c, $ext_shared) -+ PHP_HASH=yes - AC_MSG_CHECKING([for phar openssl support]) - if test "$PHP_HASH_SHARED" != "yes"; then - if test "$PHP_HASH" != "no"; then diff --git a/archivers/php53-phar/files/patch-phar.c b/archivers/php53-phar/files/patch-phar.c deleted file mode 100644 index 231ec40a8423..000000000000 --- a/archivers/php53-phar/files/patch-phar.c +++ /dev/null @@ -1,11 +0,0 @@ ---- phar.c.orig 2011-11-25 15:38:44.000000000 +0100 -+++ phar.c 2011-11-25 15:39:01.000000000 +0100 -@@ -3716,7 +3716,7 @@ - ZEND_MOD_OPTIONAL("openssl") - ZEND_MOD_OPTIONAL("zlib") - ZEND_MOD_OPTIONAL("standard") --#if defined(HAVE_HASH) && !defined(COMPILE_DL_HASH) -+#if defined(HAVE_HASH) - ZEND_MOD_REQUIRED("hash") - #endif - #if HAVE_SPL diff --git a/archivers/php53-zip/Makefile b/archivers/php53-zip/Makefile deleted file mode 100644 index f66c3111003a..000000000000 --- a/archivers/php53-zip/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= archivers - -MASTERDIR= ${.CURDIR}/../../lang/php53 - -PKGNAMESUFFIX= -zip - -.include "${MASTERDIR}/Makefile" diff --git a/archivers/php53-zip/files/patch-config.m4 b/archivers/php53-zip/files/patch-config.m4 deleted file mode 100644 index a87640ff160d..000000000000 --- a/archivers/php53-zip/files/patch-config.m4 +++ /dev/null @@ -1,10 +0,0 @@ ---- config.m4.orig 2009-04-09 16:16:30.000000000 +0200 -+++ config.m4 2009-04-09 16:17:02.000000000 +0200 -@@ -65,6 +65,7 @@ - #endif - ],[ - PHP_PCRE_REGEX=pecl -+ PHP_ADD_INCLUDE($PHP_PCRE_DIR/include) - ],[ - PHP_PCRE_REGEX=no - ]) diff --git a/archivers/php53-zlib/Makefile b/archivers/php53-zlib/Makefile deleted file mode 100644 index 8f410d872b66..000000000000 --- a/archivers/php53-zlib/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= archivers - -MASTERDIR= ${.CURDIR}/../../lang/php53 - -PKGNAMESUFFIX= -zlib - -.include "${MASTERDIR}/Makefile" diff --git a/converters/Makefile b/converters/Makefile index 634df85ddef2..e5a4cd95abc9 100644 --- a/converters/Makefile +++ b/converters/Makefile @@ -129,9 +129,6 @@ SUBDIR += php5-iconv SUBDIR += php5-mbstring SUBDIR += php5-recode - SUBDIR += php53-iconv - SUBDIR += php53-mbstring - SUBDIR += php53-recode SUBDIR += php55-iconv SUBDIR += php55-mbstring SUBDIR += php55-recode diff --git a/converters/php53-iconv/Makefile b/converters/php53-iconv/Makefile deleted file mode 100644 index fd8c1411903f..000000000000 --- a/converters/php53-iconv/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# $FreeBSD$ - -PORTREVISION= 1 -CATEGORIES= converters - -MASTERDIR= ${.CURDIR}/../../lang/php53 - -PKGNAMESUFFIX= -iconv - -.include "${MASTERDIR}/Makefile" diff --git a/converters/php53-mbstring/Makefile b/converters/php53-mbstring/Makefile deleted file mode 100644 index 1a6b1d960ad4..000000000000 --- a/converters/php53-mbstring/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= converters - -MASTERDIR= ${.CURDIR}/../../lang/php53 - -PKGNAMESUFFIX= -mbstring - -.include "${MASTERDIR}/Makefile" diff --git a/converters/php53-mbstring/files/patch-config.m4 b/converters/php53-mbstring/files/patch-config.m4 deleted file mode 100644 index 026798f26a5a..000000000000 --- a/converters/php53-mbstring/files/patch-config.m4 +++ /dev/null @@ -1,51 +0,0 @@ ---- config.m4.orig 2009-11-25 02:30:06.000000000 +0100 -+++ config.m4 2010-04-12 09:59:54.000000000 +0200 -@@ -43,6 +43,30 @@ - PHP_ADD_INCLUDE([$ext_builddir/$dir]) - done - -+ dnl This is PECL build, check if bundled PCRE library is used -+ old_CPPFLAGS=$CPPFLAGS -+ CPPFLAGS=$INCLUDES -+ AC_EGREP_CPP(yes,[ -+#include <main/php_config.h> -+#if defined(HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE) -+yes -+#endif -+ ],[ -+ PHP_PCRE_REGEX=yes -+ ],[ -+ AC_EGREP_CPP(yes,[ -+#include <main/php_config.h> -+#if defined(HAVE_PCRE) && !defined(COMPILE_DL_PCRE) -+yes -+#endif -+ ],[ -+ PHP_PCRE_REGEX=pecl -+ PHP_ADD_INCLUDE($PHP_PCRE_DIR/include) -+ ],[ -+ PHP_PCRE_REGEX=no -+ ]) -+ ]) -+ - if test "$ext_shared" = "no"; then - PHP_ADD_SOURCES(PHP_EXT_DIR(mbstring), $PHP_MBSTRING_BASE_SOURCES) - out="php_config.h" -@@ -80,7 +104,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; -@@ -347,6 +370,9 @@ - [ --with-onig[=DIR] MBSTRING: Use external oniguruma. DIR is the oniguruma install prefix. - If DIR is not set, the bundled oniguruma will be used], no, no) - -+PHP_ARG_WITH(pcre-dir, pcre install prefix, -+[ --with-pcre-dir MBSTRING: pcre install prefix], no, no) -+ - if test "$PHP_MBSTRING" != "no"; then - AC_DEFINE([HAVE_MBSTRING],1,[whether to have multibyte string support]) - diff --git a/converters/php53-recode/Makefile b/converters/php53-recode/Makefile deleted file mode 100644 index 1f33d889b7d0..000000000000 --- a/converters/php53-recode/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= converters - -MASTERDIR= ${.CURDIR}/../../lang/php53 - -PKGNAMESUFFIX= -recode - -.include "${MASTERDIR}/Makefile" diff --git a/databases/Makefile b/databases/Makefile index 967a103a09ce..202e9ca4d7d9 100644 --- a/databases/Makefile +++ b/databases/Makefile @@ -585,24 +585,7 @@ SUBDIR += php5-sqlite3 SUBDIR += php5-sybase_ct SUBDIR += php5-tarantool - SUBDIR += php53-dba - SUBDIR += php53-interbase - SUBDIR += php53-mssql - SUBDIR += php53-mysql - SUBDIR += php53-mysqli - SUBDIR += php53-odbc - SUBDIR += php53-pdo - SUBDIR += php53-pdo_dblib - SUBDIR += php53-pdo_firebird - SUBDIR += php53-pdo_mysql - SUBDIR += php53-pdo_odbc - SUBDIR += php53-pdo_pgsql SUBDIR += php53-pdo_sqlite - SUBDIR += php53-pgsql - SUBDIR += php53-redis - SUBDIR += php53-sqlite - SUBDIR += php53-sqlite3 - SUBDIR += php53-sybase_ct SUBDIR += php55-dba SUBDIR += php55-interbase SUBDIR += php55-mssql diff --git a/databases/php53-dba/Makefile b/databases/php53-dba/Makefile deleted file mode 100644 index 520f4ecd8491..000000000000 --- a/databases/php53-dba/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php53 - -PKGNAMESUFFIX= -dba - -.include "${MASTERDIR}/Makefile" diff --git a/databases/php53-dba/files/patch-config.m4 b/databases/php53-dba/files/patch-config.m4 deleted file mode 100644 index 4bb0ed06fc48..000000000000 --- a/databases/php53-dba/files/patch-config.m4 +++ /dev/null @@ -1,62 +0,0 @@ ---- config.m4.orig 2011-06-27 22:28:30.000000000 +0200 -+++ config.m4 2011-08-26 09:32:43.000000000 +0200 -@@ -285,6 +285,50 @@ - THIS_PREFIX=$i - THIS_INCLUDE=$i/db4/db.h - break -+ elif test -f "$i/include/db5/db.h"; then -+ THIS_PREFIX=$i -+ THIS_INCLUDE=$i/include/db5/db.h -+ break -+ elif test -f "$i/include/db51/db.h"; then -+ THIS_PREFIX=$i -+ THIS_INCLUDE=$i/include/db51/db.h -+ break -+ elif test -f "$i/include/db50/db.h"; then -+ THIS_PREFIX=$i -+ THIS_INCLUDE=$i/include/db50/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/db5.1/db.h"; then - THIS_PREFIX=$i - THIS_INCLUDE=$i/include/db5.1/db.h -@@ -327,7 +371,7 @@ - break - fi - done -- PHP_DBA_DB_CHECK(4, db-5.1 db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)]) -+ PHP_DBA_DB_CHECK(4, db-5.2 db-5.1 db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)]) - fi - PHP_DBA_STD_RESULT(db4,Berkeley DB4) - diff --git a/databases/php53-interbase/Makefile b/databases/php53-interbase/Makefile deleted file mode 100644 index 4f41c0fe5dbe..000000000000 --- a/databases/php53-interbase/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php53 - -PKGNAMESUFFIX= -interbase - -.include "${MASTERDIR}/Makefile" diff --git a/databases/php53-mssql/Makefile b/databases/php53-mssql/Makefile deleted file mode 100644 index 7fea4999caec..000000000000 --- a/databases/php53-mssql/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php53 - -PKGNAMESUFFIX= -mssql - -.include "${MASTERDIR}/Makefile" diff --git a/databases/php53-mysql/Makefile b/databases/php53-mysql/Makefile deleted file mode 100644 index f41c1479f81e..000000000000 --- a/databases/php53-mysql/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php53 - -PKGNAMESUFFIX= -mysql - -.include "${MASTERDIR}/Makefile" diff --git a/databases/php53-mysqli/Makefile b/databases/php53-mysqli/Makefile deleted file mode 100644 index bb07e6e10151..000000000000 --- a/databases/php53-mysqli/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php53 - -PKGNAMESUFFIX= -mysqli - -.include "${MASTERDIR}/Makefile" diff --git a/databases/php53-mysqli/files/patch-php_mysqli_structs.h b/databases/php53-mysqli/files/patch-php_mysqli_structs.h deleted file mode 100644 index d0daeee9ee54..000000000000 --- a/databases/php53-mysqli/files/patch-php_mysqli_structs.h +++ /dev/null @@ -1,10 +0,0 @@ ---- php_mysqli_structs.h.orig 2010-07-26 15:52:54.000000000 +0200 -+++ php_mysqli_structs.h 2010-07-26 15:53:14.000000000 +0200 -@@ -54,6 +54,7 @@ - #define WE_HAD_MBSTATE_T - #endif - -+#define HAVE_ULONG 1 - #include <my_global.h> - - #if !defined(HAVE_MBRLEN) && defined(WE_HAD_MBRLEN) diff --git a/databases/php53-odbc/Makefile b/databases/php53-odbc/Makefile deleted file mode 100644 index 44bce3fbfed7..000000000000 --- a/databases/php53-odbc/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php53 - -PKGNAMESUFFIX= -odbc - -.include "${MASTERDIR}/Makefile" diff --git a/databases/php53-odbc/files/patch-config.m4 b/databases/php53-odbc/files/patch-config.m4 deleted file mode 100644 index c809732b1047..000000000000 --- a/databases/php53-odbc/files/patch-config.m4 +++ /dev/null @@ -1,124 +0,0 @@ ---- config.m4.orig 2007-07-31 15:02:00.000000000 +0200 -+++ config.m4 2011-04-26 13:57:31.000000000 +0200 -@@ -99,9 +99,12 @@ - dnl - dnl configure options - dnl -+PHP_ARG_ENABLE(odbc,, -+[ --enable-odbc Enable ODBC support with selected driver]) -+ - 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 +131,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 +149,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 +174,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 +211,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 +232,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 +256,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 +294,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 +349,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 +369,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 +390,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 +410,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, no) - - if test "$PHP_UNIXODBC" != "no"; then - AC_MSG_CHECKING(for unixODBC support) -@@ -428,7 +431,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/php53-pdo/Makefile b/databases/php53-pdo/Makefile deleted file mode 100644 index 397da552b4f5..000000000000 --- a/databases/php53-pdo/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php53 - -PKGNAMESUFFIX= -pdo - -.include "${MASTERDIR}/Makefile" diff --git a/databases/php53-pdo_dblib/Makefile b/databases/php53-pdo_dblib/Makefile deleted file mode 100644 index 46ba5a3761ad..000000000000 --- a/databases/php53-pdo_dblib/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php53 - -PKGNAMESUFFIX= -pdo_dblib - -.include "${MASTERDIR}/Makefile" diff --git a/databases/php53-pdo_firebird/Makefile b/databases/php53-pdo_firebird/Makefile deleted file mode 100644 index fa681efb884f..000000000000 --- a/databases/php53-pdo_firebird/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php53 - -PKGNAMESUFFIX= -pdo_firebird - -.include "${MASTERDIR}/Makefile" diff --git a/databases/php53-pdo_mysql/Makefile b/databases/php53-pdo_mysql/Makefile deleted file mode 100644 index fa178f06476e..000000000000 --- a/databases/php53-pdo_mysql/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php53 - -PKGNAMESUFFIX= -pdo_mysql - -.include "${MASTERDIR}/Makefile" diff --git a/databases/php53-pdo_odbc/Makefile b/databases/php53-pdo_odbc/Makefile deleted file mode 100644 index decb1e868695..000000000000 --- a/databases/php53-pdo_odbc/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php53 - -PKGNAMESUFFIX= -pdo_odbc - -.include "${MASTERDIR}/Makefile" diff --git a/databases/php53-pdo_pgsql/Makefile b/databases/php53-pdo_pgsql/Makefile deleted file mode 100644 index 27d12cecc4b6..000000000000 --- a/databases/php53-pdo_pgsql/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php53 - -PKGNAMESUFFIX= -pdo_pgsql - -.include "${MASTERDIR}/Makefile" diff --git a/databases/php53-pgsql/Makefile b/databases/php53-pgsql/Makefile deleted file mode 100644 index c7fe3f4dacf6..000000000000 --- a/databases/php53-pgsql/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php53 - -PKGNAMESUFFIX= -pgsql - -.include "${MASTERDIR}/Makefile" diff --git a/databases/php53-pgsql/files/patch-pgsql.c b/databases/php53-pgsql/files/patch-pgsql.c deleted file mode 100644 index a4abfc39dff3..000000000000 --- a/databases/php53-pgsql/files/patch-pgsql.c +++ /dev/null @@ -1,30 +0,0 @@ ---- pgsql.c.orig 2010-01-03 10:23:27.000000000 +0100 -+++ pgsql.c 2010-03-08 11:00:26.000000000 +0100 -@@ -63,6 +63,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}; \ -@@ -72,7 +73,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) -@@ -728,7 +731,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/php53-redis/Makefile b/databases/php53-redis/Makefile deleted file mode 100644 index 2d634ddcbcbf..000000000000 --- a/databases/php53-redis/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# Created by: Glen Barber <gjb@FreeBSD.org> -# $FreeBSD$ - -PORTNAME= redis -PORTVERSION= 2.2.1 -CATEGORIES= databases -MASTER_SITES= https://github.com/nicolasff/phpredis/tarball/${PORTVERSION}/ -PKGNAMEPREFIX= php53- -DISTNAME= nicolasff-phpredis-${PORTVERSION}-0-g${GITVERSION} - -MAINTAINER= ports@FreeBSD.org -COMMENT= PHP5-Extension for Redis - -LICENSE= PHP301 - -DEPRECATED= requires php53, security EOL reached 14 Aug 2014 -EXPIRATION_DATE= 2015-04-15 - -GITVERSION= g882c7dc -WRKSRC= ${WRKDIR}/nicolasff-phpredis-250e81b - -USE_PHP= session -USE_PHP_BUILD= yes -USE_PHPEXT= yes -IGNORE_WITH_PHP=5 55 56 - -PHP_MODNAME= redis - -.include <bsd.port.mk> diff --git a/databases/php53-redis/distinfo b/databases/php53-redis/distinfo deleted file mode 100644 index 071f6fb97e85..000000000000 --- a/databases/php53-redis/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (nicolasff-phpredis-2.2.1-0-gg882c7dc.tar.gz) = ef72e795c7d9038e8a4b83a948e6952eb9e424cf4b8313bfa6403176701efd3a -SIZE (nicolasff-phpredis-2.2.1-0-gg882c7dc.tar.gz) = 113427 diff --git a/databases/php53-redis/files/patch-echo-nothrow b/databases/php53-redis/files/patch-echo-nothrow deleted file mode 100644 index 9244aa6507e0..000000000000 --- a/databases/php53-redis/files/patch-echo-nothrow +++ /dev/null @@ -1,1027 +0,0 @@ -diff --git a/README.markdown b/README.markdown -index 265ff2a..c49e5b6 100644 ---- a/README.markdown -+++ README.markdown -@@ -186,7 +186,6 @@ Parameter value. - $redis->getOption(Redis::OPT_SERIALIZER); // return Redis::SERIALIZER_NONE, Redis::SERIALIZER_PHP, or Redis::SERIALIZER_IGBINARY. - </pre> - -- - ## ping - ##### *Description* - -@@ -201,6 +200,20 @@ Check the current connection status - *STRING*: `+PONG` on success. Throws a RedisException object on connectivity error, as described above. - - -+## echo -+##### *Description* -+ -+Sends a string to Redis, which replies with the same string -+ -+##### *Parameters* -+ -+*STRING*: The message to send. -+ -+##### *Return Value* -+ -+*STRING*: the same message. -+ -+ - ## get - ##### *Description* - -@@ -761,9 +774,9 @@ Adds a value to the set value stored at key. If this value is already in the set - *BOOL* `TRUE` if value didn't exist and was added successfully, `FALSE` if the value is already present. - ##### *Example* - <pre> --$redis->sAdd('key1' , 'set1'); /* TRUE, 'key1' => {'set1'} */ --$redis->sAdd('key1' , 'set2'); /* TRUE, 'key1' => {'set1', 'set2'}*/ --$redis->sAdd('key1' , 'set2'); /* FALSE, 'key1' => {'set1', 'set2'}*/ -+$redis->sAdd('key1' , 'member1'); /* TRUE, 'key1' => {'member1'} */ -+$redis->sAdd('key1' , 'member2'); /* TRUE, 'key1' => {'member1', 'member2'}*/ -+$redis->sAdd('key1' , 'member2'); /* FALSE, 'key1' => {'member1', 'member2'}*/ - </pre> - - ## sRem, sRemove -@@ -776,10 +789,10 @@ Removes the specified member from the set value stored at key. - *BOOL* `TRUE` if the member was present in the set, `FALSE` if it didn't. - ##### *Example* - <pre> --$redis->sAdd('key1' , 'set1'); --$redis->sAdd('key1' , 'set2'); --$redis->sAdd('key1' , 'set3'); /* 'key1' => {'set1', 'set2', 'set3'}*/ --$redis->sRem('key1', 'set2'); /* 'key1' => {'set1', 'set3'} */ -+$redis->sAdd('key1' , 'member1'); -+$redis->sAdd('key1' , 'member2'); -+$redis->sAdd('key1' , 'member3'); /* 'key1' => {'member1', 'member2', 'member3'}*/ -+$redis->sRem('key1', 'member2'); /* 'key1' => {'member1', 'member3'} */ - </pre> - - ## sMove -@@ -793,13 +806,13 @@ Moves the specified member from the set at srcKey to the set at dstKey. - *BOOL* If the operation is successful, return `TRUE`. If the srcKey and/or dstKey didn't exist, and/or the member didn't exist in srcKey, `FALSE` is returned. - ##### *Example* - <pre> --$redis->sAdd('key1' , 'set11'); --$redis->sAdd('key1' , 'set12'); --$redis->sAdd('key1' , 'set13'); /* 'key1' => {'set11', 'set12', 'set13'}*/ --$redis->sAdd('key2' , 'set21'); --$redis->sAdd('key2' , 'set22'); /* 'key2' => {'set21', 'set22'}*/ --$redis->sMove('key1', 'key2', 'set13'); /* 'key1' => {'set11', 'set12'} */ -- /* 'key2' => {'set21', 'set22', 'set13'} */ -+$redis->sAdd('key1' , 'member11'); -+$redis->sAdd('key1' , 'member12'); -+$redis->sAdd('key1' , 'member13'); /* 'key1' => {'member11', 'member12', 'member13'}*/ -+$redis->sAdd('key2' , 'member21'); -+$redis->sAdd('key2' , 'member22'); /* 'key2' => {'member21', 'member22'}*/ -+$redis->sMove('key1', 'key2', 'member13'); /* 'key1' => {'member11', 'member12'} */ -+ /* 'key2' => {'member21', 'member22', 'member13'} */ - - </pre> - -@@ -814,12 +827,12 @@ Checks if `value` is a member of the set stored at the key `key`. - *BOOL* `TRUE` if `value` is a member of the set at key `key`, `FALSE` otherwise. - ##### *Example* - <pre> --$redis->sAdd('key1' , 'set1'); --$redis->sAdd('key1' , 'set2'); --$redis->sAdd('key1' , 'set3'); /* 'key1' => {'set1', 'set2', 'set3'}*/ -+$redis->sAdd('key1' , 'member1'); -+$redis->sAdd('key1' , 'member2'); -+$redis->sAdd('key1' , 'member3'); /* 'key1' => {'member1', 'member2', 'member3'}*/ - --$redis->sIsMember('key1', 'set1'); /* TRUE */ --$redis->sIsMember('key1', 'setX'); /* FALSE */ -+$redis->sIsMember('key1', 'member1'); /* TRUE */ -+$redis->sIsMember('key1', 'memberX'); /* FALSE */ - - </pre> - -@@ -832,9 +845,9 @@ Returns the cardinality of the set identified by key. - *LONG* the cardinality of the set identified by key, 0 if the set doesn't exist. - ##### *Example* - <pre> --$redis->sAdd('key1' , 'set1'); --$redis->sAdd('key1' , 'set2'); --$redis->sAdd('key1' , 'set3'); /* 'key1' => {'set1', 'set2', 'set3'}*/ -+$redis->sAdd('key1' , 'member1'); -+$redis->sAdd('key1' , 'member2'); -+$redis->sAdd('key1' , 'member3'); /* 'key1' => {'member1', 'member2', 'member3'}*/ - $redis->sCard('key1'); /* 3 */ - $redis->sCard('keyX'); /* 0 */ - </pre> -@@ -849,11 +862,11 @@ Removes and returns a random element from the set value at Key. - *Bool* `FALSE` if set identified by key is empty or doesn't exist. - ##### *Example* - <pre> --$redis->sAdd('key1' , 'set1'); --$redis->sAdd('key1' , 'set2'); --$redis->sAdd('key1' , 'set3'); /* 'key1' => {'set3', 'set1', 'set2'}*/ --$redis->sPop('key1'); /* 'set1', 'key1' => {'set3', 'set2'} */ --$redis->sPop('key1'); /* 'set3', 'key1' => {'set2'} */ -+$redis->sAdd('key1' , 'member1'); -+$redis->sAdd('key1' , 'member2'); -+$redis->sAdd('key1' , 'member3'); /* 'key1' => {'member3', 'member1', 'member2'}*/ -+$redis->sPop('key1'); /* 'member1', 'key1' => {'member3', 'member2'} */ -+$redis->sPop('key1'); /* 'member3', 'key1' => {'member2'} */ - </pre> - - ## sRandMember -@@ -866,11 +879,11 @@ Returns a random element from the set value at Key, without removing it. - *Bool* `FALSE` if set identified by key is empty or doesn't exist. - ##### *Example* - <pre> --$redis->sAdd('key1' , 'set1'); --$redis->sAdd('key1' , 'set2'); --$redis->sAdd('key1' , 'set3'); /* 'key1' => {'set3', 'set1', 'set2'}*/ --$redis->sRandMember('key1'); /* 'set1', 'key1' => {'set3', 'set1', 'set2'} */ --$redis->sRandMember('key1'); /* 'set3', 'key1' => {'set3', 'set1', 'set2'} */ -+$redis->sAdd('key1' , 'member1'); -+$redis->sAdd('key1' , 'member2'); -+$redis->sAdd('key1' , 'member3'); /* 'key1' => {'member3', 'member1', 'member2'}*/ -+$redis->sRandMember('key1'); /* 'member1', 'key1' => {'member3', 'member1', 'member2'} */ -+$redis->sRandMember('key1'); /* 'member3', 'key1' => {'member3', 'member1', 'member2'} */ - </pre> - - ## sInter -diff --git a/php_redis.h b/php_redis.h -index 1dfaa0f..fd8f024 100755 ---- a/php_redis.h -+++ php_redis.h -@@ -29,6 +29,7 @@ PHP_METHOD(Redis, connect); - PHP_METHOD(Redis, pconnect); - PHP_METHOD(Redis, close); - PHP_METHOD(Redis, ping); -+PHP_METHOD(Redis, echo); - PHP_METHOD(Redis, get); - PHP_METHOD(Redis, set); - PHP_METHOD(Redis, setex); -diff --git a/redis.c b/redis.c -index 9ca3a14..3e15d73 100755 ---- a/redis.c -+++ redis.c -@@ -76,6 +76,7 @@ static zend_function_entry redis_functions[] = { - PHP_ME(Redis, pconnect, NULL, ZEND_ACC_PUBLIC) - PHP_ME(Redis, close, NULL, ZEND_ACC_PUBLIC) - PHP_ME(Redis, ping, NULL, ZEND_ACC_PUBLIC) -+ PHP_ME(Redis, echo, NULL, ZEND_ACC_PUBLIC) - PHP_ME(Redis, get, NULL, ZEND_ACC_PUBLIC) - PHP_ME(Redis, set, NULL, ZEND_ACC_PUBLIC) - PHP_ME(Redis, setex, NULL, ZEND_ACC_PUBLIC) -@@ -324,7 +325,7 @@ static void redis_destructor_redis_sock(zend_rsrc_list_entry * rsrc TSRMLS_DC) - /** - * redis_sock_get - */ --PHPAPI int redis_sock_get(zval *id, RedisSock **redis_sock TSRMLS_DC) -+PHPAPI int redis_sock_get(zval *id, RedisSock **redis_sock TSRMLS_DC, int no_throw) - { - - zval **socket; -@@ -332,15 +333,21 @@ PHPAPI int redis_sock_get(zval *id, RedisSock **redis_sock TSRMLS_DC) - - if (Z_TYPE_P(id) != IS_OBJECT || zend_hash_find(Z_OBJPROP_P(id), "socket", - sizeof("socket"), (void **) &socket) == FAILURE) { -- zend_throw_exception(redis_exception_ce, "Redis server went away", 0 TSRMLS_CC); -+ // Throw an exception unless we've been requested not to -+ if(!no_throw) { -+ zend_throw_exception(redis_exception_ce, "Redis server went away", 0 TSRMLS_CC); -+ } - return -1; - } - - *redis_sock = (RedisSock *) zend_list_find(Z_LVAL_PP(socket), &resource_type); - - if (!*redis_sock || resource_type != le_redis_sock) { -- zend_throw_exception(redis_exception_ce, "Redis server went away", 0 TSRMLS_CC); -- return -1; -+ // Throw an exception unless we've been requested not to -+ if(!no_throw) { -+ zend_throw_exception(redis_exception_ce, "Redis server went away", 0 TSRMLS_CC); -+ } -+ return -1; - } - - return Z_LVAL_PP(socket); -@@ -471,7 +478,7 @@ PHP_METHOD(Redis,__destruct) { - - // Grab our socket - RedisSock *redis_sock; -- if (redis_sock_get(getThis(), &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(getThis(), &redis_sock TSRMLS_CC, 1) < 0) { - RETURN_FALSE; - } - -@@ -504,7 +511,7 @@ PHP_METHOD(Redis, pconnect) - } else { - /* reset multi/exec state if there is one. */ - RedisSock *redis_sock; -- if (redis_sock_get(getThis(), &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(getThis(), &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -547,7 +554,7 @@ PHPAPI int redis_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) { - } - - /* if there is a redis sock already we have to remove it from the list */ -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) > 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) > 0) { - if (zend_hash_find(Z_OBJPROP_P(object), "socket", - sizeof("socket"), (void **) &socket) == FAILURE) { - /* maybe there is a socket but the id isn't known.. what to do? */ -@@ -587,7 +594,7 @@ PHP_METHOD(Redis, close) - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -617,7 +624,7 @@ PHP_METHOD(Redis, set) - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -656,7 +663,7 @@ PHP_METHOD(Redis, setex) - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -691,7 +698,7 @@ PHP_METHOD(Redis, setnx) - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -729,7 +736,7 @@ PHP_METHOD(Redis, getSet) - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -763,7 +770,7 @@ PHP_METHOD(Redis, randomKey) - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -778,6 +785,39 @@ PHP_METHOD(Redis, randomKey) - } - /* }}} */ - -+/* {{{ proto string Redis::echo(string key) -+ */ -+PHP_METHOD(Redis, echo) -+{ -+ zval *object; -+ RedisSock *redis_sock; -+ char *key = NULL, *cmd; -+ int key_len, cmd_len; -+ int key_free; -+ -+ if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", -+ &object, redis_ce, -+ &key, &key_len) == FAILURE) { -+ RETURN_FALSE; -+ } -+ -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { -+ RETURN_FALSE; -+ } -+ -+ key_free = redis_key_prefix(redis_sock, &key, &key_len TSRMLS_CC); -+ cmd_len = redis_cmd_format_static(&cmd, "ECHO", "s", key, key_len); -+ if(key_free) efree(key); -+ -+ REDIS_PROCESS_REQUEST(redis_sock, cmd, cmd_len); -+ IF_ATOMIC() { -+ redis_string_response(INTERNAL_FUNCTION_PARAM_PASSTHRU, redis_sock, NULL, NULL); -+ } -+ REDIS_PROCESS_RESPONSE(redis_string_response); -+ -+} -+/* }}} */ -+ - /* {{{ proto string Redis::renameKey(string key_src, string key_dst) - */ - PHP_METHOD(Redis, renameKey) -@@ -796,7 +836,7 @@ PHP_METHOD(Redis, renameKey) - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -833,7 +873,7 @@ PHP_METHOD(Redis, renameNx) - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -868,7 +908,7 @@ PHP_METHOD(Redis, get) - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -900,7 +940,7 @@ PHP_METHOD(Redis, ping) - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -929,7 +969,7 @@ PHPAPI void redis_atomic_increment(INTERNAL_FUNCTION_PARAMETERS, char *keyword, - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - key_free = redis_key_prefix(redis_sock, &key, &key_len TSRMLS_CC); -@@ -1055,7 +1095,7 @@ PHP_METHOD(Redis, getMultiple) - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -1141,7 +1181,7 @@ PHP_METHOD(Redis, exists) - &key, &key_len) == FAILURE) { - RETURN_FALSE; - } -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -1240,7 +1280,7 @@ PHP_METHOD(Redis, getKeys) - RETURN_NULL(); - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -1274,7 +1314,7 @@ PHP_METHOD(Redis, type) - RETURN_NULL(); - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -1304,7 +1344,7 @@ PHP_METHOD(Redis, append) - RETURN_NULL(); - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -1333,7 +1373,7 @@ PHP_METHOD(Redis, getRange) - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -1361,7 +1401,7 @@ PHP_METHOD(Redis, setRange) - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -1389,7 +1429,7 @@ PHP_METHOD(Redis, getBit) - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -1418,7 +1458,7 @@ PHP_METHOD(Redis, setBit) - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -1447,7 +1487,7 @@ PHP_METHOD(Redis, strlen) - RETURN_NULL(); - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -1477,7 +1517,7 @@ generic_push_function(INTERNAL_FUNCTION_PARAMETERS, char *keyword, int keyword_l - RETURN_NULL(); - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -1550,7 +1590,7 @@ PHP_METHOD(Redis, lInsert) - RETURN_NULL(); - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -1599,7 +1639,7 @@ generic_pop_function(INTERNAL_FUNCTION_PARAMETERS, char *keyword, int keyword_le - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -1689,7 +1729,7 @@ PHP_METHOD(Redis, lSize) - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -1725,7 +1765,7 @@ PHP_METHOD(Redis, lRemove) - RETURN_NULL(); - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -1761,7 +1801,7 @@ PHP_METHOD(Redis, listTrim) - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -1794,7 +1834,7 @@ PHP_METHOD(Redis, lGet) - RETURN_NULL(); - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -1827,7 +1867,7 @@ PHP_METHOD(Redis, lGetRange) - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -1878,7 +1918,7 @@ PHP_METHOD(Redis, sSize) - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -1930,7 +1970,7 @@ PHP_METHOD(Redis, sMove) - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -1985,7 +2025,7 @@ PHP_METHOD(Redis, sContains) - return; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -2018,7 +2058,7 @@ PHP_METHOD(Redis, sMembers) - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -2059,7 +2099,7 @@ PHPAPI int generic_multiple_args_cmd(INTERNAL_FUNCTION_PARAMETERS, char *keyword - } - - /* get redis socket */ -- if (redis_sock_get(getThis(), out_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(getThis(), out_sock TSRMLS_CC, 0) < 0) { - ZVAL_BOOL(return_value, 0); - return FAILURE; - } -@@ -2392,7 +2432,7 @@ PHP_METHOD(Redis, sort) { - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -2603,7 +2643,7 @@ PHPAPI void generic_sort_cmd(INTERNAL_FUNCTION_PARAMETERS, char *sort, int use_a - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - if(key_len == 0) { -@@ -2798,7 +2838,7 @@ PHPAPI void generic_expire_cmd(INTERNAL_FUNCTION_PARAMETERS, char *keyword, int - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -2847,7 +2887,7 @@ PHP_METHOD(Redis, lSet) { - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -2874,7 +2914,7 @@ PHPAPI void generic_empty_cmd_impl(INTERNAL_FUNCTION_PARAMETERS, char *cmd, int - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -2921,7 +2961,7 @@ PHPAPI void generic_empty_long_cmd(INTERNAL_FUNCTION_PARAMETERS, char *cmd, int - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -2988,7 +3028,7 @@ PHP_METHOD(Redis, auth) { - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -3017,7 +3057,7 @@ PHP_METHOD(Redis, persist) { - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -3048,7 +3088,7 @@ PHP_METHOD(Redis, ttl) { - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -3079,7 +3119,7 @@ PHP_METHOD(Redis, info) { - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -3118,7 +3158,7 @@ PHP_METHOD(Redis, select) { - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -3148,7 +3188,7 @@ PHP_METHOD(Redis, move) { - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -3183,7 +3223,7 @@ generic_mset(INTERNAL_FUNCTION_PARAMETERS, char *kw, void (*fun)(INTERNAL_FUNCTI - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -3307,7 +3347,7 @@ PHP_METHOD(Redis, rpoplpush) - zval *object; - RedisSock *redis_sock; - char *srckey = NULL, *dstkey = NULL; -- int srckey_len, dstkey_len, cmd_len; -+ int srckey_len, dstkey_len; - - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oss", - &object, redis_ce, &srckey, &srckey_len, -@@ -3315,7 +3355,7 @@ PHP_METHOD(Redis, rpoplpush) - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -3339,7 +3379,7 @@ PHP_METHOD(Redis, brpoplpush) - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -3367,7 +3407,7 @@ PHP_METHOD(Redis, zAdd) { - int argc = ZEND_NUM_ARGS(), i; - - /* get redis socket */ -- if (redis_sock_get(getThis(), &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(getThis(), &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -3466,7 +3506,7 @@ PHP_METHOD(Redis, zRange) - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -3529,7 +3569,7 @@ PHP_METHOD(Redis, zDeleteRangeByScore) - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -3562,7 +3602,7 @@ PHP_METHOD(Redis, zDeleteRangeByRank) - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -3596,7 +3636,7 @@ PHP_METHOD(Redis, zReverseRange) - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -3649,7 +3689,7 @@ redis_generic_zrange_by_score(INTERNAL_FUNCTION_PARAMETERS, char *keyword) { - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -3755,7 +3795,7 @@ PHP_METHOD(Redis, zCount) - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -3786,7 +3826,7 @@ PHP_METHOD(Redis, zCard) - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -3820,7 +3860,7 @@ PHP_METHOD(Redis, zScore) - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -3853,7 +3893,7 @@ PHPAPI void generic_rank_method(INTERNAL_FUNCTION_PARAMETERS, char *keyword, int - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -3903,7 +3943,7 @@ PHPAPI void generic_incrby_method(INTERNAL_FUNCTION_PARAMETERS, char *keyword, i - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -3948,7 +3988,7 @@ PHPAPI void generic_z_command(INTERNAL_FUNCTION_PARAMETERS, char *command, int c - RETURN_FALSE; - } - -- if(redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if(redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -4126,7 +4166,7 @@ generic_hset(INTERNAL_FUNCTION_PARAMETERS, char *kw, void (*fun)(INTERNAL_FUNCTI - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -4170,7 +4210,7 @@ PHP_METHOD(Redis, hGet) - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - key_free = redis_key_prefix(redis_sock, &key, &key_len TSRMLS_CC); -@@ -4200,7 +4240,7 @@ PHP_METHOD(Redis, hLen) - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -4232,7 +4272,7 @@ generic_hash_command_2(INTERNAL_FUNCTION_PARAMETERS, char *keyword, int keyword_ - return NULL; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - ZVAL_BOOL(return_value, 0); - return NULL; - } -@@ -4293,7 +4333,7 @@ generic_hash_command_1(INTERNAL_FUNCTION_PARAMETERS, char *keyword, int keyword_ - return NULL; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - ZVAL_BOOL(return_value, 0); - return NULL; - } -@@ -4441,7 +4481,7 @@ PHP_METHOD(Redis, hIncrBy) - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -4492,7 +4532,7 @@ PHP_METHOD(Redis, hMget) { - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - nb_fields = zend_hash_num_elements(Z_ARRVAL_P(z_array)); -@@ -4572,7 +4612,7 @@ PHP_METHOD(Redis, hMset) - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -4681,7 +4721,7 @@ PHP_METHOD(Redis, multi) - - /* if the flag is activated, send the command, the reply will be "QUEUED" or -ERR */ - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -4730,7 +4770,7 @@ PHP_METHOD(Redis, discard) - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -4832,7 +4872,7 @@ PHP_METHOD(Redis, exec) - &object, redis_ce) == FAILURE) { - RETURN_FALSE; - } -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -4931,7 +4971,7 @@ PHP_METHOD(Redis, pipeline) - } - - /* if the flag is activated, send the command, the reply will be "QUEUED" or -ERR */ -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - redis_sock->mode = PIPELINE; -@@ -4963,7 +5003,7 @@ PHP_METHOD(Redis, publish) - RETURN_NULL(); - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -5004,7 +5044,7 @@ PHP_METHOD(Redis, subscribe) - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -5164,7 +5204,7 @@ PHP_METHOD(Redis, unsubscribe) - &object, redis_ce, &array) == FAILURE) { - RETURN_FALSE; - } -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -5248,7 +5288,7 @@ PHP_METHOD(Redis, slaveof) - &object, redis_ce, &host, &host_len, &port) == FAILURE) { - RETURN_FALSE; - } -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -5280,7 +5320,7 @@ PHP_METHOD(Redis, object) - &object, redis_ce, &info, &info_len, &key, &key_len) == FAILURE) { - RETURN_FALSE; - } -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -5318,7 +5358,7 @@ PHP_METHOD(Redis, getOption) { - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -5354,7 +5394,7 @@ PHP_METHOD(Redis, setOption) { - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -5414,7 +5454,7 @@ PHP_METHOD(Redis, config) - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -diff --git a/tests/TestRedis.php b/tests/TestRedis.php -index 1033b01..46af355 100644 ---- a/tests/TestRedis.php -+++ tests/TestRedis.php -@@ -115,6 +115,12 @@ class Redis_Test extends TestSuite - $this->assertEquals($s, $this->redis->get('x')); - } - -+ public function testEcho() { -+ $this->assertEquals($this->redis->echo("hello"), "hello"); -+ $this->assertEquals($this->redis->echo(""), ""); -+ $this->assertEquals($this->redis->echo(" 0123 "), " 0123 "); -+ } -+ - public function testErr() { - - $this->redis->set('x', '-ERR'); diff --git a/databases/php53-redis/pkg-descr b/databases/php53-redis/pkg-descr deleted file mode 100644 index 9d73cce42f8d..000000000000 --- a/databases/php53-redis/pkg-descr +++ /dev/null @@ -1,8 +0,0 @@ -This extension provides an API for communicating with Redis database, -a persistent key-value database with built-in net interface written -in ANSI-C for Posix systems. - -It is a fork of alfonsojimenez's phpredis, adding many methods and -fixing a lot of issues. - -WWW: https://github.com/nicolasff/phpredis diff --git a/databases/php53-sqlite/Makefile b/databases/php53-sqlite/Makefile deleted file mode 100644 index 07e5a2ca34e1..000000000000 --- a/databases/php53-sqlite/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php53 - -PKGNAMESUFFIX= -sqlite - -.include "${MASTERDIR}/Makefile" diff --git a/databases/php53-sqlite/files/patch-config.m4 b/databases/php53-sqlite/files/patch-config.m4 deleted file mode 100644 index c8cf2bc00557..000000000000 --- a/databases/php53-sqlite/files/patch-config.m4 +++ /dev/null @@ -1,44 +0,0 @@ ---- config.m4.orig Wed Nov 30 05:50:03 2005 -+++ 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/php53-sqlite3/Makefile b/databases/php53-sqlite3/Makefile deleted file mode 100644 index c8faa8a5a6a7..000000000000 --- a/databases/php53-sqlite3/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# $FreeBSD$ - -PORTREVISION= 3 -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php53 - -PKGNAMESUFFIX= -sqlite3 - -.include "${MASTERDIR}/Makefile" diff --git a/databases/php53-sybase_ct/Makefile b/databases/php53-sybase_ct/Makefile deleted file mode 100644 index a70c7110d9c8..000000000000 --- a/databases/php53-sybase_ct/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php53 - -PKGNAMESUFFIX= -sybase_ct - -.include "${MASTERDIR}/Makefile" diff --git a/devel/Makefile b/devel/Makefile index e1c326434ee7..bcaa0a279dfd 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -278,7 +278,6 @@ SUBDIR += cproto SUBDIR += cpuflags SUBDIR += critcl - SUBDIR += cross-binutils SUBDIR += cscope SUBDIR += cscout SUBDIR += csmith @@ -1325,7 +1324,6 @@ SUBDIR += mingw32-pdcurses SUBDIR += mingw32-pthreads SUBDIR += mingw32-zlib - SUBDIR += mingw64-binutils SUBDIR += mips-binutils SUBDIR += mips64-binutils SUBDIR += mk @@ -3521,7 +3519,6 @@ SUBDIR += pecl-uopz SUBDIR += pecl-uploadprogress SUBDIR += pecl-uri_template - SUBDIR += pecl-uuid SUBDIR += pecl-vld SUBDIR += pecl-xhprof SUBDIR += pecl-yac @@ -3553,15 +3550,6 @@ SUBDIR += php5-sysvshm SUBDIR += php5-thrift SUBDIR += php5-tokenizer - SUBDIR += php53-gettext - SUBDIR += php53-json - SUBDIR += php53-pcntl - SUBDIR += php53-readline - SUBDIR += php53-shmop - SUBDIR += php53-sysvmsg - SUBDIR += php53-sysvsem - SUBDIR += php53-sysvshm - SUBDIR += php53-tokenizer SUBDIR += php55-gettext SUBDIR += php55-json SUBDIR += php55-pcntl diff --git a/devel/cross-binutils/Makefile b/devel/cross-binutils/Makefile deleted file mode 100644 index 14da6bd37a18..000000000000 --- a/devel/cross-binutils/Makefile +++ /dev/null @@ -1,150 +0,0 @@ -# Created by: Stanislav Sedov <stas@FreeBSD.org> -# $FreeBSD$ - -PORTNAME= binutils -PORTVERSION= 2.23.2 -PORTREVISION= 1 -CATEGORIES= devel -MASTER_SITES= ${MASTER_SITE_SOURCEWARE} -MASTER_SITE_SUBDIR= binutils/releases -PKGNAMEPREFIX= ${TGTARCH}-${TGTABI}- - -PATCH_SITES= ftp://ftp.rtems.com/pub/rtems/SOURCES/4.11/ -PATCH_DIST_STRIP= -p1 - -MAINTAINER= ports@FreeBSD.org -COMMENT= GNU binutils port for cross-target development - -FORBIDDEN= Multiple vulnerbilities parsing PE and ihex files -DEPRECATED= Obsolete. Migrate to devel/binutils based ports -EXPIRATION_DATE= 2015-04-15 - -USES= gmake makeinfo tar:bzip2 -GNU_CONFIGURE= yes -ALL_TARGET= all info -MAKE_JOBS_UNSAFE= yes - -.include <bsd.port.options.mk> - -CONFIGURE_ARGS+= --disable-nls \ - --with-system-zlib \ - --with-sysroot=/ \ - --target=${OURTARGET} \ - --disable-werror - -OURTARGET= ${TGTARCH}-${TGTABI} - -INFO= ${OURTARGET}-as \ - ${OURTARGET}-bfd \ - ${OURTARGET}-binutils \ - ${OURTARGET}-ld - -PLIST_FILES= bin/${OURTARGET}-addr2line \ - bin/${OURTARGET}-ar \ - bin/${OURTARGET}-as \ - bin/${OURTARGET}-c++filt \ - bin/${OURTARGET}-elfedit \ - bin/${OURTARGET}-ld \ - bin/${OURTARGET}-ld.bfd \ - bin/${OURTARGET}-nm \ - bin/${OURTARGET}-objcopy \ - bin/${OURTARGET}-objdump \ - bin/${OURTARGET}-ranlib \ - bin/${OURTARGET}-readelf \ - bin/${OURTARGET}-size \ - bin/${OURTARGET}-strings \ - bin/${OURTARGET}-strip \ - man/man1/${OURTARGET}-addr2line.1.gz \ - man/man1/${OURTARGET}-ar.1.gz \ - man/man1/${OURTARGET}-as.1.gz \ - man/man1/${OURTARGET}-c++filt.1.gz \ - man/man1/${OURTARGET}-elfedit.1.gz \ - man/man1/${OURTARGET}-dlltool.1.gz \ - man/man1/${OURTARGET}-ld.1.gz \ - man/man1/${OURTARGET}-nlmconv.1.gz \ - man/man1/${OURTARGET}-nm.1.gz \ - man/man1/${OURTARGET}-objcopy.1.gz \ - man/man1/${OURTARGET}-objdump.1.gz \ - man/man1/${OURTARGET}-ranlib.1.gz \ - man/man1/${OURTARGET}-readelf.1.gz \ - man/man1/${OURTARGET}-size.1.gz \ - man/man1/${OURTARGET}-strings.1.gz \ - man/man1/${OURTARGET}-strip.1.gz \ - man/man1/${OURTARGET}-windmc.1.gz \ - man/man1/${OURTARGET}-windres.1.gz - -.if defined(TGTARCH) && ${TGTARCH} != mips -INFO+= ${OURTARGET}-gprof -PLIST_FILES+= bin/${OURTARGET}-gprof \ - man/man1/${OURTARGET}-gprof.1.gz -.endif - -.if defined(TGTABI) && (${TGTABI} == pc-mingw32 || ${TGTABI} == mingw32) -PLIST_FILES+= bin/${OURTARGET}-dlltool \ - bin/${OURTARGET}-dllwrap \ - bin/${OURTARGET}-windmc \ - bin/${OURTARGET}-windres -.endif - -.if ${PORT_OPTIONS:MRTEMS_PATCHES} -PATCHFILES+= ${PORTNAME}-${PORTVERSION}-rtems4.11-20130326.diff -.endif - -.if !defined(TGTARCH) || !defined(TGTABI) -PKGNAMEPREFIX= cross- -IGNORE= you should define TGTARCH and TGTABI to build port -.endif - -# -# Macro to fix up info referencies -# -FIXREFS= ${SH} -c '${REINPLACE_CMD} -E \ - -e "s,$$0\.(texi|info),${OURTARGET}-$$0.\1,g" \ - -e "s,(@file)\{$$0\},\1\{${OURTARGET}-$$0\},g" \ - -e "s,\($$0\),\(${OURTARGET}-$$0\),g" $$*' -- - -post-patch: -# -# Patch and rename info files -# - @${FIXREFS} as ${WRKSRC}/gas/doc/as.texinfo \ - ${WRKSRC}/gas/doc/Makefile.in - @${FIXREFS} bfd ${WRKSRC}/bfd/doc/bfd.texinfo \ - ${WRKSRC}/bfd/doc/Makefile.in - @${FIXREFS} binutils ${WRKSRC}/binutils/doc/binutils.texi \ - ${WRKSRC}/binutils/doc/Makefile.in - @${FIXREFS} ld ${WRKSRC}/ld/ld.texinfo \ - ${WRKSRC}/ld/Makefile.in - @${FIXREFS} gprof ${WRKSRC}/gprof/gprof.texi \ - ${WRKSRC}/gprof/Makefile.in - - @${MV} ${WRKSRC}/gas/doc/as.texinfo \ - ${WRKSRC}/gas/doc/${OURTARGET}-as.texinfo - @${MV} ${WRKSRC}/bfd/doc/bfd.texinfo \ - ${WRKSRC}/bfd/doc/${OURTARGET}-bfd.texinfo - @${MV} ${WRKSRC}/binutils/doc/binutils.texi \ - ${WRKSRC}/binutils/doc/${OURTARGET}-binutils.texi - @${MV} ${WRKSRC}/ld/ld.texinfo \ - ${WRKSRC}/ld/${OURTARGET}-ld.texinfo - @${MV} ${WRKSRC}/gprof/gprof.texi \ - ${WRKSRC}/gprof/${OURTARGET}-gprof.texi - - @${RM} ${WRKSRC}/etc/*.info ${WRKSRC}/etc/*.texi - -# -# Disable install target in some directories -# - @${REINPLACE_CMD} -E -e 's,^(install:).*,\1,' \ - ${WRKSRC}/etc/Makefile.in \ - ${WRKSRC}/libiberty/Makefile.in \ - ${WRKSRC}/opcodes/Makefile.in - -post-install: -# -# Add some plist items (we don't list them directly, since the set varies -# across different targets) -# - @${FIND} -ds ${STAGEDIR}${PREFIX}/${OURTARGET} ! -type d | \ - ${SED} -e 's,^${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST} - -.include <bsd.port.mk> diff --git a/devel/cross-binutils/distinfo b/devel/cross-binutils/distinfo deleted file mode 100644 index 7d6e93651f6b..000000000000 --- a/devel/cross-binutils/distinfo +++ /dev/null @@ -1,4 +0,0 @@ -SHA256 (binutils-2.23.2.tar.bz2) = fe914e56fed7a9ec2eb45274b1f2e14b0d8b4f41906a5194eac6883cfe5c1097 -SIZE (binutils-2.23.2.tar.bz2) = 21440347 -SHA256 (binutils-2.23.2-rtems4.11-20130326.diff) = 806c44d2987088b9c4752a769cacff89c495366f8c3222e13fae7622a8ff662f -SIZE (binutils-2.23.2-rtems4.11-20130326.diff) = 7844 diff --git a/devel/cross-binutils/pkg-descr b/devel/cross-binutils/pkg-descr deleted file mode 100644 index 8b5c96777748..000000000000 --- a/devel/cross-binutils/pkg-descr +++ /dev/null @@ -1,12 +0,0 @@ -GNU binutils for cross-target application development. - -Prerequisite for the GCC cross-compiling environment. - -Use TGTARCH switch to select target architecture, and TGTABI to select ABI. -E.g. the following command will build binutils for rtems on sparc: -% make TGTARCH=sparc TGTABI=rtems - -If you encounter any problems building/using/installing this port, please -make me know. It would help to improve this port in feature. - -WWW: http://sources.redhat.com/binutils/ diff --git a/devel/mingw64-binutils/Makefile b/devel/mingw64-binutils/Makefile deleted file mode 100644 index f4163edbe42b..000000000000 --- a/devel/mingw64-binutils/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Created by: stas -# $FreeBSD$ - -MAINTAINER= ports@FreeBSD.org - -TGTARCH= x86_64 -TGTABI= pc-mingw32 - -MASTERDIR= ${.CURDIR}/../cross-binutils -.include "${MASTERDIR}/Makefile" diff --git a/devel/pecl-uuid/Makefile b/devel/pecl-uuid/Makefile deleted file mode 100644 index c40b23e7dc9e..000000000000 --- a/devel/pecl-uuid/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -# Created by: Jui-Nan Lin <jnlin@csie.nctu.edu.tw> -# $FreeBSD$ - -PORTNAME= uuid -PORTVERSION= 1.0.2 -CATEGORIES= devel -MASTER_SITES= http://pecl.php.net/get/ -PKGNAMEPREFIX= pecl- -EXTRACT_SUFX= .tgz -DIST_SUBDIR= PECL - -MAINTAINER= jnlin@csie.nctu.edu.tw -COMMENT= UUID extension - -DEPRECATED= requires php53, security EOL reached 14 Aug 2014 -EXPIRATION_DATE= 2015-04-15 - -LIB_DEPENDS= libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid - -CONFIGURE_ARGS= --with-uuid=${LOCALBASE} CFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib -PHP_MODNAME= ${PORTNAME} -USE_PHP= yes -USE_PHPEXT= yes -IGNORE_WITH_PHP=5 55 56 - -.include <bsd.port.mk> diff --git a/devel/pecl-uuid/distinfo b/devel/pecl-uuid/distinfo deleted file mode 100644 index 0f9dc4018753..000000000000 --- a/devel/pecl-uuid/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (PECL/uuid-1.0.2.tgz) = 69af0fa121814fde51228dc2ba809a3f2988f3bca60a413c64e5e0d03a9b0271 -SIZE (PECL/uuid-1.0.2.tgz) = 6217 diff --git a/devel/pecl-uuid/pkg-descr b/devel/pecl-uuid/pkg-descr deleted file mode 100644 index 719ce6af7107..000000000000 --- a/devel/pecl-uuid/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -A wrapper around libuuid from the ext2utils project. - -WWW: http://pecl.php.net/package/uuid diff --git a/devel/php53-gettext/Makefile b/devel/php53-gettext/Makefile deleted file mode 100644 index de9d01f70731..000000000000 --- a/devel/php53-gettext/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= devel - -MASTERDIR= ${.CURDIR}/../../lang/php53 - -PKGNAMESUFFIX= -gettext - -.include "${MASTERDIR}/Makefile" diff --git a/devel/php53-gettext/files/patch-config.m4 b/devel/php53-gettext/files/patch-config.m4 deleted file mode 100644 index 2b497d366574..000000000000 --- a/devel/php53-gettext/files/patch-config.m4 +++ /dev/null @@ -1,17 +0,0 @@ ---- config.m4.orig Tue Jul 27 23:58:02 2004 -+++ 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/php53-json/Makefile b/devel/php53-json/Makefile deleted file mode 100644 index 41590295167d..000000000000 --- a/devel/php53-json/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= devel - -MASTERDIR= ${.CURDIR}/../../lang/php53 - -PKGNAMESUFFIX= -json - -.include "${MASTERDIR}/Makefile" diff --git a/devel/php53-pcntl/Makefile b/devel/php53-pcntl/Makefile deleted file mode 100644 index 05263c5220ea..000000000000 --- a/devel/php53-pcntl/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= devel - -MASTERDIR= ${.CURDIR}/../../lang/php53 - -PKGNAMESUFFIX= -pcntl - -.include "${MASTERDIR}/Makefile" diff --git a/devel/php53-readline/Makefile b/devel/php53-readline/Makefile deleted file mode 100644 index efbe308d9bc1..000000000000 --- a/devel/php53-readline/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= devel - -MASTERDIR= ${.CURDIR}/../../lang/php53 - -PKGNAMESUFFIX= -readline - -.include "${MASTERDIR}/Makefile" diff --git a/devel/php53-readline/files/patch-config.m4 b/devel/php53-readline/files/patch-config.m4 deleted file mode 100644 index b0b2bb521bc7..000000000000 --- a/devel/php53-readline/files/patch-config.m4 +++ /dev/null @@ -1,38 +0,0 @@ ---- config.m4.orig 2009-08-04 13:20:49.000000000 +0200 -+++ 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/php53-shmop/Makefile b/devel/php53-shmop/Makefile deleted file mode 100644 index edc730788431..000000000000 --- a/devel/php53-shmop/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= devel - -MASTERDIR= ${.CURDIR}/../../lang/php53 - -PKGNAMESUFFIX= -shmop - -.include "${MASTERDIR}/Makefile" diff --git a/devel/php53-sysvmsg/Makefile b/devel/php53-sysvmsg/Makefile deleted file mode 100644 index 4728d1783cad..000000000000 --- a/devel/php53-sysvmsg/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= devel - -MASTERDIR= ${.CURDIR}/../../lang/php53 - -PKGNAMESUFFIX= -sysvmsg - -.include "${MASTERDIR}/Makefile" diff --git a/devel/php53-sysvsem/Makefile b/devel/php53-sysvsem/Makefile deleted file mode 100644 index 989f13324c2f..000000000000 --- a/devel/php53-sysvsem/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= devel - -MASTERDIR= ${.CURDIR}/../../lang/php53 - -PKGNAMESUFFIX= -sysvsem - -.include "${MASTERDIR}/Makefile" diff --git a/devel/php53-sysvshm/Makefile b/devel/php53-sysvshm/Makefile deleted file mode 100644 index 431ab141b268..000000000000 --- a/devel/php53-sysvshm/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= devel - -MASTERDIR= ${.CURDIR}/../../lang/php53 - -PKGNAMESUFFIX= -sysvshm - -.include "${MASTERDIR}/Makefile" diff --git a/devel/php53-tokenizer/Makefile b/devel/php53-tokenizer/Makefile deleted file mode 100644 index 23747b1f4ec7..000000000000 --- a/devel/php53-tokenizer/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= devel - -MASTERDIR= ${.CURDIR}/../../lang/php53 - -PKGNAMESUFFIX= -tokenizer - -.include "${MASTERDIR}/Makefile" diff --git a/ftp/Makefile b/ftp/Makefile index 1aa9254ae3fe..542a09c1f2b6 100644 --- a/ftp/Makefile +++ b/ftp/Makefile @@ -66,8 +66,6 @@ SUBDIR += pftpd SUBDIR += php5-curl SUBDIR += php5-ftp - SUBDIR += php53-curl - SUBDIR += php53-ftp SUBDIR += php55-curl SUBDIR += php55-ftp SUBDIR += php56-curl diff --git a/ftp/php53-curl/Makefile b/ftp/php53-curl/Makefile deleted file mode 100644 index 1080752fdc0e..000000000000 --- a/ftp/php53-curl/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= ftp - -MASTERDIR= ${.CURDIR}/../../lang/php53 - -PKGNAMESUFFIX= -curl - -.include "${MASTERDIR}/Makefile" diff --git a/ftp/php53-ftp/Makefile b/ftp/php53-ftp/Makefile deleted file mode 100644 index aead40c91572..000000000000 --- a/ftp/php53-ftp/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= ftp - -MASTERDIR= ${.CURDIR}/../../lang/php53 - -PKGNAMESUFFIX= -ftp - -post-patch: - @${REINPLACE_CMD} s/HAVE_OPENSSL_EXT/__FreeBSD__/ \ - ${WRKSRC}/ftp.* ${WRKSRC}/php_ftp.* - -.include "${MASTERDIR}/Makefile" diff --git a/german/Makefile b/german/Makefile index 59ef42e3dee5..3bda51c83ba4 100644 --- a/german/Makefile +++ b/german/Makefile @@ -24,7 +24,6 @@ SUBDIR += libreoffice SUBDIR += mediathek SUBDIR += mythes - SUBDIR += pecl-konto_check SUBDIR += phone SUBDIR += php_doc SUBDIR += schwobifyer diff --git a/german/pecl-konto_check/Makefile b/german/pecl-konto_check/Makefile deleted file mode 100644 index db562149032f..000000000000 --- a/german/pecl-konto_check/Makefile +++ /dev/null @@ -1,40 +0,0 @@ -# Created by: Dominik Brettnacher <domi@nonsensss.de> -# $FreeBSD$ - -PORTNAME= konto_check -PORTVERSION= 2.98 -CATEGORIES= german -MASTER_SITES= SF/kontocheck/konto_check-de/${PORTVERSION} -PKGNAMEPREFIX= pecl- - -MAINTAINER= ports@FreeBSD.org -COMMENT= PHP module to check German and Austrian Bank Account Numbers - -DEPRECATED= requires php53, security EOL reached 14 Aug 2014 -EXPIRATION_DATE= 2015-04-15 - -IGNORE_WITH_PHP=5 55 56 -USES= zip:infozip -USE_PHP= yes -USE_PHPIZE= yes -USE_PHPEXT= yes -PHP_MODNAME= ${PORTNAME} - -WRKSRC= ${WRKDIR}/php - -OPTIONS_DEFINE= DOCS - -post-extract: - @${UNZIP_CMD} -q -d ${WRKDIR} ${WRKDIR}/php.zip - -post-patch: - @${REINPLACE_CMD} -e "s|\"/etc|\"${ETCDIR}|g;" ${WRKSRC}/konto_check.c ${WRKSRC}/konto_check.lxx - -post-install: - @${MKDIR} ${STAGEDIR}${ETCDIR} - @${INSTALL_DATA} ${WRKDIR}/blz.lut ${STAGEDIR}${ETCDIR} - @${INSTALL_DATA} ${WRKDIR}/blz.lut2 ${STAGEDIR}${ETCDIR} - @${MKDIR} ${STAGEDIR}${DOCSDIR} - @${INSTALL_DATA} ${WRKDIR}/00liesmich.pdf ${STAGEDIR}${DOCSDIR} - -.include <bsd.port.mk> diff --git a/german/pecl-konto_check/distinfo b/german/pecl-konto_check/distinfo deleted file mode 100644 index 3e4138aad3bb..000000000000 --- a/german/pecl-konto_check/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (konto_check-2.98.zip) = 5cd0d6683fcec74af91d3baa61513f4a515e474eb385ed8c95d9e18778b23742 -SIZE (konto_check-2.98.zip) = 628212 diff --git a/german/pecl-konto_check/files/patch-konto_check.c b/german/pecl-konto_check/files/patch-konto_check.c deleted file mode 100644 index ddc373db2f0f..000000000000 --- a/german/pecl-konto_check/files/patch-konto_check.c +++ /dev/null @@ -1,40 +0,0 @@ ---- konto_check.c.orig 2009-08-11 10:46:54.000000000 +0200 -+++ konto_check.c 2009-08-11 10:47:04.000000000 +0200 -@@ -74,31 +74,31 @@ - static int search_lutfile(char *name); - - #ifdef ZEND_ENGINE_2 --static ZEND_BEGIN_ARG_INFO(byref_0,1) -+ZEND_BEGIN_ARG_INFO(byref_0,1) - ZEND_END_ARG_INFO() - --static ZEND_BEGIN_ARG_INFO(byref_1,1) -+ZEND_BEGIN_ARG_INFO(byref_1,1) - ZEND_ARG_PASS_INFO(0) - ZEND_END_ARG_INFO() - --static ZEND_BEGIN_ARG_INFO(byref_11,1) -+ZEND_BEGIN_ARG_INFO(byref_11,1) - ZEND_ARG_PASS_INFO(0) - ZEND_ARG_PASS_INFO(1) - ZEND_ARG_PASS_INFO(0) - ZEND_END_ARG_INFO() - --static ZEND_BEGIN_ARG_INFO(byref_2,1) -+ZEND_BEGIN_ARG_INFO(byref_2,1) - ZEND_ARG_PASS_INFO(0) - ZEND_ARG_PASS_INFO(0) - ZEND_END_ARG_INFO() - --static ZEND_BEGIN_ARG_INFO(byref_3,1) -+ZEND_BEGIN_ARG_INFO(byref_3,1) - ZEND_ARG_PASS_INFO(0) - ZEND_ARG_PASS_INFO(0) - ZEND_ARG_PASS_INFO(0) - ZEND_END_ARG_INFO() - --static ZEND_BEGIN_ARG_INFO(byref_4,1) -+ZEND_BEGIN_ARG_INFO(byref_4,1) - ZEND_ARG_PASS_INFO(0) - ZEND_ARG_PASS_INFO(0) - ZEND_ARG_PASS_INFO(0) diff --git a/german/pecl-konto_check/pkg-descr b/german/pecl-konto_check/pkg-descr deleted file mode 100644 index dcad5ada8edd..000000000000 --- a/german/pecl-konto_check/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -konto_check is a PHP module to check the validity of German and -Austrian Bank Account Numbers. All currently defined test methods -by Deutsche Bundesbank (March 2009: 00 to D3) are implemented. - -This port only installs the PHP module. - -WWW: http://www.informatik.hs-mannheim.de/konto_check/ diff --git a/german/pecl-konto_check/pkg-plist b/german/pecl-konto_check/pkg-plist deleted file mode 100644 index 8d0f358cc2f6..000000000000 --- a/german/pecl-konto_check/pkg-plist +++ /dev/null @@ -1,3 +0,0 @@ -%%ETCDIR%%/blz.lut -%%ETCDIR%%/blz.lut2 -%%PORTDOCS%%%%DOCSDIR%%/00liesmich.pdf diff --git a/graphics/Makefile b/graphics/Makefile index 676f4d629149..304d48985c4d 100644 --- a/graphics/Makefile +++ b/graphics/Makefile @@ -752,8 +752,6 @@ SUBDIR += php5-ffmpeg SUBDIR += php5-gd SUBDIR += php5-swfed - SUBDIR += php53-exif - SUBDIR += php53-gd SUBDIR += php55-exif SUBDIR += php55-gd SUBDIR += php56-exif diff --git a/graphics/php53-exif/Makefile b/graphics/php53-exif/Makefile deleted file mode 100644 index aedf2999fd48..000000000000 --- a/graphics/php53-exif/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= graphics - -MASTERDIR= ${.CURDIR}/../../lang/php53 - -PKGNAMESUFFIX= -exif - -.include "${MASTERDIR}/Makefile" diff --git a/graphics/php53-gd/Makefile b/graphics/php53-gd/Makefile deleted file mode 100644 index a28e120cba1d..000000000000 --- a/graphics/php53-gd/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= graphics - -MASTERDIR= ${.CURDIR}/../../lang/php53 - -PKGNAMESUFFIX= -gd - -.include "${MASTERDIR}/Makefile" diff --git a/graphics/php53-gd/files/patch-config.m4 b/graphics/php53-gd/files/patch-config.m4 deleted file mode 100644 index debdbc510a3f..000000000000 --- a/graphics/php53-gd/files/patch-config.m4 +++ /dev/null @@ -1,20 +0,0 @@ ---- config.m4.orig 2013-12-10 20:04:57.000000000 +0100 -+++ config.m4 2013-12-24 21:07:17.000000000 +0100 -@@ -162,7 +162,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 -@@ -210,7 +210,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/lang/Makefile b/lang/Makefile index f47f6e4506f0..0fa2d98609fc 100644 --- a/lang/Makefile +++ b/lang/Makefile @@ -228,8 +228,6 @@ SUBDIR += php-mode.el SUBDIR += php5 SUBDIR += php5-extensions - SUBDIR += php53 - SUBDIR += php53-extensions SUBDIR += php55 SUBDIR += php55-extensions SUBDIR += php56 diff --git a/lang/php53-extensions/Makefile b/lang/php53-extensions/Makefile deleted file mode 100644 index f19631193f25..000000000000 --- a/lang/php53-extensions/Makefile +++ /dev/null @@ -1,129 +0,0 @@ -# $FreeBSD$ - -PORTNAME= php53 -PORTVERSION= 1.6 -CATEGORIES= lang -MASTER_SITES= # none -PKGNAMESUFFIX= -extensions -DISTFILES= # none -EXTRACT_ONLY= # none - -MAINTAINER= ports@FreeBSD.org -COMMENT= "meta-port" to install PHP extensions - -DEPRECATED= security EOL reached 14 Aug 2014 -EXPIRATION_DATE= 2015-04-15 - -PHP_DEFAULT= 53 -IGNORE_WITH_PHP=5 52 55 -USE_PHP_BUILD= yes - -NO_BUILD= yes -NO_MTREE= yes - -LATEST_LINK= ${PORTNAME}${PKGNAMESUFFIX} - -OPTIONS_DEFINE= BCMATH BZ2 CALENDAR CTYPE CURL DBA \ - DOM EXIF FILEINFO FILTER FTP GD GETTEXT \ - GMP HASH ICONV IMAP INTERBASE JSON LDAP MBSTRING MCRYPT \ - MSSQL MYSQL MYSQLI \ - ODBC OPENSSL PCNTL PDF PDO PDO_MYSQL PDO_PGSQL PDO_SQLITE \ - PGSQL PHAR POSIX \ - PSPELL READLINE RECODE SESSION SHMOP SIMPLEXML SNMP SOAP \ - SOCKETS SQLITE SQLITE3 SYBASE_CT SYSVMSG SYSVSEM SYSVSHM \ - TIDY TOKENIZER WDDX XML XMLREADER XMLRPC XMLWRITER XSL \ - ZIP ZLIB - -OPTIONS_DEFAULT= CTYPE \ - DOM \ - FILTER \ - HASH \ - ICONV \ - JSON \ - PDO \ - PDO_SQLITE \ - PHAR \ - POSIX \ - SESSION \ - SIMPLEXML \ - SQLITE \ - SQLITE3 \ - 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 -CURL_DESC= CURL support -DBA_DESC= dba support -DOM_DESC= DOM support -EXIF_DESC= EXIF support -FILEINFO_DESC= fileinfo support -FILTER_DESC= input filter support -FTP_DESC= FTP support -GD_DESC= GD library support -GETTEXT_DESC= gettext library support -GMP_DESC= GNU MP support -HASH_DESC= HASH Message Digest Framework -ICONV_DESC= iconv support -IMAP_DESC= IMAP support -INTERBASE_DESC= Interbase 6 database support (Firebird) -JSON_DESC= JavaScript Object Serialization support -LDAP_DESC= OpenLDAP support -MBSTRING_DESC= multibyte string support -MCRYPT_DESC= Encryption support -MSSQL_DESC= MS-SQL database support -MYSQL_DESC= MySQL database support -MYSQLI_DESC= MySQLi database support -ODBC_DESC= ODBC support -OPENSSL_DESC= OpenSSL support -PCNTL_DESC= pcntl support (CLI only) -PDF_DESC= PDFlib support (implies GD) -PDO_DESC= PHP Data Objects Interface (PDO) -PDO_MYSQL_DESC= PDO MySQL driver -PDO_PGSQL_DESC= PDO PostgreSQL driver -PDO_SQLITE_DESC= PDO sqlite driver -PGSQL_DESC= PostgreSQL database support -PHAR_DESC= phar support -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 -SNMP_DESC= SNMP support -SOAP_DESC= SOAP support -SOCKETS_DESC= sockets support -SQLITE_DESC= sqlite support -SQLITE3_DESC= sqlite3 support -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) -XML_DESC= XML support -XMLREADER_DESC= XMLReader support -XMLRPC_DESC= XMLRPC-EPI support -XMLWRITER_DESC= XMLWriter support -XSL_DESC= XSL support (Implies DOM) -ZIP_DESC= ZIP support -ZLIB_DESC= ZLIB support - -.include <bsd.port.options.mk> - -.for opt in ${OPTIONS_DEFINE} -. if ${PORT_OPTIONS:M${opt}} -USE_PHP+= ${opt:tl} -. endif -.endfor - -do-install: build - @${DO_NADA} - -.include <bsd.port.mk> diff --git a/lang/php53-extensions/pkg-descr b/lang/php53-extensions/pkg-descr deleted file mode 100644 index 5418bd0942d7..000000000000 --- a/lang/php53-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/php53/Makefile b/lang/php53/Makefile deleted file mode 100644 index fba43a0b03e0..000000000000 --- a/lang/php53/Makefile +++ /dev/null @@ -1,191 +0,0 @@ -# Created by: Alex Dupre <sysadmin@alexdupre.com> -# $FreeBSD$ - -PORTNAME= php53 -PORTVERSION= 5.3.29 -PORTREVISION?= 5 -CATEGORIES?= lang devel www -MASTER_SITES= ${MASTER_SITE_PHP} -MASTER_SITE_SUBDIR= distributions -DISTNAME= php-${PORTVERSION} - -MAINTAINER= ports@FreeBSD.org -COMMENT= PHP Scripting Language - -DEPRECATED= security EOL reached 14 Aug 2014 -EXPIRATION_DATE= 2015-04-15 - -LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} - -USES= tar:bzip2 cpe -CPE_PRODUCT= php -.if !defined(PKGNAMESUFFIX) -USE_AUTOTOOLS= autoconf - -LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre - -CONFIGURE_ARGS= \ - --with-layout=GNU \ - --localstatedir=/var \ - --with-config-file-scan-dir=${PREFIX}/etc/php \ - --disable-all \ - --enable-libxml \ - --enable-mysqlnd \ - --with-libxml-dir=${LOCALBASE} \ - --with-pcre-regex=${LOCALBASE} \ - --with-zlib-dir=/usr \ - --program-prefix="" - -USE_GNOME= libxml2 - -OPTIONS_DEFINE= CLI CGI FPM APACHE AP2FILTER DEBUG SUHOSIN MULTIBYTE IPV6 \ - MAILHEAD LINKTHR - -OPTIONS_DEFAULT= CLI CGI SUHOSIN IPV6 LINKTHR - -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) - -CONFLICTS= php52-5* php5-5* - -DESTDIRNAME= INSTALL_ROOT - -.include <bsd.port.pre.mk> - -PATCH_DIST_STRIP= -p1 - -PATCH_SITES+= ${MASTER_SITE_LOCAL} \ - http://people.freebsd.org/~flo/ -PATCH_SITE_SUBDIR= flo - -.if ${PORT_OPTIONS:MSUHOSIN} -PATCHFILES+= suhosin-patch-5.3.x-0.9.10.5.patch.gz -PLIST_SUB+= SUHOSIN="" -.else -PLIST_SUB+= SUHOSIN="@comment " -.endif - -.if ${PORT_OPTIONS:MMAILHEAD} -PATCHFILES+= php-5.3.x-mail-header.patch:mail -PATCH_SITES+= http://choon.net/opensource/php/:mail -.endif - -.if ${PORT_OPTIONS:MCLI} -PHP_SAPI+= cli -PLIST_SUB+= CLI="" -.else -PLIST_SUB+= CLI="@comment " -CONFIGURE_ARGS+=--disable-cli -.endif - -.if ${PORT_OPTIONS:MCGI} -PHP_SAPI+= cgi -PLIST_SUB+= CGI="" -.else -PLIST_SUB+= CGI="@comment " -CONFIGURE_ARGS+=--disable-cgi -.endif - -.if ${PORT_OPTIONS:MFPM} -PHP_SAPI+= fpm -USE_RC_SUBR+= php-fpm -CONFIGURE_ARGS+=--enable-fpm \ - --with-fpm-user=${WWWOWN} \ - --with-fpm-group=${WWWGRP} -PLIST_SUB+= FPM="" -.else -PLIST_SUB+= FPM="@comment " -.endif - -.if ${PORT_OPTIONS:MAPACHE} -PHP_SAPI+= mod -USE_APACHE= 22+ -.include "${PORTSDIR}/Mk/bsd.apache.mk" -.if ${PORT_OPTIONS:MAP2FILTER} -CONFIGURE_ARGS+=--with-apxs2filter=${APXS} -.else -CONFIGURE_ARGS+=--with-apxs2=${APXS} -.endif -PKGMESSAGE= ${PKGDIR}/pkg-message.mod -MODULENAME= libphp5 -SHORTMODNAME= php5 -PLIST_SUB+= APACHE="" -.else -PLIST_SUB+= APACHE="@comment " -.endif - -.if !defined(WITH_REGEX_TYPE) || ${WITH_REGEX_TYPE} == "php" -CONFIGURE_ARGS+=--with-regex=php -.elif defined(WITH_REGEX_TYPE) && ${WITH_REGEX_TYPE} == "system" -CONFIGURE_ARGS+=--with-regex=system -.endif - -.if !defined(WITH_ZEND_VM) || ${WITH_ZEND_VM} == "CALL" -CONFIGURE_ARGS+=--with-zend-vm=CALL -.elif defined(WITH_ZEND_VM) && ${WITH_ZEND_VM} == "SWITCH" -CONFIGURE_ARGS+=--with-zend-vm=SWITCH -.elif defined(WITH_ZEND_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} -LIBS+= -lpthread -.endif - -.if ${PORT_OPTIONS:MDEBUG} -CONFIGURE_ARGS+=--enable-debug -.endif - -.if ${PORT_OPTIONS:MMULTIBYTE} -CONFIGURE_ARGS+=--enable-zend-multibyte -.endif - -.if empty(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} - @${REINPLACE_CMD} -e "s|^;\(pid\)|\1|;s|^;\(pm\.[a-z_]*_servers\)|\1|" \ - ${WRKSRC}/sapi/fpm/php-fpm.conf.in -.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=53" > ${WRKDIR}/php.conf - @${ECHO_CMD} "PHP_VERSION=${PORTVERSION}" >> ${WRKDIR}/php.conf - @${ECHO_CMD} "PHP_SAPI=${PHP_SAPI}" >> ${WRKDIR}/php.conf - @${ECHO_CMD} "PHP_EXT_INC=pcre spl" >> ${WRKDIR}/php.conf - -test: build - @(cd ${WRKSRC} && ${MAKE} test) - -post-install: - @${INSTALL_DATA} ${WRKSRC}/php.ini-development ${WRKSRC}/php.ini-production \ - ${WRKDIR}/php.conf ${STAGEDIR}/${PREFIX}/etc - -.else -.include "${MASTERDIR}/Makefile.ext" -.endif -.include <bsd.port.post.mk> diff --git a/lang/php53/Makefile.ext b/lang/php53/Makefile.ext deleted file mode 100644 index 468aefe4ba67..000000000000 --- a/lang/php53/Makefile.ext +++ /dev/null @@ -1,605 +0,0 @@ -COMMENT= The ${PHP_MODNAME} shared extension for php - -USE_PHP= yes -USE_PHPEXT= yes -PHP_MODNAME= ${PKGNAMESUFFIX:S/-//} -PHP_DEFAULT= 53 -IGNORE_WITH_PHP=52 5 55 - -EXTSUBDIR= ${DISTNAME}/ext/${PHP_MODNAME} -WRKSRC= ${WRKDIR}/${EXTSUBDIR} -PATCHDIR= ${.CURDIR}/files -PLIST= ${NONEXISTENT} - -EXTRACT_AFTER_ARGS?= ${EXTSUBDIR} - -.if ${PHP_MODNAME} == "bcmath" -CONFIGURE_ARGS+=--enable-bcmath - -PHP_HEADER_DIRS=libbcmath libbcmath/src -.endif - -.if ${PHP_MODNAME} == "bz2" -CONFIGURE_ARGS+=--with-bz2=/usr -.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+= libcurl.so:${PORTSDIR}/ftp/curl - -CONFIGURE_ARGS+=--with-curl=${LOCALBASE} -.endif - -.if ${PHP_MODNAME} == "dba" -CONFIGURE_ARGS+=--enable-dba - -OPTIONS_DEFINE= CDB DB4 DBM INIFILE FLATFILE -OPTIONS_DEFAULT= CDB INIFILE FLATFILE -OPTIONS_SINGLE= DBM -OPTIONS_SINGLE_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} == "dom" -CONFIGURE_ARGS+=--enable-dom \ - --with-libxml-dir=${LOCALBASE} - -USE_GNOME= libxml2 -.endif - -.if ${PHP_MODNAME} == "exif" -CONFIGURE_ARGS+=--enable-exif -.endif - -.if ${PHP_MODNAME} == "fileinfo" -CONFIGURE_ARGS+=--enable-fileinfo \ - --with-pcre-dir=${LOCALBASE} - -PHP_HEADER_DIRS= libmagic -.endif - -.if ${PHP_MODNAME} == "filter" -CONFIGURE_ARGS+=--enable-filter \ - --with-pcre-dir=${LOCALBASE} -.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= libfreetype.so:${PORTSDIR}/print/freetype2 \ - libpng.so:${PORTSDIR}/graphics/png \ - libjpeg.so:${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+= libgmp.so.10:${PORTSDIR}/math/gmp - -CONFIGURE_ARGS+=--with-gmp=${LOCALBASE} -.endif - -.if ${PHP_MODNAME} == "hash" -CONFIGURE_ARGS+=--enable-hash \ - --with-mhash -.endif - -.if ${PHP_MODNAME} == "iconv" -CONFIGURE_ARGS+=--with-iconv - -USES+= iconv:translit -.endif - -.if ${PHP_MODNAME} == "imap" -OPTIONS_DEFINE= SSL -OPTIONS_DEFAULT= SSL -LIB_DEPENDS+= libc-client4.so.9:${PORTSDIR}/mail/cclient - -CONFIGURE_ARGS+=--with-imap=${LOCALBASE} \ - --with-pcre-dir=${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 \ - --with-pcre-dir=${LOCALBASE} - -OPTIONS_DEFINE= REGEX -OPTIONS_DEFAULT= REGEX - -REGEX_DESC= multibyte regex support - -PHP_HEADER_DIRS=libmbfl libmbfl/filters libmbfl/mbfl libmbfl/nls -.endif - -.if ${PHP_MODNAME} == "mcrypt" -LIB_DEPENDS+= libltdl.so:${PORTSDIR}/devel/libltdl \ - libmcrypt.so:${PORTSDIR}/security/libmcrypt - -CONFIGURE_ARGS+=--with-mcrypt=${LOCALBASE} -.endif - -.if ${PHP_MODNAME} == "mssql" -LIB_DEPENDS+= libsybdb.so.5:${PORTSDIR}/databases/freetds - -CONFIGURE_ARGS+=--with-mssql=${LOCALBASE} -.endif - -.if ${PHP_MODNAME} == "mysql" -OPTIONS_DEFINE= MYSQLND -OPTIONS_DEFAULT= MYSQLND - -MYSQLND_DESC= Use MySQL Native Driver -.endif - -.if ${PHP_MODNAME} == "mysqli" -OPTIONS_DEFINE= MYSQLND -OPTIONS_DEFAULT= MYSQLND - -MYSQLND_DESC= Use MySQL Native Driver -.endif - -.if ${PHP_MODNAME} == "odbc" -CONFIGURE_ARGS+=--enable-odbc -.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} == "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" -OPTIONS_DEFINE= MYSQLND -OPTIONS_DEFAULT= MYSQLND - -MYSQLND_DESC= Use MySQL Native Driver - -USE_PHP= pdo -USE_PHP_BUILD= yes -.endif - -.if ${PHP_MODNAME} == "pdo_odbc" -USE_PHP= pdo -USE_PHP_BUILD= yes -.endif - -.if ${PHP_MODNAME} == "pdo_pgsql" -USES+= pgsql - -CONFIGURE_ARGS+=--with-pdo-pgsql=${LOCALBASE} - -USE_PHP= pdo -USE_PHP_BUILD= yes -.endif - -.if ${PHP_MODNAME} == "pdo_sqlite" -USE_SQLITE= yes -CONFIGURE_ARGS+=--with-pdo-sqlite=${LOCALBASE} - -USE_PHP= pdo -USE_PHP_BUILD= yes -.endif - -.if ${PHP_MODNAME} == "pgsql" -USES+= pgsql - -CONFIGURE_ARGS+=--with-pgsql=${LOCALBASE} -.endif - -.if ${PHP_MODNAME} == "phar" -CONFIGURE_ARGS+=--enable-phar \ - --with-pcre-dir=${LOCALBASE} - -USE_PHP= hash -USE_PHP_BUILD= yes -.endif - -.if ${PHP_MODNAME} == "posix" -CONFIGURE_ARGS+=--enable-posix -.endif - -.if ${PHP_MODNAME} == "pspell" -LIB_DEPENDS+= libaspell.so:${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 -USES+= readline -.endif - -.if ${PHP_MODNAME} == "recode" -LIB_DEPENDS+= librecode.so.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} - -CFLAGS+= -I${LOCALBASE}/include -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+= libnetsnmp.so.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} == "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 - -OPTIONS_DEFINE= UTF8 - -UTF8_DESC= UTF-8 support -.endif - -.if ${PHP_MODNAME} == "sqlite3" -USE_SQLITE= yes -CONFIGURE_ARGS+=--with-sqlite3=${LOCALBASE} -LDFLAGS+= -L${LOCALBASE}/lib -.endif - -.if ${PHP_MODNAME} == "sybase_ct" -LIB_DEPENDS+= libct.so.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+= libtidy.so:${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 \ - --with-pcre-dir=${LOCALBASE} -.endif - -.if ${PHP_MODNAME} == "zlib" -CONFIGURE_ARGS+=--with-zlib=/usr -.endif - -.include <bsd.port.pre.mk> - -.if ${PHP_MODNAME} == "dba" -. if empty(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+= libgdbm.so.4:${PORTSDIR}/databases/gdbm - -CONFIGURE_ARGS+=--with-gdbm=${LOCALBASE} -. endif -. if ${PORT_OPTIONS:MQDBM} -LIB_DEPENDS+= libqdbm.so.14:${PORTSDIR}/databases/qdbm - -CONFIGURE_ARGS+=--with-qdbm=${LOCALBASE} -. endif -. if empty(PORT_OPTIONS:MINIFILE) -CONFIGURE_ARGS+=--disable-inifile -. endif -. if empty(PORT_OPTIONS:MFLATFILE) -CONFIGURE_ARGS+=--disable-flatfile -. endif -.endif - -.if ${PHP_MODNAME} == "gd" -. if ${PORT_OPTIONS:MX11} -USE_XORG= xpm -. endif - -. if ${PORT_OPTIONS:MX11} -CONFIGURE_ARGS+=--with-xpm-dir=${LOCALBASE} -. endif - -. if ${PORT_OPTIONS:MT1LIB} -LIB_DEPENDS+= libt1.so.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} -LIB_DEPENDS+= libonig.so.1:${PORTSDIR}/devel/oniguruma4 -CONFIGURE_ARGS+=--with-onig=${LOCALBASE} -. else -CONFIGURE_ARGS+=--disable-mbregex -. endif -.endif - -.if ${PHP_MODNAME} == "mysql" -. if ${PORT_OPTIONS:MMYSQLND} -CONFIGURE_ARGS+=--with-mysql=mysqlnd -. else -CONFIGURE_ARGS+=--with-mysql=${LOCALBASE} \ - --with-zlib-dir=/usr - -USE_MYSQL= yes -. endif -.endif - -.if ${PHP_MODNAME} == "mysqli" -. if ${PORT_OPTIONS:MMYSQLND} -CONFIGURE_ARGS+=--with-mysqli=mysqlnd -. else -CONFIGURE_ARGS+=--with-mysqli=${LOCALBASE}/bin/mysql_config - -USE_MYSQL= yes -. endif -.endif - -.if ${PHP_MODNAME} == "openssl" || ${PHP_MODNAME} == "sqlite3" -post-extract: - @${MV} ${WRKSRC}/config0.m4 ${WRKSRC}/config.m4 -.endif - -.if ${PHP_MODNAME} == "odbc" -LIB_DEPENDS+= libodbc.so.2:${PORTSDIR}/databases/unixODBC -CONFIGURE_ARGS+=--with-unixODBC=${LOCALBASE} -.endif - -.if ${PHP_MODNAME} == "pdo_dblib" -.if ${PORT_OPTIONS:MMSSQL} -LIB_DEPENDS+= libsybdb.so.5:${PORTSDIR}/databases/freetds -.else -LIB_DEPENDS+= libct.so.4:${PORTSDIR}/databases/freetds -.endif -.endif - -.if ${PHP_MODNAME} == "pdo_odbc" -LIB_DEPENDS+= libodbc.so.2:${PORTSDIR}/databases/unixODBC -CONFIGURE_ARGS+=--with-pdo-odbc=unixODBC,${LOCALBASE} -.endif - -.if ${PHP_MODNAME} == "pdo_mysql" -. if ${PORT_OPTIONS:MMYSQLND} -CONFIGURE_ARGS+=--with-pdo-mysql=mysqlnd - -USE_PHP+= mysql -. else -CONFIGURE_ARGS+=--with-pdo-mysql=${LOCALBASE} \ - --with-zlib-dir=/usr - -USE_MYSQL= yes -. 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/php53/distinfo b/lang/php53/distinfo deleted file mode 100644 index 763b4bfe0923..000000000000 --- a/lang/php53/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -SHA256 (php-5.3.29.tar.bz2) = c4e1cf6972b2a9c7f2777a18497d83bf713cdbecabb65d3ff62ba441aebb0091 -SIZE (php-5.3.29.tar.bz2) = 11396771 -SHA256 (suhosin-patch-5.3.x-0.9.10.5.patch.gz) = 5de84149facbf3c3f752a907c19e69e0f569d71facb034ce938c97004f19376b -SIZE (suhosin-patch-5.3.x-0.9.10.5.patch.gz) = 40805 -SHA256 (php-5.3.x-mail-header.patch) = 5a677448b32d9f592703e2323a33facdb45e5c237dcca04aaea8ec3287f7db84 -SIZE (php-5.3.x-mail-header.patch) = 3325 diff --git a/lang/php53/files/patch-CVE-2014-8142.patch b/lang/php53/files/patch-CVE-2014-8142.patch deleted file mode 100644 index f023909d9024..000000000000 --- a/lang/php53/files/patch-CVE-2014-8142.patch +++ /dev/null @@ -1,56 +0,0 @@ -Index: ext/standard/tests/serialize/bug68594.phpt -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ ext/standard/tests/serialize/bug68594.phpt 2015-02-13 11:27:34.753347966 -0500 -@@ -0,0 +1,23 @@ -+--TEST-- -+Bug #68545 Use after free vulnerability in unserialize() -+--FILE-- -+<?php -+for ($i=4; $i<100; $i++) { -+ $m = new StdClass(); -+ -+ $u = array(1); -+ -+ $m->aaa = array(1,2,&$u,4,5); -+ $m->bbb = 1; -+ $m->ccc = &$u; -+ $m->ddd = str_repeat("A", $i); -+ -+ $z = serialize($m); -+ $z = str_replace("bbb", "aaa", $z); -+ $y = unserialize($z); -+ $z = serialize($y); -+} -+?> -+===DONE=== -+--EXPECTF-- -+===DONE=== -Index: ext/standard/var_unserializer.c -=================================================================== ---- ext/standard/var_unserializer.c 2015-02-13 11:27:34.793348294 -0500 -+++ ext/standard/var_unserializer.c 2015-02-13 11:27:34.753347966 -0500 -@@ -298,6 +298,9 @@ - } else { - /* object properties should include no integers */ - convert_to_string(key); -+ if (zend_symtable_find(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, (void **)&old_data)==SUCCESS) { -+ var_push_dtor(var_hash, old_data); -+ } - zend_hash_update(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, &data, - sizeof data, NULL); - } -Index: ext/standard/var_unserializer.re -=================================================================== ---- ext/standard/var_unserializer.re 2015-02-13 11:27:34.793348294 -0500 -+++ ext/standard/var_unserializer.re 2015-02-13 11:27:34.753347966 -0500 -@@ -304,6 +304,9 @@ - } else { - /* object properties should include no integers */ - convert_to_string(key); -+ if (zend_symtable_find(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, (void **)&old_data)==SUCCESS) { -+ var_push_dtor(var_hash, old_data); -+ } - zend_hash_update(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, &data, - sizeof data, NULL); - } diff --git a/lang/php53/files/patch-CVE-2014-9705 b/lang/php53/files/patch-CVE-2014-9705 deleted file mode 100644 index 0b4d6b1e67be..000000000000 --- a/lang/php53/files/patch-CVE-2014-9705 +++ /dev/null @@ -1,34 +0,0 @@ ---- ext/enchant/enchant.c 2015-03-16 13:42:36.063819735 -0400 -+++ ext/enchant/enchant.c 2015-03-16 13:42:36.059819705 -0400 -@@ -545,13 +545,12 @@ - - d = enchant_broker_request_dict(pbroker->pbroker, (const char *)tag); - if (d) { -+ pos = pbroker->dictcnt++; - if (pbroker->dictcnt) { - pbroker->dict = (enchant_dict **)erealloc(pbroker->dict, sizeof(enchant_dict *) * pbroker->dictcnt); -- pos = pbroker->dictcnt++; - } else { - pbroker->dict = (enchant_dict **)emalloc(sizeof(enchant_dict *)); - pos = 0; -- pbroker->dictcnt++; - } - - dict = pbroker->dict[pos] = (enchant_dict *)emalloc(sizeof(enchant_dict)); -@@ -606,14 +605,14 @@ - - d = enchant_broker_request_pwl_dict(pbroker->pbroker, (const char *)pwl); - if (d) { -+ pos = pbroker->dictcnt++; - if (pbroker->dictcnt) { -- pos = pbroker->dictcnt++; - pbroker->dict = (enchant_dict **)erealloc(pbroker->dict, sizeof(enchant_dict *) * pbroker->dictcnt); - } else { - pbroker->dict = (enchant_dict **)emalloc(sizeof(enchant_dict *)); - pos = 0; -- pbroker->dictcnt++; - } -+ - dict = pbroker->dict[pos] = (enchant_dict *)emalloc(sizeof(enchant_dict)); - dict->id = pos; - dict->pbroker = pbroker; diff --git a/lang/php53/files/patch-CVE-2015-0231.patch b/lang/php53/files/patch-CVE-2015-0231.patch deleted file mode 100644 index 535e59013104..000000000000 --- a/lang/php53/files/patch-CVE-2015-0231.patch +++ /dev/null @@ -1,56 +0,0 @@ -Index: ext/standard/tests/strings/bug68710.phpt -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ ext/standard/tests/strings/bug68710.phpt 2015-02-13 11:36:32.969760122 -0500 -@@ -0,0 +1,25 @@ -+--TEST-- -+Bug #68710 Use after free vulnerability in unserialize() (bypassing the -+CVE-2014-8142 fix) -+--FILE-- -+<?php -+for ($i=4; $i<100; $i++) { -+ $m = new StdClass(); -+ -+ $u = array(1); -+ -+ $m->aaa = array(1,2,&$u,4,5); -+ $m->bbb = 1; -+ $m->ccc = &$u; -+ $m->ddd = str_repeat("A", $i); -+ -+ $z = serialize($m); -+ $z = str_replace("aaa", "123", $z); -+ $z = str_replace("bbb", "123", $z); -+ $y = unserialize($z); -+ $z = serialize($y); -+} -+?> -+===DONE=== -+--EXPECTF-- -+===DONE=== -Index: ext/standard/var_unserializer.c -=================================================================== ---- ext/standard/var_unserializer.c 2015-02-13 11:36:33.009760449 -0500 -+++ ext/standard/var_unserializer.c 2015-02-13 11:36:32.969760122 -0500 -@@ -298,7 +298,7 @@ - } else { - /* object properties should include no integers */ - convert_to_string(key); -- if (zend_symtable_find(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, (void **)&old_data)==SUCCESS) { -+ if (zend_hash_find(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, (void **)&old_data)==SUCCESS) { - var_push_dtor(var_hash, old_data); - } - zend_hash_update(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, &data, -Index: ext/standard/var_unserializer.re -=================================================================== ---- ext/standard/var_unserializer.re 2015-02-13 11:36:33.009760449 -0500 -+++ ext/standard/var_unserializer.re 2015-02-13 11:36:32.969760122 -0500 -@@ -304,7 +304,7 @@ - } else { - /* object properties should include no integers */ - convert_to_string(key); -- if (zend_symtable_find(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, (void **)&old_data)==SUCCESS) { -+ if (zend_hash_find(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, (void **)&old_data)==SUCCESS) { - var_push_dtor(var_hash, old_data); - } - zend_hash_update(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, &data, diff --git a/lang/php53/files/patch-CVE-2015-0273 b/lang/php53/files/patch-CVE-2015-0273 deleted file mode 100644 index d707ca3c2b0d..000000000000 --- a/lang/php53/files/patch-CVE-2015-0273 +++ /dev/null @@ -1,18 +0,0 @@ ---- ext/date/php_date.c.orig 2015-03-21 18:31:58.092700000 +0100 -+++ ext/date/php_date.c 2015-03-21 18:33:51.148505000 +0100 -@@ -2573,12 +2573,9 @@ - timelib_tzinfo *tzi; - php_timezone_obj *tzobj; - -- if (zend_hash_find(myht, "date", 5, (void**) &z_date) == SUCCESS) { -- convert_to_string(*z_date); -- if (zend_hash_find(myht, "timezone_type", 14, (void**) &z_timezone_type) == SUCCESS) { -- convert_to_long(*z_timezone_type); -- if (zend_hash_find(myht, "timezone", 9, (void**) &z_timezone) == SUCCESS) { -- convert_to_string(*z_timezone); -+ if (zend_hash_find(myht, "date", 5, (void**) &z_date) == SUCCESS && Z_TYPE_PP(z_date) == IS_STRING) { -+ if (zend_hash_find(myht, "timezone_type", 14, (void**) &z_timezone_type) == SUCCESS && Z_TYPE_PP(z_timezone_type) == IS_LONG) { -+ if (zend_hash_find(myht, "timezone", 9, (void**) &z_timezone) == SUCCESS && Z_TYPE_PP(z_timezone) == IS_STRING) { - - switch (Z_LVAL_PP(z_timezone_type)) { - case TIMELIB_ZONETYPE_OFFSET: diff --git a/lang/php53/files/patch-TSRM_threads.m4 b/lang/php53/files/patch-TSRM_threads.m4 deleted file mode 100644 index 227f6d26c9d5..000000000000 --- a/lang/php53/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/php53/files/patch-Zend__zend.h b/lang/php53/files/patch-Zend__zend.h deleted file mode 100644 index 0fb2398f171d..000000000000 --- a/lang/php53/files/patch-Zend__zend.h +++ /dev/null @@ -1,11 +0,0 @@ ---- Zend/zend.h.orig 2008-08-15 21:47:23.000000000 +0200 -+++ Zend/zend.h 2008-09-25 22:52:50.000000000 +0200 -@@ -192,7 +192,7 @@ - # define ZEND_FASTCALL - #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 ZEND_ALLOCA_MAX_SIZE (32 * 1024) - # define ALLOCA_FLAG(name) \ - zend_bool name; diff --git a/lang/php53/files/patch-Zend_zend__ini.h b/lang/php53/files/patch-Zend_zend__ini.h deleted file mode 100644 index f1a55168e581..000000000000 --- a/lang/php53/files/patch-Zend_zend__ini.h +++ /dev/null @@ -1,11 +0,0 @@ ---- Zend/zend_ini.h.orig 2014-12-17 16:24:10 UTC -+++ Zend/zend_ini.h -@@ -28,7 +28,7 @@ - #define ZEND_INI_ALL (ZEND_INI_USER|ZEND_INI_PERDIR|ZEND_INI_SYSTEM) - - #ifndef XtOffsetOf --# if defined(CRAY) || (defined(__arm) && !defined(LINUX)) -+# if defined(CRAY) || (defined(__ARMCC_VERSION) && !defined(LINUX)) - # ifdef __STDC__ - # define XtOffset(p_type, field) _Offsetof(p_type, field) - # else diff --git a/lang/php53/files/patch-Zend_zend_list.c b/lang/php53/files/patch-Zend_zend_list.c deleted file mode 100644 index efa8862d1ce8..000000000000 --- a/lang/php53/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/php53/files/patch-Zend_zend_list.h b/lang/php53/files/patch-Zend_zend_list.h deleted file mode 100644 index 308ac56b33b2..000000000000 --- a/lang/php53/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/php53/files/patch-acinclude.m4 b/lang/php53/files/patch-acinclude.m4 deleted file mode 100644 index d92738cdf776..000000000000 --- a/lang/php53/files/patch-acinclude.m4 +++ /dev/null @@ -1,54 +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,ifelse($4,fpm,PHP_FPM_OBJS,PHP_GLOBAL_OBJS))))) - ]) - - dnl -@@ -968,15 +968,9 @@ - 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) -+ PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,fpm) - EXT_CLI_STATIC="$EXT_CLI_STATIC $1" - fi - PHP_ADD_BUILD_DIR($ext_builddir) -@@ -1026,12 +1020,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 +2291,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/php53/files/patch-configure.in b/lang/php53/files/patch-configure.in deleted file mode 100644 index d6e90018c51b..000000000000 --- a/lang/php53/files/patch-configure.in +++ /dev/null @@ -1,64 +0,0 @@ ---- configure.in.orig 2011-03-04 10:10:54.000000000 +0100 -+++ configure.in 2011-03-04 10:11:01.000000000 +0100 -@@ -302,7 +302,6 @@ - dnl . - dnl ------------------------------------------------------------------------- - --PTHREADS_CHECK - PHP_HELP_SEPARATOR([SAPI modules:]) - PHP_SHLIB_SUFFIX_NAMES - PHP_SAPI=default -@@ -327,7 +326,6 @@ - - if test "$enable_maintainer_zts" = "yes"; then - PTHREADS_ASSIGN_VARS -- PTHREADS_FLAGS - fi - - divert(3) -@@ -612,7 +610,7 @@ - ) - - dnl Some systems (like OpenSolaris) do not have nanosleep in libc --PHP_CHECK_FUNC_LIB(nanosleep, rt) -+PHP_CHECK_FUNC(nanosleep, rt) - - dnl Check for getaddrinfo, should be a better way, but... - dnl Also check for working getaddrinfo -@@ -1162,7 +1160,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 -@@ -1373,22 +1371,19 @@ - pharcmd_install= - fi; - --all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_ZEND_EX) \$(PHP_CLI_TARGET) $pharcmd" --install_targets="$install_modules install-build install-headers install-programs $install_pear $pharcmd_install" -+all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_ZEND_EX) \$(PHP_CLI_TARGET) \$(PHP_CGI_TARGET) \$(PHP_FPM_TARGET) $pharcmd" -+install_targets="$PHP_INSTALL_CLI_TARGET $PHP_INSTALL_CGI_TARGET $install_modules install-build install-headers install-programs $install_pear $pharcmd_install" - - 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|apache2filter) -+ install_targets="install-sapi $install_targets" - ;; - esac - - PHP_SUBST(all_targets) - PHP_SUBST(install_targets) - --PHP_INSTALL_HEADERS([Zend/ TSRM/ include/ main/ main/streams/]) -+PHP_INSTALL_HEADERS([Zend/ TSRM/ main/ main/streams/]) - - PHP_ADD_SOURCES(TSRM, TSRM.c tsrm_strtok_r.c tsrm_virtual_cwd.c) - diff --git a/lang/php53/files/patch-ext_standard_image.c b/lang/php53/files/patch-ext_standard_image.c deleted file mode 100644 index be29b54b2650..000000000000 --- a/lang/php53/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/php53/files/patch-ext_zlib_config0.m4 b/lang/php53/files/patch-ext_zlib_config0.m4 deleted file mode 100644 index 249c85b498d3..000000000000 --- a/lang/php53/files/patch-ext_zlib_config0.m4 +++ /dev/null @@ -1,11 +0,0 @@ ---- ext/zlib/config0.m4.orig 2010-08-26 13:19:52.000000000 +0200 -+++ ext/zlib/config0.m4 2010-08-26 13:20:11.000000000 +0200 -@@ -8,7 +8,7 @@ - PHP_ARG_WITH(zlib-dir,if the location of ZLIB install directory is defined, - [ --with-zlib-dir=<DIR> Define the location of zlib install directory], no, no) - --if test "$PHP_ZLIB" != "no" || test "$PHP_ZLIB_DIR" != "no"; then -+if test "$PHP_ZLIB" != "no"; then - PHP_NEW_EXTENSION(zlib, zlib.c zlib_fopen_wrapper.c zlib_filter.c, $ext_shared) - PHP_SUBST(ZLIB_SHARED_LIBADD) - diff --git a/lang/php53/files/patch-main__php_config.h.in b/lang/php53/files/patch-main__php_config.h.in deleted file mode 100644 index 8e9938876421..000000000000 --- a/lang/php53/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/php53/files/patch-php.ini-development b/lang/php53/files/patch-php.ini-development deleted file mode 100644 index dadeb4b838b1..000000000000 --- a/lang/php53/files/patch-php.ini-development +++ /dev/null @@ -1,18 +0,0 @@ ---- php.ini-development.orig 2009-06-28 19:56:18.000000000 +0200 -+++ php.ini-development 2009-08-24 17:17:53.000000000 +0200 -@@ -335,6 +335,15 @@ - - ; Safe Mode - ; http://php.net/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/php53/files/patch-php.ini-production b/lang/php53/files/patch-php.ini-production deleted file mode 100644 index 67d3480ad4a6..000000000000 --- a/lang/php53/files/patch-php.ini-production +++ /dev/null @@ -1,18 +0,0 @@ ---- php.ini-production.orig 2009-08-24 17:18:23.000000000 +0200 -+++ php.ini-production 2009-08-24 17:18:33.000000000 +0200 -@@ -335,6 +335,15 @@ - - ; Safe Mode - ; http://php.net/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/php53/files/patch-sapi_apache2filter_config.m4 b/lang/php53/files/patch-sapi_apache2filter_config.m4 deleted file mode 100644 index ce71383f9fa4..000000000000 --- a/lang/php53/files/patch-sapi_apache2filter_config.m4 +++ /dev/null @@ -1,11 +0,0 @@ ---- sapi/apache2filter/config.m4.orig 2013-10-18 12:17:14.622544934 +0000 -+++ sapi/apache2filter/config.m4 2013-10-18 12:22:13.032234760 +0000 -@@ -68,7 +68,7 @@ - fi - - APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR` -- if test -z `$APXS -q SYSCONFDIR`; then -+ if true; then - INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \ - $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ - -i -n php5" diff --git a/lang/php53/files/patch-sapi_apache2handler_config.m4 b/lang/php53/files/patch-sapi_apache2handler_config.m4 deleted file mode 100644 index 149c4ef0fc80..000000000000 --- a/lang/php53/files/patch-sapi_apache2handler_config.m4 +++ /dev/null @@ -1,11 +0,0 @@ ---- sapi/apache2handler/config.m4.orig 2013-10-18 12:22:26.576545216 +0000 -+++ sapi/apache2handler/config.m4 2013-10-18 12:23:00.903131412 +0000 -@@ -67,7 +67,7 @@ - fi - - APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR` -- if test -z `$APXS -q SYSCONFDIR`; then -+ if true; then - INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \ - $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ - -i -n php5" diff --git a/lang/php53/files/patch-sapi_cgi_Makefile.frag b/lang/php53/files/patch-sapi_cgi_Makefile.frag deleted file mode 100644 index 26a0e4b1a3ba..000000000000 --- a/lang/php53/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/php53/files/patch-sapi_cgi_config9.m4 b/lang/php53/files/patch-sapi_cgi_config9.m4 deleted file mode 100644 index 7682dad43110..000000000000 --- a/lang/php53/files/patch-sapi_cgi_config9.m4 +++ /dev/null @@ -1,56 +0,0 @@ ---- sapi/cgi/config9.m4.orig 2007-10-01 14:40:54.000000000 +0200 -+++ sapi/cgi/config9.m4 2008-09-25 23:07:13.000000000 +0200 -@@ -8,7 +8,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) -@@ -53,8 +52,9 @@ - PHP_SUBST(SAPI_CGI_PATH) - - 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, cgi_main.c fastcgi.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, cgi_main.c fastcgi.c,, cgi) -+ PHP_ADD_SOURCES(/main, internal_functions.c,,cgi) - - case $host_alias in - *aix*) -@@ -64,17 +64,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) -- -- elif test "$PHP_CLI" != "no"; then -- AC_MSG_RESULT(no) -+ PHP_SUBST(INSTALL_CGI) -+ PHP_SUBST(PHP_CGI_OBJS) -+ PHP_SUBST(PHP_CGI_TARGET) -+ PHP_SUBST(PHP_INSTALL_CGI_TARGET) -+ -+ 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/php53/files/patch-sapi_fpm_Makefile.frag b/lang/php53/files/patch-sapi_fpm_Makefile.frag deleted file mode 100644 index 53da2da35f7c..000000000000 --- a/lang/php53/files/patch-sapi_fpm_Makefile.frag +++ /dev/null @@ -1,29 +0,0 @@ ---- sapi/fpm/Makefile.frag.orig 2011-10-08 23:04:10.000000000 +0200 -+++ sapi/fpm/Makefile.frag 2012-02-09 16:43:25.000000000 +0100 -@@ -4,14 +4,14 @@ - @mkdir -p $(builddir)/fpm - @mkdir -p $(builddir)/fpm/events - --$(SAPI_FPM_PATH): $(builddir)/fpm $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(SAPI_EXTRA_DEPS) -+$(SAPI_FPM_PATH): $(builddir)/fpm $(PHP_GLOBAL_OBJS) $(PHP_FPM_OBJS) $(FPM_EXTRA_DEPS) - $(BUILD_FPM) - - $(builddir)/fpm/fpm_conf.lo: $(builddir)/../../main/build-defs.h - - install-build: install-fpm - --install-fpm: install-sapi -+install-fpm: - @echo "Installing PHP FPM binary: $(INSTALL_ROOT)$(sbindir)/" - @$(mkinstalldirs) $(INSTALL_ROOT)$(sbindir) - @$(mkinstalldirs) $(INSTALL_ROOT)$(localstatedir)/log -@@ -27,6 +27,6 @@ - @$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man8 - @$(INSTALL_DATA) sapi/fpm/php-fpm.8 $(INSTALL_ROOT)$(mandir)/man8/php-fpm$(program_suffix).8 - -- @echo "Installing PHP FPM status page: $(INSTALL_ROOT)$(datadir)/fpm/" -- @$(mkinstalldirs) $(INSTALL_ROOT)$(datadir)/fpm -- @$(INSTALL_DATA) sapi/fpm/status.html $(INSTALL_ROOT)$(datadir)/fpm/status.html -+ @echo "Installing PHP FPM status page: $(INSTALL_ROOT)$(datadir)/php/fpm/" -+ @$(mkinstalldirs) $(INSTALL_ROOT)$(datadir)/php/fpm -+ @$(INSTALL_DATA) sapi/fpm/status.html $(INSTALL_ROOT)$(datadir)/php/fpm/status.html diff --git a/lang/php53/files/patch-sapi_fpm_config.m4 b/lang/php53/files/patch-sapi_fpm_config.m4 deleted file mode 100644 index 859db721d66e..000000000000 --- a/lang/php53/files/patch-sapi_fpm_config.m4 +++ /dev/null @@ -1,62 +0,0 @@ ---- sapi/fpm/config.m4.orig 2011-06-26 17:48:11.000000000 +0200 -+++ sapi/fpm/config.m4 2011-11-18 11:05:21.000000000 +0100 -@@ -312,7 +312,7 @@ - - AC_MSG_CHECKING([for TCP_INFO]) - -- AC_TRY_COMPILE([ #include <netinet/tcp.h> ], [struct tcp_info ti; int x = TCP_INFO;], [ -+ AC_TRY_COMPILE([ #include <netinet/tcp.h> ], [struct tcp_info ti; ti.tcpi_sacked = 0; int x = TCP_INFO;], [ - have_lq=tcp_info - AC_MSG_RESULT([yes]) - ], [ -@@ -333,7 +333,7 @@ - AC_MSG_RESULT([no]) - ]) - -- if test "$have_lq" = "tcp_info"; then -+ if test "$have_lq" = "so_listenq"; then - AC_DEFINE([HAVE_LQ_SO_LISTENQ], 1, [do we have SO_LISTENQxxx?]) - fi - fi -@@ -423,7 +423,9 @@ - - PHP_FPM_CFLAGS="-I$abs_srcdir/sapi/fpm" - -- INSTALL_IT=":" -+ if test "$PHP_SAPI" = "default"; then -+ PHP_SAPI="fpm" -+ fi - PHP_FPM_FILES="fpm/fastcgi.c \ - fpm/fpm.c \ - fpm/fpm_children.c \ -@@ -449,7 +451,8 @@ - fpm/zlog.c \ - " - -- PHP_SELECT_SAPI(fpm, program, $PHP_FPM_FILES $PHP_FPM_TRACE_FILES, $PHP_FPM_CFLAGS, '$(SAPI_FPM_PATH)') -+ PHP_ADD_SOURCES(sapi/fpm, $PHP_FPM_FILES $PHP_FPM_TRACE_FILES, $PHP_FPM_CFLAGS, fpm) -+ PHP_ADD_SOURCES(/main, internal_functions.c,,fpm) - - case $host_alias in - *aix*) -@@ -459,11 +462,19 @@ - BUILD_FPM="\$(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) \$(SAPI_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)" - ;; - *) -- BUILD_FPM="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(SAPI_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)" -+ BUILD_FPM="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_FPM_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)" - ;; - esac - -+ PHP_FPM_TARGET="\$(SAPI_FPM_PATH)" -+ PHP_INSTALL_FPM_TARGET="install-fpm" - PHP_SUBST(BUILD_FPM) -+ PHP_SUBST(PHP_FPM_OBJS) -+ PHP_SUBST(PHP_FPM_TARGET) -+ PHP_SUBST(PHP_INSTALL_FPM_TARGET) -+ if test "$PHP_SAPI" = "fpm" ; then -+ PHP_BUILD_PROGRAM($SAPI_FPM_PATH) -+ fi - else - AC_MSG_RESULT(no) - fi diff --git a/lang/php53/files/patch-sapi_fpm_php-fpm.conf.in b/lang/php53/files/patch-sapi_fpm_php-fpm.conf.in deleted file mode 100644 index 315f2470a773..000000000000 --- a/lang/php53/files/patch-sapi_fpm_php-fpm.conf.in +++ /dev/null @@ -1,11 +0,0 @@ ---- sapi/fpm/php-fpm.conf.in.orig 2012-02-08 15:50:42.000000000 +0100 -+++ sapi/fpm/php-fpm.conf.in 2012-02-08 15:50:54.000000000 +0100 -@@ -317,7 +317,7 @@ - ; last request memory: 0 - ; - ; Note: There is a real-time FPM status monitoring sample web page available --; It's available in: @EXPANDED_DATADIR@/fpm/status.html -+; It's available in: @EXPANDED_DATADIR@/php/fpm/status.html - ; - ; Note: The value must start with a leading slash (/). The value can be - ; anything, but it may not be a good idea to use the .php extension or it diff --git a/lang/php53/files/php-fpm.in b/lang/php53/files/php-fpm.in deleted file mode 100644 index 55e2ac992408..000000000000 --- a/lang/php53/files/php-fpm.in +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# PROVIDE: php-fpm -# REQUIRE: LOGIN -# KEYWORD: shutdown - -# -# Add the following line to /etc/rc.conf to enable php-fpm: -# php_fpm_enable="YES" -# - -. /etc/rc.subr - -name="php_fpm" -rcvar=php_fpm_enable - -load_rc_config "$name" - -: ${php_fpm_enable="NO"} - -extra_commands="reload logrotate" - -command="%%PREFIX%%/sbin/php-fpm" -pidfile="/var/run/php-fpm.pid" -sig_stop="QUIT" -sig_reload="USR2" -logrotate_cmd="php_fpm_logrotate" - -required_files="%%PREFIX%%/etc/php-fpm.conf" - -php_fpm_logrotate() { - 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/php53/pkg-descr b/lang/php53/pkg-descr deleted file mode 100644 index a53cdb1bde68..000000000000 --- a/lang/php53/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/php53/pkg-message.mod b/lang/php53/pkg-message.mod deleted file mode 100644 index 555f5b053ae8..000000000000 --- a/lang/php53/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/php53/pkg-plist b/lang/php53/pkg-plist deleted file mode 100644 index a5de9ec56c1e..000000000000 --- a/lang/php53/pkg-plist +++ /dev/null @@ -1,243 +0,0 @@ -%%CLI%%bin/php -%%CGI%%bin/php-cgi -bin/php-config -bin/phpize -%%FPM%%sbin/php-fpm -etc/php.conf -etc/php.ini-development -etc/php.ini-production -%%FPM%%@unexec if cmp -s %D/etc/php-fpm.conf %D/etc/php-fpm.conf.default; then rm -f %D/etc/php-fpm.conf; fi -%%FPM%%etc/php-fpm.conf.default -%%FPM%%@exec cp -n %D/%F %B/php-fpm.conf -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/acconfig.h -include/php/Zend/zend.h -include/php/Zend/zend_API.h -include/php/Zend/zend_alloc.h -include/php/Zend/zend_build.h -include/php/Zend/zend_builtin_functions.h -include/php/Zend/zend_closures.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_float.h -include/php/Zend/zend_gc.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_ini_scanner_defs.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_language_scanner_defs.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/ereg/php_ereg.h -include/php/ext/ereg/php_regex.h -include/php/ext/ereg/regex/cclass.h -include/php/ext/ereg/regex/cname.h -include/php/ext/ereg/regex/regex.h -include/php/ext/ereg/regex/regex2.h -include/php/ext/ereg/regex/utils.h -include/php/ext/libxml/php_libxml.h -include/php/ext/mysqlnd/config-win.h -include/php/ext/mysqlnd/mysqlnd.h -include/php/ext/mysqlnd/mysqlnd_block_alloc.h -include/php/ext/mysqlnd/mysqlnd_charset.h -include/php/ext/mysqlnd/mysqlnd_debug.h -include/php/ext/mysqlnd/mysqlnd_enum_n_def.h -include/php/ext/mysqlnd/mysqlnd_libmysql_compat.h -include/php/ext/mysqlnd/mysqlnd_net.h -include/php/ext/mysqlnd/mysqlnd_portability.h -include/php/ext/mysqlnd/mysqlnd_priv.h -include/php/ext/mysqlnd/mysqlnd_result.h -include/php/ext/mysqlnd/mysqlnd_result_meta.h -include/php/ext/mysqlnd/mysqlnd_statistics.h -include/php/ext/mysqlnd/mysqlnd_structs.h -include/php/ext/mysqlnd/mysqlnd_wireprotocol.h -include/php/ext/mysqlnd/php_mysqlnd.h -include/php/ext/mysqlnd/php_mysqlnd_config.h -include/php/ext/pcre/php_pcre.h -include/php/ext/spl/php_spl.h -include/php/ext/spl/spl_array.h -include/php/ext/spl/spl_directory.h -include/php/ext/spl/spl_dllist.h -include/php/ext/spl/spl_engine.h -include/php/ext/spl/spl_exceptions.h -include/php/ext/spl/spl_fixedarray.h -include/php/ext/spl/spl_functions.h -include/php/ext/spl/spl_heap.h -include/php/ext/spl/spl_iterators.h -include/php/ext/spl/spl_observer.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/crypt_blowfish.h -include/php/ext/standard/crypt_freesec.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_crypt_r.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/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 -include/php/ext/standard/winver.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/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_getopt.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_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_glob_wrapper.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/win32_internal_function_disabled.h -include/php/main/win95nt.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 -man/man1/php-config.1.gz -man/man1/phpize.1.gz -%%CLI%%man/man1/php.1.gz -%%FPM%%man/man8/php-fpm.8.gz -%%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 -%%FPM%%share/php/fpm/status.html diff --git a/mail/Makefile b/mail/Makefile index 7531998958b8..7be4529ec3aa 100644 --- a/mail/Makefile +++ b/mail/Makefile @@ -458,7 +458,6 @@ SUBDIR += pfqueue SUBDIR += pgpsendmail SUBDIR += php5-imap - SUBDIR += php53-imap SUBDIR += php55-imap SUBDIR += php56-imap SUBDIR += phplist diff --git a/mail/php53-imap/Makefile b/mail/php53-imap/Makefile deleted file mode 100644 index f007d4cd79c2..000000000000 --- a/mail/php53-imap/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= mail - -MASTERDIR= ${.CURDIR}/../../lang/php53 - -PKGNAMESUFFIX= -imap - -.include "${MASTERDIR}/Makefile" diff --git a/mail/php53-imap/files/patch-config.m4 b/mail/php53-imap/files/patch-config.m4 deleted file mode 100644 index ab7120b2c8c8..000000000000 --- a/mail/php53-imap/files/patch-config.m4 +++ /dev/null @@ -1,42 +0,0 @@ ---- config.m4.orig 2010-02-07 14:06:54.000000000 +0100 -+++ config.m4 2010-03-08 11:56:24.000000000 +0100 -@@ -103,6 +103,8 @@ - PHP_ARG_WITH(imap-ssl,for IMAP SSL support, - [ --with-imap-ssl[=DIR] IMAP: Include SSL support. DIR is the OpenSSL install prefix], no, no) - -+PHP_ARG_WITH(pcre-dir, pcre install prefix, -+[ --with-pcre-dir IMAP: pcre install prefix], no, no) - - if test "$PHP_IMAP" != "no"; then - PHP_SUBST(IMAP_SHARED_LIBADD) -@@ -119,6 +121,30 @@ - fi - done - -+ dnl This is PECL build, check if bundled PCRE library is used -+ old_CPPFLAGS=$CPPFLAGS -+ CPPFLAGS=$INCLUDES -+ AC_EGREP_CPP(yes,[ -+#include <main/php_config.h> -+#if defined(HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE) -+yes -+#endif -+ ],[ -+ PHP_PCRE_REGEX=yes -+ ],[ -+ AC_EGREP_CPP(yes,[ -+#include <main/php_config.h> -+#if defined(HAVE_PCRE) && !defined(COMPILE_DL_PCRE) -+yes -+#endif -+ ],[ -+ PHP_PCRE_REGEX=pecl -+ PHP_ADD_INCLUDE($PHP_PCRE_DIR/include) -+ ],[ -+ PHP_PCRE_REGEX=no -+ ]) -+ ]) -+ - dnl Check for c-client version 2004 - AC_EGREP_HEADER(mail_fetch_overview_sequence, $IMAP_INC_DIR/mail.h, [ - AC_DEFINE(HAVE_IMAP2004,1,[ ]) diff --git a/math/Makefile b/math/Makefile index b2f2c8b74512..127e82fbbf6a 100644 --- a/math/Makefile +++ b/math/Makefile @@ -523,8 +523,6 @@ SUBDIR += pecl-trader SUBDIR += php5-bcmath SUBDIR += php5-gmp - SUBDIR += php53-bcmath - SUBDIR += php53-gmp SUBDIR += php55-bcmath SUBDIR += php55-gmp SUBDIR += php56-bcmath diff --git a/math/php53-bcmath/Makefile b/math/php53-bcmath/Makefile deleted file mode 100644 index 09c101f55e07..000000000000 --- a/math/php53-bcmath/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= math - -MASTERDIR= ${.CURDIR}/../../lang/php53 - -PKGNAMESUFFIX= -bcmath - -.include "${MASTERDIR}/Makefile" diff --git a/math/php53-gmp/Makefile b/math/php53-gmp/Makefile deleted file mode 100644 index 8ecc88ed4baf..000000000000 --- a/math/php53-gmp/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= math - -MASTERDIR= ${.CURDIR}/../../lang/php53 - -PKGNAMESUFFIX= -gmp - -.include "${MASTERDIR}/Makefile" diff --git a/misc/Makefile b/misc/Makefile index b6c122605575..981484d15c64 100644 --- a/misc/Makefile +++ b/misc/Makefile @@ -356,7 +356,6 @@ SUBDIR += pecl-timezonedb SUBDIR += pfm SUBDIR += php5-calendar - SUBDIR += php53-calendar SUBDIR += php55-calendar SUBDIR += php56-calendar SUBDIR += phraze diff --git a/misc/php53-calendar/Makefile b/misc/php53-calendar/Makefile deleted file mode 100644 index edd5d84addaf..000000000000 --- a/misc/php53-calendar/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= misc - -MASTERDIR= ${.CURDIR}/../../lang/php53 - -PKGNAMESUFFIX= -calendar - -.include "${MASTERDIR}/Makefile" diff --git a/net-mgmt/Makefile b/net-mgmt/Makefile index d7332f5b5344..c15518b68fe6 100644 --- a/net-mgmt/Makefile +++ b/net-mgmt/Makefile @@ -246,7 +246,6 @@ SUBDIR += percona-monitoring-plugins SUBDIR += pftabled SUBDIR += php5-snmp - SUBDIR += php53-snmp SUBDIR += php55-snmp SUBDIR += php56-snmp SUBDIR += phpip diff --git a/net-mgmt/php53-snmp/Makefile b/net-mgmt/php53-snmp/Makefile deleted file mode 100644 index a2777da4769b..000000000000 --- a/net-mgmt/php53-snmp/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= net-mgmt - -MASTERDIR= ${.CURDIR}/../../lang/php53 - -PKGNAMESUFFIX= -snmp - -.include "${MASTERDIR}/Makefile" diff --git a/net/Makefile b/net/Makefile index f41206958fc3..a6cc0e131819 100644 --- a/net/Makefile +++ b/net/Makefile @@ -855,10 +855,6 @@ SUBDIR += php5-soap SUBDIR += php5-sockets SUBDIR += php5-xmlrpc - SUBDIR += php53-ldap - SUBDIR += php53-soap - SUBDIR += php53-sockets - SUBDIR += php53-xmlrpc SUBDIR += php55-ldap SUBDIR += php55-soap SUBDIR += php55-sockets diff --git a/net/php53-ldap/Makefile b/net/php53-ldap/Makefile deleted file mode 100644 index 3e452726a40c..000000000000 --- a/net/php53-ldap/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# $FreeBSD$ - -PORTREVISION= 4 -CATEGORIES= net - -MASTERDIR= ${.CURDIR}/../../lang/php53 - -PKGNAMESUFFIX= -ldap - -.include "${MASTERDIR}/Makefile" diff --git a/net/php53-soap/Makefile b/net/php53-soap/Makefile deleted file mode 100644 index 9679fc1d7ae9..000000000000 --- a/net/php53-soap/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= net - -MASTERDIR= ${.CURDIR}/../../lang/php53 - -PKGNAMESUFFIX= -soap - -.include "${MASTERDIR}/Makefile" diff --git a/net/php53-soap/files/patch-soap.c b/net/php53-soap/files/patch-soap.c deleted file mode 100644 index 70b84d3a60e9..000000000000 --- a/net/php53-soap/files/patch-soap.c +++ /dev/null @@ -1,56 +0,0 @@ ---- soap.c.orig Tue Oct 3 21:51:01 2006 -+++ 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/php53-sockets/Makefile b/net/php53-sockets/Makefile deleted file mode 100644 index 94d5e70840f1..000000000000 --- a/net/php53-sockets/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= net - -MASTERDIR= ${.CURDIR}/../../lang/php53 - -PKGNAMESUFFIX= -sockets - -.include "${MASTERDIR}/Makefile" diff --git a/net/php53-xmlrpc/Makefile b/net/php53-xmlrpc/Makefile deleted file mode 100644 index a48877f37e6a..000000000000 --- a/net/php53-xmlrpc/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= net - -MASTERDIR= ${.CURDIR}/../../lang/php53 - -PKGNAMESUFFIX= -xmlrpc - -.include "${MASTERDIR}/Makefile" diff --git a/net/php53-xmlrpc/files/patch-config.m4 b/net/php53-xmlrpc/files/patch-config.m4 deleted file mode 100644 index 098855a191dd..000000000000 --- a/net/php53-xmlrpc/files/patch-config.m4 +++ /dev/null @@ -1,23 +0,0 @@ ---- config.m4.orig 2014-05-15 08:00:57.801291749 +0000 -+++ config.m4 2014-05-15 08:01:40.161014307 +0000 -@@ -61,11 +61,9 @@ - fi - fi - -- dnl if iconv is shared or missing then we should build iconv ourselves -- if test "$PHP_ICONV_SHARED" = "yes" || test "$PHP_ICONV" = "no"; then -- - if test "$PHP_ICONV_DIR" != "no"; then - PHP_ICONV=$PHP_ICONV_DIR -+ PHP_ADD_INCLUDE($PHP_ICONV_DIR/include) - fi - - if test -z "$PHP_ICONV" || test "$PHP_ICONV" = "no"; then -@@ -75,7 +73,6 @@ - PHP_SETUP_ICONV(XMLRPC_SHARED_LIBADD, [], [ - AC_MSG_ERROR([iconv not found, in order to build xmlrpc you need the iconv library]) - ]) -- fi - fi - - if test "$PHP_XMLRPC" = "yes"; then diff --git a/security/Makefile b/security/Makefile index 7b399532afd2..a04902404bfd 100644 --- a/security/Makefile +++ b/security/Makefile @@ -719,10 +719,6 @@ SUBDIR += php5-hash SUBDIR += php5-mcrypt SUBDIR += php5-openssl - SUBDIR += php53-filter - SUBDIR += php53-hash - SUBDIR += php53-mcrypt - SUBDIR += php53-openssl SUBDIR += php55-filter SUBDIR += php55-hash SUBDIR += php55-mcrypt diff --git a/security/php53-filter/Makefile b/security/php53-filter/Makefile deleted file mode 100644 index 76001bbc2b1f..000000000000 --- a/security/php53-filter/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= security - -MASTERDIR= ${.CURDIR}/../../lang/php53 - -PKGNAMESUFFIX= -filter - -.include "${MASTERDIR}/Makefile" diff --git a/security/php53-filter/files/patch-config.m4 b/security/php53-filter/files/patch-config.m4 deleted file mode 100644 index ab64c6c9d5ad..000000000000 --- a/security/php53-filter/files/patch-config.m4 +++ /dev/null @@ -1,10 +0,0 @@ ---- config.m4.orig 2009-03-06 08:25:45.000000000 +0100 -+++ config.m4 2009-03-06 08:28:10.000000000 +0100 -@@ -32,6 +32,7 @@ - #endif - ],[ - PHP_PCRE_REGEX=pecl -+ PHP_ADD_INCLUDE($PHP_PCRE_DIR/include) - ],[ - PHP_PCRE_REGEX=no - ]) diff --git a/security/php53-hash/Makefile b/security/php53-hash/Makefile deleted file mode 100644 index a373c7eeb95e..000000000000 --- a/security/php53-hash/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= security - -MASTERDIR= ${.CURDIR}/../../lang/php53 - -PKGNAMESUFFIX= -hash - -.include "${MASTERDIR}/Makefile" diff --git a/security/php53-mcrypt/Makefile b/security/php53-mcrypt/Makefile deleted file mode 100644 index 7e344bfde53f..000000000000 --- a/security/php53-mcrypt/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# $FreeBSD$ - -PORTREVISION= 1 -CATEGORIES= security - -MASTERDIR= ${.CURDIR}/../../lang/php53 - -PKGNAMESUFFIX= -mcrypt - -.include "${MASTERDIR}/Makefile" diff --git a/security/php53-openssl/Makefile b/security/php53-openssl/Makefile deleted file mode 100644 index b8a2edc12541..000000000000 --- a/security/php53-openssl/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= security - -MASTERDIR= ${.CURDIR}/../../lang/php53 - -PKGNAMESUFFIX= -openssl - -.include "${MASTERDIR}/Makefile" diff --git a/sysutils/Makefile b/sysutils/Makefile index c0d184954024..f3cc8204b6b9 100644 --- a/sysutils/Makefile +++ b/sysutils/Makefile @@ -693,8 +693,6 @@ SUBDIR += phantom SUBDIR += php5-fileinfo SUBDIR += php5-posix - SUBDIR += php53-fileinfo - SUBDIR += php53-posix SUBDIR += php55-fileinfo SUBDIR += php55-posix SUBDIR += php56-fileinfo diff --git a/sysutils/php53-fileinfo/Makefile b/sysutils/php53-fileinfo/Makefile deleted file mode 100644 index 645849a73f88..000000000000 --- a/sysutils/php53-fileinfo/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= sysutils - -MASTERDIR= ${.CURDIR}/../../lang/php53 - -PKGNAMESUFFIX= -fileinfo - -.include "${MASTERDIR}/Makefile" diff --git a/sysutils/php53-fileinfo/files/patch-config.m4 b/sysutils/php53-fileinfo/files/patch-config.m4 deleted file mode 100644 index 1348023ccf64..000000000000 --- a/sysutils/php53-fileinfo/files/patch-config.m4 +++ /dev/null @@ -1,21 +0,0 @@ ---- config.m4.orig 2010-09-07 15:45:30.000000000 +0200 -+++ config.m4 2010-09-07 15:46:50.000000000 +0200 -@@ -4,6 +4,9 @@ - PHP_ARG_ENABLE(fileinfo, for fileinfo support, - [ --disable-fileinfo Disable fileinfo support], yes) - -+PHP_ARG_WITH(pcre-dir, pcre install prefix, -+[ --with-pcre-dir FILEINFO: pcre install prefix], no, no) -+ - if test "$PHP_FILEINFO" != "no"; then - - libmagic_sources=" \ -@@ -13,6 +16,8 @@ - libmagic/is_tar.c libmagic/magic.c libmagic/print.c \ - libmagic/readcdf.c libmagic/readelf.c libmagic/softmagic.c" - -+ PHP_ADD_INCLUDE($PHP_PCRE_DIR/include) -+ - PHP_NEW_EXTENSION(fileinfo, fileinfo.c $libmagic_sources, $ext_shared,,-I@ext_srcdir@/libmagic) - PHP_ADD_BUILD_DIR($ext_builddir/libmagic) - diff --git a/sysutils/php53-posix/Makefile b/sysutils/php53-posix/Makefile deleted file mode 100644 index bac6b7c994c8..000000000000 --- a/sysutils/php53-posix/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= sysutils - -MASTERDIR= ${.CURDIR}/../../lang/php53 - -PKGNAMESUFFIX= -posix - -.include "${MASTERDIR}/Makefile" diff --git a/sysutils/php53-posix/files/patch-posix.c b/sysutils/php53-posix/files/patch-posix.c deleted file mode 100644 index d2365b249569..000000000000 --- a/sysutils/php53-posix/files/patch-posix.c +++ /dev/null @@ -1,38 +0,0 @@ ---- posix.c.orig Fri Feb 23 00:40:39 2007 -+++ 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 00aad7672c38..13089dd61fe5 100644 --- a/textproc/Makefile +++ b/textproc/Makefile @@ -1131,15 +1131,6 @@ SUBDIR += php5-xmlreader SUBDIR += php5-xmlwriter SUBDIR += php5-xsl - SUBDIR += php53-ctype - SUBDIR += php53-dom - SUBDIR += php53-pspell - SUBDIR += php53-simplexml - SUBDIR += php53-wddx - SUBDIR += php53-xml - SUBDIR += php53-xmlreader - SUBDIR += php53-xmlwriter - SUBDIR += php53-xsl SUBDIR += php55-ctype SUBDIR += php55-dom SUBDIR += php55-pspell diff --git a/textproc/php53-ctype/Makefile b/textproc/php53-ctype/Makefile deleted file mode 100644 index 35fcdb4b6412..000000000000 --- a/textproc/php53-ctype/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= textproc - -MASTERDIR= ${.CURDIR}/../../lang/php53 - -PKGNAMESUFFIX= -ctype - -.include "${MASTERDIR}/Makefile" diff --git a/textproc/php53-dom/Makefile b/textproc/php53-dom/Makefile deleted file mode 100644 index d5587169cf38..000000000000 --- a/textproc/php53-dom/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= textproc - -MASTERDIR= ${.CURDIR}/../../lang/php53 - -PKGNAMESUFFIX= -dom - -.include "${MASTERDIR}/Makefile" diff --git a/textproc/php53-pspell/Makefile b/textproc/php53-pspell/Makefile deleted file mode 100644 index 854857578815..000000000000 --- a/textproc/php53-pspell/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# $FreeBSD$ - -PORTREVISION= 3 -CATEGORIES= textproc - -MASTERDIR= ${.CURDIR}/../../lang/php53 - -PKGNAMESUFFIX= -pspell - -.include "${MASTERDIR}/Makefile" diff --git a/textproc/php53-simplexml/Makefile b/textproc/php53-simplexml/Makefile deleted file mode 100644 index cb6476d0cfc5..000000000000 --- a/textproc/php53-simplexml/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= textproc - -MASTERDIR= ${.CURDIR}/../../lang/php53 - -PKGNAMESUFFIX= -simplexml - -.include "${MASTERDIR}/Makefile" diff --git a/textproc/php53-wddx/Makefile b/textproc/php53-wddx/Makefile deleted file mode 100644 index 5676477120c2..000000000000 --- a/textproc/php53-wddx/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= textproc - -MASTERDIR= ${.CURDIR}/../../lang/php53 - -PKGNAMESUFFIX= -wddx - -.include "${MASTERDIR}/Makefile" diff --git a/textproc/php53-wddx/files/patch-config.m4 b/textproc/php53-wddx/files/patch-config.m4 deleted file mode 100644 index 08787003b8f9..000000000000 --- a/textproc/php53-wddx/files/patch-config.m4 +++ /dev/null @@ -1,22 +0,0 @@ ---- config.m4.orig Mon Jul 26 09:05:10 2004 -+++ 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=<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/php53-wddx/files/patch-wddx.c b/textproc/php53-wddx/files/patch-wddx.c deleted file mode 100644 index a8a6a79fe47f..000000000000 --- a/textproc/php53-wddx/files/patch-wddx.c +++ /dev/null @@ -1,40 +0,0 @@ ---- wddx.c.orig Sun Jan 1 13:50:16 2006 -+++ 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/php53-xml/Makefile b/textproc/php53-xml/Makefile deleted file mode 100644 index a8f5049f1784..000000000000 --- a/textproc/php53-xml/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= textproc - -MASTERDIR= ${.CURDIR}/../../lang/php53 - -PKGNAMESUFFIX= -xml - -.include "${MASTERDIR}/Makefile" diff --git a/textproc/php53-xml/files/patch-compat.c b/textproc/php53-xml/files/patch-compat.c deleted file mode 100644 index 02125961b20c..000000000000 --- a/textproc/php53-xml/files/patch-compat.c +++ /dev/null @@ -1,13 +0,0 @@ ---- compat.c.orig Tue Jul 20 10:55:02 2004 -+++ 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/php53-xmlreader/Makefile b/textproc/php53-xmlreader/Makefile deleted file mode 100644 index 02cf815b51d5..000000000000 --- a/textproc/php53-xmlreader/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= textproc - -MASTERDIR= ${.CURDIR}/../../lang/php53 - -PKGNAMESUFFIX= -xmlreader - -.include "${MASTERDIR}/Makefile" diff --git a/textproc/php53-xmlwriter/Makefile b/textproc/php53-xmlwriter/Makefile deleted file mode 100644 index abd477522597..000000000000 --- a/textproc/php53-xmlwriter/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= textproc - -MASTERDIR= ${.CURDIR}/../../lang/php53 - -PKGNAMESUFFIX= -xmlwriter - -.include "${MASTERDIR}/Makefile" diff --git a/textproc/php53-xsl/Makefile b/textproc/php53-xsl/Makefile deleted file mode 100644 index 190af5c50fc4..000000000000 --- a/textproc/php53-xsl/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= textproc - -MASTERDIR= ${.CURDIR}/../../lang/php53 - -PKGNAMESUFFIX= -xsl - -.include "${MASTERDIR}/Makefile" diff --git a/textproc/php53-xsl/files/patch-php_xsl.h b/textproc/php53-xsl/files/patch-php_xsl.h deleted file mode 100644 index 9777187f8748..000000000000 --- a/textproc/php53-xsl/files/patch-php_xsl.h +++ /dev/null @@ -1,11 +0,0 @@ ---- php_xsl.h.orig Sun Jan 1 13:50:17 2006 -+++ php_xsl.h Tue Jan 17 16:23:10 2006 -@@ -43,7 +43,7 @@ - #include <libexslt/exsltconfig.h> - #endif - --#include "../dom/xml_common.h" -+#include "ext/dom/xml_common.h" - #include "xsl_fe.h" - - #include <libxslt/extensions.h> diff --git a/www/Makefile b/www/Makefile index f799c5f29bfa..8b9472b7a1ad 100644 --- a/www/Makefile +++ b/www/Makefile @@ -516,7 +516,6 @@ SUBDIR += monast SUBDIR += mongoose SUBDIR += mongrel2 - SUBDIR += moodle26 SUBDIR += moodle27 SUBDIR += moodle28 SUBDIR += mozplugger @@ -1418,8 +1417,6 @@ SUBDIR += php-templates SUBDIR += php5-session SUBDIR += php5-tidy - SUBDIR += php53-session - SUBDIR += php53-tidy SUBDIR += php55-opcache SUBDIR += php55-session SUBDIR += php55-tidy diff --git a/www/moodle26/Makefile b/www/moodle26/Makefile deleted file mode 100644 index 334b1b543b17..000000000000 --- a/www/moodle26/Makefile +++ /dev/null @@ -1,86 +0,0 @@ -# Created by: Javier Martin Rueda <jmrueda@diatel.upm.es> -# $FreeBSD$ - -PORTNAME= moodle -PORTVERSION= 2.6.6 -CATEGORIES= www -MASTER_SITES= SF/moodle/Moodle/stable26/ -PKGNAMESUFFIX= ${PKGORIGIN:T:S/moodle//} -EXTRACT_SUFX= .tgz - -MAINTAINER= wen@FreeBSD.org -COMMENT= Course management system based on social constructionism - -LICENSE= GPLv3 - -DEPRECATED= Deprecated by upstream, use www/moodle2{7,8} instead -EXPIRATION_DATE=2015-04-17 - -BUILD_DEPENDS= ${PHPBASE}/lib/php/${PHP_EXT_DIR}/intl.so:${PORTSDIR}/devel/pecl-intl -RUN_DEPENDS= ${PHPBASE}/lib/php/${PHP_EXT_DIR}/intl.so:${PORTSDIR}/devel/pecl-intl - -CONFLICTS= moodle27-2.7.[0-9]* moodle28-2.8.[0-9]* - -USE_PHP= session gd pcre mbstring iconv tokenizer curl xml xmlrpc ctype \ - soap openssl simplexml spl dom json zip zlib hash -WRKSRC= ${WRKDIR}/moodle - -OPTIONS_DEFINE= MYSQL PGSQL MSSQL LDAP MIMETEX -OPTIONS_DEFAULT=MYSQL -MSSQL_DESC= MS SQL Server support -MIMETEX_DESC= mimeTeX filter functionality support - -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MMYSQL} -USE_PHP+= mysqli -.endif - -.if ${PORT_OPTIONS:MPGSQL} -USE_PHP+= pgsql -.endif - -.if ${PORT_OPTIONS:MMSSQL} -USE_PHP+= mssql -.endif - -.if ${PORT_OPTIONS:MLDAP} -USE_PHP+= ldap -.endif - -.if ${PORT_OPTIONS:MMIMETEX} -RUN_DEPENDS+= ${LOCALBASE}/www/mimetex/cgi-bin/mimetex.cgi:${PORTSDIR}/www/mimetex -.endif - -NO_BUILD= yes -PLIST= ${WRKDIR}/plist -SUB_FILES= pkg-message -SUB_LIST= MOODLEDIR=${MOODLEDIR} \ - MOODLEDATADIR=${MOODLEDATADIR} - -MOODLEDIR?= www/moodle -MOODLEDATADIR?= moodledata - -pre-install: - @${ECHO_CMD} "@owner ${WWWOWN}" >> ${PLIST} - @${ECHO_CMD} "@group ${WWWGRP}" >> ${PLIST} - @${ECHO_CMD} "@mode 755" >> ${PLIST} - @${FIND} -s -d ${WRKSRC} -type f | ${SED} "s?${WRKSRC}?${MOODLEDIR}?g" >>${PLIST} - @${FIND} -s -d ${WRKSRC} -type d | ${SED} "s?${WRKSRC}?@dirrm ${MOODLEDIR}?g" >> ${PLIST} - @${ECHO} @dirrm ${MOODLEDATADIR} >> ${PLIST} - @${ECHO_CMD} "@mode" >> ${PLIST} - @${ECHO_CMD} "@group" >> ${PLIST} - @${ECHO_CMD} "@owner" >> ${PLIST} - -do-install: - @cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${MOODLEDIR} - @${INSTALL} -d ${STAGEDIR}${PREFIX}/${MOODLEDATADIR} -.if ${PORT_OPTIONS:MMIMETEX} - ${LN} -sf ${PREFIX}/www/mimetex/cgi-bin/mimetex.cgi \ - ${STAGEDIR}${PREFIX}/${MOODLEDIR}/filter/tex/mimetex.freebsd -.endif - -post-install: - @${CAT} ${PKGMESSAGE} - -.include <bsd.port.mk> diff --git a/www/moodle26/distinfo b/www/moodle26/distinfo deleted file mode 100644 index 08708e7c3ce1..000000000000 --- a/www/moodle26/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (moodle-2.6.6.tgz) = cbc617b05f985d653e5b53cb7ac92226b04b48c09d8073f36793201cbcc2f552 -SIZE (moodle-2.6.6.tgz) = 39481878 diff --git a/www/moodle26/files/pkg-message.in b/www/moodle26/files/pkg-message.in deleted file mode 100644 index 41da472c2fbf..000000000000 --- a/www/moodle26/files/pkg-message.in +++ /dev/null @@ -1,56 +0,0 @@ -POST-INSTALL CONFIGURATION FOR MOODLE -===================================== - -1) Create a user and a database for Moodle to store all - its tables in (or choose an existing database). - It doesn't matter what the database or user names are, - as this will be configured in a later step. - NOTE: this package assumes that either the phpX-pgsql, - phpX-mysql, or phpX-mssql packages are installed. - -2) Add the following to your Apache configuration, and - restart the server: - - ### Add the AcceptPathInfo directive only for Apache 2.0.30 or later. - Alias /moodle %%PREFIX%%/%%MOODLEDIR%%/ - AcceptPathInfo On - <Directory %%PREFIX%%/%%MOODLEDIR%%> - AllowOverride None - Order Allow,Deny - Allow from all - </Directory> - -3) Visit your Moodle site with a browser (i.e., - http://your.server.com/moodle/), and you should - be taken to the install.php script, which will lead - you through creating a config.php file and then - setting up Moodle, creating an admin account, etc. - - At one step, you will get a message saying that the - installer script was not able to automatically create - the config.php file. Just download it and copy it to - %%PREFIX%%/%%MOODLEDIR%%/config.php. Beware that it - will contain the database password in cleartext, so - set up whatever file permissions you deem more adequate. - For instance, user=root, group=www, mask=640. - -4) Set up a cron task to invoke the file admin/cron.php - every five minutes or so. For instance: - */5 * * * * fetch http://your.server.com/moodle/admin/cron.php - -For more information, see the INSTALL DOCUMENTATION: - - http://docs.moodle.org/en/Installing_Moodle - -It may be worth reading the installation docs even if Moodle seems -to be working at first, to ensure your PHP settings and database -configuration will allow Moodle to operate properly. - -If you are upgrading from an earlier version of Moodle, check out -possible additional steps at: - - http://docs.moodle.org/en/Upgrading - http://docs.moodle.org/en/Upgrading_to_Moodle_2.0 - -If you have real trouble, please visit the Moodle course -"Using Moodle" on moodle.org. diff --git a/www/moodle26/pkg-descr b/www/moodle26/pkg-descr deleted file mode 100644 index fe30e0d25bab..000000000000 --- a/www/moodle26/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -Moodle is a course management system (CMS) - a free, Open Source software -package designed using sound pedagogical principles, to help educators -create effective online learning communities. You can use it on any -computer you have handy (including webhosts), yet it can scale from a -single-teacher site to a 40,000-student University. - -WWW: http://www.moodle.org/ diff --git a/www/php53-session/Makefile b/www/php53-session/Makefile deleted file mode 100644 index 6a07c71d477a..000000000000 --- a/www/php53-session/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= www - -MASTERDIR= ${.CURDIR}/../../lang/php53 - -PKGNAMESUFFIX= -session - -.include "${MASTERDIR}/Makefile" diff --git a/www/php53-tidy/Makefile b/www/php53-tidy/Makefile deleted file mode 100644 index 529d7bdb5eaa..000000000000 --- a/www/php53-tidy/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= www - -MASTERDIR= ${.CURDIR}/../../lang/php53 - -PKGNAMESUFFIX= -tidy - -.include "${MASTERDIR}/Makefile" |