4 files changed, 32 insertions, 254 deletions

diff --git a/multimedia/kmplayer-kde4/Makefile b/multimedia/kmplayer-kde4/Makefile
index be09cce0a761..69e311da80c1 100644
--- a/multimedia/kmplayer-kde4/Makefile
+++ b/multimedia/kmplayer-kde4/Makefile
@@ -1,115 +1,25 @@
-# New ports collection makefile for:	KMplayer
-# Date created:				Jan 31, 2003
-# Whom:					will
+# New ports collection makefile for:	KMplayer-kde4
+# Date created:				Aug 26, 2008
+# Whom:					Kris Moore
 #
 # $FreeBSD$
 #
 
 PORTNAME=	kmplayer
-PORTVERSION=	0.10.0c
-PORTREVISION=	1
+DISTVERSION=	0.11.0-rc4
 PORTEPOCH=	2
 CATEGORIES=	multimedia audio kde
-MASTER_SITES=	http://freebsd.ricin.com/ports/distfiles/ \
-		http://kmplayer.kde.org/pkgs/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
+MASTER_SITES=	http://kmplayer.kde.org/pkgs/
+PKGNAMESUFFIX=	-kde4
 
-MAINTAINER=	danny@ricin.com
-COMMENT=	KDE frontend to MPlayer, Xine, GStreamer
+MAINTAINER=	kris@pcbsd.org
+COMMENT=	KDE frontend to Phonon / KDE4
 
-# It seems neither cairo nor npplayer can be disabled if the deps are present
-# So deps must be added here for package consistency/POLA
-PLIST_FILES+=	bin/knpplayer
-LIB_DEPENDS=	cairo:${PORTSDIR}/graphics/cairo \
-		dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
-		dbus-qt-1:${PORTSDIR}/devel/dbus-qt3 \
-		expat:${PORTSDIR}/textproc/expat2
 RUN_DEPENDS=	mplayer:${PORTSDIR}/multimedia/mplayer
 
 USE_BZIP2=	yes
-USE_KDEBASE_VER=3
-USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
-USE_LDCONFIG=	yes
-USE_GNOME=	atk glib20 gtk20 libxml2 pango # See above
-WANT_GSTREAMER=	yes # Can't be set after bsd.port.pre.mk
-USE_XORG=	xv
+USE_CMAKE=	yes
+USE_KDE4=	automoc4 kdehier kdeprefix kdelibs
+USE_LDCONFIG=	${KDE4_PREFIX}/lib ${KDE4_PREFIX}/lib/kde4
 
-OPTIONS=	ARTS	  "ARts audio system support" on \
-		GSTREAMER "GStreamer playback support" off \
-		TUBESTUFF "YouTube and other 'download & play' support" off \
-		XINE	  "Xine playback support" off
-
-CONFIGURE_ENV+=	PKG_CONFIG=${LOCALBASE}/bin/pkg-config
-
-post-patch:
-# do not try to roll our own mimetypes
-	${REINPLACE_CMD} -E -e 's|^(SUBDIRS.*)mimetypes|\1|'\
-		${WRKSRC}/Makefile.in
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITHOUT_ARTS)
-CONFIGURE_ARGS+=--without-arts
-.endif # WITHOUT_ARTS
-
-.if defined(WITH_GSTREAMER)
-USE_GSTREAMER+=	yes
-PLIST_FILES+=	bin/kgstplayer
-.else
-CONFIGURE_ARGS+=--without-gstreamer
-.endif # WITH_GSTREAMER
-
-.if defined(WITH_XINE)
-LIB_DEPENDS+=	xine:${PORTSDIR}/multimedia/libxine
-PLIST_FILES+=	bin/kxineplayer
-.else
-CONFIGURE_ARGS+=--without-xine
-.endif # WITH_XINE
-
-.if defined(WITH_TUBESTUFF)
-TUBESTUFF_VER=	20080314
-DISTFILES+=	tubestuff-${TUBESTUFF_VER}.tbz
-BUILD_DEPENDS+=	mencoder:${PORTSDIR}/multimedia/mencoder
-USE_PYTHON=	yes
-
-pre-patch:
-	${REINPLACE_CMD} -e 's|PREFIX=/usr/local|PREFIX=${PREFIX}|'\
-		${WRKDIR}/tubestuff/tubestuff-patch-kmplayerpartbase.cpp.in &&\
-		cd ${WRKDIR}/tubestuff && ./make_patch
-
-do-patch:
-	cd ${WRKSRC} && ${PATCH} <\
-		${WRKDIR}/tubestuff/patch-kmplayerpartbase.cpp-tubestuff
-
-pre-install:
-	cd ${WRKDIR}/tubestuff && ./make_video && ./make_readme
-	${REINPLACE_CMD} -e 's|PREFIX=/usr/local|PREFIX=${PREFIX}|'\
-		${WRKDIR}/tubestuff/make_install
-
-post-install:
-	cd ${WRKDIR}/tubestuff && ./make_install
-
-.if defined(NOPORTDOCS)
-	${RM} ${PREFIX}/share/apps/kmplayer/tubestuff/README
-.else
-PLIST_FILES+=	share/apps/kmplayer/tubestuff/README
-.endif # NOPORTDOCS
-
-PLIST_FILES+=	share/apps/kmplayer/tubestuff/altertube-dl \
-		share/apps/kmplayer/tubestuff/blip-dl \
-		share/apps/kmplayer/tubestuff/dailymotion-dl \
-		share/apps/kmplayer/tubestuff/downloading.avi \
-		share/apps/kmplayer/tubestuff/google-dl \
-		share/apps/kmplayer/tubestuff/liveleak-dl \
-		share/apps/kmplayer/tubestuff/metacafe-dl \
-		share/apps/kmplayer/tubestuff/ourmedia-dl \
-		share/apps/kmplayer/tubestuff/playtube \
-		share/apps/kmplayer/tubestuff/pornotube-dl \
-		share/apps/kmplayer/tubestuff/revver-dl \
-		share/apps/kmplayer/tubestuff/youtube-dl \
-		"@dirrm share/apps/kmplayer/tubestuff"
-.endif # WITH_TUBESTUFF
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/multimedia/kmplayer-kde4/distinfo b/multimedia/kmplayer-kde4/distinfo
index d21a76d337bb..2712647298ff 100644
--- a/multimedia/kmplayer-kde4/distinfo
+++ b/multimedia/kmplayer-kde4/distinfo
@@ -1,6 +1,3 @@
-MD5 (tubestuff-20080314.tbz) = c2b4e8c489f316258ece95058b850ea2
-SHA256 (tubestuff-20080314.tbz) = 1dbae17393d905deda7bfabea0e5617f14686f74e629af27521417188d0e00b8
-SIZE (tubestuff-20080314.tbz) = 19634
-MD5 (kmplayer-0.10.0c.tar.bz2) = 3e76147784b2642891c9efbfe260e4c4
-SHA256 (kmplayer-0.10.0c.tar.bz2) = f9a699fa7bf53c7130ce6aff56e4bc53f957c5d86d3d1d23d791cca8f1cf3820
-SIZE (kmplayer-0.10.0c.tar.bz2) = 1047729
+MD5 (kmplayer-0.11.0-rc4.tar.bz2) = ec9267dd78db1b6148c103c6a38116a3
+SHA256 (kmplayer-0.11.0-rc4.tar.bz2) = b7c8b932c4b3806f26f62347936a256665c3f03eb3c4d3ae00ba6c29d20aea17
+SIZE (kmplayer-0.11.0-rc4.tar.bz2) = 405699
diff --git a/multimedia/kmplayer-kde4/pkg-descr b/multimedia/kmplayer-kde4/pkg-descr
index 23960becea9f..2e3050fc497d 100644
--- a/multimedia/kmplayer-kde4/pkg-descr
+++ b/multimedia/kmplayer-kde4/pkg-descr
@@ -2,4 +2,4 @@ KDE frontend to MPlayer, Xine, GStreamer
 
 WWW: http://kmplayer.kde.org/
 
--- will@freebsd.org
+-- kris@pcbsd.org
diff --git a/multimedia/kmplayer-kde4/pkg-plist b/multimedia/kmplayer-kde4/pkg-plist
index b738c10ccf22..4518626920ec 100644
--- a/multimedia/kmplayer-kde4/pkg-plist
+++ b/multimedia/kmplayer-kde4/pkg-plist
@@ -1,57 +1,14 @@
 bin/kmplayer
-bin/kxvplayer
-lib/kde3/kmplayer.a
-lib/kde3/kmplayer.la
-lib/kde3/kmplayer.so
-lib/kde3/libkmplayerpart.a
-lib/kde3/libkmplayerpart.la
-lib/kde3/libkmplayerpart.so
-lib/libkdeinit_kmplayer.a
-lib/libkdeinit_kmplayer.la
-lib/libkdeinit_kmplayer.so
-lib/libkmplayercommon.a
-lib/libkmplayercommon.la
+bin/kphononplayer
+lib/kde4/libkmplayerpart.so
+lib/libkdeinit4_kmplayer.so
 lib/libkmplayercommon.so
-share/applications/kde/kmplayer.desktop
+share/applications/kde4/kmplayer.desktop
 share/apps/kmplayer/bookmarks.xml
 share/apps/kmplayer/kmplayerpartui.rc
 share/apps/kmplayer/kmplayerui.rc
 share/apps/kmplayer/noise.gif
 share/apps/kmplayer/pluginsinfo
-share/config/kmplayerrc
-share/doc/HTML/da/kmplayer/common
-share/doc/HTML/da/kmplayer/index.cache.bz2
-share/doc/HTML/da/kmplayer/index.docbook
-share/doc/HTML/de/kmplayer/common
-share/doc/HTML/de/kmplayer/index.cache.bz2
-share/doc/HTML/de/kmplayer/index.docbook
-share/doc/HTML/en/kmplayer/common
-share/doc/HTML/en/kmplayer/index.cache.bz2
-share/doc/HTML/en/kmplayer/index.docbook
-share/doc/HTML/es/kmplayer/common
-share/doc/HTML/es/kmplayer/index.cache.bz2
-share/doc/HTML/es/kmplayer/index.docbook
-share/doc/HTML/et/kmplayer/common
-share/doc/HTML/et/kmplayer/index.cache.bz2
-share/doc/HTML/et/kmplayer/index.docbook
-share/doc/HTML/fr/kmplayer/common
-share/doc/HTML/fr/kmplayer/index.cache.bz2
-share/doc/HTML/fr/kmplayer/index.docbook
-share/doc/HTML/it/kmplayer/common
-share/doc/HTML/it/kmplayer/index.cache.bz2
-share/doc/HTML/it/kmplayer/index.docbook
-share/doc/HTML/nl/kmplayer/common
-share/doc/HTML/nl/kmplayer/index.cache.bz2
-share/doc/HTML/nl/kmplayer/index.docbook
-share/doc/HTML/pt/kmplayer/common
-share/doc/HTML/pt/kmplayer/index.cache.bz2
-share/doc/HTML/pt/kmplayer/index.docbook
-share/doc/HTML/ru/kmplayer/common
-share/doc/HTML/ru/kmplayer/index.cache.bz2
-share/doc/HTML/ru/kmplayer/index.docbook
-share/doc/HTML/sv/kmplayer/common
-share/doc/HTML/sv/kmplayer/index.cache.bz2
-share/doc/HTML/sv/kmplayer/index.docbook
 share/icons/hicolor/128x128/apps/kmplayer.png
 share/icons/hicolor/16x16/apps/kmplayer.png
 share/icons/hicolor/22x22/apps/kmplayer.png
@@ -59,102 +16,16 @@ share/icons/hicolor/32x32/apps/kmplayer.png
 share/icons/hicolor/48x48/apps/kmplayer.png
 share/icons/hicolor/64x64/apps/kmplayer.png
 share/icons/hicolor/scalable/apps/kmplayer.svgz
-share/locale/ar/LC_MESSAGES/kmplayer.mo
-share/locale/be/LC_MESSAGES/kmplayer.mo
-share/locale/br/LC_MESSAGES/kmplayer.mo
-share/locale/bs/LC_MESSAGES/kmplayer.mo
-share/locale/ca/LC_MESSAGES/kmplayer.mo
-share/locale/cs/LC_MESSAGES/kmplayer.mo
-share/locale/csb/LC_MESSAGES/kmplayer.mo
-share/locale/cy/LC_MESSAGES/kmplayer.mo
-share/locale/da/LC_MESSAGES/kmplayer.mo
-share/locale/de/LC_MESSAGES/kmplayer.mo
-share/locale/el/LC_MESSAGES/kmplayer.mo
-share/locale/en_GB/LC_MESSAGES/kmplayer.mo
-share/locale/es/LC_MESSAGES/kmplayer.mo
-share/locale/et/LC_MESSAGES/kmplayer.mo
-share/locale/fi/LC_MESSAGES/kmplayer.mo
-share/locale/fr/LC_MESSAGES/kmplayer.mo
-share/locale/ga/LC_MESSAGES/kmplayer.mo
-share/locale/gl/LC_MESSAGES/kmplayer.mo
-share/locale/he/LC_MESSAGES/kmplayer.mo
-share/locale/hi/LC_MESSAGES/kmplayer.mo
-share/locale/hu/LC_MESSAGES/kmplayer.mo
-share/locale/is/LC_MESSAGES/kmplayer.mo
-share/locale/it/LC_MESSAGES/kmplayer.mo
-share/locale/ja/LC_MESSAGES/kmplayer.mo
-share/locale/ka/LC_MESSAGES/kmplayer.mo
-share/locale/lt/LC_MESSAGES/kmplayer.mo
-share/locale/mt/LC_MESSAGES/kmplayer.mo
-share/locale/nb/LC_MESSAGES/kmplayer.mo
-share/locale/nl/LC_MESSAGES/kmplayer.mo
-share/locale/nn/LC_MESSAGES/kmplayer.mo
-share/locale/pa/LC_MESSAGES/kmplayer.mo
-share/locale/pl/LC_MESSAGES/kmplayer.mo
-share/locale/pt/LC_MESSAGES/kmplayer.mo
-share/locale/pt_BR/LC_MESSAGES/kmplayer.mo
-share/locale/ro/LC_MESSAGES/kmplayer.mo
-share/locale/ru/LC_MESSAGES/kmplayer.mo
-share/locale/rw/LC_MESSAGES/kmplayer.mo
-share/locale/sk/LC_MESSAGES/kmplayer.mo
-share/locale/sr/LC_MESSAGES/kmplayer.mo
-share/locale/sr@Latn/LC_MESSAGES/kmplayer.mo
-share/locale/sv/LC_MESSAGES/kmplayer.mo
-share/locale/ta/LC_MESSAGES/kmplayer.mo
-share/locale/tr/LC_MESSAGES/kmplayer.mo
-share/locale/uk/LC_MESSAGES/kmplayer.mo
-share/locale/xx/LC_MESSAGES/kmplayer.mo
-share/locale/zh_CN/LC_MESSAGES/kmplayer.mo
-share/services/kmplayer_part.desktop
-@dirrmtry share/services
-@dirrmtry share/locale/csb/LC_MESSAGES
-@dirrmtry share/locale/csb
-@dirrmtry share/locale/xx/LC_MESSAGES
-@dirrmtry share/locale/xx
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/icons/hicolor/scalable/apps
-@dirrmtry share/icons/hicolor/scalable
-@dirrmtry share/icons/hicolor/64x64/apps
-@dirrmtry share/icons/hicolor/64x64
-@dirrmtry share/icons/hicolor/48x48/apps
-@dirrmtry share/icons/hicolor/48x48
-@dirrmtry share/icons/hicolor/32x32/apps
-@dirrmtry share/icons/hicolor/32x32
-@dirrmtry share/icons/hicolor/22x22/apps
-@dirrmtry share/icons/hicolor/22x22
-@dirrmtry share/icons/hicolor/16x16/apps
-@dirrmtry share/icons/hicolor/16x16
-@dirrmtry share/icons/hicolor/128x128/apps
-@dirrmtry share/icons/hicolor/128x128
-@dirrmtry share/icons/hicolor
-@dirrmtry share/icons
-@dirrm share/doc/HTML/sv/kmplayer
-@dirrmtry share/doc/HTML/sv
-@dirrm share/doc/HTML/ru/kmplayer
-@dirrmtry share/doc/HTML/ru
-@dirrm share/doc/HTML/pt/kmplayer
-@dirrmtry share/doc/HTML/pt
-@dirrm share/doc/HTML/nl/kmplayer
-@dirrmtry share/doc/HTML/nl
-@dirrm share/doc/HTML/it/kmplayer
-@dirrmtry share/doc/HTML/it
-@dirrm share/doc/HTML/fr/kmplayer
-@dirrmtry share/doc/HTML/fr
-@dirrm share/doc/HTML/et/kmplayer
-@dirrmtry share/doc/HTML/et
-@dirrm share/doc/HTML/es/kmplayer
-@dirrmtry share/doc/HTML/es
-@dirrm share/doc/HTML/en/kmplayer
-@dirrmtry share/doc/HTML/en
-@dirrm share/doc/HTML/de/kmplayer
-@dirrmtry share/doc/HTML/de
-@dirrm share/doc/HTML/da/kmplayer
-@dirrmtry share/doc/HTML/da
-@dirrmtry share/doc/HTML
-@dirrmtry share/config
-@dirrm share/apps/kmplayer
-@dirrmtry share/apps
-@dirrmtry share/applications/kde
+share/icons/oxygen/128x128/apps/kmplayer.png
+share/icons/oxygen/16x16/apps/kmplayer.png
+share/icons/oxygen/22x22/apps/kmplayer.png
+share/icons/oxygen/32x32/apps/kmplayer.png
+share/icons/oxygen/48x48/apps/kmplayer.png
+share/icons/oxygen/64x64/apps/kmplayer.png
+share/icons/oxygen/scalable/apps/kmplayer.svgz
+share/kde4/services/kmplayer.desktop
+share/kde4/services/kmplayer_part.desktop
 @dirrmtry share/applications
-@dirrmtry lib/kde3
+@dirrmtry share/pixmaps
+@dirrmtry share/apps/kmplayer
+@dirrmtry lib/kde4