[76889] trunk/dports/audio/abcde

ryandesign at macports.org ryandesign at macports.org
Fri Mar 11 14:55:06 PST 2011


Revision: 76889
          http://trac.macports.org/changeset/76889
Author:   ryandesign at macports.org
Date:     2011-03-11 14:55:05 -0800 (Fri, 11 Mar 2011)
Log Message:
-----------
abcde: use diskutil instead of disktool (#23948), and install doc files

Modified Paths:
--------------
    trunk/dports/audio/abcde/Portfile

Added Paths:
-----------
    trunk/dports/audio/abcde/files/patch-abcde.diff

Modified: trunk/dports/audio/abcde/Portfile
===================================================================
--- trunk/dports/audio/abcde/Portfile	2011-03-11 22:47:51 UTC (rev 76888)
+++ trunk/dports/audio/abcde/Portfile	2011-03-11 22:55:05 UTC (rev 76889)
@@ -4,6 +4,7 @@
 
 name                    abcde
 version                 2.4.2
+revision                1
 categories              audio
 platforms               darwin
 maintainers             nomaintainer
@@ -32,8 +33,23 @@
                         port:normalize
 
 patchfiles              patch-Makefile \
+                        patch-abcde.diff \
                         bash.diff
 
 use_configure           no
 
 destroot.destdir        prefix=${destroot}${prefix}
+
+post-destroot {
+    set docdir ${destroot}${prefix}/share/doc/${name}
+    xinstall -d ${docdir}
+    xinstall -m 644 -W ${worksrcpath} \
+        COPYING \
+        FAQ \
+        KNOWN.BUGS \
+        README \
+        TODO \
+        USEPIPES \
+        changelog \
+        ${docdir}
+}

Added: trunk/dports/audio/abcde/files/patch-abcde.diff
===================================================================
--- trunk/dports/audio/abcde/files/patch-abcde.diff	                        (rev 0)
+++ trunk/dports/audio/abcde/files/patch-abcde.diff	2011-03-11 22:55:05 UTC (rev 76889)
@@ -0,0 +1,58 @@
+--- abcde.orig	2010-05-29 04:02:44.000000000 -0500
++++ abcde	2011-03-11 16:47:41.000000000 -0600
+@@ -1730,7 +1730,7 @@
+ 		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
+ 		case "$CDROMREADERSYNTAX" in
+ 			flac)
+@@ -1803,7 +1803,7 @@
+ 		fi
+ 		# In OSX, remount the disc again
+ 		if [ "$OSFLAVOUR" = "OSX" ]; then
+-			disktool -m ${CDROM#/dev/}
++			diskutil mount ${CDROM#/dev/}
+ 		fi
+ 		WEHAVEACD=y
+ 		DISCID=$(echo $TRACKINFO | cut -f1 -d' ')
+@@ -2815,7 +2815,7 @@
+ 		cdda2wav | icedax)
+ 			if [ "$OSFLAVOUR" = "OSX" ] ; then
+ 				# Hei, we have to unmount the device before running anything like cdda2wav/icedax in OSX
+-				disktool -u ${CDROM#/dev/} 0
++				diskutil unmount ${CDROM#/dev/} 0
+ 				# Also, in OSX the cdrom device for cdda2wav/icedax changes...
+ 				CDDA2WAVCDROM="IODVDServices"
+ 			elif [ "$OSFLAVOUR" = "FBSD" ] ; then
+@@ -3152,8 +3152,8 @@
+ 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
+@@ -3840,7 +3840,7 @@
+ 	${NEEDHTTPGET+$HTTPGET} ${NEEDDISTMP3+$DISTMP3} \
+ 	${NEEDCOMMENTER+$VORBISCOMMENT} ${NEEDMETAFLAC+$METAFLAC} \
+ 	${NEEDNORMALIZER+$NORMALIZER} ${NEEDEJECT+$EJECT} \
+-	${NEEDDISKTOOL+disktool} ${NEEDCDSPEED+$CDSPEED} \
++	${NEEDDISKUTIL+diskutil} ${NEEDCDSPEED+$CDSPEED} \
+ 	${NEEDVORBISGAIN+$VORBISGAIN} ${NEEDMP3GAIN+$MP3GAIN} \
+ 	${NEEDMPPGAIN+$MPPGAIN} ${NEEDCUEREADER+$CUEREADER} \
+ 	${NEEDCUE2DISCID+$CUE2DISCID}
+@@ -4067,7 +4067,7 @@
+ 		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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110311/e185a5a1/attachment-0001.html>


More information about the macports-changes mailing list