aboutsummaryrefslogtreecommitdiff
path: root/x11/xkeyboard-config
diff options
context:
space:
mode:
authorNiclas Zeising <zeising@FreeBSD.org>2020-07-11 21:02:11 +0000
committerNiclas Zeising <zeising@FreeBSD.org>2020-07-11 21:02:11 +0000
commit9e829012c07818e7b9f0423a981ba7c60b156886 (patch)
tree9e2dfac9899bcf137deb0ec32d941c6b96cd0ba7 /x11/xkeyboard-config
parent542f7ceaf52d496aa6d5c52f614feeac4ec5dc3c (diff)
downloadports-9e829012c07818e7b9f0423a981ba7c60b156886.tar.gz
ports-9e829012c07818e7b9f0423a981ba7c60b156886.zip
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 MFH: 2020Q3 Event: Julu 2020 bugathon
Notes
Notes: svn path=/head/; revision=542055
Diffstat (limited to 'x11/xkeyboard-config')
-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