svn commit: r542065 - branches/2020Q3/x11/xkeyboard-config
Niclas Zeising
zeising at FreeBSD.org
Sun Jul 12 07:05:21 UTC 2020
Author: zeising
Date: Sun Jul 12 07:05:20 2020
New Revision: 542065
URL: https://svnweb.freebsd.org/changeset/ports/542065
Log:
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)
Modified:
branches/2020Q3/x11/xkeyboard-config/Makefile
Directory Properties:
branches/2020Q3/ (props changed)
Modified: branches/2020Q3/x11/xkeyboard-config/Makefile
==============================================================================
--- branches/2020Q3/x11/xkeyboard-config/Makefile Sun Jul 12 07:02:13 2020 (r542064)
+++ branches/2020Q3/x11/xkeyboard-config/Makefile Sun Jul 12 07:05:20 2020 (r542065)
@@ -2,6 +2,7 @@
PORTNAME= xkeyboard-config
PORTVERSION= 2.29
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= XORG/individual/data/${PORTNAME}
@@ -25,20 +26,15 @@ 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
More information about the svn-ports-all
mailing list