8 files changed, 27 insertions, 67 deletions

diff --git a/multimedia/phonon/Makefile b/multimedia/phonon/Makefile
index 3c3280bde3f8..a6ff37cca42c 100644
--- a/multimedia/phonon/Makefile
+++ b/multimedia/phonon/Makefile
@@ -5,17 +5,14 @@
 # $FreeBSD$
 
 PORTNAME=	phonon
-PORTVERSION=	4.3.0
-PORTREVISION=	1
+PORTVERSION=	4.3.1
 CATEGORIES=	multimedia kde ipv6
 MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/${PORTNAME}/${PORTVERSION}/
+MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	KDE4 phonon applications
-
-LIB_DEPENDS=	xine.1:${PORTSDIR}/multimedia/libxine
+COMMENT=	Multimedia framework for KDE4
 
 CONFLICTS=	qt4-phonon-4* kdebase-runtime-4.1.[0-4]*
 
@@ -23,9 +20,8 @@ USE_BZIP2=	yes
 USE_KDE4=	kdehier automoc4 kdeprefix
 KDE4_BUILDENV=	yes
 USE_QT_VER=	4
-QT_COMPONENTS=	corelib opengl dbus qt3support designer network svg qtestlib \
+QT_COMPONENTS=	gui dbus xml qtestlib \
 		qmake_build moc_build rcc_build uic_build
-USE_GSTREAMER=	yes
 
 .include <bsd.port.pre.mk>
 
@@ -46,4 +42,7 @@ pre-configure:
 			-e 's|{QT_INCLUDES}|{QT_INCLUDES} ${LOCALBASE}/include|'\
 		${WRKSRC}/../CMakeLists.txt
 
+post-install:
+	@${CAT} ${PKGMESSAGE}
+
 .include <bsd.port.post.mk>
diff --git a/multimedia/phonon/distinfo b/multimedia/phonon/distinfo
index 3e854c308d09..7c88843e413a 100644
--- a/multimedia/phonon/distinfo
+++ b/multimedia/phonon/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/phonon-4.3.0.tar.bz2) = f851219ec1fb4eadc7904f053b6b498d
-SHA256 (KDE/phonon-4.3.0.tar.bz2) = cb4c55e353ca9e547c94670990d58b6873937b3498045563b5c50988fb2ded22
-SIZE (KDE/phonon-4.3.0.tar.bz2) = 565443
+MD5 (KDE/phonon-4.3.1.tar.bz2) = 767cb68052c108e95f293f30acdef3fb
+SHA256 (KDE/phonon-4.3.1.tar.bz2) = 7fb6d9efad29d7ac390d539cd516177c26cc2f92ddb9b3a5d70f2c49fc15269a
+SIZE (KDE/phonon-4.3.1.tar.bz2) = 575856
diff --git a/multimedia/phonon/files/patch-CMakeLists.txt b/multimedia/phonon/files/patch-CMakeLists.txt
index 41f604aaad52..098a9b7d48e2 100644
--- a/multimedia/phonon/files/patch-CMakeLists.txt
+++ b/multimedia/phonon/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- ../CMakeLists.txt.orgi	2008-07-25 14:58:35.000000000 +0200
-+++ ../CMakeLists.txt	2008-07-25 14:59:12.000000000 +0200
-@@ -120,12 +120,12 @@
+--- ../CMakeLists.txt.orig	2009-01-22 11:20:44.000000000 +0300
++++ ../CMakeLists.txt	2009-02-21 01:36:17.000000000 +0300
+@@ -127,12 +127,12 @@
  
        try_run(_run_result _compile_result ${CMAKE_BINARY_DIR} ${_source_file} CMAKE_FLAGS "${_include_dirs}")
  
@@ -19,3 +19,14 @@
  
        if (GCC_IS_NEWER_THAN_4_2)
            set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden")
+@@ -260,8 +260,8 @@
+ endif (Q_WS_WIN)
+ 
+ if (Q_WS_X11)
+-   add_subdirectory(gstreamer)
+-   add_subdirectory(xine)
++#    add_subdirectory(gstreamer)
++#    add_subdirectory(xine)
+ endif (Q_WS_X11)
+ 
+ if(NOT WIN32) # pkgconfig file
diff --git a/multimedia/phonon/files/patch-cmake_FindGObject.cmake b/multimedia/phonon/files/patch-cmake_FindGObject.cmake
deleted file mode 100644
index d201555741bb..000000000000
--- a/multimedia/phonon/files/patch-cmake_FindGObject.cmake
+++ /dev/null
@@ -1,29 +0,0 @@
---- ../cmake/FindGObject.cmake.orig	2008-11-24 20:11:55.000000000 +0300
-+++ ../cmake/FindGObject.cmake	2008-12-11 14:36:14.000000000 +0300
-@@ -23,14 +23,16 @@
-    # in the FIND_PATH() and FIND_LIBRARY() calls
-    PKG_CHECK_MODULES(PKG_GOBJECT2 REQUIRED gobject-2.0)
-    SET(GOBJECT_DEFINITIONS ${PKG_GOBJECT2_CFLAGS})
-+   PKG_CHECK_MODULES(PKG_GLIB REQUIRED glib-2.0)
- ENDIF (NOT WIN32)
- 
- FIND_PATH(GOBJECT_INCLUDE_DIR gobject.h
-    PATHS
-+   ${PKG_GLIB_INCLUDE_DIRS}
-    ${PKG_GOBJECT2_INCLUDE_DIRS}
-    ${PKG_GOBJECT2_INCLUDE_DIRS}/glib-2.0/gobject/
-    /usr/include/glib-2.0/gobject/
--   #PATH_SUFFIXES gst
-+   PATH_SUFFIXES gobject
-    )
- 
- FIND_LIBRARY(_GObjectLibs NAMES gobject-2.0
-@@ -50,7 +52,7 @@
-    ${PKG_GOBJECT2_LIBRARY_DIRS}
-    )
- 
--SET( GOBJECT_LIBRARIES ${PKG_GOBJECT2_LIBRARIES} )
-+SET( GOBJECT_LIBRARIES ${_GObjectLibs} )
- 
- IF (GOBJECT_INCLUDE_DIR AND GOBJECT_LIBRARIES)
-    SET(GOBJECT_FOUND TRUE)
diff --git a/multimedia/phonon/files/pkg-message.in b/multimedia/phonon/files/pkg-message.in
deleted file mode 100644
index 34b19b396c20..000000000000
--- a/multimedia/phonon/files/pkg-message.in
+++ /dev/null
@@ -1,10 +0,0 @@
-Should you not hear any sound at first KDE4 startup, do the following:
-
-create $HOME/.kde4/share/config/phonon_platform_kde
-
-and add the following lines to phonon_platform_kde:
-
-[Settings]
-showOssDevices=true
-
-And then start kde4 new.
\ No newline at end of file
diff --git a/multimedia/phonon/pkg-descr b/multimedia/phonon/pkg-descr
index 8c87bc653013..558e852027aa 100644
--- a/multimedia/phonon/pkg-descr
+++ b/multimedia/phonon/pkg-descr
@@ -1 +1 @@
-phonon tools for KDE4.
+Phonon is multimedia framework for KDE4.
diff --git a/multimedia/phonon/pkg-message b/multimedia/phonon/pkg-message
new file mode 100644
index 000000000000..ebb37d8c4058
--- /dev/null
+++ b/multimedia/phonon/pkg-message
@@ -0,0 +1,2 @@
+Please consider to install xine backend for phonon (multimedia/phonon-xine)
+or/and Gstreamer backend (multimedia/phonon-gstreamer).
diff --git a/multimedia/phonon/pkg-plist b/multimedia/phonon/pkg-plist
index 985ffb9d45d2..489b28c032d2 100644
--- a/multimedia/phonon/pkg-plist
+++ b/multimedia/phonon/pkg-plist
@@ -96,8 +96,6 @@ include/phonon/videowidgetinterface.h
 include/phonon/volumefadereffect.h
 include/phonon/volumefaderinterface.h
 include/phonon/volumeslider.h
-lib/kde4/plugins/phonon_backend/phonon_gstreamer.so
-lib/kde4/plugins/phonon_backend/phonon_xine.so
 lib/libphonon.so
 lib/libphonon.so.4
 lib/libphonon.so.4.3.0
@@ -106,17 +104,6 @@ lib/libphononexperimental.so.4
 lib/libphononexperimental.so.4.3.0
 libdata/pkgconfig/phonon.pc
 share/dbus-1/interfaces/org.kde.Phonon.AudioOutput.xml
-share/icons/oxygen/128x128/apps/phonon-xine.png
-share/icons/oxygen/16x16/apps/phonon-xine.png
-share/icons/oxygen/22x22/apps/phonon-xine.png
-share/icons/oxygen/32x32/apps/phonon-xine.png
-share/icons/oxygen/48x48/apps/phonon-xine.png
-share/icons/oxygen/64x64/apps/phonon-xine.png
-share/icons/oxygen/scalable/apps/phonon-xine.svgz
-share/kde4/services/phononbackends/gstreamer.desktop
-share/kde4/services/phononbackends/xine.desktop
-@dirrm share/kde4/services/phononbackends
-@dirrm lib/kde4/plugins/phonon_backend
 @dirrm include/phonon/experimental
 @dirrm include/phonon
 @dirrm include/KDE/Phonon/Experimental