2 files changed, 63 insertions, 20 deletions

diff --git a/audio/gnormalize/Makefile b/audio/gnormalize/Makefile
index a45567c346eb..745fa67c480a 100644
--- a/audio/gnormalize/Makefile
+++ b/audio/gnormalize/Makefile
@@ -6,28 +6,15 @@
 #
 
 PORTNAME=	gnormalize
-PORTVERSION=	0.60
+PORTVERSION=	0.61
 CATEGORIES=	audio
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	darcsis@gmail.com
 COMMENT=	An alternative for replaygain
 
 BUILD_DEPENDS=	lzma:${PORTSDIR}/archivers/lzmautils
-RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Gtk2.pm:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
-		${SITE_PERL}/${PERL_ARCH}/Audio/CD.pm:${PORTSDIR}/audio/p5-Audio-CD \
-		${SITE_PERL}/MP3/Info.pm:${PORTSDIR}/audio/p5-MP3-Info \
-		${SITE_PERL}/${PERL_ARCH}/auto/Encode/Encode.so:${PORTSDIR}/converters/p5-Encode \
-		normalize:${PORTSDIR}/audio/normalize \
-		cddb.pl:${PORTSDIR}/audio/p5-CDDB_get \
-		lame:${PORTSDIR}/audio/lame \
-		faac:${PORTSDIR}/audio/faac \
-		oggenc:${PORTSDIR}/audio/vorbis-tools \
-		mppenc:${PORTSDIR}/audio/musepack \
-		mac:${PORTSDIR}/audio/mac \
-		flac:${PORTSDIR}/audio/flac \
-		faad:${PORTSDIR}/audio/faad
+RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Gtk2.pm:${PORTSDIR}/x11-toolkits/p5-Gtk2
 
 USE_PERL5_RUN=	yes
 INSTALLS_ICONS=	yes
@@ -36,6 +23,62 @@ NO_BUILD=	yes
 
 MAN1=		gnormalize.1
 
+OPTIONS=	\
+	GNORMALIZE_MP3	"WAV <-> MP3 Support"	on	\
+	GNORMALIZE_OGG	"Ogg Encoding and Playback"	on	\
+	GNORMALIZE_MP4	"WAV <-> MP4 Support"	on	\
+	GNORMALIZE_CDRIP	"CD Ripping"	off	\
+	GNORMALIZE_CDDB	"CDDB Support"	off	\
+	GNORMALIZE_CDPLAY	"CD Playback"	off	\
+	GNORMALIZE_FLAC	"FLAC Encoding and Playback"	off	\
+	GNORMALIZE_MAC	"Monkey's Audio Encoding and Playback"	off	\
+	GNORMALIZE_MPC	"MPC (musepack) Audio"	off	\
+	GNORMALIZE_WAVEGAIN	"WaveGain support (BROKEN)"	off
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_GNORMALIZE_MP3)
+RUN_DEPENDS+=	lame:${PORTSDIR}/audio/lame \
+	${SITE_PERL}/MP3/Info.pm:${PORTSDIR}/audio/p5-MP3-Info
+.endif
+
+.if defined(WITH_GNORMALIZE_OGG)
+RUN_DEPENDS+=	oggenc:${PORTSDIR}/audio/vorbis-tools
+.endif
+
+.if defined(WITH_GNORMALIZE_MP4)
+RUN_DEPENDS+=	faac:${PORTSDIR}/audio/faac \
+	faad:${PORTSDIR}/audio/faad
+.endif
+
+.if defined(WITH_GNORMALIZE_CDRIP)
+.if defined(WITH_CDDA2WAV)
+RUN_DEPENDS+=	cdda2wav:${PORTSDIR}/sysutils/cdrtools
+.else
+RUN_DEPENDS+=	cdparanoia:${PORTSDIR}/audio/cdparanoia
+.endif
+.endif
+
+.if defined(WITH_GNORMALIZE_CDDB)
+RUN_DEPENDS+=	cddb.pl:${PORTSDIR}/audio/p5-CDDB_get
+.endif
+
+.if defined(WITH_GNORMALIZE_CDPLAY)
+RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Audio/CD.pm:${PORTSDIR}/audio/p5-Audio-CD
+.endif
+
+.if defined(WITH_GNORMALIZE_FLAC)
+RUN_DEPENDS+=	flac:${PORTSDIR}/audio/flac
+.endif
+
+.if defined(WITH_GNORMALIZE_MAC)
+RUN_DEPENDS+=	mac:${PORTSDIR}/audio/mac
+.endif
+
+.if defined(WITH_GNORMALIZE_MPC)
+RUN_DEPENDS+=	mppenc:${PORTSDIR}/audio/musepack
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's,^PREFIX=.*,PREFIX=${PREFIX},; \
 		s,^MANDIR=.*,MANDIR=${MANPREFIX}/man,; \
@@ -44,4 +87,4 @@ post-patch:
 	@${REINPLACE_CMD} -e 's,/usr/share/gnormalize,${DATADIR},' \
 		${WRKSRC}/gnormalize
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/audio/gnormalize/distinfo b/audio/gnormalize/distinfo
index fa96da630a15..8288a7ef8d97 100644
--- a/audio/gnormalize/distinfo
+++ b/audio/gnormalize/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnormalize-0.60.tar.gz) = 68c80407b1eb9ebf6af74f421ca274b5
-SHA256 (gnormalize-0.60.tar.gz) = 01aca390a9d10256cadbb7a3f53bfeba095a059fdd603c3b4e780a023874c41d
-SIZE (gnormalize-0.60.tar.gz) = 1428178
+MD5 (gnormalize-0.61.tar.gz) = a1371813b89a7edfe620ca23be3f8669
+SHA256 (gnormalize-0.61.tar.gz) = 034f716a71e7b4ce7dea8464b2602209ed573daeeb3f957d4d3caebbead94b59
+SIZE (gnormalize-0.61.tar.gz) = 1569443