Attachment 130278 Details for Bug 174184 – file.diff

[patch] file.diff

file.diff (text/plain), 6.36 KB, created by tkato432 on 2012-12-05 18:10:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2012-12-05 18:10:08 UTC

Size: 6.36 KB

patch

obsolete

>diff -urN /usr/ports/audio/abcde/Makefile audio/abcde/Makefile
>--- /usr/ports/audio/abcde/Makefile	2012-11-28 18:23:38.000000000 +0900
>+++ audio/abcde/Makefile	2012-11-29 03:40:11.000000000 +0900
>@@ -2,8 +2,7 @@
> # $FreeBSD: head/audio/abcde/Makefile 307885 2012-11-28 06:53:03Z bapt $
> 
> PORTNAME=	abcde
>-PORTVERSION=	2.4.2
>-PORTREVISION=	2
>+PORTVERSION=	2.5.4
> CATEGORIES=	audio
> MASTER_SITES=	GOOGLE_CODE
> 
>@@ -20,11 +19,14 @@
> 		bash:${PORTSDIR}/shells/bash
> 
> NO_BUILD=	yes
>-MAN1=		abcde.1 cddb-tool.1
> 
>+SUB_FILES=	pkg-message
>+
>+MAN1=		abcde.1 cddb-tool.1
> PLIST_FILES=	bin/abcde bin/cddb-tool etc/abcde.conf.sample
> 
>-OPTIONS_DEFINE=	CDDA2WAV DAGRAB EJECT FLAC MPP NORMALIZE REPLAYGAIN SPEEX
>+OPTIONS_DEFINE=	CDDA2WAV DAGRAB EJECT FLAC MPP NORMALIZE REPLAYGAIN SPEEX \
>+		MUSICBRAINZ
> 
> EJECT_DESC?=	Enable auto-eject support
> NORMALIZE_DESC?=	Enable normalize support
>@@ -69,27 +71,33 @@
> 		vorbisgain:${PORTSDIR}/audio/vorbisgain
> .endif
> 
>+.if ${PORT_OPTIONS:MMUSICBRAINZ}
>+RUN_DEPENDS+=	p5-MusicBrainz-DiscID>0:${PORTSDIR}/audio/p5-MusicBrainz-DiscID \
>+		p5-WebService-MusicBrainz>0:${PORTSDIR}/www/p5-WebService-MusicBrainz
>+USE_PERL5_RUN=	yes
>+PLIST_FILES+=	bin/abcde-musicbrainz-tool
>+.endif
>+
> post-patch:
>-	${REINPLACE_CMD} -e 's#/etc/#${PREFIX}/etc/#g' \
>-		${WRKSRC}/abcde.1
>-	${REINPLACE_CMD} -e 's#/etc/#${PREFIX}/etc/#g' \
>-		-e 's#/bin/bash#${LOCALBASE}/bin/bash#g' \
>-		${WRKSRC}/abcde
>+.for f in abcde abcde.1 cddb-tool
>+	@${REINPLACE_CMD} -e \
>+		's|%%PREFIX%%|${PREFIX}| ; \
>+		 s|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/${f}
>+.endfor
>+.for f in abcde-musicbrainz-tool
>+	@${REINPLACE_CMD} -e \
>+		's|^#!/usr/bin/perl|#!${PERL}|' ${WRKSRC}/${f}
>+.endfor
> 
> do-install:
> 	${INSTALL_SCRIPT} ${WRKSRC}/abcde ${PREFIX}/bin
> 	${INSTALL_SCRIPT} ${WRKSRC}/cddb-tool ${PREFIX}/bin
> 	${INSTALL_DATA} ${WRKSRC}/abcde.conf ${PREFIX}/etc/abcde.conf.sample
>-	${INSTALL_MAN} ${WRKSRC}/abcde.1 ${PREFIX}/man/man1
>-	${INSTALL_MAN} ${WRKSRC}/cddb-tool.1 ${PREFIX}/man/man1
>-
>-post-install:
>-	@${ECHO_MSG} ""
>-	@${ECHO_MSG} "Please copy ${PREFIX}/etc/abcde.conf.sample to ~/.abcde.conf"
>-	@${ECHO_MSG} "and edit as necessary. Sane defaults have been set."
>-	@${ECHO_MSG} ""
>-	@${ECHO_MSG} "NOTE: If you have been using ${PORTNAME}-2.1.4 or older,"
>-	@${ECHO_MSG} "you must start with a fresh ~/.abcde.conf."
>-	@${ECHO_MSG} ""
>+	${INSTALL_MAN} ${WRKSRC}/abcde.1 ${MANPREFIX}/man/man1
>+	${INSTALL_MAN} ${WRKSRC}/cddb-tool.1 ${MANPREFIX}/man/man1
>+.if ${PORT_OPTIONS:MMUSICBRAINZ}
>+	${INSTALL_SCRIPT} ${WRKSRC}/abcde-musicbrainz-tool ${PREFIX}/bin
>+.endif
>+	@${CAT} ${PKGMESSAGE}
> 
> .include <bsd.port.mk>
>diff -urN /usr/ports/audio/abcde/distinfo audio/abcde/distinfo
>--- /usr/ports/audio/abcde/distinfo	2012-11-08 05:47:56.000000000 +0900
>+++ audio/abcde/distinfo	2012-11-29 03:21:20.000000000 +0900
>@@ -1,2 +1,2 @@
>-SHA256 (abcde-2.4.2.tar.gz) = 38b7545aba15bfddd9f6fc67ffa68bfa4a3e966fe1e10f8434246c0bae9b0655
>-SIZE (abcde-2.4.2.tar.gz) = 99032
>+SHA256 (abcde-2.5.4.tar.gz) = 85b679b970e728a986487adcbff7c51eb0e72f9fa10c4450521f8e029fa6e591
>+SIZE (abcde-2.5.4.tar.gz) = 104229
>diff -urN /usr/ports/audio/abcde/files/patch-abcde audio/abcde/files/patch-abcde
>--- /usr/ports/audio/abcde/files/patch-abcde	2012-11-08 05:47:56.000000000 +0900
>+++ audio/abcde/files/patch-abcde	2012-11-29 03:23:35.000000000 +0900
>@@ -1,6 +1,23 @@
> --- ./abcde.orig	2010-05-29 11:02:44.000000000 +0200
> +++ ./abcde	2011-03-11 07:56:10.638294344 +0100
>-@@ -3569,8 +3569,8 @@
>+@@ -1,4 +1,4 @@
>+-#!/bin/bash
>++#!%%LOCALBASE%%/bin/bash
>+ # Copyright (c) 1998-2001 Robert Woodcock <rcw@debian.org>
>+ # Copyright (c) 2003-2006 Jesus Climent <jesus.climent@hispalinux.es>
>+ # Copyright (c) 2009-2012 Colin Tuckley <colint@debian.org>
>+@@ -3346,8 +3346,8 @@
>+ fi
>+ 
>+ # Load system defaults
>+-if [ -r /etc/abcde.conf ]; then
>+-	. /etc/abcde.conf
>++if [ -r %%PREFIX%%/etc/abcde.conf ]; then
>++	. %%PREFIX%%/etc/abcde.conf
>+ fi
>+ # Load user preference defaults
>+ if [ -r $HOME/.abcde.conf ]; then
>+@@ -3738,8 +3738,8 @@
>  			m4a:*)  AACENCODEROPTSCLI="$( echo $OUTPUT | cut -d: -f2- )" ;;
>  		esac
>  	done
>diff -urN /usr/ports/audio/abcde/files/patch-abcde.1 audio/abcde/files/patch-abcde.1
>--- /usr/ports/audio/abcde/files/patch-abcde.1	1970-01-01 09:00:00.000000000 +0900
>+++ audio/abcde/files/patch-abcde.1	2012-11-29 03:25:21.000000000 +0900
>@@ -0,0 +1,20 @@
>+--- abcde.1.orig	2012-06-13 09:07:16.000000000 +0900
>++++ abcde.1	2012-11-29 03:25:13.000000000 +0900
>+@@ -72,7 +72,7 @@
>+ .TP
>+ .B \-c [filename]
>+ Specifies an additional configuration file to parse. Configuration options
>+-in this file override those in \fI/etc/abcde.conf\fR or \fI$HOME/.abcde.conf\fR.
>++in this file override those in \fI%%PREFIX%%/etc/abcde.conf\fR or \fI$HOME/.abcde.conf\fR.
>+ .TP
>+ .B \-C [discid]
>+ Allows you to resume a session for
>+@@ -220,7 +220,7 @@
>+ variables in your \fIabcde.conf\fR. Each file is given an extension identifying 
>+ its compression format, 'vorbis' for '.ogg', '.mp3', '.flac', '.spx', '.mpc', '.aac' or '.wav'.
>+ .SH CONFIGURATION
>+-\fBabcde\fR sources two configuration files on startup - \fI/etc/abcde.conf\fR and
>++\fBabcde\fR sources two configuration files on startup - \fI%%PREFIX%%/etc/abcde.conf\fR and
>+ \fI$HOME/.abcde.conf\fR, in that order. 
>+ .PP
>+ The configuration options stated in those files can be overridden by providing
>diff -urN /usr/ports/audio/abcde/files/patch-cddb-tool audio/abcde/files/patch-cddb-tool
>--- /usr/ports/audio/abcde/files/patch-cddb-tool	1970-01-01 09:00:00.000000000 +0900
>+++ audio/abcde/files/patch-cddb-tool	2012-11-29 03:27:00.000000000 +0900
>@@ -0,0 +1,8 @@
>+--- cddb-tool.orig	2012-06-20 22:44:13.000000000 +0900
>++++ cddb-tool	2012-11-29 03:26:47.000000000 +0900
>+@@ -1,4 +1,4 @@
>+-#!/bin/bash
>++#!%%LOCALBASE%%/bin/bash
>+ 
>+ # Copyright (C) 1999 Nathaniel Smith <njs@uclink4.berkeley.edu>
>+ # Copyright (C) 1999, 2000, 2001 Robert Woodcock <rcw@debian.org>
>diff -urN /usr/ports/audio/abcde/files/pkg-message.in audio/abcde/files/pkg-message.in
>--- /usr/ports/audio/abcde/files/pkg-message.in	1970-01-01 09:00:00.000000000 +0900
>+++ audio/abcde/files/pkg-message.in	2012-11-29 03:43:06.000000000 +0900
>@@ -0,0 +1,7 @@
>+******************************************************************
>+Please copy %%PREFIX%%/etc/abcde.conf.sample to ~/.abcde.conf and
>+edit as necessary. Sane defaults have been set.
>+
>+NOTE: If you have been using abcde-2.1.4 or older, you must start
>+with a fresh ~/.abcde.conf.
>+******************************************************************

Actions: View | Diff

Attachments on bug 174184: 130278