[99167] trunk/base/src

[jmr at macports.org]

Revision: 99167
          http://trac.macports.org//changeset/99167
Author:   jmr at macports.org
Date:     2012-10-28 17:02:17 -0700 (Sun, 28 Oct 2012)
Log Message:
-----------
fix (m)pkg

Modified Paths:
--------------
    trunk/base/src/package1.0/portdmg.tcl
    trunk/base/src/package1.0/portmdmg.tcl
    trunk/base/src/port1.0/portsandbox.tcl

Modified: trunk/base/src/package1.0/portdmg.tcl
===================================================================
--- trunk/base/src/package1.0/portdmg.tcl	2012-10-28 23:32:44 UTC (rev 99166)
+++ trunk/base/src/package1.0/portdmg.tcl	2012-10-29 00:02:17 UTC (rev 99167)
@@ -83,7 +83,13 @@
         # Apple_partition_scheme (Apple_partition_map is at s1)
         set subdev 2
     }
-    
+
+    if {![file isdirectory $pkgpath]} {
+        file mkdir ${package.destpath}/${imagename}
+        file copy $pkgpath ${package.destpath}/${imagename}
+        set pkgpath ${package.destpath}/${imagename}
+    }
+
     set hdiutil [findBinary hdiutil $portutil::autoconf::hdiutil_path]
     if {[system "$hdiutil create -quiet -fs HFS+ -volname ${imagename} -srcfolder ${pkgpath} ${tmp_image}"] != ""} {
         return -code error [format [msgcat::mc "Failed to create temporary image: %s"] ${imagename}]

Modified: trunk/base/src/package1.0/portmdmg.tcl
===================================================================
--- trunk/base/src/package1.0/portmdmg.tcl	2012-10-28 23:32:44 UTC (rev 99166)
+++ trunk/base/src/package1.0/portmdmg.tcl	2012-10-29 00:02:17 UTC (rev 99167)
@@ -84,6 +84,12 @@
         set subdev 2
     }
 
+    if {![file isdirectory $mpkgpath]} {
+        file mkdir ${package.destpath}/${imagename}
+        file copy $mpkgpath ${package.destpath}/${imagename}
+        set mpkgpath ${package.destpath}/${imagename}
+    }
+
     set hdiutil [findBinary hdiutil $portutil::autoconf::hdiutil_path]
     if {[system "$hdiutil create -quiet -fs HFS+ -volname ${imagename} -srcfolder ${mpkgpath} ${tmp_image}"] != ""} {
         return -code error [format [msgcat::mc "Failed to create temporary image: %s"] ${imagename}]

Modified: trunk/base/src/port1.0/portsandbox.tcl
===================================================================
--- trunk/base/src/port1.0/portsandbox.tcl	2012-10-28 23:32:44 UTC (rev 99166)
+++ trunk/base/src/port1.0/portsandbox.tcl	2012-10-29 00:02:17 UTC (rev 99167)
@@ -47,6 +47,8 @@
     switch $target {
         activate -
         deactivate -
+        dmg -
+        mdmg -
         load -
         unload {
             set portsandbox_profile ""
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20121028/4e3b5349/attachment.html>