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

[blair at macports.org]

Revision: 101070
          https://trac.macports.org/changeset/101070
Author:   blair at macports.org
Date:     2013-01-03 15:48:31 -0800 (Thu, 03 Jan 2013)
Log Message:
-----------
portpkg::write_welcome_html: include port revision 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-03 23:48:29 UTC (rev 101069)
+++ trunk/base/src/package1.0/portmpkg.tcl	2013-01-03 23:48:31 UTC (rev 101070)
@@ -178,7 +178,7 @@
             set pkg_$variable [set $variable]
         }
     }
-    portpkg::write_welcome_html ${resources_path}/Welcome.html $portname $portversion $pkg_long_description $pkg_description $pkg_homepage
+    portpkg::write_welcome_html ${resources_path}/Welcome.html $portname $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-03 23:48:29 UTC (rev 101069)
+++ trunk/base/src/package1.0/portpkg.tcl	2013-01-03 23:48:31 UTC (rev 101070)
@@ -59,7 +59,8 @@
     global packagemaker_path portpkg::packagemaker \
            portpkg::language xcodeversion portpath porturl \
            package.resources package.scripts package.flat \
-           subport version description long_description homepage workpath os.major
+           subport version revision description long_description \
+           homepage workpath os.major
 
     if {![info exists packagemaker_path]} {
         if {[vercmp $xcodeversion 4.3] >= 0} {
@@ -87,7 +88,7 @@
             set pkg_$variable [set $variable]
         }
     }
-    write_welcome_html ${package.resources}/${language}.lproj/Welcome.html $subport $version $pkg_long_description $pkg_description $pkg_homepage
+    write_welcome_html ${package.resources}/${language}.lproj/Welcome.html $subport $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} {
@@ -289,7 +290,7 @@
     close $infofd
 }
 
-proc portpkg::write_welcome_html {filename portname portversion long_description description homepage} {
+proc portpkg::write_welcome_html {filename portname portversion portrevision long_description description homepage} {
     set fd [open ${filename} w+]
     if {$long_description == ""} {
         set long_description $description
@@ -297,6 +298,7 @@
 
     set portname [xml_escape $portname]
     set portversion [xml_escape $portversion]
+    set portrevision [xml_escape $portrevision]
     set long_description [xml_escape $long_description]
     set description [xml_escape $description]
     set homepage [xml_escape $homepage]
@@ -317,7 +319,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} 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} ${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/20130103/92533c2b/attachment.html>