Revision: 81266 http://trac.macports.org/changeset/81266 Author: cal@macports.org Date: 2011-07-28 06:30:58 -0700 (Thu, 28 Jul 2011) Log Message: ----------- rev-upgrade: Merge from trunk Modified Paths: -------------- branches/gsoc11-rev-upgrade/base/ChangeLog branches/gsoc11-rev-upgrade/base/Makefile.in branches/gsoc11-rev-upgrade/base/aclocal.m4 branches/gsoc11-rev-upgrade/base/config/RELEASE_URL branches/gsoc11-rev-upgrade/base/config/macports_version branches/gsoc11-rev-upgrade/base/configure branches/gsoc11-rev-upgrade/base/configure.ac branches/gsoc11-rev-upgrade/base/portmgr/ReleaseProcess branches/gsoc11-rev-upgrade/base/portmgr/dmg/postflight branches/gsoc11-rev-upgrade/base/portmgr/jobs/port_binary_distributable.tcl branches/gsoc11-rev-upgrade/base/src/darwintracelib1.0/Makefile branches/gsoc11-rev-upgrade/base/src/machista1.0/Makefile.in branches/gsoc11-rev-upgrade/base/src/macports1.0/macports.tcl branches/gsoc11-rev-upgrade/base/src/package1.0/portarchivefetch.tcl branches/gsoc11-rev-upgrade/base/src/package1.0/portpkg.tcl branches/gsoc11-rev-upgrade/base/src/pextlib1.0/tests/curl.tcl branches/gsoc11-rev-upgrade/base/src/port/port.tcl branches/gsoc11-rev-upgrade/base/src/port1.0/port_autoconf.tcl.in branches/gsoc11-rev-upgrade/base/src/port1.0/portclean.tcl branches/gsoc11-rev-upgrade/base/src/port1.0/portconfigure.tcl branches/gsoc11-rev-upgrade/base/src/port1.0/portlivecheck.tcl branches/gsoc11-rev-upgrade/base/src/port1.0/portutil.tcl branches/gsoc11-rev-upgrade/base/src/registry2.0/portimage.tcl Property Changed: ---------------- branches/gsoc11-rev-upgrade/base/ branches/gsoc11-rev-upgrade/base/portmgr/fedora/macports.spec branches/gsoc11-rev-upgrade/base/src/pextlib1.0/sha2.c branches/gsoc11-rev-upgrade/base/src/pextlib1.0/sha2.h branches/gsoc11-rev-upgrade/base/src/pextlib1.0/sha256cmd.c branches/gsoc11-rev-upgrade/base/src/pextlib1.0/sha256cmd.h branches/gsoc11-rev-upgrade/base/src/registry2.0/receipt_sqlite.tcl Property changes on: branches/gsoc11-rev-upgrade/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:78828-80185 /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:78828-81265 /users/perry/base-bugs_and_notes:45682-46060 /users/perry/base-select:44044-44692 Modified: branches/gsoc11-rev-upgrade/base/ChangeLog =================================================================== --- branches/gsoc11-rev-upgrade/base/ChangeLog 2011-07-28 13:18:42 UTC (rev 81265) +++ branches/gsoc11-rev-upgrade/base/ChangeLog 2011-07-28 13:30:58 UTC (rev 81266) @@ -3,7 +3,7 @@ # $Id$ ### -Release 2.0.0 (unreleased): +Release 2.0.0 (2011-07-22 by jmr): - Multiple ports can now be defined in one Portfile using the 'subport' procedure. This reduces code duplication when several ports use very Modified: branches/gsoc11-rev-upgrade/base/Makefile.in =================================================================== --- branches/gsoc11-rev-upgrade/base/Makefile.in 2011-07-28 13:18:42 UTC (rev 81265) +++ branches/gsoc11-rev-upgrade/base/Makefile.in 2011-07-28 13:30:58 UTC (rev 81266) @@ -39,7 +39,7 @@ ifeq ($(DESTDIR),) # create run user if it doesn't exist @if test -n "${DSCL}" -a -n "${DSEDITGROUP}" ; then \ - if ! ${DSEDITGROUP} -q -o read ${RUNUSR} > /dev/null 2>&1 ; then \ + if ! ${DSCL} -q . -read /Groups/${RUNUSR} > /dev/null 2>&1 ; then \ if test `id -u` -eq 0; then \ echo "Creating group \"${RUNUSR}\"" ; \ ${DSEDITGROUP} -q -o create -n . ${RUNUSR} ; \ Modified: branches/gsoc11-rev-upgrade/base/aclocal.m4 =================================================================== --- branches/gsoc11-rev-upgrade/base/aclocal.m4 2011-07-28 13:18:42 UTC (rev 81265) +++ branches/gsoc11-rev-upgrade/base/aclocal.m4 2011-07-28 13:30:58 UTC (rev 81266) @@ -335,7 +335,7 @@ # Set Tcl package directory to ~/Library/Tcl AC_MSG_CHECKING(for Tcl package directory) - ac_cv_c_tclpkgd="~$DSTUSR/Library/Tcl" + ac_cv_c_tclpkgd=`eval echo ~$DSTUSR/Library/Tcl` # Convert to a native path and substitute into the output files. PACKAGE_DIR_NATIVE=`${CYGPATH} ${ac_cv_c_tclpkgd}` TCL_PACKAGE_DIR=${PACKAGE_DIR_NATIVE} @@ -646,7 +646,7 @@ fi fi elif test "$path" = "~/Library/Tcl"; then - ac_cv_c_tclpkgd="~$DSTUSR/Library/Tcl" + ac_cv_c_tclpkgd=`eval echo ~$DSTUSR/Library/Tcl` break fi done Modified: branches/gsoc11-rev-upgrade/base/config/RELEASE_URL =================================================================== --- branches/gsoc11-rev-upgrade/base/config/RELEASE_URL 2011-07-28 13:18:42 UTC (rev 81265) +++ branches/gsoc11-rev-upgrade/base/config/RELEASE_URL 2011-07-28 13:30:58 UTC (rev 81266) @@ -1 +1 @@ -https://svn.macports.org/repository/macports/tags/release_1_9_2/base +https://svn.macports.org/repository/macports/tags/release_2_0_0/base Modified: branches/gsoc11-rev-upgrade/base/config/macports_version =================================================================== --- branches/gsoc11-rev-upgrade/base/config/macports_version 2011-07-28 13:18:42 UTC (rev 81265) +++ branches/gsoc11-rev-upgrade/base/config/macports_version 2011-07-28 13:30:58 UTC (rev 81266) @@ -1 +1 @@ -1.9.99 +2.0.99 Modified: branches/gsoc11-rev-upgrade/base/configure =================================================================== --- branches/gsoc11-rev-upgrade/base/configure 2011-07-28 13:18:42 UTC (rev 81265) +++ branches/gsoc11-rev-upgrade/base/configure 2011-07-28 13:30:58 UTC (rev 81266) @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for MacPorts 1.9.99. +# Generated by GNU Autoconf 2.68 for MacPorts 2.0.99. # # Report bugs to <macports-dev@lists.macosforge.org>. # @@ -560,8 +560,8 @@ # Identity of this package. PACKAGE_NAME='MacPorts' PACKAGE_TARNAME='macports' -PACKAGE_VERSION='1.9.99' -PACKAGE_STRING='MacPorts 1.9.99' +PACKAGE_VERSION='2.0.99' +PACKAGE_STRING='MacPorts 2.0.99' PACKAGE_BUGREPORT='macports-dev@lists.macosforge.org' PACKAGE_URL='' @@ -684,6 +684,8 @@ PAX MKBOM LSBOM +XZ +LZMA BZIP2 GNUPATCH GNUMAKE @@ -838,6 +840,8 @@ BSDMAKE GNUMAKE BZIP2 +LZMA +XZ XAR OPEN SWIG @@ -1385,7 +1389,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures MacPorts 1.9.99 to adapt to many kinds of systems. +\`configure' configures MacPorts 2.0.99 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1451,7 +1455,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of MacPorts 1.9.99:";; + short | recursive ) echo "Configuration of MacPorts 2.0.99:";; esac cat <<\_ACEOF @@ -1523,6 +1527,8 @@ BSDMAKE path to bsdmake/pmake command GNUMAKE path to gnumake command BZIP2 path to bzip2 command + LZMA path to lzma command + XZ path to xz command XAR path to xar command OPEN path to open command SWIG path to swig command @@ -1595,7 +1601,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -MacPorts configure 1.9.99 +MacPorts configure 2.0.99 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2264,7 +2270,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by MacPorts $as_me 1.9.99, which was +It was created by MacPorts $as_me 2.0.99, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2759,7 +2765,7 @@ # Read in the MacPorts version from the base/config/macports_version file { $as_echo "$as_me:${as_lineno-$LINENO}: checking MacPorts version" >&5 $as_echo_n "checking MacPorts version... " >&6; } -MACPORTS_VERSION=1.9.99 +MACPORTS_VERSION=2.0.99 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MACPORTS_VERSION" >&5 $as_echo "$MACPORTS_VERSION" >&6; } @@ -2925,7 +2931,7 @@ as_fn_error $? "This version of Mac OS X is not supported Please upgrade at http://store.apple.com/" "$LINENO" 5 ;; - 10.4.[0-9]|10.4.10|10.5.[0-7]|10.6.[0-6]) + 10.4.[0-9]|10.4.10|10.5.[0-7]|10.6.[0-7]) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This version of Mac OS X is out of date" >&5 $as_echo "$as_me: WARNING: This version of Mac OS X is out of date" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Please run Software Update to update it" >&5 @@ -5500,6 +5506,86 @@ fi +# Extract the first word of "lzma", so it can be a program name with args. +set dummy lzma; 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_LZMA+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $LZMA in + [\\/]* | ?:[\\/]*) + ac_cv_path_LZMA="$LZMA" # 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_LZMA="$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 +LZMA=$ac_cv_path_LZMA +if test -n "$LZMA"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LZMA" >&5 +$as_echo "$LZMA" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +# Extract the first word of "xz", so it can be a program name with args. +set dummy xz; 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_XZ+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $XZ in + [\\/]* | ?:[\\/]*) + ac_cv_path_XZ="$XZ" # 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_XZ="$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 +XZ=$ac_cv_path_XZ +if test -n "$XZ"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XZ" >&5 +$as_echo "$XZ" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + # Extract the first word of "lsbom", so it can be a program name with args. set dummy lsbom; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 @@ -5760,6 +5846,8 @@ + + # Extract the first word of "sed", so it can be a program name with args. set dummy sed; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 @@ -7787,7 +7875,7 @@ # Set Tcl package directory to ~/Library/Tcl { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Tcl package directory" >&5 $as_echo_n "checking for Tcl package directory... " >&6; } - ac_cv_c_tclpkgd="~$DSTUSR/Library/Tcl" + ac_cv_c_tclpkgd=`eval echo ~$DSTUSR/Library/Tcl` # Convert to a native path and substitute into the output files. PACKAGE_DIR_NATIVE=`${CYGPATH} ${ac_cv_c_tclpkgd}` TCL_PACKAGE_DIR=${PACKAGE_DIR_NATIVE} @@ -9250,7 +9338,7 @@ fi fi elif test "$path" = "~/Library/Tcl"; then - ac_cv_c_tclpkgd="~$DSTUSR/Library/Tcl" + ac_cv_c_tclpkgd=`eval echo ~$DSTUSR/Library/Tcl` break fi done @@ -10218,7 +10306,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by MacPorts $as_me 1.9.99, which was +This file was extended by MacPorts $as_me 2.0.99, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -10280,7 +10368,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -MacPorts config.status 1.9.99 +MacPorts config.status 2.0.99 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" Modified: branches/gsoc11-rev-upgrade/base/configure.ac =================================================================== --- branches/gsoc11-rev-upgrade/base/configure.ac 2011-07-28 13:18:42 UTC (rev 81265) +++ branches/gsoc11-rev-upgrade/base/configure.ac 2011-07-28 13:30:58 UTC (rev 81266) @@ -32,7 +32,7 @@ AC_MSG_ERROR([This version of Mac OS X is not supported Please upgrade at http://store.apple.com/]) ;; - 10.4.[[0-9]]|10.4.10|10.5.[[0-7]]|10.6.[[0-6]]) + 10.4.[[0-9]]|10.4.10|10.5.[[0-7]]|10.6.[[0-7]]) AC_MSG_WARN([This version of Mac OS X is out of date]) AC_MSG_WARN([Please run Software Update to update it]) ;; @@ -119,6 +119,8 @@ AC_PATH_PROGS(GNUMAKE, [gnumake gmake], [], [$PATH:/usr/local/bin]) AC_PATH_PROGS(GNUPATCH, [gnupatch gpatch], [], [$PATH:/usr/local/bin]) AC_PATH_PROG(BZIP2, [bzip2], []) +AC_PATH_PROG(LZMA, [lzma], []) +AC_PATH_PROG(XZ, [xz], []) AC_PATH_PROG(LSBOM, [lsbom], []) AC_PATH_PROG(MKBOM, [mkbom], []) AC_PATH_PROG(PAX, [pax], []) @@ -139,6 +141,8 @@ AC_ARG_VAR(BSDMAKE, [path to bsdmake/pmake command]) AC_ARG_VAR(GNUMAKE, [path to gnumake command]) AC_ARG_VAR(BZIP2, [path to bzip2 command]) +AC_ARG_VAR(LZMA, [path to lzma command]) +AC_ARG_VAR(XZ, [path to xz command]) AC_ARG_VAR(XAR, [path to xar command]) AC_ARG_VAR(OPEN, [path to open command]) AC_ARG_VAR(SWIG, [path to swig command]) Modified: branches/gsoc11-rev-upgrade/base/portmgr/ReleaseProcess =================================================================== --- branches/gsoc11-rev-upgrade/base/portmgr/ReleaseProcess 2011-07-28 13:18:42 UTC (rev 81265) +++ branches/gsoc11-rev-upgrade/base/portmgr/ReleaseProcess 2011-07-28 13:30:58 UTC (rev 81266) @@ -31,17 +31,17 @@ === Create a Release Branch === -For each major release (i.e. 1.5.x, 1.6.x, etc.) an appropriate branch is created with a +For each major release (i.e. 1.9.x, 2.0.x, etc.) an appropriate branch is created with a consistent name. To do this, two things are required: * Choose the svn revision from which to create the branch, most likely based off trunk. - * Create the branch (e.g. release_1_6) through the svn "copy" command for history preservation, + * Create the branch (e.g. release_2_0) through the svn "copy" command for history preservation, first creating the needed branch directory to preserve the required directory structure (the 'base' directory level *needs* to exist in each release branch, otherwise selfupdate breaks): - svn mkdir -m "commit-message" https://svn.macports.org/repository/macports/branches/release_1_6 + svn mkdir -m "commit-message" https://svn.macports.org/repository/macports/branches/release_2_0 svn cp [-r<rev>] -m "commit-message" https://svn.macports.org/repository/macports/trunk/base \ - https://svn.macports.org/repository/macports/branches/release_1_6 + https://svn.macports.org/repository/macports/branches/release_2_0 The actual release, alpha or beta releases, release candidates, and any point releases will all live on this branch, and tagged appropriately and if necessary (a must for the actual releases, @@ -81,19 +81,20 @@ Tagging conventions: - * release_1_6_0-rc1 (release candidate 1 for release 1.6.0) - * release_1_6_0 (tagged release 1.6.0) - * release_1_6_0-archive (tagged release 1.6.0 -- complete archive) - * release_1_6_1 (1.6.1 release) + * release_2_0_0-beta2 (beta 2 for release 2.0.0) + * release_2_0_0-rc1 (release candidate 1 for release 2.0.0) + * release_2_0_0 (tagged release 2.0.0) + * release_2_0_0-archive (tagged release 2.0.0 -- complete archive) + * release_2_0_1 (2.0.1 release) We first tag the branched base directory to make up the final release: - svn cp -m "commit-message" https://svn.macports.org/repository/macports/branches/release_1_6 \ - https://svn.macports.org/repository/macports/tags/release_1_6_0 + svn cp -m "commit-message" https://svn.macports.org/repository/macports/branches/release_2_0 \ + https://svn.macports.org/repository/macports/tags/release_2_0_0 Although only the base subdirectory is branched and tagged for a given major release, we also create a separate tag for the entire tree (base sources and full ports tree) at the time the final release tag is -created (only for major releases, 1.x.0), in order to provide a stake in the ground that specifies a set +created (only for major releases, x.y.0), in order to provide a stake in the ground that specifies a set of ports intended to work with that release. Note that this tag incorporates the entire svn trunk directory at the revision number at which the final release was tagged. @@ -101,14 +102,14 @@ revision of the final tagging of base and then switching the base directory to the appropriate release tag URL. For instance: - svn co [-r<rev>] https://svn.macports.org/repository/macports/trunk release_1.6.0-archive - cd release_1.6.0-archive/base - svn switch https://svn.macports.org/repository/macports/tags/release_1_6_0/base + svn co [-r<rev>] https://svn.macports.org/repository/macports/trunk release_2.0.0-archive + cd release_2.0.0-archive/base + svn switch https://svn.macports.org/repository/macports/tags/release_2_0_0/base -And finally we tag the entire directory as release_1_6_0-archive: +And finally we tag the entire directory as release_2_0_0-archive: cd ../../ - svn cp -m "commit-message" release_1.6.0-archive https://svn.macports.org/repository/macports/tags/release_1_6_0-archive + svn cp -m "commit-message" release_2.0.0-archive https://svn.macports.org/repository/macports/tags/release_2_0_0-archive === Create & Post Release Tarballs === @@ -116,12 +117,12 @@ The release tarballs are tar.bz2 and tar.gz archives of the base directory only and of the entire svn tree for a particular release. They are named with the following naming convention: - MacPorts-1.6.0.tar.{bz2,gz} (base directory only, corresponding to tag release_1_6_0) - MacPorts-1.6.0-archive.tar.{bz2,gz} (complete archives corresponding to tag release_1_6_0-archive) + MacPorts-2.0.0.tar.{bz2,gz} (base directory only, corresponding to tag release_2_0_0) + MacPorts-2.0.0-archive.tar.{bz2,gz} (complete archives corresponding to tag release_2_0_0-archive) The following commands issued to the top level Makefile will generate all the tarballs and checksums: - make ARC=yes DISTVER=1.6.0 distfromsvn + make ARC=yes DISTVER=2.0.0 distfromsvn Note that if you omit the "ARC=yes" flag at the start of the make call then the full archive tarballs will not be produced. @@ -131,7 +132,7 @@ Additionally, a file is created, and posted to the same location, that contains md5, sha1, and rmd160 checksums for each of the files: - MacPorts-1.6.0.chk.txt + MacPorts-2.0.0.chk.txt (We should have a way to sign these checksums, and have the signer's keys posted somewhere. Security experts in the project, would you be interested in leading this effort? Eric? Mark? Anyone else?) @@ -139,11 +140,12 @@ === Create Release Disk Image(s) === The dmg is a Mac OS X disk image that contains a standalone installer, configured in the usual way, for major -MacPorts releases (1.x.0), named in a consistent fashion and incorporating the OS version for which it +MacPorts releases (x.y.0), named in a consistent fashion and incorporating the OS version for which it was built. - MacPorts-1.6.0-10.4-Tiger.dmg - MacPorts-1.6.0-10.5-Leopard.dmg + MacPorts-2.0.0-10.5-Leopard.dmg + MacPorts-2.0.0-10.6-SnowLeopard.dmg + MacPorts-2.0.0-10.7-Lion.dmg To create a disk image, use the MacPorts port. The Portfile will need to be updated to incorporate the proper release version and checksums, and the release tarballs will need to be already uploaded to the @@ -156,8 +158,8 @@ file in the downloads directory: cd work - mv MacPorts-1.6.0.dmg MacPorts-1.6.0-10.5-Leopard.dmg - for dmg in MacPorts-1.6.0-*.dmg; do for type in -md5 -sha1 -ripemd160 -sha256; do openssl dgst $type $dmg; done >> MacPorts-1.6.0.chk.txt; done + mv MacPorts-2.0.0.dmg MacPorts-2.0.0-10.6-SnowLeopard.dmg + for dmg in MacPorts-2.0.0-*.dmg; do for type in -md5 -sha1 -ripemd160 -sha256; do openssl dgst $type $dmg; done >> MacPorts-2.0.0.chk.txt; done These new products, along with the new checksums, also have to be posted to the appropriate directory of the MacPorts distfiles server. Developers are required to validate the generated installer as @@ -207,7 +209,7 @@ === Update trunk's version for next release === Once trunk is to be used for development of the next major version, increase its version information to -indicate it's moved past the release version by setting the patch-level version to 99, e.g., 1.8.99 (in +indicate it's moved past the release version by setting the patch-level version to 99, e.g. 2.0.99 (in trunk/base/config/macports_version). Modified: branches/gsoc11-rev-upgrade/base/portmgr/dmg/postflight =================================================================== --- branches/gsoc11-rev-upgrade/base/portmgr/dmg/postflight 2011-07-28 13:18:42 UTC (rev 81265) +++ branches/gsoc11-rev-upgrade/base/portmgr/dmg/postflight 2011-07-28 13:30:58 UTC (rev 81266) @@ -36,7 +36,7 @@ #set -x # Script identification ('cause more often than not the svn Id is not expanded): -VERSION=1.9.0 +VERSION=2.0.0 # Abstraction variables: PREFIX=__PREFIX__ @@ -136,13 +136,13 @@ # create the user to use for privilege dropping function create_run_user { DSEDITGROUP=/usr/sbin/dseditgroup - if ! ${DSEDITGROUP} -q -o read ${RUNUSR} > /dev/null 2>&1 ; then + if ! ${DSCL} -q . -read /Groups/${RUNUSR} > /dev/null 2>&1 ; then echo "Creating group \"${RUNUSR}\"" ${DSEDITGROUP} -q -o create -n . ${RUNUSR} fi if ! ${DSCL} -q . -list /Users/${RUNUSR} > /dev/null 2>&1 ; then echo "Creating user \"${RUNUSR}\"" - ${DSCL} -q . -create /Users/${RUNUSR} Password * + ${DSCL} -q . -create /Users/${RUNUSR} Password \* ${DSCL} -q . -create /Users/${RUNUSR} UniqueID $(($(${DSCL} . -list /Users UniqueID | /usr/bin/awk '{print $2}' | sort -ug | tail -1)+1)) ${DSCL} -q . -create /Users/${RUNUSR} PrimaryGroupID $(${DSCL} -q . -read /Groups/${RUNUSR} PrimaryGroupID | /usr/bin/awk '{print $2}') ${DSCL} -q . -create /Users/${RUNUSR} NFSHomeDirectory /var/empty @@ -152,6 +152,8 @@ echo "The MacPorts Project, postflight script version ${VERSION}: checking the shell environment for user \"${USER}\"." +# create macports user +create_run_user # Set up config files setup_configs # link macports1.0 pkg Property changes on: branches/gsoc11-rev-upgrade/base/portmgr/fedora/macports.spec ___________________________________________________________________ Modified: svn:mergeinfo - /branches/gsoc08-privileges/base/portmgr/fedora/macports.spec:37343-46937 /branches/universal-sanity/base/portmgr/fedora/macports.spec:51872-52323 /branches/variant-descs-14482/base/portmgr/fedora/macports.spec:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base/portmgr/fedora/macports.spec:78828-80185 /trunk/base/portmgr/fedora/macports.spec.in:30388-57826 /users/perry/base-bugs_and_notes/portmgr/fedora/macports.spec:45682-46060 /users/perry/base-select/portmgr/fedora/macports.spec:44044-44692 + /branches/gsoc08-privileges/base/portmgr/fedora/macports.spec:37343-46937 /branches/universal-sanity/base/portmgr/fedora/macports.spec:51872-52323 /branches/variant-descs-14482/base/portmgr/fedora/macports.spec:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base/portmgr/fedora/macports.spec:78828-81265 /trunk/base/portmgr/fedora/macports.spec.in:30388-57826 /users/perry/base-bugs_and_notes/portmgr/fedora/macports.spec:45682-46060 /users/perry/base-select/portmgr/fedora/macports.spec:44044-44692 Modified: branches/gsoc11-rev-upgrade/base/portmgr/jobs/port_binary_distributable.tcl =================================================================== --- branches/gsoc11-rev-upgrade/base/portmgr/jobs/port_binary_distributable.tcl 2011-07-28 13:18:42 UTC (rev 81265) +++ branches/gsoc11-rev-upgrade/base/portmgr/jobs/port_binary_distributable.tcl 2011-07-28 13:30:58 UTC (rev 81266) @@ -20,28 +20,51 @@ set check_deptypes {depends_build depends_lib} -set good_licenses {agpl apache apsl artistic boost bsd cecill cpl curl \ - fontconfig freebsd freetype gfdl gpl ibmpl ijg jasper \ - lgpl libpng mit mpl openssl php psf qpl public-domain \ - ruby sleepycat ssleay x11 zlib zpl} + +# Notes: +# 'Restrictive/Distributable' means a non-free license that nonetheless allows +# distributing binaries. +# 'Restrictive' means a non-free license that does not allow distributing +# binaries, and is thus not in the list. +# 'Permissive' is a catchall for other licenses that allow +# modification and distribution of source and binaries. +# 'Copyleft' means a license that requires source code to be made available, +# and derivative works to be licensed the same as the original. +# 'GPLConflict' should be added if the license conflicts with the GPL (and its +# variants like CeCILL and the AGPL) and is not in the list of licenses known +# to do so below. +# 'Noncommercial' means a license that prohibits commercial use. +set good_licenses {agpl apache apsl artistic autoconf boost bsd cecill copyleft cpl + curl fontconfig freebsd freetype gfdl gpl gplconflict ibmpl ijg + jasper lgpl libpng libtool mit mpl noncommercial openssl permissive + php psf qpl public-domain restrictive/distributable ruby sleepycat + ssleay tcl/tk x11 zlib zpl} foreach lic $good_licenses { set license_good($lic) 1 } # keep these values sorted array set license_conflicts \ - {agpl {cecill gpl} \ - apache {cecill gpl} \ - apsl {cecill gpl} \ - cpl {cecill gpl} \ - cecill {agpl apache apsl cpl ibmpl mpl openssl php qpl ssleay zpl-1} \ - freetype {gpl-2} \ - gpl {agpl apache apsl cpl ibmpl mpl openssl php qpl ssleay zpl-1} \ - gpl-2 {freetype} \ - ibmpl {cecill gpl} \ - mpl {cecill gpl} \ - openssl {cecill gpl} \ - php {cecill gpl} \ - qpl {cecill gpl} \ + {agpl {apache-1 apache-1.1 cecill gpl-1 gpl-2 gplconflict noncommercial restrictive/distributable} + apache {cecill gpl-1 gpl-2} + apache-1 {agpl gpl} + apache-1.1 {agpl gpl} + apsl {cecill gpl} + cpl {cecill gpl} + cecill {agpl apache apsl cpl gplconflict ibmpl mpl noncommercial openssl php qpl restrictive/distributable ssleay zpl-1} + freetype {gpl-2} + gpl {agpl apache-1 apache-1.1 apsl cpl gplconflict ibmpl mpl noncommercial openssl php qpl restrictive/distributable ssleay zpl-1} + gpl-1 {apache gpl-3 gpl-3+ lgpl-3 lgpl-3+} + gpl-2 {apache freetype gpl-3 gpl-3+ lgpl-3 lgpl-3+} + gpl-3 {gpl-1 gpl-2} + gpl-3+ {gpl-1 gpl-2} + ibmpl {cecill gpl} + lgpl-3 {gpl-1 gpl-2} + lgpl-3+ {gpl-1 gpl-2} + mpl {cecill gpl} + openssl {cecill gpl} + php {cecill gpl} + qpl {cecill gpl} + restrictive/distributable {agpl cecill gpl} ssleay {cecill gpl} zpl-1 {cecill gpl}} Modified: branches/gsoc11-rev-upgrade/base/src/darwintracelib1.0/Makefile =================================================================== --- branches/gsoc11-rev-upgrade/base/src/darwintracelib1.0/Makefile 2011-07-28 13:18:42 UTC (rev 81265) +++ branches/gsoc11-rev-upgrade/base/src/darwintracelib1.0/Makefile 2011-07-28 13:30:58 UTC (rev 81266) @@ -6,7 +6,7 @@ include ../../Mk/macports.autoconf.mk -CFLAGS+= -fPIC +CFLAGS+= -fPIC -Wno-deprecated-declarations all:: ${SHLIB_NAME} Modified: branches/gsoc11-rev-upgrade/base/src/machista1.0/Makefile.in =================================================================== --- branches/gsoc11-rev-upgrade/base/src/machista1.0/Makefile.in 2011-07-28 13:18:42 UTC (rev 81265) +++ branches/gsoc11-rev-upgrade/base/src/machista1.0/Makefile.in 2011-07-28 13:30:58 UTC (rev 81266) @@ -47,6 +47,6 @@ ${TESTS} # FIXME: This is broken -tests/libmachista-test: tests/libmachista-test.c libmachista.h libmachista$(SHLIB_SUFFIX) +tests/libmachista-test: tests/libmachista-test.c libmachista.h ${SHLIB_NAME} $(CC) $(CFLAGS) -D_POSIX_SOURCE -o $@ -I. -L. -lmachista $< Modified: branches/gsoc11-rev-upgrade/base/src/macports1.0/macports.tcl =================================================================== --- branches/gsoc11-rev-upgrade/base/src/macports1.0/macports.tcl 2011-07-28 13:18:42 UTC (rev 81265) +++ branches/gsoc11-rev-upgrade/base/src/macports1.0/macports.tcl 2011-07-28 13:30:58 UTC (rev 81266) @@ -491,6 +491,8 @@ } else { # Otherwise define the user directory as a direcotory that will never exist set macports::macports_user_dir "/dev/null/NO_HOME_DIR" + # Tcl library code wants to do tilde expansion in various places + set env(HOME) ${macports::macports_user_dir} } # set up platform info variables @@ -847,6 +849,9 @@ } } + # make tools we run operate in UTF-8 mode + set env(LANG) en_US.UTF-8 + if {![info exists xcodeversion] || ![info exists xcodebuildcmd]} { # We'll resolve these later (if needed) trace add variable macports::xcodeversion read macports::setxcodeinfo @@ -954,7 +959,7 @@ global registry_open set registry_open yes # convert any flat receipts if we just created a new db - if {$db_exists == 0 && [file writable $db_path]} { + if {$db_exists == 0 && [file exists ${registry.path}/receipts] && [file writable $db_path]} { ui_warn "Converting your registry to sqlite format, this might take a while..." if {[catch {registry::convert_to_sqlite}]} { ui_debug "$::errorInfo" @@ -1595,6 +1600,7 @@ macports::push_log $mport # xxx: set the work path? set workername [ditem_key $mport workername] + $workername eval validate_macportsuser if {![catch {$workername eval check_variants $target} result] && $result == 0 && ![catch {$workername eval check_supported_archs} result] && $result == 0 && ![catch {$workername eval eval_targets $target} result] && $result == 0} { Modified: branches/gsoc11-rev-upgrade/base/src/package1.0/portarchivefetch.tcl =================================================================== --- branches/gsoc11-rev-upgrade/base/src/package1.0/portarchivefetch.tcl 2011-07-28 13:18:42 UTC (rev 81265) +++ branches/gsoc11-rev-upgrade/base/src/package1.0/portarchivefetch.tcl 2011-07-28 13:30:58 UTC (rev 81266) @@ -66,6 +66,10 @@ proc portarchivefetch::filter_sites {} { global prefix porturl + set mirrorfile [get_full_archive_sites_path] + if {[file exists $mirrorfile]} { + source $mirrorfile + } set ret {} foreach site [array names portfetch::mirror_sites::archive_prefix] { if {$portfetch::mirror_sites::archive_prefix($site) == $prefix} { @@ -74,6 +78,7 @@ } if {[file rootname [file tail $porturl]] == [file rootname [file tail [get_portimage_path]]]} { lappend ret [string range $porturl 0 end-[string length [file tail $porturl]]] + archive.subdir } return $ret } @@ -93,16 +98,10 @@ # throws an error if unsupported archiveTypeIsSupported $portarchivetype - if {[file isfile ${archive.path}]} { - ui_debug "Found archive: ${archive.path}" - set all_archive_files {} - set fetch_urls {} - } else { - set archive.file [file tail ${archive.path}] - lappend all_archive_files ${archive.file} - if {[info exists archive_sites]} { - lappend fetch_urls archive_sites ${archive.file} - } + set archive.file [file tail ${archive.path}] + lappend all_archive_files ${archive.file} + if {[info exists archive_sites]} { + lappend fetch_urls archive_sites ${archive.file} } } Modified: branches/gsoc11-rev-upgrade/base/src/package1.0/portpkg.tcl =================================================================== --- branches/gsoc11-rev-upgrade/base/src/package1.0/portpkg.tcl 2011-07-28 13:18:42 UTC (rev 81265) +++ branches/gsoc11-rev-upgrade/base/src/package1.0/portpkg.tcl 2011-07-28 13:30:58 UTC (rev 81266) @@ -56,6 +56,10 @@ ui_msg "$UI_PREFIX [format [msgcat::mc "Creating pkg for %s-%s"] ${subport} ${version}]" + if {[getuid] == 0 && [geteuid] != 0} { + elevateToRoot "pkg" + } + return [package_pkg $subport $version $revision] } Property changes on: branches/gsoc11-rev-upgrade/base/src/pextlib1.0/sha2.c ___________________________________________________________________ Modified: svn:mergeinfo - /branches/gsoc08-privileges/base/src/pextlib1.0/sha2.c:37343-46937 /branches/universal-sanity/base/src/pextlib1.0/sha2.c:51872-52323 /branches/variant-descs-14482/base/src/pextlib1.0/sha2.c:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base/src/pextlib1.0/sha2.c:78828-80185 /users/perry/base-bugs_and_notes/src/pextlib1.0/sha2.c:45682-46060 /users/perry/base-select/src/pextlib1.0/sha2.c:44044-44692 + /branches/gsoc08-privileges/base/src/pextlib1.0/sha2.c:37343-46937 /branches/universal-sanity/base/src/pextlib1.0/sha2.c:51872-52323 /branches/variant-descs-14482/base/src/pextlib1.0/sha2.c:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base/src/pextlib1.0/sha2.c:78828-81265 /users/perry/base-bugs_and_notes/src/pextlib1.0/sha2.c:45682-46060 /users/perry/base-select/src/pextlib1.0/sha2.c:44044-44692 Property changes on: branches/gsoc11-rev-upgrade/base/src/pextlib1.0/sha2.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/gsoc08-privileges/base/src/pextlib1.0/sha2.h:37343-46937 /branches/universal-sanity/base/src/pextlib1.0/sha2.h:51872-52323 /branches/variant-descs-14482/base/src/pextlib1.0/sha2.h:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base/src/pextlib1.0/sha2.h:78828-80185 /users/perry/base-bugs_and_notes/src/pextlib1.0/sha2.h:45682-46060 /users/perry/base-select/src/pextlib1.0/sha2.h:44044-44692 + /branches/gsoc08-privileges/base/src/pextlib1.0/sha2.h:37343-46937 /branches/universal-sanity/base/src/pextlib1.0/sha2.h:51872-52323 /branches/variant-descs-14482/base/src/pextlib1.0/sha2.h:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base/src/pextlib1.0/sha2.h:78828-81265 /users/perry/base-bugs_and_notes/src/pextlib1.0/sha2.h:45682-46060 /users/perry/base-select/src/pextlib1.0/sha2.h:44044-44692 Property changes on: branches/gsoc11-rev-upgrade/base/src/pextlib1.0/sha256cmd.c ___________________________________________________________________ Modified: svn:mergeinfo - /branches/gsoc08-privileges/base/src/pextlib1.0/rmd160cmd.c:37343-46937 /branches/gsoc09-logging/base/src/pextlib1.0/sha256cmd.c:51231-60371 /branches/universal-sanity/base/src/pextlib1.0/rmd160cmd.c:51872-52323 /branches/variant-descs-14482/base/src/pextlib1.0/rmd160cmd.c:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base/src/pextlib1.0/sha256cmd.c:78828-80185 /users/perry/base-bugs_and_notes/src/pextlib1.0/rmd160cmd.c:45682-46060 /users/perry/base-select/src/pextlib1.0/rmd160cmd.c:44044-44692 + /branches/gsoc08-privileges/base/src/pextlib1.0/rmd160cmd.c:37343-46937 /branches/gsoc09-logging/base/src/pextlib1.0/sha256cmd.c:51231-60371 /branches/universal-sanity/base/src/pextlib1.0/rmd160cmd.c:51872-52323 /branches/variant-descs-14482/base/src/pextlib1.0/rmd160cmd.c:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base/src/pextlib1.0/sha256cmd.c:78828-81265 /users/perry/base-bugs_and_notes/src/pextlib1.0/rmd160cmd.c:45682-46060 /users/perry/base-select/src/pextlib1.0/rmd160cmd.c:44044-44692 Property changes on: branches/gsoc11-rev-upgrade/base/src/pextlib1.0/sha256cmd.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/gsoc08-privileges/base/src/pextlib1.0/rmd160cmd.h:37343-46937 /branches/gsoc09-logging/base/src/pextlib1.0/sha256cmd.h:51231-60371 /branches/universal-sanity/base/src/pextlib1.0/rmd160cmd.h:51872-52323 /branches/variant-descs-14482/base/src/pextlib1.0/rmd160cmd.h:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base/src/pextlib1.0/sha256cmd.h:78828-80185 /users/perry/base-bugs_and_notes/src/pextlib1.0/rmd160cmd.h:45682-46060 /users/perry/base-select/src/pextlib1.0/rmd160cmd.h:44044-44692 + /branches/gsoc08-privileges/base/src/pextlib1.0/rmd160cmd.h:37343-46937 /branches/gsoc09-logging/base/src/pextlib1.0/sha256cmd.h:51231-60371 /branches/universal-sanity/base/src/pextlib1.0/rmd160cmd.h:51872-52323 /branches/variant-descs-14482/base/src/pextlib1.0/rmd160cmd.h:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base/src/pextlib1.0/sha256cmd.h:78828-81265 /users/perry/base-bugs_and_notes/src/pextlib1.0/rmd160cmd.h:45682-46060 /users/perry/base-select/src/pextlib1.0/rmd160cmd.h:44044-44692 Modified: branches/gsoc11-rev-upgrade/base/src/pextlib1.0/tests/curl.tcl =================================================================== --- branches/gsoc11-rev-upgrade/base/src/pextlib1.0/tests/curl.tcl 2011-07-28 13:18:42 UTC (rev 81265) +++ branches/gsoc11-rev-upgrade/base/src/pextlib1.0/tests/curl.tcl 2011-07-28 13:30:58 UTC (rev 81266) @@ -24,8 +24,8 @@ test {![curl isnewer $dummyroot/dummy [clock scan 2007-06-17Z]]} # use --disable-epsv - curl fetch --disable-epsv ftp://ftp.cup.hp.com/dist/networking/benchmarks/netperf/archive/netperf-2.2pl5.tar.gz $tempfile - test {[md5 file $tempfile] == "a4b0f4a5fbd8bec23002ad8023e01729"} + #curl fetch --disable-epsv ftp://ftp.cup.hp.com/dist/networking/benchmarks/netperf/archive/netperf-2.2pl5.tar.gz $tempfile + #test {[md5 file $tempfile] == "a4b0f4a5fbd8bec23002ad8023e01729"} # use -u # This URL does not work anymore, disabled the test Modified: branches/gsoc11-rev-upgrade/base/src/port/port.tcl =================================================================== --- branches/gsoc11-rev-upgrade/base/src/port/port.tcl 2011-07-28 13:18:42 UTC (rev 81265) +++ branches/gsoc11-rev-upgrade/base/src/port/port.tcl 2011-07-28 13:30:58 UTC (rev 81266) @@ -3304,6 +3304,7 @@ ui_notice "$portname has the variants:" foreach v [lsort $portinfo(variants)] { unset -nocomplain vconflicts vdescription vrequires + set varmodifier " " # Retrieve variants' information from the new format. if {[info exists vinfo]} { array unset variant @@ -3326,8 +3327,6 @@ set varmodifier "($global_variations($v))" } elseif {[info exists variant(is_default)]} { set varmodifier "\[$variant(is_default)\]" - } else { - set varmodifier " " } if {[info exists variant(requires)]} { set vrequires $variant(requires) @@ -4065,7 +4064,7 @@ depends description epoch fullname heading homepage index license line long_description maintainer maintainers name platform platforms portdir pretty - replaced_by revision variant variants version} + replaced_by revision subports variant variants version} contents {size {units 1}} deps {index no-build} rdeps {index no-build full} Modified: branches/gsoc11-rev-upgrade/base/src/port1.0/port_autoconf.tcl.in =================================================================== --- branches/gsoc11-rev-upgrade/base/src/port1.0/port_autoconf.tcl.in 2011-07-28 13:18:42 UTC (rev 81265) +++ branches/gsoc11-rev-upgrade/base/src/port1.0/port_autoconf.tcl.in 2011-07-28 13:30:58 UTC (rev 81266) @@ -33,6 +33,8 @@ namespace eval portutil::autoconf { variable bzip2_path "@BZIP2@" + variable lzma_path "@LZMA@" + variable xz_path "@XZ@" variable cp_path "@CP@" variable cpio_path "@CPIO@" variable diff_path "@DIFF@" Modified: branches/gsoc11-rev-upgrade/base/src/port1.0/portclean.tcl =================================================================== --- branches/gsoc11-rev-upgrade/base/src/port1.0/portclean.tcl 2011-07-28 13:18:42 UTC (rev 81265) +++ branches/gsoc11-rev-upgrade/base/src/port1.0/portclean.tcl 2011-07-28 13:30:58 UTC (rev 81266) @@ -55,7 +55,7 @@ ui_notice "$UI_PREFIX [format [msgcat::mc "Cleaning %s"] [option subport]]" - if {![file writable $prefix] || ([getuid] == 0 && [geteuid] != 0)} { + if {[getuid] == 0 && [geteuid] != 0} { elevateToRoot "clean" } } Modified: branches/gsoc11-rev-upgrade/base/src/port1.0/portconfigure.tcl =================================================================== --- branches/gsoc11-rev-upgrade/base/src/port1.0/portconfigure.tcl 2011-07-28 13:18:42 UTC (rev 81265) +++ branches/gsoc11-rev-upgrade/base/src/port1.0/portconfigure.tcl 2011-07-28 13:30:58 UTC (rev 81266) @@ -194,6 +194,7 @@ set name "" switch -exact ${configure.compiler} { + cc { set name "System cc" } gcc { set name "System gcc" } gcc-3.3 { set name "Mac OS X gcc 3.3" } gcc-4.0 { set name "Mac OS X gcc 4.0" } @@ -369,6 +370,14 @@ global configure.compiler prefix developer_dir set ret "" switch -exact ${configure.compiler} { + cc { + switch -exact ${type} { + 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 /usr/bin/gcc } @@ -440,6 +449,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 { Modified: branches/gsoc11-rev-upgrade/base/src/port1.0/portlivecheck.tcl =================================================================== --- branches/gsoc11-rev-upgrade/base/src/port1.0/portlivecheck.tcl 2011-07-28 13:18:42 UTC (rev 81265) +++ branches/gsoc11-rev-upgrade/base/src/port1.0/portlivecheck.tcl 2011-07-28 13:30:58 UTC (rev 81266) @@ -101,6 +101,14 @@ if {$has_master_sites} { foreach {master_site} ${master_sites} { if {[regexp "^($available_types)(?::(\[^:\]+))?" ${master_site} _ site subdir]} { + set subdirs [split $subdir /] + if {[llength $subdirs] > 1} { + if {[lindex $subdirs 0] == "project"} { + set subdir [lindex $subdirs 1] + } else { + set subdir "" + } + } if {${subdir} ne "" && ${livecheck.name} eq "default"} { set livecheck.name ${subdir} } Modified: branches/gsoc11-rev-upgrade/base/src/port1.0/portutil.tcl =================================================================== --- branches/gsoc11-rev-upgrade/base/src/port1.0/portutil.tcl 2011-07-28 13:18:42 UTC (rev 81265) +++ branches/gsoc11-rev-upgrade/base/src/port1.0/portutil.tcl 2011-07-28 13:30:58 UTC (rev 81266) @@ -2020,19 +2020,18 @@ array set vinfo $PortInfo(vinfo) foreach v $value { - if {[regexp {([-+])([-A-Za-z0-9_]+)} $v whole val variant]} { + if {[regexp {([-+])([-A-Za-z0-9_]+)} $v whole val variant] && ![info exists variations($variant)]} { # Retrieve the information associated with this variant. if {![info exists vinfo($variant)]} { set vinfo($variant) {} } + array unset info array set info $vinfo($variant) + # Set is_default and update vinfo. + set info(is_default) $val + array set vinfo [list $variant [array get info]] - if {![info exists variations($variant)]} { - # Set is_default and update vinfo. - array set vinfo [list $variant [list is_default $val]] - - set variations($variant) $val - } + set variations($variant) $val } } # Update PortInfo(vinfo). @@ -2082,8 +2081,8 @@ set uid [nextuid] set gid [existsgroup nogroup] set realname ${name} - set home /dev/null - set shell /dev/null + set home /var/empty + set shell /usr/bin/false foreach arg $args { if {[regexp {([a-z]*)=(.*)} $arg match key val]} { @@ -2690,11 +2689,16 @@ set ok 3.1 set rec 3.1.4 } - default { + 10.6 { set min 3.2 set ok 3.2 set rec 3.2.6 } + default { + set min 4.1 + set ok 4.1 + set rec 4.1 + } } if {$xcodeversion == "none"} { ui_warn "Xcode does not appear to be installed; most ports will likely fail to build." Modified: branches/gsoc11-rev-upgrade/base/src/registry2.0/portimage.tcl =================================================================== --- branches/gsoc11-rev-upgrade/base/src/registry2.0/portimage.tcl 2011-07-28 13:18:42 UTC (rev 81265) +++ branches/gsoc11-rev-upgrade/base/src/registry2.0/portimage.tcl 2011-07-28 13:30:58 UTC (rev 81266) @@ -280,9 +280,9 @@ # returns: path to the extracted directory proc extract_archive_to_tmpdir {location} { set extractdir [mkdtemp [::file join [macports::gettmpdir] mpextractXXXXXXXX]] + set startpwd [pwd] try { - set startpwd [pwd] if {[catch {cd $extractdir} err]} { throw MACPORTS $err } Property changes on: branches/gsoc11-rev-upgrade/base/src/registry2.0/receipt_sqlite.tcl ___________________________________________________________________ Modified: svn:mergeinfo - /branches/gsoc08-privileges/base/src/registry1.0/receipt_sqlite.tcl:37343-46937 /branches/gsoc09-logging/base/src/registry1.0/receipt_sqlite.tcl:51231-60371 /branches/universal-sanity/base/src/registry1.0/receipt_sqlite.tcl:51872-52323 /branches/variant-descs-14482/base/src/registry1.0/receipt_sqlite.tcl:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base/src/registry2.0/receipt_sqlite.tcl:78828-80185 /users/perry/base-bugs_and_notes/src/registry1.0/receipt_sqlite.tcl:45682-46060 /users/perry/base-select/src/registry1.0/receipt_sqlite.tcl:44044-44692 + /branches/gsoc08-privileges/base/src/registry1.0/receipt_sqlite.tcl:37343-46937 /branches/gsoc09-logging/base/src/registry1.0/receipt_sqlite.tcl:51231-60371 /branches/universal-sanity/base/src/registry1.0/receipt_sqlite.tcl:51872-52323 /branches/variant-descs-14482/base/src/registry1.0/receipt_sqlite.tcl:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base/src/registry2.0/receipt_sqlite.tcl:78828-81265 /users/perry/base-bugs_and_notes/src/registry1.0/receipt_sqlite.tcl:45682-46060 /users/perry/base-select/src/registry1.0/receipt_sqlite.tcl:44044-44692