svn commit: r312844 - in head/audio/abcde: . files

[Grzegorz Blach]

Author: gblach
Date: Sat Feb 23 17:20:37 2013
New Revision: 312844
URL: http://svnweb.freebsd.org/changeset/ports/312844

Log:
  - Use cdcontrol eject properly
  - Bump PORTREVISION
  
  Approved by:	tabthorpe (mentor)

Modified:
  head/audio/abcde/Makefile
  head/audio/abcde/files/patch-abcde.conf

Modified: head/audio/abcde/Makefile
==============================================================================
--- head/audio/abcde/Makefile	Sat Feb 23 17:17:26 2013	(r312843)
+++ head/audio/abcde/Makefile	Sat Feb 23 17:20:37 2013	(r312844)
@@ -3,6 +3,7 @@
 
 PORTNAME=	abcde
 PORTVERSION=	2.5.4
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	GOOGLE_CODE
 

Modified: head/audio/abcde/files/patch-abcde.conf
==============================================================================
--- head/audio/abcde/files/patch-abcde.conf	Sat Feb 23 17:17:26 2013	(r312843)
+++ head/audio/abcde/files/patch-abcde.conf	Sat Feb 23 17:20:37 2013	(r312844)
@@ -1,14 +1,16 @@
 --- abcde.conf.orig	2012-04-19 22:57:19.000000000 +0200
-+++ abcde.conf	2012-11-29 21:11:17.000000000 +0100
-@@ -136,7 +136,7 @@
++++ abcde.conf	2013-02-22 21:53:52.000000000 +0100
+@@ -136,8 +136,8 @@
  #CDDAFS=cp
  #CDDISCID=cd-discid
  #CDDBTOOL=cddb-tool
 -#EJECT=eject
-+EJECT=cdcontrol eject
- #MD5SUM=md5sum
+-#MD5SUM=md5sum
++EJECT=cdcontrol
++MD5SUM=md5
  #DISTMP3=distmp3
  #VORBISCOMMENT=vorbiscomment
+ #METAFLAC=metaflac
 @@ -170,7 +170,8 @@
  
  # Ogg:
@@ -19,6 +21,15 @@
  
  # FLAC:
  #FLACOPTS="-f"
+@@ -193,7 +194,7 @@
+ #CDDA2WAVOPTS=
+ #CDDAFSOPTS="-f"
+ #CDDBTOOLOPTS=
+-#EJECTOPTS=
++EJECTOPTS="eject"
+ #DISTMP3OPTS=
+ #NORMALIZEOPTS=
+ #CDSPEEDOPTS="-x"
 @@ -238,7 +239,7 @@
  
  # OUTPUTTYPE can be either "ogg", "mp3", "flac" or "spx", or a combination
@@ -40,3 +51,13 @@
  
  # Like OUTPUTFORMAT and VAOUTPUTFORMAT but for the ONEFILE rips.
  #ONETRACKOUTPUTFORMAT=$OUTPUTFORMAT
+@@ -319,8 +322,7 @@
+ # Custom pre-read function
+ # By default it does nothing.
+ # You can set some things to get abcde function in better ways:
+-# * Close the CD tray using eject -t (if available in eject and supported by 
+-#   your CD device.
++# * Close the CD tray using cdcontrol close
+ # * Set the CD speed. You can also use the built-in options, but you can also 
+ #   set it here. In Debian, eject -x and cdset -x do the job.
+ # KEEP IN MIND that executables included in pre_read must be in your $PATH or