3 files changed, 51 insertions, 86 deletions

diff --git a/multimedia/qt4-phonon/Makefile b/multimedia/qt4-phonon/Makefile
index 1687fbd1817e..56de6baaae64 100644
--- a/multimedia/qt4-phonon/Makefile
+++ b/multimedia/qt4-phonon/Makefile
@@ -8,10 +8,7 @@
 PORTNAME=	phonon
 PORTVERSION=	${QT4_VERSION}
 CATEGORIES?=	multimedia
-MASTER_SITES=	${MASTER_SITE_QT}
 PKGNAMEPREFIX=	qt4-
-DISTNAME=	qt-x11-opensource-src-${PORTVERSION}
-DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt4 multimedia framework
diff --git a/multimedia/qt4-phonon/distinfo b/multimedia/qt4-phonon/distinfo
deleted file mode 100644
index 27b0949354e8..000000000000
--- a/multimedia/qt4-phonon/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = d8bcc070a58db25c228b7729ffad4550
-SHA256 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 4e4c8619335cac14ba0c52d1555fab549a562fb774c1c08dcbd2be9de38120a2
-SIZE (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 125803421
diff --git a/multimedia/qt4-phonon/pkg-plist b/multimedia/qt4-phonon/pkg-plist
index 6f138fe7c417..98b55a71a329 100644
--- a/multimedia/qt4-phonon/pkg-plist
+++ b/multimedia/qt4-phonon/pkg-plist
@@ -1,80 +1,49 @@
-include/qt4/Qt/abstractaudiooutput.h
-include/qt4/Qt/abstractmediastream.h
-include/qt4/Qt/abstractvideooutput.h
-include/qt4/Qt/addoninterface.h
-include/qt4/Qt/audiooutput.h
-include/qt4/Qt/audiooutputinterface.h
-include/qt4/Qt/backendcapabilities.h
-include/qt4/Qt/backendinterface.h
-include/qt4/Qt/effect.h
-include/qt4/Qt/effectinterface.h
-include/qt4/Qt/effectparameter.h
-include/qt4/Qt/effectwidget.h
-include/qt4/Qt/mediacontroller.h
-include/qt4/Qt/medianode.h
-include/qt4/Qt/mediaobject.h
-include/qt4/Qt/mediaobjectinterface.h
-include/qt4/Qt/mediasource.h
-include/qt4/Qt/objectdescription.h
-include/qt4/Qt/objectdescriptionmodel.h
-include/qt4/Qt/path.h
-include/qt4/Qt/phonon
-include/qt4/Qt/phonon_export.h
-include/qt4/Qt/phonondefs.h
-include/qt4/Qt/phononnamespace.h
-include/qt4/Qt/platformplugin.h
-include/qt4/Qt/seekslider.h
-include/qt4/Qt/streaminterface.h
-include/qt4/Qt/videoplayer.h
-include/qt4/Qt/videowidget.h
-include/qt4/Qt/videowidgetinterface.h
-include/qt4/Qt/volumefadereffect.h
-include/qt4/Qt/volumefaderinterface.h
-include/qt4/Qt/volumeslider.h
-include/qt4/phonon/AbstractAudioOutput
-include/qt4/phonon/AbstractMediaStream
-include/qt4/phonon/AbstractVideoOutput
-include/qt4/phonon/AddonInterface
-include/qt4/phonon/AudioCaptureDevice
-include/qt4/phonon/AudioCaptureDeviceModel
-include/qt4/phonon/AudioChannelDescription
-include/qt4/phonon/AudioChannelDescriptionModel
-include/qt4/phonon/AudioOutput
-include/qt4/phonon/AudioOutputDevice
-include/qt4/phonon/AudioOutputDeviceModel
-include/qt4/phonon/AudioOutputInterface
-include/qt4/phonon/AudioOutputInterface40
-include/qt4/phonon/AudioOutputInterface42
-include/qt4/phonon/BackendCapabilities
-include/qt4/phonon/BackendInterface
-include/qt4/phonon/Effect
-include/qt4/phonon/EffectDescription
-include/qt4/phonon/EffectDescriptionModel
-include/qt4/phonon/EffectInterface
-include/qt4/phonon/EffectParameter
-include/qt4/phonon/EffectWidget
+include/qt4/Phonon
 include/qt4/phonon/Global
-include/qt4/phonon/MediaController
-include/qt4/phonon/MediaNode
-include/qt4/phonon/MediaObject
-include/qt4/phonon/MediaObjectInterface
-include/qt4/phonon/MediaSource
-include/qt4/phonon/ObjectDescription
-include/qt4/phonon/ObjectDescriptionData
-include/qt4/phonon/ObjectDescriptionModel
-include/qt4/phonon/ObjectDescriptionModelData
-include/qt4/phonon/Path
-include/qt4/phonon/PlatformPlugin
-include/qt4/phonon/SeekSlider
-include/qt4/phonon/StreamInterface
-include/qt4/phonon/SubtitleDescription
-include/qt4/phonon/SubtitleDescriptionModel
-include/qt4/phonon/VideoPlayer
-include/qt4/phonon/VideoWidget
-include/qt4/phonon/VideoWidgetInterface
-include/qt4/phonon/VolumeFaderEffect
-include/qt4/phonon/VolumeFaderInterface
-include/qt4/phonon/VolumeSlider
+include/qt4/phonon/Phonon/AbstractAudioOutput
+include/qt4/phonon/Phonon/AbstractMediaStream
+include/qt4/phonon/Phonon/AbstractVideoOutput
+include/qt4/phonon/Phonon/AddonInterface
+include/qt4/phonon/Phonon/AudioCaptureDevice
+include/qt4/phonon/Phonon/AudioCaptureDeviceModel
+include/qt4/phonon/Phonon/AudioChannelDescription
+include/qt4/phonon/Phonon/AudioChannelDescriptionModel
+include/qt4/phonon/Phonon/AudioOutput
+include/qt4/phonon/Phonon/AudioOutputDevice
+include/qt4/phonon/Phonon/AudioOutputDeviceModel
+include/qt4/phonon/Phonon/AudioOutputInterface
+include/qt4/phonon/Phonon/AudioOutputInterface40
+include/qt4/phonon/Phonon/AudioOutputInterface42
+include/qt4/phonon/Phonon/BackendCapabilities
+include/qt4/phonon/Phonon/BackendInterface
+include/qt4/phonon/Phonon/Effect
+include/qt4/phonon/Phonon/EffectDescription
+include/qt4/phonon/Phonon/EffectDescriptionModel
+include/qt4/phonon/Phonon/EffectInterface
+include/qt4/phonon/Phonon/EffectParameter
+include/qt4/phonon/Phonon/EffectWidget
+include/qt4/phonon/Phonon/Global
+include/qt4/phonon/Phonon/MediaController
+include/qt4/phonon/Phonon/MediaNode
+include/qt4/phonon/Phonon/MediaObject
+include/qt4/phonon/Phonon/MediaObjectInterface
+include/qt4/phonon/Phonon/MediaSource
+include/qt4/phonon/Phonon/ObjectDescription
+include/qt4/phonon/Phonon/ObjectDescriptionData
+include/qt4/phonon/Phonon/ObjectDescriptionModel
+include/qt4/phonon/Phonon/ObjectDescriptionModelData
+include/qt4/phonon/Phonon/Path
+include/qt4/phonon/Phonon/PlatformPlugin
+include/qt4/phonon/Phonon/SeekSlider
+include/qt4/phonon/Phonon/StreamInterface
+include/qt4/phonon/Phonon/SubtitleDescription
+include/qt4/phonon/Phonon/SubtitleDescriptionModel
+include/qt4/phonon/Phonon/VideoPlayer
+include/qt4/phonon/Phonon/VideoWidget
+include/qt4/phonon/Phonon/VideoWidgetInterface
+include/qt4/phonon/Phonon/VolumeFaderEffect
+include/qt4/phonon/Phonon/VolumeFaderInterface
+include/qt4/phonon/Phonon/VolumeSlider
 include/qt4/phonon/abstractaudiooutput.h
 include/qt4/phonon/abstractmediastream.h
 include/qt4/phonon/abstractvideooutput.h
@@ -108,7 +77,6 @@ include/qt4/phonon/videowidgetinterface.h
 include/qt4/phonon/volumefadereffect.h
 include/qt4/phonon/volumefaderinterface.h
 include/qt4/phonon/volumeslider.h
-include/qt4/Phonon
 lib/qt4/libphonon.la
 lib/qt4/libphonon.prl
 lib/qt4/libphonon.so
@@ -117,7 +85,10 @@ lib/qt4/libphonon.so.4.3
 lib/qt4/libphonon.so.4.3.1
 %%DEBUG%%lib/qt4/libphonon.so.4.3.1.debug
 libdata/pkgconfig/phonon.pc
+@dirrm lib/qt4/plugins/phonon_backend
+@dirrm lib/qt4/plugins
+@dirrm lib/qt4
+@dirrmtry include/qt4/phonon/Phonon
 @dirrm include/qt4/phonon
-@dirrmtry include/qt4/Qt
-@dirrmtry include/qt4
-@dirrmtry %%QT_PLUGINDIR_REL%%/phonon_backend
+@dirrmtry %%QT_PLUGINDIR_REL%%//phonon_backend
+@dirrm include/qt4