Remove expired ports:

2015-04-15 databases/php53-sqlite3: security EOL reached 14 Aug 2014
2015-04-15 textproc/php53-simplexml: security EOL reached 14 Aug 2014
2015-04-15 databases/php53-sybase_ct: security EOL reached 14 Aug 2014
2015-04-15 databases/php53-pdo_mysql: security EOL reached 14 Aug 2014
2015-04-15 textproc/php53-ctype: security EOL reached 14 Aug 2014
2015-04-15 textproc/php53-wddx: security EOL reached 14 Aug 2014
2015-04-15 security/php53-filter: security EOL reached 14 Aug 2014
2015-04-15 ftp/php53-ftp: security EOL reached 14 Aug 2014
2015-04-15 net/php53-soap: security EOL reached 14 Aug 2014
2015-04-15 converters/php53-recode: security EOL reached 14 Aug 2014
2015-04-15 security/php53-openssl: security EOL reached 14 Aug 2014
2015-04-15 databases/php53-dba: security EOL reached 14 Aug 2014
2015-04-15 databases/php53-pdo_pgsql: security EOL reached 14 Aug 2014
2015-04-15 sysutils/php53-fileinfo: security EOL reached 14 Aug 2014
2015-04-15 databases/php53-pdo_odbc: security EOL reached 14 Aug 2014
2015-04-15 databases/php53-sqlite: security EOL reached 14 Aug 2014
2015-04-15 devel/php53-readline: security EOL reached 14 Aug 2014
2015-04-15 mail/php53-imap: security EOL reached 14 Aug 2014
2015-04-15 sysutils/php53-posix: security EOL reached 14 Aug 2014
2015-04-15 archivers/php53-phar: security EOL reached 14 Aug 2014
2015-04-15 graphics/php53-gd: security EOL reached 14 Aug 2014
2015-04-15 textproc/php53-xsl: security EOL reached 14 Aug 2014
2015-04-15 databases/php53-pdo_firebird: security EOL reached 14 Aug 2014
2015-04-15 devel/mingw64-binutils: Obsolete.  Migrate to devel/binutils based ports
2015-04-15 devel/cross-binutils: Obsolete.  Migrate to devel/binutils based ports
2015-04-15 databases/php53-pdo_dblib: security EOL reached 14 Aug 2014
2015-04-15 devel/php53-sysvshm: security EOL reached 14 Aug 2014
2015-04-15 devel/php53-json: security EOL reached 14 Aug 2014
2015-04-15 databases/php53-redis: requires php53, security EOL reached 14 Aug 2014
2015-04-15 textproc/php53-pspell: security EOL reached 14 Aug 2014
2015-04-15 databases/php53-pgsql: security EOL reached 14 Aug 2014
2015-04-15 textproc/php53-xmlreader: security EOL reached 14 Aug 2014
2015-04-15 converters/php53-iconv: security EOL reached 14 Aug 2014
2015-04-15 databases/php53-odbc: security EOL reached 14 Aug 2014
2015-04-15 ftp/php53-curl: security EOL reached 14 Aug 2014
2015-04-15 math/php53-gmp: security EOL reached 14 Aug 2014
2015-04-15 security/php53-mcrypt: security EOL reached 14 Aug 2014
2015-04-15 devel/php53-shmop: security EOL reached 14 Aug 2014
2015-04-15 math/php53-bcmath: security EOL reached 14 Aug 2014
2015-04-15 security/php53-hash: security EOL reached 14 Aug 2014
2015-04-15 devel/php53-sysvsem: security EOL reached 14 Aug 2014
2015-04-15 archivers/php53-zip: security EOL reached 14 Aug 2014
2015-04-15 graphics/php53-exif: security EOL reached 14 Aug 2014
2015-04-15 devel/php53-gettext: security EOL reached 14 Aug 2014
2015-04-15 databases/php53-mysql: security EOL reached 14 Aug 2014
2015-04-15 textproc/php53-xmlwriter: security EOL reached 14 Aug 2014
2015-04-15 textproc/php53-xml: security EOL reached 14 Aug 2014
2015-04-15 converters/php53-mbstring: security EOL reached 14 Aug 2014
2015-04-15 devel/php53-sysvmsg: security EOL reached 14 Aug 2014
2015-04-15 databases/php53-mysqli: security EOL reached 14 Aug 2014
2015-04-15 misc/php53-calendar: security EOL reached 14 Aug 2014
2015-04-15 devel/php53-tokenizer: security EOL reached 14 Aug 2014
2015-04-15 databases/php53-pdo: security EOL reached 14 Aug 2014
2015-04-15 net/php53-xmlrpc: security EOL reached 14 Aug 2014
2015-04-15 databases/php53-interbase: security EOL reached 14 Aug 2014
2015-04-15 www/php53-session: security EOL reached 14 Aug 2014
2015-04-15 databases/php53-mssql: security EOL reached 14 Aug 2014
2015-04-15 www/php53-tidy: security EOL reached 14 Aug 2014
2015-04-15 archivers/php53-zlib: security EOL reached 14 Aug 2014
2015-04-15 net/php53-ldap: security EOL reached 14 Aug 2014
2015-04-15 net-mgmt/php53-snmp: security EOL reached 14 Aug 2014
2015-04-15 textproc/php53-dom: security EOL reached 14 Aug 2014
2015-04-15 devel/php53-pcntl: security EOL reached 14 Aug 2014
2015-04-15 archivers/php53-bz2: security EOL reached 14 Aug 2014
2015-04-15 net/php53-sockets: security EOL reached 14 Aug 2014
2015-04-15 lang/php53: security EOL reached 14 Aug 2014
2015-04-15 devel/pecl-uuid: requires php53, security EOL reached 14 Aug 2014
2015-04-15 lang/php53-extensions: security EOL reached 14 Aug 2014
2015-04-15 german/pecl-konto_check: requires php53, security EOL reached 14 Aug 2014
2015-04-17 www/moodle26: Deprecated by upstream, use www/moodle2{7,8} instead

24 files changed, 0 insertions, 718 deletions

diff --git a/lang/php53/files/patch-CVE-2014-8142.patch b/lang/php53/files/patch-CVE-2014-8142.patch
deleted file mode 100644
index f023909d9024..000000000000
--- a/lang/php53/files/patch-CVE-2014-8142.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-Index: ext/standard/tests/serialize/bug68594.phpt
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ ext/standard/tests/serialize/bug68594.phpt	2015-02-13 11:27:34.753347966 -0500
-@@ -0,0 +1,23 @@
-+--TEST--
-+Bug #68545 Use after free vulnerability in unserialize()
-+--FILE--
-+<?php
-+for ($i=4; $i<100; $i++) {
-+	$m = new StdClass();
-+
-+	$u = array(1);
-+
-+	$m->aaa = array(1,2,&$u,4,5);
-+	$m->bbb = 1;
-+	$m->ccc = &$u;
-+	$m->ddd = str_repeat("A", $i);
-+
-+	$z = serialize($m);
-+	$z = str_replace("bbb", "aaa", $z);
-+	$y = unserialize($z);
-+	$z = serialize($y);
-+}
-+?>
-+===DONE===
-+--EXPECTF--
-+===DONE===
-Index: ext/standard/var_unserializer.c
-===================================================================
---- ext/standard/var_unserializer.c	2015-02-13 11:27:34.793348294 -0500
-+++ ext/standard/var_unserializer.c	2015-02-13 11:27:34.753347966 -0500
-@@ -298,6 +298,9 @@
- 		} else {
- 			/* object properties should include no integers */
- 			convert_to_string(key);
-+			if (zend_symtable_find(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, (void **)&old_data)==SUCCESS) {
-+				var_push_dtor(var_hash, old_data);
-+			}
- 			zend_hash_update(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, &data,
- 					sizeof data, NULL);
- 		}
-Index: ext/standard/var_unserializer.re
-===================================================================
---- ext/standard/var_unserializer.re	2015-02-13 11:27:34.793348294 -0500
-+++ ext/standard/var_unserializer.re	2015-02-13 11:27:34.753347966 -0500
-@@ -304,6 +304,9 @@
- 		} else {
- 			/* object properties should include no integers */
- 			convert_to_string(key);
-+			if (zend_symtable_find(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, (void **)&old_data)==SUCCESS) {
-+				var_push_dtor(var_hash, old_data);
-+			}
- 			zend_hash_update(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, &data,
- 					sizeof data, NULL);
- 		}
diff --git a/lang/php53/files/patch-CVE-2014-9705 b/lang/php53/files/patch-CVE-2014-9705
deleted file mode 100644
index 0b4d6b1e67be..000000000000
--- a/lang/php53/files/patch-CVE-2014-9705
+++ /dev/null
@@ -1,34 +0,0 @@
---- ext/enchant/enchant.c	2015-03-16 13:42:36.063819735 -0400
-+++ ext/enchant/enchant.c	2015-03-16 13:42:36.059819705 -0400
-@@ -545,13 +545,12 @@
- 
- 	d = enchant_broker_request_dict(pbroker->pbroker, (const char *)tag);
- 	if (d) {
-+		pos = pbroker->dictcnt++;
- 		if (pbroker->dictcnt) {
- 			pbroker->dict = (enchant_dict **)erealloc(pbroker->dict, sizeof(enchant_dict *) * pbroker->dictcnt);
--			pos = pbroker->dictcnt++;
- 		} else {
- 			pbroker->dict = (enchant_dict **)emalloc(sizeof(enchant_dict *));
- 			pos = 0;
--			pbroker->dictcnt++;
- 		}
- 
- 		dict = pbroker->dict[pos] = (enchant_dict *)emalloc(sizeof(enchant_dict));
-@@ -606,14 +605,14 @@
- 
- 	d = enchant_broker_request_pwl_dict(pbroker->pbroker, (const char *)pwl);
- 	if (d) {
-+		pos = pbroker->dictcnt++;
- 		if (pbroker->dictcnt) {
--			pos = pbroker->dictcnt++;
- 			pbroker->dict = (enchant_dict **)erealloc(pbroker->dict, sizeof(enchant_dict *) * pbroker->dictcnt);
- 		} else {
- 			pbroker->dict = (enchant_dict **)emalloc(sizeof(enchant_dict *));
- 			pos = 0;
--			pbroker->dictcnt++;
- 		}
-+
- 		dict = pbroker->dict[pos] = (enchant_dict *)emalloc(sizeof(enchant_dict));
- 		dict->id = pos;
- 		dict->pbroker = pbroker;
diff --git a/lang/php53/files/patch-CVE-2015-0231.patch b/lang/php53/files/patch-CVE-2015-0231.patch
deleted file mode 100644
index 535e59013104..000000000000
--- a/lang/php53/files/patch-CVE-2015-0231.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-Index: ext/standard/tests/strings/bug68710.phpt
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ ext/standard/tests/strings/bug68710.phpt	2015-02-13 11:36:32.969760122 -0500
-@@ -0,0 +1,25 @@
-+--TEST--
-+Bug #68710 Use after free vulnerability in unserialize() (bypassing the
-+CVE-2014-8142 fix)
-+--FILE--
-+<?php
-+for ($i=4; $i<100; $i++) {
-+    $m = new StdClass();
-+
-+    $u = array(1);
-+
-+    $m->aaa = array(1,2,&$u,4,5);
-+    $m->bbb = 1;
-+    $m->ccc = &$u;
-+    $m->ddd = str_repeat("A", $i);
-+
-+    $z = serialize($m);
-+    $z = str_replace("aaa", "123", $z);
-+    $z = str_replace("bbb", "123", $z);
-+    $y = unserialize($z);
-+    $z = serialize($y);
-+}
-+?>
-+===DONE===
-+--EXPECTF--
-+===DONE===
-Index: ext/standard/var_unserializer.c
-===================================================================
---- ext/standard/var_unserializer.c	2015-02-13 11:36:33.009760449 -0500
-+++ ext/standard/var_unserializer.c	2015-02-13 11:36:32.969760122 -0500
-@@ -298,7 +298,7 @@
- 		} else {
- 			/* object properties should include no integers */
- 			convert_to_string(key);
--			if (zend_symtable_find(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, (void **)&old_data)==SUCCESS) {
-+			if (zend_hash_find(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, (void **)&old_data)==SUCCESS) {
- 				var_push_dtor(var_hash, old_data);
- 			}
- 			zend_hash_update(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, &data,
-Index: ext/standard/var_unserializer.re
-===================================================================
---- ext/standard/var_unserializer.re	2015-02-13 11:36:33.009760449 -0500
-+++ ext/standard/var_unserializer.re	2015-02-13 11:36:32.969760122 -0500
-@@ -304,7 +304,7 @@
- 		} else {
- 			/* object properties should include no integers */
- 			convert_to_string(key);
--			if (zend_symtable_find(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, (void **)&old_data)==SUCCESS) {
-+			if (zend_hash_find(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, (void **)&old_data)==SUCCESS) {
- 				var_push_dtor(var_hash, old_data);
- 			}
- 			zend_hash_update(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, &data,
diff --git a/lang/php53/files/patch-CVE-2015-0273 b/lang/php53/files/patch-CVE-2015-0273
deleted file mode 100644
index d707ca3c2b0d..000000000000
--- a/lang/php53/files/patch-CVE-2015-0273
+++ /dev/null
@@ -1,18 +0,0 @@
---- ext/date/php_date.c.orig	2015-03-21 18:31:58.092700000 +0100
-+++ ext/date/php_date.c	2015-03-21 18:33:51.148505000 +0100
-@@ -2573,12 +2573,9 @@
- 	timelib_tzinfo   *tzi;
- 	php_timezone_obj *tzobj;
- 
--	if (zend_hash_find(myht, "date", 5, (void**) &z_date) == SUCCESS) {
--		convert_to_string(*z_date);
--		if (zend_hash_find(myht, "timezone_type", 14, (void**) &z_timezone_type) == SUCCESS) {
--			convert_to_long(*z_timezone_type);
--			if (zend_hash_find(myht, "timezone", 9, (void**) &z_timezone) == SUCCESS) {
--				convert_to_string(*z_timezone);
-+	if (zend_hash_find(myht, "date", 5, (void**) &z_date) == SUCCESS && Z_TYPE_PP(z_date) == IS_STRING) {
-+		if (zend_hash_find(myht, "timezone_type", 14, (void**) &z_timezone_type) == SUCCESS && Z_TYPE_PP(z_timezone_type) == IS_LONG) {
-+			if (zend_hash_find(myht, "timezone", 9, (void**) &z_timezone) == SUCCESS && Z_TYPE_PP(z_timezone) == IS_STRING) {
- 
- 				switch (Z_LVAL_PP(z_timezone_type)) {
- 					case TIMELIB_ZONETYPE_OFFSET:
diff --git a/lang/php53/files/patch-TSRM_threads.m4 b/lang/php53/files/patch-TSRM_threads.m4
deleted file mode 100644
index 227f6d26c9d5..000000000000
--- a/lang/php53/files/patch-TSRM_threads.m4
+++ /dev/null
@@ -1,11 +0,0 @@
---- TSRM/threads.m4.orig	2005-04-27 15:22:18.000000000 +0200
-+++ TSRM/threads.m4	2009-09-22 10:01:37.000000000 +0200
-@@ -79,7 +79,7 @@
-     pthread_mutexattr_t mattr;
-     int data = 1;
-     pthread_mutexattr_init(&mattr);
--    return pthread_create(&thd, NULL, thread_routine, &data);
-+    return 0;
- } ], [
-   pthreads_working=yes
-   ], [
diff --git a/lang/php53/files/patch-Zend__zend.h b/lang/php53/files/patch-Zend__zend.h
deleted file mode 100644
index 0fb2398f171d..000000000000
--- a/lang/php53/files/patch-Zend__zend.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- Zend/zend.h.orig	2008-08-15 21:47:23.000000000 +0200
-+++ Zend/zend.h	2008-09-25 22:52:50.000000000 +0200
-@@ -192,7 +192,7 @@
- # define ZEND_FASTCALL
- #endif
- 
--#if (HAVE_ALLOCA || (defined (__GNUC__) && __GNUC__ >= 2)) && !(defined(ZTS) && defined(ZEND_WIN32)) && !(defined(ZTS) && defined(NETWARE)) && !(defined(ZTS) && defined(HPUX)) && !defined(DARWIN)
-+#if (HAVE_ALLOCA || (defined (__GNUC__) && __GNUC__ >= 2)) && !(defined(ZTS) && defined(ZEND_WIN32)) && !(defined(ZTS) && defined(NETWARE)) && !(defined(ZTS) && defined(HPUX)) && !defined(DARWIN) && !(defined(ZTS) && defined(__FreeBSD__))
- # define ZEND_ALLOCA_MAX_SIZE (32 * 1024)
- # define ALLOCA_FLAG(name) \
- 	zend_bool name;
diff --git a/lang/php53/files/patch-Zend_zend__ini.h b/lang/php53/files/patch-Zend_zend__ini.h
deleted file mode 100644
index f1a55168e581..000000000000
--- a/lang/php53/files/patch-Zend_zend__ini.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- Zend/zend_ini.h.orig	2014-12-17 16:24:10 UTC
-+++ Zend/zend_ini.h
-@@ -28,7 +28,7 @@
- #define ZEND_INI_ALL (ZEND_INI_USER|ZEND_INI_PERDIR|ZEND_INI_SYSTEM)
- 
- #ifndef XtOffsetOf
--# if defined(CRAY) || (defined(__arm) && !defined(LINUX))
-+# if defined(CRAY) || (defined(__ARMCC_VERSION) && !defined(LINUX))
- # ifdef __STDC__
- # define XtOffset(p_type, field) _Offsetof(p_type, field)
- # else
diff --git a/lang/php53/files/patch-Zend_zend_list.c b/lang/php53/files/patch-Zend_zend_list.c
deleted file mode 100644
index efa8862d1ce8..000000000000
--- a/lang/php53/files/patch-Zend_zend_list.c
+++ /dev/null
@@ -1,38 +0,0 @@
---- Zend/zend_list.c.orig	2007-01-01 10:35:46.000000000 +0100
-+++ Zend/zend_list.c	2008-01-29 11:05:14.000000000 +0100
-@@ -48,7 +48,7 @@
- 	return index;
- }
- 
--ZEND_API int _zend_list_delete(int id TSRMLS_DC)
-+ZEND_API int _zend_list_delete(ulong id TSRMLS_DC)
- {
- 	zend_rsrc_list_entry *le;
- 	
-@@ -65,7 +65,7 @@
- }
- 
- 
--ZEND_API void *_zend_list_find(int id, int *type TSRMLS_DC)
-+ZEND_API void *_zend_list_find(ulong id, int *type TSRMLS_DC)
- {
- 	zend_rsrc_list_entry *le;
- 
-@@ -78,7 +78,7 @@
- 	}
- }
- 
--ZEND_API int _zend_list_addref(int id TSRMLS_DC)
-+ZEND_API int _zend_list_addref(ulong id TSRMLS_DC)
- {
- 	zend_rsrc_list_entry *le;
- 	
-@@ -350,7 +350,7 @@
- }
- 
- 
--char *zend_rsrc_list_get_rsrc_type(int resource TSRMLS_DC)
-+char *zend_rsrc_list_get_rsrc_type(ulong resource TSRMLS_DC)
- {
- 	zend_rsrc_list_dtors_entry *lde;
- 	int rsrc_type;
diff --git a/lang/php53/files/patch-Zend_zend_list.h b/lang/php53/files/patch-Zend_zend_list.h
deleted file mode 100644
index 308ac56b33b2..000000000000
--- a/lang/php53/files/patch-Zend_zend_list.h
+++ /dev/null
@@ -1,24 +0,0 @@
---- Zend/zend_list.h.orig	2007-01-01 10:35:46.000000000 +0100
-+++ Zend/zend_list.h	2008-01-29 11:05:12.000000000 +0100
-@@ -71,9 +71,9 @@
- void zend_destroy_rsrc_list_dtors(void);
- 
- ZEND_API int zend_list_insert(void *ptr, int type);
--ZEND_API int _zend_list_addref(int id TSRMLS_DC);
--ZEND_API int _zend_list_delete(int id TSRMLS_DC);
--ZEND_API void *_zend_list_find(int id, int *type TSRMLS_DC);
-+ZEND_API int _zend_list_addref(ulong id TSRMLS_DC);
-+ZEND_API int _zend_list_delete(ulong id TSRMLS_DC);
-+ZEND_API void *_zend_list_find(ulong id, int *type TSRMLS_DC);
- 
- #define zend_list_addref(id)		_zend_list_addref(id TSRMLS_CC)
- #define zend_list_delete(id)		_zend_list_delete(id TSRMLS_CC)
-@@ -82,7 +82,7 @@
- ZEND_API int zend_register_resource(zval *rsrc_result, void *rsrc_pointer, int rsrc_type);
- ZEND_API void *zend_fetch_resource(zval **passed_id TSRMLS_DC, int default_id, char *resource_type_name, int *found_resource_type, int num_resource_types, ...);
- 
--ZEND_API char *zend_rsrc_list_get_rsrc_type(int resource TSRMLS_DC);
-+ZEND_API char *zend_rsrc_list_get_rsrc_type(ulong resource TSRMLS_DC);
- ZEND_API int zend_fetch_list_dtor_id(char *type_name);
- 
- extern ZEND_API int le_index_ptr;  /* list entry type for index pointers */
diff --git a/lang/php53/files/patch-acinclude.m4 b/lang/php53/files/patch-acinclude.m4
deleted file mode 100644
index d92738cdf776..000000000000
--- a/lang/php53/files/patch-acinclude.m4
+++ /dev/null
@@ -1,54 +0,0 @@
---- acinclude.m4.orig	2009-05-09 22:28:02.000000000 +0200
-+++ acinclude.m4	2009-06-25 08:08:05.000000000 +0200
-@@ -194,7 +194,7 @@
- dnl
- dnl which array to append to?
- AC_DEFUN([PHP_ADD_SOURCES],[
--  PHP_ADD_SOURCES_X($1, $2, $3, ifelse($4,cli,PHP_CLI_OBJS,ifelse($4,sapi,PHP_SAPI_OBJS,PHP_GLOBAL_OBJS)))
-+  PHP_ADD_SOURCES_X($1, $2, $3, ifelse($4,cli,PHP_CLI_OBJS,ifelse($4,sapi,PHP_SAPI_OBJS,ifelse($4,cgi,PHP_CGI_OBJS,ifelse($4,fpm,PHP_FPM_OBJS,PHP_GLOBAL_OBJS)))))
- ])
- 
- dnl
-@@ -968,15 +968,9 @@
-   if test "$3" != "shared" && test "$3" != "yes" && test "$4" = "cli"; then
- dnl ---------------------------------------------- CLI static module
-     [PHP_]translit($1,a-z_-,A-Z__)[_SHARED]=no
--    case "$PHP_SAPI" in
--      cgi|embed[)]
--        PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,)
--        EXT_STATIC="$EXT_STATIC $1"
--        ;;
--      *[)]
-         PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,cli)
--        ;;
--    esac
-+        PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,cgi)
-+        PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,fpm)
-     EXT_CLI_STATIC="$EXT_CLI_STATIC $1"
-   fi
-   PHP_ADD_BUILD_DIR($ext_builddir)
-@@ -1026,12 +1020,6 @@
- build to be successful.
- ])
-   fi
--  if test "x$is_it_enabled" = "xno" && test "x$3" != "xtrue"; then
--    AC_MSG_ERROR([
--You've configured extension $1, which depends on extension $2,
--but you've either not enabled $2, or have disabled it.
--])
--  fi
-   dnl Some systems require that we link $2 to $1 when building
- ])
- 
-@@ -2303,9 +2291,9 @@
-   test -z "$PHP_IMAP_SSL" && PHP_IMAP_SSL=no
- 
-   dnl Fallbacks for different configure options
--  if test "$PHP_OPENSSL" != "no"; then
-+  if test -n "$PHP_OPENSSL" && test "$PHP_OPENSSL" != "no"; then
-     PHP_OPENSSL_DIR=$PHP_OPENSSL
--  elif test "$PHP_IMAP_SSL" != "no"; then
-+  elif test -n "$PHP_IMAP_SSL" && test "$PHP_IMAP_SSL" != "no"; then
-     PHP_OPENSSL_DIR=$PHP_IMAP_SSL
-   fi
- 
diff --git a/lang/php53/files/patch-configure.in b/lang/php53/files/patch-configure.in
deleted file mode 100644
index d6e90018c51b..000000000000
--- a/lang/php53/files/patch-configure.in
+++ /dev/null
@@ -1,64 +0,0 @@
---- configure.in.orig	2011-03-04 10:10:54.000000000 +0100
-+++ configure.in	2011-03-04 10:11:01.000000000 +0100
-@@ -302,7 +302,6 @@
- dnl .
- dnl -------------------------------------------------------------------------
- 
--PTHREADS_CHECK
- PHP_HELP_SEPARATOR([SAPI modules:])
- PHP_SHLIB_SUFFIX_NAMES
- PHP_SAPI=default
-@@ -327,7 +326,6 @@
- 
- if test "$enable_maintainer_zts" = "yes"; then
-   PTHREADS_ASSIGN_VARS
--  PTHREADS_FLAGS
- fi
- 
- divert(3)
-@@ -612,7 +610,7 @@
- )
- 
- dnl Some systems (like OpenSolaris) do not have nanosleep in libc
--PHP_CHECK_FUNC_LIB(nanosleep, rt)
-+PHP_CHECK_FUNC(nanosleep, rt)
- 
- dnl Check for getaddrinfo, should be a better way, but...
- dnl Also check for working getaddrinfo
-@@ -1162,7 +1160,7 @@
- EXPANDED_DATADIR=$datadir
- EXPANDED_PHP_CONFIG_FILE_PATH=`eval echo "$PHP_CONFIG_FILE_PATH"`
- EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=`eval echo "$PHP_CONFIG_FILE_SCAN_DIR"`
--INCLUDE_PATH=.:$EXPANDED_PEAR_INSTALLDIR
-+INCLUDE_PATH=.:${prefix}/share/pear
- 
- exec_prefix=$old_exec_prefix
- libdir=$old_libdir
-@@ -1373,22 +1371,19 @@
-   pharcmd_install=
- fi;
- 
--all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_ZEND_EX) \$(PHP_CLI_TARGET) $pharcmd"
--install_targets="$install_modules install-build install-headers install-programs $install_pear $pharcmd_install"
-+all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_ZEND_EX) \$(PHP_CLI_TARGET) \$(PHP_CGI_TARGET) \$(PHP_FPM_TARGET) $pharcmd"
-+install_targets="$PHP_INSTALL_CLI_TARGET $PHP_INSTALL_CGI_TARGET $install_modules install-build install-headers install-programs $install_pear $pharcmd_install"
- 
- case $PHP_SAPI in
--  cli)
--    install_targets="$PHP_INSTALL_CLI_TARGET $install_targets"
--    ;;
--  *)
--    install_targets="install-sapi $PHP_INSTALL_CLI_TARGET $install_targets"
-+  apache|apache2handler|apache2filter)
-+    install_targets="install-sapi $install_targets"
-     ;;
- esac
- 
- PHP_SUBST(all_targets)
- PHP_SUBST(install_targets)
- 
--PHP_INSTALL_HEADERS([Zend/ TSRM/ include/ main/ main/streams/])
-+PHP_INSTALL_HEADERS([Zend/ TSRM/ main/ main/streams/])
- 
- PHP_ADD_SOURCES(TSRM, TSRM.c tsrm_strtok_r.c tsrm_virtual_cwd.c)
- 
diff --git a/lang/php53/files/patch-ext_standard_image.c b/lang/php53/files/patch-ext_standard_image.c
deleted file mode 100644
index be29b54b2650..000000000000
--- a/lang/php53/files/patch-ext_standard_image.c
+++ /dev/null
@@ -1,50 +0,0 @@
---- ext/standard/image.c.orig	2007-10-04 15:31:11.000000000 +0200
-+++ ext/standard/image.c	2007-11-13 22:47:04.000000000 +0100
-@@ -31,9 +31,7 @@
- #endif
- #include "php_image.h"
- 
--#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB)
- #include "zlib.h"
--#endif
- 
- /* file type markers */
- PHPAPI const char php_sig_gif[3] = {'G', 'I', 'F'};
-@@ -80,9 +78,7 @@
- 	REGISTER_LONG_CONSTANT("IMAGETYPE_JP2",     IMAGE_FILETYPE_JP2,     CONST_CS | CONST_PERSISTENT);
- 	REGISTER_LONG_CONSTANT("IMAGETYPE_JPX",     IMAGE_FILETYPE_JPX,     CONST_CS | CONST_PERSISTENT);
- 	REGISTER_LONG_CONSTANT("IMAGETYPE_JB2",     IMAGE_FILETYPE_JB2,     CONST_CS | CONST_PERSISTENT);
--#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB)
- 	REGISTER_LONG_CONSTANT("IMAGETYPE_SWC",     IMAGE_FILETYPE_SWC,     CONST_CS | CONST_PERSISTENT);
--#endif	
- 	REGISTER_LONG_CONSTANT("IMAGETYPE_IFF",     IMAGE_FILETYPE_IFF,     CONST_CS | CONST_PERSISTENT);
- 	REGISTER_LONG_CONSTANT("IMAGETYPE_WBMP",    IMAGE_FILETYPE_WBMP,    CONST_CS | CONST_PERSISTENT);
- 	REGISTER_LONG_CONSTANT("IMAGETYPE_JPEG2000",IMAGE_FILETYPE_JPC,     CONST_CS | CONST_PERSISTENT); /* keep alias */
-@@ -184,7 +180,6 @@
- }
- /* }}} */
- 
--#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB)
- /* {{{ php_handle_swc
-  */
- static struct gfxinfo *php_handle_swc(php_stream * stream TSRMLS_DC)
-@@ -255,7 +250,6 @@
- 	return result;
- }
- /* }}} */
--#endif
- 
- /* {{{ php_handle_swf
-  */
-@@ -1314,11 +1308,7 @@
- 			result = php_handle_swf(stream TSRMLS_CC);
- 			break;
- 		case IMAGE_FILETYPE_SWC:
--#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB)
- 			result = php_handle_swc(stream TSRMLS_CC);
--#else
--			php_error_docref(NULL TSRMLS_CC, E_NOTICE, "The image is a compressed SWF file, but you do not have a static version of the zlib extension enabled");
--#endif
- 			break;
- 		case IMAGE_FILETYPE_PSD:
- 			result = php_handle_psd(stream TSRMLS_CC);
diff --git a/lang/php53/files/patch-ext_zlib_config0.m4 b/lang/php53/files/patch-ext_zlib_config0.m4
deleted file mode 100644
index 249c85b498d3..000000000000
--- a/lang/php53/files/patch-ext_zlib_config0.m4
+++ /dev/null
@@ -1,11 +0,0 @@
---- ext/zlib/config0.m4.orig	2010-08-26 13:19:52.000000000 +0200
-+++ ext/zlib/config0.m4	2010-08-26 13:20:11.000000000 +0200
-@@ -8,7 +8,7 @@
- PHP_ARG_WITH(zlib-dir,if the location of ZLIB install directory is defined,
- [  --with-zlib-dir=<DIR>   Define the location of zlib install directory], no, no)
- 
--if test "$PHP_ZLIB" != "no" || test "$PHP_ZLIB_DIR" != "no"; then
-+if test "$PHP_ZLIB" != "no"; then
-   PHP_NEW_EXTENSION(zlib, zlib.c zlib_fopen_wrapper.c zlib_filter.c, $ext_shared)
-   PHP_SUBST(ZLIB_SHARED_LIBADD)
-   
diff --git a/lang/php53/files/patch-main__php_config.h.in b/lang/php53/files/patch-main__php_config.h.in
deleted file mode 100644
index 8e9938876421..000000000000
--- a/lang/php53/files/patch-main__php_config.h.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- main/php_config.h.in.orig	Wed Jan 11 15:25:52 2006
-+++ main/php_config.h.in	Wed May  3 09:38:09 2006
-@@ -2760,6 +2760,9 @@
- /* Define if uint32_t type is present.  */
- #undef HAVE_UINT32_T
- 
-+/* Include external shared modules configurations */
-+#include "ext/php_config.h"
-+
- /* Whether sprintf is broken */
- #undef ZEND_BROKEN_SPRINTF
- 
diff --git a/lang/php53/files/patch-php.ini-development b/lang/php53/files/patch-php.ini-development
deleted file mode 100644
index dadeb4b838b1..000000000000
--- a/lang/php53/files/patch-php.ini-development
+++ /dev/null
@@ -1,18 +0,0 @@
---- php.ini-development.orig	2009-06-28 19:56:18.000000000 +0200
-+++ php.ini-development	2009-08-24 17:17:53.000000000 +0200
-@@ -335,6 +335,15 @@
- 
- ; Safe Mode
- ; http://php.net/safe-mode
-+;
-+; SECURITY NOTE: The FreeBSD Security Officer strongly recommend that
-+; the PHP Safe Mode feature not be relied upon for security, since the
-+; issues Safe Mode tries to handle cannot properly be handled in PHP
-+; (primarily due to PHP's use of external libraries).  While many bugs
-+; in Safe Mode has been fixed it's very likely that more issues exist
-+; which allows a user to bypass Safe Mode restrictions.
-+; For increased security we always recommend to install the Suhosin
-+; extension.
- safe_mode = Off
- 
- ; By default, Safe Mode does a UID compare check when
diff --git a/lang/php53/files/patch-php.ini-production b/lang/php53/files/patch-php.ini-production
deleted file mode 100644
index 67d3480ad4a6..000000000000
--- a/lang/php53/files/patch-php.ini-production
+++ /dev/null
@@ -1,18 +0,0 @@
---- php.ini-production.orig	2009-08-24 17:18:23.000000000 +0200
-+++ php.ini-production	2009-08-24 17:18:33.000000000 +0200
-@@ -335,6 +335,15 @@
- 
- ; Safe Mode
- ; http://php.net/safe-mode
-+;
-+; SECURITY NOTE: The FreeBSD Security Officer strongly recommend that
-+; the PHP Safe Mode feature not be relied upon for security, since the
-+; issues Safe Mode tries to handle cannot properly be handled in PHP
-+; (primarily due to PHP's use of external libraries).  While many bugs
-+; in Safe Mode has been fixed it's very likely that more issues exist
-+; which allows a user to bypass Safe Mode restrictions.
-+; For increased security we always recommend to install the Suhosin
-+; extension.
- safe_mode = Off
- 
- ; By default, Safe Mode does a UID compare check when
diff --git a/lang/php53/files/patch-sapi_apache2filter_config.m4 b/lang/php53/files/patch-sapi_apache2filter_config.m4
deleted file mode 100644
index ce71383f9fa4..000000000000
--- a/lang/php53/files/patch-sapi_apache2filter_config.m4
+++ /dev/null
@@ -1,11 +0,0 @@
---- sapi/apache2filter/config.m4.orig	2013-10-18 12:17:14.622544934 +0000
-+++ sapi/apache2filter/config.m4	2013-10-18 12:22:13.032234760 +0000
-@@ -68,7 +68,7 @@
-   fi
- 
-   APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
--  if test -z `$APXS -q SYSCONFDIR`; then
-+  if true; then
-     INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
-                  $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
-                        -i -n php5"
diff --git a/lang/php53/files/patch-sapi_apache2handler_config.m4 b/lang/php53/files/patch-sapi_apache2handler_config.m4
deleted file mode 100644
index 149c4ef0fc80..000000000000
--- a/lang/php53/files/patch-sapi_apache2handler_config.m4
+++ /dev/null
@@ -1,11 +0,0 @@
---- sapi/apache2handler/config.m4.orig	2013-10-18 12:22:26.576545216 +0000
-+++ sapi/apache2handler/config.m4	2013-10-18 12:23:00.903131412 +0000
-@@ -67,7 +67,7 @@
-   fi
- 
-   APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
--  if test -z `$APXS -q SYSCONFDIR`; then
-+  if true; then
-     INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
-                  $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
-                        -i -n php5"
diff --git a/lang/php53/files/patch-sapi_cgi_Makefile.frag b/lang/php53/files/patch-sapi_cgi_Makefile.frag
deleted file mode 100644
index 26a0e4b1a3ba..000000000000
--- a/lang/php53/files/patch-sapi_cgi_Makefile.frag
+++ /dev/null
@@ -1,9 +0,0 @@
---- sapi/cgi/Makefile.frag.orig	Wed May  3 10:09:02 2006
-+++ sapi/cgi/Makefile.frag	Wed May  3 10:08:54 2006
-@@ -1,2 +1,5 @@
--$(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
-+$(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_CGI_OBJS)
- 	$(BUILD_CGI)
-+
-+install-cgi: $(SAPI_CGI_PATH)
-+	@$(INSTALL_CGI)
diff --git a/lang/php53/files/patch-sapi_cgi_config9.m4 b/lang/php53/files/patch-sapi_cgi_config9.m4
deleted file mode 100644
index 7682dad43110..000000000000
--- a/lang/php53/files/patch-sapi_cgi_config9.m4
+++ /dev/null
@@ -1,56 +0,0 @@
---- sapi/cgi/config9.m4.orig	2007-10-01 14:40:54.000000000 +0200
-+++ sapi/cgi/config9.m4	2008-09-25 23:07:13.000000000 +0200
-@@ -8,7 +8,6 @@
- dnl
- dnl CGI setup
- dnl
--if test "$PHP_SAPI" = "default"; then
-   AC_MSG_CHECKING(whether to build CGI binary)
-   if test "$PHP_CGI" != "no"; then
-     AC_MSG_RESULT(yes)
-@@ -53,8 +52,9 @@
-     PHP_SUBST(SAPI_CGI_PATH)
- 
-     dnl Set install target and select SAPI
--    INSTALL_IT="@echo \"Installing PHP CGI binary: \$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php-cgi\$(program_suffix)\$(EXEEXT)"
--    PHP_SELECT_SAPI(cgi, program, cgi_main.c fastcgi.c,, '$(SAPI_CGI_PATH)')
-+    INSTALL_CGI="@echo \"Installing PHP CGI binary: \$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php-cgi\$(program_suffix)\$(EXEEXT)"
-+    PHP_ADD_SOURCES(sapi/cgi, cgi_main.c fastcgi.c,, cgi)
-+    PHP_ADD_SOURCES(/main, internal_functions.c,,cgi)
- 
-     case $host_alias in
-       *aix*)
-@@ -64,17 +64,29 @@
-         BUILD_CGI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_SAPI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
-       ;;
-       *)
--        BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
-+        BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CGI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
-       ;;
-     esac
- 
-+    PHP_CGI_TARGET="\$(SAPI_CGI_PATH)"
-+    PHP_INSTALL_CGI_TARGET="install-cgi"
-     PHP_SUBST(BUILD_CGI)
--
--  elif test "$PHP_CLI" != "no"; then
--    AC_MSG_RESULT(no)
-+    PHP_SUBST(INSTALL_CGI)
-+    PHP_SUBST(PHP_CGI_OBJS)
-+    PHP_SUBST(PHP_CGI_TARGET)
-+    PHP_SUBST(PHP_INSTALL_CGI_TARGET)
-+
-+    if test "$PHP_SAPI" = "default" ; then
-+      PHP_BUILD_PROGRAM($SAPI_CGI_PATH)
-+    fi
-+ else
-+  AC_MSG_RESULT(no)
-+  if test "$PHP_SAPI" = "default" ; then
-+    if test "$PHP_CLI" != "no" ; then
-     OVERALL_TARGET=
-     PHP_SAPI=cli   
-   else
-     AC_MSG_ERROR([No SAPIs selected.])  
-   fi
-+ fi
- fi
diff --git a/lang/php53/files/patch-sapi_fpm_Makefile.frag b/lang/php53/files/patch-sapi_fpm_Makefile.frag
deleted file mode 100644
index 53da2da35f7c..000000000000
--- a/lang/php53/files/patch-sapi_fpm_Makefile.frag
+++ /dev/null
@@ -1,29 +0,0 @@
---- sapi/fpm/Makefile.frag.orig	2011-10-08 23:04:10.000000000 +0200
-+++ sapi/fpm/Makefile.frag	2012-02-09 16:43:25.000000000 +0100
-@@ -4,14 +4,14 @@
- 	@mkdir -p $(builddir)/fpm
- 	@mkdir -p $(builddir)/fpm/events
- 
--$(SAPI_FPM_PATH): $(builddir)/fpm $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(SAPI_EXTRA_DEPS)
-+$(SAPI_FPM_PATH): $(builddir)/fpm $(PHP_GLOBAL_OBJS) $(PHP_FPM_OBJS) $(FPM_EXTRA_DEPS)
- 	$(BUILD_FPM)
- 
- $(builddir)/fpm/fpm_conf.lo: $(builddir)/../../main/build-defs.h
- 
- install-build: install-fpm
- 
--install-fpm: install-sapi
-+install-fpm:
- 	@echo "Installing PHP FPM binary:        $(INSTALL_ROOT)$(sbindir)/"
- 	@$(mkinstalldirs) $(INSTALL_ROOT)$(sbindir)
- 	@$(mkinstalldirs) $(INSTALL_ROOT)$(localstatedir)/log
-@@ -27,6 +27,6 @@
- 	@$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man8
- 	@$(INSTALL_DATA) sapi/fpm/php-fpm.8 $(INSTALL_ROOT)$(mandir)/man8/php-fpm$(program_suffix).8
- 
--	@echo "Installing PHP FPM status page:      $(INSTALL_ROOT)$(datadir)/fpm/"
--	@$(mkinstalldirs) $(INSTALL_ROOT)$(datadir)/fpm
--	@$(INSTALL_DATA) sapi/fpm/status.html $(INSTALL_ROOT)$(datadir)/fpm/status.html
-+	@echo "Installing PHP FPM status page:      $(INSTALL_ROOT)$(datadir)/php/fpm/"
-+	@$(mkinstalldirs) $(INSTALL_ROOT)$(datadir)/php/fpm
-+	@$(INSTALL_DATA) sapi/fpm/status.html $(INSTALL_ROOT)$(datadir)/php/fpm/status.html
diff --git a/lang/php53/files/patch-sapi_fpm_config.m4 b/lang/php53/files/patch-sapi_fpm_config.m4
deleted file mode 100644
index 859db721d66e..000000000000
--- a/lang/php53/files/patch-sapi_fpm_config.m4
+++ /dev/null
@@ -1,62 +0,0 @@
---- sapi/fpm/config.m4.orig	2011-06-26 17:48:11.000000000 +0200
-+++ sapi/fpm/config.m4	2011-11-18 11:05:21.000000000 +0100
-@@ -312,7 +312,7 @@
- 
-   AC_MSG_CHECKING([for TCP_INFO])
- 
--  AC_TRY_COMPILE([ #include <netinet/tcp.h> ], [struct tcp_info ti; int x = TCP_INFO;], [
-+  AC_TRY_COMPILE([ #include <netinet/tcp.h> ], [struct tcp_info ti; ti.tcpi_sacked = 0; int x = TCP_INFO;], [
-     have_lq=tcp_info
-     AC_MSG_RESULT([yes])
-   ], [
-@@ -333,7 +333,7 @@
-       AC_MSG_RESULT([no])
-     ])
- 
--    if test "$have_lq" = "tcp_info"; then
-+    if test "$have_lq" = "so_listenq"; then
-       AC_DEFINE([HAVE_LQ_SO_LISTENQ], 1, [do we have SO_LISTENQxxx?])
-     fi
-   fi
-@@ -423,7 +423,9 @@
-   
-   PHP_FPM_CFLAGS="-I$abs_srcdir/sapi/fpm"
-  
--  INSTALL_IT=":"
-+  if test "$PHP_SAPI" = "default"; then
-+    PHP_SAPI="fpm"
-+  fi 
-   PHP_FPM_FILES="fpm/fastcgi.c \
-     fpm/fpm.c \
-     fpm/fpm_children.c \
-@@ -449,7 +451,8 @@
-     fpm/zlog.c \
-   "
- 
--  PHP_SELECT_SAPI(fpm, program, $PHP_FPM_FILES $PHP_FPM_TRACE_FILES, $PHP_FPM_CFLAGS, '$(SAPI_FPM_PATH)')
-+  PHP_ADD_SOURCES(sapi/fpm, $PHP_FPM_FILES $PHP_FPM_TRACE_FILES, $PHP_FPM_CFLAGS, fpm)
-+  PHP_ADD_SOURCES(/main, internal_functions.c,,fpm)
- 
-   case $host_alias in
-       *aix*)
-@@ -459,11 +462,19 @@
-         BUILD_FPM="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_SAPI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(SAPI_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)"
-       ;;
-       *)
--        BUILD_FPM="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(SAPI_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)"
-+        BUILD_FPM="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_FPM_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)"
-       ;;
-   esac
- 
-+  PHP_FPM_TARGET="\$(SAPI_FPM_PATH)"
-+  PHP_INSTALL_FPM_TARGET="install-fpm"
-   PHP_SUBST(BUILD_FPM)
-+  PHP_SUBST(PHP_FPM_OBJS)
-+  PHP_SUBST(PHP_FPM_TARGET)
-+  PHP_SUBST(PHP_INSTALL_FPM_TARGET)
-+  if test "$PHP_SAPI" = "fpm" ; then
-+    PHP_BUILD_PROGRAM($SAPI_FPM_PATH)
-+  fi
- else
-   AC_MSG_RESULT(no)
- fi
diff --git a/lang/php53/files/patch-sapi_fpm_php-fpm.conf.in b/lang/php53/files/patch-sapi_fpm_php-fpm.conf.in
deleted file mode 100644
index 315f2470a773..000000000000
--- a/lang/php53/files/patch-sapi_fpm_php-fpm.conf.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- sapi/fpm/php-fpm.conf.in.orig	2012-02-08 15:50:42.000000000 +0100
-+++ sapi/fpm/php-fpm.conf.in	2012-02-08 15:50:54.000000000 +0100
-@@ -317,7 +317,7 @@
- ;   last request memory:  0
- ;
- ; Note: There is a real-time FPM status monitoring sample web page available
--;       It's available in: @EXPANDED_DATADIR@/fpm/status.html
-+;       It's available in: @EXPANDED_DATADIR@/php/fpm/status.html
- ;
- ; Note: The value must start with a leading slash (/). The value can be
- ;       anything, but it may not be a good idea to use the .php extension or it
diff --git a/lang/php53/files/php-fpm.in b/lang/php53/files/php-fpm.in
deleted file mode 100644
index 55e2ac992408..000000000000
--- a/lang/php53/files/php-fpm.in
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: php-fpm
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-
-#
-# Add the following line to /etc/rc.conf to enable php-fpm:
-# php_fpm_enable="YES"
-#
-
-. /etc/rc.subr
-
-name="php_fpm"
-rcvar=php_fpm_enable
-
-load_rc_config "$name"
-
-: ${php_fpm_enable="NO"}
-
-extra_commands="reload logrotate"
-
-command="%%PREFIX%%/sbin/php-fpm"
-pidfile="/var/run/php-fpm.pid"
-sig_stop="QUIT"
-sig_reload="USR2"
-logrotate_cmd="php_fpm_logrotate"
-
-required_files="%%PREFIX%%/etc/php-fpm.conf"
-
-php_fpm_logrotate() {
-        if [ -z "$rc_pid" ]; then
-                _run_rc_notrunning
-                return 1
-        fi
-        echo "Rotating logs $name."
-        kill -USR1 $rc_pid
-}
-
-run_rc_command "$1"