- Update to 2.6

- Use OPTIONS helpers
- Convert pkg-plist to PLIST_FILES
This commit is contained in:
Grzegorz Blach 2014-12-19 13:19:21 +00:00
parent a9e3d3d9cb
commit d35d2175c6
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=374944
6 changed files with 63 additions and 97 deletions

View file

@ -5,6 +5,16 @@ they are unavoidable.
You should get into the habit of checking this file for changes each time You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades. you update your ports collection, before attempting any port upgrades.
20141219:
AFFECTS: users of audio/abcde
AUTHOR: gblach@FreeBSD.org
In audio/abcde dependency has been changed from audio/py-eyed3-06
to audio/py-eyed3. Before updating audio/abcde to 2.6 you must manually
deinstall audio/py-eyed-06.
# pkg delete -f pyXX-eyed3-06
20141218: 20141218:
AFFECTS: users of security/openssh-portable AFFECTS: users of security/openssh-portable
AUTHOR: bdrewery@FreeBSD.org AUTHOR: bdrewery@FreeBSD.org

View file

@ -2,10 +2,9 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= abcde PORTNAME= abcde
PORTVERSION= 2.5.4 PORTVERSION= 2.6
PORTREVISION= 4
CATEGORIES= audio CATEGORIES= audio
MASTER_SITES= GOOGLE_CODE MASTER_SITES= http://abcde.einval.com/download/
MAINTAINER= gblach@FreeBSD.org MAINTAINER= gblach@FreeBSD.org
COMMENT= Front-end shell script to encode CDs in flac/mp3/ogg/speex format COMMENT= Front-end shell script to encode CDs in flac/mp3/ogg/speex format
@ -14,66 +13,40 @@ LICENSE= GPLv2
RUN_DEPENDS= cd-discid:${PORTSDIR}/audio/cd-discid \ RUN_DEPENDS= cd-discid:${PORTSDIR}/audio/cd-discid \
cdparanoia:${PORTSDIR}/audio/cdparanoia \ cdparanoia:${PORTSDIR}/audio/cdparanoia \
${PYTHON_PKGNAMEPREFIX}eyed3-06>0:${PORTSDIR}/audio/py-eyed3-06 \
lame:${PORTSDIR}/audio/lame \
oggenc:${PORTSDIR}/audio/vorbis-tools \ oggenc:${PORTSDIR}/audio/vorbis-tools \
lame:${PORTSDIR}/audio/lame \
${PYTHON_PKGNAMEPREFIX}eyed3>=0.7:${PORTSDIR}/audio/py-eyed3 \
bash:${PORTSDIR}/shells/bash bash:${PORTSDIR}/shells/bash
NO_BUILD= yes NO_BUILD= yes
OPTIONS_DEFINE= CDDA2WAV DAGRAB EJECT FLAC MPP NORMALIZE REPLAYGAIN SPEEX
EJECT_DESC?= Enable auto-eject support
NORMALIZE_DESC?= Enable normalize support
REPLAYGAIN_DESC?= Enable (vorbis|mp3)gain support
USES= python:run shebangfix USES= python:run shebangfix
SHEBANG_FILES= ${PORTNAME} cddb-tool SHEBANG_FILES= ${PORTNAME} cddb-tool
.include <bsd.port.options.mk> OPTIONS_GROUP= CODEC RIPPER
OPTIONS_GROUP_CODEC= AAC FLAC MPP OPUS SPEEX
OPTIONS_GROUP_RIPPER= CDDA2WAV DAGRAB
OPTIONS_DEFINE= NORMALIZE REPLAYGAIN
.if ${PORT_OPTIONS:MCDDA2WAV} NORMALIZE_DESC?= Enable normalize support
RUN_DEPENDS+= cdda2wav:${PORTSDIR}/sysutils/cdrtools REPLAYGAIN_DESC?= Enable (vorbis|mp3)gain support
.endif
.if ${PORT_OPTIONS:MDAGRAB} AAC_RUN_DEPENDS+= faac:${PORTSDIR}/audio/faac
RUN_DEPENDS+= dagrab:${PORTSDIR}/audio/dagrab FLAC_RUN_DEPENDS+= flac:${PORTSDIR}/audio/flac
.endif MPP_RUN_DEPENDS+= mpcenc:${PORTSDIR}/audio/musepack
OPUS_RUN_DEPENDS+= opusenc:${PORTSDIR}/audio/opus-tools
SPEEX_RUN_DEPENDS+= speexenc:${PORTSDIR}/audio/speex
CDDA2WAV_RUN_DEPENDS+= cdda2wav:${PORTSDIR}/sysutils/cdrtools
DAGRAB_RUN_DEPENDS+= dagrab:${PORTSDIR}/audio/dagrab
NORMALIZE_RUN_DEPENDS+= normalize:${PORTSDIR}/audio/normalize
REPLAYGAIN_RUN_DEPENDS+=mp3gain:${PORTSDIR}/audio/mp3gain \
vorbisgain:${PORTSDIR}/audio/vorbisgain
.if ${PORT_OPTIONS:MEJECT} PLIST_FILES= bin/abcde bin/cddb-tool etc/abcde.conf.sample \
RUN_DEPENDS+= eject:${PORTSDIR}/sysutils/eject man/man1/abcde.1.gz man/man1/cddb-tool.1.gz
.endif
.if ${PORT_OPTIONS:MFLAC}
RUN_DEPENDS+= flac:${PORTSDIR}/audio/flac
.endif
.if ${PORT_OPTIONS:MNORMALIZE}
RUN_DEPENDS+= normalize:${PORTSDIR}/audio/normalize
.endif
.if ${PORT_OPTIONS:MSPEEX}
RUN_DEPENDS+= speexenc:${PORTSDIR}/audio/speex
.endif
.if ${PORT_OPTIONS:MAAC}
RUN_DEPENDS+= faac:${PORTSDIR}/audio/faac
.endif
.if ${PORT_OPTIONS:MMPP}
RUN_DEPENDS+= mpcenc:${PORTSDIR}/audio/musepack
.endif
.if ${PORT_OPTIONS:MREPLAYGAIN}
RUN_DEPENDS+= mp3gain:${PORTSDIR}/audio/mp3gain \
vorbisgain:${PORTSDIR}/audio/vorbisgain
.endif
post-patch: post-patch:
${REINPLACE_CMD} -e 's#/etc/#${PREFIX}/etc/#g' \ ${REINPLACE_CMD} -e 's#/etc/#${PREFIX}/etc/#g' \
${WRKSRC}/abcde.1 ${WRKSRC}/abcde ${WRKSRC}/abcde.1
${REINPLACE_CMD} -e 's#/etc/#${PREFIX}/etc/#g' \
${WRKSRC}/abcde
do-install: do-install:
${INSTALL_SCRIPT} ${WRKSRC}/abcde ${STAGEDIR}${PREFIX}/bin ${INSTALL_SCRIPT} ${WRKSRC}/abcde ${STAGEDIR}${PREFIX}/bin

View file

@ -1,2 +1,2 @@
SHA256 (abcde-2.5.4.tar.gz) = 85b679b970e728a986487adcbff7c51eb0e72f9fa10c4450521f8e029fa6e591 SHA256 (abcde-2.6.tar.gz) = 683ea7e215142784a28afcda4a18d9a2b8f7ef7bcd9c2881ee110a3b86784c78
SIZE (abcde-2.5.4.tar.gz) = 104229 SIZE (abcde-2.6.tar.gz) = 105609

View file

@ -1,6 +1,6 @@
--- abcde.conf.orig 2012-04-19 22:57:19.000000000 +0200 --- abcde.conf.orig 2014-12-18 17:39:40.000000000 +0100
+++ abcde.conf 2013-02-22 21:53:52.000000000 +0100 +++ abcde.conf 2014-12-18 17:45:51.000000000 +0100
@@ -136,8 +136,8 @@ @@ -141,13 +141,13 @@
#CDDAFS=cp #CDDAFS=cp
#CDDISCID=cd-discid #CDDISCID=cd-discid
#CDDBTOOL=cddb-tool #CDDBTOOL=cddb-tool
@ -11,53 +11,41 @@
#DISTMP3=distmp3 #DISTMP3=distmp3
#VORBISCOMMENT=vorbiscomment #VORBISCOMMENT=vorbiscomment
#METAFLAC=metaflac #METAFLAC=metaflac
@@ -170,7 +170,8 @@ #NORMALIZE=normalize-audio
-#CDSPEED=eject
# Ogg: +CDSPEED=cdcontrol
#VORBIZEOPTS= #VORBISGAIN=vorbisgain
-#OGGENCOPTS= #MKCUE=mkcue
+#OFFENCOPTS= #MKTOC=cdrdao
+OGGENCOPTS="-q 5" @@ -215,10 +215,10 @@
#PIRDOPTS="-p"
# FLAC:
#FLACOPTS="-f"
@@ -193,7 +194,7 @@
#CDDA2WAVOPTS=
#CDDAFSOPTS="-f" #CDDAFSOPTS="-f"
#CDDBTOOLOPTS= #CDDBTOOLOPTS=
-#EJECTOPTS= -#EJECTOPTS=
+EJECTOPTS="eject" +EJECTOPTS="eject"
#DISTMP3OPTS= #DISTMP3OPTS=
#NORMALIZEOPTS= #NORMALIZEOPTS=
#CDSPEEDOPTS="-x" -#CDSPEEDOPTS="-x"
@@ -238,7 +239,7 @@ +CDSPEEDOPTS="speed"
#CDSPEEDVALUE=""
# OUTPUTTYPE can be either "ogg", "mp3", "flac" or "spx", or a combination #MKCUEOPTS=""
# of them separated with ",": "ogg,mp3". #MKTOCOPTS=""
-#OUTPUTTYPE=ogg @@ -245,7 +245,7 @@
+OUTPUTTYPE=ogg # CD device you want to read from
# It can be defined as a singletrack flac file, but since it might change from
# Output filename format - change this to reflect your inner desire to # file to file it makes little sense to define it here.
# organize things differently than everyone else :) -#CDROM=/dev/cdrom
@@ -251,9 +252,11 @@ +CDROM=/dev/cd0
# to the files. Remove it from your user defined string if you are getting # If we are using the IDE bus, we need CDPARANOIACDROMBUS defined as "d"
# files like ".ogg.ogg". # If we are using the ide-scsi emulation layer, we need to define a "g"
#OUTPUTFORMAT='${ARTISTFILE}-${ALBUMFILE}/${TRACKNUM}.${TRACKFILE}' #CDPARANOIACDROMBUS="d"
+OUTPUTFORMAT='${ARTISTFILE}-${ALBUMFILE}/${ARTISTFILE}-${TRACKNUM}-${TRACKFILE}' @@ -343,8 +343,7 @@
# 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
@@ -319,8 +322,7 @@
# Custom pre-read function # Custom pre-read function
# By default it does nothing. # By default it does nothing.
# You can set some things to get abcde function in better ways: # 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 -# * Close the CD tray using eject -t (if available in eject and supported by
-# your CD device. -# your CD device.
+# * Close the CD tray using cdcontrol close +# * 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 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. # 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 # KEEP IN MIND that executables included in pre_read must be in your $PATH or

View file

@ -7,4 +7,4 @@ MP3,... and will use one single rip to create as many output formats as you want
Many other useful features are supported. Many other useful features are supported.
WWW: http://code.google.com/p/abcde/ WWW: http://abcde.einval.com/

View file

@ -1,5 +0,0 @@
bin/abcde
bin/cddb-tool
etc/abcde.conf.sample
man/man1/abcde.1.gz
man/man1/cddb-tool.1.gz