[pkgsrc/trunk]: pkgsrc/x11/xkbdata Conflict with xkeyboard-config, which is n...

[reed <reed%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/aa719a1843de
branches:  trunk
changeset: 522164:aa719a1843de
user:      reed <reed%pkgsrc.org@localhost>
date:      Tue Dec 05 03:09:38 2006 +0000

description:
Conflict with xkeyboard-config, which is now in pkgsrc-wip.

xorg says that xkbdata is deprecated and to use xkeyboard-config
instead.

diffstat:

 x11/xkbdata/Makefile |  5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diffs (22 lines):

diff -r 72ef1c570bda -r aa719a1843de x11/xkbdata/Makefile
--- a/x11/xkbdata/Makefile      Mon Dec 04 22:06:40 2006 +0000
+++ b/x11/xkbdata/Makefile      Tue Dec 05 03:09:38 2006 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/11/07 17:27:42 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2006/12/05 03:09:38 reed Exp $
 #
 
 DISTNAME=              xkbdata-1.0.1
+PKGREVISION=           1
 CATEGORIES=            x11
 MASTER_SITES=          http://xorg.freedesktop.org/releases/individual/data/
 EXTRACT_SUFX=          .tar.bz2
@@ -10,6 +11,8 @@
 HOMEPAGE=              http://xorg.freedesktop.org/
 COMMENT=               Xorg keyboard maps and layouts
 
+CONFLICTS+=            xkeyboard-config-[0-9]*
+
 PKG_DESTDIR_SUPPORT=   user-destdir
 
 GNU_CONFIGURE=         yes