[106320] trunk/dports/emulators

ryandesign at macports.org ryandesign at macports.org
Wed May 22 06:14:41 PDT 2013


Revision: 106320
          https://trac.macports.org/changeset/106320
Author:   ryandesign at macports.org
Date:     2013-05-22 06:14:41 -0700 (Wed, 22 May 2013)
Log Message:
-----------
minivmac, minivmac-devel: speed up extract: no need to manually de-MacBinary the system disk container image; apparently `hdiutil` reads MacBinary images just fine on its own

Modified Paths:
--------------
    trunk/dports/emulators/minivmac/Portfile
    trunk/dports/emulators/minivmac-devel/Portfile

Removed Paths:
-------------
    trunk/dports/emulators/minivmac/files/demacbinary.sh
    trunk/dports/emulators/minivmac-devel/files/demacbinary.sh

Modified: trunk/dports/emulators/minivmac/Portfile
===================================================================
--- trunk/dports/emulators/minivmac/Portfile	2013-05-22 13:08:54 UTC (rev 106319)
+++ trunk/dports/emulators/minivmac/Portfile	2013-05-22 13:14:41 UTC (rev 106320)
@@ -141,14 +141,10 @@
 extract.asroot          yes
 
 post-extract {
-    # Decode MacBinary encoding of the system disk container image.
-    ui_debug "Decoding ${my_system_disk_container_distfile}."
-    system -W ${worksrcpath} "sh ${filespath}/demacbinary.sh ${distpath}/${my_system_disk_container_distfile}"
-    
     # Decompress the system disk container image.
-    ui_debug "Decompressing ${my_system_disk_container}."
-    set my_system_disk_container_decompressed "[file rootname ${my_system_disk_container}].uncompressed.dmg"
-    system -W ${worksrcpath} "hdiutil convert '${my_system_disk_container}' -format UDRO -o '${my_system_disk_container_decompressed}'"
+    ui_debug "Decompressing ${my_system_disk_container_distfile}."
+    set my_system_disk_container_decompressed "[file rootname ${my_system_disk_container}].dmg"
+    system -W ${worksrcpath} "hdiutil convert '${distpath}/${my_system_disk_container_distfile}' -format UDRO -o '${my_system_disk_container_decompressed}'"
     
     # The images on the container image. Images we don't need are commented out for future reference.
     set my_images {
@@ -171,7 +167,7 @@
     }
     
     # Delete temporary files we no longer need.
-    delete ${worksrcpath}/${my_system_disk_container} ${worksrcpath}/${my_system_disk_container_decompressed}
+    delete ${worksrcpath}/${my_system_disk_container_decompressed}
     
     # Make the data directory, where Mini vMac looks for the files it needs.
     set my_mnvm_dat "${worksrcpath}/${my_bootstrap_app}/Contents/mnvm_dat"

Deleted: trunk/dports/emulators/minivmac/files/demacbinary.sh
===================================================================
--- trunk/dports/emulators/minivmac/files/demacbinary.sh	2013-05-22 13:08:54 UTC (rev 106319)
+++ trunk/dports/emulators/minivmac/files/demacbinary.sh	2013-05-22 13:14:41 UTC (rev 106320)
@@ -1,37 +0,0 @@
-#!/bin/sh
-
-# $Id$
-
-INFILE="$1"
-
-if [ $# -ne 1 ]; then
-	echo "usage: $0 <infile>" 1>&2
-	exit 1
-fi
-
-if [ ! -f "$INFILE" ]; then
-	echo "$0: $INFILE: No such file" 1>&2
-	exit 1
-fi
-
-OUTFILE="$(basename "$INFILE" .bin)"
-
-if [ "$INFILE" == "$OUTFILE" ]; then
-	echo "$0: $INFILE: Filename doesn't end with .bin" 1>&2
-	exit 1
-fi
-
-MACBINARY="/usr/bin/macbinary"
-if [ -x "$MACBINARY" ]; then
-	"$MACBINARY" decode -o "$OUTFILE" "$INFILE"
-	exit $?
-fi
-
-DATAFORKFILE="$OUTFILE.data"
-RSRCFORKFILE="$OUTFILE.rsrc"
-INFOFILE="$OUTFILE.info"
-
-macunpack -3 "$INFILE" || exit $?
-cp "$DATAFORKFILE" "$OUTFILE" || exit $?
-cp "$RSRCFORKFILE" "$OUTFILE/rsrc" || exit $?
-rm -f "$DATAFORKFILE" "$RSRCFORKFILE" "$INFOFILE"

Modified: trunk/dports/emulators/minivmac-devel/Portfile
===================================================================
--- trunk/dports/emulators/minivmac-devel/Portfile	2013-05-22 13:08:54 UTC (rev 106319)
+++ trunk/dports/emulators/minivmac-devel/Portfile	2013-05-22 13:14:41 UTC (rev 106320)
@@ -150,14 +150,10 @@
 extract.asroot          yes
 
 post-extract {
-    # Decode MacBinary encoding of the system disk container image.
-    ui_debug "Decoding ${my_system_disk_container_distfile}."
-    system -W ${worksrcpath} "sh ${filespath}/demacbinary.sh ${distpath}/${my_system_disk_container_distfile}"
-    
     # Decompress the system disk container image.
-    ui_debug "Decompressing ${my_system_disk_container}."
-    set my_system_disk_container_decompressed "[file rootname ${my_system_disk_container}].uncompressed.dmg"
-    system -W ${worksrcpath} "hdiutil convert '${my_system_disk_container}' -format UDRO -o '${my_system_disk_container_decompressed}'"
+    ui_debug "Decompressing ${my_system_disk_container_distfile}."
+    set my_system_disk_container_decompressed "[file rootname ${my_system_disk_container}].dmg"
+    system -W ${worksrcpath} "hdiutil convert '${distpath}/${my_system_disk_container_distfile}' -format UDRO -o '${my_system_disk_container_decompressed}'"
     
     # The images on the container image. Images we don't need are commented out for future reference.
     set my_images {
@@ -180,7 +176,7 @@
     }
     
     # Delete temporary files we no longer need.
-    delete ${worksrcpath}/${my_system_disk_container} ${worksrcpath}/${my_system_disk_container_decompressed}
+    delete ${worksrcpath}/${my_system_disk_container_decompressed}
     
     # Make the data directory, where Mini vMac looks for the files it needs.
     set my_mnvm_dat "${worksrcpath}/${my_bootstrap_app}/Contents/mnvm_dat"

Deleted: trunk/dports/emulators/minivmac-devel/files/demacbinary.sh
===================================================================
--- trunk/dports/emulators/minivmac-devel/files/demacbinary.sh	2013-05-22 13:08:54 UTC (rev 106319)
+++ trunk/dports/emulators/minivmac-devel/files/demacbinary.sh	2013-05-22 13:14:41 UTC (rev 106320)
@@ -1,37 +0,0 @@
-#!/bin/sh
-
-# $Id$
-
-INFILE="$1"
-
-if [ $# -ne 1 ]; then
-	echo "usage: $0 <infile>" 1>&2
-	exit 1
-fi
-
-if [ ! -f "$INFILE" ]; then
-	echo "$0: $INFILE: No such file" 1>&2
-	exit 1
-fi
-
-OUTFILE="$(basename "$INFILE" .bin)"
-
-if [ "$INFILE" == "$OUTFILE" ]; then
-	echo "$0: $INFILE: Filename doesn't end with .bin" 1>&2
-	exit 1
-fi
-
-MACBINARY="/usr/bin/macbinary"
-if [ -x "$MACBINARY" ]; then
-	"$MACBINARY" decode -o "$OUTFILE" "$INFILE"
-	exit $?
-fi
-
-DATAFORKFILE="$OUTFILE.data"
-RSRCFORKFILE="$OUTFILE.rsrc"
-INFOFILE="$OUTFILE.info"
-
-macunpack -3 "$INFILE" || exit $?
-cp "$DATAFORKFILE" "$OUTFILE" || exit $?
-cp "$RSRCFORKFILE" "$OUTFILE/rsrc" || exit $?
-rm -f "$DATAFORKFILE" "$RSRCFORKFILE" "$INFOFILE"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130522/972408c5/attachment.html>


More information about the macports-changes mailing list