9 files changed, 27 insertions, 115 deletions
diff --git a/multimedia/dragon/Makefile b/multimedia/dragon/Makefile
index 9a2941e15af1..469719dbda6f 100644
--- a/multimedia/dragon/Makefile
+++ b/multimedia/dragon/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	dragon
 PORTVERSION=	${KDE4_VERSION}
 CATEGORIES=	multimedia kde
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
+MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
 # Avoid clash with devel/dragon
 PKGNAMESUFFIX=	-player
 DIST_SUBDIR=	KDE/${PORTVERSION}
@@ -15,17 +14,9 @@ COMMENT=	KDE multimedia player with a focus on simplicity
 
 LICENSE=	GPLv2
 
-CONFLICTS_INSTALL=	kdemultimedia-4.[1-8].*
-
 USES=		cmake:outsource
 USE_KDE4=	automoc4 kdehier kdelibs kdeprefix
 USE_QT4=	phonon moc_build qmake_build rcc_build uic_build
 USE_XZ=		yes
 
-MAN1=		dragon.1
-
-NO_STAGE=	yes
-post-install:
-	@${CAT} ${PKGMESSAGE}
-
 .include <bsd.port.mk>
diff --git a/multimedia/dragon/distinfo b/multimedia/dragon/distinfo
index 50ad0f951a15..871e6587f247 100644
--- a/multimedia/dragon/distinfo
+++ b/multimedia/dragon/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.10.5/dragon-4.10.5.tar.xz) = 498a4de53c975d1bbc896b288f078027ad9e0fbcfc9fe467494593d1c24e4872
-SIZE (KDE/4.10.5/dragon-4.10.5.tar.xz) = 395680
+SHA256 (KDE/4.12.2/dragon-4.12.2.tar.xz) = abf39b781db16d1de8daab3bccc91bedbcf52555ff165240e7b40ef1829fcfbf
+SIZE (KDE/4.12.2/dragon-4.12.2.tar.xz) = 390852
diff --git a/multimedia/dragon/pkg-plist b/multimedia/dragon/pkg-plist
index 23512b1a927a..633aefdf93fa 100644
--- a/multimedia/dragon/pkg-plist
+++ b/multimedia/dragon/pkg-plist
@@ -1,5 +1,6 @@
 bin/dragon
 lib/kde4/dragonpart.so
+man/man1/dragon.1.gz
 share/applications/kde4/dragonplayer.desktop
 share/apps/dragonplayer/dragonlogo.png
 share/apps/dragonplayer/dragonplayerui.rc
diff --git a/multimedia/kdemultimedia4-ffmpegthumbs/Makefile b/multimedia/kdemultimedia4-ffmpegthumbs/Makefile
index 7f897cbc777a..66f272035c49 100644
--- a/multimedia/kdemultimedia4-ffmpegthumbs/Makefile
+++ b/multimedia/kdemultimedia4-ffmpegthumbs/Makefile
@@ -3,10 +3,8 @@
 
 PORTNAME=	ffmpegthumbs
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	1
 CATEGORIES=	multimedia kde
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
+MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
 PKGNAMEPREFIX=	kdemultimedia-
 DIST_SUBDIR=	KDE/${PORTVERSION}
 
@@ -15,19 +13,11 @@ COMMENT=	FFmpeg-based thumbnail generator for video files
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	swscale${FFMPEG_SUFFIX}:${PORTSDIR}/multimedia/ffmpeg${FFMPEG_SUFFIX}
-
-CONFLICTS_INSTALL=	kdemultimedia-4.[1-8].*
+LIB_DEPENDS=	swscale:${PORTSDIR}/multimedia/ffmpeg
 
 USES=		cmake:outsource pkgconfig
 USE_KDE4=	automoc4 kdehier kdelibs kdeprefix
 USE_QT4=	moc_build qmake_build rcc_build uic_build
 USE_XZ=		yes
 
-# supported versions: ffmpeg1, ffmpeg-devel
-# corresponding FFMPEG_SUFFIX: '1', '-devel'
-FFMPEG_SUFFIX?=
-CMAKE_ARGS+=	-DFFMPEG_SUFFIX=${FFMPEG_SUFFIX}
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/multimedia/kdemultimedia4-ffmpegthumbs/distinfo b/multimedia/kdemultimedia4-ffmpegthumbs/distinfo
index 3a3456f64860..f3e322d0ed1b 100644
--- a/multimedia/kdemultimedia4-ffmpegthumbs/distinfo
+++ b/multimedia/kdemultimedia4-ffmpegthumbs/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.10.5/ffmpegthumbs-4.10.5.tar.xz) = 38391f4f732e5fb9f603470d12921280b883a0fa8c39aa432775bc00cc448c46
-SIZE (KDE/4.10.5/ffmpegthumbs-4.10.5.tar.xz) = 20896
+SHA256 (KDE/4.12.2/ffmpegthumbs-4.12.2.tar.xz) = 6daeae62b79d5b27f1795d1b4860ae61d38ad07738dc2b40a2a18f83ed1855c3
+SIZE (KDE/4.12.2/ffmpegthumbs-4.12.2.tar.xz) = 20208
diff --git a/multimedia/kdemultimedia4-ffmpegthumbs/files/patch-cmake__FindFFmpeg.cmake b/multimedia/kdemultimedia4-ffmpegthumbs/files/patch-cmake__FindFFmpeg.cmake
deleted file mode 100644
index 2ab29a6ffb80..000000000000
--- a/multimedia/kdemultimedia4-ffmpegthumbs/files/patch-cmake__FindFFmpeg.cmake
+++ /dev/null
@@ -1,45 +0,0 @@
---- ./cmake/FindFFmpeg.cmake.orig	2013-03-01 07:07:31.562142000 +0000
-+++ ./cmake/FindFFmpeg.cmake	2013-03-06 00:32:09.269367542 +0000
-@@ -71,13 +71,15 @@
-       ${PC_LIB${_component}_INCLUDEDIR}
-       ${PC_LIB${_component}_INCLUDE_DIRS}
-     PATH_SUFFIXES
--      ffmpeg
-+      ffmpeg${FFMPEG_SUFFIX}
-   )
- 
-   find_library(${_component}_LIBRARIES NAMES ${_library}
--      HINTS
-+    HINTS
-       ${PC_LIB${_component}_LIBDIR}
-       ${PC_LIB${_component}_LIBRARY_DIRS}
-+    PATH_SUFFIXES
-+      ffmpeg${FFMPEG_SUFFIX}
-   )
- 
-   set(${_component}_DEFINITIONS  ${PC_${_component}_CFLAGS_OTHER} CACHE STRING "The ${_component} CFLAGS.")
-@@ -97,13 +99,18 @@
- # Check for cached results. If there are skip the costly part.
- if (NOT FFMPEG_LIBRARIES)
- 
-+  # Look for ffmpeg1 by default. Use empty suffix for ffmpeg-0.7
-+  if (NOT DEFINED FFMPEG_SUFFIX)
-+    set(FFMPEG_SUFFIX 1)
-+  endif ()
-+
-   # Check for all possible component.
--  find_component(AVCODEC  libavcodec  avcodec  libavcodec/avcodec.h)
--  find_component(AVFORMAT libavformat avformat libavformat/avformat.h)
--  find_component(AVDEVICE libavdevice avdevice libavdevice/avdevice.h)
--  find_component(AVUTIL   libavutil   avutil   libavutil/avutil.h)
--  find_component(SWSCALE  libswscale  swscale  libswscale/swscale.h)
--  find_component(POSTPROC libpostproc postproc libpostproc/postprocess.h)
-+  find_component(AVCODEC  libavcodec${FFMPEG_SUFFIX}  avcodec${FFMPEG_SUFFIX}  libavcodec/avcodec.h)
-+  find_component(AVFORMAT libavformat${FFMPEG_SUFFIX} avformat${FFMPEG_SUFFIX} libavformat/avformat.h)
-+  find_component(AVDEVICE libavdevice${FFMPEG_SUFFIX} avdevice${FFMPEG_SUFFIX} libavdevice/avdevice.h)
-+  find_component(AVUTIL   libavutil${FFMPEG_SUFFIX}   avutil${FFMPEG_SUFFIX}   libavutil/avutil.h)
-+  find_component(SWSCALE  libswscale${FFMPEG_SUFFIX}  swscale${FFMPEG_SUFFIX}  libswscale/swscale.h)
-+  find_component(POSTPROC libpostproc${FFMPEG_SUFFIX} postproc${FFMPEG_SUFFIX} libpostproc/postprocess.h)
- 
-   # Check if the required components were found and add their stuff to the FFMPEG_* vars.
-   foreach (_component ${FFmpeg_FIND_COMPONENTS})
diff --git a/multimedia/kdemultimedia4-mplayerthumbs/Makefile b/multimedia/kdemultimedia4-mplayerthumbs/Makefile
index a3384b63d81b..a5e46928e7d8 100644
--- a/multimedia/kdemultimedia4-mplayerthumbs/Makefile
+++ b/multimedia/kdemultimedia4-mplayerthumbs/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	mplayerthumbs
 PORTVERSION=	${KDE4_VERSION}
 CATEGORIES=	multimedia kde
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
+MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
 PKGNAMEPREFIX=	kdemultimedia-
 DIST_SUBDIR=	KDE/${PORTVERSION}
 
@@ -16,12 +15,9 @@ LICENSE=	LGPL21
 
 RUN_DEPENDS=	mplayer:${PORTSDIR}/multimedia/mplayer
 
-CONFLICTS_INSTALL=	kdemultimedia-4.[1-8].*
-
 USES=		cmake:outsource
 USE_KDE4=	automoc4 kdehier kdelibs kdeprefix
 USE_QT4=	phonon moc_build qmake_build rcc_build uic_build
 USE_XZ=		yes
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/multimedia/kdemultimedia4-mplayerthumbs/distinfo b/multimedia/kdemultimedia4-mplayerthumbs/distinfo
index 30af1dfdc38d..092f0d9e28f1 100644
--- a/multimedia/kdemultimedia4-mplayerthumbs/distinfo
+++ b/multimedia/kdemultimedia4-mplayerthumbs/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.10.5/mplayerthumbs-4.10.5.tar.xz) = befaf7c957dc35157eab04eebe2790471ecf9a8143c5ea024be7644aa3dfad42
-SIZE (KDE/4.10.5/mplayerthumbs-4.10.5.tar.xz) = 28368
+SHA256 (KDE/4.12.2/mplayerthumbs-4.12.2.tar.xz) = 53e86998e56b522b334635c4d6f51c08908a40f9b07927f3405fb1ff2b1d668f
+SIZE (KDE/4.12.2/mplayerthumbs-4.12.2.tar.xz) = 27124
diff --git a/multimedia/kdemultimedia4/Makefile b/multimedia/kdemultimedia4/Makefile
index e01787bf9c3e..0c1545d9b9f7 100644
--- a/multimedia/kdemultimedia4/Makefile
+++ b/multimedia/kdemultimedia4/Makefile
@@ -4,59 +4,38 @@
 PORTNAME=	kdemultimedia
 PORTVERSION=	${KDE4_VERSION}
 CATEGORIES=	multimedia kde
-MASTER_SITES=	# empty
 DISTFILES=	# empty
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE Multimedia applications (meta port)
 
-LATEST_LINK=	${PORTNAME}4
-
 NO_BUILD=	yes
+NO_INSTALL=	yes
+NO_MTREE=	yes
 USE_KDE4=	kdeprefix
 
 OPTIONS_DEFINE=		DRAGON FFMPEG JUK KIO_AUDIOCD KMIX KSCD MPLAYER
 OPTIONS_DEFAULT=	DRAGON FFMPEG JUK KIO_AUDIOCD KMIX KSCD
-DRAGON_DESC=		Simple video player
-FFMPEG_DESC=		FFMPEG-based video thumbnailer
-JUK_DESC=		Audio player
-KIO_AUDIOCD_DESC=	Audio CD IOSlave
-KMIX_DESC=		Audio mixer
-KSCD_DESC=		CD Player
-MPLAYER_DESC=		MPlayer-based video thumbnailer
-
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MDRAGON}
-RUN_DEPENDS+=	${KDE4_PREFIX}/bin/dragon:${PORTSDIR}/multimedia/dragon
-.endif
-
-.if ${PORT_OPTIONS:MFFMPEG}
-RUN_DEPENDS+=	${KDE4_PREFIX}/lib/kde4/ffmpegthumbs.so:${PORTSDIR}/multimedia/kdemultimedia4-ffmpegthumbs
-.endif
+DRAGON_DESC=		Simple video player
+DRAGON_RUN_DEPENDS=	${KDE4_PREFIX}/bin/dragon:${PORTSDIR}/multimedia/dragon
 
-.if ${PORT_OPTIONS:MJUK}
-RUN_DEPENDS+=	${KDE4_PREFIX}/bin/juk:${PORTSDIR}/audio/juk
-.endif
+FFMPEG_DESC=		FFMPEG-based video thumbnailer
+FFMPEG_RUN_DEPENDS=	${KDE4_PREFIX}/lib/kde4/ffmpegthumbs.so:${PORTSDIR}/multimedia/kdemultimedia4-ffmpegthumbs
 
-.if ${PORT_OPTIONS:MKIO_AUDIOCD}
-RUN_DEPENDS+=	${KDE4_PREFIX}/lib/libaudiocdplugins.so.5:${PORTSDIR}/audio/kio-audiocd
-.endif
+JUK_DESC=		Audio player
+JUK_RUN_DEPENDS=	${KDE4_PREFIX}/bin/juk:${PORTSDIR}/audio/juk
 
-.if ${PORT_OPTIONS:MKMIX}
-RUN_DEPENDS+=	${KDE4_PREFIX}/bin/kmix:${PORTSDIR}/audio/kmix
-.endif
+KIO_AUDIOCD_DESC=	Audio CD IOSlave
+KIO_AUDIOCD_RUN_DEPENDS=	${KDE4_PREFIX}/lib/libaudiocdplugins.so:${PORTSDIR}/audio/kio-audiocd
 
-.if ${PORT_OPTIONS:MKSCD}
-RUN_DEPENDS+=	${KDE4_PREFIX}/bin/kscd:${PORTSDIR}/audio/kscd
-.endif
+KMIX_DESC=		Audio mixer
+KMIX_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kmix:${PORTSDIR}/audio/kmix
 
-.if ${PORT_OPTIONS:MMPLAYER}
-RUN_DEPENDS+=	${KDE4_PREFIX}/bin/mplayerthumbsconfig:${PORTSDIR}/multimedia/kdemultimedia4-mplayerthumbs
-.endif
+KSCD_DESC=		CD Player
+KSCD_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kscd:${PORTSDIR}/audio/kscd
 
-do-install:
-	${DO_NADA}
+MPLAYER_DESC=		MPlayer-based video thumbnailer
+MPLAYER_RUN_DEPENDS=	${KDE4_PREFIX}/bin/mplayerthumbsconfig:${PORTSDIR}/multimedia/kdemultimedia4-mplayerthumbs
 
 .include <bsd.port.mk>