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

[90052] trunk/dports/kde/kmymoney4-devel/Portfile
by mk＠macports.org 20 Feb '12

20 Feb '12

Revision: 90052 http://trac.macports.org/changeset/90052 Author: mk(a)macports.org Date: 2012-02-20 00:12:01 -0800 (Mon, 20 Feb 2012) Log Message: ----------- kmymoney4-devel: update to latest git version Modified Paths: -------------- trunk/dports/kde/kmymoney4-devel/Portfile Modified: trunk/dports/kde/kmymoney4-devel/Portfile =================================================================== --- trunk/dports/kde/kmymoney4-devel/Portfile 2012-02-20 08:06:58 UTC (rev 90051) +++ trunk/dports/kde/kmymoney4-devel/Portfile 2012-02-20 08:12:01 UTC (rev 90052) @@ -8,11 +8,10 @@ fetch.type git git.url git://anongit.kde.org/kmymoney -git.branch 720d999a079375d8b1c5215dfb4c774a94417cb4 +git.branch da69efb40e5d574ac5ff7c863a9e675db7b0fa2a name kmymoney4-devel -version 4.6-20120208 -revision 3 +version 4.6-20120220 categories kde kde4 finance maintainers mk pixilla openmaintainer

1 0

[90051] trunk/dports/science/nco/Portfile
by takeshi＠macports.org 20 Feb '12

20 Feb '12

Revision: 90051 http://trac.macports.org/changeset/90051 Author: takeshi(a)macports.org Date: 2012-02-20 00:06:58 -0800 (Mon, 20 Feb 2012) Log Message: ----------- nco: updated for 4.0.9 Modified Paths: -------------- trunk/dports/science/nco/Portfile Modified: trunk/dports/science/nco/Portfile =================================================================== --- trunk/dports/science/nco/Portfile 2012-02-20 07:41:30 UTC (rev 90050) +++ trunk/dports/science/nco/Portfile 2012-02-20 08:06:58 UTC (rev 90051) @@ -4,16 +4,15 @@ PortSystem 1.0 name nco -version 4.0.8 -revision 1 +version 4.0.9 platforms darwin maintainers takeshi categories science description The netCDF Operators master_sites http://${name}.sourceforge.net/src/ -checksums md5 edd1e5dab719b4bfc2cd07ec840f4f1d \ - sha1 98f97fc21bab1190053c08bfae77b61b149bfd50 \ - rmd160 8788b001021b31d41cf24738d1aa5437bd4493e1 +checksums md5 83985751f0db7b48a40280ee8c650321 \ + sha1 53e2b8a14f8db97e5be6c51d1e20634b54761318 \ + rmd160 a81648532d34fbb8b0500b5138bd370ccfc99d93 homepage http://nco.sourceforge.net/ long_description \ Each NCO operator (e.g., ncks) takes netCDF or HDF input file(s), \

1 0

[90050] trunk/dports/lang/clang-2.9/Portfile
by jeremyhu＠macports.org 20 Feb '12

20 Feb '12

Revision: 90050 http://trac.macports.org/changeset/90050 Author: jeremyhu(a)macports.org Date: 2012-02-19 23:41:30 -0800 (Sun, 19 Feb 2012) Log Message: ----------- clang-2.9: Actually fix #33272 this time Modified Paths: -------------- trunk/dports/lang/clang-2.9/Portfile Modified: trunk/dports/lang/clang-2.9/Portfile =================================================================== --- trunk/dports/lang/clang-2.9/Portfile 2012-02-20 07:21:46 UTC (rev 90049) +++ trunk/dports/lang/clang-2.9/Portfile 2012-02-20 07:41:30 UTC (rev 90050) @@ -98,6 +98,7 @@ post-patch { # http://trac.macports.org/ticket/33272 if {![variant_isset arm_runtime]} { + reinplace {/^RuntimeLibrary.darwin.Configs/ s/arm[^ ]* *//g} ${worksrcpath}/tools/clang/runtime/Makefile reinplace {/^SubDirs/ s/arm//} ${worksrcpath}/projects/compiler-rt/lib/Makefile.mk reinplace {/^UniversalArchs/ s/arm[^ )]* *//g} ${worksrcpath}/projects/compiler-rt/make/platform/clang_darwin.mk reinplace {/^Configs/ s/arm[^ )]* *//g} ${worksrcpath}/projects/compiler-rt/make/platform/clang_darwin.mk

1 0

[90049] branches/release_2_0/base/ChangeLog
by jberry＠macports.org 20 Feb '12

20 Feb '12

Revision: 90049 http://trac.macports.org/changeset/90049 Author: jberry(a)macports.org Date: 2012-02-19 23:21:46 -0800 (Sun, 19 Feb 2012) Log Message: ----------- Revise changelog to omit reverted 90028, 90031 Modified Paths: -------------- branches/release_2_0/base/ChangeLog Modified: branches/release_2_0/base/ChangeLog =================================================================== --- branches/release_2_0/base/ChangeLog 2012-02-20 07:13:30 UTC (rev 90048) +++ branches/release_2_0/base/ChangeLog 2012-02-20 07:21:46 UTC (rev 90049) @@ -7,16 +7,6 @@ - Resolve ambiguity in selection in portlists (jberry in r88179, r88185) - - Xcode 4.3 support: Use xcrun -find to find xcode compiler if it's not - found in /usr/bin. - (jberry, jmr in r88540,r88541,r88546,r88777,r88779,r88787,r89359,r89984,r90028) - - - Xcode 4.3 support: Search harder for developer directory; advise user to - run xcode-select when necessary, searching for Xcode and suggesting - xcode-select commands. - (jberry, jmr in r89970,r89971,r89972,r89996,r89999,r90003,r90005-r90009, - r90018-r90019,r90024,r90031) - - Xcode 4.3 support: Change home directory for MacPorts user to ${prefix}/var/macports/home. (jberry, jmr in r89988, r89993, r90002, r90010, r90011)

1 0

[90048] branches/release_2_0/base
by jberry＠macports.org 20 Feb '12

20 Feb '12

Revision: 90048 http://trac.macports.org/changeset/90048 Author: jberry(a)macports.org Date: 2012-02-19 23:13:30 -0800 (Sun, 19 Feb 2012) Log Message: ----------- Revert r90028,r90029 per jmr Revision Links: -------------- http://trac.macports.org/changeset/90028 http://trac.macports.org/changeset/90029 Modified Paths: -------------- branches/release_2_0/base/configure branches/release_2_0/base/configure.ac branches/release_2_0/base/src/port1.0/port_autoconf.tcl.in branches/release_2_0/base/src/port1.0/portconfigure.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,88540-88541,88546,88777,88779,88787,89359,89984,89988,89993-89994,90000,90002,90004,90010,90020,90032 /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 /users/perry/base-bugs_and_notes:45682-46060 /users/perry/base-select:44044-44692 Modified: branches/release_2_0/base/configure =================================================================== --- branches/release_2_0/base/configure 2012-02-20 07:10:07 UTC (rev 90047) +++ branches/release_2_0/base/configure 2012-02-20 07:13:30 UTC (rev 90048) @@ -689,7 +689,6 @@ GNUPATCH GNUMAKE GNUTAR -XCRUN XCODEBUILD LAUNCHCTL HAVE_LAUNCHD @@ -5326,46 +5325,6 @@ fi -# Extract the first word of "xcrun", so it can be a program name with args. -set dummy xcrun; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_XCRUN+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $XCRUN in - [\\/]* | ?:[\\/]*) - ac_cv_path_XCRUN="$XCRUN" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_XCRUN="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -XCRUN=$ac_cv_path_XCRUN -if test -n "$XCRUN"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XCRUN" >&5 -$as_echo "$XCRUN" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - for ac_prog in gnutar gtar do # Extract the first word of "$ac_prog", so it can be a program name with args. Modified: branches/release_2_0/base/configure.ac =================================================================== --- branches/release_2_0/base/configure.ac 2012-02-20 07:10:07 UTC (rev 90047) +++ branches/release_2_0/base/configure.ac 2012-02-20 07:13:30 UTC (rev 90048) @@ -115,7 +115,6 @@ AC_CHECK_PROG(HAVE_LAUNCHD, [launchd], [yes], []) AC_PATH_PROG(LAUNCHCTL, [launchctl], []) AC_PATH_PROG(XCODEBUILD, [xcodebuild], []) -AC_PATH_PROG(XCRUN, [xcrun], []) AC_PATH_PROGS(GNUTAR, [gnutar gtar], [], [$PATH:/usr/local/bin]) AC_PATH_PROGS(GNUMAKE, [gnumake gmake], [], [$PATH:/usr/local/bin]) AC_PATH_PROGS(GNUPATCH, [gnupatch gpatch], [], [$PATH:/usr/local/bin]) Modified: branches/release_2_0/base/src/port1.0/port_autoconf.tcl.in =================================================================== --- branches/release_2_0/base/src/port1.0/port_autoconf.tcl.in 2012-02-20 07:10:07 UTC (rev 90047) +++ branches/release_2_0/base/src/port1.0/port_autoconf.tcl.in 2012-02-20 07:13:30 UTC (rev 90048) @@ -62,9 +62,6 @@ variable mtree_path "@MTREE@" variable pax_path "@PAX@" variable xar_path "@XAR@" - variable xcode_select_path "@XCODE_SELECT@" - variable xcodebuild_path "@XCODEBUILD@" - variable xcrun_path "@XCRUN@" variable sed_command "@SED@" variable sed_ext_flag "@SED_EXT@" variable tar_command "@TAR_CMD@" Modified: branches/release_2_0/base/src/port1.0/portconfigure.tcl =================================================================== --- branches/release_2_0/base/src/port1.0/portconfigure.tcl 2012-02-20 07:10:07 UTC (rev 90047) +++ branches/release_2_0/base/src/port1.0/portconfigure.tcl 2012-02-20 07:13:30 UTC (rev 90048) @@ -372,29 +372,6 @@ } } -# Find a developer tool -proc portconfigure::find_developer_tool {name} { - global developer_dir - - # first try /usr/bin since this doesn't move around - set toolpath "/usr/bin/${name}" - if {[file executable $toolpath]} { - return $toolpath - } - - # Use xcode's xcrun to find the named tool. - if {![catch {exec [findBinary xcrun $portutil::autoconf::xcrun_path] -find ${name}} toolpath]} { - return ${toolpath} - } - - # If xcrun failed to find the tool, return a path from - # the developer_dir. - # The tool may not be there, but we'll leave it up to - # the invoking code to figure out that it doesn't have - # a valid compiler - return "${developer_dir}/usr/bin/${name}" -} - # internal function to find correct compilers proc portconfigure::configure_get_compiler {type} { global configure.compiler prefix developer_dir @@ -402,42 +379,42 @@ switch -exact ${configure.compiler} { cc { switch -exact ${type} { - cc { set ret [find_developer_tool cc] } - objc { set ret [find_developer_tool cc] } - cxx { set ret [find_developer_tool c++] } - cpp { set ret [find_developer_tool cpp] } + cc { set ret /usr/bin/cc } + objc { set ret /usr/bin/cc } + cxx { set ret /usr/bin/c++ } + cpp { set ret /usr/bin/cpp } } } gcc { switch -exact ${type} { - cc { set ret [find_developer_tool gcc] } - objc { set ret [find_developer_tool gcc] } - cxx { set ret [find_developer_tool g++] } - cpp { set ret [find_developer_tool cpp] } + cc { set ret /usr/bin/gcc } + objc { set ret /usr/bin/gcc } + cxx { set ret /usr/bin/g++ } + cpp { set ret /usr/bin/cpp } } } gcc-3.3 { switch -exact ${type} { - cc { set ret [find_developer_tool gcc-3.3] } - objc { set ret [find_developer_tool gcc-3.3] } - cxx { set ret [find_developer_tool g++-3.3] } - cpp { set ret [find_developer_tool cpp-3.3] } + cc { set ret /usr/bin/gcc-3.3 } + objc { set ret /usr/bin/gcc-3.3 } + cxx { set ret /usr/bin/g++-3.3 } + cpp { set ret /usr/bin/cpp-3.3 } } } gcc-4.0 { switch -exact ${type} { - cc { set ret [find_developer_tool gcc-4.0] } - objc { set ret [find_developer_tool gcc-4.0] } - cxx { set ret [find_developer_tool g++-4.0] } - cpp { set ret [find_developer_tool cpp-4.0] } + cc { set ret /usr/bin/gcc-4.0 } + objc { set ret /usr/bin/gcc-4.0 } + cxx { set ret /usr/bin/g++-4.0 } + cpp { set ret /usr/bin/cpp-4.0 } } } gcc-4.2 { switch -exact ${type} { - cc { set ret [find_developer_tool gcc-4.2] } - objc { set ret [find_developer_tool gcc-4.2] } - cxx { set ret [find_developer_tool g++-4.2] } - cpp { set ret [find_developer_tool cpp-4.2] } + cc { set ret /usr/bin/gcc-4.2 } + objc { set ret /usr/bin/gcc-4.2 } + cxx { set ret /usr/bin/g++-4.2 } + cpp { set ret /usr/bin/cpp-4.2 } } } llvm-gcc-4.2 { @@ -447,22 +424,21 @@ set llvm_prefix ${developer_dir} } switch -exact ${type} { - cc { set ret [find_developer_tool llvm-gcc-4.2] } - objc { set ret [find_developer_tool llvm-gcc-4.2] } - cxx { set ret [find_developer_tool llvm-g++-4.2] } - cpp { set ret [find_developer_tool llvm-cpp-4.2] } + cc { set ret ${llvm_prefix}/usr/bin/llvm-gcc-4.2 } + objc { set ret ${llvm_prefix}/usr/bin/llvm-gcc-4.2 } + cxx { set ret ${llvm_prefix}/usr/bin/llvm-g++-4.2 } + cpp { set ret ${llvm_prefix}/usr/bin/llvm-cpp-4.2 } } } clang { switch -exact ${type} { - cc { set ret [find_developer_tool clang] } - objc { set ret [find_developer_tool clang] } + cc { set ret /usr/bin/clang } + objc { set ret /usr/bin/clang } cxx { - set clangpp [find_developer_tool clang++] - if {[file executable ${clangpp}]} { - set ret ${clangpp} + if {[file executable /usr/bin/clang++]} { + set ret /usr/bin/clang++ } else { - set ret [find_developer_tool llvm-g++-4.2] + set ret /usr/bin/llvm-g++-4.2 } } }

1 0

[90047] branches/release_2_0/base
by jberry＠macports.org 20 Feb '12

20 Feb '12

Revision: 90047 http://trac.macports.org/changeset/90047 Author: jberry(a)macports.org Date: 2012-02-19 23:10:07 -0800 (Sun, 19 Feb 2012) Log Message: ----------- Revert r90031 per jmr Revision Links: -------------- http://trac.macports.org/changeset/90031 Modified Paths: -------------- branches/release_2_0/base/src/macports1.0/macports.tcl branches/release_2_0/base/src/port1.0/portmain.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,88540-88541,88546,88777,88779,88787,89359,89970-89972,89984,89988,89993-89994,89996,89999-90000,90002-90010,90018-90020,90024,90032 /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,88540-88541,88546,88777,88779,88787,89359,89984,89988,89993-89994,90000,90002,90004,90010,90020,90032 /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-20 06:51:52 UTC (rev 90046) +++ branches/release_2_0/base/src/macports1.0/macports.tcl 2012-02-20 07:10:07 UTC (rev 90047) @@ -62,7 +62,7 @@ # deferred options are only computed when needed. # they are not exported to the trace thread. # they are not exported to the interpreter in system_options array. - variable portinterp_deferred_options "xcodeversion xcodebuildcmd developer_dir" + variable portinterp_deferred_options "xcodeversion xcodebuildcmd" variable open_mports {} @@ -362,7 +362,7 @@ trace remove variable macports::xcodeversion read macports::setxcodeinfo trace remove variable macports::xcodebuildcmd read macports::setxcodeinfo - if {![catch {findBinary xcodebuild /usr/bin/xcodebuild} xcodebuild]} { + if {[catch {set xcodebuild [binaryInPath "xcodebuild"]}] == 0} { if {![info exists xcodeversion]} { # Determine xcode version set macports::xcodeversion "2.0orlower" @@ -414,85 +414,6 @@ } } -# deferred calculation of developer_dir -proc macports::set_developer_dir {name1 name2 op} { - global macports::developer_dir macports::os_major macports::xcodeversion - - trace remove variable macports::developer_dir read macports::set_developer_dir - - # Look for xcodeselect, and make sure it has a valid value - if {![catch {findBinary xcode-select /usr/bin/xcode-select} xcodeselect]} { - - # We have xcode-select: ask it where xcode is - set devdir [exec $xcodeselect -print-path 2> /dev/null] - - # If the directory is valid, use it - if {[_is_valid_developer_dir $devdir]} { - set macports::developer_dir $devdir - return - } - - # The directory from xcode-select isn't correct. - # Ask mdfind where Xcode is and make some suggestions for the user, - # searching by bundle identifier for various Xcode versions (3.x and 4.x) - set installed_xcodes {} - if {![catch {findBinary mdfind /usr/bin/mdfind} mdfind]} { - set installed_xcodes [concat \ - [exec $mdfind "kMDItemCFBundleIdentifier == 'com.apple.Xcode'"] \ - [exec $mdfind "kMDItemCFBundleIdentifier == 'com.apple.dt.Xcode'"] \ - ] - } - if {[llength $installed_xcodes] > 0 && ![catch {findBinary mdls /usr/bin/mdls} mdls]} { - # One, or more than one, Xcode installations found - ui_error "No valid Xcode installation is properly selected." - - ui_error - ui_error "Please use xcode-select to select an Xcode installation:" - foreach xcode $installed_xcodes { - set vers [exec $mdls -raw -name kMDItemVersion $xcode] - if { $vers == "(null)" } { set vers "unknown" } - if {[vercmp $vers 4.3] >= 0 || [_is_valid_developer_dir "${xcode}/Contents/Developer"]} { - ui_error " sudo xcode-select -switch ${xcode} # version ${vers}" - } elseif {[_is_valid_developer_dir "${xcode}/../.."]} { - ui_error " sudo xcode-select -switch [file normalize ${xcode}/../..] # version ${vers}" - } else { - ui_error " # malformed xcode at ${xcode}, version ${vers}" - } - } - ui_error - } - } - - # Try the default - if {$os_major >= 11 && [vercmp $xcodeversion 4.3] >= 0} { - set devdir "/Applications/Xcode.app/Contents/Developer" - } else { - set devdir "/Developer" - } - - set macports::developer_dir $devdir -} - -proc macports::_is_valid_developer_dir {dir} { - # Check whether specified directory looks valid for an Xcode installation - - # Verify that the directory exists - if {![file isdirectory $dir]} { - return 0 - } - - # Verify that the directory has some key subdirectories - foreach subdir {Headers Library usr} { - if {![file isdirectory "${dir}/${subdir}"]} { - return 0 - } - } - - # The specified directory seems valid for Xcode - return 1 -} - - proc mportinit {{up_ui_options {}} {up_options {}} {up_variations {}}} { if {$up_ui_options eq ""} { array set macports::ui_options {} @@ -750,8 +671,8 @@ set macports::portautoclean "yes" global macports::portautoclean } - # whether to keep logs after successful builds - if {![info exists keeplogs]} { + # whether to keep logs after successful builds + if {![info exists keeplogs]} { set macports::keeplogs "no" global macports::keeplogs } @@ -976,15 +897,7 @@ trace add variable macports::xcodebuildcmd read macports::setxcodeinfo } - if {![info exists developer_dir]} { - if {$os_platform == "darwin"} { - trace add variable macports::developer_dir read macports::set_developer_dir - } else { - set macports::developer_dir "" - } - } - - if {$os_major >= 11 && $os_platform == "darwin" && [vercmp $xcodeversion 4.3] >= 0} { + if {[vercmp $xcodeversion 4.3] >= 0} { macports::copy_xcode_plist $env(HOME) } Modified: branches/release_2_0/base/src/port1.0/portmain.tcl =================================================================== --- branches/release_2_0/base/src/port1.0/portmain.tcl 2012-02-20 06:51:52 UTC (rev 90046) +++ branches/release_2_0/base/src/port1.0/portmain.tcl 2012-02-20 07:10:07 UTC (rev 90047) @@ -44,8 +44,6 @@ namespace eval portmain { } -set_ui_prefix - # define options options prefix name version revision epoch categories maintainers \ long_description description homepage notes license \ @@ -91,6 +89,7 @@ default prefix /opt/local default applications_dir /Applications/MacPorts default frameworks_dir {${prefix}/Library/Frameworks} +default developer_dir {[portmain::get_developer_dir]} default destdir destroot default destpath {${workpath}/${destdir}} # destroot is provided as a clearer name for the "destpath" variable @@ -145,6 +144,20 @@ default compiler.cpath {${prefix}/include} default compiler.library_path {${prefix}/lib} +proc portmain::get_developer_dir {} { + if {![catch {binaryInPath xcode-select}] + && ![catch {exec xcode-select -print-path 2> /dev/null} result] + && [file isdirectory $result]} { + return $result + } + global xcodeversion + if {[vercmp $xcodeversion 4.3] >= 0} { + return "/Applications/Xcode.app/Contents/Developer" + } else { + return "/Developer" + } +} + # start gsoc08-privileges # Record initial euid/egid

1 0

[90046] trunk/dports/python/py-omniORBpy/Portfile
by ryandesign＠macports.org 20 Feb '12

20 Feb '12

Revision: 90046 http://trac.macports.org/changeset/90046 Author: ryandesign(a)macports.org Date: 2012-02-19 22:51:52 -0800 (Sun, 19 Feb 2012) Log Message: ----------- py-omniORBpy: rewrite master_sites to avoid redirects Modified Paths: -------------- trunk/dports/python/py-omniORBpy/Portfile Modified: trunk/dports/python/py-omniORBpy/Portfile =================================================================== --- trunk/dports/python/py-omniORBpy/Portfile 2012-02-20 06:40:34 UTC (rev 90045) +++ trunk/dports/python/py-omniORBpy/Portfile 2012-02-20 06:51:52 UTC (rev 90046) @@ -13,7 +13,7 @@ Python. omniORB is largely CORBA 2.6 compliant. homepage http://omniorb.sourceforge.net/ platforms darwin -master_sites sourceforge:omniorb +master_sites sourceforge:project/omniorb/omniORBpy/omniORBpy-${version} distname omniORBpy-${version}

1 0

[90045] trunk/dports/devel/tclreadline
by jberry＠macports.org 20 Feb '12

20 Feb '12

Revision: 90045 http://trac.macports.org/changeset/90045 Author: jberry(a)macports.org Date: 2012-02-19 22:40:34 -0800 (Sun, 19 Feb 2012) Log Message: ----------- Resolve #32858. Maintainer timeout. Add patch for support of thread-enabled Tcl. Modified Paths: -------------- trunk/dports/devel/tclreadline/Portfile Added Paths: ----------- trunk/dports/devel/tclreadline/files/ trunk/dports/devel/tclreadline/files/patch-tclreadline.c.diff Modified: trunk/dports/devel/tclreadline/Portfile =================================================================== --- trunk/dports/devel/tclreadline/Portfile 2012-02-20 05:24:49 UTC (rev 90044) +++ trunk/dports/devel/tclreadline/Portfile 2012-02-20 06:40:34 UTC (rev 90045) @@ -5,6 +5,8 @@ name tclreadline version 2.1.0 +revision 1 + categories devel platforms darwin maintainers dons.net.au:darius @@ -33,6 +35,10 @@ use_autoreconf yes +# Patch readline to use malloc/free instead of +# Tcl_Alloc/Tcl_Free. Required for threaded-enabled Tcl. +patchfiles patch-tclreadline.c.diff + livecheck.type regex livecheck.url http://sourceforge.net/projects/${name}/files/ livecheck.regex /${name}-(\[0-9.\]+)${extract.suffix} Added: trunk/dports/devel/tclreadline/files/patch-tclreadline.c.diff =================================================================== --- trunk/dports/devel/tclreadline/files/patch-tclreadline.c.diff (rev 0) +++ trunk/dports/devel/tclreadline/files/patch-tclreadline.c.diff 2012-02-20 06:40:34 UTC (rev 90045) @@ -0,0 +1,13 @@ +--- tclreadline.c.orig 2012-02-19 22:30:13.000000000 -0800 ++++ tclreadline.c 2012-02-19 22:27:00.000000000 -0800 +@@ -49,8 +49,8 @@ + static const char* tclrl_version_str = TCLRL_VERSION_STR; + static const char* tclrl_patchlevel_str = TCLRL_PATCHLEVEL_STR; + +-#define MALLOC(size) Tcl_Alloc((int) size) +-#define FREE(ptr) if (ptr) { Tcl_Free((char*) ptr); ptr = 0; } ++#define MALLOC(size) malloc((int) size) ++#define FREE(ptr) if (ptr) { free((char*) ptr); ptr = 0; } + + enum { + _CMD_SET = (1 << 0),

1 0

[90044] trunk/dports/python/py-omniORBpy/Portfile
by macsforever2000＠macports.org 20 Feb '12

20 Feb '12

Revision: 90044 http://trac.macports.org/changeset/90044 Author: macsforever2000(a)macports.org Date: 2012-02-19 21:24:49 -0800 (Sun, 19 Feb 2012) Log Message: ----------- py-omniORBpy: remove bzip2. Modified Paths: -------------- trunk/dports/python/py-omniORBpy/Portfile Modified: trunk/dports/python/py-omniORBpy/Portfile =================================================================== --- trunk/dports/python/py-omniORBpy/Portfile 2012-02-20 05:21:09 UTC (rev 90043) +++ trunk/dports/python/py-omniORBpy/Portfile 2012-02-20 05:24:49 UTC (rev 90044) @@ -17,7 +17,7 @@ distname omniORBpy-${version} -use_bzip2 yes +#use_bzip2 yes checksums md5 d054e99c89c20f86927c52010e9e7449 \ sha1 e598bd25289d0a2a09da4c7241513202c8b9adb4 \ rmd160 5b389a31907510800ef0913e2e3855038e6a4cf9

1 0

[90043] trunk/dports/python/py-omniORBpy/Portfile
by macsforever2000＠macports.org 20 Feb '12

20 Feb '12

Revision: 90043 http://trac.macports.org/changeset/90043 Author: macsforever2000(a)macports.org Date: 2012-02-19 21:21:09 -0800 (Sun, 19 Feb 2012) Log Message: ----------- py-omniORBpy: fix syntax error. Modified Paths: -------------- trunk/dports/python/py-omniORBpy/Portfile Modified: trunk/dports/python/py-omniORBpy/Portfile =================================================================== --- trunk/dports/python/py-omniORBpy/Portfile 2012-02-20 05:17:42 UTC (rev 90042) +++ trunk/dports/python/py-omniORBpy/Portfile 2012-02-20 05:21:09 UTC (rev 90043) @@ -18,9 +18,9 @@ distname omniORBpy-${version} use_bzip2 yes -checksums md5 d054e99c89c20f86927c52010e9e7449 \ - sha1 e598bd25289d0a2a09da4c7241513202c8b9adb4 \ - rmd160 5b389a31907510800ef0913e2e3855038e6a4cf9 +checksums md5 d054e99c89c20f86927c52010e9e7449 \ + sha1 e598bd25289d0a2a09da4c7241513202c8b9adb4 \ + rmd160 5b389a31907510800ef0913e2e3855038e6a4cf9 # Use the python subports feature but omniORBpy uses make # rather than setup.py for building since there are compiled libraries.

1 0