Index: head/audio/abcde/Makefile
===================================================================
--- head/audio/abcde/Makefile	(revision 476580)
+++ head/audio/abcde/Makefile	(revision 476581)
@@ -1,76 +1,75 @@
 # Created by: Munish Chopra <mchopra@engmail.uwaterloo.ca>
 # $FreeBSD$
 
 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
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	cd-discid:audio/cd-discid \
 		cdparanoia:audio/cdparanoia \
 		lame:audio/lame \
 		eyeD3:audio/py-eyed3 \
 		oggenc:audio/vorbis-tools \
 		bash:shells/bash
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 USES=		shebangfix
 SHEBANG_FILES=	abcde abcde-musicbrainz-tool cddb-tool
 
 SUB_FILES=	pkg-message
 
 OPTIONS_GROUP=		CODEC RIPPER
 OPTIONS_GROUP_CODEC=	AAC FLAC MPP OPUS SPEEX
 OPTIONS_GROUP_RIPPER=	CDDA2WAV DAGRAB
 OPTIONS_DEFINE=		MUSICBRAINZ NORMALIZE REPLAYGAIN
 OPTIONS_DEFAULT=	MUSICBRAINZ
 
 AAC_RUN_DEPENDS=	faac:audio/faac
 CDDA2WAV_RUN_DEPENDS=	cdda2wav:sysutils/cdrtools
 DAGRAB_RUN_DEPENDS=	dagrab:audio/dagrab
 FLAC_RUN_DEPENDS=	flac:audio/flac
 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
 OPUS_RUN_DEPENDS=	opusenc:audio/opus-tools
 REPLAYGAIN_DESC=	Enable (vorbis|mp3)gain support
 REPLAYGAIN_RUN_DEPENDS=	mp3gain:audio/mp3gain \
 			vorbisgain:audio/vorbisgain
 SPEEX_RUN_DEPENDS=	speexenc:audio/speex
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|\([[:space:]]\)\(/etc/abcde.conf\)|\1${PREFIX}\2|' \
 		${WRKSRC}/abcde
 	@${REINPLACE_CMD} -e \
 		's|\(fI\)\(/etc/abcde.conf\)|\1${PREFIX}\2|' \
 		${WRKSRC}/abcde.1
 
 do-install:
 	(cd ${WRKSRC} && ${INSTALL_SCRIPT} abcde cddb-tool \
 		${STAGEDIR}${PREFIX}/bin)
 	(cd ${WRKSRC} && ${INSTALL_DATA} abcde.conf \
 		${STAGEDIR}${PREFIX}/etc/abcde.conf.sample)
 	(cd ${WRKSRC} && ${INSTALL_MAN} abcde.1 cddb-tool.1 \
 		${STAGEDIR}${MANPREFIX}/man/man1)
 post-install-MUSICBRAINZ-on:
 	(cd ${WRKSRC} && ${INSTALL_SCRIPT} abcde-musicbrainz-tool \
 		${STAGEDIR}${PREFIX}/bin)
 
 .include <bsd.port.mk>
Index: head/audio/abcde/files/patch-abcde
===================================================================
--- head/audio/abcde/files/patch-abcde	(revision 476580)
+++ head/audio/abcde/files/patch-abcde	(revision 476581)
@@ -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