- Update to 0.10.0c, the last release for KDE3

- Add depends for gtk stuff (used if found by configure)
- Update tubestuff add-on

Submitted by:	Danny Pansters <danny@ricin.com> (maintainer via private mail)

4 files changed, 91 insertions, 18 deletions

diff --git a/multimedia/kmplayer-kde4/Makefile b/multimedia/kmplayer-kde4/Makefile
index 075155a8fbe9..598852ddcafe 100644
--- a/multimedia/kmplayer-kde4/Makefile
+++ b/multimedia/kmplayer-kde4/Makefile
@@ -6,16 +6,24 @@
 #
 
 PORTNAME=	kmplayer
-PORTVERSION=	0.9.4a
+PORTVERSION=	0.10.0c
+PORTREVISION=	# zero
 PORTEPOCH=	2
 CATEGORIES=	multimedia audio kde
-MASTER_SITES=	http://kmplayer.kde.org/pkgs/ \
-		http://freebsd.ricin.com/ports/distfiles/
-#DISTNAME=	${PORTNAME}-${PORTVERSION:C/\.r/-rc/}
+MASTER_SITES=	http://freebsd.ricin.com/ports/distfiles/ \
+		http://kmplayer.kde.org/pkgs/
+DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	danny@ricin.com
-COMMENT=	KDE frontend to mplayer
+COMMENT=	KDE frontend to MPlayer, Xine, GStreamer
 
+# 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
@@ -23,31 +31,88 @@ USE_KDEBASE_VER=3
 USE_XLIB=	yes
 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
 
-OPTIONS=	GSTREAMER	"Enable gstreamer playback support" off \
-		XINE		"Enable libxine playback support" off
+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
 
-WANT_GSTREAMER=	yes
+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|' \
+	${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
+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
+CONFIGURE_ARGS+=--without-xine
+.endif # WITH_XINE
+
+.if defined(WITH_TUBESTUFF)
+TUBESTUFF_VER=	20080314
+DISTFILES=	tubestuff-${TUBESTUFF_VER}.tbz
+DISTFILES+=	${DISTNAME}.tar.bz2
+BUILD_DEPENDS+=	mencoder:${PORTSDIR}/multimedia/mencoder
+USE_PYTHON=	yes
+
+post-extract:
+	${TAR} xvf ${DISTDIR}/tubestuff-${TUBESTUFF_VER}.tbz ${WRKDIR}
+
+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>
diff --git a/multimedia/kmplayer-kde4/distinfo b/multimedia/kmplayer-kde4/distinfo
index 817848d2df2f..d21a76d337bb 100644
--- a/multimedia/kmplayer-kde4/distinfo
+++ b/multimedia/kmplayer-kde4/distinfo
@@ -1,3 +1,6 @@
-MD5 (kmplayer-0.9.4a.tar.bz2) = 10eeb318a4800e4cfa74957c7a6714da
-SHA256 (kmplayer-0.9.4a.tar.bz2) = 1c5d705818bca7cb00384991498fe020b70bc0f55622185e63905551793aaa9c
-SIZE (kmplayer-0.9.4a.tar.bz2) = 970527
+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
diff --git a/multimedia/kmplayer-kde4/pkg-descr b/multimedia/kmplayer-kde4/pkg-descr
index 81e9fc252cd5..23960becea9f 100644
--- a/multimedia/kmplayer-kde4/pkg-descr
+++ b/multimedia/kmplayer-kde4/pkg-descr
@@ -1,4 +1,4 @@
-KDE frontend to mplayer
+KDE frontend to MPlayer, Xine, GStreamer
 
 WWW: http://kmplayer.kde.org/
 
diff --git a/multimedia/kmplayer-kde4/pkg-plist b/multimedia/kmplayer-kde4/pkg-plist
index 9b3e4d670cef..b738c10ccf22 100644
--- a/multimedia/kmplayer-kde4/pkg-plist
+++ b/multimedia/kmplayer-kde4/pkg-plist
@@ -60,10 +60,12 @@ 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
@@ -86,6 +88,7 @@ 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
@@ -104,6 +107,8 @@ 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