[91305] trunk/dports/_resources/port1.0/group

jmr at macports.org jmr at macports.org
Wed Mar 28 11:15:12 PDT 2012


Revision: 91305
          https://trac.macports.org/changeset/91305
Author:   jmr at macports.org
Date:     2012-03-28 11:15:12 -0700 (Wed, 28 Mar 2012)
Log Message:
-----------
change rpm-vercomp to vercmp in portgroups

Modified Paths:
--------------
    trunk/dports/_resources/port1.0/group/xcode-1.0.tcl
    trunk/dports/_resources/port1.0/group/xcodeversion-1.0.tcl

Modified: trunk/dports/_resources/port1.0/group/xcode-1.0.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/xcode-1.0.tcl	2012-03-28 18:09:25 UTC (rev 91304)
+++ trunk/dports/_resources/port1.0/group/xcode-1.0.tcl	2012-03-28 18:15:12 UTC (rev 91305)
@@ -129,7 +129,7 @@
 # fix resource dependencies (with Xcode >= 2.1).
 proc xcode::fix_resource_dependencies {} {
     global xcodeversion xcode.configuration
-    if {[rpm-vercomp $xcodeversion 2.1] >= 0} {
+    if {[vercmp $xcodeversion 2.1] >= 0} {
         set build_path "[xcode::get_project_path]/build/"
         set config_build_path "[xcode::get_project_path]/build/${xcode.configuration}/"
         if {[file isdirectory ${config_build_path}]} {
@@ -147,7 +147,7 @@
 proc xcode::get_configuration_arg { style } {
     global xcodeversion
     if {$style != ""} {
-        if {[rpm-vercomp $xcodeversion 2.1] >= 0} {
+        if {[vercmp $xcodeversion 2.1] >= 0} {
             return "-configuration $style"
         } else {
             return "-buildstyle $style"

Modified: trunk/dports/_resources/port1.0/group/xcodeversion-1.0.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/xcodeversion-1.0.tcl	2012-03-28 18:09:25 UTC (rev 91304)
+++ trunk/dports/_resources/port1.0/group/xcodeversion-1.0.tcl	2012-03-28 18:15:12 UTC (rev 91305)
@@ -56,7 +56,7 @@
         }
         foreach {darwin_major minimum_xcodeversion} [join ${minimum_xcodeversions}] {
             if {${darwin_major} == ${os.major}} {
-                if {[rpm-vercomp ${xcodeversion} ${minimum_xcodeversion}] < 0} {
+                if {[vercmp ${xcodeversion} ${minimum_xcodeversion}] < 0} {
                     ui_error "On Mac OS X ${macosx_version}, ${name} ${version} requires Xcode ${minimum_xcodeversion} or later but you have Xcode ${xcodeversion}."
                     ui_error "See http://guide.macports.org/chunked/installing.xcode.html for download links."
                     return -code error "incompatible Xcode version"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120328/7e432587/attachment.html>


More information about the macports-changes mailing list