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

[90122] trunk/dports/python/py-zc-buildout/Portfile
by singingwolfboy＠macports.org 22 Feb '12

22 Feb '12

Revision: 90122 http://trac.macports.org/changeset/90122 Author: singingwolfboy(a)macports.org Date: 2012-02-22 08:09:38 -0800 (Wed, 22 Feb 2012) Log Message: ----------- py-zc-buildout: add more checks for deleting stray README Modified Paths: -------------- trunk/dports/python/py-zc-buildout/Portfile Modified: trunk/dports/python/py-zc-buildout/Portfile =================================================================== --- trunk/dports/python/py-zc-buildout/Portfile 2012-02-22 15:24:52 UTC (rev 90121) +++ trunk/dports/python/py-zc-buildout/Portfile 2012-02-22 16:09:38 UTC (rev 90122) @@ -6,7 +6,7 @@ name py-zc-buildout set real_name zc.buildout version 1.5.2 -revision 1 +revision 2 python.versions 24 25 26 27 categories-append devel platforms darwin @@ -39,7 +39,12 @@ foreach file [glob ${destroot}${python.pkgd}/zc/buildout/*.txt] { delete $file } - delete ${destroot}${prefix}/README.txt + if {[file exists ${destroot}${prefix}/README.txt]} { + delete ${destroot}${prefix}/README.txt + } + if {[file exists ${destroot}${python.prefix}/README.txt]} { + delete ${destroot}${python.prefix}/README.txt + } system "chmod -R 755 ${destroot}${python.pkgd}" } }

1 0

[90121] trunk/dports/net/curl-ca-bundle/Portfile
by ryandesign＠macports.org 22 Feb '12

22 Feb '12

Revision: 90121 http://trac.macports.org/changeset/90121 Author: ryandesign(a)macports.org Date: 2012-02-22 07:24:52 -0800 (Wed, 22 Feb 2012) Log Message: ----------- curl-ca-bundle: update certdata.txt to 1.82 and also install a symlink for openssl (#19247) Modified Paths: -------------- trunk/dports/net/curl-ca-bundle/Portfile Modified: trunk/dports/net/curl-ca-bundle/Portfile =================================================================== --- trunk/dports/net/curl-ca-bundle/Portfile 2012-02-22 14:20:36 UTC (rev 90120) +++ trunk/dports/net/curl-ca-bundle/Portfile 2012-02-22 15:24:52 UTC (rev 90121) @@ -6,6 +6,7 @@ name curl-ca-bundle # keep the version in sync with the curl port version 7.24.0 +revision 1 set curl_name curl categories net license {MPL-1.1 LGPL-2.1+ GPL-2+} @@ -21,8 +22,8 @@ dist_subdir ${curl_name} set curl_source ${distname}${extract.suffix} set certdata_file certdata.txt -set certdata_version 1.81 -set certdata_date 2012-01-17 +set certdata_version 1.82 +set certdata_date 2012-02-18 set certdata_distfile certdata-${certdata_version}.txt set certdata_path security/nss/lib/ckfw/builtins/${certdata_file} build.target ca-bundle @@ -50,7 +51,7 @@ # on me noticing new versions within that time and updating the port, and # on upstream not updating the file again within that time. set days_since_update [expr {[expr {[clock seconds] - [clock format [clock scan ${certdata_date}] -format %s]}] / 86400}] -if {${days_since_update} > 3} { +if {${days_since_update} > 4} { master_sites-append http://distfiles.macports.org/curl/:certdata } else { master_sites-append http://mxr.mozilla.org/mozilla/source/${certdata_path}?raw=1&dummy=:certdata @@ -64,8 +65,8 @@ rmd160 b2b3116318813478b4683ae479cb889c4fc05cea \ sha256 ebdb111088ff8b0e05b1d1b075e9f1608285e8105cc51e21caacf33d01812c16 \ ${certdata_distfile} \ - rmd160 621f297487026817d56e2685c9494470ea4c8808 \ - sha256 92a98d43ad4f2f98747de5f195cc2790c710458d629524f2b46174d65c96d17f + rmd160 b3bc4bdb6ac212165dfb7616de33015c368a92c9 \ + sha256 9467dceae5024931062b0caa0e71275cb20e806168d1b690c7fef054aa2844ec depends_build \ path:bin/perl:perl5 @@ -78,9 +79,11 @@ } destroot { - set ca_bundle_dir ${destroot}${prefix}/share/curl - xinstall -d ${ca_bundle_dir} - xinstall -m 644 ${worksrcpath}/lib/ca-bundle.crt ${ca_bundle_dir}/curl-ca-bundle.crt + set ca_bundle_dir ${prefix}/share/curl + set openssl_dir ${prefix}/etc/openssl + xinstall -d ${destroot}${ca_bundle_dir} ${destroot}${openssl_dir} + xinstall -m 644 ${worksrcpath}/lib/ca-bundle.crt ${destroot}${ca_bundle_dir}/curl-ca-bundle.crt + ln -s ${ca_bundle_dir}/curl-ca-bundle.crt ${destroot}${openssl_dir}/cert.pem } livecheck.type regex

1 0

[90120] trunk/dports/math/qhull/Portfile
by mmoll＠macports.org 22 Feb '12

22 Feb '12

Revision: 90120 http://trac.macports.org/changeset/90120 Author: mmoll(a)macports.org Date: 2012-02-22 06:20:36 -0800 (Wed, 22 Feb 2012) Log Message: ----------- math/qhull: use dist_subdir to correctly deal with stealth update Modified Paths: -------------- trunk/dports/math/qhull/Portfile Modified: trunk/dports/math/qhull/Portfile =================================================================== --- trunk/dports/math/qhull/Portfile 2012-02-22 13:55:14 UTC (rev 90119) +++ trunk/dports/math/qhull/Portfile 2012-02-22 14:20:36 UTC (rev 90120) @@ -7,6 +7,7 @@ name qhull version 2012.1 revision 2 +dist_subdir ${name}/${version}_1 categories math platforms darwin maintainers mmoll

1 0

[90119] trunk/dports/devel/ppl
by adfernandes＠macports.org 22 Feb '12

22 Feb '12

Revision: 90119 http://trac.macports.org/changeset/90119 Author: adfernandes(a)macports.org Date: 2012-02-22 05:55:14 -0800 (Wed, 22 Feb 2012) Log Message: ----------- devel/ppl: fix for cross-compile configure check #33152 Modified Paths: -------------- trunk/dports/devel/ppl/Portfile Added Paths: ----------- trunk/dports/devel/ppl/files/configure-crosscompile.patch Removed Paths: ------------- trunk/dports/devel/ppl/files/configure.patch Modified: trunk/dports/devel/ppl/Portfile =================================================================== --- trunk/dports/devel/ppl/Portfile 2012-02-22 13:46:31 UTC (rev 90118) +++ trunk/dports/devel/ppl/Portfile 2012-02-22 13:55:14 UTC (rev 90119) @@ -37,6 +37,8 @@ sha1 915f1d8a7def10e540bf2806babf94dccd15852a \ rmd160 68dd335f6e94df09ac4e19ccf08f1c1b280efe86 +patchfiles configure-crosscompile.patch + depends_build port:m4 depends_lib port:gmp \ Added: trunk/dports/devel/ppl/files/configure-crosscompile.patch =================================================================== --- trunk/dports/devel/ppl/files/configure-crosscompile.patch (rev 0) +++ trunk/dports/devel/ppl/files/configure-crosscompile.patch 2012-02-22 13:55:14 UTC (rev 90119) @@ -0,0 +1,11 @@ +--- configure 2011-02-27 04:08:19.000000000 -0500 ++++ configure 2012-02-21 12:11:19.000000000 -0500 +@@ -9196,7 +9196,7 @@ + class B { + private: + int capacity; +- A vec; ++ A vec[]; + + public: + void* operator new(size_t fixed_size, int c) { Deleted: trunk/dports/devel/ppl/files/configure.patch =================================================================== --- trunk/dports/devel/ppl/files/configure.patch 2012-02-22 13:46:31 UTC (rev 90118) +++ trunk/dports/devel/ppl/files/configure.patch 2012-02-22 13:55:14 UTC (rev 90119) @@ -1,13 +0,0 @@ ---- configure 2010-08-08 13:40:26.000000000 -0400 -+++ configure 2010-08-08 13:41:00.000000000 -0400 -@@ -16472,9 +16472,7 @@ - if (sizeof(mp_limb_t)*CHAR_BIT != GMP_LIMB_BITS - || GMP_LIMB_BITS != mp_bits_per_limb) { - std::cerr -- << "GMP header (gmp.h) and library (ligmp.*) bits-per-limb mismatch:\n" -- << "header gives " << __GMP_BITS_PER_MP_LIMB << ";\n" -- << "library gives " << mp_bits_per_limb << ".\n" -+ << "GMP header (gmp.h) and library (ligmp.*) bits-per-limb mismatch!\n" - << "This probably means you are on a bi-arch system and\n" - << "you are compiling with the wrong header or linking with\n" - << "the wrong library." << std::endl;

1 0

[90118] trunk/dports/math/qhull/Portfile
by mmoll＠macports.org 22 Feb '12

22 Feb '12

Revision: 90118 http://trac.macports.org/changeset/90118 Author: mmoll(a)macports.org Date: 2012-02-22 05:46:31 -0800 (Wed, 22 Feb 2012) Log Message: ----------- math/qhull: yet another stealth update. closes #33314 (again) Modified Paths: -------------- trunk/dports/math/qhull/Portfile Modified: trunk/dports/math/qhull/Portfile =================================================================== --- trunk/dports/math/qhull/Portfile 2012-02-22 13:09:03 UTC (rev 90117) +++ trunk/dports/math/qhull/Portfile 2012-02-22 13:46:31 UTC (rev 90118) @@ -6,7 +6,7 @@ name qhull version 2012.1 -revision 1 +revision 2 categories math platforms darwin maintainers mmoll @@ -27,9 +27,9 @@ master_sites ${homepage}/download distname ${name}-${version}-src extract.suffix .tgz -checksums md5 710962448d0a5a01a798bb663443eb31 \ - sha1 65c9865bc56a173d223c9d7d230b12603c51a439 \ - rmd160 4c7d0e14ca2426e58709a862d2166b610348a3e4 +checksums md5 d0f978c0d8dfb2e919caefa56ea2953c \ + sha1 60f61580e1d6fbbd28e6df2ff625c98d15b5fbc6 \ + rmd160 4199d326414087512efbbca25db8be51f69ef730 # patch for g++-4.0 / Leopard, see #31053 patchfiles patch-nested-const-iterator.diff worksrcdir ${name}-${version}

1 0

[90117] trunk/dports/textproc
by hum＠macports.org 22 Feb '12

22 Feb '12

Revision: 90117 http://trac.macports.org/changeset/90117 Author: hum(a)macports.org Date: 2012-02-22 05:09:03 -0800 (Wed, 22 Feb 2012) Log Message: ----------- New port: marisa-trie @0.2.0-beta7 - a static and space-efficient trie data structure. Added Paths: ----------- trunk/dports/textproc/marisa-trie/ trunk/dports/textproc/marisa-trie/Portfile Added: trunk/dports/textproc/marisa-trie/Portfile =================================================================== --- trunk/dports/textproc/marisa-trie/Portfile (rev 0) +++ trunk/dports/textproc/marisa-trie/Portfile 2012-02-22 13:09:03 UTC (rev 90117) @@ -0,0 +1,41 @@ +# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4 +# $Id$ + +PortSystem 1.0 + +name marisa-trie +version 0.2.0-beta7 +categories textproc +maintainers hum openmaintainer + +description a static and space-efficient trie data structure +long_description Matching Algorithm with Recursively Implemented StorAge \ + (MARISA) is a static and space-efficient trie data structure. \ + And libmarisa is a C++ library to provide an implementation \ + of MARISA. Also, the package of libmarisa contains a set of \ + command line tools for building and operating a MARISA-based \ + dictionary. + +homepage http://code.google.com/p/marisa-trie/ +platforms darwin +license BSD + +master_sites googlecode +checksums rmd160 7f97ecc237b1e760281691f09c06396aaf108571 \ + sha256 97f0b2f376d5f386cab1f30f3caf384635eee0306e70a4a699ee3c85bb8d72fd + +distname marisa-${version} + +test.run yes +test.target check + +post-destroot { + set docdir ${prefix}/share/doc/${name} + xinstall -m 755 -d ${destroot}${docdir}/docs + xinstall -m 644 -W ${worksrcpath} \ + AUTHORS COPYING README \ + ${destroot}${docdir} + xinstall -m 644 -W ${worksrcpath}/docs \ + readme.en.html readme.ja.html style.css \ + ${destroot}${docdir}/docs +} Property changes on: trunk/dports/textproc/marisa-trie/Portfile ___________________________________________________________________ Added: svn:keywords + Id Added: svn:eol-style + native

1 0

[90106] trunk/dports/math/qhull
by mmoll＠macports.org 22 Feb '12

22 Feb '12

Revision: 90106 http://trac.macports.org/changeset/90106 Author: mmoll(a)macports.org Date: 2012-02-21 17:04:31 -0800 (Tue, 21 Feb 2012) Log Message: ----------- math/qhull: stealth update that incorporates now redundant patch. Closes #33314. Modified Paths: -------------- trunk/dports/math/qhull/Portfile Removed Paths: ------------- trunk/dports/math/qhull/files/patch-CMakeLists.txt.diff Modified: trunk/dports/math/qhull/Portfile =================================================================== --- trunk/dports/math/qhull/Portfile 2012-02-22 00:58:08 UTC (rev 90105) +++ trunk/dports/math/qhull/Portfile 2012-02-22 01:04:31 UTC (rev 90106) @@ -6,6 +6,7 @@ name qhull version 2012.1 +revision 1 categories math platforms darwin maintainers mmoll @@ -26,12 +27,11 @@ master_sites ${homepage}/download distname ${name}-${version}-src extract.suffix .tgz -checksums md5 ed81aa19b203aa0fdb75b41fe6f7a40f \ - sha1 7982ce08436d0b1797d311abd8944c35218639dc \ - rmd160 9923f5dc89d5dd79dd1a304cf5c9083f07291ccd -patchfiles patch-CMakeLists.txt.diff \ - patch-nested-const-iterator.diff -# last patch is for g++-4.0 / Leopard, see #31053 +checksums md5 710962448d0a5a01a798bb663443eb31 \ + sha1 65c9865bc56a173d223c9d7d230b12603c51a439 \ + rmd160 4c7d0e14ca2426e58709a862d2166b610348a3e4 +# patch for g++-4.0 / Leopard, see #31053 +patchfiles patch-nested-const-iterator.diff worksrcdir ${name}-${version} configure.args-append -DDOC_INSTALL_DIR=share/doc/qhull -DMAN_INSTALL_DIR=share/man/man1 post-destroot { Deleted: trunk/dports/math/qhull/files/patch-CMakeLists.txt.diff =================================================================== --- trunk/dports/math/qhull/files/patch-CMakeLists.txt.diff 2012-02-22 00:58:08 UTC (rev 90105) +++ trunk/dports/math/qhull/files/patch-CMakeLists.txt.diff 2012-02-22 01:04:31 UTC (rev 90106) @@ -1,44 +0,0 @@ ---- CMakeLists.txt.orig 2012-02-03 11:03:32.000000000 -0600 -+++ CMakeLists.txt 2012-02-03 11:03:47.000000000 -0600 -@@ -242,7 +242,6 @@ - qhull_TARGETS - ${qhull_CPP} ${qhull_STATIC} ${qhull_STATICP} ${qhull_SHARED} ${qhull_SHAREDP} - qhull rbox qconvex qdelaunay qvoronoi qhalf -- user_eg user_eg2 user_eg3 testqset - ) - - -@@ -342,33 +341,21 @@ - - add_executable(qhull ${qhull_SOURCES}) - target_link_libraries(qhull ${qhull_STATIC}) --set_target_properties(qhull PROPERTIES -- VERSION ${qhull_VERSION}) - - add_executable(rbox ${rbox_SOURCES}) - target_link_libraries(rbox ${qhull_STATIC}) --set_target_properties(rbox PROPERTIES -- VERSION ${qhull_VERSION}) - - add_executable(qconvex ${qconvex_SOURCES}) - target_link_libraries(qconvex ${qhull_STATIC}) --set_target_properties(qconvex PROPERTIES -- VERSION ${qhull_VERSION}) - - add_executable(qdelaunay ${qdelaunay_SOURCES}) - target_link_libraries(qdelaunay ${qhull_STATIC}) --set_target_properties(qdelaunay PROPERTIES -- VERSION ${qhull_VERSION}) - - add_executable(qvoronoi ${qvoronoi_SOURCES}) - target_link_libraries(qvoronoi ${qhull_STATIC}) --set_target_properties(qvoronoi PROPERTIES -- VERSION ${qhull_VERSION}) - - add_executable(qhalf ${qhalf_SOURCES}) - target_link_libraries(qhalf ${qhull_STATIC}) --set_target_properties(qhalf PROPERTIES -- VERSION ${qhull_VERSION}) - - # --------------------------------------- - # Define testqset linked to qset.o and mem.o

2 1

[90116] trunk/dports/mail/postfix/Portfile
by jmr＠macports.org 22 Feb '12

22 Feb '12

Revision: 90116 http://trac.macports.org/changeset/90116 Author: jmr(a)macports.org Date: 2012-02-22 03:44:11 -0800 (Wed, 22 Feb 2012) Log Message: ----------- postfix: update to 2.9.1 Modified Paths: -------------- trunk/dports/mail/postfix/Portfile Modified: trunk/dports/mail/postfix/Portfile =================================================================== --- trunk/dports/mail/postfix/Portfile 2012-02-22 11:03:00 UTC (rev 90115) +++ trunk/dports/mail/postfix/Portfile 2012-02-22 11:44:11 UTC (rev 90116) @@ -3,7 +3,7 @@ PortSystem 1.0 name postfix -version 2.9.0 +version 2.9.1 categories mail license IBMPL-1.0 maintainers jmr openmaintainer @@ -15,8 +15,8 @@ Postfix act as delivery daemon for ezmlm-idx. homepage http://www.postfix.org/ platforms darwin -checksums rmd160 0454dce2e82edb11f7e61f8038154c32a47bc605 \ - sha256 aed9b360eb74f46bfd6c6efe4eb724ce013cb8c6d4ad43888dd940aa2d33e6ec +checksums rmd160 5a97bcfe16a5ed343e449e73cde99c62b47c4aeb \ + sha256 d1dbe901f76ab6fd51f9c8c61eb46bd6fe0bc8b13823330e397eb1b00e940cbe master_sites http://archive.mgm51.com/mirrors/postfix-source/official/ \ http://de.postfix.org/ftpmirror/official/ \

1 0

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

22 Feb '12

Revision: 90115 http://trac.macports.org/changeset/90115 Author: jmr(a)macports.org Date: 2012-02-22 03:03:00 -0800 (Wed, 22 Feb 2012) Log Message: ----------- merge r90100, r90112 from trunk: * copy_xcode_plist: Fix misleading error messages, permissions need to be in octal, only print debug message about copying the plist if copying is actually attempted * 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 Revision Links: -------------- http://trac.macports.org/changeset/90100 http://trac.macports.org/changeset/90112 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,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,89894,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,89894,89988,89993-89994,90000,90002,90004,90010,90020,90054,90056,90058,90075,90082-90084,90088,90100,90107,90112 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,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,89894,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,89894,89988,89993-89994,90000,90002,90004,90010,90020,90032,90054,90056,90058,90075,90082-90084,90088,90100,90107,90112 /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 10:53:05 UTC (rev 90114) +++ branches/release_2_0/base/src/macports1.0/macports.tcl 2012-02-22 11:03:00 UTC (rev 90115) @@ -898,7 +898,7 @@ trace add variable macports::xcodebuildcmd read macports::setxcodeinfo } - if {[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) } @@ -1008,19 +1008,16 @@ if {[file isfile $user_plist]} { if {![file isdirectory "${target_dir}"]} { if {[catch {file mkdir "${target_dir}"} result]} { - ui_warn "Failed to create Library/Preferences in temporary home directory: $result" + ui_warn "Failed to create Library/Preferences in ${target_homedir}: $result" return } } - ui_debug "Copying $user_plist to temporary home directory ${target_dir}" 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 644 + 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 temporary home directory: $result" + ui_warn "Failed to copy com.apple.dt.Xcode.plist to ${target_dir}: $result" } } } @@ -1084,7 +1081,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: branches/release_2_0/base/src/port1.0/portutil.tcl =================================================================== --- branches/release_2_0/base/src/port1.0/portutil.tcl 2012-02-22 10:53:05 UTC (rev 90114) +++ branches/release_2_0/base/src/port1.0/portutil.tcl 2012-02-22 11:03:00 UTC (rev 90115) @@ -1567,10 +1567,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

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

22 Feb '12

Revision: 90114 http://trac.macports.org/changeset/90114 Author: jmr(a)macports.org Date: 2012-02-22 02:53:05 -0800 (Wed, 22 Feb 2012) Log Message: ----------- merge r89894 from trunk: fix incorrect case, "XCode" -> "Xcode" Revision Links: -------------- http://trac.macports.org/changeset/89894 Modified Paths: -------------- 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,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 + /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,89894,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,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 + /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,89894,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 10:43:03 UTC (rev 90113) +++ branches/release_2_0/base/src/port1.0/portutil.tcl 2012-02-22 10:53:05 UTC (rev 90114) @@ -2737,7 +2737,7 @@ 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"]} { + 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." } }

1 0