Page MenuHomeFreeBSD
Files F152818498

D5278.id.diff
No OneTemporary
Actions

D5278.id.diff
View Options

Index: head/MOVED
===================================================================
--- head/MOVED
+++ head/MOVED
@@ -8139,3 +8139,69 @@
ports-mgmt/tinderbox-devel|ports-mgmt/tinderbox|2016-02-14|Has expired: use newer stable version (ports-mgmt/tinderbox)
deskutils/alacarte||2016-02-10|Not part of GNOME anymore
deskutils/gnome-shell-extension-calculator||2016-02-10|Obsolete. gnome-calculator provides the functionality since GNOME 3.14
+archivers/php5-bz2||2016-02-14|PHP 5.4 is End of Life http://php.net/supported-versions.php
+archivers/php5-phar||2016-02-14|PHP 5.4 is End of Life http://php.net/supported-versions.php
+archivers/php5-zip||2016-02-14|PHP 5.4 is End of Life http://php.net/supported-versions.php
+archivers/php5-zlib||2016-02-14|PHP 5.4 is End of Life http://php.net/supported-versions.php
+converters/php5-iconv||2016-02-14|PHP 5.4 is End of Life http://php.net/supported-versions.php
+converters/php5-mbstring||2016-02-14|PHP 5.4 is End of Life http://php.net/supported-versions.php
+converters/php5-recode||2016-02-14|PHP 5.4 is End of Life http://php.net/supported-versions.php
+databases/php5-dba||2016-02-14|PHP 5.4 is End of Life http://php.net/supported-versions.php
+databases/php5-interbase||2016-02-14|PHP 5.4 is End of Life http://php.net/supported-versions.php
+databases/php5-mssql||2016-02-14|PHP 5.4 is End of Life http://php.net/supported-versions.php
+databases/php5-mysql||2016-02-14|PHP 5.4 is End of Life http://php.net/supported-versions.php
+databases/php5-mysqli||2016-02-14|PHP 5.4 is End of Life http://php.net/supported-versions.php
+databases/php5-odbc||2016-02-14|PHP 5.4 is End of Life http://php.net/supported-versions.php
+databases/php5-pdo||2016-02-14|PHP 5.4 is End of Life http://php.net/supported-versions.php
+databases/php5-pdo_dblib||2016-02-14|PHP 5.4 is End of Life http://php.net/supported-versions.php
+databases/php5-pdo_firebird||2016-02-14|PHP 5.4 is End of Life http://php.net/supported-versions.php
+databases/php5-pdo_mysql||2016-02-14|PHP 5.4 is End of Life http://php.net/supported-versions.php
+databases/php5-pdo_odbc||2016-02-14|PHP 5.4 is End of Life http://php.net/supported-versions.php
+databases/php5-pdo_pgsql||2016-02-14|PHP 5.4 is End of Life http://php.net/supported-versions.php
+databases/php5-pdo_sqlite||2016-02-14|PHP 5.4 is End of Life http://php.net/supported-versions.php
+databases/php5-pgsql||2016-02-14|PHP 5.4 is End of Life http://php.net/supported-versions.php
+databases/php5-sqlite3||2016-02-14|PHP 5.4 is End of Life http://php.net/supported-versions.php
+databases/php5-sybase_ct||2016-02-14|PHP 5.4 is End of Life http://php.net/supported-versions.php
+devel/php5-gettext||2016-02-14|PHP 5.4 is End of Life http://php.net/supported-versions.php
+devel/php5-json||2016-02-14|PHP 5.4 is End of Life http://php.net/supported-versions.php
+devel/php5-pcntl||2016-02-14|PHP 5.4 is End of Life http://php.net/supported-versions.php
+devel/php5-readline||2016-02-14|PHP 5.4 is End of Life http://php.net/supported-versions.php
+devel/php5-shmop||2016-02-14|PHP 5.4 is End of Life http://php.net/supported-versions.php
+devel/php5-sysvmsg||2016-02-14|PHP 5.4 is End of Life http://php.net/supported-versions.php
+devel/php5-sysvsem||2016-02-14|PHP 5.4 is End of Life http://php.net/supported-versions.php
+devel/php5-sysvshm||2016-02-14|PHP 5.4 is End of Life http://php.net/supported-versions.php
+devel/php5-tokenizer||2016-02-14|PHP 5.4 is End of Life http://php.net/supported-versions.php
+ftp/php5-curl||2016-02-14|PHP 5.4 is End of Life http://php.net/supported-versions.php
+ftp/php5-ftp||2016-02-14|PHP 5.4 is End of Life http://php.net/supported-versions.php
+graphics/php5-exif||2016-02-14|PHP 5.4 is End of Life http://php.net/supported-versions.php
+graphics/php5-gd||2016-02-14|PHP 5.4 is End of Life http://php.net/supported-versions.php
+lang/php5||2016-02-14|PHP 5.4 is End of Life http://php.net/supported-versions.php
+lang/php5-extensions||2016-02-14|PHP 5.4 EOL reached
+mail/php5-imap||2016-02-14|PHP 5.4 is End of Life http://php.net/supported-versions.php
+math/php5-bcmath||2016-02-14|PHP 5.4 is End of Life http://php.net/supported-versions.php
+math/php5-gmp||2016-02-14|PHP 5.4 is End of Life http://php.net/supported-versions.php
+misc/php5-calendar||2016-02-14|PHP 5.4 is End of Life http://php.net/supported-versions.php
+net/php5-ldap||2016-02-14|PHP 5.4 is End of Life http://php.net/supported-versions.php
+net/php5-soap||2016-02-14|PHP 5.4 is End of Life http://php.net/supported-versions.php
+net/php5-sockets||2016-02-14|PHP 5.4 is End of Life http://php.net/supported-versions.php
+net/php5-xmlrpc||2016-02-14|PHP 5.4 is End of Life http://php.net/supported-versions.php
+net-mgmt/php5-snmp||2016-02-14|PHP 5.4 is End of Life http://php.net/supported-versions.php
+security/php5-filter||2016-02-14|PHP 5.4 is End of Life http://php.net/supported-versions.php
+security/php5-hash||2016-02-14|PHP 5.4 is End of Life http://php.net/supported-versions.php
+security/php5-mcrypt||2016-02-14|PHP 5.4 is End of Life http://php.net/supported-versions.php
+security/php5-openssl||2016-02-14|PHP 5.4 is End of Life http://php.net/supported-versions.php
+sysutils/php5-fileinfo||2016-02-14|PHP 5.4 is End of Life http://php.net/supported-versions.php
+sysutils/php5-posix||2016-02-14|PHP 5.4 is End of Life http://php.net/supported-versions.php
+textproc/php5-ctype||2016-02-14|PHP 5.4 is End of Life http://php.net/supported-versions.php
+textproc/php5-dom||2016-02-14|PHP 5.4 is End of Life http://php.net/supported-versions.php
+textproc/php5-pspell||2016-02-14|PHP 5.4 is End of Life http://php.net/supported-versions.php
+textproc/php5-simplexml||2016-02-14|PHP 5.4 is End of Life http://php.net/supported-versions.php
+textproc/php5-wddx||2016-02-14|PHP 5.4 is End of Life http://php.net/supported-versions.php
+textproc/php5-xml||2016-02-14|PHP 5.4 is End of Life http://php.net/supported-versions.php
+textproc/php5-xmlreader||2016-02-14|PHP 5.4 is End of Life http://php.net/supported-versions.php
+textproc/php5-xmlwriter||2016-02-14|PHP 5.4 is End of Life http://php.net/supported-versions.php
+textproc/php5-xsl||2016-02-14|PHP 5.4 is End of Life http://php.net/supported-versions.php
+www/mod_php5||2016-02-14|PHP 5.4 is End of Life http://php.net/supported-versions.php
+www/pecl-zendopcache||2016-02-14|PHP 5.4 EOL reached
+www/php5-session||2016-02-14|PHP 5.4 is End of Life http://php.net/supported-versions.php
+www/php5-tidy||2016-02-14|PHP 5.4 is End of Life http://php.net/supported-versions.php
Index: head/Mk/bsd.php.mk
===================================================================
--- head/Mk/bsd.php.mk
+++ head/Mk/bsd.php.mk
@@ -56,21 +56,15 @@
DEFAULT_PHP_VER?= ${PHP_DEFAULT:S/.//}
PHP_VER?= ${DEFAULT_PHP_VER}
-.if ${PHP_VER} == 53
-PHP_EXT_DIR= 20090626
-PHP_EXT_INC= pcre spl
-.elif ${PHP_VER} == 56
+.if ${PHP_VER} == 56
PHP_EXT_DIR= 20131226
PHP_EXT_INC= pcre spl
.elif ${PHP_VER} == 55
PHP_EXT_DIR= 20121212
PHP_EXT_INC= pcre spl
-.elif ${PHP_VER} == 54
-PHP_VER= 5
-PHP_EXT_DIR= 20100525
-PHP_EXT_INC= pcre spl
.else
-PHP_EXT_DIR= 20100525
+# (rene) default to DEFAULT_VERSIONS
+PHP_EXT_DIR= 20131226
PHP_EXT_INC= pcre spl
.endif
@@ -93,13 +87,11 @@
.endif # .if exists(${PHPBASE}/etc/php.conf)
PHP_EXT_INC?= ""
-PHP5_LAST_VER= 54
-
.if defined(IGNORE_WITH_PHP)
. for VER in ${IGNORE_WITH_PHP}
. if ${PHP_VER} == "${VER}"
IGNORE= cannot be installed: doesn't work with lang/php${PHP_VER} port\
- (doesn't support PHP ${IGNORE_WITH_PHP:C/^5$/${PHP5_LAST_VER}/:C/^5/5./})
+ (doesn't support PHP ${IGNORE_WITH_PHP:C/^5/5./})
. endif
. endfor
.endif
@@ -110,11 +102,6 @@
@${ECHO_CMD} "If you define WANT_PHP_WEB you cannot set also WANT_PHP_CGI"
@${ECHO_CMD} "or WANT_PHP_MOD. Use only one of them."
@${FALSE}
-. elif defined(PHP_VERSION) && ${PHP_VER} == 53 && ${PHP_SAPI:Mcgi} == "" && ${PHP_SAPI:Mfpm} == "" && ${PHP_SAPI:Mmod} == ""
-check-makevars::
- @${ECHO_CMD} "This port requires the Apache Module or the CGI version of PHP, but you have"
- @${ECHO_CMD} "already installed a PHP port without them."
- @${FALSE}
. endif
.endif
@@ -136,15 +123,6 @@
. endif
.endif
-.if defined(WANT_PHP_MOD)
-. if defined(PHP_VERSION) && ${PHP_VER} == 53 && ${PHP_SAPI:Mmod} == ""
-check-makevars::
- @${ECHO_CMD} "This port requires the Apache Module for PHP, but you have already"
- @${ECHO_CMD} "installed a PHP port without the Apache Module."
- @${FALSE}
-. endif
-.endif
-
.if defined(WANT_PHP_EMB)
. if defined(PHP_VERSION) && ${PHP_SAPI:Membed} == ""
check-makevars::
@@ -155,11 +133,7 @@
.endif
PHP_PORT?= lang/php${PHP_VER}
-.if ${PHP_VER} == 53
-MOD_PHP_PORT?= ${PHP_PORT}
-.else
MOD_PHP_PORT?= www/mod_php${PHP_VER}
-.endif
.if defined(USE_PHP_BUILD)
BUILD_DEPENDS+= ${PHPBASE}/include/php/main/php.h:${PORTSDIR}/${PHP_PORT}
@@ -276,8 +250,6 @@
sockets spl sybase_ct sysvmsg sysvsem sysvshm \
tidy tokenizer wddx xml xmlreader xmlrpc xmlwriter xsl zip zlib
# version specific components
-_USE_PHP_VER5= ${_USE_PHP_ALL} phar sqlite3
-_USE_PHP_VER53= ${_USE_PHP_ALL} phar sqlite sqlite3
_USE_PHP_VER55= ${_USE_PHP_ALL} phar sqlite3
_USE_PHP_VER56= ${_USE_PHP_ALL} phar sqlite3
@@ -318,8 +290,6 @@
oci8_DEPENDS= databases/php${PHP_VER}-oci8
.if ${PHP_VER} == 55 || ${PHP_VER} == 56
opcache_DEPENDS= www/php${PHP_VER}-opcache
-.else
-opcache_DEPENDS= www/pecl-zendopcache
.endif
openssl_DEPENDS=security/php${PHP_VER}-openssl
pcntl_DEPENDS= devel/php${PHP_VER}-pcntl
Index: head/archivers/Makefile
===================================================================
--- head/archivers/Makefile
+++ head/archivers/Makefile
@@ -141,11 +141,7 @@
SUBDIR += pecl-phk
SUBDIR += pecl-rar
SUBDIR += php-horde_lz4
- SUBDIR += php5-bz2
- SUBDIR += php5-phar
SUBDIR += php5-snappy
- SUBDIR += php5-zip
- SUBDIR += php5-zlib
SUBDIR += php55-bz2
SUBDIR += php55-phar
SUBDIR += php55-zip
Index: head/archivers/php5-bz2/Makefile
===================================================================
--- head/archivers/php5-bz2/Makefile
+++ head/archivers/php5-bz2/Makefile
@@ -1,10 +0,0 @@
-# Created by: Alex Dupre <ale@FreeBSD.org>
-# $FreeBSD$
-
-CATEGORIES= archivers
-
-MASTERDIR= ${.CURDIR}/../../lang/php5
-
-PKGNAMESUFFIX= -bz2
-
-.include "${MASTERDIR}/Makefile"
Index: head/archivers/php5-phar/Makefile
===================================================================
--- head/archivers/php5-phar/Makefile
+++ head/archivers/php5-phar/Makefile
@@ -1,10 +0,0 @@
-# Created by: Alex Dupre <ale@FreeBSD.org>
-# $FreeBSD$
-
-CATEGORIES= archivers
-
-MASTERDIR= ${.CURDIR}/../../lang/php5
-
-PKGNAMESUFFIX= -phar
-
-.include "${MASTERDIR}/Makefile"
Index: head/archivers/php5-phar/files/patch-config.m4
===================================================================
--- head/archivers/php5-phar/files/patch-config.m4
+++ head/archivers/php5-phar/files/patch-config.m4
@@ -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
Index: head/archivers/php5-phar/files/patch-phar.c
===================================================================
--- head/archivers/php5-phar/files/patch-phar.c
+++ head/archivers/php5-phar/files/patch-phar.c
@@ -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
Index: head/archivers/php5-zip/Makefile
===================================================================
--- head/archivers/php5-zip/Makefile
+++ head/archivers/php5-zip/Makefile
@@ -1,10 +0,0 @@
-# Created by: Alex Dupre <ale@FreeBSD.org>
-# $FreeBSD$
-
-CATEGORIES= archivers
-
-MASTERDIR= ${.CURDIR}/../../lang/php5
-
-PKGNAMESUFFIX= -zip
-
-.include "${MASTERDIR}/Makefile"
Index: head/archivers/php5-zip/files/patch-config.m4
===================================================================
--- head/archivers/php5-zip/files/patch-config.m4
+++ head/archivers/php5-zip/files/patch-config.m4
@@ -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
- ])
Index: head/archivers/php5-zlib/Makefile
===================================================================
--- head/archivers/php5-zlib/Makefile
+++ head/archivers/php5-zlib/Makefile
@@ -1,10 +0,0 @@
-# Created by: Alex Dupre <ale@FreeBSD.org>
-# $FreeBSD$
-
-CATEGORIES= archivers
-
-MASTERDIR= ${.CURDIR}/../../lang/php5
-
-PKGNAMESUFFIX= -zlib
-
-.include "${MASTERDIR}/Makefile"
Index: head/archivers/php5-zlib/files/patch-zlib.c
===================================================================
--- head/archivers/php5-zlib/files/patch-zlib.c
+++ head/archivers/php5-zlib/files/patch-zlib.c
@@ -1,10 +0,0 @@
---- zlib.c.orig 2012-07-09 15:25:31.000000000 +0200
-+++ zlib.c 2012-07-09 15:26:07.000000000 +0200
-@@ -957,6 +957,7 @@
- /* {{{ PHP_RINIT_FUNCTION */
- static PHP_RINIT_FUNCTION(zlib)
- {
-+ ZLIBG(output_compression) = 0;
- ZLIBG(compression_coding) = 0;
-
- php_zlib_output_compression_start(TSRMLS_C);
Index: head/converters/Makefile
===================================================================
--- head/converters/Makefile
+++ head/converters/Makefile
@@ -134,9 +134,6 @@
SUBDIR += pecl-fribidi
SUBDIR += pecl-igbinary
SUBDIR += php5-bsdconv
- SUBDIR += php5-iconv
- SUBDIR += php5-mbstring
- SUBDIR += php5-recode
SUBDIR += php55-iconv
SUBDIR += php55-mbstring
SUBDIR += php55-recode
Index: head/converters/php5-iconv/Makefile
===================================================================
--- head/converters/php5-iconv/Makefile
+++ head/converters/php5-iconv/Makefile
@@ -1,10 +0,0 @@
-# Created by: Alex Dupre <ale@FreeBSD.org>
-# $FreeBSD$
-
-CATEGORIES= converters
-
-MASTERDIR= ${.CURDIR}/../../lang/php5
-
-PKGNAMESUFFIX= -iconv
-
-.include "${MASTERDIR}/Makefile"
Index: head/converters/php5-mbstring/Makefile
===================================================================
--- head/converters/php5-mbstring/Makefile
+++ head/converters/php5-mbstring/Makefile
@@ -1,11 +0,0 @@
-# Created by: Alex Dupre <ale@FreeBSD.org>
-# $FreeBSD$
-
-PORTREVISION= 1
-CATEGORIES= converters
-
-MASTERDIR= ${.CURDIR}/../../lang/php5
-
-PKGNAMESUFFIX= -mbstring
-
-.include "${MASTERDIR}/Makefile"
Index: head/converters/php5-mbstring/files/patch-config.m4
===================================================================
--- head/converters/php5-mbstring/files/patch-config.m4
+++ head/converters/php5-mbstring/files/patch-config.m4
@@ -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])
-
Index: head/converters/php5-recode/Makefile
===================================================================
--- head/converters/php5-recode/Makefile
+++ head/converters/php5-recode/Makefile
@@ -1,10 +0,0 @@
-# Created by: Alex Dupre <ale@FreeBSD.org>
-# $FreeBSD$
-
-CATEGORIES= converters
-
-MASTERDIR= ${.CURDIR}/../../lang/php5
-
-PKGNAMESUFFIX= -recode
-
-.include "${MASTERDIR}/Makefile"
Index: head/databases/Makefile
===================================================================
--- head/databases/Makefile
+++ head/databases/Makefile
@@ -579,23 +579,7 @@
SUBDIR += pgworksheet
SUBDIR += php-adodb-ext
SUBDIR += php-mdcached
- SUBDIR += php5-dba
- SUBDIR += php5-interbase
- SUBDIR += php5-mssql
- SUBDIR += php5-mysql
- SUBDIR += php5-mysqli
- SUBDIR += php5-odbc
- SUBDIR += php5-pdo
SUBDIR += php5-pdo_cassandra
- SUBDIR += php5-pdo_dblib
- SUBDIR += php5-pdo_firebird
- SUBDIR += php5-pdo_mysql
- SUBDIR += php5-pdo_odbc
- SUBDIR += php5-pdo_pgsql
- SUBDIR += php5-pdo_sqlite
- SUBDIR += php5-pgsql
- SUBDIR += php5-sqlite3
- SUBDIR += php5-sybase_ct
SUBDIR += php5-tarantool
SUBDIR += php55-dba
SUBDIR += php55-interbase
Index: head/databases/php5-dba/Makefile
===================================================================
--- head/databases/php5-dba/Makefile
+++ head/databases/php5-dba/Makefile
@@ -1,10 +0,0 @@
-# Created by: Alex Dupre <ale@FreeBSD.org>
-# $FreeBSD$
-
-CATEGORIES= databases
-
-MASTERDIR= ${.CURDIR}/../../lang/php5
-
-PKGNAMESUFFIX= -dba
-
-.include "${MASTERDIR}/Makefile"
Index: head/databases/php5-dba/files/patch-config.m4
===================================================================
--- head/databases/php5-dba/files/patch-config.m4
+++ head/databases/php5-dba/files/patch-config.m4
@@ -1,50 +0,0 @@
---- config.m4.orig 2012-11-21 06:12:20.000000000 +0100
-+++ config.m4 2012-12-12 10:18:42.000000000 +0100
-@@ -320,6 +320,38 @@
- 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/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/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
-@@ -362,7 +394,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 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)
-
Index: head/databases/php5-interbase/Makefile
===================================================================
--- head/databases/php5-interbase/Makefile
+++ head/databases/php5-interbase/Makefile
@@ -1,10 +0,0 @@
-# Created by: Alex Dupre <ale@FreeBSD.org>
-# $FreeBSD$
-
-CATEGORIES= databases
-
-MASTERDIR= ${.CURDIR}/../../lang/php5
-
-PKGNAMESUFFIX= -interbase
-
-.include "${MASTERDIR}/Makefile"
Index: head/databases/php5-mssql/Makefile
===================================================================
--- head/databases/php5-mssql/Makefile
+++ head/databases/php5-mssql/Makefile
@@ -1,10 +0,0 @@
-# Created by: Alex Dupre <ale@FreeBSD.org>
-# $FreeBSD$
-
-CATEGORIES= databases
-
-MASTERDIR= ${.CURDIR}/../../lang/php5
-
-PKGNAMESUFFIX= -mssql
-
-.include "${MASTERDIR}/Makefile"
Index: head/databases/php5-mysql/Makefile
===================================================================
--- head/databases/php5-mysql/Makefile
+++ head/databases/php5-mysql/Makefile
@@ -1,10 +0,0 @@
-# Created by: Alex Dupre <ale@FreeBSD.org>
-# $FreeBSD$
-
-CATEGORIES= databases
-
-MASTERDIR= ${.CURDIR}/../../lang/php5
-
-PKGNAMESUFFIX= -mysql
-
-.include "${MASTERDIR}/Makefile"
Index: head/databases/php5-mysqli/Makefile
===================================================================
--- head/databases/php5-mysqli/Makefile
+++ head/databases/php5-mysqli/Makefile
@@ -1,10 +0,0 @@
-# Created by: Alex Dupre <ale@FreeBSD.org>
-# $FreeBSD$
-
-CATEGORIES= databases
-
-MASTERDIR= ${.CURDIR}/../../lang/php5
-
-PKGNAMESUFFIX= -mysqli
-
-.include "${MASTERDIR}/Makefile"
Index: head/databases/php5-mysqli/files/patch-php_mysqli_structs.h
===================================================================
--- head/databases/php5-mysqli/files/patch-php_mysqli_structs.h
+++ head/databases/php5-mysqli/files/patch-php_mysqli_structs.h
@@ -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)
Index: head/databases/php5-odbc/Makefile
===================================================================
--- head/databases/php5-odbc/Makefile
+++ head/databases/php5-odbc/Makefile
@@ -1,10 +0,0 @@
-# Created by: Alex Dupre <ale@FreeBSD.org>
-# $FreeBSD$
-
-CATEGORIES= databases
-
-MASTERDIR= ${.CURDIR}/../../lang/php5
-
-PKGNAMESUFFIX= -odbc
-
-.include "${MASTERDIR}/Makefile"
Index: head/databases/php5-odbc/files/patch-config.m4
===================================================================
--- head/databases/php5-odbc/files/patch-config.m4
+++ head/databases/php5-odbc/files/patch-config.m4
@@ -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)
Index: head/databases/php5-pdo/Makefile
===================================================================
--- head/databases/php5-pdo/Makefile
+++ head/databases/php5-pdo/Makefile
@@ -1,10 +0,0 @@
-# Created by: Alex Dupre <ale@FreeBSD.org>
-# $FreeBSD$
-
-CATEGORIES= databases
-
-MASTERDIR= ${.CURDIR}/../../lang/php5
-
-PKGNAMESUFFIX= -pdo
-
-.include "${MASTERDIR}/Makefile"
Index: head/databases/php5-pdo_dblib/Makefile
===================================================================
--- head/databases/php5-pdo_dblib/Makefile
+++ head/databases/php5-pdo_dblib/Makefile
@@ -1,10 +0,0 @@
-# Created by: Alex Dupre <ale@FreeBSD.org>
-# $FreeBSD$
-
-CATEGORIES= databases
-
-MASTERDIR= ${.CURDIR}/../../lang/php5
-
-PKGNAMESUFFIX= -pdo_dblib
-
-.include "${MASTERDIR}/Makefile"
Index: head/databases/php5-pdo_firebird/Makefile
===================================================================
--- head/databases/php5-pdo_firebird/Makefile
+++ head/databases/php5-pdo_firebird/Makefile
@@ -1,10 +0,0 @@
-# Created by: Alex Dupre <ale@FreeBSD.org>
-# $FreeBSD$
-
-CATEGORIES= databases
-
-MASTERDIR= ${.CURDIR}/../../lang/php5
-
-PKGNAMESUFFIX= -pdo_firebird
-
-.include "${MASTERDIR}/Makefile"
Index: head/databases/php5-pdo_mysql/Makefile
===================================================================
--- head/databases/php5-pdo_mysql/Makefile
+++ head/databases/php5-pdo_mysql/Makefile
@@ -1,10 +0,0 @@
-# Created by: Alex Dupre <ale@FreeBSD.org>
-# $FreeBSD$
-
-CATEGORIES= databases
-
-MASTERDIR= ${.CURDIR}/../../lang/php5
-
-PKGNAMESUFFIX= -pdo_mysql
-
-.include "${MASTERDIR}/Makefile"
Index: head/databases/php5-pdo_odbc/Makefile
===================================================================
--- head/databases/php5-pdo_odbc/Makefile
+++ head/databases/php5-pdo_odbc/Makefile
@@ -1,10 +0,0 @@
-# Created by: Alex Dupre <ale@FreeBSD.org>
-# $FreeBSD$
-
-CATEGORIES= databases
-
-MASTERDIR= ${.CURDIR}/../../lang/php5
-
-PKGNAMESUFFIX= -pdo_odbc
-
-.include "${MASTERDIR}/Makefile"
Index: head/databases/php5-pdo_pgsql/Makefile
===================================================================
--- head/databases/php5-pdo_pgsql/Makefile
+++ head/databases/php5-pdo_pgsql/Makefile
@@ -1,10 +0,0 @@
-# Created by: Alex Dupre <ale@FreeBSD.org>
-# $FreeBSD$
-
-CATEGORIES= databases
-
-MASTERDIR= ${.CURDIR}/../../lang/php5
-
-PKGNAMESUFFIX= -pdo_pgsql
-
-.include "${MASTERDIR}/Makefile"
Index: head/databases/php5-pdo_sqlite/Makefile
===================================================================
--- head/databases/php5-pdo_sqlite/Makefile
+++ head/databases/php5-pdo_sqlite/Makefile
@@ -1,10 +0,0 @@
-# Created by: Alex Dupre <ale@FreeBSD.org>
-# $FreeBSD$
-
-CATEGORIES= databases
-
-MASTERDIR= ${.CURDIR}/../../lang/php5
-
-PKGNAMESUFFIX= -pdo_sqlite
-
-.include "${MASTERDIR}/Makefile"
Index: head/databases/php5-pgsql/Makefile
===================================================================
--- head/databases/php5-pgsql/Makefile
+++ head/databases/php5-pgsql/Makefile
@@ -1,10 +0,0 @@
-# Created by: Alex Dupre <ale@FreeBSD.org>
-# $FreeBSD$
-
-CATEGORIES= databases
-
-MASTERDIR= ${.CURDIR}/../../lang/php5
-
-PKGNAMESUFFIX= -pgsql
-
-.include "${MASTERDIR}/Makefile"
Index: head/databases/php5-pgsql/files/patch-pgsql.c
===================================================================
--- head/databases/php5-pgsql/files/patch-pgsql.c
+++ head/databases/php5-pgsql/files/patch-pgsql.c
@@ -1,11 +0,0 @@
---- pgsql.c.orig 2010-01-03 10:23:27.000000000 +0100
-+++ pgsql.c 2010-03-08 11:00:26.000000000 +0100
-@@ -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;
-
Index: head/databases/php5-sqlite3/Makefile
===================================================================
--- head/databases/php5-sqlite3/Makefile
+++ head/databases/php5-sqlite3/Makefile
@@ -1,10 +0,0 @@
-# Created by: Alex Dupre <ale@FreeBSD.org>
-# $FreeBSD$
-
-CATEGORIES= databases
-
-MASTERDIR= ${.CURDIR}/../../lang/php5
-
-PKGNAMESUFFIX= -sqlite3
-
-.include "${MASTERDIR}/Makefile"
Index: head/databases/php5-sybase_ct/Makefile
===================================================================
--- head/databases/php5-sybase_ct/Makefile
+++ head/databases/php5-sybase_ct/Makefile
@@ -1,10 +0,0 @@
-# Created by: Alex Dupre <ale@FreeBSD.org>
-# $FreeBSD$
-
-CATEGORIES= databases
-
-MASTERDIR= ${.CURDIR}/../../lang/php5
-
-PKGNAMESUFFIX= -sybase_ct
-
-.include "${MASTERDIR}/Makefile"
Index: head/devel/Makefile
===================================================================
--- head/devel/Makefile
+++ head/devel/Makefile
@@ -3745,19 +3745,10 @@
SUBDIR += php5-blitz-devel
SUBDIR += php5-dav
SUBDIR += php5-geshi
- SUBDIR += php5-gettext
SUBDIR += php5-ice
- SUBDIR += php5-json
SUBDIR += php5-msgpack
- SUBDIR += php5-pcntl
SUBDIR += php5-pinba
- SUBDIR += php5-readline
- SUBDIR += php5-shmop
- SUBDIR += php5-sysvmsg
- SUBDIR += php5-sysvsem
- SUBDIR += php5-sysvshm
SUBDIR += php5-thrift
- SUBDIR += php5-tokenizer
SUBDIR += php55-gettext
SUBDIR += php55-json
SUBDIR += php55-pcntl
Index: head/devel/php5-gettext/Makefile
===================================================================
--- head/devel/php5-gettext/Makefile
+++ head/devel/php5-gettext/Makefile
@@ -1,10 +0,0 @@
-# Created by: Alex Dupre <ale@FreeBSD.org>
-# $FreeBSD$
-
-CATEGORIES= devel
-
-MASTERDIR= ${.CURDIR}/../../lang/php5
-
-PKGNAMESUFFIX= -gettext
-
-.include "${MASTERDIR}/Makefile"
Index: head/devel/php5-gettext/files/patch-config.m4
===================================================================
--- head/devel/php5-gettext/files/patch-config.m4
+++ head/devel/php5-gettext/files/patch-config.m4
@@ -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
Index: head/devel/php5-json/Makefile
===================================================================
--- head/devel/php5-json/Makefile
+++ head/devel/php5-json/Makefile
@@ -1,10 +0,0 @@
-# Created by: Alex Dupre <ale@FreeBSD.org>
-# $FreeBSD$
-
-CATEGORIES= devel
-
-MASTERDIR= ${.CURDIR}/../../lang/php5
-
-PKGNAMESUFFIX= -json
-
-.include "${MASTERDIR}/Makefile"
Index: head/devel/php5-pcntl/Makefile
===================================================================
--- head/devel/php5-pcntl/Makefile
+++ head/devel/php5-pcntl/Makefile
@@ -1,10 +0,0 @@
-# Created by: Alex Dupre <ale@FreeBSD.org>
-# $FreeBSD$
-
-CATEGORIES= devel
-
-MASTERDIR= ${.CURDIR}/../../lang/php5
-
-PKGNAMESUFFIX= -pcntl
-
-.include "${MASTERDIR}/Makefile"
Index: head/devel/php5-readline/Makefile
===================================================================
--- head/devel/php5-readline/Makefile
+++ head/devel/php5-readline/Makefile
@@ -1,10 +0,0 @@
-# Created by: Alex Dupre <ale@FreeBSD.org>
-# $FreeBSD$
-
-CATEGORIES= devel
-
-MASTERDIR= ${.CURDIR}/../../lang/php5
-
-PKGNAMESUFFIX= -readline
-
-.include "${MASTERDIR}/Makefile"
Index: head/devel/php5-readline/files/patch-config.m4
===================================================================
--- head/devel/php5-readline/files/patch-config.m4
+++ head/devel/php5-readline/files/patch-config.m4
@@ -1,38 +0,0 @@
---- config.m4.orig 2011-09-06 17:07:24.000000000 +0200
-+++ config.m4 2012-03-02 14:29:51.000000000 +0100
-@@ -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
-@@ -67,6 +62,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
-@@ -118,7 +120,6 @@
- fi
-
- if test "$PHP_READLINE" != "no" || test "$PHP_LIBEDIT" != "no"; then
-- AC_CHECK_FUNCS([rl_completion_matches])
- PHP_NEW_EXTENSION(readline, readline.c readline_cli.c, $ext_shared, cli)
- PHP_SUBST(READLINE_SHARED_LIBADD)
- fi
Index: head/devel/php5-readline/files/patch-readline_cli.c
===================================================================
--- head/devel/php5-readline/files/patch-readline_cli.c
+++ head/devel/php5-readline/files/patch-readline_cli.c
@@ -1,13 +0,0 @@
---- readline_cli.c.orig 2012-03-02 16:40:26.000000000 +0100
-+++ readline_cli.c 2012-03-02 16:40:43.000000000 +0100
-@@ -19,6 +19,10 @@
-
- /* $Id: readline_cli.c 321634 2012-01-01 13:15:04Z felipe $ */
-
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include "php.h"
-
- #ifndef HAVE_RL_COMPLETION_MATCHES
Index: head/devel/php5-shmop/Makefile
===================================================================
--- head/devel/php5-shmop/Makefile
+++ head/devel/php5-shmop/Makefile
@@ -1,10 +0,0 @@
-# Created by: Alex Dupre <ale@FreeBSD.org>
-# $FreeBSD$
-
-CATEGORIES= devel
-
-MASTERDIR= ${.CURDIR}/../../lang/php5
-
-PKGNAMESUFFIX= -shmop
-
-.include "${MASTERDIR}/Makefile"
Index: head/devel/php5-sysvmsg/Makefile
===================================================================
--- head/devel/php5-sysvmsg/Makefile
+++ head/devel/php5-sysvmsg/Makefile
@@ -1,10 +0,0 @@
-# Created by: Alex Dupre <ale@FreeBSD.org>
-# $FreeBSD$
-
-CATEGORIES= devel
-
-MASTERDIR= ${.CURDIR}/../../lang/php5
-
-PKGNAMESUFFIX= -sysvmsg
-
-.include "${MASTERDIR}/Makefile"
Index: head/devel/php5-sysvsem/Makefile
===================================================================
--- head/devel/php5-sysvsem/Makefile
+++ head/devel/php5-sysvsem/Makefile
@@ -1,10 +0,0 @@
-# Created by: Alex Dupre <ale@FreeBSD.org>
-# $FreeBSD$
-
-CATEGORIES= devel
-
-MASTERDIR= ${.CURDIR}/../../lang/php5
-
-PKGNAMESUFFIX= -sysvsem
-
-.include "${MASTERDIR}/Makefile"
Index: head/devel/php5-sysvshm/Makefile
===================================================================
--- head/devel/php5-sysvshm/Makefile
+++ head/devel/php5-sysvshm/Makefile
@@ -1,10 +0,0 @@
-# Created by: Alex Dupre <ale@FreeBSD.org>
-# $FreeBSD$
-
-CATEGORIES= devel
-
-MASTERDIR= ${.CURDIR}/../../lang/php5
-
-PKGNAMESUFFIX= -sysvshm
-
-.include "${MASTERDIR}/Makefile"
Index: head/devel/php5-tokenizer/Makefile
===================================================================
--- head/devel/php5-tokenizer/Makefile
+++ head/devel/php5-tokenizer/Makefile
@@ -1,10 +0,0 @@
-# Created by: Alex Dupre <ale@FreeBSD.org>
-# $FreeBSD$
-
-CATEGORIES= devel
-
-MASTERDIR= ${.CURDIR}/../../lang/php5
-
-PKGNAMESUFFIX= -tokenizer
-
-.include "${MASTERDIR}/Makefile"
Index: head/ftp/Makefile
===================================================================
--- head/ftp/Makefile
+++ head/ftp/Makefile
@@ -63,8 +63,6 @@
SUBDIR += pavuk
SUBDIR += pear-Net_FTP
SUBDIR += pftpd
- SUBDIR += php5-curl
- SUBDIR += php5-ftp
SUBDIR += php55-curl
SUBDIR += php55-ftp
SUBDIR += php56-curl
Index: head/ftp/php5-curl/Makefile
===================================================================
--- head/ftp/php5-curl/Makefile
+++ head/ftp/php5-curl/Makefile
@@ -1,10 +0,0 @@
-# Created by: Alex Dupre <ale@FreeBSD.org>
-# $FreeBSD$
-
-CATEGORIES= ftp
-
-MASTERDIR= ${.CURDIR}/../../lang/php5
-
-PKGNAMESUFFIX= -curl
-
-.include "${MASTERDIR}/Makefile"
Index: head/ftp/php5-ftp/Makefile
===================================================================
--- head/ftp/php5-ftp/Makefile
+++ head/ftp/php5-ftp/Makefile
@@ -1,14 +0,0 @@
-# Created by: Alex Dupre <ale@FreeBSD.org>
-# $FreeBSD$
-
-CATEGORIES= ftp
-
-MASTERDIR= ${.CURDIR}/../../lang/php5
-
-PKGNAMESUFFIX= -ftp
-
-post-patch:
- @${REINPLACE_CMD} s/HAVE_OPENSSL_EXT/__FreeBSD__/ \
- ${WRKSRC}/ftp.* ${WRKSRC}/php_ftp.*
-
-.include "${MASTERDIR}/Makefile"
Index: head/graphics/Makefile
===================================================================
--- head/graphics/Makefile
+++ head/graphics/Makefile
@@ -765,9 +765,7 @@
SUBDIR += php-gdal
SUBDIR += php-libpuzzle
SUBDIR += php-magickwand
- SUBDIR += php5-exif
SUBDIR += php5-ffmpeg
- SUBDIR += php5-gd
SUBDIR += php55-exif
SUBDIR += php55-gd
SUBDIR += php56-exif
Index: head/graphics/mapserver/Makefile
===================================================================
--- head/graphics/mapserver/Makefile
+++ head/graphics/mapserver/Makefile
@@ -125,8 +125,8 @@
.endif
.if ${PORT_OPTIONS:MPHP}
-BUILD_DEPENDS+= ${LOCALBASE}/bin/php-config:${PORTSDIR}/lang/php5
-RUN_BUILDS+= ${LOCALBASE}/bin/php-config:${PORTSDIR}/lang/php5
+BUILD_DEPENDS+= ${LOCALBASE}/bin/php-config:${PORTSDIR}/lang/php56
+RUN_BUILDS+= ${LOCALBASE}/bin/php-config:${PORTSDIR}/lang/php56
PHP_EXTENSION_DIR!= ${LOCALBASE}/bin/php-config --extension-dir | ${SED} -e "s,/usr/local/,,"
CMAKE_ARGS+= -DWITH_PHP=1
PLIST_SUB+= PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR}
Index: head/graphics/php5-exif/Makefile
===================================================================
--- head/graphics/php5-exif/Makefile
+++ head/graphics/php5-exif/Makefile
@@ -1,10 +0,0 @@
-# Created by: Alex Dupre <ale@FreeBSD.org>
-# $FreeBSD$
-
-CATEGORIES= graphics
-
-MASTERDIR= ${.CURDIR}/../../lang/php5
-
-PKGNAMESUFFIX= -exif
-
-.include "${MASTERDIR}/Makefile"
Index: head/graphics/php5-gd/Makefile
===================================================================
--- head/graphics/php5-gd/Makefile
+++ head/graphics/php5-gd/Makefile
@@ -1,11 +0,0 @@
-# Created by: Alex Dupre <ale@FreeBSD.org>
-# $FreeBSD$
-
-PORTREVISION= 1
-CATEGORIES= graphics
-
-MASTERDIR= ${.CURDIR}/../../lang/php5
-
-PKGNAMESUFFIX= -gd
-
-.include "${MASTERDIR}/Makefile"
Index: head/graphics/php5-gd/files/patch-config.m4
===================================================================
--- head/graphics/php5-gd/files/patch-config.m4
+++ head/graphics/php5-gd/files/patch-config.m4
@@ -1,11 +0,0 @@
---- config.m4.orig 2013-12-10 20:32:43.000000000 +0100
-+++ config.m4 2013-12-24 21:02:03.000000000 +0100
-@@ -241,7 +241,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
- ])
Index: head/graphics/php5-gd/files/patch-libgd_webpimg.c
===================================================================
--- head/graphics/php5-gd/files/patch-libgd_webpimg.c
+++ head/graphics/php5-gd/files/patch-libgd_webpimg.c
@@ -1,29 +0,0 @@
-Adjust to libvpx 1.4.0 until the code is removed.
-
-https://chromium.googlesource.com/webm/libvpx/+/9cdaa3d%5E!/
-https://bitbucket.org/libgd/gd-libgd/commits/824a3aa
-
---- libgd/webpimg.c.orig 2013-06-25 09:58:23 UTC
-+++ libgd/webpimg.c
-@@ -711,14 +711,14 @@ static WebPResult VPXEncode(const uint8*
- codec_ctl(&enc, VP8E_SET_STATIC_THRESHOLD, 0);
- codec_ctl(&enc, VP8E_SET_TOKEN_PARTITIONS, 2);
-
-- vpx_img_wrap(&img, IMG_FMT_I420,
-+ vpx_img_wrap(&img, VPX_IMG_FMT_I420,
- y_width, y_height, 16, (uint8*)(Y));
-- img.planes[PLANE_Y] = (uint8*)(Y);
-- img.planes[PLANE_U] = (uint8*)(U);
-- img.planes[PLANE_V] = (uint8*)(V);
-- img.stride[PLANE_Y] = y_stride;
-- img.stride[PLANE_U] = uv_stride;
-- img.stride[PLANE_V] = uv_stride;
-+ img.planes[VPX_PLANE_Y] = (uint8*)(Y);
-+ img.planes[VPX_PLANE_U] = (uint8*)(U);
-+ img.planes[VPX_PLANE_V] = (uint8*)(V);
-+ img.stride[VPX_PLANE_Y] = y_stride;
-+ img.stride[VPX_PLANE_U] = uv_stride;
-+ img.stride[VPX_PLANE_V] = uv_stride;
-
- res = vpx_codec_encode(&enc, &img, 0, 1, 0, VPX_DL_BEST_QUALITY);
-
Index: head/lang/Makefile
===================================================================
--- head/lang/Makefile
+++ head/lang/Makefile
@@ -245,8 +245,6 @@
SUBDIR += pharo
SUBDIR += phc
SUBDIR += php-mode.el
- SUBDIR += php5
- SUBDIR += php5-extensions
SUBDIR += php55
SUBDIR += php55-extensions
SUBDIR += php56
Index: head/lang/php5-extensions/Makefile
===================================================================
--- head/lang/php5-extensions/Makefile
+++ head/lang/php5-extensions/Makefile
@@ -1,130 +0,0 @@
-# Created by: Alex Dupre <ale@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME= php5
-PORTVERSION= 1.7
-CATEGORIES= lang
-MASTER_SITES= # none
-PKGNAMESUFFIX= -extensions
-DISTFILES= # none
-EXTRACT_ONLY= # none
-
-MAINTAINER= ale@FreeBSD.org
-COMMENT= "meta-port" to install PHP extensions
-
-DEPRECATED= PHP 5.4 EOL reached
-EXPIRATION_DATE= 2016-01-15
-
-USE_PHP= yes
-PHP_DEFAULT= 5.4
-IGNORE_WITH_PHP=53 55
-USE_PHP_BUILD= yes
-
-NO_BUILD= yes
-NO_MTREE= yes
-
-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_DBLIB PDO_FIREBIRD \
- PDO_MYSQL PDO_ODBC PDO_PGSQL PDO_SQLITE PGSQL PHAR POSIX \
- PSPELL READLINE RECODE SESSION SHMOP SIMPLEXML SNMP SOAP \
- SOCKETS SQLITE3 SYBASE_CT SYSVMSG SYSVSEM SYSVSHM \
- TIDY TOKENIZER WDDX XML XMLREADER XMLRPC XMLWRITER XSL \
- ZIP ZLIB
-
-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_DBLIB_DESC= PDO DBLIB-DB driver
-PDO_FIREBIRD_DESC= PDO Firebird driver
-PDO_MYSQL_DESC= PDO MySQL driver
-PDO_ODBC_DESC= PDO ODBC 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
-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
-
-OPTIONS_DEFAULT= CTYPE \
- DOM \
- FILTER \
- HASH \
- ICONV \
- JSON \
- PDO \
- PDO_SQLITE \
- PHAR \
- POSIX \
- SESSION \
- SIMPLEXML \
- SQLITE3 \
- TOKENIZER \
- XML \
- XMLREADER \
- XMLWRITER
-
-.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>
Index: head/lang/php5-extensions/pkg-descr
===================================================================
--- head/lang/php5-extensions/pkg-descr
+++ head/lang/php5-extensions/pkg-descr
@@ -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/
Index: head/lang/php5/Makefile
===================================================================
--- head/lang/php5/Makefile
+++ head/lang/php5/Makefile
@@ -1,209 +0,0 @@
-# Created by: Alex Dupre <ale@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME= php5
-PORTVERSION= 5.4.45
-PORTREVISION?= 0
-CATEGORIES?= lang devel www
-MASTER_SITES= PHP/distributions
-DISTNAME= php-${PORTVERSION}
-
-MAINTAINER= ale@FreeBSD.org
-COMMENT= PHP Scripting Language
-
-LICENSE= PHP301
-
-USES= tar:bzip2 cpe
-CPE_PRODUCT= php
-NO_OPTIONS_SORT=yes
-
-DEPRECATED= PHP 5.4 is End of Life http://php.net/supported-versions.php
-EXPIRATION_DATE=2016-01-15
-
-.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 EMBED DEBUG DTRACE IPV6 MAILHEAD LINKTHR ZTS
-OPTIONS_DEFAULT=CLI CGI FPM IPV6 LINKTHR
-# Bug 197128: No ASM code for MIPS/MIPS64, disable FPM
-OPTIONS_EXCLUDE_mips=FPM
-OPTIONS_EXCLUDE_mips64=FPM
-OPTIONS_SUB= yes
-
-CLI_DESC= Build CLI version
-CGI_DESC= Build CGI version
-FPM_DESC= Build FPM version
-EMBED_DESC= Build embedded library
-DEBUG_DESC= Enable debug
-DTRACE_DESC= Enable DTrace support
-IPV6_DESC= Enable ipv6 support
-MAILHEAD_DESC= Enable mail header patch
-LINKTHR_DESC= Link thread lib (for threaded extensions)
-ZTS_DESC= Force Zend Thread Safety (ZTS) build
-
-CONFLICTS= php53-5* php55-5* php56-5*
-
-DESTDIRNAME= INSTALL_ROOT
-
-.include <bsd.port.pre.mk>
-
-PATCH_DIST_STRIP= -p1
-
-PATCH_SITES+= LOCAL/ale
-
-.if ${PORT_OPTIONS:MMAILHEAD}
-PATCHFILES+= php-5.4.x-mail-header.patch:mail
-PATCH_SITES+= http://choon.net/opensource/php/:mail
-.endif
-
-.if ${PORT_OPTIONS:MCLI}
-PHP_SAPI+= cli
-.else
-CONFIGURE_ARGS+=--disable-cli
-.endif
-
-.if ${PORT_OPTIONS:MCGI}
-PHP_SAPI+= cgi
-.else
-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}
-.endif
-
-.if defined(OPTIONS_FILE_SET) && ${OPTIONS_FILE_SET:MAPACHE}
-IGNORE= doesn't install the Apache module anymore:\
- update your OPTIONS and build www/mod_php5 port instead
-.endif
-
-.if defined(PKGNAMEPREFIX)
-USE_PHP= yes
-PHP_DEFAULT= 5.4
-IGNORE_WITH_PHP=53 55
-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
-PLIST= ${PKGDIR}/pkg-plist.mod
-PKGMESSAGE= ${PKGDIR}/pkg-message.mod
-MODULENAME= libphp5
-SHORTMODNAME= php5
-WARNING= "!!! If you have a threaded Apache, you must build ${PHP_PORT} with ZTS support to enable thread-safety in extensions !!!"
-.endif
-
-.if ${PORT_OPTIONS:MEMBED}
-PHP_SAPI+= embed
-CONFIGURE_ARGS+=--enable-embed
-.endif
-
-.if ${PORT_OPTIONS:MCLI} || ${PORT_OPTIONS:MEMBED}
-PLIST_SUB+= SAPI_INC=""
-.else
-PLIST_SUB+= SAPI_INC="@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="" \
- ac_cv_decimal_fp_supported="no" \
- pthreads_working="yes" \
- lt_cv_path_SED="sed"
-
-.if ${PORT_OPTIONS:MLINKTHR}
-LIBS+= -lpthread
-.endif
-
-.if ${PORT_OPTIONS:MZTS}
-CONFIGURE_ARGS+=--enable-maintainer-zts
-.endif
-
-.if ${PORT_OPTIONS:MDEBUG}
-CONFIGURE_ARGS+=--enable-debug
-.endif
-
-.if ${PORT_OPTIONS:MDTRACE}
-CONFIGURE_ARGS+=--enable-dtrace
-PLIST_SUB+= DTRACE=""
-.else
-PLIST_SUB+= DTRACE="@comment "
-.endif
-
-.if empty(PORT_OPTIONS:MIPV6)
-CONFIGURE_ARGS+=--disable-ipv6
-.endif
-
-post-patch:
- @${TOUCH} ${WRKSRC}/ext/php_config.h
- @${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
-
-.if !defined(PKGNAMEPREFIX)
-post-build:
- @${ECHO_CMD} "PHP_VER=5" > ${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
-do-install:
- ${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}
- ${INSTALL_LIB} ${WRKSRC}/libs/${MODULENAME}.so \
- ${STAGEDIR}${PREFIX}/${APACHEMODDIR}
-.endif
-
-.else
-.include "${MASTERDIR}/Makefile.ext"
-.endif
-.include <bsd.port.post.mk>
Index: head/lang/php5/Makefile.ext
===================================================================
--- head/lang/php5/Makefile.ext
+++ head/lang/php5/Makefile.ext
@@ -1,599 +0,0 @@
-COMMENT= The ${PHP_MODNAME} shared extension for php
-
-USE_PHP= yes
-USE_PHPEXT= yes
-PHP_MODNAME= ${PKGNAMESUFFIX:S/-//}
-PHP_DEFAULT= 5.4
-IGNORE_WITH_PHP=52 53 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 GDBM QDBM TOKYO INIFILE FLATFILE
-OPTIONS_DEFAULT=CDB INIFILE FLATFILE
-
-CDB_DESC= cdb database support
-DB4_DESC= Berkeley DB4 support
-GDBM_DESC= GDBM database support
-QDBM_DESC= QDBM database support
-TOKYO_DESC= Tokyo Cabinet 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
-USES+= 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 VPX
-OPTIONS_DEFAULT=T1LIB TRUETYPE X11
-
-T1LIB_DESC= Include T1lib support
-TRUETYPE_DESC= Enable TrueType string function
-JIS_DESC= Enable JIS-mapped Japanese font support
-X11_DESC= Enable XPM support
-VPX_DESC= Enable VP8 codec 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:${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=${LOCALBASE}
-
-USES+= iconv:translit
-.endif
-
-.if ${PHP_MODNAME} == "imap"
-OPTIONS_DEFINE= PANDA
-PANDA_DESC= Uses the forked panda-cclient instead of the original cclient
-
-CONFIGURE_ARGS+=--with-imap=${LOCALBASE} \
- --with-pcre-dir=${LOCALBASE} \
- --with-imap-ssl=${OPENSSLBASE}
-
-LDFLAGS+= -L${OPENSSLLIB} -lcrypto -lssl
-USE_OPENSSL= yes
-.endif
-
-.if ${PHP_MODNAME} == "interbase"
-CONFIGURE_ARGS+=--with-interbase=${LOCALBASE}
-
-USES+= firebird
-.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=${LOCALBASE}
-. endif
-.endif
-
-.if ${PHP_MODNAME} == "mbstring"
-
-CONFIGURE_ARGS+=--enable-mbstring \
- --with-pcre-dir=${LOCALBASE}
-
-OPTIONS_DEFINE= REGEX
-OPTIONS_DEFAULT=REGEX
-
-REGEX_DESC= Enable 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:${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"
-LIB_DEPENDS+= libodbc.so:${PORTSDIR}/databases/unixODBC
-
-CONFIGURE_ARGS+=--enable-odbc \
- --with-unixODBC=${LOCALBASE}
-.endif
-
-.if ${PHP_MODNAME} == "openssl"
-CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE}
-
-LDFLAGS+= -L${OPENSSLLIB} -lcrypto -lssl
-USE_OPENSSL= yes
-.endif
-
-.if ${PHP_MODNAME} == "pcntl"
-CONFIGURE_ARGS+=--enable-pcntl
-.endif
-
-.if ${PHP_MODNAME} == "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= Enable Microsoft SQL Server support
-.endif
-
-.if ${PHP_MODNAME} == "pdo_firebird"
-CONFIGURE_ARGS+=--with-pdo-firebird=${LOCALBASE}
-
-USE_PHP= pdo
-USE_PHP_BUILD= yes
-
-USES+= firebird
-.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"
-LIB_DEPENDS+= libodbc.so:${PORTSDIR}/databases/unixODBC
-CONFIGURE_ARGS+=--with-pdo-odbc=unixODBC,${LOCALBASE}
-
-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"
-USES+= sqlite
-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} == "pear"
-CONFIGURE_ARGS+=--with-pear
-.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:${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-pcre-dir=${LOCALBASE} \
- --with-libxml-dir=${LOCALBASE}
-
-USES+= pkgconfig
-USE_GNOME= libxml2
-.endif
-
-.if ${PHP_MODNAME} == "snmp"
-CONFIGURE_ARGS+=--with-snmp=${LOCALBASE} \
- --with-openssl-dir=${OPENSSLBASE}
-
-CONFIGURE_ENV+= ac_cv_buggy_snprint_value="no"
-
-LIB_DEPENDS+= libnetsnmp.so:${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} == "sqlite3"
-USES+= sqlite
-CONFIGURE_ARGS+=--with-sqlite3=${LOCALBASE}
-.endif
-
-.if ${PHP_MODNAME} == "sybase_ct"
-LIB_DEPENDS+= libct.so:${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} \
- --with-iconv-dir=${LOCALBASE}
-
-USES+= iconv:translit
-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:${PORTSDIR}/databases/gdbm
-
-CONFIGURE_ARGS+=--with-gdbm=${LOCALBASE}
-. endif
-. if ${PORT_OPTIONS:MQDBM}
-LIB_DEPENDS+= libqdbm.so:${PORTSDIR}/databases/qdbm
-
-CONFIGURE_ARGS+=--with-qdbm=${LOCALBASE}
-. endif
-. if ${PORT_OPTIONS:MTOKYO}
-LIB_DEPENDS+= libtokyocabinet.so:${PORTSDIR}/databases/tokyocabinet
-
-CONFIGURE_ARGS+=--with-tcadb=${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:MT1LIB}
-LIB_DEPENDS+= libt1.so:${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
-. if ${PORT_OPTIONS:MX11}
-USE_XORG= xpm
-
-CONFIGURE_ARGS+=--with-xpm-dir=${LOCALBASE}
-. endif
-. if ${PORT_OPTIONS:MVPX}
-LIB_DEPENDS+= libvpx.so:${PORTSDIR}/multimedia/libvpx
-
-CONFIGURE_ARGS+=--with-vpx-dir=${LOCALBASE}
-. endif
-.endif
-
-.if ${PHP_MODNAME} == "imap"
-. if ${PORT_OPTIONS:MPANDA}
-LIB_DEPENDS+= libc-client4.so.10:${PORTSDIR}/mail/panda-cclient
-. else
-LIB_DEPENDS+= libc-client4.so.9:${PORTSDIR}/mail/cclient
-. endif
-.endif
-
-.if ${PHP_MODNAME} == "mbstring"
-. if ${PORT_OPTIONS:MREGEX}
-LIB_DEPENDS+= libonig.so:${PORTSDIR}/devel/oniguruma5
-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} == "pdo_dblib"
-. if ${PORT_OPTIONS:MMSSQL}
-LIB_DEPENDS+= libsybdb.so:${PORTSDIR}/databases/freetds
-. else
-LIB_DEPENDS+= libct.so:${PORTSDIR}/databases/freetds
-. endif
-.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} == "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
Index: head/lang/php5/distinfo
===================================================================
--- head/lang/php5/distinfo
+++ head/lang/php5/distinfo
@@ -1,4 +0,0 @@
-SHA256 (php-5.4.45.tar.bz2) = 4e0d28b1554c95cfaea6fa2b64aac85433f158ce72bb571bcd5574f98f4c6582
-SIZE (php-5.4.45.tar.bz2) = 12703324
-SHA256 (php-5.4.x-mail-header.patch) = 005ae1cd8ed17c72d7b09dee9c4466e8b16d4ecba7fe11276731ed6ff9fbb344
-SIZE (php-5.4.x-mail-header.patch) = 3379
Index: head/lang/php5/files/patch-TSRM_threads.m4
===================================================================
--- head/lang/php5/files/patch-TSRM_threads.m4
+++ head/lang/php5/files/patch-TSRM_threads.m4
@@ -1,11 +0,0 @@
---- TSRM/threads.m4.orig 2013-12-10 19:32:43.000000000 +0000
-+++ TSRM/threads.m4 2013-12-13 21:55:53.764235920 +0000
-@@ -79,7 +79,7 @@ int main() {
- pthread_mutexattr_t mattr;
- int data = 1;
- pthread_mutexattr_init(&mattr);
-- return pthread_create(&thd, NULL, thread_routine, &data);
-+ return 0;
- } ], [
- pthreads_working=yes
- ], [
Index: head/lang/php5/files/patch-Zend__zend.h
===================================================================
--- head/lang/php5/files/patch-Zend__zend.h
+++ head/lang/php5/files/patch-Zend__zend.h
@@ -1,11 +0,0 @@
---- Zend/zend.h.orig 2013-12-10 19:32:43.000000000 +0000
-+++ Zend/zend.h 2013-12-13 21:55:53.836235768 +0000
-@@ -180,7 +180,7 @@ char *alloca ();
- #endif
- #define restrict __restrict__
-
--#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;
Index: head/lang/php5/files/patch-Zend_zend_list.h
===================================================================
--- head/lang/php5/files/patch-Zend_zend_list.h
+++ head/lang/php5/files/patch-Zend_zend_list.h
@@ -1,24 +0,0 @@
---- Zend/zend_list.h.orig 2013-12-10 19:32:43.000000000 +0000
-+++ Zend/zend_list.h 2013-12-13 21:55:53.929236061 +0000
-@@ -71,9 +71,9 @@ int zend_init_rsrc_list_dtors(void);
- void zend_destroy_rsrc_list_dtors(void);
-
- ZEND_API int zend_list_insert(void *ptr, int type TSRMLS_DC);
--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 void *_zend_list_find(int id, i
- ZEND_API int zend_register_resource(zval *rsrc_result, void *rsrc_pointer, int rsrc_type TSRMLS_DC);
- ZEND_API void *zend_fetch_resource(zval **passed_id TSRMLS_DC, int default_id, const char *resource_type_name, int *found_resource_type, int num_resource_types, ...);
-
--ZEND_API const char *zend_rsrc_list_get_rsrc_type(int resource TSRMLS_DC);
-+ZEND_API const 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 */
Index: head/lang/php5/files/patch-Zend_zend_list.c
===================================================================
--- head/lang/php5/files/patch-Zend_zend_list.c
+++ head/lang/php5/files/patch-Zend_zend_list.c
@@ -1,38 +0,0 @@
---- Zend/zend_list.c.orig 2013-12-10 19:32:43.000000000 +0000
-+++ Zend/zend_list.c 2013-12-13 21:55:53.859235929 +0000
-@@ -47,7 +47,7 @@ ZEND_API int zend_list_insert(void *ptr,
- 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;
-
-@@ -64,7 +64,7 @@ ZEND_API int _zend_list_delete(int id TS
- }
-
-
--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;
-
-@@ -77,7 +77,7 @@ ZEND_API void *_zend_list_find(int id, i
- }
- }
-
--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;
-
-@@ -348,7 +348,7 @@ void zend_destroy_rsrc_list_dtors(void)
- }
-
-
--const char *zend_rsrc_list_get_rsrc_type(int resource TSRMLS_DC)
-+const char *zend_rsrc_list_get_rsrc_type(ulong resource TSRMLS_DC)
- {
- zend_rsrc_list_dtors_entry *lde;
- int rsrc_type;
Index: head/lang/php5/files/patch-acinclude.m4
===================================================================
--- head/lang/php5/files/patch-acinclude.m4
+++ head/lang/php5/files/patch-acinclude.m4
@@ -1,78 +0,0 @@
---- acinclude.m4.orig 2014-11-12 00:29:14.000000000 +0000
-+++ acinclude.m4 2014-11-27 09:29:43.821181323 +0000
-@@ -984,15 +984,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)
-@@ -1042,12 +1036,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
- ])
-
-@@ -2320,9 +2308,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
-
-@@ -2969,7 +2957,7 @@
- $abs_srcdir/$ac_provsrc:;
-
- $ac_bdir[$]ac_hdrobj: $abs_srcdir/$ac_provsrc
-- CFLAGS="\$(CFLAGS_CLEAN)" dtrace -h -C -s $ac_srcdir[$]ac_provsrc -o \$[]@.bak && \$(SED) -e 's,PHP_,DTRACE_,g' \$[]@.bak > \$[]@
-+ CFLAGS="\$(CFLAGS_CLEAN)" dtrace -xnolibs -h -C -s $ac_srcdir[$]ac_provsrc -o \$[]@.bak && \$(SED) -e 's,PHP_,DTRACE_,g' \$[]@.bak > \$[]@
-
- \$(PHP_DTRACE_OBJS): $ac_bdir[$]ac_hdrobj
-
-@@ -2989,12 +2977,12 @@
- $ac_bdir[$]ac_provsrc.lo: \$(PHP_DTRACE_OBJS)
- echo "[#] Generated by Makefile for libtool" > \$[]@
- @test -d "$dtrace_lib_dir" || mkdir $dtrace_lib_dir
-- if CFLAGS="\$(CFLAGS_CLEAN)" dtrace -G -o $dtrace_d_obj -s $abs_srcdir/$ac_provsrc $dtrace_lib_objs 2> /dev/null && test -f "$dtrace_d_obj"; then [\\]
-+ if CFLAGS="\$(CFLAGS_CLEAN)" dtrace -xnolibs -G -o $dtrace_d_obj -s $abs_srcdir/$ac_provsrc $dtrace_lib_objs 2> /dev/null && test -f "$dtrace_d_obj"; then [\\]
- echo "pic_object=['].libs/$dtrace_prov_name[']" >> \$[]@ [;\\]
- else [\\]
- echo "pic_object='none'" >> \$[]@ [;\\]
- fi
-- if CFLAGS="\$(CFLAGS_CLEAN)" dtrace -G -o $ac_bdir[$]ac_provsrc.o -s $abs_srcdir/$ac_provsrc $dtrace_nolib_objs 2> /dev/null && test -f "$ac_bdir[$]ac_provsrc.o"; then [\\]
-+ if CFLAGS="\$(CFLAGS_CLEAN)" dtrace -xnolibs -G -o $ac_bdir[$]ac_provsrc.o -s $abs_srcdir/$ac_provsrc $dtrace_nolib_objs 2> /dev/null && test -f "$ac_bdir[$]ac_provsrc.o"; then [\\]
- echo "non_pic_object=[']$dtrace_prov_name[']" >> \$[]@ [;\\]
- else [\\]
- echo "non_pic_object='none'" >> \$[]@ [;\\]
-@@ -3006,7 +2994,7 @@
- *)
- cat>>Makefile.objects<<EOF
- $ac_bdir[$]ac_provsrc.o: \$(PHP_DTRACE_OBJS)
-- CFLAGS="\$(CFLAGS_CLEAN)" dtrace -G -o \$[]@ -s $abs_srcdir/$ac_provsrc $dtrace_objs
-+ CFLAGS="\$(CFLAGS_CLEAN)" dtrace -xnolibs -G -o \$[]@ -s $abs_srcdir/$ac_provsrc $dtrace_objs
-
- EOF
- ;;
Index: head/lang/php5/files/patch-configure.in
===================================================================
--- head/lang/php5/files/patch-configure.in
+++ head/lang/php5/files/patch-configure.in
@@ -1,53 +0,0 @@
---- configure.in.orig 2014-04-02 05:43:49.000000000 +0000
-+++ configure.in 2014-04-09 07:55:06.042404378 +0000
-@@ -370,7 +370,6 @@
- dnl .
- dnl -------------------------------------------------------------------------
-
--PTHREADS_CHECK
- PHP_HELP_SEPARATOR([SAPI modules:])
- PHP_SHLIB_SUFFIX_NAMES
- PHP_BUILD_PROGRAM
-@@ -401,15 +400,9 @@
- AC_MSG_RESULT([none])
- fi
-
--dnl Exit early
--if test -z "$PHP_INSTALLED_SAPIS"; then
-- AC_MSG_ERROR([Nothing to build.])
--fi
--
- dnl force ZTS
- if test "$enable_maintainer_zts" = "yes"; then
- PTHREADS_ASSIGN_VARS
-- PTHREADS_FLAGS
- fi
-
- dnl Starting system checks.
-@@ -688,7 +681,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
-@@ -1225,7 +1218,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
-@@ -1435,7 +1428,7 @@
- PHP_SUBST(install_targets)
- PHP_SUBST(install_binary_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)
-
Index: head/lang/php5/files/patch-ext_standard_image.c
===================================================================
--- head/lang/php5/files/patch-ext_standard_image.c
+++ head/lang/php5/files/patch-ext_standard_image.c
@@ -1,50 +0,0 @@
---- ext/standard/image.c.orig 2013-12-10 19:32:43.000000000 +0000
-+++ ext/standard/image.c 2013-12-13 21:55:54.112235824 +0000
-@@ -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'};
-@@ -81,9 +79,7 @@ PHP_MINIT_FUNCTION(imagetypes)
- 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 */
-@@ -188,7 +184,6 @@ static unsigned long int php_swf_get_bit
- }
- /* }}} */
-
--#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB)
- /* {{{ php_handle_swc
- */
- static struct gfxinfo *php_handle_swc(php_stream * stream TSRMLS_DC)
-@@ -259,7 +254,6 @@ static struct gfxinfo *php_handle_swc(ph
- return result;
- }
- /* }}} */
--#endif
-
- /* {{{ php_handle_swf
- */
-@@ -1318,11 +1312,7 @@ static void php_getimagesize_from_stream
- 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);
Index: head/lang/php5/files/patch-ext_zlib_config0.m4
===================================================================
--- head/lang/php5/files/patch-ext_zlib_config0.m4
+++ head/lang/php5/files/patch-ext_zlib_config0.m4
@@ -1,11 +0,0 @@
---- ext/zlib/config0.m4.orig 2013-12-10 19:32:43.000000000 +0000
-+++ ext/zlib/config0.m4 2013-12-13 21:55:54.142235878 +0000
-@@ -8,7 +8,7 @@ PHP_ARG_WITH(zlib,for ZLIB support,
- 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)
-
Index: head/lang/php5/files/patch-main__php_config.h.in
===================================================================
--- head/lang/php5/files/patch-main__php_config.h.in
+++ head/lang/php5/files/patch-main__php_config.h.in
@@ -1,12 +0,0 @@
---- main/php_config.h.in.orig 2013-12-10 20:12:52.000000000 +0000
-+++ main/php_config.h.in 2013-12-13 21:55:54.207235635 +0000
-@@ -2375,6 +2375,9 @@
- /* Define if processor uses big-endian word */
- #undef WORDS_BIGENDIAN
-
-+/* Include external shared modules configurations */
-+#include "ext/php_config.h"
-+
- /* Whether sprintf is broken */
- #undef ZEND_BROKEN_SPRINTF
-
Index: head/lang/php5/files/patch-sapi_apache2filter_config.m4
===================================================================
--- head/lang/php5/files/patch-sapi_apache2filter_config.m4
+++ head/lang/php5/files/patch-sapi_apache2filter_config.m4
@@ -1,11 +0,0 @@
---- sapi/apache2filter/config.m4.orig 2013-12-10 19:32:43.000000000 +0000
-+++ sapi/apache2filter/config.m4 2013-12-13 21:55:54.268235571 +0000
-@@ -68,7 +68,7 @@ if test "$PHP_APXS2FILTER" != "no"; then
- 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"
Index: head/lang/php5/files/patch-sapi_apache2handler_config.m4
===================================================================
--- head/lang/php5/files/patch-sapi_apache2handler_config.m4
+++ head/lang/php5/files/patch-sapi_apache2handler_config.m4
@@ -1,11 +0,0 @@
---- sapi/apache2handler/config.m4.orig 2013-12-10 19:32:43.000000000 +0000
-+++ sapi/apache2handler/config.m4 2013-12-13 21:55:54.331235888 +0000
-@@ -67,7 +67,7 @@ if test "$PHP_APXS2" != "no"; then
- 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"
Index: head/lang/php5/files/patch-sapi_fpm_Makefile.frag
===================================================================
--- head/lang/php5/files/patch-sapi_fpm_Makefile.frag
+++ head/lang/php5/files/patch-sapi_fpm_Makefile.frag
@@ -1,12 +0,0 @@
---- sapi/fpm/Makefile.frag.orig 2013-12-10 19:32:43.000000000 +0000
-+++ sapi/fpm/Makefile.frag 2013-12-13 21:55:54.402236058 +0000
-@@ -18,6 +18,6 @@ install-fpm: $(SAPI_FPM_PATH)
- @$(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
Index: head/lang/php5/files/patch-sapi_fpm_config.m4
===================================================================
--- head/lang/php5/files/patch-sapi_fpm_config.m4
+++ head/lang/php5/files/patch-sapi_fpm_config.m4
@@ -1,20 +0,0 @@
---- sapi/fpm/config.m4.orig 2013-12-10 19:32:43.000000000 +0000
-+++ sapi/fpm/config.m4 2013-12-13 21:55:54.457235637 +0000
-@@ -317,7 +317,7 @@ AC_DEFUN([AC_FPM_LQ],
-
- 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])
- ], [
-@@ -338,7 +338,7 @@ AC_DEFUN([AC_FPM_LQ],
- 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
Index: head/lang/php5/files/patch-sapi_fpm_php-fpm.conf.in
===================================================================
--- head/lang/php5/files/patch-sapi_fpm_php-fpm.conf.in
+++ head/lang/php5/files/patch-sapi_fpm_php-fpm.conf.in
@@ -1,11 +0,0 @@
---- sapi/fpm/php-fpm.conf.in.orig 2013-12-10 19:32:43.000000000 +0000
-+++ sapi/fpm/php-fpm.conf.in 2013-12-13 21:55:54.520235931 +0000
-@@ -341,7 +341,7 @@ pm.max_spare_servers = 3
- ; 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
Index: head/lang/php5/files/php-fpm.in
===================================================================
--- head/lang/php5/files/php-fpm.in
+++ head/lang/php5/files/php-fpm.in
@@ -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"
Index: head/lang/php5/pkg-descr
===================================================================
--- head/lang/php5/pkg-descr
+++ head/lang/php5/pkg-descr
@@ -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/
Index: head/lang/php5/pkg-message.mod
===================================================================
--- head/lang/php5/pkg-message.mod
+++ head/lang/php5/pkg-message.mod
@@ -1,14 +0,0 @@
-***************************************************************
-
-Make sure index.php is part of your DirectoryIndex.
-
-You should add the following to your Apache configuration file:
-
-<FilesMatch "\.php$">
- SetHandler application/x-httpd-php
-</FilesMatch>
-<FilesMatch "\.phps$">
- SetHandler application/x-httpd-php-source
-</FilesMatch>
-
-***************************************************************
Index: head/lang/php5/pkg-plist
===================================================================
--- head/lang/php5/pkg-plist
+++ head/lang/php5/pkg-plist
@@ -1,244 +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/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/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_dtrace.h
-%%DTRACE%%include/php/Zend/zend_dtrace_gen.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_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_signal.h
-include/php/Zend/zend_stack.h
-include/php/Zend/zend_static_allocator.h
-include/php/Zend/zend_stream.h
-include/php/Zend/zend_string.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_alloc.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_ext_plugin.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_reverse_api.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/html_tables.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/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/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
-%%CLI%%include/php/sapi/cli/cli.h
-%%EMBED%%include/php/sapi/embed/php_embed.h
-include/php/main/win32_internal_function_disabled.h
-include/php/main/win95nt.h
-%%EMBED%%lib/libphp5.so
-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
-%%CGI%%man/man1/php-cgi.1.gz
-man/man1/php-config.1.gz
-%%CLI%%man/man1/php.1.gz
-man/man1/phpize.1.gz
-%%FPM%%man/man8/php-fpm.8.gz
-%%FPM%%share/php/fpm/status.html
Index: head/lang/php5/pkg-plist.mod
===================================================================
--- head/lang/php5/pkg-plist.mod
+++ head/lang/php5/pkg-plist.mod
@@ -1,3 +0,0 @@
-%%APACHEMODDIR%%/%%AP_MODULE%%
-@exec %D/sbin/apxs -e -a -n %%AP_NAME%% %f
-@unexec %D/sbin/apxs -e -A -n %%AP_NAME%% %f
Index: head/mail/Makefile
===================================================================
--- head/mail/Makefile
+++ head/mail/Makefile
@@ -466,7 +466,6 @@
SUBDIR += pflogsumm
SUBDIR += pfqueue
SUBDIR += pgpsendmail
- SUBDIR += php5-imap
SUBDIR += php55-imap
SUBDIR += php56-imap
SUBDIR += phplist
Index: head/mail/php5-imap/Makefile
===================================================================
--- head/mail/php5-imap/Makefile
+++ head/mail/php5-imap/Makefile
@@ -1,10 +0,0 @@
-# Created by: Alex Dupre <ale@FreeBSD.org>
-# $FreeBSD$
-
-CATEGORIES= mail
-
-MASTERDIR= ${.CURDIR}/../../lang/php5
-
-PKGNAMESUFFIX= -imap
-
-.include "${MASTERDIR}/Makefile"
Index: head/mail/php5-imap/files/patch-config.m4
===================================================================
--- head/mail/php5-imap/files/patch-config.m4
+++ head/mail/php5-imap/files/patch-config.m4
@@ -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,[ ])
Index: head/math/Makefile
===================================================================
--- head/math/Makefile
+++ head/math/Makefile
@@ -556,8 +556,6 @@
SUBDIR += pecl-bitset
SUBDIR += pecl-stats
SUBDIR += pecl-trader
- SUBDIR += php5-bcmath
- SUBDIR += php5-gmp
SUBDIR += php55-bcmath
SUBDIR += php55-gmp
SUBDIR += php56-bcmath
Index: head/math/php5-bcmath/Makefile
===================================================================
--- head/math/php5-bcmath/Makefile
+++ head/math/php5-bcmath/Makefile
@@ -1,10 +0,0 @@
-# Created by: Alex Dupre <ale@FreeBSD.org>
-# $FreeBSD$
-
-CATEGORIES= math
-
-MASTERDIR= ${.CURDIR}/../../lang/php5
-
-PKGNAMESUFFIX= -bcmath
-
-.include "${MASTERDIR}/Makefile"
Index: head/math/php5-gmp/Makefile
===================================================================
--- head/math/php5-gmp/Makefile
+++ head/math/php5-gmp/Makefile
@@ -1,10 +0,0 @@
-# Created by: Alex Dupre <ale@FreeBSD.org>
-# $FreeBSD$
-
-CATEGORIES= math
-
-MASTERDIR= ${.CURDIR}/../../lang/php5
-
-PKGNAMESUFFIX= -gmp
-
-.include "${MASTERDIR}/Makefile"
Index: head/misc/Makefile
===================================================================
--- head/misc/Makefile
+++ head/misc/Makefile
@@ -360,7 +360,6 @@
SUBDIR += pear-Text_Figlet
SUBDIR += pecl-timezonedb
SUBDIR += pfm
- SUBDIR += php5-calendar
SUBDIR += php55-calendar
SUBDIR += php56-calendar
SUBDIR += phraze
Index: head/misc/php5-calendar/Makefile
===================================================================
--- head/misc/php5-calendar/Makefile
+++ head/misc/php5-calendar/Makefile
@@ -1,10 +0,0 @@
-# Created by: Alex Dupre <ale@FreeBSD.org>
-# $FreeBSD$
-
-CATEGORIES= misc
-
-MASTERDIR= ${.CURDIR}/../../lang/php5
-
-PKGNAMESUFFIX= -calendar
-
-.include "${MASTERDIR}/Makefile"
Index: head/net-mgmt/Makefile
===================================================================
--- head/net-mgmt/Makefile
+++ head/net-mgmt/Makefile
@@ -252,7 +252,6 @@
SUBDIR += pandorafms_server
SUBDIR += percona-monitoring-plugins
SUBDIR += pftabled
- SUBDIR += php5-snmp
SUBDIR += php55-snmp
SUBDIR += php56-snmp
SUBDIR += phpip
Index: head/net-mgmt/php5-snmp/Makefile
===================================================================
--- head/net-mgmt/php5-snmp/Makefile
+++ head/net-mgmt/php5-snmp/Makefile
@@ -1,10 +0,0 @@
-# Created by: Alex Dupre <ale@FreeBSD.org>
-# $FreeBSD$
-
-CATEGORIES= net-mgmt
-
-MASTERDIR= ${.CURDIR}/../../lang/php5
-
-PKGNAMESUFFIX= -snmp
-
-.include "${MASTERDIR}/Makefile"
Index: head/net/Makefile
===================================================================
--- head/net/Makefile
+++ head/net/Makefile
@@ -884,10 +884,6 @@
SUBDIR += pen
SUBDIR += pfinger
SUBDIR += phamm
- SUBDIR += php5-ldap
- SUBDIR += php5-soap
- SUBDIR += php5-sockets
- SUBDIR += php5-xmlrpc
SUBDIR += php55-ldap
SUBDIR += php55-soap
SUBDIR += php55-sockets
Index: head/net/php5-ldap/Makefile
===================================================================
--- head/net/php5-ldap/Makefile
+++ head/net/php5-ldap/Makefile
@@ -1,10 +0,0 @@
-# Created by: Alex Dupre <ale@FreeBSD.org>
-# $FreeBSD$
-
-CATEGORIES= net
-
-MASTERDIR= ${.CURDIR}/../../lang/php5
-
-PKGNAMESUFFIX= -ldap
-
-.include "${MASTERDIR}/Makefile"
Index: head/net/php5-soap/Makefile
===================================================================
--- head/net/php5-soap/Makefile
+++ head/net/php5-soap/Makefile
@@ -1,10 +0,0 @@
-# Created by: Alex Dupre <ale@FreeBSD.org>
-# $FreeBSD$
-
-CATEGORIES= net
-
-MASTERDIR= ${.CURDIR}/../../lang/php5
-
-PKGNAMESUFFIX= -soap
-
-.include "${MASTERDIR}/Makefile"
Index: head/net/php5-soap/files/patch-soap.c
===================================================================
--- head/net/php5-soap/files/patch-soap.c
+++ head/net/php5-soap/files/patch-soap.c
@@ -1,56 +0,0 @@
---- soap.c.orig 2012-03-02 15:46:04.000000000 +0100
-+++ soap.c 2012-03-02 15:45:38.000000000 +0100
-@@ -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
- #include "zend_exceptions.h"
-@@ -1639,7 +1639,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;
-@@ -1722,7 +1722,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;
-@@ -1820,7 +1820,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;
-@@ -1845,7 +1845,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) {
-@@ -1887,7 +1887,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) {
Index: head/net/php5-sockets/Makefile
===================================================================
--- head/net/php5-sockets/Makefile
+++ head/net/php5-sockets/Makefile
@@ -1,10 +0,0 @@
-# Created by: Alex Dupre <ale@FreeBSD.org>
-# $FreeBSD$
-
-CATEGORIES= net
-
-MASTERDIR= ${.CURDIR}/../../lang/php5
-
-PKGNAMESUFFIX= -sockets
-
-.include "${MASTERDIR}/Makefile"
Index: head/net/php5-xmlrpc/Makefile
===================================================================
--- head/net/php5-xmlrpc/Makefile
+++ head/net/php5-xmlrpc/Makefile
@@ -1,10 +0,0 @@
-# Created by: Alex Dupre <ale@FreeBSD.org>
-# $FreeBSD$
-
-CATEGORIES= net
-
-MASTERDIR= ${.CURDIR}/../../lang/php5
-
-PKGNAMESUFFIX= -xmlrpc
-
-.include "${MASTERDIR}/Makefile"
Index: head/net/php5-xmlrpc/files/patch-config.m4
===================================================================
--- head/net/php5-xmlrpc/files/patch-config.m4
+++ head/net/php5-xmlrpc/files/patch-config.m4
@@ -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
Index: head/security/Makefile
===================================================================
--- head/security/Makefile
+++ head/security/Makefile
@@ -752,10 +752,6 @@
SUBDIR += pgpgpg
SUBDIR += pgpin
SUBDIR += php-suhosin
- SUBDIR += php5-filter
- SUBDIR += php5-hash
- SUBDIR += php5-mcrypt
- SUBDIR += php5-openssl
SUBDIR += php55-filter
SUBDIR += php55-hash
SUBDIR += php55-mcrypt
Index: head/security/php5-filter/Makefile
===================================================================
--- head/security/php5-filter/Makefile
+++ head/security/php5-filter/Makefile
@@ -1,10 +0,0 @@
-# Created by: Alex Dupre <ale@FreeBSD.org>
-# $FreeBSD$
-
-CATEGORIES= security
-
-MASTERDIR= ${.CURDIR}/../../lang/php5
-
-PKGNAMESUFFIX= -filter
-
-.include "${MASTERDIR}/Makefile"
Index: head/security/php5-filter/files/patch-config.m4
===================================================================
--- head/security/php5-filter/files/patch-config.m4
+++ head/security/php5-filter/files/patch-config.m4
@@ -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
- ])
Index: head/security/php5-hash/Makefile
===================================================================
--- head/security/php5-hash/Makefile
+++ head/security/php5-hash/Makefile
@@ -1,10 +0,0 @@
-# Created by: Alex Dupre <ale@FreeBSD.org>
-# $FreeBSD$
-
-CATEGORIES= security
-
-MASTERDIR= ${.CURDIR}/../../lang/php5
-
-PKGNAMESUFFIX= -hash
-
-.include "${MASTERDIR}/Makefile"
Index: head/security/php5-mcrypt/Makefile
===================================================================
--- head/security/php5-mcrypt/Makefile
+++ head/security/php5-mcrypt/Makefile
@@ -1,10 +0,0 @@
-# Created by: Alex Dupre <ale@FreeBSD.org>
-# $FreeBSD$
-
-CATEGORIES= security
-
-MASTERDIR= ${.CURDIR}/../../lang/php5
-
-PKGNAMESUFFIX= -mcrypt
-
-.include "${MASTERDIR}/Makefile"
Index: head/security/php5-openssl/Makefile
===================================================================
--- head/security/php5-openssl/Makefile
+++ head/security/php5-openssl/Makefile
@@ -1,10 +0,0 @@
-# Created by: Alex Dupre <ale@FreeBSD.org>
-# $FreeBSD$
-
-CATEGORIES= security
-
-MASTERDIR= ${.CURDIR}/../../lang/php5
-
-PKGNAMESUFFIX= -openssl
-
-.include "${MASTERDIR}/Makefile"
Index: head/sysutils/Makefile
===================================================================
--- head/sysutils/Makefile
+++ head/sysutils/Makefile
@@ -730,8 +730,6 @@
SUBDIR += pftables
SUBDIR += pftop
SUBDIR += phantom
- SUBDIR += php5-fileinfo
- SUBDIR += php5-posix
SUBDIR += php55-fileinfo
SUBDIR += php55-posix
SUBDIR += php56-fileinfo
Index: head/sysutils/php5-fileinfo/Makefile
===================================================================
--- head/sysutils/php5-fileinfo/Makefile
+++ head/sysutils/php5-fileinfo/Makefile
@@ -1,10 +0,0 @@
-# Created by: Alex Dupre <ale@FreeBSD.org>
-# $FreeBSD$
-
-CATEGORIES= sysutils
-
-MASTERDIR= ${.CURDIR}/../../lang/php5
-
-PKGNAMESUFFIX= -fileinfo
-
-.include "${MASTERDIR}/Makefile"
Index: head/sysutils/php5-fileinfo/files/patch-config.m4
===================================================================
--- head/sysutils/php5-fileinfo/files/patch-config.m4
+++ head/sysutils/php5-fileinfo/files/patch-config.m4
@@ -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)
-
Index: head/sysutils/php5-posix/Makefile
===================================================================
--- head/sysutils/php5-posix/Makefile
+++ head/sysutils/php5-posix/Makefile
@@ -1,10 +0,0 @@
-# Created by: Alex Dupre <ale@FreeBSD.org>
-# $FreeBSD$
-
-CATEGORIES= sysutils
-
-MASTERDIR= ${.CURDIR}/../../lang/php5
-
-PKGNAMESUFFIX= -posix
-
-.include "${MASTERDIR}/Makefile"
Index: head/sysutils/php5-posix/files/patch-posix.c
===================================================================
--- head/sysutils/php5-posix/files/patch-posix.c
+++ head/sysutils/php5-posix/files/patch-posix.c
@@ -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);
-
Index: head/textproc/Makefile
===================================================================
--- head/textproc/Makefile
+++ head/textproc/Makefile
@@ -1165,15 +1165,6 @@
SUBDIR += perl2html
SUBDIR += permute
SUBDIR += php-mecab
- SUBDIR += php5-ctype
- SUBDIR += php5-dom
- SUBDIR += php5-pspell
- SUBDIR += php5-simplexml
- SUBDIR += php5-wddx
- SUBDIR += php5-xml
- SUBDIR += php5-xmlreader
- SUBDIR += php5-xmlwriter
- SUBDIR += php5-xsl
SUBDIR += php55-ctype
SUBDIR += php55-dom
SUBDIR += php55-pspell
Index: head/textproc/php5-ctype/Makefile
===================================================================
--- head/textproc/php5-ctype/Makefile
+++ head/textproc/php5-ctype/Makefile
@@ -1,10 +0,0 @@
-# Created by: Alex Dupre <ale@FreeBSD.org>
-# $FreeBSD$
-
-CATEGORIES= textproc
-
-MASTERDIR= ${.CURDIR}/../../lang/php5
-
-PKGNAMESUFFIX= -ctype
-
-.include "${MASTERDIR}/Makefile"
Index: head/textproc/php5-dom/Makefile
===================================================================
--- head/textproc/php5-dom/Makefile
+++ head/textproc/php5-dom/Makefile
@@ -1,10 +0,0 @@
-# Created by: Alex Dupre <ale@FreeBSD.org>
-# $FreeBSD$
-
-CATEGORIES= textproc
-
-MASTERDIR= ${.CURDIR}/../../lang/php5
-
-PKGNAMESUFFIX= -dom
-
-.include "${MASTERDIR}/Makefile"
Index: head/textproc/php5-pspell/Makefile
===================================================================
--- head/textproc/php5-pspell/Makefile
+++ head/textproc/php5-pspell/Makefile
@@ -1,10 +0,0 @@
-# Created by: Alex Dupre <ale@FreeBSD.org>
-# $FreeBSD$
-
-CATEGORIES= textproc
-
-MASTERDIR= ${.CURDIR}/../../lang/php5
-
-PKGNAMESUFFIX= -pspell
-
-.include "${MASTERDIR}/Makefile"
Index: head/textproc/php5-simplexml/Makefile
===================================================================
--- head/textproc/php5-simplexml/Makefile
+++ head/textproc/php5-simplexml/Makefile
@@ -1,10 +0,0 @@
-# Created by: Alex Dupre <ale@FreeBSD.org>
-# $FreeBSD$
-
-CATEGORIES= textproc
-
-MASTERDIR= ${.CURDIR}/../../lang/php5
-
-PKGNAMESUFFIX= -simplexml
-
-.include "${MASTERDIR}/Makefile"
Index: head/textproc/php5-simplexml/files/patch-config.m4
===================================================================
--- head/textproc/php5-simplexml/files/patch-config.m4
+++ head/textproc/php5-simplexml/files/patch-config.m4
@@ -1,43 +0,0 @@
---- config.m4.orig 2014-05-14 10:14:22.929420181 +0000
-+++ config.m4 2014-05-14 10:15:36.967414693 +0000
-@@ -4,6 +4,9 @@
- PHP_ARG_ENABLE(simplexml, whether to enable SimpleXML support,
- [ --disable-simplexml Disable SimpleXML support], yes)
-
-+PHP_ARG_WITH(pcre-dir, pcre install prefix,
-+[ --with-pcre-dir SimpleXML: pcre install prefix], no, no)
-+
- if test -z "$PHP_LIBXML_DIR"; then
- PHP_ARG_WITH(libxml-dir, libxml2 install dir,
- [ --with-libxml-dir=DIR SimpleXML: libxml2 install prefix], no, no)
-@@ -11,6 +14,30 @@
-
- if test "$PHP_SIMPLEXML" != "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
-+ ])
-+ ])
-+
- if test "$PHP_LIBXML" = "no"; then
- AC_MSG_ERROR([SimpleXML extension requires LIBXML extension, add --enable-libxml])
- fi
Index: head/textproc/php5-wddx/Makefile
===================================================================
--- head/textproc/php5-wddx/Makefile
+++ head/textproc/php5-wddx/Makefile
@@ -1,10 +0,0 @@
-# Created by: Alex Dupre <ale@FreeBSD.org>
-# $FreeBSD$
-
-CATEGORIES= textproc
-
-MASTERDIR= ${.CURDIR}/../../lang/php5
-
-PKGNAMESUFFIX= -wddx
-
-.include "${MASTERDIR}/Makefile"
Index: head/textproc/php5-wddx/files/patch-config.m4
===================================================================
--- head/textproc/php5-wddx/files/patch-config.m4
+++ head/textproc/php5-wddx/files/patch-config.m4
@@ -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
Index: head/textproc/php5-wddx/files/patch-wddx.c
===================================================================
--- head/textproc/php5-wddx/files/patch-wddx.c
+++ head/textproc/php5-wddx/files/patch-wddx.c
@@ -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
Index: head/textproc/php5-xml/Makefile
===================================================================
--- head/textproc/php5-xml/Makefile
+++ head/textproc/php5-xml/Makefile
@@ -1,10 +0,0 @@
-# Created by: Alex Dupre <ale@FreeBSD.org>
-# $FreeBSD$
-
-CATEGORIES= textproc
-
-MASTERDIR= ${.CURDIR}/../../lang/php5
-
-PKGNAMESUFFIX= -xml
-
-.include "${MASTERDIR}/Makefile"
Index: head/textproc/php5-xml/files/patch-compat.c
===================================================================
--- head/textproc/php5-xml/files/patch-compat.c
+++ head/textproc/php5-xml/files/patch-compat.c
@@ -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"
Index: head/textproc/php5-xmlreader/Makefile
===================================================================
--- head/textproc/php5-xmlreader/Makefile
+++ head/textproc/php5-xmlreader/Makefile
@@ -1,10 +0,0 @@
-# Created by: Alex Dupre <ale@FreeBSD.org>
-# $FreeBSD$
-
-CATEGORIES= textproc
-
-MASTERDIR= ${.CURDIR}/../../lang/php5
-
-PKGNAMESUFFIX= -xmlreader
-
-.include "${MASTERDIR}/Makefile"
Index: head/textproc/php5-xmlwriter/Makefile
===================================================================
--- head/textproc/php5-xmlwriter/Makefile
+++ head/textproc/php5-xmlwriter/Makefile
@@ -1,10 +0,0 @@
-# Created by: Alex Dupre <ale@FreeBSD.org>
-# $FreeBSD$
-
-CATEGORIES= textproc
-
-MASTERDIR= ${.CURDIR}/../../lang/php5
-
-PKGNAMESUFFIX= -xmlwriter
-
-.include "${MASTERDIR}/Makefile"
Index: head/textproc/php5-xsl/Makefile
===================================================================
--- head/textproc/php5-xsl/Makefile
+++ head/textproc/php5-xsl/Makefile
@@ -1,10 +0,0 @@
-# Created by: Alex Dupre <ale@FreeBSD.org>
-# $FreeBSD$
-
-CATEGORIES= textproc
-
-MASTERDIR= ${.CURDIR}/../../lang/php5
-
-PKGNAMESUFFIX= -xsl
-
-.include "${MASTERDIR}/Makefile"
Index: head/textproc/php5-xsl/files/patch-php_xsl.h
===================================================================
--- head/textproc/php5-xsl/files/patch-php_xsl.h
+++ head/textproc/php5-xsl/files/patch-php_xsl.h
@@ -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>
Index: head/www/Makefile
===================================================================
--- head/www/Makefile
+++ head/www/Makefile
@@ -489,7 +489,6 @@
SUBDIR += mod_myvhost
SUBDIR += mod_ntlm2
SUBDIR += mod_perl2
- SUBDIR += mod_php5
SUBDIR += mod_php55
SUBDIR += mod_php56
SUBDIR += mod_proctitle
@@ -1433,7 +1432,6 @@
SUBDIR += pecl-varnish
SUBDIR += pecl-yaf
SUBDIR += pecl-yar
- SUBDIR += pecl-zendopcache
SUBDIR += perlbal
SUBDIR += pglogd
SUBDIR += phalcon
@@ -1441,8 +1439,6 @@
SUBDIR += php-plurk-api
SUBDIR += php-screw
SUBDIR += php-templates
- SUBDIR += php5-session
- SUBDIR += php5-tidy
SUBDIR += php55-opcache
SUBDIR += php55-session
SUBDIR += php55-tidy
Index: head/www/mod_php5/Makefile
===================================================================
--- head/www/mod_php5/Makefile
+++ head/www/mod_php5/Makefile
@@ -1,17 +0,0 @@
-# Created by: marcus@FreeBSD.org
-# $FreeBSD$
-
-PORTEPOCH= 1
-CATEGORIES= www devel
-PKGNAMEPREFIX= mod_
-
-MAINTAINER= ale@FreeBSD.org
-
-PHP_PORT= lang/php5
-MASTERDIR= ${.CURDIR}/../../${PHP_PORT}
-
-OPTIONS_DEFINE= AP2FILTER
-AP2FILTER_DESC= Use Apache 2.x filter interface (experimental)
-OPTIONS_EXCLUDE= CGI CLI FPM EMBED
-
-.include "${MASTERDIR}/Makefile"
Index: head/www/pecl-zendopcache/Makefile
===================================================================
--- head/www/pecl-zendopcache/Makefile
+++ head/www/pecl-zendopcache/Makefile
@@ -1,35 +0,0 @@
-# Created by: Alex Dupre <ale@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME= zendopcache
-PORTVERSION= 7.0.5
-CATEGORIES= www
-MASTER_SITES= http://pecl.php.net/get/
-PKGNAMEPREFIX= pecl-
-DIST_SUBDIR= PECL
-
-MAINTAINER= ale@FreeBSD.org
-COMMENT= Opcode cacher and optimizer for PHP
-
-LICENSE= PHP301
-
-DEPRECATED= PHP 5.4 EOL reached
-EXPIRATION_DATE= 2016-01-15
-
-OPTIONS_DEFINE= DOCS
-
-USES= tar:tgz
-USE_PHP= yes
-USE_PHP_BUILD= yes
-USE_ZENDEXT= yes
-PHP_MODNAME= opcache
-PHP_DEFAULT= 5
-IGNORE_WITH_PHP=55 56
-
-PORTDOCS= *
-
-post-install:
- ${MKDIR} ${STAGEDIR}${DOCSDIR}
- ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
-
-.include <bsd.port.mk>
Index: head/www/pecl-zendopcache/distinfo
===================================================================
--- head/www/pecl-zendopcache/distinfo
+++ head/www/pecl-zendopcache/distinfo
@@ -1,2 +0,0 @@
-SHA256 (PECL/zendopcache-7.0.5.tgz) = c8e4a23bcc78e6280f41b5020eac4825a810d77684d0ce10608bfa5bece9e9c0
-SIZE (PECL/zendopcache-7.0.5.tgz) = 97101
Index: head/www/pecl-zendopcache/pkg-descr
===================================================================
--- head/www/pecl-zendopcache/pkg-descr
+++ head/www/pecl-zendopcache/pkg-descr
@@ -1,7 +0,0 @@
-The Zend OPcache provides faster PHP execution through opcode caching and
-optimization. It improves PHP performance by storing precompiled script
-bytecode in the shared memory. This eliminates the stages of reading code from
-the disk and compiling it on future access. In addition, it applies a few
-bytecode optimization patterns that make code execution faster.
-
-WWW: https://github.com/zend-dev/ZendOptimizerPlus
Index: head/www/php5-session/Makefile
===================================================================
--- head/www/php5-session/Makefile
+++ head/www/php5-session/Makefile
@@ -1,10 +0,0 @@
-# Created by: Alex Dupre <ale@FreeBSD.org>
-# $FreeBSD$
-
-CATEGORIES= www
-
-MASTERDIR= ${.CURDIR}/../../lang/php5
-
-PKGNAMESUFFIX= -session
-
-.include "${MASTERDIR}/Makefile"
Index: head/www/php5-tidy/Makefile
===================================================================
--- head/www/php5-tidy/Makefile
+++ head/www/php5-tidy/Makefile
@@ -1,10 +0,0 @@
-# Created by: Alex Dupre <ale@FreeBSD.org>
-# $FreeBSD$
-
-CATEGORIES= www
-
-MASTERDIR= ${.CURDIR}/../../lang/php5
-
-PKGNAMESUFFIX= -tidy
-
-.include "${MASTERDIR}/Makefile"

File Metadata

Mime Type
text/plain
Expires
Sat, Apr 18, 7:45 AM (10 h, 56 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31706700
Default Alt Text
D5278.id.diff (124 KB)

Event Timeline