Thu Jul 15 10:56:21 2021 UTC ()
xkeyboard-config: update to 2.32.

2.32	95 commits
	Translations updated
2.31	86 commits
	Translations updated
2.30	29 commits
	Translations updated
2.29	47 commits
	Translations updated


(wiz)
diff -r1.43 -r1.44 pkgsrc/x11/xkeyboard-config/Makefile
diff -r1.20 -r1.21 pkgsrc/x11/xkeyboard-config/PLIST
diff -r1.31 -r1.32 pkgsrc/x11/xkeyboard-config/distinfo
cvs diff -r1.43 -r1.44 pkgsrc/x11/xkeyboard-config/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/xkeyboard-config/Makefile 2021/05/24 19:56:06 1.43
+++ pkgsrc/x11/xkeyboard-config/Makefile 2021/07/15 10:56:21 1.44
@@ -1,35 +1,35 @@ @@ -1,35 +1,35 @@
1# $NetBSD: Makefile,v 1.43 2021/05/24 19:56:06 wiz Exp $ 1# $NetBSD: Makefile,v 1.44 2021/07/15 10:56:21 wiz Exp $
2 2
3DISTNAME= xkeyboard-config-2.28 3DISTNAME= xkeyboard-config-2.32
4PKGREVISION= 2 
5CATEGORIES= x11 4CATEGORIES= x11
6MASTER_SITES= ${MASTER_SITE_XORG:=data/${PKGBASE}/} 5MASTER_SITES= ${MASTER_SITE_XORG:=data/${PKGBASE}/}
7EXTRACT_SUFX= .tar.bz2 6EXTRACT_SUFX= .tar.bz2
8 7
9MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://www.freedesktop.org/wiki/Software/XKeyboardConfig 9HOMEPAGE= https://www.freedesktop.org/wiki/Software/XKeyboardConfig
11COMMENT= X Keyboard Configuration Database 10COMMENT= X Keyboard Configuration Database
12 11
13BUILD_DEPENDS+= xkbcomp-[0-9]*:../../x11/xkbcomp 12BUILD_DEPENDS+= xkbcomp-[0-9]*:../../x11/xkbcomp
14 13
15CONFLICTS+= xkbdata-[0-9]* 14CONFLICTS+= xkbdata-[0-9]*
16 15
17MAKE_JOBS_SAFE= no 16MAKE_JOBS_SAFE= no
18 17
19GNU_CONFIGURE= yes 18GNU_CONFIGURE= yes
20USE_LIBTOOL= yes 19USE_LIBTOOL= yes
21USE_TOOLS+= gmake msgfmt perl pkg-config 20USE_TOOLS+= gmake msgfmt perl pkg-config
22PKGCONFIG_OVERRIDE+= xkeyboard-config.pc.in 21PKGCONFIG_OVERRIDE+= xkeyboard-config.pc.in
 22PYTHON_FOR_BUILD_ONLY= yes
23 23
24BUILD_DEFS+= VARBASE 24BUILD_DEFS+= VARBASE
25BUILD_DEFS+= XKBCOMPDIR 25BUILD_DEFS+= XKBCOMPDIR
26 26
27CONFIGURE_ARGS+= --with-xkb-rules-symlink=xfree86,xorg 27CONFIGURE_ARGS+= --with-xkb-rules-symlink=xfree86,xorg
28CONFIGURE_ARGS+= --with-xkb-base=${XKBBASE:Q} 28CONFIGURE_ARGS+= --with-xkb-base=${XKBBASE:Q}
29CONFIGURE_ARGS+= --datadir=${PREFIX}/share 29CONFIGURE_ARGS+= --datadir=${PREFIX}/share
30CONFIGURE_ARGS+= --without-xsltproc 30CONFIGURE_ARGS+= --without-xsltproc
31### 31###
32REPLACE_SH= rules/merge.sh 32REPLACE_SH= rules/merge.sh
33### 33###
34### Keymaps, rules, etc. are installed here. 34### Keymaps, rules, etc. are installed here.
35### 35###
@@ -49,14 +49,15 @@ FILES_SUBST+= XKBBASE=${XKBBASE:Q} @@ -49,14 +49,15 @@ FILES_SUBST+= XKBBASE=${XKBBASE:Q}
49FILES_SUBST+= XKBCOMP=${XKBCOMP:Q} 49FILES_SUBST+= XKBCOMP=${XKBCOMP:Q}
50FILES_SUBST+= XKBCOMP_SYMLINK=${${XKBBASE}/xkbcomp:L:Q} 50FILES_SUBST+= XKBCOMP_SYMLINK=${${XKBBASE}/xkbcomp:L:Q}
51FILES_SUBST+= XKBCOMPDIR=${XKBCOMPDIR:Q} 51FILES_SUBST+= XKBCOMPDIR=${XKBCOMPDIR:Q}
52FILES_SUBST+= XKBCOMPDIR_SYMLINK=${XKBCOMPDIR_SYMLINK:Q} 52FILES_SUBST+= XKBCOMPDIR_SYMLINK=${XKBCOMPDIR_SYMLINK:Q}
53 53
54OWN_DIRS+= ${XKBCOMPDIR} 54OWN_DIRS+= ${XKBCOMPDIR}
55 55
56BUILDLINK_DEPMETHOD.gettext= build # for the configure only 56BUILDLINK_DEPMETHOD.gettext= build # for the configure only
57.include "../../devel/gettext-lib/buildlink3.mk" 57.include "../../devel/gettext-lib/buildlink3.mk"
58 58
59BUILDLINK_API_DEPENDS.libX11+= libX11>=1.4.3 59BUILDLINK_API_DEPENDS.libX11+= libX11>=1.4.3
60.include "../../x11/libX11/buildlink3.mk" 60.include "../../x11/libX11/buildlink3.mk"
61.include "../../x11/xorgproto/buildlink3.mk" 61.include "../../x11/xorgproto/buildlink3.mk"
 62.include "../../lang/python/tool.mk"
62.include "../../mk/bsd.pkg.mk" 63.include "../../mk/bsd.pkg.mk"
cvs diff -r1.20 -r1.21 pkgsrc/x11/xkeyboard-config/PLIST (expand / switch to unified diff)

--- pkgsrc/x11/xkeyboard-config/PLIST 2019/11/13 22:07:02 1.20
+++ pkgsrc/x11/xkeyboard-config/PLIST 2021/07/15 10:56:21 1.21
@@ -1,22 +1,23 @@ @@ -1,22 +1,23 @@
1@comment $NetBSD: PLIST,v 1.20 2019/11/13 22:07:02 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.21 2021/07/15 10:56:21 wiz Exp $
2share/X11/xkb/compat/README 2share/X11/xkb/compat/README
3share/X11/xkb/compat/accessx 3share/X11/xkb/compat/accessx
4share/X11/xkb/compat/basic 4share/X11/xkb/compat/basic
5share/X11/xkb/compat/caps 5share/X11/xkb/compat/caps
6share/X11/xkb/compat/complete 6share/X11/xkb/compat/complete
7share/X11/xkb/compat/iso9995 7share/X11/xkb/compat/iso9995
8share/X11/xkb/compat/japan 8share/X11/xkb/compat/japan
9share/X11/xkb/compat/ledcaps 9share/X11/xkb/compat/ledcaps
 10share/X11/xkb/compat/ledcompose
10share/X11/xkb/compat/lednum 11share/X11/xkb/compat/lednum
11share/X11/xkb/compat/ledscroll 12share/X11/xkb/compat/ledscroll
12share/X11/xkb/compat/level5 13share/X11/xkb/compat/level5
13share/X11/xkb/compat/misc 14share/X11/xkb/compat/misc
14share/X11/xkb/compat/mousekeys 15share/X11/xkb/compat/mousekeys
15share/X11/xkb/compat/olpc 16share/X11/xkb/compat/olpc
16share/X11/xkb/compat/pc 17share/X11/xkb/compat/pc
17share/X11/xkb/compat/pc98 18share/X11/xkb/compat/pc98
18share/X11/xkb/compat/xfree86 19share/X11/xkb/compat/xfree86
19share/X11/xkb/compat/xtest 20share/X11/xkb/compat/xtest
20share/X11/xkb/geometry/README 21share/X11/xkb/geometry/README
21share/X11/xkb/geometry/amiga 22share/X11/xkb/geometry/amiga
22share/X11/xkb/geometry/ataritt 23share/X11/xkb/geometry/ataritt
@@ -73,27 +74,26 @@ share/X11/xkb/rules/README @@ -73,27 +74,26 @@ share/X11/xkb/rules/README
73share/X11/xkb/rules/base 74share/X11/xkb/rules/base
74share/X11/xkb/rules/base.extras.xml 75share/X11/xkb/rules/base.extras.xml
75share/X11/xkb/rules/base.lst 76share/X11/xkb/rules/base.lst
76share/X11/xkb/rules/base.xml 77share/X11/xkb/rules/base.xml
77share/X11/xkb/rules/evdev 78share/X11/xkb/rules/evdev
78share/X11/xkb/rules/evdev.extras.xml 79share/X11/xkb/rules/evdev.extras.xml
79share/X11/xkb/rules/evdev.lst 80share/X11/xkb/rules/evdev.lst
80share/X11/xkb/rules/evdev.xml 81share/X11/xkb/rules/evdev.xml
81share/X11/xkb/rules/xfree86 82share/X11/xkb/rules/xfree86
82share/X11/xkb/rules/xfree86.lst 83share/X11/xkb/rules/xfree86.lst
83share/X11/xkb/rules/xfree86.xml 84share/X11/xkb/rules/xfree86.xml
84share/X11/xkb/rules/xfree98 85share/X11/xkb/rules/xfree98
85share/X11/xkb/rules/xkb.dtd 86share/X11/xkb/rules/xkb.dtd
86share/X11/xkb/rules/xkb.its 
87share/X11/xkb/rules/xorg 87share/X11/xkb/rules/xorg
88share/X11/xkb/rules/xorg.lst 88share/X11/xkb/rules/xorg.lst
89share/X11/xkb/rules/xorg.xml 89share/X11/xkb/rules/xorg.xml
90share/X11/xkb/symbols/af 90share/X11/xkb/symbols/af
91share/X11/xkb/symbols/al 91share/X11/xkb/symbols/al
92share/X11/xkb/symbols/altwin 92share/X11/xkb/symbols/altwin
93share/X11/xkb/symbols/am 93share/X11/xkb/symbols/am
94share/X11/xkb/symbols/apl 94share/X11/xkb/symbols/apl
95share/X11/xkb/symbols/ara 95share/X11/xkb/symbols/ara
96share/X11/xkb/symbols/at 96share/X11/xkb/symbols/at
97share/X11/xkb/symbols/au 97share/X11/xkb/symbols/au
98share/X11/xkb/symbols/az 98share/X11/xkb/symbols/az
99share/X11/xkb/symbols/ba 99share/X11/xkb/symbols/ba
@@ -112,26 +112,27 @@ share/X11/xkb/symbols/ch @@ -112,26 +112,27 @@ share/X11/xkb/symbols/ch
112share/X11/xkb/symbols/cm 112share/X11/xkb/symbols/cm
113share/X11/xkb/symbols/cn 113share/X11/xkb/symbols/cn
114share/X11/xkb/symbols/compose 114share/X11/xkb/symbols/compose
115share/X11/xkb/symbols/ctrl 115share/X11/xkb/symbols/ctrl
116share/X11/xkb/symbols/cz 116share/X11/xkb/symbols/cz
117share/X11/xkb/symbols/de 117share/X11/xkb/symbols/de
118share/X11/xkb/symbols/digital_vndr/lk 118share/X11/xkb/symbols/digital_vndr/lk
119share/X11/xkb/symbols/digital_vndr/pc 119share/X11/xkb/symbols/digital_vndr/pc
120share/X11/xkb/symbols/digital_vndr/us 120share/X11/xkb/symbols/digital_vndr/us
121share/X11/xkb/symbols/digital_vndr/vt 121share/X11/xkb/symbols/digital_vndr/vt
122share/X11/xkb/symbols/dk 122share/X11/xkb/symbols/dk
123share/X11/xkb/symbols/dz 123share/X11/xkb/symbols/dz
124share/X11/xkb/symbols/ee 124share/X11/xkb/symbols/ee
 125share/X11/xkb/symbols/eg
125share/X11/xkb/symbols/empty 126share/X11/xkb/symbols/empty
126share/X11/xkb/symbols/epo 127share/X11/xkb/symbols/epo
127share/X11/xkb/symbols/es 128share/X11/xkb/symbols/es
128share/X11/xkb/symbols/et 129share/X11/xkb/symbols/et
129share/X11/xkb/symbols/eu 130share/X11/xkb/symbols/eu
130share/X11/xkb/symbols/eurosign 131share/X11/xkb/symbols/eurosign
131share/X11/xkb/symbols/fi 132share/X11/xkb/symbols/fi
132share/X11/xkb/symbols/fo 133share/X11/xkb/symbols/fo
133share/X11/xkb/symbols/fr 134share/X11/xkb/symbols/fr
134share/X11/xkb/symbols/fujitsu_vndr/jp 135share/X11/xkb/symbols/fujitsu_vndr/jp
135share/X11/xkb/symbols/fujitsu_vndr/us 136share/X11/xkb/symbols/fujitsu_vndr/us
136share/X11/xkb/symbols/gb 137share/X11/xkb/symbols/gb
137share/X11/xkb/symbols/ge 138share/X11/xkb/symbols/ge
@@ -143,36 +144,38 @@ share/X11/xkb/symbols/hp_vndr/us @@ -143,36 +144,38 @@ share/X11/xkb/symbols/hp_vndr/us
143share/X11/xkb/symbols/hr 144share/X11/xkb/symbols/hr
144share/X11/xkb/symbols/hu 145share/X11/xkb/symbols/hu
145share/X11/xkb/symbols/id 146share/X11/xkb/symbols/id
146share/X11/xkb/symbols/ie 147share/X11/xkb/symbols/ie
147share/X11/xkb/symbols/il 148share/X11/xkb/symbols/il
148share/X11/xkb/symbols/in 149share/X11/xkb/symbols/in
149share/X11/xkb/symbols/inet 150share/X11/xkb/symbols/inet
150share/X11/xkb/symbols/iq 151share/X11/xkb/symbols/iq
151share/X11/xkb/symbols/ir 152share/X11/xkb/symbols/ir
152share/X11/xkb/symbols/is 153share/X11/xkb/symbols/is
153share/X11/xkb/symbols/it 154share/X11/xkb/symbols/it
154share/X11/xkb/symbols/jolla_vndr/sbj 155share/X11/xkb/symbols/jolla_vndr/sbj
155share/X11/xkb/symbols/jp 156share/X11/xkb/symbols/jp
 157share/X11/xkb/symbols/jv
156share/X11/xkb/symbols/ke 158share/X11/xkb/symbols/ke
157share/X11/xkb/symbols/keypad 159share/X11/xkb/symbols/keypad
158share/X11/xkb/symbols/kg 160share/X11/xkb/symbols/kg
159share/X11/xkb/symbols/kh 161share/X11/xkb/symbols/kh
160share/X11/xkb/symbols/kpdl 162share/X11/xkb/symbols/kpdl
161share/X11/xkb/symbols/kr 163share/X11/xkb/symbols/kr
162share/X11/xkb/symbols/kz 164share/X11/xkb/symbols/kz
163share/X11/xkb/symbols/la 165share/X11/xkb/symbols/la
164share/X11/xkb/symbols/latam 166share/X11/xkb/symbols/latam
165share/X11/xkb/symbols/latin 167share/X11/xkb/symbols/latin
 168share/X11/xkb/symbols/level2
166share/X11/xkb/symbols/level3 169share/X11/xkb/symbols/level3
167share/X11/xkb/symbols/level5 170share/X11/xkb/symbols/level5
168share/X11/xkb/symbols/lk 171share/X11/xkb/symbols/lk
169share/X11/xkb/symbols/lt 172share/X11/xkb/symbols/lt
170share/X11/xkb/symbols/lv 173share/X11/xkb/symbols/lv
171share/X11/xkb/symbols/ma 174share/X11/xkb/symbols/ma
172share/X11/xkb/symbols/macintosh_vndr/apple 175share/X11/xkb/symbols/macintosh_vndr/apple
173share/X11/xkb/symbols/macintosh_vndr/ch 176share/X11/xkb/symbols/macintosh_vndr/ch
174share/X11/xkb/symbols/macintosh_vndr/de 177share/X11/xkb/symbols/macintosh_vndr/de
175share/X11/xkb/symbols/macintosh_vndr/dk 178share/X11/xkb/symbols/macintosh_vndr/dk
176share/X11/xkb/symbols/macintosh_vndr/fi 179share/X11/xkb/symbols/macintosh_vndr/fi
177share/X11/xkb/symbols/macintosh_vndr/fr 180share/X11/xkb/symbols/macintosh_vndr/fr
178share/X11/xkb/symbols/macintosh_vndr/gb 181share/X11/xkb/symbols/macintosh_vndr/gb
cvs diff -r1.31 -r1.32 pkgsrc/x11/xkeyboard-config/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/xkeyboard-config/distinfo 2019/11/13 22:07:02 1.31
+++ pkgsrc/x11/xkeyboard-config/distinfo 2021/07/15 10:56:21 1.32
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.31 2019/11/13 22:07:02 wiz Exp $ 1$NetBSD: distinfo,v 1.32 2021/07/15 10:56:21 wiz Exp $
2 2
3SHA1 (xkeyboard-config-2.28.tar.bz2) = f521cd49ab04f54778779dddc68e1771de2e8fbb 3SHA1 (xkeyboard-config-2.32.tar.bz2) = 68e2eea28c0511bfa828f5837815329e5f227c93
4RMD160 (xkeyboard-config-2.28.tar.bz2) = 64ccc7259e64e6134a3450b7d9fbdb230132f51b 4RMD160 (xkeyboard-config-2.32.tar.bz2) = b11990316315d18b1d628cb60148165283044d1a
5SHA512 (xkeyboard-config-2.28.tar.bz2) = be38e61a7d3a1c03f9dc92fed5aada65fdb8b42272e874e01156a39de07f2a7c81846e9ba449aeb95661587f8d05217d549a1315ee0dd92facbb6158362e68ae 5SHA512 (xkeyboard-config-2.32.tar.bz2) = c082a86efcf69ab50454875686b9b4c388cf48002de3728331de3c09c1349a38c9b9ad8ecace2215061c0c775e59c3dd230fffe3f24db63790aa71dc8eff8dea
6Size (xkeyboard-config-2.28.tar.bz2) = 1682987 bytes 6Size (xkeyboard-config-2.32.tar.bz2) = 1742570 bytes