aboutsummaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorNiclas Zeising <zeising@FreeBSD.org>2020-07-12 07:05:20 +0000
committerNiclas Zeising <zeising@FreeBSD.org>2020-07-12 07:05:20 +0000
commit0e3d17e3710547f14e8814534e82581c7d534c2a (patch)
tree386b42a6c248dee50b96cabab274958e0de35c2c /x11
parentf6c864d3af156cd194aad05a8454ca7fc12f9311 (diff)
downloadports-0e3d17e3710547f14e8814534e82581c7d534c2a.tar.gz
ports-0e3d17e3710547f14e8814534e82581c7d534c2a.zip
MFH: r542055
x11/xkeyboard-config: Add NLS option Add NLS option to x11/xkeyboard-config. This was broken in the past, but is fixed now. PR: 243070 (based on) Submitted by: Andrew Romanenko Event: Julu 2020 bugathon Approved by: ports-secteam (joenum)
Notes
Notes: svn path=/branches/2020Q3/; revision=542065
Diffstat (limited to 'x11')
-rw-r--r--x11/xkeyboard-config/Makefile16
1 files changed, 6 insertions, 10 deletions
diff --git a/x11/xkeyboard-config/Makefile b/x11/xkeyboard-config/Makefile
index d5e8a66fddb5..18109bda5e0e 100644
--- a/x11/xkeyboard-config/Makefile
+++ b/x11/xkeyboard-config/Makefile
@@ -2,6 +2,7 @@
PORTNAME= xkeyboard-config
PORTVERSION= 2.29
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= XORG/individual/data/${PORTNAME}
@@ -25,21 +26,16 @@ SHEBANG_FILES= rules/merge.py \
CONFIGURE_ARGS= --with-xkb-base=${PREFIX}/share/X11/xkb \
--with-xkb-rules-symlink=xorg
-OPTIONS_DEFINE= ETERSOFT
+OPTIONS_DEFINE= ETERSOFT NLS
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
.include <bsd.port.options.mk>
-# !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-install:
@${MKDIR} ${STAGEDIR}/var/lib/xkb
@${LN} -sf /var/lib/xkb ${STAGEDIR}${PREFIX}/share/X11/xkb/compiled