[101128] trunk/base/src/package1.0

[blair at macports.org]

Revision: 101128
          https://trac.macports.org/changeset/101128
Author:   blair at macports.org
Date:     2013-01-04 14:35:53 -0800 (Fri, 04 Jan 2013)
Log Message:
-----------
portpkg::write_welcome_html: include port epoch in generated HTML.

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	2013-01-04 22:35:50 UTC (rev 101127)
+++ trunk/base/src/package1.0/portmpkg.tcl	2013-01-04 22:35:53 UTC (rev 101128)
@@ -48,14 +48,14 @@
 set_ui_prefix
 
 proc portmpkg::mpkg_main {args} {
-    global subport version revision os.major package.destpath package.flat UI_PREFIX
+    global subport epoch version revision os.major package.destpath package.flat UI_PREFIX
 
     if {!${package.flat} || ${os.major} < 10} {
         # Make sure the destination path exists.
         file mkdir ${package.destpath}
     }
 
-    return [package_mpkg $subport $version $revision]
+    return [package_mpkg $subport $epoch $version $revision]
 }
 
 proc portmpkg::make_dependency_list {portname destination} {
@@ -120,7 +120,7 @@
     }
 }
 
-proc portmpkg::package_mpkg {portname portversion portrevision} {
+proc portmpkg::package_mpkg {portname portepoch 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}_${portrevision}.mpkg
@@ -179,7 +179,7 @@
             set pkg_$variable [set $variable]
         }
     }
-    portpkg::write_welcome_html ${resources_path}/Welcome.html $portname $portversion $portrevision $pkg_long_description $pkg_description $pkg_homepage
+    portpkg::write_welcome_html ${resources_path}/Welcome.html $portname $portepoch $portversion $portrevision $pkg_long_description $pkg_description $pkg_homepage
     file copy -force -- [getportresourcepath $porturl "port1.0/package/background.tiff"] ${resources_path}/background.tiff
 
     if {${package.flat} && ${os.major} >= 10} {

Modified: trunk/base/src/package1.0/portpkg.tcl
===================================================================
--- trunk/base/src/package1.0/portpkg.tcl	2013-01-04 22:35:50 UTC (rev 101127)
+++ trunk/base/src/package1.0/portpkg.tcl	2013-01-04 22:35:53 UTC (rev 101128)
@@ -59,7 +59,7 @@
     global packagemaker_path portpkg::packagemaker \
            portpkg::language xcodeversion portpath porturl \
            package.resources package.scripts package.flat \
-           subport version revision description long_description \
+           subport epoch version revision description long_description \
            homepage workpath os.major
 
     if {![info exists packagemaker_path]} {
@@ -88,7 +88,7 @@
             set pkg_$variable [set $variable]
         }
     }
-    write_welcome_html ${package.resources}/${language}.lproj/Welcome.html $subport $version $revision $pkg_long_description $pkg_description $pkg_homepage
+    write_welcome_html ${package.resources}/${language}.lproj/Welcome.html $subport $epoch $version $revision $pkg_long_description $pkg_description $pkg_homepage
     file copy -force -- [getportresourcepath $porturl "port1.0/package/background.tiff"] ${package.resources}/${language}.lproj/background.tiff
 
     if {${package.flat} && ${os.major} >= 9} {
@@ -291,13 +291,14 @@
     close $infofd
 }
 
-proc portpkg::write_welcome_html {filename portname portversion portrevision long_description description homepage} {
+proc portpkg::write_welcome_html {filename portname portepoch portversion portrevision long_description description homepage} {
     set fd [open ${filename} w+]
     if {$long_description == ""} {
         set long_description $description
     }
 
     set portname [xml_escape $portname]
+    set portepoch [xml_escape $portepoch]
     set portversion [xml_escape $portversion]
     set portrevision [xml_escape $portrevision]
     set long_description [xml_escape $long_description]
@@ -320,7 +321,7 @@
         puts $fd "<font face=\"Helvetica\"><a href=\"${homepage}\">${homepage}</a></font><p>"
     }
 
-    puts $fd "<font face=\"Helvetica\">This installer guides you through the steps necessary to install ${portname} ${portversion}_${portrevision} for Mac OS X. To get started, click Continue.</font>
+    puts $fd "<font face=\"Helvetica\">This installer guides you through the steps necessary to install ${portname} ${portepoch}_${portversion}_${portrevision} for Mac OS X. To get started, click Continue.</font>
 </body>
 </html>"
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130104/f3671328/attachment-0001.html>