Attachment #130278 for bug #174184

View | Details | Raw Unified | Return to bug 174184
Collapse All | Expand All

Lines 2-9 Link Here

(-)audio/abcde/Makefile (-20 / +28 lines)
2	# $FreeBSD: head/audio/abcde/Makefile 307885 2012-11-28 06:53:03Z bapt $	2	# $FreeBSD: head/audio/abcde/Makefile 307885 2012-11-28 06:53:03Z bapt $
3		3
4	PORTNAME= abcde	4	PORTNAME= abcde
5	PORTVERSION= 2.4.2	5	PORTVERSION= 2.5.4
6	PORTREVISION= 2
7	CATEGORIES= audio	6	CATEGORIES= audio
8	MASTER_SITES= GOOGLE_CODE	7	MASTER_SITES= GOOGLE_CODE
9		8
Lines 20-30 Link Here
20	bash:${PORTSDIR}/shells/bash	19	bash:${PORTSDIR}/shells/bash
21		20
22	NO_BUILD= yes	21	NO_BUILD= yes
23	MAN1= abcde.1 cddb-tool.1
24		22
		23	SUB_FILES= pkg-message
		24
		25	MAN1= abcde.1 cddb-tool.1
25	PLIST_FILES= bin/abcde bin/cddb-tool etc/abcde.conf.sample	26	PLIST_FILES= bin/abcde bin/cddb-tool etc/abcde.conf.sample
26		27
27	OPTIONS_DEFINE= CDDA2WAV DAGRAB EJECT FLAC MPP NORMALIZE REPLAYGAIN SPEEX	28	OPTIONS_DEFINE= CDDA2WAV DAGRAB EJECT FLAC MPP NORMALIZE REPLAYGAIN SPEEX \
		29	MUSICBRAINZ
28		30
29	EJECT_DESC?= Enable auto-eject support	31	EJECT_DESC?= Enable auto-eject support
30	NORMALIZE_DESC?= Enable normalize support	32	NORMALIZE_DESC?= Enable normalize support
Lines 69-95 Link Here
69	vorbisgain:${PORTSDIR}/audio/vorbisgain	71	vorbisgain:${PORTSDIR}/audio/vorbisgain
70	.endif	72	.endif
71		73
		74	.if ${PORT_OPTIONS:MMUSICBRAINZ}
		75	RUN_DEPENDS+= p5-MusicBrainz-DiscID>0:${PORTSDIR}/audio/p5-MusicBrainz-DiscID \
		76	p5-WebService-MusicBrainz>0:${PORTSDIR}/www/p5-WebService-MusicBrainz
		77	USE_PERL5_RUN= yes
		78	PLIST_FILES+= bin/abcde-musicbrainz-tool
		79	.endif
		80
72	post-patch:	81	post-patch:
73	${REINPLACE_CMD} -e 's#/etc/#${PREFIX}/etc/#g' \	82	.for f in abcde abcde.1 cddb-tool
74	${WRKSRC}/abcde.1	83	@${REINPLACE_CMD} -e \
75	${REINPLACE_CMD} -e 's#/etc/#${PREFIX}/etc/#g' \	84	's\|%%PREFIX%%\|${PREFIX}\| ; \
76	-e 's#/bin/bash#${LOCALBASE}/bin/bash#g' \	85	s\|%%LOCALBASE%%\|${LOCALBASE}\|' ${WRKSRC}/${f}
77	${WRKSRC}/abcde	86	.endfor
		87	.for f in abcde-musicbrainz-tool
		88	@${REINPLACE_CMD} -e \
		89	's\|^#!/usr/bin/perl\|#!${PERL}\|' ${WRKSRC}/${f}
		90	.endfor
78		91
79	do-install:	92	do-install:
80	${INSTALL_SCRIPT} ${WRKSRC}/abcde ${PREFIX}/bin	93	${INSTALL_SCRIPT} ${WRKSRC}/abcde ${PREFIX}/bin
81	${INSTALL_SCRIPT} ${WRKSRC}/cddb-tool ${PREFIX}/bin	94	${INSTALL_SCRIPT} ${WRKSRC}/cddb-tool ${PREFIX}/bin
82	${INSTALL_DATA} ${WRKSRC}/abcde.conf ${PREFIX}/etc/abcde.conf.sample	95	${INSTALL_DATA} ${WRKSRC}/abcde.conf ${PREFIX}/etc/abcde.conf.sample
83	${INSTALL_MAN} ${WRKSRC}/abcde.1 ${PREFIX}/man/man1	96	${INSTALL_MAN} ${WRKSRC}/abcde.1 ${MANPREFIX}/man/man1
84	${INSTALL_MAN} ${WRKSRC}/cddb-tool.1 ${PREFIX}/man/man1	97	${INSTALL_MAN} ${WRKSRC}/cddb-tool.1 ${MANPREFIX}/man/man1
85		98	.if ${PORT_OPTIONS:MMUSICBRAINZ}
86	post-install:	99	${INSTALL_SCRIPT} ${WRKSRC}/abcde-musicbrainz-tool ${PREFIX}/bin
87	@${ECHO_MSG} ""	100	.endif
88	@${ECHO_MSG} "Please copy ${PREFIX}/etc/abcde.conf.sample to ~/.abcde.conf"	101	@${CAT} ${PKGMESSAGE}
89	@${ECHO_MSG} "and edit as necessary. Sane defaults have been set."
90	@${ECHO_MSG} ""
91	@${ECHO_MSG} "NOTE: If you have been using ${PORTNAME}-2.1.4 or older,"
92	@${ECHO_MSG} "you must start with a fresh ~/.abcde.conf."
93	@${ECHO_MSG} ""
94		102
95	.include <bsd.port.mk>	103	.include <bsd.port.mk>

Lines 1-2 Link Here

(-)audio/abcde/distinfo (-2 / +2 lines)
1	SHA256 (abcde-2.4.2.tar.gz) = 38b7545aba15bfddd9f6fc67ffa68bfa4a3e966fe1e10f8434246c0bae9b0655	1	SHA256 (abcde-2.5.4.tar.gz) = 85b679b970e728a986487adcbff7c51eb0e72f9fa10c4450521f8e029fa6e591
2	SIZE (abcde-2.4.2.tar.gz) = 99032	2	SIZE (abcde-2.5.4.tar.gz) = 104229




--- ./abcde.orig	2010-05-29 11:02:44.000000000 +0200
+++ ./abcde	2011-03-11 07:56:10.638294344 +0100
@@ -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




--- 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

Line 0 Link Here

(-)audio/abcde/files/patch-cddb-tool (+8 lines)
	1	--- cddb-tool.orig 2012-06-20 22:44:13.000000000 +0900
	2	+++ cddb-tool 2012-11-29 03:26:47.000000000 +0900
	3	@@ -1,4 +1,4 @@
	4	-#!/bin/bash
	5	+#!%%LOCALBASE%%/bin/bash
	6
	7	# Copyright (C) 1999 Nathaniel Smith <njs@uclink4.berkeley.edu>
	8	# Copyright (C) 1999, 2000, 2001 Robert Woodcock <rcw@debian.org>

Line 0 Link Here

(-)audio/abcde/files/pkg-message.in (+7 lines)
	1	******************************************************************
	2	Please copy %%PREFIX%%/etc/abcde.conf.sample to ~/.abcde.conf and
	3	edit as necessary. Sane defaults have been set.
	4
	5	NOTE: If you have been using abcde-2.1.4 or older, you must start
	6	with a fresh ~/.abcde.conf.
	7	******************************************************************

Return to bug 174184

Lines 1-6 Link Here

(-)audio/abcde/files/patch-abcde (-1 / +18 lines)
1	--- ./abcde.orig 2010-05-29 11:02:44.000000000 +0200	1	--- ./abcde.orig 2010-05-29 11:02:44.000000000 +0200
2	+++ ./abcde 2011-03-11 07:56:10.638294344 +0100	2	+++ ./abcde 2011-03-11 07:56:10.638294344 +0100
3	@@ -3569,8 +3569,8 @@	3	@@ -1,4 +1,4 @@
		4	-#!/bin/bash
		5	+#!%%LOCALBASE%%/bin/bash
		6	# Copyright (c) 1998-2001 Robert Woodcock <rcw@debian.org>
		7	# Copyright (c) 2003-2006 Jesus Climent <jesus.climent@hispalinux.es>
		8	# Copyright (c) 2009-2012 Colin Tuckley <colint@debian.org>
		9	@@ -3346,8 +3346,8 @@
		10	fi
		11
		12	# Load system defaults
		13	-if [ -r /etc/abcde.conf ]; then
		14	- . /etc/abcde.conf
		15	+if [ -r %%PREFIX%%/etc/abcde.conf ]; then
		16	+ . %%PREFIX%%/etc/abcde.conf
		17	fi
		18	# Load user preference defaults
		19	if [ -r $HOME/.abcde.conf ]; then
		20	@@ -3738,8 +3738,8 @@
4	m4a:*) AACENCODEROPTSCLI="$( echo $OUTPUT \| cut -d: -f2- )" ;;	21	m4a:*) AACENCODEROPTSCLI="$( echo $OUTPUT \| cut -d: -f2- )" ;;
5	esac	22	esac
6	done	23	done

Line 0 Link Here

(-)audio/abcde/files/patch-abcde.1 (+20 lines)
	1	--- abcde.1.orig 2012-06-13 09:07:16.000000000 +0900
	2	+++ abcde.1 2012-11-29 03:25:13.000000000 +0900
	3	@@ -72,7 +72,7 @@
	4	.TP
	5	.B \-c [filename]
	6	Specifies an additional configuration file to parse. Configuration options
	7	-in this file override those in \fI/etc/abcde.conf\fR or \fI$HOME/.abcde.conf\fR.
	8	+in this file override those in \fI%%PREFIX%%/etc/abcde.conf\fR or \fI$HOME/.abcde.conf\fR.
	9	.TP
	10	.B \-C [discid]
	11	Allows you to resume a session for
	12	@@ -220,7 +220,7 @@
	13	variables in your \fIabcde.conf\fR. Each file is given an extension identifying
	14	its compression format, 'vorbis' for '.ogg', '.mp3', '.flac', '.spx', '.mpc', '.aac' or '.wav'.
	15	.SH CONFIGURATION
	16	-\fBabcde\fR sources two configuration files on startup - \fI/etc/abcde.conf\fR and
	17	+\fBabcde\fR sources two configuration files on startup - \fI%%PREFIX%%/etc/abcde.conf\fR and
	18	\fI$HOME/.abcde.conf\fR, in that order.
	19	.PP
	20	The configuration options stated in those files can be overridden by providing