From owner-svn-ports-all@freebsd.org Sat Jul 11 21:02:12 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 66B673713E0; Sat, 11 Jul 2020 21:02:12 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4B42R827zSz4c9J; Sat, 11 Jul 2020 21:02:12 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2DB3F1971F; Sat, 11 Jul 2020 21:02:12 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 06BL2C2Y054868; Sat, 11 Jul 2020 21:02:12 GMT (envelope-from zeising@FreeBSD.org) Received: (from zeising@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 06BL2CCw054867; Sat, 11 Jul 2020 21:02:12 GMT (envelope-from zeising@FreeBSD.org) Message-Id: <202007112102.06BL2CCw054867@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: zeising set sender to zeising@FreeBSD.org using -f From: Niclas Zeising Date: Sat, 11 Jul 2020 21:02:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r542055 - head/x11/xkeyboard-config X-SVN-Group: ports-head X-SVN-Commit-Author: zeising X-SVN-Commit-Paths: head/x11/xkeyboard-config X-SVN-Commit-Revision: 542055 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 Jul 2020 21:02:12 -0000 Author: zeising Date: Sat Jul 11 21:02:11 2020 New Revision: 542055 URL: https://svnweb.freebsd.org/changeset/ports/542055 Log: 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 Modified: head/x11/xkeyboard-config/Makefile Modified: head/x11/xkeyboard-config/Makefile ============================================================================== --- head/x11/xkeyboard-config/Makefile Sat Jul 11 20:57:41 2020 (r542054) +++ head/x11/xkeyboard-config/Makefile Sat Jul 11 21:02:11 2020 (r542055) @@ -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 - -# !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