summaryrefslogtreecommitdiff
path: root/lang/php5
diff options
context:
space:
mode:
authorAlex Dupre <ale@FreeBSD.org>2014-09-04 14:24:25 +0000
committerAlex Dupre <ale@FreeBSD.org>2014-09-04 14:24:25 +0000
commitf23aed7bde4b7e82cbb2943a38f6f60f51038567 (patch)
tree65444edf752ebaf49e944ea49c7e7dad35e1de9a /lang/php5
parent- Update to 1.20140824 (diff)
Import PHP 5.6 branch!
Notes
Notes: svn path=/head/; revision=367268
Diffstat (limited to 'lang/php5')
-rw-r--r--lang/php5/Makefile2
1 files changed, 1 insertions, 1 deletions
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