[57139] branches/images-and-archives/base
blb at macports.org
blb at macports.org
Sun Sep 6 13:43:40 PDT 2009
Revision: 57139
http://trac.macports.org/changeset/57139
Author: blb at macports.org
Date: 2009-09-06 13:43:40 -0700 (Sun, 06 Sep 2009)
Log Message:
-----------
Merge from trunk
Modified Paths:
--------------
branches/images-and-archives/base/ChangeLog
branches/images-and-archives/base/NEWS
branches/images-and-archives/base/config/RELEASE_URL
branches/images-and-archives/base/doc/port.1
branches/images-and-archives/base/doc/portfile.7
branches/images-and-archives/base/m4/tcl.m4
branches/images-and-archives/base/portmgr/dmg/InstallationCheck.strings
branches/images-and-archives/base/portmgr/dmg/postflight
branches/images-and-archives/base/portmgr/jobs/PortIndex2MySQL.tcl
branches/images-and-archives/base/src/macports1.0/macports.tcl
branches/images-and-archives/base/src/pextlib1.0/Pextlib.c
branches/images-and-archives/base/src/port/port-help.tcl
branches/images-and-archives/base/src/port/port.tcl
branches/images-and-archives/base/src/port1.0/portload.tcl
branches/images-and-archives/base/src/port1.0/portutil.tcl
branches/images-and-archives/base/src/upgrade_sources_conf_default.tcl
Property Changed:
----------------
branches/images-and-archives/base/
Property changes on: branches/images-and-archives/base
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/gsoc08-privileges/base:37343-46937
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:50249-56394
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692
+ /branches/gsoc08-privileges/base:37343-46937
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:50249-57135
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692
Modified: branches/images-and-archives/base/ChangeLog
===================================================================
--- branches/images-and-archives/base/ChangeLog 2009-09-06 20:42:18 UTC (rev 57138)
+++ branches/images-and-archives/base/ChangeLog 2009-09-06 20:43:40 UTC (rev 57139)
@@ -4,7 +4,7 @@
###
-Release 1.8.0 (unreleased):
+Release 1.8.0 (2009-08-28 by jmr):
- There is now a 'build_arch' variable, available in portfiles and
configurable in macports.conf, which sets the CPU architecture that
ports should be compiled for (when not building universal). Its default
@@ -660,7 +660,7 @@
- `port info` now supports new --index flag for using old behaviour (eridius r25256).
- `port info` now opens the Portfile and displays up-to-date information.
- This allows information about variants to be displayed (eg. dependencies).
+ This allows information about variants to be displayed (e.g. dependencies).
Also allow `port info` to default to current directory if no name is provided
(eridius r25255).
Modified: branches/images-and-archives/base/NEWS
===================================================================
--- branches/images-and-archives/base/NEWS 2009-09-06 20:42:18 UTC (rev 57138)
+++ branches/images-and-archives/base/NEWS 2009-09-06 20:43:40 UTC (rev 57139)
@@ -1,4 +1,43 @@
+== Overview of changes from MacPorts 1.7.1 to 1.8.0 ==
+# For regular users:
+
+*) Compatible with Mac OS X 10.6 Snow Leopard, requires at least 10.4 Tiger
+*) CPU architecture to build for is now configurable
+*) Performance and memory usage improvements
+*) New -y option for dry-run
+*) 'port search' has many new options that make it more flexible
+*) 'port upgrade' now follows the right dependencies when variants change them
+*) 'port info' and 'port variants' indicate selected and default variants;
+ 'port variants' also shows conflicts and dependencies between variants
+*) A port can be marked as being replaced by another port; upgrading will
+ perform the replacement
+*) upgrade accepts new options: --force, --enforce-variants, --no-replace
+*) Ports can be marked as conflicting, and conflicts will be detected before
+ the install process starts
+*) Proxy information can now be obtained from System Preferences and from
+ macports.conf
+*) Activating a port will now first deactivate any other version of the same
+ port that is already active
+*) MacPorts can be configured to drop root privileges when not needed
+*) port(1) will exit with an appropriate status code when an error is
+ encountered (use -p to continue despite errors)
+
+# For Portfile writers:
+
+*) New options: replaced_by, conflicts, depends_fetch, depends_extract, license
+*) build_arch variable indicates which architecture should be targeted. Flags
+ used to implement this are configured per-compiler, for example,
+ configure.cc_archflags will be passed to configure.cc in CFLAGS
+*) Dependencies can be satisfied by ports that are installed but not
+ available in the ports tree
+*) Deleting all the contents of an option no longer unsets the option entirely
+*) Using an alternative fetch or extract type now adds appropriate
+ dependencies automatically, e.g. 'use_zip yes' adds a dep on unzip, and
+ 'fetch.type svn' adds a dep on subversion
+*) Running phases prior to install should now work reliably when the port is
+ already installed
+
== Overview of changes from MacPorts 1.6.0 to 1.7.0 ==
# For regular users:
Modified: branches/images-and-archives/base/config/RELEASE_URL
===================================================================
--- branches/images-and-archives/base/config/RELEASE_URL 2009-09-06 20:42:18 UTC (rev 57138)
+++ branches/images-and-archives/base/config/RELEASE_URL 2009-09-06 20:43:40 UTC (rev 57139)
@@ -1 +1 @@
-http://svn.macports.org/repository/macports/tags/release_1_7_1/base
+http://svn.macports.org/repository/macports/tags/release_1_8_0/base
Modified: branches/images-and-archives/base/doc/port.1
===================================================================
--- branches/images-and-archives/base/doc/port.1 2009-09-06 20:42:18 UTC (rev 57138)
+++ branches/images-and-archives/base/doc/port.1 2009-09-06 20:43:40 UTC (rev 57139)
@@ -36,7 +36,7 @@
.Ar ports
.Sh SYNOPSIS
.Nm
-.Op Fl vdqfonRusbckixpyt
+.Op Fl bcdfknopqRstuvy
.Op Fl D Ar portdir
.Op Fl F Ar cmdfile
.Op Ar action
@@ -444,8 +444,6 @@
.Dl launchctl load -w /Library/LaunchDaemons/org.macports.${port}.plist
.Ss unload
A shortcut to launchctl, like load, but unloads the daemon.
-.Ss platform
-Prints out the current platform information for the running system.
.Ss gohome
Loads the home page for the given
.Ar portname
Modified: branches/images-and-archives/base/doc/portfile.7
===================================================================
--- branches/images-and-archives/base/doc/portfile.7 2009-09-06 20:42:18 UTC (rev 57138)
+++ branches/images-and-archives/base/doc/portfile.7 2009-09-06 20:43:40 UTC (rev 57139)
@@ -250,6 +250,17 @@
sha1 a633a9a811a138eac5ed440d583473b644135ef5 \e\
rmd160 941cf8f2ef8459ec4f9ce65772e134505d46566
.Ed
+.It Ic macosx_deployment_target
+Value for MACOSX_DEPLOYMENT_TARGET environment variable when invoking the configure script.
+.br
+.Sy Type:
+.Em optional
+.br
+.Sy Default:
+.Em (current OS version)
+.br
+.Sy Example:
+.Dl macosx_deployment_target 10.4
.It Ic use_parallel_build
If set to yes (and the user has enabled buildmakejobs in
.Pa macports.conf
@@ -306,6 +317,32 @@
.br
.Sy Example:
.Dl use_configure no
+.It Ic conflicts
+Used to list ports which conflict with the one containing the
+.Cm conflicts
+declaration.
+.br
+.Sy Type:
+.Em optional
+.br
+.Sy Default:
+.Em none (empty)
+.br
+.Sy Example:
+.Dl conflicts cdrtools
+.It Ic replaced_by
+When a particular port is deprecated in favor of another, use
+.Cm replaced_by
+in the deprecated port and list the new one to be used.
+.br
+.Sy Type:
+.Em optional
+.br
+.Sy Default:
+.Em none (empty)
+.br
+.Sy Example:
+.Dl replaced_by xorg-renderproto
.El
.Sh TARGET HOOKS
A number of hooks are available for customizing many of the standard
@@ -430,33 +467,33 @@
.Sy Default:
.Em ${sysportpath}/distfiles/${dist_subdir}/
.It Ic os.arch
-Identifies hardware type (eg "powerpc").
+Identifies hardware type (e.g. "powerpc").
.br
.Sy Type:
.Em read-only
.It Ic os.version
-Version number of operating system (eg "7.0").
+Version number of operating system (e.g. "7.0").
.br
.Sy Type:
.Em read-only
.It Ic os.endian
-Endianness of the processor (eg "bigEndian").
+Endianness of the processor (e.g. "bigEndian").
.br
.Sy Type:
.Em read-only
.It Ic os.platform
-Operating system name (eg "darwin").
+Operating system name (e.g. "darwin").
.br
.Sy Type:
.Em read-only
.It Ic install.user
-User for MacPorts installation (eg
+User for MacPorts installation (e.g.
.Pa root )
.br
.Sy Type:
.Em read-only
.It Ic install.group
-Group for MacPorts installation (eg
+Group for MacPorts installation (e.g.
.Pa wheel )
.br
.Sy Type:
@@ -966,14 +1003,6 @@
.br
.Sy Type:
.Em optional
-.It Ic configure.macosx_deployment_target
-Flags to put in the MACOSX_DEPLOYMENT_TARGET environment variable when invoking the configure script.
-.br
-.Sy Type:
-.Em optional
-.br
-.Sy Example:
-.Dl configure.macosx_deployment_target 10.4
.It Ic configure.cc
C-compiler to put in the CC environment variable when invoking the configure script.
.br
@@ -1958,7 +1987,7 @@
Compare two RPM-format versions for equality. The return value is like
strcmp(), returning -1, 0, or 1 when versionA is earlier, equal to, or
later than versionB, respectively. Note that some comparisions featuring
-floating-point notation may compare incorrectly, eg, 2.101 is considered
+floating-point notation may compare incorrectly, e.g. 2.101 is considered
later than 2.2 (101 is larger than 2) which may be incorrect per some
projects versioning methods (see ticket #11873).
.It Xo
Modified: branches/images-and-archives/base/m4/tcl.m4
===================================================================
--- branches/images-and-archives/base/m4/tcl.m4 2009-09-06 20:42:18 UTC (rev 57138)
+++ branches/images-and-archives/base/m4/tcl.m4 2009-09-06 20:43:40 UTC (rev 57139)
@@ -2230,7 +2230,7 @@
AC_DEFINE(HAVE_TIMEZONE_VAR)
else
#
- # On some systems (eg IRIX 6.2), timezone is a time_t and not a long.
+ # On some systems (e.g. IRIX 6.2), timezone is a time_t and not a long.
#
AC_MSG_CHECKING([time_t timezone variable])
AC_CACHE_VAL(tcl_cv_timezone_time,
Modified: branches/images-and-archives/base/portmgr/dmg/InstallationCheck.strings
===================================================================
--- branches/images-and-archives/base/portmgr/dmg/InstallationCheck.strings 2009-09-06 20:42:18 UTC (rev 57138)
+++ branches/images-and-archives/base/portmgr/dmg/InstallationCheck.strings 2009-09-06 20:43:40 UTC (rev 57139)
@@ -1,2 +1,2 @@
"16" = "This package is meant to be installed on __XVERS__";
-"17" = "Your existing MacPorts or DarwinPorts install is too old to be upgraded by this installer. Please install MacPorts 1.7.1 first."
+"17" = "Your existing MacPorts or DarwinPorts install is too old to be upgraded by this installer. Please install MacPorts 1.7.1 first.";
Modified: branches/images-and-archives/base/portmgr/dmg/postflight
===================================================================
--- branches/images-and-archives/base/portmgr/dmg/postflight 2009-09-06 20:42:18 UTC (rev 57138)
+++ branches/images-and-archives/base/portmgr/dmg/postflight 2009-09-06 20:43:40 UTC (rev 57139)
@@ -166,7 +166,7 @@
# We gather the path into a variable of our own for faster operation:
ORIGINAL_MANPATH="$(${SHELL} ${LOGIN_FLAG} -c "/usr/bin/printenv MANPATH")"
-# Adding out setting to the MANPATH variable only if it exists:
+# Adding our setting to the MANPATH variable only if it exists:
if ! ${SHELL} ${LOGIN_FLAG} -c "/usr/bin/env | grep MANPATH" > /dev/null || \
# and following that, if it's not empty:
[ -z "${ORIGINAL_MANPATH}" ] || \
Modified: branches/images-and-archives/base/portmgr/jobs/PortIndex2MySQL.tcl
===================================================================
--- branches/images-and-archives/base/portmgr/jobs/PortIndex2MySQL.tcl 2009-09-06 20:42:18 UTC (rev 57138)
+++ branches/images-and-archives/base/portmgr/jobs/PortIndex2MySQL.tcl 2009-09-06 20:43:40 UTC (rev 57139)
@@ -73,7 +73,7 @@
set HEADERS "To: $SPAM_LOVERS\r\nFrom: $FROM\r\nSubject: $SUBJECT\r\n\r\n"
# handle command line arguments
-set create_tables false
+set create_tables true
if {[llength $argv]} {
if {[lindex $argv 0] == "--create-tables"} {
set create_tables true
@@ -260,6 +260,9 @@
puts $sqlfile_fd "DROP TABLE IF EXISTS platforms;"
puts $sqlfile_fd "CREATE TABLE platforms (portfile VARCHAR(255), platform VARCHAR(255)) DEFAULT CHARSET=utf8;"
+
+ puts $sqlfile_fd "DROP TABLE IF EXISTS licenses;"
+ puts $sqlfile_fd "CREATE TABLE licenses (portfile VARCHAR(255), license VARCHAR(255)) DEFAULT CHARSET=utf8;"
} else {
# if we are not creating tables from scratch, remove the old data
puts $sqlfile_fd "TRUNCATE log;"
@@ -269,6 +272,7 @@
puts $sqlfile_fd "TRUNCATE dependencies;"
puts $sqlfile_fd "TRUNCATE variants;"
puts $sqlfile_fd "TRUNCATE platforms;"
+ puts $sqlfile_fd "TRUNCATE licenses;"
}
# Iterate over each matching port, extracting its information from the
@@ -335,6 +339,11 @@
} else {
set platforms ""
}
+ if {[info exists portinfo(license)]} {
+ set licenses $portinfo(license)
+ } else {
+ set licenses ""
+ }
puts $sqlfile_fd "INSERT INTO portfiles VALUES ('$portname', '$portdir', '$portversion', '$description');"
@@ -387,6 +396,11 @@
puts $sqlfile_fd "INSERT INTO platforms VALUES ('$portname', '$platform');"
}
+ foreach license $licenses {
+ set license [sql_escape $license]
+ puts $sqlfile_fd "INSERT INTO licenses VALUES ('$portname', '$license');"
+ }
+
}
# Mark the db regen as done only once we're done processing all ports:
Modified: branches/images-and-archives/base/src/macports1.0/macports.tcl
===================================================================
--- branches/images-and-archives/base/src/macports1.0/macports.tcl 2009-09-06 20:42:18 UTC (rev 57138)
+++ branches/images-and-archives/base/src/macports1.0/macports.tcl 2009-09-06 20:43:40 UTC (rev 57139)
@@ -1657,7 +1657,7 @@
}
}
- set tar [findBinary tar $macports::autoconf::tar_path]
+ set tar [macports::findBinary tar $macports::autoconf::tar_path]
if { [catch { system "cd $destdir/.. && $tar ${verboseflag} ${extflag} -xf $filename" } error] } {
ui_error "Extracting $source failed ($error)"
incr numfailed
Modified: branches/images-and-archives/base/src/pextlib1.0/Pextlib.c
===================================================================
--- branches/images-and-archives/base/src/pextlib1.0/Pextlib.c 2009-09-06 20:42:18 UTC (rev 57138)
+++ branches/images-and-archives/base/src/pextlib1.0/Pextlib.c 2009-09-06 20:43:40 UTC (rev 57139)
@@ -512,7 +512,7 @@
(void) unsetenv(name);
}
/* Tcl appears to become out of sync with the environment when we
- unset things, eg, 'info exists env(CC)' will succeed where
+ unset things, e.g. 'info exists env(CC)' will succeed where
'puts $env(CC)' will fail since it doesn't actually exist after
being unset here. This forces Tcl to resync to the current state
(don't care about the actual result, so reset it) */
Modified: branches/images-and-archives/base/src/port/port-help.tcl
===================================================================
--- branches/images-and-archives/base/src/port/port-help.tcl 2009-09-06 20:42:18 UTC (rev 57138)
+++ branches/images-and-archives/base/src/port/port-help.tcl 2009-09-06 20:43:40 UTC (rev 57139)
@@ -220,7 +220,7 @@
This allows you to choose which version, among several installed versions
of a port, is to be considered primary. What this means is which version
-becomes the one most would consider the default, eg, the one run without
+becomes the one most would consider the default, e.g. the one run without
specifying any version.
One example is the set of python ports, where there are (among others)
Modified: branches/images-and-archives/base/src/port/port.tcl
===================================================================
--- branches/images-and-archives/base/src/port/port.tcl 2009-09-06 20:42:18 UTC (rev 57138)
+++ branches/images-and-archives/base/src/port/port.tcl 2009-09-06 20:43:40 UTC (rev 57139)
@@ -44,7 +44,7 @@
proc print_usage {{verbose 1}} {
global cmdname
set syntax {
- [-bcdfknopqRstuvxy] [-D portdir] [-F cmdfile] action [privopts] [actionflags]
+ [-bcdfknopqRstuvy] [-D portdir] [-F cmdfile] action [privopts] [actionflags]
[[portname|pseudo-portname|port-url] [@version] [+-variant]... [option=value]...]...
}
@@ -335,7 +335,7 @@
upvar $nameportlist portlist
if {[llength $portlist] == 0 && (![info exists private_options(ports_no_args)] || $private_options(ports_no_args) == "no")} {
- ui_error "No ports found"
+ ui_error "No ports matched the given expression"
return 1
}
Modified: branches/images-and-archives/base/src/port1.0/portload.tcl
===================================================================
--- branches/images-and-archives/base/src/port1.0/portload.tcl 2009-09-06 20:42:18 UTC (rev 57138)
+++ branches/images-and-archives/base/src/port1.0/portload.tcl 2009-09-06 20:43:40 UTC (rev 57139)
@@ -37,7 +37,7 @@
set org.macports.load [target_new org.macports.load portload::load_main]
target_runtype ${org.macports.load} always
target_provides ${org.macports.load} load
-target_requires ${org.macports.load} portload::main
+target_requires ${org.macports.load} main
namespace eval portload {
}
Modified: branches/images-and-archives/base/src/port1.0/portutil.tcl
===================================================================
--- branches/images-and-archives/base/src/port1.0/portutil.tcl 2009-09-06 20:42:18 UTC (rev 57138)
+++ branches/images-and-archives/base/src/port1.0/portutil.tcl 2009-09-06 20:43:40 UTC (rev 57139)
@@ -1495,7 +1495,7 @@
if { [getuid] != 0 } {
ui_msg "MacPorts running without privileges.\
- You may be unable to complete certain actions (eg install)."
+ You may be unable to complete certain actions (e.g. install)."
}
# de-escalate privileges if MacPorts was started with sudo
Modified: branches/images-and-archives/base/src/upgrade_sources_conf_default.tcl
===================================================================
--- branches/images-and-archives/base/src/upgrade_sources_conf_default.tcl 2009-09-06 20:42:18 UTC (rev 57138)
+++ branches/images-and-archives/base/src/upgrade_sources_conf_default.tcl 2009-09-06 20:43:40 UTC (rev 57139)
@@ -94,7 +94,7 @@
needs to have a \[default\] tag added to the primary MacPorts repository,
however the proper entry could not be determined. Please add the tag
manually by either appending \[default\] to the end of the correct line,
-or if there are already tags, adding it to the list, eg,
+or if there are already tags, adding it to the list, e.g.
\[nosync,default\].
[string repeat - 72]"
}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090906/55e8eb32/attachment-0001.html>
More information about the macports-changes
mailing list