[50937] branches/images-and-archives/base
blb at macports.org
blb at macports.org
Tue May 12 23:38:13 PDT 2009
Revision: 50937
http://trac.macports.org/changeset/50937
Author: blb at macports.org
Date: 2009-05-12 23:38:13 -0700 (Tue, 12 May 2009)
Log Message:
-----------
Merge from trunk
Modified Paths:
--------------
branches/images-and-archives/base/LICENSE
branches/images-and-archives/base/doc/portfile.7
branches/images-and-archives/base/src/macports1.0/macports.tcl
branches/images-and-archives/base/src/port/port.tcl
branches/images-and-archives/base/src/port1.0/portconfigure.tcl
branches/images-and-archives/base/src/port1.0/portfetch.tcl
branches/images-and-archives/base/src/port1.0/portinstall.tcl
branches/images-and-archives/base/src/port1.0/portmain.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/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:50249-50751
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692
+ /branches/gsoc08-privileges/base:37343-46937
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:50249-50936
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692
Modified: branches/images-and-archives/base/LICENSE
===================================================================
--- branches/images-and-archives/base/LICENSE 2009-05-13 06:33:35 UTC (rev 50936)
+++ branches/images-and-archives/base/LICENSE 2009-05-13 06:38:13 UTC (rev 50937)
@@ -1,4 +1,4 @@
-Copyright (c) 2002 - 2003, Apple Computer, Inc.
+Copyright (c) 2002 - 2003, Apple Inc.
Copyright (c) 2004 - 2009, The MacPorts Project.
All rights reserved.
@@ -10,7 +10,7 @@
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
-3. Neither the name of Apple Computer, Inc., The MacPorts Project nor the
+3. Neither the name of Apple Inc., The MacPorts Project nor the
names of its contributors may be used to endorse or promote products
derived from this software without specific prior written permission.
Modified: branches/images-and-archives/base/doc/portfile.7
===================================================================
--- branches/images-and-archives/base/doc/portfile.7 2009-05-13 06:33:35 UTC (rev 50936)
+++ branches/images-and-archives/base/doc/portfile.7 2009-05-13 06:38:13 UTC (rev 50937)
@@ -1936,6 +1936,11 @@
.Ar template .
See
.Xr mkstemp 3 .
+.It Ic mkdtemp Ar template
+Create a temporary directory using a
+.Ar template .
+See
+.Xr mkdtemp 3 .
.It Ic md5 Ar
Compute the MD5 hashes of the file(s).
.It Ic rpm-vercomp Ar versionA Ar versionB
Modified: branches/images-and-archives/base/src/macports1.0/macports.tcl
===================================================================
--- branches/images-and-archives/base/src/macports1.0/macports.tcl 2009-05-13 06:33:35 UTC (rev 50936)
+++ branches/images-and-archives/base/src/macports1.0/macports.tcl 2009-05-13 06:38:13 UTC (rev 50937)
@@ -2075,9 +2075,18 @@
set tclpackage $libpath
}
+ set configure_args "--prefix=$prefix --with-tclpackage=$tclpackage --with-install-user=$owner --with-install-group=$group --with-directory-mode=$perms"
+ # too many users have an incompatible readline in /usr/local, see ticket #10651
+ if {$tcl_platform(os) != "Darwin" || $prefix == "/usr/local"
+ || ([glob -nocomplain "/usr/local/lib/lib{readline,history}*"] == "" && [glob -nocomplain "/usr/local/include/readline/*.h"] == "")} {
+ append configure_args " --enable-readline"
+ } else {
+ ui_warn "Disabling readline support due to readline in /usr/local"
+ }
+
# do the actual configure, build and installation of new base
ui_msg "Installing new MacPorts release in $prefix as $owner:$group; permissions $perms; Tcl-Package in $tclpackage\n"
- if { [catch { system "cd $mp_source_path && ./configure --prefix=$prefix --with-tclpackage=$tclpackage --with-install-user=$owner --with-install-group=$group --with-directory-mode=$perms && make && make install" } result] } {
+ if { [catch { system "cd $mp_source_path && ./configure $configure_args && make && make install" } result] } {
return -code error "Error installing new MacPorts base: $result"
}
}
Modified: branches/images-and-archives/base/src/port/port.tcl
===================================================================
--- branches/images-and-archives/base/src/port/port.tcl 2009-05-13 06:33:35 UTC (rev 50936)
+++ branches/images-and-archives/base/src/port/port.tcl 2009-05-13 06:38:13 UTC (rev 50937)
@@ -1465,6 +1465,7 @@
homepage Homepage
platforms Platforms
maintainers Maintainers
+ license License
}
# Wrap-length map for pretty printing
@@ -1478,6 +1479,7 @@
long_description 22
homepage 22
platforms 22
+ license 22
maintainers 22
}
@@ -1532,7 +1534,8 @@
ports_info_long_description ports_info_homepage
ports_info_skip_line ports_info_depends_build
ports_info_depends_lib ports_info_depends_run
- ports_info_platforms ports_info_maintainers
+ ports_info_platforms ports_info_license
+ ports_info_maintainers
}
}
foreach { option } $opts_todo {
@@ -2777,7 +2780,13 @@
break_softcontinue "lookup of portname $portname failed: $result" 1 status
}
if {[llength $res] < 2} {
- break_softcontinue "Port $portname not found" 1 status
+ # don't error for ports that are installed but not in the tree
+ if {[registry::entry_exists_for_name $portname]} {
+ ui_warn "Skipping $portname (not in the ports tree)"
+ continue
+ } else {
+ break_softcontinue "Port $portname not found" 1 status
+ }
}
array unset portinfo
array set portinfo [lindex $res 1]
@@ -3022,8 +3031,8 @@
edit {{editor 1}}
ed {{editor 1}}
info {category categories depends_build depends_lib depends_run
- depends description epoch fullname heading homepage index line
- long_description
+ depends description epoch fullname heading homepage index license
+ line long_description
maintainer maintainers name platform platforms portdir pretty
revision variant variants version}
search {case-sensitive category categories depends_build depends_lib depends_run
Modified: branches/images-and-archives/base/src/port1.0/portconfigure.tcl
===================================================================
--- branches/images-and-archives/base/src/port1.0/portconfigure.tcl 2009-05-13 06:33:35 UTC (rev 50936)
+++ branches/images-and-archives/base/src/port1.0/portconfigure.tcl 2009-05-13 06:38:13 UTC (rev 50937)
@@ -204,38 +204,9 @@
# end gsoc08-privileges
}
-# internal function to determine canonical system name for configure
-proc portconfigure::configure_get_universal_system_name {args} {
- global configure.universal_target configure.universal_archs
- set arch "unknown"
- switch -- ${configure.universal_archs} {
- "ppc" { set arch "powerpc" }
- "i386" { set arch "i686" }
- "ppc64" { set arch "powerpc" }
- "x86_64" { set arch "i686" }
- }
- switch -- ${configure.universal_target} {
- "10.1" { return "powerpc-apple-darwin5" }
- # /Developer/SDKs/MacOSX10.1.5.sdk
- "10.2" { return "powerpc-apple-darwin6" }
- # /Developer/SDKs/MacOSX10.2.8.sdk
- "10.3" { return "powerpc-apple-darwin7" }
- # /Developer/SDKs/MacOSX10.3.9.sdk
- "10.4" { return "${arch}-apple-darwin8" }
- "10.5" { return "${arch}-apple-darwin9" }
- }
- return ""
-}
-
# internal function to determine the universal args for configure.cmd
proc portconfigure::configure_get_universal_args {args} {
- global configure.universal_archs
- set system [configure_get_universal_system_name]
set params "--disable-dependency-tracking"
- if {[llength ${configure.universal_archs}] == 1 &&
- [info exists system] && $system != ""} {
- set params "$params --host=${system} --target=${system}"
- }
return $params
}
Modified: branches/images-and-archives/base/src/port1.0/portfetch.tcl
===================================================================
--- branches/images-and-archives/base/src/port1.0/portfetch.tcl 2009-05-13 06:33:35 UTC (rev 50936)
+++ branches/images-and-archives/base/src/port1.0/portfetch.tcl 2009-05-13 06:38:13 UTC (rev 50937)
@@ -338,21 +338,21 @@
variable fetch_urls
if {[info exists patchfiles]} {
- foreach file $patchfiles {
- if {![file exists $filespath/$file]} {
- set distsite [getdisttag $file]
- set file [getdistname $file]
- lappend all_dist_files $file
- if {$distsite != ""} {
- lappend fetch_urls $distsite $file
- } elseif {[info exists patch_sites]} {
- lappend fetch_urls patch_sites $file
- } else {
- lappend fetch_urls master_sites $file
+ foreach file $patchfiles {
+ if {![file exists $filespath/$file]} {
+ set distsite [getdisttag $file]
+ set file [getdistname $file]
+ lappend all_dist_files $file
+ if {$distsite != ""} {
+ lappend fetch_urls $distsite $file
+ } elseif {[info exists patch_sites]} {
+ lappend fetch_urls patch_sites $file
+ } else {
+ lappend fetch_urls master_sites $file
+ }
+ }
}
- }
}
- }
}
# Checks dist files and their tags to assemble url lists for later fetching
@@ -361,19 +361,19 @@
variable fetch_urls
if {[info exists distfiles]} {
- foreach file $distfiles {
- if {![file exists $filespath/$file]} {
- set distsite [getdisttag $file]
- set file [getdistname $file]
- lappend all_dist_files $file
- if {$distsite != ""} {
- lappend fetch_urls $distsite $file
- } else {
- lappend fetch_urls master_sites $file
+ foreach file $distfiles {
+ if {![file exists $filespath/$file]} {
+ set distsite [getdisttag $file]
+ set file [getdistname $file]
+ lappend all_dist_files $file
+ if {$distsite != ""} {
+ lappend fetch_urls $distsite $file
+ } else {
+ lappend fetch_urls master_sites $file
+ }
+ }
}
}
- }
- }
}
# sorts fetch_urls in order of ping time
@@ -474,36 +474,36 @@
set cvs.tag "HEAD"
}
if {[string length ${cvs.tag}]} {
- set cvs.args "${cvs.args} -r ${cvs.tag}"
+ set cvs.args "${cvs.args} -r ${cvs.tag}"
}
if {[string length ${cvs.date}]} {
- set cvs.args "${cvs.args} -D ${cvs.date}"
+ set cvs.args "${cvs.args} -D ${cvs.date}"
}
if {[regexp ^:pserver: ${cvs.root}]} {
- set savecmd ${cvs.cmd}
- set saveargs ${cvs.args}
- set savepost_args ${cvs.post_args}
- set cvs.cmd "echo ${cvs.password} | $portutil::autoconf::cvs_path"
- set cvs.args login
- set cvs.post_args ""
- if {[catch {command_exec cvs -notty "" "2>&1"} result]} {
- return -code error [msgcat::mc "CVS login failed"]
- }
- set cvs.cmd ${savecmd}
- set cvs.args ${saveargs}
- set cvs.post_args ${savepost_args}
+ set savecmd ${cvs.cmd}
+ set saveargs ${cvs.args}
+ set savepost_args ${cvs.post_args}
+ set cvs.cmd "echo ${cvs.password} | $portutil::autoconf::cvs_path"
+ set cvs.args login
+ set cvs.post_args ""
+ if {[catch {command_exec cvs -notty "" "2>&1"} result]} {
+ return -code error [msgcat::mc "CVS login failed"]
+ }
+ set cvs.cmd ${savecmd}
+ set cvs.args ${saveargs}
+ set cvs.post_args ${savepost_args}
} else {
- set env(CVS_RSH) ssh
+ set env(CVS_RSH) ssh
}
if {[catch {command_exec cvs "" "2>&1"} result]} {
- return -code error [msgcat::mc "CVS check out failed"]
+ return -code error [msgcat::mc "CVS check out failed"]
}
if {[info exists patchfiles]} {
- return [portfetch::fetchfiles]
+ return [portfetch::fetchfiles]
}
return 0
}
@@ -516,11 +516,11 @@
# Look for the svn command, either in the path or in the prefix
set goodcmd 0
foreach svncmd "${svn.cmd} ${prefix_frozen}/bin/svn svn" {
- if { [file executable ${svncmd}] } {
- set svn.cmd $svncmd
- set goodcmd 1
- break;
- }
+ if { [file executable ${svncmd}] } {
+ set svn.cmd $svncmd
+ set goodcmd 1
+ break;
+ }
}
if { !$goodcmd } {
ui_error "The subversion tool (svn) is required to fetch ${svn.url}."
@@ -538,7 +538,7 @@
}
if {[info exists patchfiles]} {
- return [portfetch::fetchfiles]
+ return [portfetch::fetchfiles]
}
return 0
Modified: branches/images-and-archives/base/src/port1.0/portinstall.tcl
===================================================================
--- branches/images-and-archives/base/src/port1.0/portinstall.tcl 2009-05-13 06:33:35 UTC (rev 50936)
+++ branches/images-and-archives/base/src/port1.0/portinstall.tcl 2009-05-13 06:38:13 UTC (rev 50937)
@@ -149,6 +149,9 @@
if {[info exists long_description]} {
registry_prop_store $regref long_description [string map {\n \\n} ${long_description}]
}
+ if {[info exists license]} {
+ registry_prop_store $regref license ${license}
+ }
if {[info exists homepage]} {
registry_prop_store $regref homepage ${homepage}
}
Modified: branches/images-and-archives/base/src/port1.0/portmain.tcl
===================================================================
--- branches/images-and-archives/base/src/port1.0/portmain.tcl 2009-05-13 06:33:35 UTC (rev 50936)
+++ branches/images-and-archives/base/src/port1.0/portmain.tcl 2009-05-13 06:38:13 UTC (rev 50937)
@@ -45,12 +45,12 @@
# define options
options prefix macportsuser name version revision epoch categories maintainers
-options long_description description homepage
+options long_description description homepage license
options worksrcdir filesdir distname portdbpath libpath distpath sources_conf os.platform os.version os.major os.arch os.endian platforms default_variants install.user install.group macosx_deployment_target
options universal_variant os.universal_supported
# Export options via PortInfo
-options_export name version revision epoch categories maintainers platforms description long_description homepage
+options_export name version revision epoch categories maintainers platforms description long_description homepage license
# Assign option procedure to default_variants
option_proc default_variants handle_default_variants
@@ -68,6 +68,7 @@
default filesdir files
default revision 0
default epoch 0
+default license unknown
default distname {${portname}-${portversion}}
default worksrcdir {$distname}
default filespath {[file join $portpath $filesdir]}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090512/d34b11ce/attachment.html>
More information about the macports-changes
mailing list