Thu Jan 29 10:17:03 2015 UTC ()
Update to 2.14:

New xkeyboard-config release is out:

Andreas Wettstein (1):
      Add oe ligature to Swiss keyboard layout, replacing oslash.

Changwoo Ryu (1):
      update Korean

Julien Cristau (1):
      fujitsu_vndr: add a name to xkb_symbols sections

Michael Witten (1):
      README: Clean up grammar/formatting, and mention bugzilla

Peter Hutterer (2):
      rules: improve documentation for numpad:microsoft
      symbols/il: add HOLAM HASER FOR VAV on shift+5 to il(biblical)

Ran Benita (3):
      symbols/macintosh_vndr: add some "default" annotations
      macintosh_vndr/us: include "keypad(overlay)" explicitly
      symbols/keypad: move the default map to be the first in the file

Sergey Udaltsov (9):
      Added Russian AZERTY phonetic variants
      Added de(pl) option
      Fixng the ISO 639-2 Code for the Uyghur keyboard layout [cn (ug)]
      Removing compose(ralt)
      Prerelease 2.13.99
      support for arabic macintosh
      Typo fixed, closing tag
      Prerelease translation sync
      Release 2.14

Viatcheslav Kileev (1):
      symbols/ru: remove non-Mari letters from Mari layout and add the missing one


(wiz)
diff -r1.25 -r1.26 pkgsrc/x11/xkeyboard-config/Makefile
diff -r1.17 -r1.18 pkgsrc/x11/xkeyboard-config/distinfo
cvs diff -r1.25 -r1.26 pkgsrc/x11/xkeyboard-config/Makefile (switch to unified diff)

--- pkgsrc/x11/xkeyboard-config/Makefile 2014/10/05 14:57:55 1.25
+++ pkgsrc/x11/xkeyboard-config/Makefile 2015/01/29 10:17:03 1.26
@@ -1,62 +1,62 @@ @@ -1,62 +1,62 @@
1# $NetBSD: Makefile,v 1.25 2014/10/05 14:57:55 wiz Exp $ 1# $NetBSD: Makefile,v 1.26 2015/01/29 10:17:03 wiz Exp $
2 2
3DISTNAME= xkeyboard-config-2.13 3DISTNAME= xkeyboard-config-2.14
4CATEGORIES= x11 4CATEGORIES= x11
5MASTER_SITES= ${MASTER_SITE_XORG:=data/${PKGBASE}/} 5MASTER_SITES= ${MASTER_SITE_XORG:=data/${PKGBASE}/}
6EXTRACT_SUFX= .tar.bz2 6EXTRACT_SUFX= .tar.bz2
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.freedesktop.org/wiki/Software/XKeyboardConfig 9HOMEPAGE= http://www.freedesktop.org/wiki/Software/XKeyboardConfig
10COMMENT= X Keyboard Configuration Database 10COMMENT= X Keyboard Configuration Database
11 11
12BUILD_DEPENDS+= xkbcomp-[0-9]*:../../x11/xkbcomp 12BUILD_DEPENDS+= xkbcomp-[0-9]*:../../x11/xkbcomp
13 13
14CONFLICTS+= xkbdata-[0-9]* 14CONFLICTS+= xkbdata-[0-9]*
15 15
16MAKE_JOBS_SAFE= no 16MAKE_JOBS_SAFE= no
17 17
18GNU_CONFIGURE= yes 18GNU_CONFIGURE= yes
19USE_LIBTOOL= yes 19USE_LIBTOOL= yes
20USE_TOOLS+= gmake intltool msgfmt pkg-config 20USE_TOOLS+= gmake intltool msgfmt pkg-config
21PKGCONFIG_OVERRIDE+= xkeyboard-config.pc.in 21PKGCONFIG_OVERRIDE+= xkeyboard-config.pc.in
22 22
23BUILD_DEFS+= VARBASE 23BUILD_DEFS+= VARBASE
24BUILD_DEFS+= XKBCOMPDIR 24BUILD_DEFS+= XKBCOMPDIR
25 25
26CONFIGURE_ARGS+= --with-xkb-rules-symlink=xfree86,xorg 26CONFIGURE_ARGS+= --with-xkb-rules-symlink=xfree86,xorg
27CONFIGURE_ARGS+= --with-xkb-base=${XKBBASE:Q} 27CONFIGURE_ARGS+= --with-xkb-base=${XKBBASE:Q}
28CONFIGURE_ARGS+= --datadir=${PREFIX}/share 28CONFIGURE_ARGS+= --datadir=${PREFIX}/share
29CONFIGURE_ARGS+= --without-xsltproc 29CONFIGURE_ARGS+= --without-xsltproc
30### 30###
31REPLACE_SH= rules/merge.sh 31REPLACE_SH= rules/merge.sh
32### 32###
33### Keymaps, rules, etc. are installed here. 33### Keymaps, rules, etc. are installed here.
34### 34###
35XKBBASE= ${PREFIX}/share/X11/xkb 35XKBBASE= ${PREFIX}/share/X11/xkb
36### 36###
37### The server puts compiled keymaps in the directory below. 37### The server puts compiled keymaps in the directory below.
38### 38###
39XKBCOMPDIR?= ${VARBASE}/db/xkb 39XKBCOMPDIR?= ${VARBASE}/db/xkb
40### 40###
41### The package must symlink ${XKBCOMPDIR} into ${XKBBASE}. ${XKBCOMP} is 41### The package must symlink ${XKBCOMPDIR} into ${XKBBASE}. ${XKBCOMP} is
42### is the path to the xkbcomp binary we wish to use. 42### is the path to the xkbcomp binary we wish to use.
43### 43###
44XKBCOMPDIR_SYMLINK= ${XKBBASE}/compiled 44XKBCOMPDIR_SYMLINK= ${XKBBASE}/compiled
45XKBCOMP= ${PREFIX}/bin/xkbcomp 45XKBCOMP= ${PREFIX}/bin/xkbcomp
46 46
47FILES_SUBST+= XKBBASE=${XKBBASE:Q} 47FILES_SUBST+= XKBBASE=${XKBBASE:Q}
48FILES_SUBST+= XKBCOMP=${XKBCOMP:Q} 48FILES_SUBST+= XKBCOMP=${XKBCOMP:Q}
49FILES_SUBST+= XKBCOMP_SYMLINK=${${XKBBASE}/xkbcomp:L:Q} 49FILES_SUBST+= XKBCOMP_SYMLINK=${${XKBBASE}/xkbcomp:L:Q}
50FILES_SUBST+= XKBCOMPDIR=${XKBCOMPDIR:Q} 50FILES_SUBST+= XKBCOMPDIR=${XKBCOMPDIR:Q}
51FILES_SUBST+= XKBCOMPDIR_SYMLINK=${XKBCOMPDIR_SYMLINK:Q} 51FILES_SUBST+= XKBCOMPDIR_SYMLINK=${XKBCOMPDIR_SYMLINK:Q}
52 52
53OWN_DIRS+= ${XKBCOMPDIR} 53OWN_DIRS+= ${XKBCOMPDIR}
54 54
55BUILDLINK_DEPMETHOD.gettext= build # for the configure only 55BUILDLINK_DEPMETHOD.gettext= build # for the configure only
56.include "../../devel/gettext-lib/buildlink3.mk" 56.include "../../devel/gettext-lib/buildlink3.mk"
57 57
58BUILDLINK_API_DEPENDS.libX11+= libX11>=1.4.3 58BUILDLINK_API_DEPENDS.libX11+= libX11>=1.4.3
59.include "../../x11/libX11/buildlink3.mk" 59.include "../../x11/libX11/buildlink3.mk"
60BUILDLINK_API_DEPENDS.xproto+= xproto>=7.0.20 60BUILDLINK_API_DEPENDS.xproto+= xproto>=7.0.20
61.include "../../x11/xproto/buildlink3.mk" 61.include "../../x11/xproto/buildlink3.mk"
62.include "../../mk/bsd.pkg.mk" 62.include "../../mk/bsd.pkg.mk"
cvs diff -r1.17 -r1.18 pkgsrc/x11/xkeyboard-config/distinfo (switch to unified diff)

--- pkgsrc/x11/xkeyboard-config/distinfo 2014/10/05 14:57:55 1.17
+++ pkgsrc/x11/xkeyboard-config/distinfo 2015/01/29 10:17:03 1.18
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.17 2014/10/05 14:57:55 wiz Exp $ 1$NetBSD: distinfo,v 1.18 2015/01/29 10:17:03 wiz Exp $
2 2
3SHA1 (xkeyboard-config-2.13.tar.bz2) = ea2d43582c37aa23ab347f002357f5473fe9a6bb 3SHA1 (xkeyboard-config-2.14.tar.bz2) = b37c42b26739bedb9716c60c92f721c1ad934116
4RMD160 (xkeyboard-config-2.13.tar.bz2) = a359333b8b525ea533e89c253b4c08f62663ad70 4RMD160 (xkeyboard-config-2.14.tar.bz2) = ea0f82cbc5950aa2265f5d36caa429314183d9bf
5Size (xkeyboard-config-2.13.tar.bz2) = 944375 bytes 5Size (xkeyboard-config-2.14.tar.bz2) = 953589 bytes
6SHA1 (patch-po_Makefile.in.in) = ccb83a3e59f29769c351699142db7a8c6f29c53c 6SHA1 (patch-po_Makefile.in.in) = ccb83a3e59f29769c351699142db7a8c6f29c53c