Index: head/x11/xkeyboard-config/Makefile =================================================================== --- head/x11/xkeyboard-config/Makefile (revision 530220) +++ head/x11/xkeyboard-config/Makefile (revision 530221) @@ -1,48 +1,47 @@ # $FreeBSD$ PORTNAME= xkeyboard-config -PORTVERSION= 2.27 +PORTVERSION= 2.29 CATEGORIES= x11 -MASTER_SITES= XORG/individual/${XORG_CAT}/${PORTNAME} +MASTER_SITES= XORG/individual/data/${PORTNAME} MAINTAINER= x11@FreeBSD.org COMMENT= X Keyboard Configuration Database LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= xkbcomp:x11/xkbcomp -USES= gmake gnome localbase pathfix perl5 xorg-cat:data +USES= gmake gnome localbase pathfix perl5 python:3.5+,build \ + shebangfix xorg-cat:data NO_ARCH= yes USE_GNOME= libxslt:build USE_PERL5= build +SHEBANG_FILES= rules/merge.py \ + rules/compat/map-variants.py CONFIGURE_ARGS= --with-xkb-base=${PREFIX}/share/X11/xkb \ --with-xkb-rules-symlink=xorg OPTIONS_DEFINE= ETERSOFT ETERSOFT_DESC= Add pre-1918 Russian letters to typographic layout ETERSOFT_EXTRA_PATCHES= ${FILESDIR}/etersoft-patch-symbols-typo .include # !nls case doesn't work correctly, comment it out. #.if ${PORT_OPTIONS:MNLS} USES+= gettext-tools iconv PLIST_SUB+= NLS="" #.else #CONFIGURE_ARGS+=--disable-nls #PLIST_SUB+= NLS="@comment " #.endif - -post-patch: - @${REINPLACE_CMD} -e 's|/bin/bash|/bin/sh|g' -e 's|==|=|g' \ - ${WRKSRC}/rules/merge.sh post-install: @${MKDIR} ${STAGEDIR}/var/lib/xkb @${LN} -sf /var/lib/xkb ${STAGEDIR}${PREFIX}/share/X11/xkb/compiled .include Index: head/x11/xkeyboard-config/distinfo =================================================================== --- head/x11/xkeyboard-config/distinfo (revision 530220) +++ head/x11/xkeyboard-config/distinfo (revision 530221) @@ -1,3 +1,3 @@ -TIMESTAMP = 1560370074 -SHA256 (xorg/data/xkeyboard-config-2.27.tar.bz2) = 690daec8fea63526c07620c90e6f3f10aae34e94b6db6e30906173480721901f -SIZE (xorg/data/xkeyboard-config-2.27.tar.bz2) = 1664454 +TIMESTAMP = 1585258061 +SHA256 (xorg/data/xkeyboard-config-2.29.tar.bz2) = 1d4175278bf06000683656763a8b1d3282c61a314b6db41260c8efe92d621802 +SIZE (xorg/data/xkeyboard-config-2.29.tar.bz2) = 1707176 Index: head/x11/xkeyboard-config/files/etersoft-patch-symbols-typo =================================================================== --- head/x11/xkeyboard-config/files/etersoft-patch-symbols-typo (revision 530220) +++ head/x11/xkeyboard-config/files/etersoft-patch-symbols-typo (revision 530221) @@ -1,26 +1,27 @@ Etersoft version of typographic keyboard layout. It removes Yen symbol `¥' (can be easily inserted via "Compose Y =") and adds four letters of Russian orthography that were removed during the reform of 1917-1918. Original upstream bugzilla request: http://bugs.etersoft.ru/show_bug.cgi?id=5466 Description (in Russian) and the picture of keyboard layout: http://kb.etersoft.ru/Типографская_раскладка_Etersoft --- symbols/typo.orig 2015-04-05 00:48:56.000000000 +0200 +++ symbols/typo 2015-10-17 14:23:59.906594000 +0200 -@@ -29,7 +29,10 @@ +@@ -29,8 +29,10 @@ key { [ NoSymbol, NoSymbol, EuroSign, NoSymbol ] }; // "e" key { [ NoSymbol, NoSymbol, registered, NoSymbol ] }; // "r" key { [ NoSymbol, NoSymbol, trademark, NoSymbol ] }; // "t" - key { [ NoSymbol, NoSymbol, yen, NoSymbol ] }; // "y" +- key { [ NoSymbol, NoSymbol, U20B4, NoSymbol ] }; // "u" + key { [ NoSymbol, NoSymbol, U0463, U0462 ] }; + key { [ NoSymbol, NoSymbol, U0475, U0474 ] }; + key { [ NoSymbol, NoSymbol, U0456, U0406 ] }; + key { [ NoSymbol, NoSymbol, U0473, U0472 ] }; key { [ NoSymbol, NoSymbol, acute, doubleacute ] }; // "p" key { [ NoSymbol, NoSymbol, bracketleft, braceleft ] }; // "[" key { [ NoSymbol, NoSymbol, bracketright, braceright ] }; // "]" Index: head/x11/xkeyboard-config/pkg-plist =================================================================== --- head/x11/xkeyboard-config/pkg-plist (revision 530220) +++ head/x11/xkeyboard-config/pkg-plist (revision 530221) @@ -1,337 +1,338 @@ libdata/pkgconfig/xkeyboard-config.pc man/man7/xkeyboard-config.7.gz share/X11/xkb/compat/README share/X11/xkb/compat/accessx share/X11/xkb/compat/basic share/X11/xkb/compat/caps share/X11/xkb/compat/complete share/X11/xkb/compat/iso9995 share/X11/xkb/compat/japan share/X11/xkb/compat/ledcaps +share/X11/xkb/compat/ledcompose share/X11/xkb/compat/lednum share/X11/xkb/compat/ledscroll share/X11/xkb/compat/level5 share/X11/xkb/compat/misc share/X11/xkb/compat/mousekeys share/X11/xkb/compat/olpc share/X11/xkb/compat/pc share/X11/xkb/compat/pc98 share/X11/xkb/compat/xfree86 share/X11/xkb/compat/xtest share/X11/xkb/compiled share/X11/xkb/geometry/README share/X11/xkb/geometry/amiga share/X11/xkb/geometry/ataritt share/X11/xkb/geometry/chicony share/X11/xkb/geometry/dell share/X11/xkb/geometry/digital_vndr/lk share/X11/xkb/geometry/digital_vndr/pc share/X11/xkb/geometry/digital_vndr/unix share/X11/xkb/geometry/everex share/X11/xkb/geometry/fujitsu share/X11/xkb/geometry/hhk share/X11/xkb/geometry/hp share/X11/xkb/geometry/keytronic share/X11/xkb/geometry/kinesis share/X11/xkb/geometry/macintosh share/X11/xkb/geometry/microsoft share/X11/xkb/geometry/nec share/X11/xkb/geometry/nokia share/X11/xkb/geometry/northgate share/X11/xkb/geometry/pc share/X11/xkb/geometry/sanwa share/X11/xkb/geometry/sgi_vndr/O2 share/X11/xkb/geometry/sgi_vndr/indigo share/X11/xkb/geometry/sgi_vndr/indy share/X11/xkb/geometry/sony share/X11/xkb/geometry/steelseries 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 share/X11/xkb/keycodes/README share/X11/xkb/keycodes/aliases share/X11/xkb/keycodes/amiga share/X11/xkb/keycodes/ataritt share/X11/xkb/keycodes/digital_vndr/lk share/X11/xkb/keycodes/digital_vndr/pc share/X11/xkb/keycodes/empty share/X11/xkb/keycodes/evdev share/X11/xkb/keycodes/fujitsu share/X11/xkb/keycodes/hp share/X11/xkb/keycodes/ibm share/X11/xkb/keycodes/jolla share/X11/xkb/keycodes/macintosh share/X11/xkb/keycodes/olpc share/X11/xkb/keycodes/sgi_vndr/indigo share/X11/xkb/keycodes/sgi_vndr/indy share/X11/xkb/keycodes/sgi_vndr/iris share/X11/xkb/keycodes/sony share/X11/xkb/keycodes/sun share/X11/xkb/keycodes/xfree86 share/X11/xkb/keycodes/xfree98 share/X11/xkb/rules/README share/X11/xkb/rules/base share/X11/xkb/rules/base.extras.xml share/X11/xkb/rules/base.lst share/X11/xkb/rules/base.xml share/X11/xkb/rules/evdev share/X11/xkb/rules/evdev.extras.xml share/X11/xkb/rules/evdev.lst share/X11/xkb/rules/evdev.xml -share/X11/xkb/rules/xkb.its share/X11/xkb/rules/xfree98 share/X11/xkb/rules/xkb.dtd share/X11/xkb/rules/xorg share/X11/xkb/rules/xorg.lst share/X11/xkb/rules/xorg.xml share/X11/xkb/symbols/af share/X11/xkb/symbols/al share/X11/xkb/symbols/altwin share/X11/xkb/symbols/am share/X11/xkb/symbols/apl share/X11/xkb/symbols/ara share/X11/xkb/symbols/at share/X11/xkb/symbols/au share/X11/xkb/symbols/az share/X11/xkb/symbols/ba share/X11/xkb/symbols/bd share/X11/xkb/symbols/be share/X11/xkb/symbols/bg share/X11/xkb/symbols/br share/X11/xkb/symbols/brai share/X11/xkb/symbols/bt share/X11/xkb/symbols/bw share/X11/xkb/symbols/by share/X11/xkb/symbols/ca share/X11/xkb/symbols/capslock share/X11/xkb/symbols/cd share/X11/xkb/symbols/ch share/X11/xkb/symbols/cm share/X11/xkb/symbols/cn share/X11/xkb/symbols/compose share/X11/xkb/symbols/ctrl share/X11/xkb/symbols/cz share/X11/xkb/symbols/de share/X11/xkb/symbols/digital_vndr/lk share/X11/xkb/symbols/digital_vndr/pc share/X11/xkb/symbols/digital_vndr/us share/X11/xkb/symbols/digital_vndr/vt share/X11/xkb/symbols/dk share/X11/xkb/symbols/dz share/X11/xkb/symbols/ee share/X11/xkb/symbols/empty share/X11/xkb/symbols/epo share/X11/xkb/symbols/es share/X11/xkb/symbols/et share/X11/xkb/symbols/eu share/X11/xkb/symbols/eurosign share/X11/xkb/symbols/fi share/X11/xkb/symbols/fo share/X11/xkb/symbols/fr share/X11/xkb/symbols/fujitsu_vndr/jp share/X11/xkb/symbols/fujitsu_vndr/us share/X11/xkb/symbols/gb share/X11/xkb/symbols/ge share/X11/xkb/symbols/gh share/X11/xkb/symbols/gn share/X11/xkb/symbols/gr share/X11/xkb/symbols/group share/X11/xkb/symbols/hp_vndr/us share/X11/xkb/symbols/hr share/X11/xkb/symbols/hu share/X11/xkb/symbols/id share/X11/xkb/symbols/ie share/X11/xkb/symbols/il share/X11/xkb/symbols/in share/X11/xkb/symbols/inet share/X11/xkb/symbols/iq share/X11/xkb/symbols/ir share/X11/xkb/symbols/is share/X11/xkb/symbols/it share/X11/xkb/symbols/jolla_vndr/sbj share/X11/xkb/symbols/jp +share/X11/xkb/symbols/jv share/X11/xkb/symbols/ke share/X11/xkb/symbols/keypad share/X11/xkb/symbols/kg share/X11/xkb/symbols/kh share/X11/xkb/symbols/kpdl share/X11/xkb/symbols/kr share/X11/xkb/symbols/kz share/X11/xkb/symbols/la share/X11/xkb/symbols/latam share/X11/xkb/symbols/latin share/X11/xkb/symbols/level3 share/X11/xkb/symbols/level5 share/X11/xkb/symbols/lk share/X11/xkb/symbols/lt share/X11/xkb/symbols/lv share/X11/xkb/symbols/ma share/X11/xkb/symbols/macintosh_vndr/apple share/X11/xkb/symbols/macintosh_vndr/ch share/X11/xkb/symbols/macintosh_vndr/de share/X11/xkb/symbols/macintosh_vndr/dk share/X11/xkb/symbols/macintosh_vndr/fi share/X11/xkb/symbols/macintosh_vndr/fr share/X11/xkb/symbols/macintosh_vndr/gb share/X11/xkb/symbols/macintosh_vndr/is share/X11/xkb/symbols/macintosh_vndr/it share/X11/xkb/symbols/macintosh_vndr/jp share/X11/xkb/symbols/macintosh_vndr/latam share/X11/xkb/symbols/macintosh_vndr/nl share/X11/xkb/symbols/macintosh_vndr/no share/X11/xkb/symbols/macintosh_vndr/pt share/X11/xkb/symbols/macintosh_vndr/se share/X11/xkb/symbols/macintosh_vndr/us share/X11/xkb/symbols/mao share/X11/xkb/symbols/md share/X11/xkb/symbols/me share/X11/xkb/symbols/mk share/X11/xkb/symbols/ml share/X11/xkb/symbols/mm share/X11/xkb/symbols/mn share/X11/xkb/symbols/mt share/X11/xkb/symbols/mv share/X11/xkb/symbols/my share/X11/xkb/symbols/nbsp share/X11/xkb/symbols/nec_vndr/jp share/X11/xkb/symbols/ng share/X11/xkb/symbols/nl share/X11/xkb/symbols/no share/X11/xkb/symbols/nokia_vndr/rx-44 share/X11/xkb/symbols/nokia_vndr/rx-51 share/X11/xkb/symbols/nokia_vndr/su-8w share/X11/xkb/symbols/np share/X11/xkb/symbols/olpc share/X11/xkb/symbols/parens share/X11/xkb/symbols/pc share/X11/xkb/symbols/ph share/X11/xkb/symbols/pk share/X11/xkb/symbols/pl share/X11/xkb/symbols/pt share/X11/xkb/symbols/ro share/X11/xkb/symbols/rs share/X11/xkb/symbols/ru share/X11/xkb/symbols/rupeesign share/X11/xkb/symbols/se share/X11/xkb/symbols/sgi_vndr/jp share/X11/xkb/symbols/sharp_vndr/sl-c3x00 share/X11/xkb/symbols/sharp_vndr/ws003sh share/X11/xkb/symbols/sharp_vndr/ws007sh share/X11/xkb/symbols/sharp_vndr/ws011sh share/X11/xkb/symbols/sharp_vndr/ws020sh share/X11/xkb/symbols/shift share/X11/xkb/symbols/si share/X11/xkb/symbols/sk share/X11/xkb/symbols/sn share/X11/xkb/symbols/sony_vndr/us share/X11/xkb/symbols/srvr_ctrl share/X11/xkb/symbols/sun_vndr/ara share/X11/xkb/symbols/sun_vndr/be share/X11/xkb/symbols/sun_vndr/br share/X11/xkb/symbols/sun_vndr/ca share/X11/xkb/symbols/sun_vndr/ch share/X11/xkb/symbols/sun_vndr/cz share/X11/xkb/symbols/sun_vndr/de share/X11/xkb/symbols/sun_vndr/dk share/X11/xkb/symbols/sun_vndr/ee share/X11/xkb/symbols/sun_vndr/es share/X11/xkb/symbols/sun_vndr/fi share/X11/xkb/symbols/sun_vndr/fr share/X11/xkb/symbols/sun_vndr/gb share/X11/xkb/symbols/sun_vndr/gr share/X11/xkb/symbols/sun_vndr/it share/X11/xkb/symbols/sun_vndr/jp share/X11/xkb/symbols/sun_vndr/kr share/X11/xkb/symbols/sun_vndr/lt share/X11/xkb/symbols/sun_vndr/lv share/X11/xkb/symbols/sun_vndr/nl share/X11/xkb/symbols/sun_vndr/no share/X11/xkb/symbols/sun_vndr/pl share/X11/xkb/symbols/sun_vndr/pt share/X11/xkb/symbols/sun_vndr/ro share/X11/xkb/symbols/sun_vndr/ru share/X11/xkb/symbols/sun_vndr/se share/X11/xkb/symbols/sun_vndr/sk share/X11/xkb/symbols/sun_vndr/solaris share/X11/xkb/symbols/sun_vndr/tr share/X11/xkb/symbols/sun_vndr/tw share/X11/xkb/symbols/sun_vndr/ua share/X11/xkb/symbols/sun_vndr/us share/X11/xkb/symbols/sy share/X11/xkb/symbols/terminate share/X11/xkb/symbols/tg share/X11/xkb/symbols/th share/X11/xkb/symbols/tj share/X11/xkb/symbols/tm share/X11/xkb/symbols/tr share/X11/xkb/symbols/trans share/X11/xkb/symbols/tw share/X11/xkb/symbols/typo share/X11/xkb/symbols/tz share/X11/xkb/symbols/ua share/X11/xkb/symbols/us share/X11/xkb/symbols/uz share/X11/xkb/symbols/vn share/X11/xkb/symbols/xfree68_vndr/amiga share/X11/xkb/symbols/xfree68_vndr/ataritt share/X11/xkb/symbols/za share/X11/xkb/types/README share/X11/xkb/types/basic share/X11/xkb/types/cancel share/X11/xkb/types/caps share/X11/xkb/types/complete share/X11/xkb/types/default share/X11/xkb/types/extra share/X11/xkb/types/iso9995 share/X11/xkb/types/level5 share/X11/xkb/types/mousekeys share/X11/xkb/types/nokia share/X11/xkb/types/numpad share/X11/xkb/types/pc %%NLS%%share/locale/af/LC_MESSAGES/xkeyboard-config.mo %%NLS%%share/locale/az/LC_MESSAGES/xkeyboard-config.mo %%NLS%%share/locale/bg/LC_MESSAGES/xkeyboard-config.mo %%NLS%%share/locale/ca/LC_MESSAGES/xkeyboard-config.mo %%NLS%%share/locale/crh/LC_MESSAGES/xkeyboard-config.mo %%NLS%%share/locale/cs/LC_MESSAGES/xkeyboard-config.mo %%NLS%%share/locale/da/LC_MESSAGES/xkeyboard-config.mo %%NLS%%share/locale/de/LC_MESSAGES/xkeyboard-config.mo %%NLS%%share/locale/el/LC_MESSAGES/xkeyboard-config.mo %%NLS%%share/locale/en_GB/LC_MESSAGES/xkeyboard-config.mo %%NLS%%share/locale/eo/LC_MESSAGES/xkeyboard-config.mo %%NLS%%share/locale/es/LC_MESSAGES/xkeyboard-config.mo %%NLS%%share/locale/fi/LC_MESSAGES/xkeyboard-config.mo %%NLS%%share/locale/fr/LC_MESSAGES/xkeyboard-config.mo %%NLS%%share/locale/fur/LC_MESSAGES/xkeyboard-config.mo %%NLS%%share/locale/gl/LC_MESSAGES/xkeyboard-config.mo %%NLS%%share/locale/hr/LC_MESSAGES/xkeyboard-config.mo %%NLS%%share/locale/hu/LC_MESSAGES/xkeyboard-config.mo %%NLS%%share/locale/id/LC_MESSAGES/xkeyboard-config.mo %%NLS%%share/locale/it/LC_MESSAGES/xkeyboard-config.mo %%NLS%%share/locale/ja/LC_MESSAGES/xkeyboard-config.mo %%NLS%%share/locale/ka/LC_MESSAGES/xkeyboard-config.mo %%NLS%%share/locale/ko/LC_MESSAGES/xkeyboard-config.mo %%NLS%%share/locale/ky/LC_MESSAGES/xkeyboard-config.mo %%NLS%%share/locale/lt/LC_MESSAGES/xkeyboard-config.mo %%NLS%%share/locale/nb/LC_MESSAGES/xkeyboard-config.mo %%NLS%%share/locale/nl/LC_MESSAGES/xkeyboard-config.mo %%NLS%%share/locale/pl/LC_MESSAGES/xkeyboard-config.mo %%NLS%%share/locale/pt/LC_MESSAGES/xkeyboard-config.mo %%NLS%%share/locale/pt_BR/LC_MESSAGES/xkeyboard-config.mo %%NLS%%share/locale/ro/LC_MESSAGES/xkeyboard-config.mo %%NLS%%share/locale/ru/LC_MESSAGES/xkeyboard-config.mo %%NLS%%share/locale/rw/LC_MESSAGES/xkeyboard-config.mo %%NLS%%share/locale/sk/LC_MESSAGES/xkeyboard-config.mo %%NLS%%share/locale/sl/LC_MESSAGES/xkeyboard-config.mo %%NLS%%share/locale/sq/LC_MESSAGES/xkeyboard-config.mo %%NLS%%share/locale/sr/LC_MESSAGES/xkeyboard-config.mo %%NLS%%share/locale/sv/LC_MESSAGES/xkeyboard-config.mo %%NLS%%share/locale/tr/LC_MESSAGES/xkeyboard-config.mo %%NLS%%share/locale/uk/LC_MESSAGES/xkeyboard-config.mo %%NLS%%share/locale/vi/LC_MESSAGES/xkeyboard-config.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/xkeyboard-config.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/xkeyboard-config.mo @dir /var/lib/xkb @dir /var/lib