From f23aed7bde4b7e82cbb2943a38f6f60f51038567 Mon Sep 17 00:00:00 2001 From: Alex Dupre Date: Thu, 4 Sep 2014 14:24:25 +0000 Subject: Import PHP 5.6 branch! --- lang/php5/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lang/php5') diff --git a/lang/php5/Makefile b/lang/php5/Makefile index 655767ddbbe9..310d603932ca 100644 --- a/lang/php5/Makefile +++ b/lang/php5/Makefile @@ -54,7 +54,7 @@ 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* +CONFLICTS= php53-5* php55-5* php56-5* DESTDIRNAME= INSTALL_ROOT -- cgit v1.2.3