3 files changed, 25 insertions, 26 deletions

diff --git a/audio/audex/Makefile b/audio/audex/Makefile
index f1d3d5ed1a29..ad5c90c72dc6 100644
--- a/audio/audex/Makefile
+++ b/audio/audex/Makefile
@@ -2,37 +2,42 @@
 
 PORTNAME=	audex
 DISTVERSION=	0.74b1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio kde
 MASTER_SITES=	http://kde.maniatek.com/${PORTNAME}/files/
 
 MAINTAINER=	jhale@FreeBSD.org
 COMMENT=	Audio CD ripping utility for KDE4
 
-LIB_DEPENDS=	cdda_paranoia.0:${PORTSDIR}/audio/cdparanoia \
-		kcddb.5:${PORTSDIR}/multimedia/kdemultimedia4
+LICENSE=	GPLv3
+
+LIB_DEPENDS=	cdda_paranoia:${PORTSDIR}/audio/cdparanoia
 
 USE_XZ=		yes
 USE_CMAKE=	yes
-USE_KDE4=	automoc4 kdeprefix kdelibs
+USE_KDE4=	automoc4 kdeprefix kdelibs libkcddb
 USE_QT4=	gui dbus network svg xml \
 		qmake_build moc_build rcc_build uic_build
 MAKE_JOBS_SAFE=	yes
 
-LICENSE=	GPLv3
+OPTIONS_DEFINE=		NLS EYED3 FAAC FLAC LAME VORBIS
+OPTIONS_DEFAULT=	FLAC VORBIS
+NO_OPTIONS_SORT=	yes
 
-OPTIONS_DEFINE= FAAC FLAC LAME EYED3 OGG
-OPTIONS_DEFAULT=	FLAC OGG
-EYED3_DESC=	 Unicode mp3 tags support
+EYED3_DESC=		Unicode MP3 tag support via audio/py-eyed3
 
 .include <bsd.port.options.mk>
 
-.if !${PORT_OPTIONS:MNLS}
-CMAKE_ARGS+=	-DDISABLE_ALL_OPTIONAL_SUBDIRECTORIES=TRUE
-PLIST_SUB+=	NLS="@comment "
-.else
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
+.else
+CMAKE_ARGS+=	-DDISABLE_ALL_OPTIONAL_SUBDIRECTORIES=TRUE
+PLIST_SUB+=	NLS="@comment "
+.endif
+
+.if ${PORT_OPTIONS:MEYED3}
+RUN_DEPENDS+=	eyeD3:${PORTSDIR}/audio/py-eyed3
 .endif
 
 .if ${PORT_OPTIONS:MFAAC}
@@ -47,11 +52,7 @@ RUN_DEPENDS+=	flac:${PORTSDIR}/audio/flac
 RUN_DEPENDS+=	lame:${PORTSDIR}/audio/lame
 .endif
 
-.if ${PORT_OPTIONS:MEYED3}
-RUN_DEPENDS+=	eyeD3:${PORTSDIR}/audio/py-eyed3
-.endif
-
-.if ${PORT_OPTIONS:MOGG}
+.if ${PORT_OPTIONS:MVORBIS}
 RUN_DEPENDS+=	oggenc:${PORTSDIR}/audio/vorbis-tools
 .endif
 
diff --git a/audio/kaudiocreator/Makefile b/audio/kaudiocreator/Makefile
index 9c75a19524d3..bd055fa37d18 100644
--- a/audio/kaudiocreator/Makefile
+++ b/audio/kaudiocreator/Makefile
@@ -3,17 +3,16 @@
 
 PORTNAME=	kaudiocreator
 PORTVERSION=	1.2.90
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	audio kde
 MASTER_SITES=	http://kde-look.org/CONTENT/content-files/
 DISTNAME=	107645-${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	dbn@FreeBSD.org
-COMMENT=	An audio-cd ripper and encoder for KDE4
+COMMENT=	Audio-cd ripper and encoder for KDE4
 
 LIB_DEPENDS=	discid:${PORTSDIR}/audio/libdiscid \
-		tag:${PORTSDIR}/audio/taglib \
-		kcddb:${PORTSDIR}/multimedia/kdemultimedia4
+		tag:${PORTSDIR}/audio/taglib
 RUN_DEPENDS=	flac:${PORTSDIR}/audio/flac \
 		oggenc:${PORTSDIR}/audio/vorbis-tools
 .if !defined(PACKAGE_BUILDING)
@@ -23,7 +22,7 @@ RUN_DEPENDS+=	lame:${PORTSDIR}/audio/lame
 USE_BZIP2=	yes
 USE_CMAKE=	yes
 USE_QT4=	moc_build qmake_build rcc_build uic_build
-USE_KDE4=	automoc4 kdehier kdeprefix
+USE_KDE4=	automoc4 kdehier kdeprefix libkcddb
 
 LICENSE=	GPLv2
 MAKE_JOBS_SAFE=	yes
diff --git a/audio/soundkonverter/Makefile b/audio/soundkonverter/Makefile
index 09d9df3f9202..83f173ee1ccd 100644
--- a/audio/soundkonverter/Makefile
+++ b/audio/soundkonverter/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	soundkonverter
 DISTVERSION=	0.9.94rc2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	audio kde
 MASTER_SITES=	https://api.opensuse.org/public/source/home:HessiJames/soundkonverter/
 
@@ -11,12 +11,11 @@ MAINTAINER=	dbn@FreeBSD.org
 COMMENT=	Frontend to various audio converters (transcoder)
 
 LIB_DEPENDS=	tag:${PORTSDIR}/audio/taglib \
-		cdda_paranoia:${PORTSDIR}/audio/cdparanoia \
-		kcddb:${PORTSDIR}/multimedia/kdemultimedia4
+		cdda_paranoia:${PORTSDIR}/audio/cdparanoia
 
 USE_CMAKE=	yes
 USE_QT4=	moc_build qmake_build rcc_build uic_build
-USE_KDE4=	automoc4 kdehier kdeprefix kdelibs
+USE_KDE4=	automoc4 kdehier kdeprefix kdelibs libkcddb
 INSTALLS_ICONS=	yes
 
 MAKE_JOBS_SAFE=	yes