From 470e9d37b04776af8ab61c2825f3d9ace8609861 Mon Sep 17 00:00:00 2001
From: wiz <wiz>
Date: Thu, 16 Sep 2010 09:49:42 +0000
Subject: Now that libX11 pulls in libxcb, merge xine-xcb package back into
 xine-lib. Update dependency patterns in users and bump PKGREVISION.

---
 multimedia/kdemultimedia4/Makefile | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'multimedia/kdemultimedia4')

diff --git a/multimedia/kdemultimedia4/Makefile b/multimedia/kdemultimedia4/Makefile
index c3729db45af..9da2bf5e647 100644
--- a/multimedia/kdemultimedia4/Makefile
+++ b/multimedia/kdemultimedia4/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2010/09/14 11:02:29 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2010/09/16 09:49:42 wiz Exp $
 
 DISTNAME=	kdemultimedia-${_KDE_VERSION}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	multimedia
 COMMENT=	Multimedia tools for the KDE integrated X11 desktop
 
@@ -9,8 +9,6 @@ COMMENT=	Multimedia tools for the KDE integrated X11 desktop
 
 # BUILD_MAKE_FLAGS+= VERBOSE=1
 
-DEPENDS+=	xine-xcb>=1.1.9:../../x11/xine-xcb
-
 .include "../../mk/bsd.prefs.mk"
 .include "options.mk"
 
@@ -23,6 +21,7 @@ DEPENDS+=	xine-xcb>=1.1.9:../../x11/xine-xcb
 .include "../../audio/taglib/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../multimedia/libtheora/buildlink3.mk"
+BUILDLINK_ABI_DEPENDS.xine-lib?=	xine-lib>=1.1.19nb1
 .include "../../multimedia/xine-lib/buildlink3.mk"
 .include "../../x11/kdelibs4/buildlink3.mk"
 .include "../../x11/kdebase-runtime4/buildlink3.mk"
-- 
cgit v1.2.3