[126105] trunk/dports/php

[ryandesign at macports.org]

Revision: 126105
          https://trac.macports.org/changeset/126105
Author:   ryandesign at macports.org
Date:     2014-10-03 15:37:54 -0700 (Fri, 03 Oct 2014)
Log Message:
-----------
php-http2 and php-event no longer conflict

Modified Paths:
--------------
    trunk/dports/php/php-event/Portfile
    trunk/dports/php/php-http2/Portfile

Modified: trunk/dports/php/php-event/Portfile
===================================================================
--- trunk/dports/php/php-event/Portfile	2014-10-03 22:36:52 UTC (rev 126104)
+++ trunk/dports/php/php-event/Portfile	2014-10-03 22:37:54 UTC (rev 126105)
@@ -22,8 +22,6 @@
                         sha256  f1955c7f470829024e2f816a2a4c5201bbef3c673e49e7d25a24e248011225be
 
 if {${name} ne ${subport}} {
-    conflicts           ${php}-http2
-
     depends_lib-append  port:libevent \
                         port:openssl \
                         port:${php}-sockets

Modified: trunk/dports/php/php-http2/Portfile
===================================================================
--- trunk/dports/php/php-http2/Portfile	2014-10-03 22:36:52 UTC (rev 126104)
+++ trunk/dports/php/php-http2/Portfile	2014-10-03 22:37:54 UTC (rev 126105)
@@ -33,8 +33,7 @@
                 sha256  16c212e84a00a86ea0273001834fd365ff98e1639b369e3529268988a209e113
 
 if {${name} ne ${subport}} {
-    conflicts           ${php}-event \
-                        ${php}-http
+    conflicts           ${php}-http
 
     depends_lib-append  port:curl \
                         port:${php}-iconv \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141003/9e6d13ec/attachment.html>