From owner-svn-ports-all@freebsd.org Tue Aug 7 09:07:08 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 808481053E89; Tue, 7 Aug 2018 09:07:08 +0000 (UTC) (envelope-from arved@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 37A2C84C67; Tue, 7 Aug 2018 09:07:08 +0000 (UTC) (envelope-from arved@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F3E0B19BA4; Tue, 7 Aug 2018 09:07:07 +0000 (UTC) (envelope-from arved@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w77977ek092786; Tue, 7 Aug 2018 09:07:07 GMT (envelope-from arved@FreeBSD.org) Received: (from arved@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w77977tv092784; Tue, 7 Aug 2018 09:07:07 GMT (envelope-from arved@FreeBSD.org) Message-Id: <201808070907.w77977tv092784@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: arved set sender to arved@FreeBSD.org using -f From: Tilman Keskinoz Date: Tue, 7 Aug 2018 09:07:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r476581 - in head/audio/abcde: . files X-SVN-Group: ports-head X-SVN-Commit-Author: arved X-SVN-Commit-Paths: in head/audio/abcde: . files X-SVN-Commit-Revision: 476581 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Aug 2018 09:07:08 -0000 Author: arved Date: Tue Aug 7 09:07:07 2018 New Revision: 476581 URL: https://svnweb.freebsd.org/changeset/ports/476581 Log: Fix Musicbrainz support - by replacing GNU sed'ism with awk Obtained from: upstream While here: - remove dependencies on perl modules included in perl-base - Grab maintainership Modified: head/audio/abcde/Makefile head/audio/abcde/files/patch-abcde Modified: head/audio/abcde/Makefile ============================================================================== --- head/audio/abcde/Makefile Tue Aug 7 08:27:03 2018 (r476580) +++ head/audio/abcde/Makefile Tue Aug 7 09:07:07 2018 (r476581) @@ -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 Modified: head/audio/abcde/files/patch-abcde ============================================================================== --- head/audio/abcde/files/patch-abcde Tue Aug 7 08:27:03 2018 (r476580) +++ head/audio/abcde/files/patch-abcde Tue Aug 7 09:07:07 2018 (r476581) @@ -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