[146559] trunk/dports/lang/pypy/Portfile

[jmr at macports.org]

Revision: 146559
          https://trac.macports.org/changeset/146559
Author:   jmr at macports.org
Date:     2016-03-11 22:15:25 -0800 (Fri, 11 Mar 2016)
Log Message:
-----------
pypy: don't require manual intervention by using conflicts_build, just build with cpython

Modified Paths:
--------------
    trunk/dports/lang/pypy/Portfile

Modified: trunk/dports/lang/pypy/Portfile
===================================================================
--- trunk/dports/lang/pypy/Portfile	2016-03-12 01:55:55 UTC (rev 146558)
+++ trunk/dports/lang/pypy/Portfile	2016-03-12 06:15:25 UTC (rev 146559)
@@ -2,7 +2,6 @@
 # $Id$
 
 PortSystem          1.0
-PortGroup           conflicts_build 1.0
 
 name                pypy
 version             5.0.0
@@ -24,8 +23,6 @@
 checksums           rmd160  c3ce29ccd6f356190401d327f672291dfc19bf63 \
                     sha256  89027b1b33553b53ff7733dc4838f0a76af23552c0d915d9f6de5875b8d7d4ab
 
-conflicts_build     ${name}
-
 depends_build       port:pkgconfig
 depends_lib         port:libffi \
                     port:sqlite3 \
@@ -46,12 +43,12 @@
 use_configure       no
 
 # use pypy to build if it's already installed
-if {[file executable ${prefix}/lib/pypy/pypy]} {
-    build.cmd       ${prefix}/lib/pypy/pypy
-} else {
+#if {[file executable ${prefix}/lib/pypy/pypy]} {
+#    build.cmd       ${prefix}/lib/pypy/pypy
+#} else {
     depends_build-append port:python27
     build.cmd       ${prefix}/bin/python2.7
-}
+#}
 
 # a lot of memory is used before the C compiler even runs, so limit build.jobs
 # according to available memory more tightly than the default
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160311/5353835e/attachment.html>