8 files changed, 22 insertions, 54 deletions

diff --git a/multimedia/phonon-designerplugin/Makefile b/multimedia/phonon-designerplugin/Makefile
index 0678157d8702..7fbb0a95a7b9 100644
--- a/multimedia/phonon-designerplugin/Makefile
+++ b/multimedia/phonon-designerplugin/Makefile
@@ -1,10 +1,9 @@
 # $FreeBSD$
 
 PORTNAME=	phonon
-PORTVERSION=	4.7.0
+PORTVERSION=	4.7.1
 CATEGORIES=	multimedia kde
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	${PHONON_BRANCH}/${PORTNAME}/${PORTVERSION}
+MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTVERSION}
 PKGNAMESUFFIX=	-designerplugin
 DIST_SUBDIR=	KDE
 
diff --git a/multimedia/phonon-gstreamer/Makefile b/multimedia/phonon-gstreamer/Makefile
index d8adb4d2b9b0..4ae77094bf1a 100644
--- a/multimedia/phonon-gstreamer/Makefile
+++ b/multimedia/phonon-gstreamer/Makefile
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	phonon
-PORTVERSION=	4.7.0
+PORTVERSION=	4.7.1
 CATEGORIES=	multimedia kde
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	${PHONON_BRANCH}/${PORTNAME}/${PORTNAME}-backend${PKGNAMESUFFIX}/${PORTVERSION}/src
+MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTNAME}-backend${PKGNAMESUFFIX}/${PORTVERSION}
 PKGNAMESUFFIX=	-gstreamer
 DISTNAME=	${PORTNAME}-backend${PKGNAMESUFFIX}-${PORTVERSION}
 DIST_SUBDIR=	KDE
@@ -13,13 +12,6 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	GStreamer backend for Phonon
 
-# Required in order to avoid conflicts with multimedia/phonon's OPTIONS.
-LATEST_LINK=	${PORTNAME}${PKGNAMESUFFIX}
-
-CONFLICTS=	qt4-phonon-gst-4*
-
-PHONON_BRANCH=	stable
-
 USE_GL=		gl
 USE_GNOME=	glib20 libxml2
 USE_GSTREAMER=	yes
@@ -30,21 +22,11 @@ USE_XORG=	x11
 USE_XZ=		yes
 USES=		cmake pkgconfig
 
-PLIST_SUB+=	QT_PREFIX=${QT_PREFIX}
+SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=	GST_PLUGINS
-
 GST_PLUGINS_DESC=	Install GStreamer plugins
-
-OPTIONS_DEFAULT=
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MGST_PLUGINS}
-RUN_DEPENDS+=	gstreamer-plugins-all>=0:${PORTSDIR}/multimedia/gstreamer-plugins-all
-.else
-SUB_FILES=	pkg-message
-.endif
+GST_PLUGINS_RUN_DEPENDS=	gstreamer-plugins-all>=0:${PORTSDIR}/multimedia/gstreamer-plugins-all
 
 post-install:
 	${MKDIR} ${STAGEDIR}${QT_PLUGINDIR}/phonon_backend
diff --git a/multimedia/phonon-gstreamer/distinfo b/multimedia/phonon-gstreamer/distinfo
index 562221ebdfe4..f495037e05f7 100644
--- a/multimedia/phonon-gstreamer/distinfo
+++ b/multimedia/phonon-gstreamer/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/phonon-backend-gstreamer-4.7.0.tar.xz) = 3a776b3166330260b356fb9e136302df3d46c6107deaf737bb3c4dee9585e77d
-SIZE (KDE/phonon-backend-gstreamer-4.7.0.tar.xz) = 75416
+SHA256 (KDE/phonon-backend-gstreamer-4.7.1.tar.xz) = 7859782fb3d304e1d0363e665feecb7d3b64a712705dc326151c6402fef6f2ca
+SIZE (KDE/phonon-backend-gstreamer-4.7.1.tar.xz) = 75528
diff --git a/multimedia/phonon-vlc/Makefile b/multimedia/phonon-vlc/Makefile
index fb705524c966..5c3390bac04c 100644
--- a/multimedia/phonon-vlc/Makefile
+++ b/multimedia/phonon-vlc/Makefile
@@ -1,10 +1,9 @@
 # $FreeBSD$
 
 PORTNAME=	phonon
-PORTVERSION=	0.7.0
-CATEGORIES=	multimedia kde ipv6
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	${PHONON_BRANCH}/${PORTNAME}/${PORTNAME}-backend${PKGNAMESUFFIX}/${PORTVERSION}/src
+PORTVERSION=	0.7.1
+CATEGORIES=	multimedia kde
+MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTNAME}-backend${PKGNAMESUFFIX}/${PORTVERSION}
 PKGNAMESUFFIX=	-vlc
 DISTNAME=	${PORTNAME}-backend${PKGNAMESUFFIX}-${PORTVERSION}
 DIST_SUBDIR=	KDE
@@ -12,10 +11,7 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	VLC backend for Phonon
 
-LIB_DEPENDS=	vlc:${PORTSDIR}/multimedia/vlc
-
-# Required in order to avoid conflicts with multimedia/phonon.
-LATEST_LINK=	${PORTNAME}${PKGNAMESUFFIX}
+LIB_DEPENDS=	libvlc.so:${PORTSDIR}/multimedia/vlc
 
 USE_KDE4=	kdehier kdeprefix automoc4
 USE_QT4=	corelib gui phonon \
@@ -23,10 +19,6 @@ USE_QT4=	corelib gui phonon \
 USE_XZ=		yes
 USES=		cmake pkgconfig
 
-PHONON_BRANCH=	stable
-
-PLIST_SUB+=	QT_PREFIX=${QT_PREFIX}
-
 post-install:
 	${MKDIR} ${STAGEDIR}${QT_PLUGINDIR}/phonon_backend
 	${LN} -sf ${PREFIX}/lib/kde4/plugins/phonon_backend/phonon_vlc.so \
diff --git a/multimedia/phonon-vlc/distinfo b/multimedia/phonon-vlc/distinfo
index 2f69af594b8e..2f400a681344 100644
--- a/multimedia/phonon-vlc/distinfo
+++ b/multimedia/phonon-vlc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/phonon-backend-vlc-0.7.0.tar.xz) = edb5ada44ab91882e7dc337ec82cf0fe8623999e9177f7faf3862214da601fe6
-SIZE (KDE/phonon-backend-vlc-0.7.0.tar.xz) = 58648
+SHA256 (KDE/phonon-backend-vlc-0.7.1.tar.xz) = 230bb7f3377fd6e82b19d9438026308d7584ae34945cb5aa9fdb23f39980158e
+SIZE (KDE/phonon-backend-vlc-0.7.1.tar.xz) = 58876
diff --git a/multimedia/phonon/Makefile b/multimedia/phonon/Makefile
index 6d1c7179411d..44a4e799f02e 100644
--- a/multimedia/phonon/Makefile
+++ b/multimedia/phonon/Makefile
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	phonon
-PORTVERSION=	4.7.0
-CATEGORIES=	multimedia kde ipv6
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	${PHONON_BRANCH}/${PORTNAME}/${PORTVERSION}
+PORTVERSION=	4.7.1
+CATEGORIES=	multimedia kde
+MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTVERSION}
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
@@ -15,10 +14,6 @@ LICENSE=	LGPL21
 
 LIB_DEPENDS=	libqzeitgeist.so:${PORTSDIR}/sysutils/qzeitgeist
 
-CONFLICTS=	qt4-phonon-4*
-
-PHONON_BRANCH=	stable
-
 USE_KDE4=	kdehier kdeprefix automoc4
 USE_QT4=	corelib dbus gui \
 		qmake_build moc_build rcc_build uic_build
@@ -29,7 +24,7 @@ CMAKE_ARGS=	-DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT:BOOL=TRUE \
 		-DPHONON_BUILD_DESIGNER_PLUGIN:BOOL=OFF
 USE_LDCONFIG=	yes
 
-PLIST_SUB=	QT_PREFIX=${QT_PREFIX}
+PLIST_SUB=	SHLIB_VER=${PORTVERSION}
 
 OPTIONS_DEFINE=	PULSEAUDIO
 
diff --git a/multimedia/phonon/distinfo b/multimedia/phonon/distinfo
index 3b2c271dc546..2841c39ed8ea 100644
--- a/multimedia/phonon/distinfo
+++ b/multimedia/phonon/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/phonon-4.7.0.tar.xz) = 4ca5e17b6afbbfbfe92611f51f9e8d78552ecc31c2e15cbb18be37132ab7b9eb
-SIZE (KDE/phonon-4.7.0.tar.xz) = 329792
+SHA256 (KDE/phonon-4.7.1.tar.xz) = 4ff7802deeac1557166591deb9fc2bfdfcaacdeb5389d07f08255365fb91b75d
+SIZE (KDE/phonon-4.7.1.tar.xz) = 329900
diff --git a/multimedia/phonon/pkg-plist b/multimedia/phonon/pkg-plist
index 1c2cba0d8be7..4f23b7d3eab7 100644
--- a/multimedia/phonon/pkg-plist
+++ b/multimedia/phonon/pkg-plist
@@ -163,10 +163,10 @@ lib/cmake/phonon/PhononTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/phonon/PhononTargets.cmake
 lib/libphonon.so
 lib/libphonon.so.4
-lib/libphonon.so.4.7.0
+lib/libphonon.so.%%SHLIB_VER%%
 lib/libphononexperimental.so
 lib/libphononexperimental.so.4
-lib/libphononexperimental.so.4.7.0
+lib/libphononexperimental.so.%%SHLIB_VER%%
 libdata/pkgconfig/phonon.pc
 share/dbus-1/interfaces/org.kde.Phonon.AudioOutput.xml
 %%DATADIR%%/buildsystem/COPYING-CMAKE-SCRIPTS