diff --git a/x11/xkeyboard-config/Makefile b/x11/xkeyboard-config/Makefile index 0f75124106e4..37c36894f0fc 100644 --- a/x11/xkeyboard-config/Makefile +++ b/x11/xkeyboard-config/Makefile @@ -1,43 +1,43 @@ PORTNAME= xkeyboard-config -DISTVERSION= 2.40 +DISTVERSION= 2.41 PORTREVISION= 4 CATEGORIES= x11 MASTER_SITES= XORG/individual/data/${PORTNAME} MAINTAINER= x11@FreeBSD.org COMMENT= X Keyboard Configuration Database WWW= https://freedesktop.org/wiki/Software/XKeyboardConfig/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING USES= meson gnome localbase pathfix perl5 python:build \ shebangfix tar:xz NO_ARCH= yes USE_GNOME= libxslt:build USE_PERL5= build SHEBANG_FILES= rules/merge.py \ rules/compat/map-variants.py MESON_ARGS= -Dxkb-base=${PREFIX}/share/X11/xkb \ -Dxorg-rules-symlinks=true OPTIONS_DEFINE= ETERSOFT NLS X11 OPTIONS_DEFAULT=X11 NLS_USES= gettext-tools iconv NLS_MESON_TRUE= nls ETERSOFT_DESC= Add pre-1918 Russian letters to typographic layout OPTIONS_SUB= yes ETERSOFT_EXTRA_PATCHES= ${FILESDIR}/etersoft-patch-symbols-typo X11_BUILD_DEPENDS= xkbcomp:x11/xkbcomp X11_DESC= XKB keyboard description compiler support .include post-install: @${MKDIR} ${STAGEDIR}/var/lib/xkb @${LN} -sf /var/lib/xkb ${STAGEDIR}${PREFIX}/share/X11/xkb/compiled .include diff --git a/x11/xkeyboard-config/distinfo b/x11/xkeyboard-config/distinfo index 8b118f8120e9..c96b62372210 100644 --- a/x11/xkeyboard-config/distinfo +++ b/x11/xkeyboard-config/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1698603581 -SHA256 (xkeyboard-config-2.40.tar.xz) = 7a3dba1bec7dc7191432da021242d17c9cf6c89690e6c57b0de048ff8c9d2ae3 -SIZE (xkeyboard-config-2.40.tar.xz) = 893584 +TIMESTAMP = 1707131942 +SHA256 (xkeyboard-config-2.41.tar.xz) = f02cd6b957295e0d50236a3db15825256c92f67ef1f73bf1c77a4b179edf728f +SIZE (xkeyboard-config-2.41.tar.xz) = 898404 diff --git a/x11/xkeyboard-config/files/patch-nls b/x11/xkeyboard-config/files/patch-nls deleted file mode 100644 index 91455f5797d7..000000000000 --- a/x11/xkeyboard-config/files/patch-nls +++ /dev/null @@ -1,25 +0,0 @@ ---- meson_options.txt.orig 2023-10-05 22:26:07.000000000 +0300 -+++ meson_options.txt 2023-11-02 21:02:30.219251000 +0200 -@@ -10,3 +10,7 @@ - type: 'boolean', - value: false, - description: 'create "xorg" symlinks to the "base" rules files [default=false]') -+option('nls', -+ type: 'boolean', -+ value: true, -+ description: 'build with native language support (NLS) [default=true]') ---- po/meson.build.orig 2023-10-05 22:26:07.000000000 +0300 -+++ po/meson.build 2023-11-02 21:02:38.562084000 +0200 -@@ -1,5 +1,7 @@ --i18n = import('i18n') --i18n.gettext('xkeyboard-config', preset: 'glib', -- args: ['--keyword=_', -- '--keyword=N_', -- '--its=@0@/rules/xkb.its'.format(meson.source_root())]) -+if get_option('nls') -+ i18n = import('i18n') -+ i18n.gettext('xkeyboard-config', preset: 'glib', -+ args: ['--keyword=_', -+ '--keyword=N_', -+ '--its=@0@/rules/xkb.its'.format(meson.source_root())]) -+endif