Add musicbrainz, trm and taglib as dependancies/build requirements of

kdemultimedia3.  This allows JuK to now be built.

Bump PKGREVISION.

3 files changed, 22 insertions, 4 deletions

diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile
index 4abbb3021ed..edbbe096169 100644
--- a/multimedia/kdemultimedia3/Makefile
+++ b/multimedia/kdemultimedia3/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2004/02/05 07:43:30 markd Exp $
+# $NetBSD: Makefile,v 1.4 2004/02/09 00:53:48 chris Exp $
 
 DISTNAME=	kdemultimedia-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	multimedia
 COMMENT=	Multimedia tools for the KDE integrated X11 desktop
 
@@ -9,6 +10,7 @@ CONFLICTS=	timidity-[0-9]*
 .include "../../meta-pkgs/kde3/Makefile.kde3"
 
 DEPENDS+=	xine-arts>=1rc0a:../../audio/xine-arts
+DEPENDS+=	trm>=0.2.1:../../audio/trm
 
 USE_BUILDLINK2=		YES
 
@@ -39,6 +41,8 @@ PLIST_SUBST+=		XV_WORKAROUND="@comment "
 PLIST_SUBST+=		XV_WORKAROUND=""
 .endif
 
+.include "../../audio/musicbrainz/buildlink2.mk"
+.include "../../audio/taglib/buildlink2.mk"
 .include "../../audio/arts/buildlink2.mk"
 .include "../../meta-pkgs/kde3/buildlink2.mk"
 .include "../../multimedia/xine-lib/buildlink2.mk"
diff --git a/multimedia/kdemultimedia3/PLIST b/multimedia/kdemultimedia3/PLIST
index 4e5bafb4572..9bfe8444fce 100644
--- a/multimedia/kdemultimedia3/PLIST
+++ b/multimedia/kdemultimedia3/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.3 2004/02/05 20:14:06 skrll Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/02/09 00:53:48 chris Exp $
 bin/artsbuilder
 bin/artscontrol
+bin/juk
 bin/kaboodle
 bin/kmid
 bin/kmix
@@ -471,6 +472,7 @@ lib/mcop/winskinvis.mcoptype
 lib/mcop/xinePlayObject.mcopclass
 share/applications/kde/artsbuilder.desktop
 share/applications/kde/artscontrol.desktop
+share/applications/kde/juk.desktop
 share/applications/kde/kaboodle.desktop
 share/applications/kde/kmid.desktop
 share/applications/kde/kmix.desktop
@@ -679,6 +681,8 @@ share/kde/apps/artsbuilder/pics/Synth_WAVE_TRI.xpm
 share/kde/apps/artsbuilder/pics/Synth_XFADE.xpm
 share/kde/apps/artscontrol/artscontrol.rc
 share/kde/apps/artscontrol/artsmidimanagerview.rc
+share/kde/apps/juk/jukui.rc
+share/kde/apps/juk/pics/playing.png
 share/kde/apps/kaboodle/icons/crystalsvg/16x16/actions/kaboodleloop.png
 share/kde/apps/kaboodle/icons/crystalsvg/22x22/actions/kaboodleloop.png
 share/kde/apps/kaboodle/kaboodlepartui.rc
@@ -730,6 +734,7 @@ share/kde/apps/kmix/pics/mix_treble.png
 share/kde/apps/kmix/pics/mix_unknown.png
 share/kde/apps/kmix/pics/mix_video.png
 share/kde/apps/kmix/pics/mix_volume.png
+share/kde/apps/konqueror/servicemenus/jukservicemenu.desktop
 share/kde/apps/krec/icons/crystalsvg/16x16/actions/krec_record.png
 share/kde/apps/krec/icons/crystalsvg/22x22/actions/krec_record.png
 share/kde/apps/krec/icons/crystalsvg/32x32/actions/krec_record.png
@@ -988,8 +993,11 @@ share/kde/icons/crystalsvg/16x16/actions/artsenvironment.png
 share/kde/icons/crystalsvg/16x16/actions/artsfftscope.png
 share/kde/icons/crystalsvg/16x16/actions/artsmediatypes.png
 share/kde/icons/crystalsvg/16x16/actions/artsmidimanager.png
+share/kde/icons/crystalsvg/16x16/actions/juk_time.png
+share/kde/icons/crystalsvg/16x16/actions/juk_volume.png
 share/kde/icons/crystalsvg/16x16/apps/artsbuilder.png
 share/kde/icons/crystalsvg/16x16/apps/artscontrol.png
+share/kde/icons/crystalsvg/16x16/apps/juk.png
 share/kde/icons/crystalsvg/16x16/apps/kaboodle.png
 share/kde/icons/crystalsvg/16x16/apps/kmid.png
 share/kde/icons/crystalsvg/16x16/apps/kmix.png
@@ -1002,6 +1010,7 @@ share/kde/icons/crystalsvg/22x22/actions/artsenvironment.png
 share/kde/icons/crystalsvg/22x22/actions/artsfftscope.png
 share/kde/icons/crystalsvg/22x22/actions/artsmediatypes.png
 share/kde/icons/crystalsvg/22x22/actions/artsmidimanager.png
+share/kde/icons/crystalsvg/22x22/actions/juk_dock.png
 share/kde/icons/crystalsvg/22x22/apps/artscontrol.png
 share/kde/icons/crystalsvg/22x22/apps/kaboodle.png
 share/kde/icons/crystalsvg/22x22/apps/krec.png
@@ -1012,6 +1021,7 @@ share/kde/icons/crystalsvg/32x32/actions/artsfftscope.png
 share/kde/icons/crystalsvg/32x32/actions/artsmediatypes.png
 share/kde/icons/crystalsvg/32x32/actions/artsmidimanager.png
 share/kde/icons/crystalsvg/32x32/apps/artscontrol.png
+share/kde/icons/crystalsvg/32x32/apps/juk.png
 share/kde/icons/crystalsvg/32x32/apps/kaboodle.png
 share/kde/icons/crystalsvg/32x32/apps/kmid.png
 share/kde/icons/crystalsvg/32x32/apps/kmix.png
@@ -1024,6 +1034,7 @@ share/kde/icons/crystalsvg/48x48/actions/artsfftscope.png
 share/kde/icons/crystalsvg/48x48/actions/artsmediatypes.png
 share/kde/icons/crystalsvg/48x48/actions/artsmidimanager.png
 share/kde/icons/crystalsvg/48x48/apps/artscontrol.png
+share/kde/icons/crystalsvg/48x48/apps/juk.png
 share/kde/icons/crystalsvg/48x48/apps/kaboodle.png
 share/kde/icons/crystalsvg/48x48/apps/kmid.png
 share/kde/icons/crystalsvg/48x48/apps/kmix.png
@@ -1132,6 +1143,7 @@ share/kde/servicetypes/krec_exportitem.desktop
 @dirrm share/kde/apps/krec/icons/crystalsvg
 @dirrm share/kde/apps/krec/icons
 @dirrm share/kde/apps/krec
+@comment dirrm share/kde/apps/konqueror/servicemenus
 @dirrm share/kde/apps/kmix/pics
 @dirrm share/kde/apps/kmix
 @dirrm share/kde/apps/kmid/maps
@@ -1154,6 +1166,8 @@ share/kde/servicetypes/krec_exportitem.desktop
 @dirrm share/kde/apps/kaboodle/icons/crystalsvg
 @dirrm share/kde/apps/kaboodle/icons
 @dirrm share/kde/apps/kaboodle
+@dirrm share/kde/apps/juk/pics
+@dirrm share/kde/apps/juk
 @dirrm share/kde/apps/artscontrol
 @dirrm share/kde/apps/artsbuilder/pics
 @dirrm share/kde/apps/artsbuilder/examples/todo
diff --git a/multimedia/kdemultimedia3/buildlink2.mk b/multimedia/kdemultimedia3/buildlink2.mk
index 9212b332791..1ec2d87f4b7 100644
--- a/multimedia/kdemultimedia3/buildlink2.mk
+++ b/multimedia/kdemultimedia3/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.1 2004/02/05 07:43:30 markd Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2004/02/09 00:53:48 chris Exp $
 #
 # This Makefile fragment is included by packages that use kdemultimedia.
 #
@@ -9,7 +9,7 @@
 KDEMULTIMEDIA_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			kdemultimedia
-BUILDLINK_DEPENDS.kdemultimedia?=		kdemultimedia>=3.2.0
+BUILDLINK_DEPENDS.kdemultimedia?=		kdemultimedia>=3.2.0nb1
 BUILDLINK_PKGSRCDIR.kdemultimedia?=		../../multimedia/kdemultimedia3
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.kdemultimedia=kdemultimedia