Ticket #23948: abcde-10.6.diff

/opt/local/bin/abcde

@@ -1101 +1101 @@
                 vecho -n "Getting CD track info... "
                 # In OSX, unmount the disc before a query
                 if [ "$OSFLAVOUR" = "OSX" ]; then
-                disktool -u ${CDROM#/dev/}
+                diskutil unmount ${CDROM#/dev/}
                 fi
                 TRACKINFO=$($CDDISCID $CDROM)
                 # Make sure there's a CD in there by checking cd-discid's return code
@@ -1111 +1111 @@
                 fi
                 # In OSX, remount the disc again
                 if [ "$OSFLAVOUR" = "OSX" ]; then
-                        disktool -m ${CDROM#/dev/}
+                        diskutil mount ${CDROM#/dev/}
                 fi
                 WEHAVEACD=y
         else
@@ -1921 +1921 @@
                 cdda2wav)
                         if [ "$OSFLAVOUR" = "OSX" ] ; then
                                 # Hei, we have to unmount the device before running anything like cdda2wav in OSX
-                                disktool -u ${CDROM#/dev/} 0
+                                diskutil unmount ${CDROM#/dev/} 0
                                 # Also, in OSX the cdrom device for cdda2wav changes...
                                 CDDA2WAVCDROM="IODVDServices"
                         elif [ "$OSFLAVOUR" = "FBSD" ] ; then
@@ -2172 +2172 @@
 elif [ X$(uname) = "XDarwin" ] ; then
         HTTPGET=curl
         OSFLAVOUR=OSX
-        # We should have disktool in OSX, but let's be sure...
-        NEEDDISKTOOL=y
+        # We should have diskutil in OSX, but let's be sure...
+        NEEDDISKUTIL=y
         CDROMREADERSYNTAX=cddafs
 elif [ X$(uname) = "XOpenBSD" ] ; then
         HTTPGET=wget
@@ -2676 +2676 @@
         ${NEEDHTTPGET+$HTTPGET} ${NEEDDISTMP3+$DISTMP3} \
         ${NEEDCOMMENTER+$VORBISCOMMENT} ${NEEDMETAFLAC+$METAFLAC} \
         ${NEEDNORMALIZER+$NORMALIZER} ${NEEDEJECT+$EJECT} \
-        ${NEEDDISKTOOL+disktool} ${NEEDCDSPEED+$CDSPEED} \
+        ${NEEDDISKTOOL+diskutil} ${NEEDCDSPEED+$CDSPEED} \
         ${NEEDVORBISGAIN+$VORBISGAIN} ${NEEDCUEREADER+$CUEREADER}
 do
         # Cut off the command-line options we just added in
@@ -2844 +2844 @@
                 cd="$(echo $CDROM | sed -e 's=.*/==;s=[a-h]$==;')"
                 $eject $EJECTOPTS $cd
         elif [ X"$(uname)" = X"Darwin" ] ; then
-                disktool -e ${CDROM#/dev/} 0
+                diskutil eject ${CDROM#/dev/} 0
         else
                 $EJECT $EJECTOPTS $CDROM
         fi