summaryrefslogtreecommitdiff
path: root/x11/xkbdata
diff options
context:
space:
mode:
authorreed <reed@pkgsrc.org>2006-12-05 03:09:38 +0000
committerreed <reed@pkgsrc.org>2006-12-05 03:09:38 +0000
commit9b1b3eaab7b7c5d27a6b68be96b223d05cc52bd2 (patch)
tree41be6960dfd2e71bc64cf37c1bbb7bcaf1bef80b /x11/xkbdata
parente840567ecdbf07cb2992e5aabac8141f83652c2c (diff)
downloadpkgsrc-9b1b3eaab7b7c5d27a6b68be96b223d05cc52bd2.tar.gz
Conflict with xkeyboard-config, which is now in pkgsrc-wip.
xorg says that xkbdata is deprecated and to use xkeyboard-config instead.
Diffstat (limited to 'x11/xkbdata')
-rw-r--r--x11/xkbdata/Makefile5
1 files changed, 4 insertions, 1 deletions
diff --git a/x11/xkbdata/Makefile b/x11/xkbdata/Makefile
index c13adfbcfdd..caaa0ce1a60 100644
--- a/x11/xkbdata/Makefile
+++ b/x11/xkbdata/Makefile
@@ -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 @@ MAINTAINER= joerg@NetBSD.org
HOMEPAGE= http://xorg.freedesktop.org/
COMMENT= Xorg keyboard maps and layouts
+CONFLICTS+= xkeyboard-config-[0-9]*
+
PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= yes