Index: head/audio/abcde/Makefile
===================================================================
--- head/audio/abcde/Makefile	(revision 454860)
+++ head/audio/abcde/Makefile	(revision 454861)
@@ -1,71 +1,74 @@
 # Created by: Munish Chopra <mchopra@engmail.uwaterloo.ca>
 # $FreeBSD$
 
 PORTNAME=	abcde
 PORTVERSION=	2.8.1
 PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://abcde.einval.com/download/
 
 MAINTAINER=	tz@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 \
 		${PYTHON_PKGNAMEPREFIX}eyed3>=0.7:audio/py-eyed3 \
 		oggenc:audio/vorbis-tools \
 		bash:shells/bash
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 USES=		python:run shebangfix
-SHEBANG_FILES=	abcde cddb-tool
+SHEBANG_FILES=	abcde abcde-musicbrainz-tool cddb-tool
 
 SUB_FILES=	pkg-message
 
-PLIST_FILES=	bin/abcde bin/cddb-tool etc/abcde.conf.sample \
-		man/man1/abcde.1.gz man/man1/cddb-tool.1.gz
-
 OPTIONS_GROUP=		CODEC RIPPER
 OPTIONS_GROUP_CODEC=	AAC FLAC MPP OPUS SPEEX
 OPTIONS_GROUP_RIPPER=	CDDA2WAV DAGRAB
-OPTIONS_DEFINE=		NORMALIZE REPLAYGAIN
+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-MusicBrainz-DiscID>=0:audio/p5-MusicBrainz-DiscID \
+			p5-WebService-MusicBrainz0>=0:www/p5-WebService-MusicBrainz0
 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-extract:
-	@${LN} -sf abcde.conf ${WRKSRC}/abcde.conf.sample
-
 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.sample \
-		${STAGEDIR}${PREFIX}/etc)
+	(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	(nonexistent)
+++ head/audio/abcde/files/patch-abcde	(revision 454861)
@@ -0,0 +1,14 @@
+--- abcde.orig	2017-01-18 13:56:14 UTC
++++ abcde
+@@ -2012,7 +2012,10 @@ do_discid ()
+ 
+ 				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
+ 				;;
+ 			*)
+ 				case "$CDDBMETHOD" in

Property changes on: head/audio/abcde/files/patch-abcde
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/audio/abcde/pkg-plist
===================================================================
--- head/audio/abcde/pkg-plist	(nonexistent)
+++ head/audio/abcde/pkg-plist	(revision 454861)
@@ -0,0 +1,6 @@
+bin/abcde
+bin/abcde-musicbrainz-tool
+bin/cddb-tool
+@sample etc/abcde.conf.sample
+man/man1/abcde.1.gz
+man/man1/cddb-tool.1.gz

Property changes on: head/audio/abcde/pkg-plist
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property