[56395] branches/images-and-archives/base

blb at macports.org blb at macports.org
Wed Aug 26 19:24:05 PDT 2009


Revision: 56395
          http://trac.macports.org/changeset/56395
Author:   blb at macports.org
Date:     2009-08-26 19:24:00 -0700 (Wed, 26 Aug 2009)
Log Message:
-----------
Merge from trunk

Modified Paths:
--------------
    branches/images-and-archives/base/doc/prefix.mtree.in
    branches/images-and-archives/base/portmgr/ReleaseProcess
    branches/images-and-archives/base/src/port1.0/portconfigure.tcl
    branches/images-and-archives/base/src/port1.0/portfetch.tcl
    branches/images-and-archives/base/src/port1.0/portutil.tcl

Property Changed:
----------------
    branches/images-and-archives/base/


Property changes on: branches/images-and-archives/base
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/gsoc08-privileges/base:37343-46937
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:50249-55829
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692
   + /branches/gsoc08-privileges/base:37343-46937
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:50249-56394
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692

Modified: branches/images-and-archives/base/doc/prefix.mtree.in
===================================================================
--- branches/images-and-archives/base/doc/prefix.mtree.in	2009-08-27 02:04:39 UTC (rev 56394)
+++ branches/images-and-archives/base/doc/prefix.mtree.in	2009-08-27 02:24:00 UTC (rev 56395)
@@ -241,6 +241,8 @@
     ..
     var
         macports
+            build
+            ..
             distfiles
             ..
             receipts

Modified: branches/images-and-archives/base/portmgr/ReleaseProcess
===================================================================
--- branches/images-and-archives/base/portmgr/ReleaseProcess	2009-08-27 02:04:39 UTC (rev 56394)
+++ branches/images-and-archives/base/portmgr/ReleaseProcess	2009-08-27 02:24:00 UTC (rev 56395)
@@ -170,10 +170,10 @@
    this can be accomplished through the use of otool's -L flag. Currently the libraries and binaries in need
    of linking validation are:
              ${destroot}/Library/Tcl/macports1.0/MacPorts.dylib
-	     ${destroot}/opt/local/bin/daemondo (only built on 10.4 and later)
-	     ${destroot}/opt/local/share/macports/Tcl/darwintrace1.0/darwintrace.dylib
-	     ${destroot}/opt/local/share/macports/Tcl/pextlib1.0/Pextlib.dylib
-	     ${destroot}/opt/local/share/macports/Tcl/registry2.0/registry.dylib
+             ${destroot}/opt/local/bin/daemondo
+             ${destroot}/opt/local/share/macports/Tcl/darwintrace1.0/darwintrace.dylib
+             ${destroot}/opt/local/share/macports/Tcl/pextlib1.0/Pextlib.dylib
+             ${destroot}/opt/local/share/macports/Tcl/registry2.0/registry.dylib
  * Universal building: When building for Tiger and above, all the files that need linking confirmation in the
    step above also need to be confirmed of the universal type. A way to do this is through the file(1) command:
              file ${destroot}/opt/local/bin/daemondo:

Modified: branches/images-and-archives/base/src/port1.0/portconfigure.tcl
===================================================================
--- branches/images-and-archives/base/src/port1.0/portconfigure.tcl	2009-08-27 02:04:39 UTC (rev 56394)
+++ branches/images-and-archives/base/src/port1.0/portconfigure.tcl	2009-08-27 02:24:00 UTC (rev 56395)
@@ -305,6 +305,7 @@
         "darwin 8" { set compiler gcc-4.0 }
         "darwin 9" { set compiler gcc-4.0 }
         "darwin 10" { set compiler gcc-4.2 }
+        "darwin 11" { set compiler llvm-gcc-4.2 }
         default { set compiler gcc }
     }
     return $compiler
@@ -349,9 +350,10 @@
         }
         llvm-gcc-4.2 {
             switch -exact ${type} {
-                cc   { set ret ${developer_dir}/usr/llvm-gcc-4.2/bin/llvm-gcc-4.2 }
-                objc { set ret ${developer_dir}/usr/llvm-gcc-4.2/bin/llvm-gcc-4.2 }
-                cxx  { set ret ${developer_dir}/usr/llvm-gcc-4.2/bin/llvm-g++-4.2 }
+                cc   { set ret ${developer_dir}/usr/bin/llvm-gcc-4.2 }
+                objc { set ret ${developer_dir}/usr/bin/llvm-gcc-4.2 }
+                cxx  { set ret ${developer_dir}/usr/bin/llvm-g++-4.2 }
+                cpp  { set ret ${developer_dir}/usr/bin/llvm-cpp-4.2 }
             }
         }
         clang {

Modified: branches/images-and-archives/base/src/port1.0/portfetch.tcl
===================================================================
--- branches/images-and-archives/base/src/port1.0/portfetch.tcl	2009-08-27 02:04:39 UTC (rev 56394)
+++ branches/images-and-archives/base/src/port1.0/portfetch.tcl	2009-08-27 02:24:00 UTC (rev 56395)
@@ -85,7 +85,7 @@
 default cvs.post_args {"${cvs.module}"}
 
 # we want the svn port so we know --trust-server-cert will work
-default svn.cmd {${prefix}/bin/svn}
+default svn.cmd {[portfetch::find_svn_path]}
 default svn.dir {${workpath}}
 default svn.method {export}
 default svn.revision ""
@@ -160,13 +160,18 @@
 }
 
 proc portfetch::set_fetch_type {option action args} {
+    global os.platform os.major
     if {[string equal ${action} "set"]} {
         switch $args {
             cvs {
                 depends_fetch-append bin:cvs:cvs
             }
             svn {
-                depends_fetch-append port:subversion
+                if {${os.platform} == "darwin" && ${os.major} >= 10} {
+                    depends_fetch-append bin:svn:subversion
+                } else {
+                    depends_fetch-append port:subversion
+                }
             }
             git {
                 depends_fetch-append bin:git:git-core
@@ -178,6 +183,15 @@
     }
 }
 
+proc portfetch::find_svn_path {args} {
+    global prefix os.platform os.major
+    if {${os.platform} == "darwin" && ${os.major} >= 10} {
+        return [findBinary svn $portutil::autoconf::svn_path]
+    } else {
+        return ${prefix}/bin/svn
+    }
+}
+
 set_ui_prefix
 
 

Modified: branches/images-and-archives/base/src/port1.0/portutil.tcl
===================================================================
--- branches/images-and-archives/base/src/port1.0/portutil.tcl	2009-08-27 02:04:39 UTC (rev 56394)
+++ branches/images-and-archives/base/src/port1.0/portutil.tcl	2009-08-27 02:24:00 UTC (rev 56395)
@@ -696,26 +696,10 @@
     variant $platform $code
 
     # Set the variant if this platform matches the platform we're on
-    set matches 1
-    if {[info exists os.platform] && ${os.platform} == $os} {
-        set sel_platform $os
-        if {[info exists os.major] && [info exists release]} {
-            if {${os.major} == $release } {
-                set sel_platform ${sel_platform}_${release}
-            } else {
-                set matches 0
-            }
-        }
-        if {$matches == 1 && [info exists arch] && [info exists os.arch]} {
-            if {${os.arch} == $arch} {
-                set sel_platform ${sel_platform}_${arch}
-            } else {
-                set matches 0
-            }
-        }
-        if {$matches == 1} {
-            variant_set $sel_platform
-        }
+    if {([info exists os.platform] && ${os.platform} == $os)
+            && !([info exists os.major] && [info exists release] && ${os.major} != $release)
+            && !([info exists arch] && [info exists os.arch] && ${os.arch} != $arch)} {
+        variant_set $platform
     }
 }
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090826/455559c1/attachment.html>


More information about the macports-changes mailing list