audio/abcde: Updated for version 2.7.1 + new maintainer.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

6 files changed, 87 insertions, 75 deletions

diff --git a/audio/abcde/Makefile.diff b/audio/abcde/Makefile.diff
deleted file mode 100644
index 922e3c3160..0000000000
--- a/audio/abcde/Makefile.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- abcde-2.6/Makefile	2014-10-26 13:41:35.000000000 -0400
-+++ abcde-2.6/Makefile.patched	2014-12-14 18:22:39.005098302 -0500
-@@ -3,7 +3,7 @@
- # Installation directories
- prefix = ${DESTDIR}/usr
- exec_prefix = ${prefix}
--mandir = ${prefix}/share/man/man1
-+mandir = ${prefix}/man/man1
- bindir = ${exec_prefix}/bin
- etcdir = ${DESTDIR}/etc
- 
diff --git a/audio/abcde/README b/audio/abcde/README
index 3b6c074d74..534e40d071 100644
--- a/audio/abcde/README
+++ b/audio/abcde/README
@@ -1,29 +1,46 @@
 abcde is a frontend command-line utility (actually, a shell script)
-that grabs tracks off a CD encodes them to Ogg/Vorbis, MP3, FLAC,
-OGG/Speex, MPP/MP+(Musepack) and/or M4A/AAC format, and tags them 
-all in one go.
-
-There are many optional features that abcde supports by building 
-with one or more of these optional dependencies:
-
-* faac       : for creating m4a/aac files
-* id3lib     : for manipulating ID3v1 and ID3v2 tags
-* id3v2      : for writing id3v2 tags
-* lame       : for creating mp3 files
-* mppenc     : for creating MPP/MP+(Musepack) files 
-* speex      : for creating Speex files
-* vorbisgain : for adjusting the volume of ogg vorbis files
-
-PLEASE NOTE: the included abcde-musicbrainz-tool script requires the
-following Perl modules (which are not available through SlackBuilds.org
-yet):
-
-MusicBrainz::DiscID
-WebService::MusicBrainz::Release
-WebService::MusicBrainz::Artist
-WebService::MusicBrainz::Response::Track
-WebService::MusicBrainz::Response::TrackList
-
-Try running abcde as root (sudo or whatever) if abcde/cd-discid thinks 
-your favorite audio cd is a data cd. Please note also that faac needs 
-to have mp4 support enabled to work correctly with abcde.
+that grabs tracks off an audio CD, encodes them to Ogg Vorbis, MP3,
+MP2, FLAC, Opus, Speex, WAV, WavPack, Musepack, M4A/AAC, Monkey’s
+Audio and/or True Audio formats, and tags them all in one go.
+
+On Slackware systems without third party packages Ogg Vorbis, FLAC
+and WavPack are supported. There are many additional features that
+abcde supports by installing one or more of these dependencies:
+
+* lame            for creating MP3 files
+* eyeD3           for tagging MP3 files (default)
+* id3v2           for tagging MP3 files (with ID3TAGV=id3v2.3)
+* id3             for tagging MP3 files (with ID3TAGV=id3v1)
+
+* twolame         for creating MP2 files
+* mutagen         for tagging MP2 and MP3 files (with ID3TAGV=id3v2.3
+                  and ID3V2=mid3v2)
+
+* opus-tools      for creating Opus files
+
+* speex           for creating Speex files
+
+* musepack-tools  for creating Musepack files
+
+* faac            for creating M4A/AAC files (default)
+* fdkaac          for creating M4A/AAC files
+* ffmpeg          for creating M4A/AAC, MP2 and WavPack files (if built
+                  with support for these formats)
+* wine            for running neroAacEnc, qaac and fhgaacenc
+
+* mac             for creating Monkey’s Audio files
+* apetag          for tagging Monkey’s Audio files
+
+* tta             for creating True Audio files (default)
+* ttaenc          for creating True Audio files
+
+* glyr            for downloading album art
+* mkcue           for generating cue sheets for one-album files
+* vorbisgain      for adjusting the volume of Ogg Vorbis files
+
+Install perl-MusicBrainz-DiscID and perl-WebService-MusicBrainz and set
+CDDBMETHOD to "musicbrainz" if you would like to retrieve music
+metadata and album art from MusicBrainz instead of freedb.
+
+Try running abcde as root (sudo or whatever) if abcde/cd-discid thinks
+your favorite audio cd is a data cd.
diff --git a/audio/abcde/abcde.SlackBuild b/audio/abcde/abcde.SlackBuild
index f232bfc94f..97addbabaa 100644
--- a/audio/abcde/abcde.SlackBuild
+++ b/audio/abcde/abcde.SlackBuild
@@ -25,9 +25,10 @@
 # Modified by the SlackBuilds.org project
 # Modified by Andrew Strong
 # Modified by Glenn Becker
+# Modified by Andreas Voegele
 
 PRGNAM=abcde
-VERSION=${VERSION:-2.6}
+VERSION=${VERSION:-2.7.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -48,8 +49,8 @@ set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-rm -rf $TMP/$PRGNAM-$VERSION
 cd $TMP
+rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
@@ -57,39 +58,26 @@ find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Fix mandir and remove setting of ownership during install
-# The mandir can easily be changed by passing a 'mandir' variable to the
-# 'make install' process, but the setting of ownership isn't so easy to
-# work around without a patch.  This isn't an issue if the SlackBuild
-# script is run as root, but I'm guessing that I'm not the only person who
-# likes to test a script as normal user before running it as root, and the
-# ownership setting in the Makefile will break installs as a normal user.
-# --rworkman
-patch -p1 < $CWD/Makefile.diff
+patch -p1 < $CWD/id3-genre.diff
 
-# fix to mailx call: the command was using the -a option which, in Slackware's
-# mailx, means something different than what was intended here (intent here is
-# to set content type to UTF-8. In Slackware the -a is unnecessary. Thanks to
-# Andreas Vogele for this patch. --gbecker
-patch -p1 < $CWD/cddb-tool.diff
-
-# Removed aac/speex patch as this was fixed upstream - G Becker 10.7.12
-
-make install DESTDIR=$PKG
+make install DESTDIR=$PKG \
+  prefix=/usr \
+  sysconfdir=/etc \
+  docdir=/usr/doc/$PRGNAM-$VERSION \
+  mandir=/usr/man
 
 # Let's not overwrite the config file if it already exists
 mv $PKG/etc/$PRGNAM.conf $PKG/etc/$PRGNAM.conf.new
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING FAQ README TODO changelog examples $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 644 {} \;
-
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING FAQ README changelog examples $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
diff --git a/audio/abcde/abcde.info b/audio/abcde/abcde.info
index 76946e7dc1..13d1cd9557 100644
--- a/audio/abcde/abcde.info
+++ b/audio/abcde/abcde.info
@@ -1,10 +1,10 @@
 PRGNAM="abcde"
-VERSION="2.6"
+VERSION="2.7.1"
 HOMEPAGE="http://abcde.einval.com"
-DOWNLOAD="http://abcde.einval.com/download/abcde-2.6.tar.gz"
-MD5SUM="c8b91d5c53386cfc4345d9d49f67e1dd"
+DOWNLOAD="http://abcde.einval.com/download/abcde-2.7.1.tar.gz"
+MD5SUM="09d5c9dc6c0bf6dd4b3fb159e1433018"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="cd-discid"
-MAINTAINER="Glenn Becker"
-EMAIL="burningc@sdf.org"
+MAINTAINER="Andreas Voegele"
+EMAIL="andreas@andreasvoegele.com"
diff --git a/audio/abcde/id3-genre.diff b/audio/abcde/id3-genre.diff
new file mode 100644
index 0000000000..e3dd55d262
--- /dev/null
+++ b/audio/abcde/id3-genre.diff
@@ -0,0 +1,18 @@
+Pass the genre name instead of the identifier to the id3 command as the
+numbers are offset by one.
+
+--- abcde-2.7.1/abcde.orig	2015-10-04 11:30:28.000000000 +0200
++++ abcde-2.7.1/abcde	2016-01-09 15:49:12.249326957 +0100
+@@ -822,11 +822,11 @@
+ 			case "$ID3SYNTAX" in
+ 				id3)
+ 					run_command tagtrack-$OUTPUT-$1 nice $ENCNICE \
+ 						$TAGGER $TAGGEROPTS -c "$COMMENTOUTPUT" \
+ 						-A "$DALBUM" -a "$TRACKARTIST" -t "$TRACKNAME" \
+-						-y "$CDYEAR" -g "$GENREID" \
++						-y "$CDYEAR" -g "$CDGENRE" \
+ 						-T "${TRACKNUM:-$1}" \
+ 						"$ABCDETEMPDIR/track$1.$OUTPUT"
+ 					;;
+ 				id3v2)
+ 					# FIXME # track numbers in mp3 come with 1/10, so we cannot
diff --git a/audio/abcde/slack-desc b/audio/abcde/slack-desc
index b96cb9ab7c..49420743d9 100644
--- a/audio/abcde/slack-desc
+++ b/audio/abcde/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
      |-----handy-ruler------------------------------------------------------|
-abcde: abcde (shell script to encode CD's)
+abcde: abcde (shell script to encode audio CDs)
 abcde:
 abcde: abcde is a frontend command-line utility (actually, a shell script)
-abcde: that grabs tracks from a CD, encodes them to Ogg/Vorbis, MP3, FLAC,
-abcde: OGG/Speex, MPP/MP+(Musepack) and/or M4A/AAC format, and tags them,
-abcde: all in one go.
+abcde: that grabs tracks off an audio CD, encodes them to Ogg Vorbis, MP3,
+abcde: MP2, FLAC, Opus, Speex, WAV, WavPack, Musepack, M4A/AAC, Monkey’s
+abcde: Audio and/or True Audio formats and tags them all in one go.
 abcde:
-abcde: Homepage: http://freecode.com/projects/abcde
+abcde: Homepage: http://abcde.einval.com
 abcde:
 abcde:
 abcde: