summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--x11/xkeyboard-config/Makefile4
-rw-r--r--x11/xkeyboard-config/PLIST3
-rw-r--r--x11/xkeyboard-config/distinfo10
-rw-r--r--x11/xkeyboard-config/patches/patch-po_Makefile.in.in16
4 files changed, 9 insertions, 24 deletions
diff --git a/x11/xkeyboard-config/Makefile b/x11/xkeyboard-config/Makefile
index d52da022f0b..2c7e06a1e55 100644
--- a/x11/xkeyboard-config/Makefile
+++ b/x11/xkeyboard-config/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.27 2015/05/27 06:45:52 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2015/10/15 08:41:14 wiz Exp $
-DISTNAME= xkeyboard-config-2.15
+DISTNAME= xkeyboard-config-2.16
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=data/${PKGBASE}/}
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/xkeyboard-config/PLIST b/x11/xkeyboard-config/PLIST
index 6713ea365b1..b289abbb469 100644
--- a/x11/xkeyboard-config/PLIST
+++ b/x11/xkeyboard-config/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2014/05/28 05:55:22 wiz Exp $
+@comment $NetBSD: PLIST,v 1.13 2015/10/15 08:41:14 wiz Exp $
share/X11/xkb/compat/README
share/X11/xkb/compat/accessx
share/X11/xkb/compat/basic
@@ -43,6 +43,7 @@ share/X11/xkb/geometry/sgi_vndr/indigo
share/X11/xkb/geometry/sgi_vndr/indy
share/X11/xkb/geometry/sony
share/X11/xkb/geometry/sun
+share/X11/xkb/geometry/teck
share/X11/xkb/geometry/thinkpad
share/X11/xkb/geometry/typematrix
share/X11/xkb/geometry/winbook
diff --git a/x11/xkeyboard-config/distinfo b/x11/xkeyboard-config/distinfo
index f0c20bf4641..61c2407b311 100644
--- a/x11/xkeyboard-config/distinfo
+++ b/x11/xkeyboard-config/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.19 2015/05/27 06:45:52 wiz Exp $
+$NetBSD: distinfo,v 1.20 2015/10/15 08:41:14 wiz Exp $
-SHA1 (xkeyboard-config-2.15.tar.bz2) = e3711045dcee02c5a5b4eb8344879a1f0233edce
-RMD160 (xkeyboard-config-2.15.tar.bz2) = c372d5cbeadb0f26f0781523304ba2ab5ea8bbd0
-Size (xkeyboard-config-2.15.tar.bz2) = 958523 bytes
-SHA1 (patch-po_Makefile.in.in) = ccb83a3e59f29769c351699142db7a8c6f29c53c
+SHA1 (xkeyboard-config-2.16.tar.bz2) = 6b2f374ccef542eed8ac29f81996cf9ca81cd3b6
+RMD160 (xkeyboard-config-2.16.tar.bz2) = 927b0c5c250cea7dde89247009aff642feb7e960
+SHA512 (xkeyboard-config-2.16.tar.bz2) = 7a661d8601a2653b3e2b55b47b3cf02aa1b028d97ea141cab3a234d61fdd00ab6f37d236c38bb96e32c2f0db535975583e17f080f24ac758982c301105d28079
+Size (xkeyboard-config-2.16.tar.bz2) = 968663 bytes
diff --git a/x11/xkeyboard-config/patches/patch-po_Makefile.in.in b/x11/xkeyboard-config/patches/patch-po_Makefile.in.in
deleted file mode 100644
index 50088e2f5b6..00000000000
--- a/x11/xkeyboard-config/patches/patch-po_Makefile.in.in
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-po_Makefile.in.in,v 1.2 2012/07/14 17:20:31 wiz Exp $
-
-Fix installation directory for locale files.
-https://bugs.freedesktop.org/show_bug.cgi?id=52094
-
---- po/Makefile.in.in.orig 2012-04-17 22:38:54.000000000 +0000
-+++ po/Makefile.in.in
-@@ -34,7 +34,7 @@ datadir = @datadir@
- datarootdir = @datarootdir@
- libdir = @libdir@
- DATADIRNAME = @DATADIRNAME@
--itlocaledir = $(prefix)/$(DATADIRNAME)/locale
-+itlocaledir = @localedir@
- subdir = po
- install_sh = @install_sh@
- # Automake >= 1.8 provides @mkdir_p@.