Attachment #159175 for bug #201837

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




# $FreeBSD: head/audio/abcde/Makefile 384126 2015-04-16 20:13:43Z gblach $

PORTNAME=	abcde
PORTVERSION=	2.7
CATEGORIES=	audio
MASTER_SITES=	http://abcde.einval.com/download/

MAINTAINER=	ports@FreeBSD.org
COMMENT=	Front-end shell script to encode CDs in flac/mp3/ogg/speex format

LICENSE=	ART10 GPLv2
LICENSE_COMP=	dual

RUN_DEPENDS=	cd-discid:${PORTSDIR}/audio/cd-discid \
		cdparanoia:${PORTSDIR}/audio/cdparanoia \
		oggenc:${PORTSDIR}/audio/vorbis-tools \
		lame:${PORTSDIR}/audio/lame \
		${PYTHON_PKGNAMEPREFIX}eyed3>=0.7:${PORTSDIR}/audio/py-eyed3 \
		oggenc:${PORTSDIR}/audio/vorbis-tools \
		bash:${PORTSDIR}/shells/bash

NO_ARCH=	yes
NO_BUILD=	yes

USES=		python:run shebangfix
SHEBANG_FILES=	abcde 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

AAC_RUN_DEPENDS=	faac:${PORTSDIR}/audio/faac
CDDA2WAV_RUN_DEPENDS=	cdda2wav:${PORTSDIR}/sysutils/cdrtools
DAGRAB_RUN_DEPENDS=	dagrab:${PORTSDIR}/audio/dagrab
FLAC_RUN_DEPENDS=	flac:${PORTSDIR}/audio/flac
MPP_RUN_DEPENDS=	mpcenc:${PORTSDIR}/audio/musepack
NORMALIZE_DESC=		Enable normalize support
NORMALIZE_RUN_DEPENDS=	normalize:${PORTSDIR}/audio/normalize
OPUS_RUN_DEPENDS=	opusenc:${PORTSDIR}/audio/opus-tools
REPLAYGAIN_DESC=	Enable (vorbis|mp3)gain support
REPLAYGAIN_RUN_DEPENDS=	mp3gain:${PORTSDIR}/audio/mp3gain \
NORMALIZE_RUN_DEPENDS+=	normalize:${PORTSDIR}/audio/normalize
REPLAYGAIN_RUN_DEPENDS+=mp3gain:${PORTSDIR}/audio/mp3gain \
			vorbisgain:${PORTSDIR}/audio/vorbisgain
SPEEX_RUN_DEPENDS=	speexenc:${PORTSDIR}/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|' \
		${WRKSRC}/abcde
	@${REINPLACE_CMD} -e \
		's|\(fI\)\(/etc/abcde.conf\)|\1${PREFIX}\2|' \
		${WRKSRC}/abcde.1

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_MAN} abcde.1 cddb-tool.1 \
		${STAGEDIR}${MANPREFIX}/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} ""

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)audio/abcde/distinfo (-2 / +2 lines)
1	SHA256 (abcde-2.6.tar.gz) = 683ea7e215142784a28afcda4a18d9a2b8f7ef7bcd9c2881ee110a3b86784c78	1	SHA256 (abcde-2.7.tar.gz) = 0148698a09fedcbae37ee9da295afe411a1190cf8ae224b7814d31b5bf737746
2	SIZE (abcde-2.6.tar.gz) = 105609	2	SIZE (abcde-2.7.tar.gz) = 140039




--- ./abcde.orig	2010-05-29 11:02:44.000000000 +0200
+++ ./abcde	2011-03-11 07:56:10.638294344 +0100
@@ -3569,8 +3569,8 @@
 			m4a:*)  AACENCODEROPTSCLI="$( echo $OUTPUT | cut -d: -f2- )" ;;
 		esac
 	done
-	for OUTPUT in "$(echo "$OUTPUTTYPE" | tr , \ )"; do
-		TEMPOUTPUT=$( echo "$OUTPUT" | cut -d: -f1 )
+	for OUTPUT in "$(echo "$OUTPUTTYPE" | tr \  \| | tr , \ )"; do
+		TEMPOUTPUT=$( echo "$OUTPUT" | tr \  \| | cut -d: -f1 )
 		TEMPOUTPUTTYPE="${TEMPOUTPUTTYPE:+$TEMPOUTPUTTYPE,}$TEMPOUTPUT"
 	done
 	OUTPUTTYPE="$TEMPOUTPUTTYPE"




--- abcde.conf.orig	2015-06-18 12:26:40 UTC
+++ abcde.conf
@@ -209,7 +209,8 @@
 
 # Ogg:
 #VORBIZEOPTS=
-#OGGENCOPTS=
+#OFFENCOPTS=
+OGGENCOPTS="-q 5"
 
 # FLAC:
 # The flac option is a workaround for an error where flac fails
@@ -323,7 +324,7 @@
 # (e.g. "ogg") or a combination of them separated with ","
 # (e.g. "flac,mp3"). Currently recognised and supported are:
 # "flac", "m4a", "mp3, "mpc", "ogg", "opus", "spx", "vorbis", "wav", "wv", "ape"
-#OUTPUTTYPE=ogg
+OUTPUTTYPE=ogg
 
 # Output filename format - change this to reflect your inner desire to
 # organize things differently than everyone else :)
@@ -336,9 +337,11 @@
 # to the files. Remove it from your user defined string if you are getting
 # files like ".ogg.ogg".
 #OUTPUTFORMAT='${ARTISTFILE}-${ALBUMFILE}/${TRACKNUM}.${TRACKFILE}'
+OUTPUTFORMAT='${ARTISTFILE}-${ALBUMFILE}/${ARTISTFILE}-${TRACKNUM}-${TRACKFILE}'
 
 # Like OUTPUTFORMAT but for Various Artists discs.
 #VAOUTPUTFORMAT='Various-${ALBUMFILE}/${TRACKNUM}.${ARTISTFILE}-${TRACKFILE}'
+VAOUTPUTFORMAT='${ARTISTFILE}/${ARTISTFILE}-${TRACKNUM}-${TRACKFILE}'
 
 # Like OUTPUTFORMAT and VAOUTPUTFORMAT but for the ONEFILE rips.
 #ONETRACKOUTPUTFORMAT=$OUTPUTFORMAT
 # CD device you want to read from
 # It can be defined as a singletrack flac file, but since it might change from
 # file to file it makes little sense to define it here.
-#CDROM=/dev/cdrom
+CDROM=/dev/cd0
 # If we are using the IDE bus, we need CDPARANOIACDROMBUS defined as "d"
 # If we are using the ide-scsi emulation layer, we need to define a "g"
 #CDPARANOIACDROMBUS="d"
@@ -343,8 +343,7 @@
 # Custom pre-read function
 # By default it does nothing.
 # You can set some things to get abcde function in better ways:
-# * Close the CD tray using eject -t (if available in eject and supported by 
-#   your CD device.
+# * Close the CD tray using cdcontrol close (if supported by your CD device).
 # * Set the CD speed. You can also use the built-in options, but you can also 
 #   set it here. In Debian, eject -x and cdset -x do the job.
 # KEEP IN MIND that executables included in pre_read must be in your $PATH or

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 201837

Lines 2-68 Link Here

(-)audio/abcde/Makefile (-35 / +37 lines)
2	# $FreeBSD: head/audio/abcde/Makefile 384126 2015-04-16 20:13:43Z gblach $	2	# $FreeBSD: head/audio/abcde/Makefile 384126 2015-04-16 20:13:43Z gblach $
3		3
4	PORTNAME= abcde	4	PORTNAME= abcde
5	PORTVERSION= 2.6	5	PORTVERSION= 2.7
6	CATEGORIES= audio	6	CATEGORIES= audio
7	MASTER_SITES= http://abcde.einval.com/download/	7	MASTER_SITES= http://abcde.einval.com/download/
8		8
9	MAINTAINER= ports@FreeBSD.org	9	MAINTAINER= ports@FreeBSD.org
10	COMMENT= Front-end shell script to encode CDs in flac/mp3/ogg/speex format	10	COMMENT= Front-end shell script to encode CDs in flac/mp3/ogg/speex format
11		11
12	LICENSE= GPLv2	12	LICENSE= ART10 GPLv2
		13	LICENSE_COMP= dual
13		14
14	RUN_DEPENDS= cd-discid:${PORTSDIR}/audio/cd-discid \	15	RUN_DEPENDS= cd-discid:${PORTSDIR}/audio/cd-discid \
15	cdparanoia:${PORTSDIR}/audio/cdparanoia \	16	cdparanoia:${PORTSDIR}/audio/cdparanoia \
16	oggenc:${PORTSDIR}/audio/vorbis-tools \
17	lame:${PORTSDIR}/audio/lame \	17	lame:${PORTSDIR}/audio/lame \
18	${PYTHON_PKGNAMEPREFIX}eyed3>=0.7:${PORTSDIR}/audio/py-eyed3 \	18	${PYTHON_PKGNAMEPREFIX}eyed3>=0.7:${PORTSDIR}/audio/py-eyed3 \
		19	oggenc:${PORTSDIR}/audio/vorbis-tools \
19	bash:${PORTSDIR}/shells/bash	20	bash:${PORTSDIR}/shells/bash
20		21
		22	NO_ARCH= yes
21	NO_BUILD= yes	23	NO_BUILD= yes
		24
22	USES= python:run shebangfix	25	USES= python:run shebangfix
23	SHEBANG_FILES= ${PORTNAME} cddb-tool	26	SHEBANG_FILES= abcde cddb-tool
		27
		28	SUB_FILES= pkg-message
		29
		30	PLIST_FILES= bin/abcde bin/cddb-tool etc/abcde.conf.sample \
		31	man/man1/abcde.1.gz man/man1/cddb-tool.1.gz
24		32
25	OPTIONS_GROUP= CODEC RIPPER	33	OPTIONS_GROUP= CODEC RIPPER
26	OPTIONS_GROUP_CODEC= AAC FLAC MPP OPUS SPEEX	34	OPTIONS_GROUP_CODEC= AAC FLAC MPP OPUS SPEEX
27	OPTIONS_GROUP_RIPPER= CDDA2WAV DAGRAB	35	OPTIONS_GROUP_RIPPER= CDDA2WAV DAGRAB
28	OPTIONS_DEFINE= NORMALIZE REPLAYGAIN	36	OPTIONS_DEFINE= NORMALIZE REPLAYGAIN
29		37
30	NORMALIZE_DESC?= Enable normalize support	38	AAC_RUN_DEPENDS= faac:${PORTSDIR}/audio/faac
31	REPLAYGAIN_DESC?= Enable (vorbis\|mp3)gain support	39	CDDA2WAV_RUN_DEPENDS= cdda2wav:${PORTSDIR}/sysutils/cdrtools
32		40	DAGRAB_RUN_DEPENDS= dagrab:${PORTSDIR}/audio/dagrab
33	AAC_RUN_DEPENDS+= faac:${PORTSDIR}/audio/faac	41	FLAC_RUN_DEPENDS= flac:${PORTSDIR}/audio/flac
34	FLAC_RUN_DEPENDS+= flac:${PORTSDIR}/audio/flac	42	MPP_RUN_DEPENDS= mpcenc:${PORTSDIR}/audio/musepack
35	MPP_RUN_DEPENDS+= mpcenc:${PORTSDIR}/audio/musepack	43	NORMALIZE_DESC= Enable normalize support
36	OPUS_RUN_DEPENDS+= opusenc:${PORTSDIR}/audio/opus-tools	44	NORMALIZE_RUN_DEPENDS= normalize:${PORTSDIR}/audio/normalize
37	SPEEX_RUN_DEPENDS+= speexenc:${PORTSDIR}/audio/speex	45	OPUS_RUN_DEPENDS= opusenc:${PORTSDIR}/audio/opus-tools
38	CDDA2WAV_RUN_DEPENDS+= cdda2wav:${PORTSDIR}/sysutils/cdrtools	46	REPLAYGAIN_DESC= Enable (vorbis\|mp3)gain support
39	DAGRAB_RUN_DEPENDS+= dagrab:${PORTSDIR}/audio/dagrab	47	REPLAYGAIN_RUN_DEPENDS= mp3gain:${PORTSDIR}/audio/mp3gain \
40	NORMALIZE_RUN_DEPENDS+= normalize:${PORTSDIR}/audio/normalize
41	REPLAYGAIN_RUN_DEPENDS+=mp3gain:${PORTSDIR}/audio/mp3gain \
42	vorbisgain:${PORTSDIR}/audio/vorbisgain	48	vorbisgain:${PORTSDIR}/audio/vorbisgain
		49	SPEEX_RUN_DEPENDS= speexenc:${PORTSDIR}/audio/speex
43		50
44	PLIST_FILES= bin/abcde bin/cddb-tool etc/abcde.conf.sample \	51	post-extract:
45	man/man1/abcde.1.gz man/man1/cddb-tool.1.gz	52	@${LN} -sf abcde.conf ${WRKSRC}/abcde.conf.sample
46		53
47	post-patch:	54	post-patch:
48	${REINPLACE_CMD} -e 's#/etc/#${PREFIX}/etc/#g' \	55	@${REINPLACE_CMD} -e \
49	${WRKSRC}/abcde ${WRKSRC}/abcde.1	56	's\|\([[:space:]]\)\(/etc/abcde.conf\)\|\1${PREFIX}\2\|' \
		57	${WRKSRC}/abcde
		58	@${REINPLACE_CMD} -e \
		59	's\|\(fI\)\(/etc/abcde.conf\)\|\1${PREFIX}\2\|' \
		60	${WRKSRC}/abcde.1
50		61
51	do-install:	62	do-install:
52	${INSTALL_SCRIPT} ${WRKSRC}/abcde ${STAGEDIR}${PREFIX}/bin	63	(cd ${WRKSRC} && ${INSTALL_SCRIPT} abcde cddb-tool \
53	${INSTALL_SCRIPT} ${WRKSRC}/cddb-tool ${STAGEDIR}${PREFIX}/bin	64	${STAGEDIR}${PREFIX}/bin)
54	${INSTALL_DATA} ${WRKSRC}/abcde.conf \	65	(cd ${WRKSRC} && ${INSTALL_DATA} abcde.conf.sample \
55	${STAGEDIR}${PREFIX}/etc/abcde.conf.sample	66	${STAGEDIR}${PREFIX}/etc)
56	${INSTALL_MAN} ${WRKSRC}/abcde.1 ${STAGEDIR}${PREFIX}/man/man1	67	(cd ${WRKSRC} && ${INSTALL_MAN} abcde.1 cddb-tool.1 \
57	${INSTALL_MAN} ${WRKSRC}/cddb-tool.1 ${STAGEDIR}${PREFIX}/man/man1	68	${STAGEDIR}${MANPREFIX}/man/man1)
58
59	post-install:
60	@${ECHO_MSG} ""
61	@${ECHO_MSG} "Please copy ${PREFIX}/etc/abcde.conf.sample to ~/.abcde.conf"
62	@${ECHO_MSG} "and edit as necessary. Sane defaults have been set."
63	@${ECHO_MSG} ""
64	@${ECHO_MSG} "NOTE: If you have been using ${PORTNAME}-2.1.4 or older,"
65	@${ECHO_MSG} "you must start with a fresh ~/.abcde.conf."
66	@${ECHO_MSG} ""
67		69
68	.include <bsd.port.mk>	70	.include <bsd.port.mk>

Lines 1-13 Link Here

(-)audio/abcde/files/patch-abcde (-13 lines)
1	--- ./abcde.orig 2010-05-29 11:02:44.000000000 +0200
2	+++ ./abcde 2011-03-11 07:56:10.638294344 +0100
3	@@ -3569,8 +3569,8 @@
4	m4a:*) AACENCODEROPTSCLI="$( echo $OUTPUT \| cut -d: -f2- )" ;;
5	esac
6	done
7	- for OUTPUT in "$(echo "$OUTPUTTYPE" \| tr , \ )"; do
8	- TEMPOUTPUT=$( echo "$OUTPUT" \| cut -d: -f1 )
9	+ for OUTPUT in "$(echo "$OUTPUTTYPE" \| tr \ \\| \| tr , \ )"; do
10	+ TEMPOUTPUT=$( echo "$OUTPUT" \| tr \ \\| \| cut -d: -f1 )
11	TEMPOUTPUTTYPE="${TEMPOUTPUTTYPE:+$TEMPOUTPUTTYPE,}$TEMPOUTPUT"
12	done
13	OUTPUTTYPE="$TEMPOUTPUTTYPE"

Lines 1-51 Link Here

(-)audio/abcde/files/patch-abcde.conf (-51 / +33 lines)
1	--- abcde.conf.orig 2014-12-18 17:39:40.000000000 +0100	1	--- abcde.conf.orig 2015-06-18 12:26:40 UTC
2	+++ abcde.conf 2014-12-18 17:45:51.000000000 +0100	2	+++ abcde.conf
3	@@ -141,13 +141,13 @@	3	@@ -209,7 +209,8 @@
4	#CDDAFS=cp	4
5	#CDDISCID=cd-discid	5	# Ogg:
6	#CDDBTOOL=cddb-tool	6	#VORBIZEOPTS=
7	-#EJECT=eject	7	-#OGGENCOPTS=
8	-#MD5SUM=md5sum	8	+#OFFENCOPTS=
9	+EJECT=cdcontrol	9	+OGGENCOPTS="-q 5"
10	+MD5SUM=md5	10
11	#DISTMP3=distmp3	11	# FLAC:
12	#VORBISCOMMENT=vorbiscomment	12	# The flac option is a workaround for an error where flac fails
13	#METAFLAC=metaflac	13	@@ -323,7 +324,7 @@
14	#NORMALIZE=normalize-audio	14	# (e.g. "ogg") or a combination of them separated with ","
15	-#CDSPEED=eject	15	# (e.g. "flac,mp3"). Currently recognised and supported are:
16	+CDSPEED=cdcontrol	16	# "flac", "m4a", "mp3, "mpc", "ogg", "opus", "spx", "vorbis", "wav", "wv", "ape"
17	#VORBISGAIN=vorbisgain	17	-#OUTPUTTYPE=ogg
18	#MKCUE=mkcue	18	+OUTPUTTYPE=ogg
19	#MKTOC=cdrdao	19
20	@@ -215,10 +215,10 @@	20	# Output filename format - change this to reflect your inner desire to
21	#PIRDOPTS="-p"	21	# organize things differently than everyone else :)
22	#CDDAFSOPTS="-f"	22	@@ -336,9 +337,11 @@
23	#CDDBTOOLOPTS=	23	# to the files. Remove it from your user defined string if you are getting
24	-#EJECTOPTS=	24	# files like ".ogg.ogg".
25	+EJECTOPTS="eject"	25	#OUTPUTFORMAT='${ARTISTFILE}-${ALBUMFILE}/${TRACKNUM}.${TRACKFILE}'
26	#DISTMP3OPTS=	26	+OUTPUTFORMAT='${ARTISTFILE}-${ALBUMFILE}/${ARTISTFILE}-${TRACKNUM}-${TRACKFILE}'
27	#NORMALIZEOPTS=	27
28	-#CDSPEEDOPTS="-x"	28	# Like OUTPUTFORMAT but for Various Artists discs.
29	+CDSPEEDOPTS="speed"	29	#VAOUTPUTFORMAT='Various-${ALBUMFILE}/${TRACKNUM}.${ARTISTFILE}-${TRACKFILE}'
30	#CDSPEEDVALUE=""	30	+VAOUTPUTFORMAT='${ARTISTFILE}/${ARTISTFILE}-${TRACKNUM}-${TRACKFILE}'
31	#MKCUEOPTS=""	31
32	#MKTOCOPTS=""	32	# Like OUTPUTFORMAT and VAOUTPUTFORMAT but for the ONEFILE rips.
33	@@ -245,7 +245,7 @@	33	#ONETRACKOUTPUTFORMAT=$OUTPUTFORMAT
34	# CD device you want to read from
35	# It can be defined as a singletrack flac file, but since it might change from
36	# file to file it makes little sense to define it here.
37	-#CDROM=/dev/cdrom
38	+CDROM=/dev/cd0
39	# If we are using the IDE bus, we need CDPARANOIACDROMBUS defined as "d"
40	# If we are using the ide-scsi emulation layer, we need to define a "g"
41	#CDPARANOIACDROMBUS="d"
42	@@ -343,8 +343,7 @@
43	# Custom pre-read function
44	# By default it does nothing.
45	# You can set some things to get abcde function in better ways:
46	-# * Close the CD tray using eject -t (if available in eject and supported by
47	-# your CD device.
48	+# * Close the CD tray using cdcontrol close (if supported by your CD device).
49	# * Set the CD speed. You can also use the built-in options, but you can also
50	# set it here. In Debian, eject -x and cdset -x do the job.
51	# KEEP IN MIND that executables included in pre_read must be in your $PATH or