diff --git a/x11/xkeyboard-config/Makefile b/x11/xkeyboard-config/Makefile --- a/x11/xkeyboard-config/Makefile +++ b/x11/xkeyboard-config/Makefile @@ -1,8 +1,9 @@ PORTNAME= xkeyboard-config -DISTVERSION= 2.34 +DISTVERSION= 2.40 PORTREVISION= 2 CATEGORIES= x11 MASTER_SITES= XORG/individual/data/${PORTNAME} +EXTRACT_SUFX= .tar.xz MAINTAINER= x11@FreeBSD.org COMMENT= X Keyboard Configuration Database @@ -11,8 +12,8 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -USES= gmake gnome localbase pathfix perl5 python:build \ - shebangfix xorg-cat:data +USES= meson gnome localbase pathfix perl5 python:build \ + shebangfix gettext-tools iconv NO_ARCH= yes USE_GNOME= libxslt:build @@ -20,16 +21,14 @@ SHEBANG_FILES= rules/merge.py \ rules/compat/map-variants.py -CONFIGURE_ARGS= --with-xkb-base=${PREFIX}/share/X11/xkb \ - --with-xkb-rules-symlink=xorg +MESON_ARGS= -Dxkb-base=${PREFIX}/share/X11/xkb \ + -Dxorg-rules-symlinks=true -OPTIONS_DEFINE= ETERSOFT NLS X11 +OPTIONS_DEFINE= ETERSOFT X11 OPTIONS_DEFAULT=X11 ETERSOFT_DESC= Add pre-1918 Russian letters to typographic layout OPTIONS_SUB= yes -NLS_CONFIGURE_ENABLE= nls -NLS_USES= gettext-tools iconv ETERSOFT_EXTRA_PATCHES= ${FILESDIR}/etersoft-patch-symbols-typo X11_BUILD_DEPENDS= xkbcomp:x11/xkbcomp X11_CONFIGURE_OFF= --disable-runtime-deps diff --git a/x11/xkeyboard-config/distinfo b/x11/xkeyboard-config/distinfo --- a/x11/xkeyboard-config/distinfo +++ b/x11/xkeyboard-config/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1635635692 -SHA256 (xorg/data/xkeyboard-config-2.34.tar.bz2) = b321d27686ee7e6610ffe7b56e28d5bbf60625a1f595124cd320c0caa717b8ce -SIZE (xorg/data/xkeyboard-config-2.34.tar.bz2) = 1763558 +TIMESTAMP = 1697912466 +SHA256 (xkeyboard-config-2.40.tar.xz) = 7a3dba1bec7dc7191432da021242d17c9cf6c89690e6c57b0de048ff8c9d2ae3 +SIZE (xkeyboard-config-2.40.tar.xz) = 893584 diff --git a/x11/xkeyboard-config/pkg-plist b/x11/xkeyboard-config/pkg-plist --- a/x11/xkeyboard-config/pkg-plist +++ b/x11/xkeyboard-config/pkg-plist @@ -1,4 +1,3 @@ -libdata/pkgconfig/xkeyboard-config.pc man/man7/xkeyboard-config.7.gz share/X11/xkb/compat/README share/X11/xkb/compat/accessx @@ -90,6 +89,7 @@ share/X11/xkb/symbols/al share/X11/xkb/symbols/altwin share/X11/xkb/symbols/am +share/X11/xkb/symbols/ancient share/X11/xkb/symbols/apl share/X11/xkb/symbols/ara share/X11/xkb/symbols/at @@ -99,6 +99,7 @@ share/X11/xkb/symbols/bd share/X11/xkb/symbols/be share/X11/xkb/symbols/bg +share/X11/xkb/symbols/bqn share/X11/xkb/symbols/br share/X11/xkb/symbols/brai share/X11/xkb/symbols/bt @@ -153,7 +154,6 @@ 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 @@ -187,7 +187,6 @@ 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 @@ -293,48 +292,48 @@ 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 +share/locale/af/LC_MESSAGES/xkeyboard-config.mo +share/locale/az/LC_MESSAGES/xkeyboard-config.mo +share/locale/bg/LC_MESSAGES/xkeyboard-config.mo +share/locale/ca/LC_MESSAGES/xkeyboard-config.mo +share/locale/crh/LC_MESSAGES/xkeyboard-config.mo +share/locale/cs/LC_MESSAGES/xkeyboard-config.mo +share/locale/da/LC_MESSAGES/xkeyboard-config.mo +share/locale/de/LC_MESSAGES/xkeyboard-config.mo +share/locale/el/LC_MESSAGES/xkeyboard-config.mo +share/locale/en_GB/LC_MESSAGES/xkeyboard-config.mo +share/locale/eo/LC_MESSAGES/xkeyboard-config.mo +share/locale/es/LC_MESSAGES/xkeyboard-config.mo +share/locale/fi/LC_MESSAGES/xkeyboard-config.mo +share/locale/fr/LC_MESSAGES/xkeyboard-config.mo +share/locale/fur/LC_MESSAGES/xkeyboard-config.mo +share/locale/gl/LC_MESSAGES/xkeyboard-config.mo +share/locale/hr/LC_MESSAGES/xkeyboard-config.mo +share/locale/hu/LC_MESSAGES/xkeyboard-config.mo +share/locale/id/LC_MESSAGES/xkeyboard-config.mo +share/locale/it/LC_MESSAGES/xkeyboard-config.mo +share/locale/ja/LC_MESSAGES/xkeyboard-config.mo +share/locale/ka/LC_MESSAGES/xkeyboard-config.mo +share/locale/ko/LC_MESSAGES/xkeyboard-config.mo +share/locale/ky/LC_MESSAGES/xkeyboard-config.mo +share/locale/lt/LC_MESSAGES/xkeyboard-config.mo +share/locale/nb/LC_MESSAGES/xkeyboard-config.mo +share/locale/nl/LC_MESSAGES/xkeyboard-config.mo +share/locale/pl/LC_MESSAGES/xkeyboard-config.mo +share/locale/pt/LC_MESSAGES/xkeyboard-config.mo +share/locale/pt_BR/LC_MESSAGES/xkeyboard-config.mo +share/locale/ro/LC_MESSAGES/xkeyboard-config.mo +share/locale/ru/LC_MESSAGES/xkeyboard-config.mo +share/locale/rw/LC_MESSAGES/xkeyboard-config.mo +share/locale/sk/LC_MESSAGES/xkeyboard-config.mo +share/locale/sl/LC_MESSAGES/xkeyboard-config.mo +share/locale/sq/LC_MESSAGES/xkeyboard-config.mo +share/locale/sr/LC_MESSAGES/xkeyboard-config.mo +share/locale/sv/LC_MESSAGES/xkeyboard-config.mo +share/locale/tr/LC_MESSAGES/xkeyboard-config.mo +share/locale/uk/LC_MESSAGES/xkeyboard-config.mo +share/locale/vi/LC_MESSAGES/xkeyboard-config.mo +share/locale/zh_CN/LC_MESSAGES/xkeyboard-config.mo +share/locale/zh_TW/LC_MESSAGES/xkeyboard-config.mo @dir /var/lib/xkb @dir /var/lib