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

[blair at macports.org]

Revision: 101129
          https://trac.macports.org/changeset/101129
Author:   blair at macports.org
Date:     2013-01-04 14:35:56 -0800 (Fri, 04 Jan 2013)
Log Message:
-----------
portpkg/portmpkg: include port epoch in .pkg filenames.

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:53 UTC (rev 101128)
+++ trunk/base/src/package1.0/portmpkg.tcl	2013-01-04 22:35:56 UTC (rev 101129)
@@ -96,7 +96,7 @@
         }
     }
 
-    lappend result [list $portinfo(name) $portinfo(version) $portinfo(revision) $mport]
+    lappend result [list $portinfo(name) $portinfo(epoch) $portinfo(version) $portinfo(revision) $mport]
     return $result
 }
 
@@ -126,11 +126,11 @@
     set mpkgpath ${package.destpath}/${portname}-${portversion}_${portrevision}.mpkg
 
     if {${package.flat} && ${os.major} >= 10} {
-        set pkgpath ${package.destpath}/${portname}-${portversion}_${portrevision}-component.pkg
+        set pkgpath ${package.destpath}/${portname}-${portepoch}_${portversion}_${portrevision}-component.pkg
         set packages_path ${workpath}/mpkg_packages
         set resources_path ${workpath}/mpkg_resources
     } else {
-        set pkgpath ${package.destpath}/${portname}-${portversion}_${portrevision}.pkg
+        set pkgpath ${package.destpath}/${portname}-${portepoch}_${portversion}_${portrevision}.pkg
         set packages_path ${mpkgpath}/Contents/Packages
         set resources_path ${mpkgpath}/Contents/Resources
     }
@@ -143,23 +143,24 @@
     set deps [lsort -unique $deps]
     foreach dep $deps {
         set name [lindex $dep 0]
-        set vers [lindex $dep 1]
-        set rev [lindex $dep 2]
-        set mport [lindex $dep 3]
+        set epoch [lindex $dep 1]
+        set vers [lindex $dep 2]
+        set rev [lindex $dep 3]
+        set mport [lindex $dep 4]
         # don't re-package ourself
         if {$name != $portname} {
             make_one_package $name $mport
             if {${package.flat} && ${os.major} >= 10} {
-                lappend dependencies org.macports.${name} ${name}-${vers}_${rev}-component.pkg
+                lappend dependencies org.macports.${name} ${name}-${epoch}_${vers}_${rev}-component.pkg
             } else {
-                lappend dependencies ${name}-${vers}_${rev}.pkg
+                lappend dependencies ${name}-${epoch}_${vers}_${rev}.pkg
             }
         }
     }
     if {${package.flat} && ${os.major} >= 10} {
-        lappend dependencies org.macports.${portname} ${portname}-${portversion}_${portrevision}-component.pkg
+        lappend dependencies org.macports.${portname} ${portname}-${portepoch}_${portversion}_${portrevision}-component.pkg
     } else {
-        lappend dependencies ${portname}-${portversion}_${portrevision}.pkg
+        lappend dependencies ${portname}-${portepoch}_${portversion}_${portrevision}.pkg
     }
 
     # copy our own pkg into the mpkg

Modified: trunk/base/src/package1.0/portpkg.tcl
===================================================================
--- trunk/base/src/package1.0/portpkg.tcl	2013-01-04 22:35:53 UTC (rev 101128)
+++ trunk/base/src/package1.0/portpkg.tcl	2013-01-04 22:35:56 UTC (rev 101129)
@@ -92,7 +92,7 @@
     file copy -force -- [getportresourcepath $porturl "port1.0/package/background.tiff"] ${package.resources}/${language}.lproj/background.tiff
 
     if {${package.flat} && ${os.major} >= 9} {
-        write_distribution "${workpath}/Distribution" $subport $version $revision
+        write_distribution "${workpath}/Distribution" $subport $epoch $version $revision
     }
 }
 
@@ -113,7 +113,7 @@
     package.flat package.destpath portpath os.version os.major \
     package.resources package.scripts portpkg::packagemaker portpkg::language
 
-    set pkgpath "${package.destpath}/${portname}-${portversion}_${portrevision}.pkg"
+    set pkgpath "${package.destpath}/${portname}-${portepoch}_${portversion}_${portrevision}.pkg"
     if {[file readable $pkgpath] && ([file mtime ${pkgpath}] >= [file mtime ${portpath}/Portfile])} {
         ui_msg "$UI_PREFIX [format [msgcat::mc "Package for %s-%s_%s_%s is up-to-date"] ${portname} ${portepoch} ${portversion} ${portrevision}]"
         return 0
@@ -363,7 +363,7 @@
     close $infofd
 }
 
-proc portpkg::write_distribution {dfile portname portversion portrevision} {
+proc portpkg::write_distribution {dfile portname portepoch portversion portrevision} {
     global macosx_deployment_target
     set portname [xml_escape $portname]
     set portversion [xml_escape $portversion]
@@ -384,7 +384,7 @@
     <choice id=\"org.macports.${portname}\" visible=\"false\">
         <pkg-ref id=\"org.macports.${portname}\"/>
     </choice>
-    <pkg-ref id=\"org.macports.${portname}\">${portname}-${portversion}_${portrevision}-component.pkg</pkg-ref>
+    <pkg-ref id=\"org.macports.${portname}\">${portname}-${portepoch}_${portversion}_${portrevision}-component.pkg</pkg-ref>
 </installer-gui-script>
 "
     close $dfd
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130104/7e1ff282/attachment.html>