[100435] trunk/base/src/package1.0
blair at macports.org
blair at macports.org
Tue Dec 11 21:45:24 PST 2012
Revision: 100435
https://trac.macports.org/changeset/100435
Author: blair at macports.org
Date: 2012-12-11 21:45:23 -0800 (Tue, 11 Dec 2012)
Log Message:
-----------
src/package1.0/port{m,}pkg.tcl: replace tabs with 4 spaces.
Modified Paths:
--------------
trunk/base/src/package1.0/portmpkg.tcl
trunk/base/src/package1.0/portpkg.tcl
Modified: trunk/base/src/package1.0/portmpkg.tcl
===================================================================
--- trunk/base/src/package1.0/portmpkg.tcl 2012-12-12 05:42:07 UTC (rev 100434)
+++ trunk/base/src/package1.0/portmpkg.tcl 2012-12-12 05:45:23 UTC (rev 100435)
@@ -60,26 +60,26 @@
proc portmpkg::make_dependency_list {portname destination} {
global variations prefix package.destpath package.flat
- set result {}
- if {[catch {set res [mport_lookup $portname]} error]} {
- global errorInfo
- ui_debug "$errorInfo"
- return -code error "port lookup failed: $error"
- }
- array set portinfo [lindex $res 1]
+ set result {}
+ if {[catch {set res [mport_lookup $portname]} error]} {
+ global errorInfo
+ ui_debug "$errorInfo"
+ return -code error "port lookup failed: $error"
+ }
+ array set portinfo [lindex $res 1]
- if {[getuid] == 0 && [geteuid] != 0} {
- setegid 0; seteuid 0
- set deprivileged 1
- }
+ if {[getuid] == 0 && [geteuid] != 0} {
+ setegid 0; seteuid 0
+ set deprivileged 1
+ }
- set mport [mport_open $portinfo(porturl) [list prefix $prefix package.destpath ${destination} package.flat ${package.flat} subport $portinfo(name)] [array get variations]]
+ set mport [mport_open $portinfo(porturl) [list prefix $prefix package.destpath ${destination} package.flat ${package.flat} subport $portinfo(name)] [array get variations]]
if {[info exists deprivileged]} {
- global macportsuser
- setegid [uname_to_gid "$macportsuser"]
- seteuid [name_to_uid "$macportsuser"]
- }
+ global macportsuser
+ setegid [uname_to_gid "$macportsuser"]
+ seteuid [name_to_uid "$macportsuser"]
+ }
unset portinfo
array set portinfo [mport_info $mport]
@@ -97,14 +97,14 @@
}
lappend result [list $portinfo(name) $portinfo(version) $mport]
- return $result
+ return $result
}
proc portmpkg::make_one_package {portname portversion mport} {
- if {[getuid] == 0 && [geteuid] != 0} {
- setegid 0; seteuid 0
- set deprivileged 1
- }
+ if {[getuid] == 0 && [geteuid] != 0} {
+ setegid 0; seteuid 0
+ set deprivileged 1
+ }
ui_debug "building dependency package: $portname"
set result [mport_exec $mport pkg]
@@ -113,17 +113,17 @@
error "Processing of port $portname failed"
}
- if {[info exists deprivileged]} {
- global macportsuser
- setegid [uname_to_gid "$macportsuser"]
- seteuid [name_to_uid "$macportsuser"]
- }
+ if {[info exists deprivileged]} {
+ global macportsuser
+ setegid [uname_to_gid "$macportsuser"]
+ seteuid [name_to_uid "$macportsuser"]
+ }
}
proc portmpkg::package_mpkg {portname portversion portrevision} {
global portdbpath os.major destpath workpath prefix porturl description package.destpath package.flat long_description homepage depends_run depends_lib
- set mpkgpath ${package.destpath}/${portname}-${portversion}.mpkg
+ set mpkgpath ${package.destpath}/${portname}-${portversion}.mpkg
if {${package.flat} && ${os.major} >= 10} {
set pkgpath ${package.destpath}/${portname}-${portversion}-component.pkg
@@ -131,35 +131,35 @@
set resources_path ${workpath}/mpkg_resources
} else {
set pkgpath ${package.destpath}/${portname}-${portversion}.pkg
- set packages_path ${mpkgpath}/Contents/Packages
- set resources_path ${mpkgpath}/Contents/Resources
- }
- system "mkdir -p -m 0755 ${packages_path}"
- system "mkdir -p -m 0755 ${resources_path}"
+ set packages_path ${mpkgpath}/Contents/Packages
+ set resources_path ${mpkgpath}/Contents/Resources
+ }
+ system "mkdir -p -m 0755 ${packages_path}"
+ system "mkdir -p -m 0755 ${resources_path}"
- set dependencies {}
- # get deplist
- set deps [make_dependency_list $portname $packages_path]
- set deps [lsort -unique $deps]
- foreach dep $deps {
- set name [lindex $dep 0]
- set vers [lindex $dep 1]
- set mport [lindex $dep 2]
- # don't re-package ourself
- if {$name != $portname} {
- make_one_package $name $vers $mport
- if {${package.flat} && ${os.major} >= 10} {
- lappend dependencies org.macports.${name} ${name}-${vers}-component.pkg
- } else {
- lappend dependencies ${name}-${vers}.pkg
- }
- }
- }
- if {${package.flat} && ${os.major} >= 10} {
- lappend dependencies org.macports.${portname} ${portname}-${portversion}-component.pkg
- } else {
- lappend dependencies ${portname}-${portversion}.pkg
- }
+ set dependencies {}
+ # get deplist
+ set deps [make_dependency_list $portname $packages_path]
+ set deps [lsort -unique $deps]
+ foreach dep $deps {
+ set name [lindex $dep 0]
+ set vers [lindex $dep 1]
+ set mport [lindex $dep 2]
+ # don't re-package ourself
+ if {$name != $portname} {
+ make_one_package $name $vers $mport
+ if {${package.flat} && ${os.major} >= 10} {
+ lappend dependencies org.macports.${name} ${name}-${vers}-component.pkg
+ } else {
+ lappend dependencies ${name}-${vers}.pkg
+ }
+ }
+ }
+ if {${package.flat} && ${os.major} >= 10} {
+ lappend dependencies org.macports.${portname} ${portname}-${portversion}-component.pkg
+ } else {
+ lappend dependencies ${portname}-${portversion}.pkg
+ }
# copy our own pkg into the mpkg
system "cp -PR ${pkgpath} ${packages_path}"
@@ -189,7 +189,7 @@
system $cmdline
}
- return 0
+ return 0
}
proc portmpkg::write_distribution {dfile portname dependencies} {
@@ -226,61 +226,61 @@
}
proc portmpkg::xml_escape {s} {
- regsub -all {&} $s {\&} s
- regsub -all {<} $s {\<} s
- regsub -all {>} $s {\>} s
- return $s
+ regsub -all {&} $s {\&} s
+ regsub -all {<} $s {\<} s
+ regsub -all {>} $s {\>} s
+ return $s
}
proc portmpkg::mpkg_write_info_plist {infofile portname portversion portrevision destination dependencies} {
- set vers [split $portversion "."]
+ set vers [split $portversion "."]
- if {[string index $destination end] != "/"} {
- append destination /
- }
+ if {[string index $destination end] != "/"} {
+ append destination /
+ }
- set depxml ""
- foreach dep $dependencies {
- set dep [xml_escape $dep]
- append depxml "<dict>
- <key>IFPkgFlagPackageLocation</key>
- <string>${dep}</string>
- <key>IFPkgFlagPackageSelection</key>
- <string>selected</string>
- </dict>
- "
- }
+ set depxml ""
+ foreach dep $dependencies {
+ set dep [xml_escape $dep]
+ append depxml "<dict>
+ <key>IFPkgFlagPackageLocation</key>
+ <string>${dep}</string>
+ <key>IFPkgFlagPackageSelection</key>
+ <string>selected</string>
+ </dict>
+ "
+ }
- set portname [xml_escape $portname]
- set portversion [xml_escape $portversion]
- set portrevision [xml_escape $portrevision]
+ set portname [xml_escape $portname]
+ set portversion [xml_escape $portversion]
+ set portrevision [xml_escape $portrevision]
- set infofd [open ${infofile} w+]
- puts $infofd {<?xml version="1.0" encoding="UTF-8"?>
+ set infofd [open ${infofile} w+]
+ puts $infofd {<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
}
- puts $infofd "<dict>
- <key>CFBundleGetInfoString</key>
- <string>${portname} ${portversion}</string>
- <key>CFBundleIdentifier</key>
- <string>org.macports.mpkg.${portname}</string>
- <key>CFBundleName</key>
- <string>${portname}</string>
- <key>CFBundleShortVersionString</key>
- <string>${portversion}</string>
- <key>IFMajorVersion</key>
- <integer>${portrevision}</integer>
- <key>IFMinorVersion</key>
- <integer>0</integer>
- <key>IFPkgFlagComponentDirectory</key>
- <string>./Contents/Packages</string>
- <key>IFPkgFlagPackageList</key>
- <array>
- ${depxml}</array>
- <key>IFPkgFormatVersion</key>
- <real>0.10000000149011612</real>
+ puts $infofd "<dict>
+ <key>CFBundleGetInfoString</key>
+ <string>${portname} ${portversion}</string>
+ <key>CFBundleIdentifier</key>
+ <string>org.macports.mpkg.${portname}</string>
+ <key>CFBundleName</key>
+ <string>${portname}</string>
+ <key>CFBundleShortVersionString</key>
+ <string>${portversion}</string>
+ <key>IFMajorVersion</key>
+ <integer>${portrevision}</integer>
+ <key>IFMinorVersion</key>
+ <integer>0</integer>
+ <key>IFPkgFlagComponentDirectory</key>
+ <string>./Contents/Packages</string>
+ <key>IFPkgFlagPackageList</key>
+ <array>
+ ${depxml}</array>
+ <key>IFPkgFormatVersion</key>
+ <real>0.10000000149011612</real>
</dict>
</plist>"
- close $infofd
+ close $infofd
}
Modified: trunk/base/src/package1.0/portpkg.tcl
===================================================================
--- trunk/base/src/package1.0/portpkg.tcl 2012-12-12 05:42:07 UTC (rev 100434)
+++ trunk/base/src/package1.0/portpkg.tcl 2012-12-12 05:45:23 UTC (rev 100435)
@@ -304,8 +304,8 @@
puts $fd "
<html lang=\"en\">
<head>
- <meta http-equiv=\"content-type\" content=\"text/html; charset=iso-8859-1\">
- <title>Install ${portname}</title>
+ <meta http-equiv=\"content-type\" content=\"text/html; charset=iso-8859-1\">
+ <title>Install ${portname}</title>
</head>
<body>
<font face=\"Helvetica\"><b>Welcome to the ${portname} for Mac OS X Installer</b></font>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20121211/adf511c1/attachment.html>
More information about the macports-changes
mailing list