diff options
| -rw-r--r-- | audio/abcde/Makefile | 7 | ||||
| -rw-r--r-- | audio/abcde/files/patch-abcde | 17 |
2 files changed, 10 insertions, 14 deletions
diff --git a/audio/abcde/Makefile b/audio/abcde/Makefile index a1c7c0e39ab5..85fe1689b3d3 100644 --- a/audio/abcde/Makefile +++ b/audio/abcde/Makefile @@ -3,10 +3,11 @@ PORTNAME= abcde DISTVERSION= 2.9.2 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= http://abcde.einval.com/download/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= arved@FreeBSD.org COMMENT= Front-end shell script to encode CDs in flac/mp3/ogg/speex format LICENSE= ART10 GPLv2 @@ -41,10 +42,8 @@ MPP_RUN_DEPENDS= mpcenc:audio/musepack MUSICBRAINZ_DESC= Enable MusicBrainz DiscID support MUSICBRAINZ_USES= perl5 MUSICBRAINZ_USE_PERL5= run -MUSICBRAINZ_RUN_DEPENDS=p5-Digest-SHA>=0:security/p5-Digest-SHA \ - p5-Getopt-Long>=0:devel/p5-Getopt-Long \ +MUSICBRAINZ_RUN_DEPENDS= \ p5-MusicBrainz-DiscID>=0:audio/p5-MusicBrainz-DiscID \ - p5-Pod-Usage>=0:devel/p5-Pod-Usage \ p5-WebService-MusicBrainz>=1:www/p5-WebService-MusicBrainz NORMALIZE_DESC= Enable normalize support NORMALIZE_RUN_DEPENDS= normalize:audio/normalize diff --git a/audio/abcde/files/patch-abcde b/audio/abcde/files/patch-abcde index 32e99793ccaf..3084bcc4293e 100644 --- a/audio/abcde/files/patch-abcde +++ b/audio/abcde/files/patch-abcde @@ -1,14 +1,11 @@ ---- abcde.orig 2018-03-15 16:01:58 UTC -+++ abcde -@@ -2108,7 +2108,10 @@ do_discid () +--- abcde.orig 2018-08-07 10:53:58.070134000 +0200 ++++ abcde 2018-08-07 10:54:34.101817000 +0200 +@@ -2110,7 +2110,7 @@ + CDPARANOIAAUDIOTRACKS="$TRACKS" LEADOUT="$(echo "$CDPARANOIAOUTPUT" | grep -Eo '^TOTAL[[:space:]]+([[:digit:]]+)' | get_last)" - OFFSETS="$(echo "$CDPARANOIAOUTPUT" | sed -n -e's/^ .* \([0-9]\+\) \[.*/\1/p')" -- makeids -+ case "$CDDBMETHOD" in -+ cddb) TRACKINFO=$($CDDISCID "$CDROM") ;; -+ musicbrainz) TRACKINFO=$($MUSICBRAINZ --command id --device "$CDROM") ;; -+ esac +- OFFSETS="$(echo "$CDPARANOIAOUTPUT" | sed -n -e's/^ .* \([0-9]\+\) \[.*/\1/p')" ++ OFFSETS="$(echo "$CDPARANOIAOUTPUT" | awk '/^ +.*\[/ {print $4}')" + makeids ;; *) - # Calculate the cddb discid in all |