source: trunk/dports/audio/abcde/files/patch-abcde.diff @ 76889

Last change on this file since 76889 was 76889, checked in by ryandesign@…, 10 years ago

abcde: use diskutil instead of disktool (#23948), and install doc files

File size: 2.0 KB
  • abcde

    old new  
    17301730                vecho -n "Getting CD track info... "
    17311731                # In OSX, unmount the disc before a query
    17321732                if [ "$OSFLAVOUR" = "OSX" ]; then
    1733                         disktool -u ${CDROM#/dev/}
     1733                        diskutil unmount ${CDROM#/dev/}
    17341734                fi
    17351735                case "$CDROMREADERSYNTAX" in
    17361736                        flac)
     
    18031803                fi
    18041804                # In OSX, remount the disc again
    18051805                if [ "$OSFLAVOUR" = "OSX" ]; then
    1806                         disktool -m ${CDROM#/dev/}
     1806                        diskutil mount ${CDROM#/dev/}
    18071807                fi
    18081808                WEHAVEACD=y
    18091809                DISCID=$(echo $TRACKINFO | cut -f1 -d' ')
     
    28152815                cdda2wav | icedax)
    28162816                        if [ "$OSFLAVOUR" = "OSX" ] ; then
    28172817                                # Hei, we have to unmount the device before running anything like cdda2wav/icedax in OSX
    2818                                 disktool -u ${CDROM#/dev/} 0
     2818                                diskutil unmount ${CDROM#/dev/} 0
    28192819                                # Also, in OSX the cdrom device for cdda2wav/icedax changes...
    28202820                                CDDA2WAVCDROM="IODVDServices"
    28212821                        elif [ "$OSFLAVOUR" = "FBSD" ] ; then
     
    31523152elif [ X$(uname) = "XDarwin" ] ; then
    31533153        HTTPGET=curl
    31543154        OSFLAVOUR=OSX
    3155         # We should have disktool in OSX, but let's be sure...
    3156         NEEDDISKTOOL=y
     3155        # We should have diskutil in OSX, but let's be sure...
     3156        NEEDDISKUTIL=y
    31573157        CDROMREADERSYNTAX=cddafs
    31583158elif [ X$(uname) = "XOpenBSD" ] ; then
    31593159        HTTPGET=wget
     
    38403840        ${NEEDHTTPGET+$HTTPGET} ${NEEDDISTMP3+$DISTMP3} \
    38413841        ${NEEDCOMMENTER+$VORBISCOMMENT} ${NEEDMETAFLAC+$METAFLAC} \
    38423842        ${NEEDNORMALIZER+$NORMALIZER} ${NEEDEJECT+$EJECT} \
    3843         ${NEEDDISKTOOL+disktool} ${NEEDCDSPEED+$CDSPEED} \
     3843        ${NEEDDISKUTIL+diskutil} ${NEEDCDSPEED+$CDSPEED} \
    38443844        ${NEEDVORBISGAIN+$VORBISGAIN} ${NEEDMP3GAIN+$MP3GAIN} \
    38453845        ${NEEDMPPGAIN+$MPPGAIN} ${NEEDCUEREADER+$CUEREADER} \
    38463846        ${NEEDCUE2DISCID+$CUE2DISCID}
     
    40674067                cd="$(echo $CDROM | sed -e 's=.*/==;s=[a-h]$==;')"
    40684068                $eject $EJECTOPTS $cd
    40694069        elif [ X"$(uname)" = X"Darwin" ] ; then
    4070                 disktool -e ${CDROM#/dev/} 0
     4070                diskutil eject ${CDROM#/dev/} 0
    40714071        else
    40724072                $EJECT $EJECTOPTS "$CDROM"
    40734073        fi
Note: See TracBrowser for help on using the repository browser.