February 2012 - macports-changes - lists.macosforge.org

[90113] branches/release_2_0
by jmr＠macports.org 22 Feb '12

22 Feb '12

Revision: 90113 http://trac.macports.org/changeset/90113 Author: jmr(a)macports.org Date: 2012-02-22 02:43:03 -0800 (Wed, 22 Feb 2012) Log Message: ----------- merge r80248 from trunk: Include a C++ compiler for apple-gcc-4.2 Revision Links: -------------- http://trac.macports.org/changeset/80248 Modified Paths: -------------- branches/release_2_0/base/src/port1.0/portconfigure.tcl Property Changed: ---------------- branches/release_2_0/ branches/release_2_0/base/ Property changes on: branches/release_2_0 ___________________________________________________________________ Modified: svn:mergeinfo - /trunk:79584,79586,79590-79594,79599-79600,79649,79686,79689,79692,79750,79762,79787,79864,79943,80069,80088,80178,80220,80222,80224,80226,80229,80245,80287,80335,80443,80581,80583,80586,80779,80797-80798,80894,80928,80932,80934,80969,80971,81119,81146,81234,81361,81371,81414-81415,81454,81464,81467,81522,81557-81558,81562,81565,81567,81577,81630,81657,81830-81832,82111,82767,82921,82924,82947,83136,83149,83267,83270-83271,83391,83395,83443,84351,84908-84909,84931,84937,88045,89988,89993-89994,90000,90002,90004,90010,90020,90054,90056,90058,90075,90082-90084,90088,90107 + /trunk:79584,79586,79590-79594,79599-79600,79649,79686,79689,79692,79750,79762,79787,79864,79943,80069,80088,80178,80220,80222,80224,80226,80229,80245,80248,80287,80335,80443,80581,80583,80586,80779,80797-80798,80894,80928,80932,80934,80969,80971,81119,81146,81234,81361,81371,81414-81415,81454,81464,81467,81522,81557-81558,81562,81565,81567,81577,81630,81657,81830-81832,82111,82767,82921,82924,82947,83136,83149,83267,83270-83271,83391,83395,83443,84351,84908-84909,84931,84937,88045,89988,89993-89994,90000,90002,90004,90010,90020,90054,90056,90058,90075,90082-90084,90088,90107 Property changes on: branches/release_2_0/base ___________________________________________________________________ Modified: svn:mergeinfo - /branches/gsoc08-privileges/base:37343-46937 /branches/gsoc09-logging/base:51231-60371 /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:79584,79586,79590-79594,79599-79600,79649,79686,79689,79692,79750,79762,79771-79774,79782,79787,79864,79943,80069,80088,80178,80220,80222,80224,80226,80229,80245,80287,80335,80443,80581,80583,80586,80779,80797-80798,80894,80928,80932,80934,80969,80971,81005,81119,81146,81171,81234,81269,81361,81371,81414-81415,81454,81464,81467,81475,81522,81556-81558,81562,81565,81567,81577,81630,81657,81830-81832,82111,82135,82767,82921,82924,82947,83136,83149,83267,83270-83271,83391,83395,83443,83471,83537,84351,84908-84909,84931,84937,88045,88179,88185,89988,89993-89994,90000,90002,90004,90010,90020,90032,90054,90056,90058,90075,90082-90084,90088,90107 /users/perry/base-bugs_and_notes:45682-46060 /users/perry/base-select:44044-44692 + /branches/gsoc08-privileges/base:37343-46937 /branches/gsoc09-logging/base:51231-60371 /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:79584,79586,79590-79594,79599-79600,79649,79686,79689,79692,79750,79762,79771-79774,79782,79787,79864,79943,80069,80088,80178,80220,80222,80224,80226,80229,80245,80248,80287,80335,80443,80581,80583,80586,80779,80797-80798,80894,80928,80932,80934,80969,80971,81005,81119,81146,81171,81234,81269,81361,81371,81414-81415,81454,81464,81467,81475,81522,81556-81558,81562,81565,81567,81577,81630,81657,81830-81832,82111,82135,82767,82921,82924,82947,83136,83149,83267,83270-83271,83391,83395,83443,83471,83537,84351,84908-84909,84931,84937,88045,88179,88185,89988,89993-89994,90000,90002,90004,90010,90020,90032,90054,90056,90058,90075,90082-90084,90088,90107 /users/perry/base-bugs_and_notes:45682-46060 /users/perry/base-select:44044-44692 Modified: branches/release_2_0/base/src/port1.0/portconfigure.tcl =================================================================== --- branches/release_2_0/base/src/port1.0/portconfigure.tcl 2012-02-22 10:33:50 UTC (rev 90112) +++ branches/release_2_0/base/src/port1.0/portconfigure.tcl 2012-02-22 10:43:03 UTC (rev 90113) @@ -461,6 +461,7 @@ cc { set ret ${prefix}/bin/gcc-apple-4.2 } objc { set ret ${prefix}/bin/gcc-apple-4.2 } cpp { set ret ${prefix}/bin/cpp-apple-4.2 } + cxx { set ret ${prefix}/bin/g++-apple-4.2 } } } macports-gcc-4.0 {

1 0

[90112] trunk/base/src
by jmr＠macports.org 22 Feb '12

22 Feb '12

Revision: 90112 http://trac.macports.org/changeset/90112 Author: jmr(a)macports.org Date: 2012-02-22 02:33:50 -0800 (Wed, 22 Feb 2012) Log Message: ----------- don't copy xcode 4.3 plist into per-port home dirs, and only copy into main home dir if we're root, since xcodebuild only looks in the running user's actual NFSHomeDirectory Modified Paths: -------------- trunk/base/src/macports1.0/macports.tcl trunk/base/src/port1.0/portutil.tcl Modified: trunk/base/src/macports1.0/macports.tcl =================================================================== --- trunk/base/src/macports1.0/macports.tcl 2012-02-22 08:15:57 UTC (rev 90111) +++ trunk/base/src/macports1.0/macports.tcl 2012-02-22 10:33:50 UTC (rev 90112) @@ -1043,7 +1043,7 @@ } } - if {$os_major >= 11 && $os_platform == "darwin" && [vercmp $xcodeversion 4.3] >= 0} { + if {[getuid] == 0 && $os_major >= 11 && $os_platform == "darwin" && [vercmp $xcodeversion 4.3] >= 0} { macports::copy_xcode_plist $env(HOME) } @@ -1193,10 +1193,7 @@ if {[file writable ${target_dir}] && [catch { ui_debug "Copying $user_plist to ${target_dir}" file copy -force $user_plist $target_dir - if {[getuid] == 0} { - file attributes "${target_dir}/com.apple.dt.Xcode.plist" -owner $macportsuser - } - file attributes "${target_dir}/com.apple.dt.Xcode.plist" -permissions 0644 + file attributes "${target_dir}/com.apple.dt.Xcode.plist" -owner $macportsuser -permissions 0644 } result]} { ui_warn "Failed to copy com.apple.dt.Xcode.plist to ${target_dir}: $result" } @@ -1262,7 +1259,6 @@ $workername alias realpath realpath $workername alias _mportsearchpath _mportsearchpath $workername alias _portnameactive _portnameactive - $workername alias _copy_xcode_plist macports::copy_xcode_plist # New Registry/Receipts stuff $workername alias registry_new registry::new_entry Modified: trunk/base/src/port1.0/portutil.tcl =================================================================== --- trunk/base/src/port1.0/portutil.tcl 2012-02-22 08:15:57 UTC (rev 90111) +++ trunk/base/src/port1.0/portutil.tcl 2012-02-22 10:33:50 UTC (rev 90112) @@ -1639,10 +1639,6 @@ if {![tbool ports_dryrun]} { if {![file isdirectory $workpath]} { file mkdir "${workpath}/.home" - global xcodeversion - if {[vercmp $xcodeversion 4.3] >= 0} { - _copy_xcode_plist "${workpath}/.home" - } chownAsRoot $subbuildpath } # Create a symlink to the workpath for port authors

1 0

[90111] trunk/base/src/port1.0/portutil.tcl
by dports＠macports.org 22 Feb '12

22 Feb '12

Revision: 90111 http://trac.macports.org/changeset/90111 Author: dports(a)macports.org Date: 2012-02-22 00:15:57 -0800 (Wed, 22 Feb 2012) Log Message: ----------- Check for the Xcode command line tools if it looks like Xcode 4.3 is installed, even if xcodebuild failed because it hasn't been properly xcode-select'd. Modified Paths: -------------- trunk/base/src/port1.0/portutil.tcl Modified: trunk/base/src/port1.0/portutil.tcl =================================================================== --- trunk/base/src/port1.0/portutil.tcl 2012-02-22 07:54:27 UTC (rev 90110) +++ trunk/base/src/port1.0/portutil.tcl 2012-02-22 08:15:57 UTC (rev 90111) @@ -2817,7 +2817,8 @@ # Xcode 4.3 requires the command-line utilities package to be # installed. - if {[vercmp $xcodeversion 4.3] >= 0} { + if {[vercmp $xcodeversion 4.3] >= 0 || + ($xcodeversion == "none" && [file exists "/Applications/Xcode.app"])} { if {![file exists "/usr/bin/make"]} { ui_warn "The Command Line Tools for Xcode don't appear to be installed; most ports will likely fail to build." ui_warn "See http://guide.macports.org/chunked/installing.xcode.html for more information."

1 0

[90110] branches/release_2_0
by dports＠macports.org 22 Feb '12

22 Feb '12

Revision: 90110 http://trac.macports.org/changeset/90110 Author: dports(a)macports.org Date: 2012-02-21 23:54:27 -0800 (Tue, 21 Feb 2012) Log Message: ----------- release_2_0 branch: add a warning if Xcode 4.3 is installed but we still need to run xcode-select. (release_2_0 only; trunk already has a warning for this as part of calculating developer_dir) Modified Paths: -------------- branches/release_2_0/base/src/port1.0/portutil.tcl Property Changed: ---------------- branches/release_2_0/ Property changes on: branches/release_2_0 ___________________________________________________________________ Modified: svn:mergeinfo - /trunk:79584,79586,79590-79594,79599-79600,79649,79686,79689,79692,79750,79762,79787,79864,79943,80069,80088,80178,80220,80222,80224,80226,80229,80245,80287,80335,80443,80581,80583,80586,80779,80797-80798,80894,80928,80932,80934,80969,80971,81119,81146,81234,81361,81371,81414-81415,81454,81464,81467,81522,81557-81558,81562,81565,81567,81577,81630,81657,81830-81832,82111,82767,82921,82924,82947,83136,83149,83267,83270-83271,83391,83395,83443,84351,88045,89988,89993-89994,90000,90002,90004,90010,90020,90054,90056,90058,90075,90082-90084,90088,90107 + /trunk:79584,79586,79590-79594,79599-79600,79649,79686,79689,79692,79750,79762,79787,79864,79943,80069,80088,80178,80220,80222,80224,80226,80229,80245,80287,80335,80443,80581,80583,80586,80779,80797-80798,80894,80928,80932,80934,80969,80971,81119,81146,81234,81361,81371,81414-81415,81454,81464,81467,81522,81557-81558,81562,81565,81567,81577,81630,81657,81830-81832,82111,82767,82921,82924,82947,83136,83149,83267,83270-83271,83391,83395,83443,84351,84908-84909,84931,84937,88045,89988,89993-89994,90000,90002,90004,90010,90020,90054,90056,90058,90075,90082-90084,90088,90107 Modified: branches/release_2_0/base/src/port1.0/portutil.tcl =================================================================== --- branches/release_2_0/base/src/port1.0/portutil.tcl 2012-02-22 07:26:15 UTC (rev 90109) +++ branches/release_2_0/base/src/port1.0/portutil.tcl 2012-02-22 07:54:27 UTC (rev 90110) @@ -2732,9 +2732,14 @@ } } if {$xcodeversion == "none"} { - ui_warn "Xcode does not appear to be installed; most ports will likely fail to build." - if {[file exists "/Applications/Install XCode.app"]} { - ui_warn "You downloaded Xcode from the Mac App Store but didn't install it. Run \"Install Xcode\" in the /Applications folder." + if {[file exists "/Applications/Xcode.app"]} { + ui_warn "Xcode appears to be installed but xcodebuild is unusable; some ports will likely fail to build." + ui_warn "You may need to run `sudo xcode-select -switch /Applications/Xcode.app`" + } else { + ui_warn "Xcode does not appear to be installed; most ports will likely fail to build." + if {[file exists "/Applications/Install XCode.app"]} { + ui_warn "You downloaded Xcode from the Mac App Store but didn't install it. Run \"Install Xcode\" in the /Applications folder." + } } } elseif {[rpm-vercomp $xcodeversion $min] < 0} { ui_error "The installed version of Xcode (${xcodeversion}) is too old to use on the installed OS version. Version $rec or later is recommended on Mac OS X ${macosx_version}." @@ -2745,7 +2750,8 @@ # Xcode 4.3 requires the command-line utilities package to be # installed. - if {[vercmp $xcodeversion 4.3] >= 0} { + if {[vercmp $xcodeversion 4.3] >= 0 || + ($xcodeversion == "none" && [file exists "/Applications/Xcode.app"])} { if {![file exists "/usr/bin/make"]} { ui_warn "The Command Line Tools for Xcode don't appear to be installed; most ports will likely fail to build." ui_warn "See http://guide.macports.org/chunked/installing.xcode.html for more information."

1 0

[90109] branches/release_2_0/base
by dports＠macports.org 22 Feb '12

22 Feb '12

Revision: 90109 http://trac.macports.org/changeset/90109 Author: dports(a)macports.org Date: 2012-02-21 23:26:15 -0800 (Tue, 21 Feb 2012) Log Message: ----------- merge r84908, r84909, r84931, r84937 from trunk: give a warning if the user downloaded XCode but didn't install it Revision Links: -------------- http://trac.macports.org/changeset/84908 http://trac.macports.org/changeset/84909 http://trac.macports.org/changeset/84931 http://trac.macports.org/changeset/84937 Modified Paths: -------------- branches/release_2_0/base/src/port1.0/portutil.tcl Property Changed: ---------------- branches/release_2_0/base/ Property changes on: branches/release_2_0/base ___________________________________________________________________ Modified: svn:mergeinfo - /branches/gsoc08-privileges/base:37343-46937 /branches/gsoc09-logging/base:51231-60371 /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:79584,79586,79590-79594,79599-79600,79649,79686,79689,79692,79750,79762,79771-79774,79782,79787,79864,79943,80069,80088,80178,80220,80222,80224,80226,80229,80245,80287,80335,80443,80581,80583,80586,80779,80797-80798,80894,80928,80932,80934,80969,80971,81005,81119,81146,81171,81234,81269,81361,81371,81414-81415,81454,81464,81467,81475,81522,81556-81558,81562,81565,81567,81577,81630,81657,81830-81832,82111,82135,82767,82921,82924,82947,83136,83149,83267,83270-83271,83391,83395,83443,83471,83537,84351,88045,88179,88185,89988,89993-89994,90000,90002,90004,90010,90020,90032,90054,90056,90058,90075,90082-90084,90088,90107 /users/perry/base-bugs_and_notes:45682-46060 /users/perry/base-select:44044-44692 + /branches/gsoc08-privileges/base:37343-46937 /branches/gsoc09-logging/base:51231-60371 /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:79584,79586,79590-79594,79599-79600,79649,79686,79689,79692,79750,79762,79771-79774,79782,79787,79864,79943,80069,80088,80178,80220,80222,80224,80226,80229,80245,80287,80335,80443,80581,80583,80586,80779,80797-80798,80894,80928,80932,80934,80969,80971,81005,81119,81146,81171,81234,81269,81361,81371,81414-81415,81454,81464,81467,81475,81522,81556-81558,81562,81565,81567,81577,81630,81657,81830-81832,82111,82135,82767,82921,82924,82947,83136,83149,83267,83270-83271,83391,83395,83443,83471,83537,84351,84908-84909,84931,84937,88045,88179,88185,89988,89993-89994,90000,90002,90004,90010,90020,90032,90054,90056,90058,90075,90082-90084,90088,90107 /users/perry/base-bugs_and_notes:45682-46060 /users/perry/base-select:44044-44692 Modified: branches/release_2_0/base/src/port1.0/portutil.tcl =================================================================== --- branches/release_2_0/base/src/port1.0/portutil.tcl 2012-02-22 07:04:21 UTC (rev 90108) +++ branches/release_2_0/base/src/port1.0/portutil.tcl 2012-02-22 07:26:15 UTC (rev 90109) @@ -2733,6 +2733,9 @@ } if {$xcodeversion == "none"} { ui_warn "Xcode does not appear to be installed; most ports will likely fail to build." + if {[file exists "/Applications/Install XCode.app"]} { + ui_warn "You downloaded Xcode from the Mac App Store but didn't install it. Run \"Install Xcode\" in the /Applications folder." + } } elseif {[rpm-vercomp $xcodeversion $min] < 0} { ui_error "The installed version of Xcode (${xcodeversion}) is too old to use on the installed OS version. Version $rec or later is recommended on Mac OS X ${macosx_version}." return 1

1 0

[90108] branches/release_2_0
by dports＠macports.org 22 Feb '12

22 Feb '12

Revision: 90108 http://trac.macports.org/changeset/90108 Author: dports(a)macports.org Date: 2012-02-21 23:04:21 -0800 (Tue, 21 Feb 2012) Log Message: ----------- merge r90107 from trunk: On Xcode 4.3, give a warning if the command-line utilities package doesn't appear to be installed. Check the Xcode version and supported_archs even if the port we're installing has no dependencies. Revision Links: -------------- http://trac.macports.org/changeset/90107 Modified Paths: -------------- branches/release_2_0/base/src/macports1.0/macports.tcl branches/release_2_0/base/src/port1.0/portutil.tcl Property Changed: ---------------- branches/release_2_0/ branches/release_2_0/base/ Property changes on: branches/release_2_0 ___________________________________________________________________ Modified: svn:mergeinfo - /trunk:79584,79586,79590-79594,79599-79600,79649,79686,79689,79692,79750,79762,79787,79864,79943,80069,80088,80178,80220,80222,80224,80226,80229,80245,80287,80335,80443,80581,80583,80586,80779,80797-80798,80894,80928,80932,80934,80969,80971,81119,81146,81234,81361,81371,81414-81415,81454,81464,81467,81522,81557-81558,81562,81565,81567,81577,81630,81657,81830-81832,82111,82767,82921,82924,82947,83136,83149,83267,83270-83271,83391,83395,83443,84351,88045,89988,89993-89994,90000,90002,90004,90010,90020,90054,90056,90058,90075,90082-90084,90088 + /trunk:79584,79586,79590-79594,79599-79600,79649,79686,79689,79692,79750,79762,79787,79864,79943,80069,80088,80178,80220,80222,80224,80226,80229,80245,80287,80335,80443,80581,80583,80586,80779,80797-80798,80894,80928,80932,80934,80969,80971,81119,81146,81234,81361,81371,81414-81415,81454,81464,81467,81522,81557-81558,81562,81565,81567,81577,81630,81657,81830-81832,82111,82767,82921,82924,82947,83136,83149,83267,83270-83271,83391,83395,83443,84351,88045,89988,89993-89994,90000,90002,90004,90010,90020,90054,90056,90058,90075,90082-90084,90088,90107 Property changes on: branches/release_2_0/base ___________________________________________________________________ Modified: svn:mergeinfo - /branches/gsoc08-privileges/base:37343-46937 /branches/gsoc09-logging/base:51231-60371 /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:79584,79586,79590-79594,79599-79600,79649,79686,79689,79692,79750,79762,79771-79774,79782,79787,79864,79943,80069,80088,80178,80220,80222,80224,80226,80229,80245,80287,80335,80443,80581,80583,80586,80779,80797-80798,80894,80928,80932,80934,80969,80971,81005,81119,81146,81171,81234,81269,81361,81371,81414-81415,81454,81464,81467,81475,81522,81556-81558,81562,81565,81567,81577,81630,81657,81830-81832,82111,82135,82767,82921,82924,82947,83136,83149,83267,83270-83271,83391,83395,83443,83471,83537,84351,88045,88179,88185,89988,89993-89994,90000,90002,90004,90010,90020,90032,90054,90056,90058,90075,90082-90084,90088 /users/perry/base-bugs_and_notes:45682-46060 /users/perry/base-select:44044-44692 + /branches/gsoc08-privileges/base:37343-46937 /branches/gsoc09-logging/base:51231-60371 /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:79584,79586,79590-79594,79599-79600,79649,79686,79689,79692,79750,79762,79771-79774,79782,79787,79864,79943,80069,80088,80178,80220,80222,80224,80226,80229,80245,80287,80335,80443,80581,80583,80586,80779,80797-80798,80894,80928,80932,80934,80969,80971,81005,81119,81146,81171,81234,81269,81361,81371,81414-81415,81454,81464,81467,81475,81522,81556-81558,81562,81565,81567,81577,81630,81657,81830-81832,82111,82135,82767,82921,82924,82947,83136,83149,83267,83270-83271,83391,83395,83443,83471,83537,84351,88045,88179,88185,89988,89993-89994,90000,90002,90004,90010,90020,90032,90054,90056,90058,90075,90082-90084,90088,90107 /users/perry/base-bugs_and_notes:45682-46060 /users/perry/base-select:44044-44692 Modified: branches/release_2_0/base/src/macports1.0/macports.tcl =================================================================== --- branches/release_2_0/base/src/macports1.0/macports.tcl 2012-02-22 06:51:46 UTC (rev 90107) +++ branches/release_2_0/base/src/macports1.0/macports.tcl 2012-02-22 07:04:21 UTC (rev 90108) @@ -1696,6 +1696,20 @@ macports::push_log $mport } + # Use _target_needs_deps as a proxy for whether we're going to + # build and will therefore need to check Xcode version and + # supported_archs. + if {[macports::_target_needs_deps $target]} { + # possibly warn or error out depending on how old xcode is + if {[$workername eval _check_xcode_version] != 0} { + return 1 + } + # error out if selected arch(s) not supported by this port + if {[$workername eval check_supported_archs] != 0} { + return 1 + } + } + # Before we build the port, we must build its dependencies. set dlist {} if {[macports::_target_needs_deps $target] && [macports::_mport_has_deptypes $mport [macports::_deptypes_for_target $target $workername]]} { @@ -1703,14 +1717,6 @@ # see if we actually need to build this port if {($target != "activate" && $target != "install") || ![$workername eval registry_exists \$subport \$version \$revision \$portvariants]} { - # possibly warn or error out depending on how old xcode is - if {[$workername eval _check_xcode_version] != 0} { - return 1 - } - # error out if selected arch(s) not supported by this port - if {[$workername eval check_supported_archs] != 0} { - return 1 - } # upgrade dependencies that are already installed if {![macports::global_option_isset ports_nodeps]} { Modified: branches/release_2_0/base/src/port1.0/portutil.tcl =================================================================== --- branches/release_2_0/base/src/port1.0/portutil.tcl 2012-02-22 06:51:46 UTC (rev 90107) +++ branches/release_2_0/base/src/port1.0/portutil.tcl 2012-02-22 07:04:21 UTC (rev 90108) @@ -2739,6 +2739,16 @@ } elseif {[rpm-vercomp $xcodeversion $ok] < 0} { ui_warn "The installed version of Xcode (${xcodeversion}) is known to cause problems. Version $rec or later is recommended on Mac OS X ${macosx_version}." } + + # Xcode 4.3 requires the command-line utilities package to be + # installed. + if {[vercmp $xcodeversion 4.3] >= 0} { + if {![file exists "/usr/bin/make"]} { + ui_warn "The Command Line Tools for Xcode don't appear to be installed; most ports will likely fail to build." + ui_warn "See http://guide.macports.org/chunked/installing.xcode.html for more information." + } + } + } return 0 }

1 0

[90107] trunk/base/src
by dports＠macports.org 22 Feb '12

22 Feb '12

Revision: 90107 http://trac.macports.org/changeset/90107 Author: dports(a)macports.org Date: 2012-02-21 22:51:46 -0800 (Tue, 21 Feb 2012) Log Message: ----------- On Xcode 4.3, give a warning if the command-line utilities package doesn't appear to be installed. Check the Xcode version and supported_archs even if the port we're installing has no dependencies. Modified Paths: -------------- trunk/base/src/macports1.0/macports.tcl trunk/base/src/port1.0/portutil.tcl Modified: trunk/base/src/macports1.0/macports.tcl =================================================================== --- trunk/base/src/macports1.0/macports.tcl 2012-02-22 01:04:31 UTC (rev 90106) +++ trunk/base/src/macports1.0/macports.tcl 2012-02-22 06:51:46 UTC (rev 90107) @@ -1889,6 +1889,20 @@ macports::push_log $mport } + # Use _target_needs_deps as a proxy for whether we're going to + # build and will therefore need to check Xcode version and + # supported_archs. + if {[macports::_target_needs_deps $target]} { + # possibly warn or error out depending on how old xcode is + if {[$workername eval _check_xcode_version] != 0} { + return 1 + } + # error out if selected arch(s) not supported by this port + if {[$workername eval check_supported_archs] != 0} { + return 1 + } + } + # Before we build the port, we must build its dependencies. set dlist {} if {[macports::_target_needs_deps $target] && [macports::_mport_has_deptypes $mport [macports::_deptypes_for_target $target $workername]]} { @@ -1896,14 +1910,6 @@ # see if we actually need to build this port if {($target != "activate" && $target != "install") || ![$workername eval registry_exists \$subport \$version \$revision \$portvariants]} { - # possibly warn or error out depending on how old xcode is - if {[$workername eval _check_xcode_version] != 0} { - return 1 - } - # error out if selected arch(s) not supported by this port - if {[$workername eval check_supported_archs] != 0} { - return 1 - } # upgrade dependencies that are already installed if {![macports::global_option_isset ports_nodeps]} { Modified: trunk/base/src/port1.0/portutil.tcl =================================================================== --- trunk/base/src/port1.0/portutil.tcl 2012-02-22 01:04:31 UTC (rev 90106) +++ trunk/base/src/port1.0/portutil.tcl 2012-02-22 06:51:46 UTC (rev 90107) @@ -2814,6 +2814,16 @@ } elseif {[vercmp $xcodeversion $ok] < 0} { ui_warn "The installed version of Xcode (${xcodeversion}) is known to cause problems. Version $rec or later is recommended on Mac OS X ${macosx_version}." } + + # Xcode 4.3 requires the command-line utilities package to be + # installed. + if {[vercmp $xcodeversion 4.3] >= 0} { + if {![file exists "/usr/bin/make"]} { + ui_warn "The Command Line Tools for Xcode don't appear to be installed; most ports will likely fail to build." + ui_warn "See http://guide.macports.org/chunked/installing.xcode.html for more information." + } + } + } return 0 }

1 0

[90105] trunk/dports/science/flann
by mmoll＠macports.org 22 Feb '12

22 Feb '12

Revision: 90105 http://trac.macports.org/changeset/90105 Author: mmoll(a)macports.org Date: 2012-02-21 16:58:08 -0800 (Tue, 21 Feb 2012) Log Message: ----------- science/flann: install python bindings in the right place Modified Paths: -------------- trunk/dports/science/flann/Portfile Added Paths: ----------- trunk/dports/science/flann/files/ trunk/dports/science/flann/files/patch-src-python-CMakeLists.txt.diff Modified: trunk/dports/science/flann/Portfile =================================================================== --- trunk/dports/science/flann/Portfile 2012-02-21 22:12:30 UTC (rev 90104) +++ trunk/dports/science/flann/Portfile 2012-02-22 00:58:08 UTC (rev 90105) @@ -4,6 +4,7 @@ PortGroup cmake 1.0 name flann version 1.7.1 +revision 1 categories science devel maintainers mmoll description Fast Library for Approximate Nearest Neighbors @@ -24,6 +25,9 @@ sha1 4f3cef9b4f171b1ee4a98f4f684c350c3022e9b2 \ rmd160 c48f6de9d3c1c87a446a4f3f0353ff02f4fe6506 depends_lib port:hdf5-18 +patchfiles patch-src-python-CMakeLists.txt.diff +patch.dir ${worksrcpath}/${worksrcdir} + # MPI support is automatically disabled if hdf5-18 is installed without the +openmpi variant configure.args-append ${distname} -DBUILD_MATLAB_BINDINGS=OFF -DUSE_MPI=ON \ -DMPIEXEC=${prefix}/lib/openmpi/bin/mpiexec \ @@ -32,18 +36,34 @@ variant python26 description {Use python2.6 for python bindings} conflicts python27 python31 python32 { depends_lib-append port:python26 configure.args-append -DPYTHON_EXECUTABLE=${prefix}/bin/python2.6 + post-patch { + reinplace "s|@@PREFIX@@|${destroot}${prefix}|g" ${patch.dir}/src/python/CMakeLists.txt + reinplace "s|@@PYTHON_LIB@@|${destroot}${prefix}/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6|g" ${patch.dir}/src/python/CMakeLists.txt + } } variant python27 description {Use python2.7 for python bindings} conflicts python26 python31 python32 { depends_lib-append port:python27 configure.args-append -DPYTHON_EXECUTABLE=${prefix}/bin/python2.7 + post-patch { + reinplace "s|@@PREFIX@@|${destroot}${prefix}|g" ${patch.dir}/src/python/CMakeLists.txt + reinplace "s|@@PYTHON_LIB@@|${destroot}${prefix}/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7|g" ${patch.dir}/src/python/CMakeLists.txt + } } variant python31 description {Use python3.1 for python bindings} conflicts python26 python27 python32 { depends_lib-append port:python31 configure.args-append -DPYTHON_EXECUTABLE=${prefix}/bin/python3.1 + post-patch { + reinplace "s|@@PREFIX@@|${destroot}${prefix}|g" ${patch.dir}/src/python/CMakeLists.txt + reinplace "s|@@PYTHON_LIB@@|${destroot}${prefix}/Library/Frameworks/Python.framework/Versions/3.1/lib/python3.1|g" ${patch.dir}/src/python/CMakeLists.txt + } } variant python32 description {Use python3.2 for python bindings} conflicts python26 python27 python31 { depends_lib-append port:python32 configure.args-append -DPYTHON_EXECUTABLE=${prefix}/bin/python3.2 + post-patch { + reinplace "s|@@PREFIX@@|${destroot}${prefix}|g" ${patch.dir}/src/python/CMakeLists.txt + reinplace "s|@@PYTHON_LIB@@|${destroot}${prefix}/Library/Frameworks/Python.framework/Versions/3.2/lib/python3.2|g" ${patch.dir}/src/python/CMakeLists.txt + } } livecheck.type regex Added: trunk/dports/science/flann/files/patch-src-python-CMakeLists.txt.diff =================================================================== --- trunk/dports/science/flann/files/patch-src-python-CMakeLists.txt.diff (rev 0) +++ trunk/dports/science/flann/files/patch-src-python-CMakeLists.txt.diff 2012-02-22 00:58:08 UTC (rev 90105) @@ -0,0 +1,10 @@ +--- src/python/CMakeLists.txt.orig 2012-02-21 18:35:22.000000000 -0600 ++++ src/python/CMakeLists.txt 2012-02-21 18:37:32.000000000 -0600 +@@ -7,6 +7,6 @@ + # python instalation + if (PYTHON_EXECUTABLE) + install(CODE "execute_process( +- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/setup.py install ++ COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/setup.py install --prefix=@@PREFIX@@ --install-lib=@@PYTHON_LIB@@ + WORKING_DIRECTORY \"${CMAKE_CURRENT_SOURCE_DIR}\")") + endif()

1 0

[90104] trunk/base/ChangeLog
by and.damore＠macports.org 21 Feb '12

21 Feb '12

Revision: 90104 http://trac.macports.org/changeset/90104 Author: and.damore(a)macports.org Date: 2012-02-21 14:12:30 -0800 (Tue, 21 Feb 2012) Log Message: ----------- reverting r90103, already there Revision Links: -------------- http://trac.macports.org/changeset/90103 Modified Paths: -------------- trunk/base/ChangeLog Modified: trunk/base/ChangeLog =================================================================== --- trunk/base/ChangeLog 2012-02-21 22:03:12 UTC (rev 90103) +++ trunk/base/ChangeLog 2012-02-21 22:12:30 UTC (rev 90104) @@ -32,7 +32,7 @@ - Xcode 4.3 support: Change home directory for MacPorts user to ${prefix}/var/macports/home. - (jberry, jmr in r89988, r89993, r89994, r90002, r90010, r90011) + (jberry, jmr in r89988, r89993, r90002, r90010, r90011) - Xcode 4.3 support, #31827: set env(HOME) to our own dirs (#31827) and copy user's xcode 4.3 plist into them.

1 0

[90103] trunk/base/ChangeLog
by and.damore＠macports.org 21 Feb '12

21 Feb '12

Revision: 90103 http://trac.macports.org/changeset/90103 Author: and.damore(a)macports.org Date: 2012-02-21 14:03:12 -0800 (Tue, 21 Feb 2012) Log Message: ----------- adding r89994 to Changelog, contains significative changes for new home setting Revision Links: -------------- http://trac.macports.org/changeset/89994 Modified Paths: -------------- trunk/base/ChangeLog Modified: trunk/base/ChangeLog =================================================================== --- trunk/base/ChangeLog 2012-02-21 17:04:50 UTC (rev 90102) +++ trunk/base/ChangeLog 2012-02-21 22:03:12 UTC (rev 90103) @@ -32,7 +32,7 @@ - Xcode 4.3 support: Change home directory for MacPorts user to ${prefix}/var/macports/home. - (jberry, jmr in r89988, r89993, r90002, r90010, r90011) + (jberry, jmr in r89988, r89993, r89994, r90002, r90010, r90011) - Xcode 4.3 support, #31827: set env(HOME) to our own dirs (#31827) and copy user's xcode 4.3 plist into them.

1 0