Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/sound
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23580
Modified Files:
abcde.info abcde.patch
Log Message:
New upstream. Fixes build-as-nobody.
Index: abcde.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/sound/abcde.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- abcde.patch 28 Sep 2004 17:01:35 -0000 1.5
+++ abcde.patch 15 Jul 2005 22:46:41 -0000 1.6
@@ -1,25 +1,38 @@
-diff -urN abcde-2.1.19.orig/abcde abcde-2.1.19/abcde
---- abcde-2.1.19.orig/abcde Fri Apr 9 14:12:15 2004
-+++ abcde-2.1.19/abcde Sat Sep 25 15:48:43 2004
-@@ -1445,7 +1445,7 @@
- cddafs)
- # Find the track's mounted path
- REALTRACKNUM=$(expr $UTRACKNUM + 0)
-- FILEPATH=$(mount | grep "$CDROM on" | sed 's/^[^ ]* on
\([^(]*\) (.*/\1/')
-+ FILEPATH=$(mount | grep "$CDROM on" | sed 's/^[^ ]* on
\(.*\) (.*/\1/')
- FILEPATH=$(find "$FILEPATH" | grep "/$REALTRACKNUM ");
- # If the file exists, copy it
- if [ -e "$FILEPATH" ] ; then
-@@ -1505,7 +1505,7 @@
- cddafs)
- # Find the track's mounted path
- REALTRACKNUM=$(expr $UTRACKNUM + 0)
-- FILEPATH=$(mount | grep "$CDROM on" | sed 's/^[^ ]* on
\([^(]*\) (.*/\1/')
-+ FILEPATH=$(mount | grep "$CDROM on" | sed 's/^[^ ]* on
\(.*\) (.*/\1/')
- FILEPATH=$(find "$FILEPATH" | grep "/$REALTRACKNUM ");
- # If the file exists, copy it
- if [ -e "$FILEPATH" ] ; then
-@@ -1553,7 +1553,7 @@
+diff -urN abcde-2.2.6.orig/Makefile abcde-2.2.6/Makefile
+--- abcde-2.2.6.orig/Makefile Tue Jun 14 12:41:33 2005
++++ abcde-2.2.6/Makefile Tue Jun 14 12:52:18 2005
+@@ -14,13 +14,13 @@
+
+ install:
+ $(INSTALL) -d -m 755 $(bindir)
+- $(INSTALL) -m 755 -o 0 abcde $(bindir)
+- $(INSTALL) -m 755 -o 0 cddb-tool $(bindir)
++ $(INSTALL) -m 755 abcde $(bindir)
++ $(INSTALL) -m 755 cddb-tool $(bindir)
+ $(INSTALL) -d -m 755 $(mandir)
+- $(INSTALL) -m 644 -o 0 abcde.1 $(mandir)
+- $(INSTALL) -m 644 -o 0 cddb-tool.1 $(mandir)
++ $(INSTALL) -m 644 abcde.1 $(mandir)
++ $(INSTALL) -m 644 cddb-tool.1 $(mandir)
+ $(INSTALL) -d -m 755 $(etcdir)
+- $(INSTALL) -m 644 -o 0 abcde.conf $(etcdir)
++ $(INSTALL) -m 644 abcde.conf $(etcdir)
+
+ tarball:
+ @cd .. && tar czvf abcde_$(VERSION).orig.tar.gz \
+diff -urN abcde-2.2.6.orig/abcde abcde-2.2.6/abcde
+--- abcde-2.2.6.orig/abcde Tue Jun 14 12:41:33 2005
++++ abcde-2.2.6/abcde Tue Jun 14 12:47:15 2005
+@@ -1666,7 +1666,7 @@
+ mungefilename ()
+ {
+ #echo "$@" | sed s,:,\ -,g | tr \ /\* __+ | tr -d \'\"\?\[:cntrl:\]
+- echo "$@" | sed s,:,\ -,g | tr \ / __ | tr -d \'\"\?\[:cntrl:\]
++ echo "$@" | sed s,:,\ -,g | tr / __ | tr -d \'\"\?\[:cntrl:\]
+ }
+
+ # Custom genre munging:
+@@ -1694,7 +1694,7 @@
CDDBPROTO=5
HELLOINFO="$(whoami)@$(hostname)"
INTERACTIVE=y
@@ -28,9 +41,9 @@
OUTPUTTYPE=ogg
ENCODERSYNTAX=default
-@@ -1562,10 +1562,9 @@
- FLACENCODERSYNTAX=default
- SPEEXENCODERSYNTAX=default
+@@ -1705,10 +1705,9 @@
+ MPPENCODERSYNTAX=default
+ NORMALIZERSYNTAX=default
-OUTPUTFORMAT='${ARTISTFILE}-${ALBUMFILE}/${TRACKNUM}.${TRACKFILE}'
-# Use the following VAOUTPUTFORMAT to revert to 2.0.x VA format:
@@ -42,16 +55,7 @@
ONETRACKOUTPUTFORMAT='${ARTISTFILE}-${ALBUMFILE}/${ALBUMFILE}'
VAONETRACKOUTPUTFORMAT='Various-${ALBUMFILE}/${ALBUMFILE}'
PLAYLISTFORMAT='${ARTISTFILE}-${ALBUMFILE}.${OUTPUT}.m3u'
-@@ -1662,7 +1661,7 @@
- # Custom filename munging:
- mungefilename ()
- {
-- echo "$@" | sed s,:,\ -,g | tr \ / __ | tr -d \'\"\?\[:cntrl:\]
-+ echo "$@" | sed s,:,\ -,g | tr / __ | tr -d \'\"\?\[:cntrl:\]
- }
-
- # Pre-read execution:
-@@ -1695,7 +1694,7 @@
+@@ -1829,7 +1828,7 @@
USEID3=y
if [ -z "$OUTPUTDIR" ]; then
@@ -60,7 +64,7 @@
fi
if [ -z "$WAVOUTPUTDIR" ]; then
-@@ -1703,8 +1702,8 @@
+@@ -1837,8 +1836,8 @@
fi
# Load system defaults
@@ -71,21 +75,10 @@
fi
# Load user preference defaults
if [ -r $HOME/.abcde.conf ]; then
-@@ -1851,6 +1850,10 @@
- CDROMREADER="$CDDAFS"
- CDROMREADEROPTS="$CDDAFSOPTS"
- ;;
-+ cddafs)
-+ CDROMREADER="$CDDAFS"
-+ CDROMREADEROPTS="$CDDAFSOPTS"
-+ ;;
- esac
-
- # There's only one normalize...
-diff -urN abcde-2.1.19.orig/abcde.conf abcde-2.1.19/abcde.conf
---- abcde-2.1.19.orig/abcde.conf Sun Apr 4 15:22:05 2004
-+++ abcde-2.1.19/abcde.conf Sat Sep 25 15:42:56 2004
-@@ -48,7 +48,7 @@
+diff -urN abcde-2.2.6.orig/abcde.conf abcde-2.2.6/abcde.conf
+--- abcde-2.2.6.orig/abcde.conf Tue Jun 14 12:41:33 2005
++++ abcde-2.2.6/abcde.conf Tue Jun 14 12:51:26 2005
+@@ -62,7 +62,7 @@
# CD reader program to use - currently recognized options are 'cdparanoia',
# 'cdda2wav', 'dagrab' and 'cddafs' (Mac OS X only).
@@ -94,7 +87,7 @@
# Keep the wav files after encoding. Set it to "y" and remove "clean" from
# the list of default actions, since we purge the temp directory as default.
-@@ -99,11 +99,11 @@
+@@ -120,11 +120,11 @@
# If HTTPGET is modified, the HTTPGETOPTS options should also be defined
# accordingly. If HTTPGET is changed, the default options will be set,
# if HTTPGETOPTS is empty or not defined.
@@ -108,13 +101,16 @@
# MP3:
#LAMEOPTS=
-@@ -157,15 +157,15 @@
- #NOCDDBQUERY=n
+@@ -174,14 +174,14 @@
+ #ACTIONS=cddb,read,encode,tag,move,clean
# CD device you want to read from
-#CDROM=/dev/cdrom
+#CDROM=/dev/disk1
+ # Optional CDROM device-ID for readers requiring the SCSI-syntax Bus,ID,Lun
+ #CDROMID=0,3,0
+
-# If you'd like to make a default location that overrides the current
-# directory for putting mp3's, uncomment this.
-#OUTPUTDIR=`pwd`
@@ -124,12 +120,7 @@
# Or if you'd just like to put the temporary .wav files somewhere else
# you can specify that here
--#WAVOUTPUTDIR=`pwd`
-+#OUTPUTDIR="$HOME/Music"
-
- # OUTPUTTYPE can be either "ogg", "mp3", "flac" or "spx", or a combination
- # of them separated with ",": "ogg,mp3".
-@@ -181,10 +181,10 @@
+@@ -201,10 +201,11 @@
# Since multiple-output was integrated we always append the file type
# to the files. Remove it from your user defined string if you are getting
# files like ".ogg.ogg".
@@ -139,15 +130,16 @@
# Like OUTPUTFORMAT but for Various Artists discs.
-#VAOUTPUTFORMAT='${ARTISTFILE}/${TRACKFILE}'
+#VAOUTPUTFORMAT=${OUTPUTFORMAT}
++
# Define how many encoders to run at once. This makes for huge speedups
# on SMP systems. Defaults to 1. Equivalent to -j.
-@@ -223,7 +223,7 @@
+@@ -249,7 +250,7 @@
# as $1 and outputs it on stdout.
#mungefilename ()
#{
--# echo "$@" | sed s,:,\ -,g | tr \ / __ | tr -d \'\"\?\[:cntrl:\]
-+# echo "$@" | sed s,:,\ -,g | tr / __ | tr -d \'\"\?\[:cntrl:\]
+-# echo "$@" | sed s,:,\ -,g | tr \ /\* __+ | tr -d \'\"\?\[:cntrl:\]
++# echo "$@" | sed s,:,\ -,g | tr /\* __+ | tr -d \'\"\?\[:cntrl:\]
#}
- # Custom pre-read function
+ # Custom genre munging:
Index: abcde.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/sound/abcde.info,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- abcde.info 7 Dec 2004 22:47:16 -0000 1.7
+++ abcde.info 15 Jul 2005 22:46:41 -0000 1.8
@@ -1,12 +1,12 @@
Package: abcde
-Version: 2.1.19
-Revision: 2
-Description: "A Better CD Encoder": Rips audio CDs to OGG/MP3
+Version: 2.2.6
+Revision: 1
+Description: "A Better CD Encoder": Rips CDs to OGG/MP3
DescDetail: <<
- A frontend program to cdparanoia, wget, cd-discid, id3, and your favorite
- Ogg or MP3 encoder (defaults to oggenc from the vorbis-tools package). Grabs
- an entire CD and converts each track to Ogg or MP3, then comments or ID3-tags
- each file, with one command.
+ A Better CD Encoder is a frontend to cdparanoia, wget, cd-discid, id3, and
+ your favorite Ogg or MP3 encoder (defaults to oggenc from the vorbis-tools
+ package). Grabs an entire CD and converts each track to Ogg or MP3, then
+ comments or ID3-tags each file, with one command.
<<
License: GPL
Maintainer: Evan Jones <[EMAIL PROTECTED]>
@@ -14,9 +14,9 @@
Depends: cd-discid, vorbis-tools (>= 1.0-2) | lame
Suggests: eject, cdparanoia | cdda2wav, distmp3, id3 (>= 0.12), id3v2
-Source: http://www.hispalinux.es/~data/files/%n_%v.orig.tar.gz
+Source: mirror:debian:pool/main/a/abcde/%n_%v.orig.tar.gz
SourceDirectory: %n-%v
-Source-MD5: 6fab88a6f1080d36cd58d07a6664b2ad
+Source-MD5: bf37710eb66f1c69a0cc9f42e5cdc5af
PatchScript: sed -e 's|@PREFIX@|%p|' < %a/%n.patch | patch -p1
CompileScript: make etcdir=%p/etc
-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
