Index: Makefile
===================================================================
--- Makefile	(revision 453216)
+++ Makefile	(working copy)
@@ -3,6 +3,7 @@
 
 PORTNAME=	abcde
 PORTVERSION=	2.8.1
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://abcde.einval.com/download/
 
@@ -23,17 +24,15 @@
 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
@@ -40,6 +39,11 @@
 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
@@ -48,9 +52,6 @@
 			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|' \
@@ -62,9 +63,12 @@
 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: files/patch-abcde
===================================================================
--- files/patch-abcde	(nonexistent)
+++ files/patch-abcde	(working copy)
@@ -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: 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: pkg-plist
===================================================================
--- pkg-plist	(nonexistent)
+++ pkg-plist	(working copy)
@@ -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: 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