Ticket #12791: macports-mdmg.patch

src/port/port.tcl

@@ -2163 +2163 @@
     archive     action_target
     unarchive   action_target
     dmg         action_target
+    mdmg        action_target
     dpkg        action_target
     mpkg        action_target
     pkg         action_target

doc/port.1

@@ -495 +495 @@
 .Ss dmg
 Creates an internet-enabled disk image containing an OS X package of
 .Ar portname .
+.Ss mdmg
+Creates an internet-enabled disk image containing an OS X metapackage of
+.Ar portname
+and its dependencies.
 .Ss rpm
 Creates an RPM binary package of
 .Ar portname ,

src/package1.0/package.tcl

@@ -37 +37 @@
 package require portpkg 1.0
 package require portmpkg 1.0
 package require portdmg 1.0
+package require portmdmg 1.0
 package require portdpkg 1.0
 package require portunarchive 1.0
 package require portarchive 1.0

src/package1.0/portmdmg.tcl

@@ -1 +1 @@
 # et:ts=4
-# portdmg.tcl
+# portmdmg.tcl
 # $Id$
 #
 # Copyright (c) 2003 Apple Computer, Inc.
@@ -30 +30 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
-package provide portdmg 1.0
+package provide portmdmg 1.0
 package require portutil 1.0
 
-set org.macports.dmg [target_new org.macports.dmg dmg_main]
-target_runtype ${org.macports.dmg} always
-target_provides ${org.macports.dmg} dmg 
-target_requires ${org.macports.dmg} pkg
+set org.macports.mdmg [target_new org.macports.mdmg mdmg_main]
+target_runtype ${org.macports.mdmg} always
+target_provides ${org.macports.mdmg} mdmg 
+target_requires ${org.macports.mdmg} mpkg
 
 set_ui_prefix
 
-proc dmg_main {args} {
+proc mdmg_main {args} {
     global portname portversion portrevision package.destpath UI_PREFIX
     
     ui_msg "$UI_PREFIX [format [msgcat::mc "Creating disk image for %s-%s"] ${portname} ${portversion}]"
     
-    return [package_dmg $portname $portversion $portrevision]
+    return [package_mdmg $portname $portversion $portrevision]
 }
 
-proc package_dmg {portname portversion portrevision} {
+proc package_mdmg {portname portversion portrevision} {
     global UI_PREFIX package.destpath portpath
     
     if {[expr (${portrevision} > 0)]} {
@@ -59 +59 @@
     
     set tmp_image ${package.destpath}/${imagename}.tmp.dmg
     set final_image ${package.destpath}/${imagename}.dmg
-    set pkgpath ${package.destpath}/${portname}-${portversion}.pkg
+    set mpkgpath ${package.destpath}/${portname}-${portversion}.mpkg
     
     if {[file readable $final_image] && ([file mtime ${final_image}] >= [file mtime ${portpath}/Portfile])} {
         ui_msg "$UI_PREFIX [format [msgcat::mc "Disk Image for %s-%s is up-to-date"] ${portname} ${portversion}]"
@@ -67 +67 @@
     }
     
     # size for .dmg
-    set size [dirSize ${pkgpath}]
+    set size [dirSize ${mpkgpath}]
     if {[expr ($size < 4194304)]} {
         # there is a minimum of 8292 512 blocks in a dmg
         set blocks 8292
@@ -84 +84 @@
     }
     set mount_point [exec mount | grep "${devicename}"]
     regexp {(\/Volumes/[A-Za-z0-9\-\_\s].+)\s\(} $mount_point code mount_point
-    system "ditto -rsrcFork ${pkgpath} '${mount_point}/${portname}-${portversion}.pkg'"
+    system "ditto -rsrcFork ${mpkgpath} '${mount_point}/${portname}-${portversion}.mpkg'"
     system "hdiutil detach ${devicename} -quiet"
     if {[system "hdiutil convert ${tmp_image} -format UDCO -o ${final_image} -quiet"] != ""} {
         return -code error [format [msgcat::mc "Failed to convert to final image: %s"] ${final_image}]