[151210] trunk/dports/python/py-obspy/Portfile

petr at macports.org petr at macports.org
Wed Aug 10 08:38:30 PDT 2016


Revision: 151210
          https://trac.macports.org/changeset/151210
Author:   petr at macports.org
Date:     2016-08-10 08:38:30 -0700 (Wed, 10 Aug 2016)
Log Message:
-----------
py-obspy: fix conflict declaration

Modified Paths:
--------------
    trunk/dports/python/py-obspy/Portfile

Modified: trunk/dports/python/py-obspy/Portfile
===================================================================
--- trunk/dports/python/py-obspy/Portfile	2016-08-10 15:19:27 UTC (rev 151209)
+++ trunk/dports/python/py-obspy/Portfile	2016-08-10 15:38:30 UTC (rev 151210)
@@ -6,10 +6,11 @@
 PortGroup           select 1.0
 
 set _name           obspy
+set _name_conflict  ${_name}-devel
 set _n              [string index ${_name} 0]
 
 name                py-${_name}
-conflicts           py-${_name}-devel
+conflicts           py-${_name_conflict}
 
 version             1.0.2
 categories-append   science
@@ -40,7 +41,7 @@
 python.versions     27 34 35
 
 if {${name} ne ${subport}} {
-    conflicts               py{python.version}-${_name}
+    conflicts               py${python.version}-${_name_conflict}
 
     # py-scipy is not universal
     universal_variant       no
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160810/b8bf51af/attachment.html>


More information about the macports-changes mailing list