[87594] branches/gsoc11-rev-upgrade/base
cal at macports.org
cal at macports.org
Sun Nov 27 14:25:23 PST 2011
Revision: 87594
http://trac.macports.org/changeset/87594
Author: cal at macports.org
Date: 2011-11-27 14:25:18 -0800 (Sun, 27 Nov 2011)
Log Message:
-----------
Merge from trunk
Modified Paths:
--------------
branches/gsoc11-rev-upgrade/base/ChangeLog
branches/gsoc11-rev-upgrade/base/doc/portfile.7
branches/gsoc11-rev-upgrade/base/portmgr/jobs/port_binary_distributable.tcl
branches/gsoc11-rev-upgrade/base/src/macports1.0/macports.tcl
branches/gsoc11-rev-upgrade/base/src/port/port.tcl
branches/gsoc11-rev-upgrade/base/src/port1.0/portconfigure.tcl
branches/gsoc11-rev-upgrade/base/src/port1.0/portlint.tcl
branches/gsoc11-rev-upgrade/base/src/port1.0/portutil.tcl
Property Changed:
----------------
branches/gsoc11-rev-upgrade/base/
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-86078
/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-87593
/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-11-27 13:20:42 UTC (rev 87593)
+++ branches/gsoc11-rev-upgrade/base/ChangeLog 2011-11-27 22:25:18 UTC (rev 87594)
@@ -5,6 +5,8 @@
Unreleased changes:
+ - port lint now recognizes licenses (snc in r85929, r86016)
+
- Implement new option-replace using lsearch/lreplace. The old behavior is
deprecated for option-replace with only one argument, but can still be
found in option-strsed.
Modified: branches/gsoc11-rev-upgrade/base/doc/portfile.7
===================================================================
--- branches/gsoc11-rev-upgrade/base/doc/portfile.7 2011-11-27 13:20:42 UTC (rev 87593)
+++ branches/gsoc11-rev-upgrade/base/doc/portfile.7 2011-11-27 22:25:18 UTC (rev 87594)
@@ -84,9 +84,14 @@
If a port's version numbering changes such that a newer version looks
older than the previous version, the
.Ic epoch
-should be increased. Often the
+should be increased. Some
+.Nm Portfile
+authors have used large
.Ic epoch
-is formatted like a date.
+values that look like a date, but there is no reason to do so. The
+.Ic epoch
+is simply an unsigned integer, and the only requirement is that it never be
+decreased.
.br
.Sy Type:
.Em optional
@@ -95,7 +100,7 @@
.Em 0
.br
.Sy Example:
-.Dl epoch 20041231
+.Dl epoch 1
.It Ic description
One line description of the software and what it does. To appear in the
description, brackets and semi-colons need to be escaped with a backslash (i.e.
@@ -201,6 +206,28 @@
.br
.Sy Example:
.Dl platforms darwin
+.It Ic supported_archs
+The CPU architectures for which this port can be built. Archs currently
+supported by Mac OS X are: i386, ppc, ppc64, x86_64. If this option is not set,
+it is assumed that the port can build for all archs. If a port does not install
+any architecture-specific files, use the special value noarch.
+.br
+If the building architecture isn't among supported_archs, port fails with an
+error message except when building on x86_64 (or ppc64) and supported_archs
+contains i386 (or ppc). In this case, the port will be built in 32-bit mode.
+.br
+.Sy Type:
+.Em optional
+.br
+.Sy Values:
+.Em i386 x86_64 ppc ppc64 noarch
+.br
+.Sy Default:
+.Em i386 x86_64 ppc ppc64
+.br
+.Sy Examples:
+.Dl supported_archs i386 x86_64
+.Dl supported_archs noarch
.It Ic homepage
Project homepage for the port.
.br
@@ -257,7 +284,7 @@
.Ic distfiles .
The checksum
.Ar type
-can currently be md5, rmd160 or sha1. The
+can currently be md5, sha1, rmd160 or sha256. The
.Ar filename
can be omitted if there is only one distfile.
.br
@@ -301,10 +328,10 @@
.Em optional
.br
.Sy Default:
-.Em no
+.Em yes
.br
.Sy Example:
-.Dl use_parallel_build yes
+.Dl use_parallel_build no
.It Ic use_automake
If set to yes, run the
.Cm automake
@@ -459,7 +486,7 @@
basis.
.br
.Sy Example:
-.Dl configure.env CPP=/usr/bin/cpp-4.0
+.Dl build.env CC="${configure.cc} [get_canonical_archflags]"
.It Va target Ns Ic .pre_args
Additional arguments passed before the main arguments.
.br
@@ -595,7 +622,7 @@
.Em read-only
.br
.Sy Default:
-.Em /Applications/Macports
+.Em /Applications/MacPorts
.It Ic frameworks_dir
Absolute path to the final location to install Mac OS X framework
bundles (.framework directories).
@@ -607,7 +634,7 @@
.Em ${prefix}/Library/Frameworks
.El
.Sh DEPENDENCY OPTIONS
-Port dependencies should refer to other MacPort ports
+Port dependencies should refer to other MacPorts ports
whenever possible, therefore each dependency should be
expressed in the format:
.Bl -tag -width ls
@@ -670,7 +697,7 @@
.Em optional
.br
.Sy Example:
-.Dl depends_extract port:xz-devel
+.Dl depends_extract path:bin/xz:xz
.It Ic depends_build
List of dependencies to check before
.Cm configure ,
@@ -788,7 +815,7 @@
.Em optional
.br
.Sy Example:
-.Dl patchfiles japanese-widechar-fix.diff japanese-localization.diff
+.Dl patchfiles patch-Makefile.in.diff patch-main.c.diff
.It Ic use_zip
Use zip.
.br
@@ -965,9 +992,9 @@
.Em none
.br
.Sy Example:
-.Dl svn.url http://www.domain.com/svn-repo/mydirectory
- svn.url svn://www.domain.com/svn-repo/mydirectory
-.It Ic svn.tag
+.Dl svn.url https://www.example.com/svn/project/tags/1.2.3
+ svn.url svn://www.example.com/svn/project/tags/1.2.3
+.It Ic svn.revision
Specify a tag from which svn should fetch files. This
corresponds to the -r option to the svn cli. Note that you
will need to use backslashes to escape characters that have
@@ -981,8 +1008,8 @@
.Em none
.br
.Sy Example:
-.Dl svn.tag 37192
- svn.tag \\{\\"2006-02-17 15:30 +0230\\"\\}
+.Dl svn.revision 37192
+ svn.revision \\{\\"2006-02-17 15:30 +0230\\"\\}
.El
.Ss FETCHING FROM GIT
As an alternative to fetching distribution files, pulling the sources
@@ -1193,32 +1220,28 @@
.Em gcc-3.3
.Em gcc-4.0
.Em gcc-4.2
-use the standard system compiler suites,
.Em llvm-gcc-4.2
.Em clang
-use the newer, non-default compilers installed by Xcode,
-.Em apple-gcc-3.3
+use the standard Xcode compiler suites,
.Em apple-gcc-4.0
.Em apple-gcc-4.2
use Apple's gcc suite installed via MacPorts,
-.Em macports-gcc-3.3
-.Em macports-gcc-3.4
-.Em macports-gcc-4.0
-.Em macports-gcc-4.1
.Em macports-gcc-4.2
.Em macports-gcc-4.3
.Em macports-gcc-4.4
.Em macports-gcc-4.5
-use the vanilla gcc installed via MacPorts.
+.Em macports-gcc-4.6
+.Em macports-llvm-gcc-4.2
+use the vanilla compiler suites installed via MacPorts.
.br
.Sy Type:
.Em optional
.br
.Sy Values:
-.Em gcc-3.3 gcc-4.0 gcc-4.2 llvm-gcc-4.2 clang apple-gcc-3.3 apple-gcc-4.0 apple-gcc-4.2 macports-gcc-3.3 macports-gcc-3.4 macports-gcc-4.0 macports-gcc-4.1 macports-gcc-4.2 macports-gcc-4.3 macports-gcc-4.4 macports-gcc-4.5
+.Em gcc-3.3 gcc-4.0 gcc-4.2 llvm-gcc-4.2 clang apple-gcc-4.0 apple-gcc-4.2 macports-gcc-4.2 macports-gcc-4.3 macports-gcc-4.4 macports-gcc-4.5 macports-gcc-4.6 macports-llvm-gcc-4.2
.br
.Sy Example:
-.Dl configure.compiler gcc-4.0
+.Dl configure.compiler llvm-gcc-4.2
.\" FOOBAR
.El
.Ss UNIVERSAL TARGET HOOKS
@@ -1747,7 +1770,7 @@
.Bd -literal -offset indent -compact
variant gnome requires glib { configure.args-append --with-gnome \e\
- depends_lib-append lib:gnome-session:gnome-session }
+ depends_lib-append port:gnome-session }
.Ed
.It Ic default_variants
If variants are defined, then the
@@ -1796,7 +1819,7 @@
.Xc
The body is executed if the given platform/version/arch combination matches
os.platform or os.subplatform and/or os.major and/or os.arch.
-The following examples are from the databases/db4 and devel/libidl1
+The following examples are from the lang/php5, audio/flac and sysutils/getopt
.Nm Portfiles
respectively.
.br
@@ -1805,20 +1828,18 @@
.br
.Sy Example:
.Bd -literal -offset indent -compact
-platform darwin 6 { configure.args-append --enable-tcl \e\
-
- --with-tcl=/System/Library/Tcl/8.3 }
+platform darwin 10 { configure.env-append LIBS=-lresolv }
.Ed
.br
.Sy Example:
.Bd -literal -offset indent -compact
-platform darwin powerpc { configure.args-append \e\
-
- --host=${os.arch}-apple-rhapsody${os.version} }
-platform darwin i386 { configure.args-append \e\
-
- --host=i386-gnu-rhapsody${os.version} }
+platform darwin i386 { configure.args-append --disable-asm-optimizations }
.Ed
+.br
+.Sy Example:
+.Bd -literal -offset indent -compact
+platform darwin 8 powerpc { configure.universal_ldflags-append -liconv }
+.Ed
.El
.Sh PORTGROUP
To factorize the work with similar ports, MacPorts provides the notion of
@@ -2122,7 +2143,7 @@
.It Ic vercmp Ar versionA Ar versionB
Compare two EVR-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
+later than versionB, respectively. Note that some comparisons featuring
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).
Modified: branches/gsoc11-rev-upgrade/base/portmgr/jobs/port_binary_distributable.tcl
===================================================================
--- branches/gsoc11-rev-upgrade/base/portmgr/jobs/port_binary_distributable.tcl 2011-11-27 13:20:42 UTC (rev 87593)
+++ branches/gsoc11-rev-upgrade/base/portmgr/jobs/port_binary_distributable.tcl 2011-11-27 22:25:18 UTC (rev 87594)
@@ -34,9 +34,9 @@
# 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 {afl agpl apache apsl artistic autoconf bitstreamvera \
- boost bsd bsd-old cecill cecill-b cecill-c copyleft cpl \
- curl epl fpll fontconfig freebsd freetype gd gfdl gpl \
+set good_licenses {afl agpl apache apsl artistic autoconf beopen bitstreamvera \
+ boost bsd bsd-old cecill cecill-b cecill-c cnri copyleft \
+ cpl curl epl fpll fontconfig freetype gd gfdl gpl \
gplconflict ibmpl ijg isc jasper lgpl libtool lppl mit \
mpl ncsa noncommercial openldap openssl permissive php \
psf public-domain qpl restrictive/distributable ruby \
@@ -62,13 +62,15 @@
apache-1 {agpl gpl}
apache-1.1 {agpl gpl}
apsl {cecill gpl}
+ beopen {cecill gpl}
bsd-old {cecill gpl}
+ cnri {cecill gpl}
cpl {cecill gpl}
- cecill {afl agpl apache apsl bsd-old cpl epl gd gplconflict ibmpl lppl mpl noncommercial openssl php qpl restrictive/distributable ruby ssleay zpl-1}
+ cecill {afl agpl apache apsl beopen bsd-old cnri cpl epl gd gplconflict ibmpl lppl mpl noncommercial openssl php qpl restrictive/distributable ruby ssleay zpl-1}
epl {cecill gpl}
freetype {gpl-2}
gd {cecill gpl}
- gpl {afl agpl apache-1 apache-1.1 apsl bsd-old cpl epl gd gplconflict ibmpl lppl mpl noncommercial openssl php qpl restrictive/distributable ruby ssleay zpl-1}
+ gpl {afl agpl apache-1 apache-1.1 apsl beopen cnri bsd-old cpl epl gd gplconflict ibmpl lppl mpl noncommercial openssl php qpl restrictive/distributable ruby 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}
@@ -225,7 +227,7 @@
if {!$any_good} {
if {$verbose} {
- puts "dependency '$aPort' has license '$lic' which is not known to be distributable"
+ puts "${portName}'s dependency '$aPort' has license '$lic' which is not known to be distributable"
}
return 1
}
Modified: branches/gsoc11-rev-upgrade/base/src/macports1.0/macports.tcl
===================================================================
--- branches/gsoc11-rev-upgrade/base/src/macports1.0/macports.tcl 2011-11-27 13:20:42 UTC (rev 87593)
+++ branches/gsoc11-rev-upgrade/base/src/macports1.0/macports.tcl 2011-11-27 22:25:18 UTC (rev 87594)
@@ -1976,8 +1976,10 @@
switch -regexp -- [macports::getprotocol $source] {
{^file$} {
set portdir [macports::getportdir $source]
- if {[file exists $portdir/.svn]} {
- set svn_commandline "[macports::findBinary svn] update --non-interactive ${portdir}"
+ set svn_cmd ""
+ catch {set svn_cmd [macports::findBinary svn]}
+ if {$svn_cmd != "" && ([file exists $portdir/.svn] || ![catch {exec $svn_cmd info $portdir > /dev/null 2>@1}])} {
+ set svn_commandline "$svn_cmd update --non-interactive ${portdir}"
ui_debug $svn_commandline
if {
[catch {
@@ -2725,7 +2727,7 @@
} elseif {[info exists dep_portinfo(installs_libs)] && !$dep_portinfo(installs_libs)} {
set check_archs 0
}
- lappend options subport $dep_portname
+ lappend options subport $dep_portinfo(name)
# Figure out the depport. Check the open_mports list first, since
# we potentially leak mport references if we mportopen each time,
# because mportexec only closes each open mport once.
@@ -3167,7 +3169,6 @@
proc macports::_upgrade {portname dspec variationslist optionslist {depscachename ""}} {
global macports::global_variations
array set options $optionslist
- set options(subport) $portname
if {![string match "" $depscachename]} {
upvar $depscachename depscache
@@ -3205,6 +3206,7 @@
array set portinfo [lindex $result 1]
# set portname again since the one we were passed may not have had the correct case
set portname $portinfo(name)
+ set options(subport) $portname
set ilist {}
if { [catch {set ilist [registry::installed $portname ""]} result] } {
Modified: branches/gsoc11-rev-upgrade/base/src/port/port.tcl
===================================================================
--- branches/gsoc11-rev-upgrade/base/src/port/port.tcl 2011-11-27 13:20:42 UTC (rev 87593)
+++ branches/gsoc11-rev-upgrade/base/src/port/port.tcl 2011-11-27 22:25:18 UTC (rev 87594)
@@ -1051,7 +1051,7 @@
set porturl $portinfo(porturl)
# open portfile
- if {[catch {set mport [mportopen $porturl [list subport $portname] [array get global_variations]]} result]} {
+ if {[catch {set mport [mportopen $porturl [list subport $portinfo(name)] [array get global_variations]]} result]} {
ui_debug "$::errorInfo"
return -code error "Unable to open port: $result"
}
@@ -1097,7 +1097,7 @@
set porturl $portinfo(porturl)
# open its portfile
- if {[catch {set mport [mportopen $porturl [list subport $depname] [array get global_variations]]} result]} {
+ if {[catch {set mport [mportopen $porturl [list subport $portinfo(name)] [array get global_variations]]} result]} {
ui_debug "$::errorInfo"
ui_error "Unable to open port: $result"
continue
@@ -1886,6 +1886,7 @@
set index_only 1
}
puts -nonewline $separator
+ array unset portinfo
# If we have a url, use that, since it's most specific
# otherwise try to map the portname to a url
if {$porturl == "" || $index_only} {
@@ -1897,7 +1898,6 @@
if {[llength $result] < 2} {
break_softcontinue "Port $portname not found" 1 status
}
- array unset portinfo
array set portinfo [lindex $result 1]
set porturl $portinfo(porturl)
set portdir $portinfo(portdir)
@@ -1914,7 +1914,11 @@
}
}
if {![info exists options(subport)]} {
- set options(subport) $portname
+ if {[info exists portinfo(name)]} {
+ set options(subport) $portinfo(name)
+ } else {
+ set options(subport) $portname
+ }
}
if {[catch {set mport [mportopen $porturl [array get options] [array get merged_variations]]} result]} {
@@ -2239,6 +2243,7 @@
set status 0
foreachport $portlist {
+ array unset portinfo
if {$porturl eq ""} {
# Look up the port.
if {[catch {mportlookup $portname} result]} {
@@ -2251,7 +2256,6 @@
}
# Retrieve the port's URL.
- array unset portinfo
array set portinfo [lindex $result 1]
set porturl $portinfo(porturl)
}
@@ -2266,7 +2270,11 @@
}
}
if {![info exists options(subport)]} {
- set options(subport) $portname
+ if {[info exists portinfo(name)]} {
+ set options(subport) $portinfo(name)
+ } else {
+ set options(subport) $portname
+ }
}
# Open the Portfile associated with this port.
@@ -2730,7 +2738,8 @@
} else {
set deptypes {depends_fetch depends_extract depends_build depends_lib depends_run}
}
-
+
+ array unset portinfo
# If we have a url, use that, since it's most specific
# otherwise try to map the portname to a url
if {$porturl eq ""} {
@@ -2742,7 +2751,6 @@
if {[llength $result] < 2} {
break_softcontinue "Port $portname not found" 1 status
}
- array unset portinfo
array set portinfo [lindex $result 1]
set porturl $portinfo(porturl)
} elseif {$porturl ne "file://."} {
@@ -2761,7 +2769,6 @@
if {[llength $result] < 2} {
break_softcontinue "Portdir $portdir not found" 1 status
}
- array unset portinfo
array set portinfo [lindex $result 1]
}
@@ -2776,7 +2783,11 @@
}
}
if {![info exists options(subport)]} {
- set options(subport) $portname
+ if {[info exists portinfo(name)]} {
+ set options(subport) $portinfo(name)
+ } else {
+ set options(subport) $portname
+ }
}
if {[catch {set mport [mportopen $porturl [array get options] [array get merged_variations]]} result]} {
ui_debug "$::errorInfo"
@@ -2856,7 +2867,7 @@
array unset portinfo
array set portinfo [lindex $result 1]
set porturl $portinfo(porturl)
- set options(subport) $depname
+ set options(subport) $portinfo(name)
# open the portfile if requested
if {!([info exists options(ports_${action}_index)] && $options(ports_${action}_index) eq "yes")} {
@@ -3298,6 +3309,7 @@
return 1
}
foreachport $portlist {
+ array unset portinfo
if {$porturl eq ""} {
# look up port
if {[catch {mportlookup $portname} result]} {
@@ -3309,7 +3321,6 @@
break_softcontinue "Port $portname not found" 1 status
}
- array unset portinfo
array set portinfo [lindex $result 1]
set porturl $portinfo(porturl)
@@ -3318,7 +3329,11 @@
if {!([info exists options(ports_variants_index)] && $options(ports_variants_index) eq "yes")} {
if {![info exists options(subport)]} {
- set options(subport) $portname
+ if {[info exists portinfo(name)]} {
+ set options(subport) $portinfo(name)
+ } else {
+ set options(subport) $portname
+ }
}
if {[catch {set mport [mportopen $porturl [array get options] [array get variations]]} result]} {
ui_debug "$::errorInfo"
@@ -3813,6 +3828,7 @@
return 1
}
foreachport $portlist {
+ array unset portinfo
# If we have a url, use that, since it's most specific
# otherwise try to map the portname to a url
if {$porturl == ""} {
@@ -3831,7 +3847,6 @@
break_softcontinue "Port $portname not found" 1 status
}
}
- array unset portinfo
array set portinfo [lindex $res 1]
set porturl $portinfo(porturl)
}
@@ -3866,7 +3881,11 @@
set target $action
}
if {![info exists options(subport)]} {
- set options(subport) $portname
+ if {[info exists portinfo(name)]} {
+ set options(subport) $portinfo(name)
+ } else {
+ set options(subport) $portname
+ }
}
if {[catch {set workername [mportopen $porturl [array get options] [array get requested_variations]]} result]} {
global errorInfo
Modified: branches/gsoc11-rev-upgrade/base/src/port1.0/portconfigure.tcl
===================================================================
--- branches/gsoc11-rev-upgrade/base/src/port1.0/portconfigure.tcl 2011-11-27 13:20:42 UTC (rev 87593)
+++ branches/gsoc11-rev-upgrade/base/src/port1.0/portconfigure.tcl 2011-11-27 22:25:18 UTC (rev 87594)
@@ -201,9 +201,9 @@
gcc-4.2 { set name "Mac OS X gcc 4.2" }
llvm-gcc-4.2 { set name "Mac OS X llvm-gcc 4.2" }
clang { set name "Mac OS X clang" }
- apple-gcc-3.3 { set name "MacPorts Apple gcc 3.3" }
apple-gcc-4.0 { set name "MacPorts Apple gcc 4.0" }
apple-gcc-4.2 { set name "MacPorts Apple gcc 4.2" }
+ macports-gcc { set name "MacPorts gcc (port select)" }
macports-gcc-4.0 { set name "MacPorts gcc 4.0" }
macports-gcc-4.1 { set name "MacPorts gcc 4.1" }
macports-gcc-4.2 { set name "MacPorts gcc 4.2" }
@@ -212,7 +212,10 @@
macports-gcc-4.5 { set name "MacPorts gcc 4.5" }
macports-gcc-4.6 { set name "MacPorts gcc 4.6" }
macports-llvm-gcc-4.2 { set name "MacPorts llvm-gcc 4.2" }
- macports-clang { set name "MacPorts clang" }
+ macports-clang { set name "MacPorts clang (port select)" }
+ macports-clang-2.9 { set name "MacPorts clang 2.9" }
+ macports-clang-3.0 { set name "MacPorts clang 3.0" }
+ macports-clang-3.1 { set name "MacPorts clang 3.1" }
default { return -code error "Invalid value for configure.compiler" }
}
ui_debug "Using compiler '$name'"
@@ -433,12 +436,6 @@
}
}
}
- apple-gcc-3.3 {
- switch -exact ${type} {
- cc { set ret ${prefix}/bin/gcc-apple-3.3 }
- cpp { set ret ${prefix}/bin/cpp-apple-3.3 }
- }
- }
apple-gcc-4.0 {
switch -exact ${type} {
cc { set ret ${prefix}/bin/gcc-apple-4.0 }
@@ -454,6 +451,17 @@
cxx { set ret ${prefix}/bin/g++-apple-4.2 }
}
}
+ macports-gcc {
+ switch -exact ${type} {
+ cc { set ret ${prefix}/bin/gcc }
+ objc { set ret ${prefix}/bin/gcc }
+ cxx { set ret ${prefix}/bin/g++ }
+ cpp { set ret ${prefix}/bin/cpp }
+ fc { set ret ${prefix}/bin/gfortran }
+ f77 { set ret ${prefix}/bin/gfortran }
+ f90 { set ret ${prefix}/bin/gfortran }
+ }
+ }
macports-gcc-4.0 {
switch -exact ${type} {
cc { set ret ${prefix}/bin/gcc-mp-4.0 }
@@ -549,6 +557,27 @@
cxx { set ret ${prefix}/bin/clang++ }
}
}
+ macports-clang-2.9 {
+ switch -exact ${type} {
+ cc { set ret ${prefix}/bin/clang-mp-2.9 }
+ objc { set ret ${prefix}/bin/clang-mp-2.9 }
+ cxx { set ret ${prefix}/bin/clang++-mp-2.9 }
+ }
+ }
+ macports-clang-3.0 {
+ switch -exact ${type} {
+ cc { set ret ${prefix}/bin/clang-mp-3.0 }
+ objc { set ret ${prefix}/bin/clang-mp-3.0 }
+ cxx { set ret ${prefix}/bin/clang++-mp-3.0 }
+ }
+ }
+ macports-clang-3.1 {
+ switch -exact ${type} {
+ cc { set ret ${prefix}/bin/clang-mp-3.1 }
+ objc { set ret ${prefix}/bin/clang-mp-3.1 }
+ cxx { set ret ${prefix}/bin/clang++-mp-3.1 }
+ }
+ }
}
return $ret
}
Modified: branches/gsoc11-rev-upgrade/base/src/port1.0/portlint.tcl
===================================================================
--- branches/gsoc11-rev-upgrade/base/src/port1.0/portlint.tcl 2011-11-27 13:20:42 UTC (rev 87593)
+++ branches/gsoc11-rev-upgrade/base/src/port1.0/portlint.tcl 2011-11-27 22:25:18 UTC (rev 87594)
@@ -292,6 +292,7 @@
global description long_description platforms categories all_variants
global maintainers license homepage master_sites checksums patchfiles
global depends_fetch depends_extract depends_lib depends_build depends_run distfiles fetch.type
+ global livecheck.type subport name
global lint_portsystem lint_platforms
global lint_required lint_optional
@@ -554,6 +555,10 @@
}
+ if {$subport != $name && ${livecheck.type} != "none"} {
+ ui_warn "livecheck set for subport $subport"
+ }
+
# these checks are only valid for ports stored in the regular tree directories
if {[info exists category] && $portcatdir != $category} {
ui_error "Portfile parent directory $portcatdir does not match primary category $category"
Modified: branches/gsoc11-rev-upgrade/base/src/port1.0/portutil.tcl
===================================================================
--- branches/gsoc11-rev-upgrade/base/src/port1.0/portutil.tcl 2011-11-27 13:20:42 UTC (rev 87593)
+++ branches/gsoc11-rev-upgrade/base/src/port1.0/portutil.tcl 2011-11-27 22:25:18 UTC (rev 87594)
@@ -781,7 +781,7 @@
if {![info exists PortInfo(subports)] || [lsearch -exact $PortInfo(subports) $subname] == -1} {
lappend PortInfo(subports) $subname
}
- if {$subname == $subport} {
+ if {[string equal -nocase $subname $subport]} {
set PortInfo(name) $subname
uplevel 1 $body
}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111127/273a6c04/attachment-0001.html>
More information about the macports-changes
mailing list