From owner-svn-ports-head@freebsd.org Sat Nov 25 01:34:26 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6401BDF69FF; Sat, 25 Nov 2017 01:34:26 +0000 (UTC) (envelope-from woodsb02@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3B4426BF87; Sat, 25 Nov 2017 01:34:26 +0000 (UTC) (envelope-from woodsb02@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAP1YP1t036669; Sat, 25 Nov 2017 01:34:25 GMT (envelope-from woodsb02@FreeBSD.org) Received: (from woodsb02@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAP1YP9k036666; Sat, 25 Nov 2017 01:34:25 GMT (envelope-from woodsb02@FreeBSD.org) Message-Id: <201711250134.vAP1YP9k036666@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: woodsb02 set sender to woodsb02@FreeBSD.org using -f From: Ben Woods Date: Sat, 25 Nov 2017 01:34:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r454861 - in head/audio/abcde: . files X-SVN-Group: ports-head X-SVN-Commit-Author: woodsb02 X-SVN-Commit-Paths: in head/audio/abcde: . files X-SVN-Commit-Revision: 454861 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Nov 2017 01:34:26 -0000 Author: woodsb02 Date: Sat Nov 25 01:34:24 2017 New Revision: 454861 URL: https://svnweb.freebsd.org/changeset/ports/454861 Log: audio/abcde: Add MusicBrainz support - Make MusicBrainz support an on-by-default option - Add pkg-plist file to allow @sample to be clearly used for the config file - Include patch from upstream bug#54 to fix calculating MusicBrainz discid [1] [1] https://abcde.einval.com/bugzilla/show_bug.cgi?id=54 PR: 223346 Approved by: tz (maintainer timeout) Added: head/audio/abcde/files/patch-abcde (contents, props changed) head/audio/abcde/pkg-plist (contents, props changed) Modified: head/audio/abcde/Makefile Modified: head/audio/abcde/Makefile ============================================================================== --- head/audio/abcde/Makefile Sat Nov 25 01:25:36 2017 (r454860) +++ head/audio/abcde/Makefile Sat Nov 25 01:34:24 2017 (r454861) @@ -24,23 +24,26 @@ 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 @@ -49,9 +52,6 @@ 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|' \ @@ -63,9 +63,12 @@ post-patch: 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 Added: head/audio/abcde/files/patch-abcde ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/abcde/files/patch-abcde Sat Nov 25 01:34:24 2017 (r454861) @@ -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 Added: head/audio/abcde/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/abcde/pkg-plist Sat Nov 25 01:34:24 2017 (r454861) @@ -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