Update to upstream version 2.7

- General port cleanup
- Apply FreeBSD-specific modifications to make it
  work out of the box more conveniently

PR:		201837
Submitted by:	tkato432@yahoo.com

5 files changed, 79 insertions, 101 deletions

diff --git a/audio/abcde/Makefile b/audio/abcde/Makefile
index b423358c6f40..9fe9736b5fef 100644
--- a/audio/abcde/Makefile
+++ b/audio/abcde/Makefile
@@ -2,67 +2,69 @@
 # $FreeBSD$
 
 PORTNAME=	abcde
-PORTVERSION=	2.6
+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=	GPLv2
+LICENSE=	ART10 GPLv2
+LICENSE_COMB=	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=	${PORTNAME} cddb-tool
+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
 
-NORMALIZE_DESC?=	Enable normalize support
-REPLAYGAIN_DESC?=	Enable (vorbis|mp3)gain support
-
-AAC_RUN_DEPENDS+=	faac:${PORTSDIR}/audio/faac
-FLAC_RUN_DEPENDS+=	flac:${PORTSDIR}/audio/flac
-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 \
+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 \
 			vorbisgain:${PORTSDIR}/audio/vorbisgain
+SPEEX_RUN_DEPENDS=	speexenc:${PORTSDIR}/audio/speex
 
-PLIST_FILES=	bin/abcde bin/cddb-tool etc/abcde.conf.sample \
-		man/man1/abcde.1.gz man/man1/cddb-tool.1.gz
+post-extract:
+	@${LN} -sf abcde.conf ${WRKSRC}/abcde.conf.sample
 
 post-patch:
-	${REINPLACE_CMD} -e 's#/etc/#${PREFIX}/etc/#g' \
-		${WRKSRC}/abcde ${WRKSRC}/abcde.1
+	@${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:
-	${INSTALL_SCRIPT} ${WRKSRC}/abcde ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/cddb-tool ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/abcde.conf \
-		${STAGEDIR}${PREFIX}/etc/abcde.conf.sample
-	${INSTALL_MAN} ${WRKSRC}/abcde.1 ${STAGEDIR}${PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/cddb-tool.1 ${STAGEDIR}${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} ""
+	(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)
 
 .include <bsd.port.mk>
diff --git a/audio/abcde/distinfo b/audio/abcde/distinfo
index 3eafc5d86eeb..ff8230184e02 100644
--- a/audio/abcde/distinfo
+++ b/audio/abcde/distinfo
@@ -1,2 +1,2 @@
-SHA256 (abcde-2.6.tar.gz) = 683ea7e215142784a28afcda4a18d9a2b8f7ef7bcd9c2881ee110a3b86784c78
-SIZE (abcde-2.6.tar.gz) = 105609
+SHA256 (abcde-2.7.tar.gz) = 0148698a09fedcbae37ee9da295afe411a1190cf8ae224b7814d31b5bf737746
+SIZE (abcde-2.7.tar.gz) = 140039
diff --git a/audio/abcde/files/patch-abcde b/audio/abcde/files/patch-abcde
deleted file mode 100644
index ffd9165d5963..000000000000
--- a/audio/abcde/files/patch-abcde
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./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"
diff --git a/audio/abcde/files/patch-abcde.conf b/audio/abcde/files/patch-abcde.conf
index 45ea12c7a7c5..1eaecb880f62 100644
--- a/audio/abcde/files/patch-abcde.conf
+++ b/audio/abcde/files/patch-abcde.conf
@@ -1,51 +1,33 @@
---- abcde.conf.orig	2014-12-18 17:39:40.000000000 +0100
-+++ abcde.conf	2014-12-18 17:45:51.000000000 +0100
-@@ -141,13 +141,13 @@
- #CDDAFS=cp
- #CDDISCID=cd-discid
- #CDDBTOOL=cddb-tool
--#EJECT=eject
--#MD5SUM=md5sum
-+EJECT=cdcontrol
-+MD5SUM=md5
- #DISTMP3=distmp3
- #VORBISCOMMENT=vorbiscomment
- #METAFLAC=metaflac
- #NORMALIZE=normalize-audio
--#CDSPEED=eject
-+CDSPEED=cdcontrol
- #VORBISGAIN=vorbisgain
- #MKCUE=mkcue
- #MKTOC=cdrdao
-@@ -215,10 +215,10 @@
- #PIRDOPTS="-p"
- #CDDAFSOPTS="-f"
- #CDDBTOOLOPTS=
--#EJECTOPTS=
-+EJECTOPTS="eject"
- #DISTMP3OPTS=
- #NORMALIZEOPTS=
--#CDSPEEDOPTS="-x"
-+CDSPEEDOPTS="speed"
- #CDSPEEDVALUE=""
- #MKCUEOPTS=""
- #MKTOCOPTS=""
-@@ -245,7 +245,7 @@
- # 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
+--- 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
diff --git a/audio/abcde/files/pkg-message.in b/audio/abcde/files/pkg-message.in
new file mode 100644
index 000000000000..61f33298dde6
--- /dev/null
+++ b/audio/abcde/files/pkg-message.in
@@ -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.
+******************************************************************