summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--x11/xkeyboard-config/Makefile8
-rw-r--r--x11/xkeyboard-config/PLIST6
-rw-r--r--x11/xkeyboard-config/distinfo8
3 files changed, 10 insertions, 12 deletions
diff --git a/x11/xkeyboard-config/Makefile b/x11/xkeyboard-config/Makefile
index bb63d871a9b..74dbffe5d1b 100644
--- a/x11/xkeyboard-config/Makefile
+++ b/x11/xkeyboard-config/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2008/04/15 02:27:54 reed Exp $
+# $NetBSD: Makefile,v 1.8 2008/06/03 06:10:16 bjs Exp $
#
-DISTNAME= xkeyboard-config-1.2
+DISTNAME= xkeyboard-config-1.3
CATEGORIES= x11
MASTER_SITES= http://xlibs.freedesktop.org/xkbdesc/
EXTRACT_SUFX= .tar.bz2
@@ -16,7 +16,7 @@ CONFLICTS+= xkbdata-[0-9]*
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
-USE_TOOLS+= gmake intltool perl:build
+USE_TOOLS+= gmake intltool perl:build
USE_TOOLS+= msgfmt xgettext
CONFIGURE_ARGS+= --with-xkb-rules-symlink=xfree86,xorg
@@ -42,7 +42,7 @@ XKBCOMPDIR?= ${VARBASE}/db/xkb
### is the path to the xkbcomp binary we wish to use.
###
XKBCOMPDIR_SYMLINK= ${XKBBASE}/compiled
-XKBCOMP= ${LOCALBASE}/bin/xkbcomp
+XKBCOMP= ${PREFIX}/bin/xkbcomp
BUILD_DEFS+= VARBASE
BUILD_DEFS+= XKBCOMPDIR
diff --git a/x11/xkeyboard-config/PLIST b/x11/xkeyboard-config/PLIST
index 774983273b2..0dc05b7d12e 100644
--- a/x11/xkeyboard-config/PLIST
+++ b/x11/xkeyboard-config/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2007/12/19 04:10:43 bjs Exp $
+@comment $NetBSD: PLIST,v 1.3 2008/06/03 06:10:16 bjs Exp $
share/X11/xkb/compat.dir
share/X11/xkb/compat/README
share/X11/xkb/compat/accessx
@@ -113,9 +113,6 @@ share/X11/xkb/rules/README
share/X11/xkb/rules/base
share/X11/xkb/rules/base.lst
share/X11/xkb/rules/base.xml
-share/X11/xkb/rules/sgi
-share/X11/xkb/rules/sun
-share/X11/xkb/rules/sun.xml
share/X11/xkb/rules/xfree86
share/X11/xkb/rules/xfree86.lst
share/X11/xkb/rules/xfree86.xml
@@ -351,3 +348,4 @@ share/locale/zh_TW/LC_MESSAGES/xkeyboard-config.mo
@dirrm share/X11/xkb/geometry
@dirrm share/X11/xkb/compat
@dirrm share/X11/xkb
+@comment @dirrm share/X11
diff --git a/x11/xkeyboard-config/distinfo b/x11/xkeyboard-config/distinfo
index 538cdb4a026..1d124181526 100644
--- a/x11/xkeyboard-config/distinfo
+++ b/x11/xkeyboard-config/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2008/02/07 06:31:25 bjs Exp $
+$NetBSD: distinfo,v 1.4 2008/06/03 06:10:16 bjs Exp $
-SHA1 (xkeyboard-config-1.2.tar.bz2) = d258d46dd2c5255aa60d489810ea246d5d224881
-RMD160 (xkeyboard-config-1.2.tar.bz2) = a42f603630dd6ef67fb281207a022e55b79f3007
-Size (xkeyboard-config-1.2.tar.bz2) = 586629 bytes
+SHA1 (xkeyboard-config-1.3.tar.bz2) = 1bc9bb0eeb9ffe6d044cc2c7b5853b5f4d9a5277
+RMD160 (xkeyboard-config-1.3.tar.bz2) = e496233ba058125a46d585cd262df95eaa4a1e7c
+Size (xkeyboard-config-1.3.tar.bz2) = 592158 bytes
SHA1 (patch-aa) = 1f6ec615b0915c5d08ac7ddbf2d35948b8859d85
SHA1 (patch-ab) = c8225979ce3b0e06b02ee71d6675588844ca3e81
SHA1 (patch-ac) = 1adb014877c3cef1138a57915b5779eca683365f