From owner-svn-ports-all@freebsd.org Wed Apr 1 15:35:55 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 CF2222BEE7C; Wed, 1 Apr 2020 15:35:55 +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) server-signature RSA-PSS (4096 bits) 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 48sqzG4xmFz4G3Q; Wed, 1 Apr 2020 15:35:54 +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 BC99A276BF; Wed, 1 Apr 2020 15:25:36 +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 031FPaP5079882; Wed, 1 Apr 2020 15:25:36 GMT (envelope-from zeising@FreeBSD.org) Received: (from zeising@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 031FPZi0079878; Wed, 1 Apr 2020 15:25:35 GMT (envelope-from zeising@FreeBSD.org) Message-Id: <202004011525.031FPZi0079878@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: zeising set sender to zeising@FreeBSD.org using -f From: Niclas Zeising Date: Wed, 1 Apr 2020 15:25:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r530221 - in head/x11/xkeyboard-config: . files X-SVN-Group: ports-head X-SVN-Commit-Author: zeising X-SVN-Commit-Paths: in head/x11/xkeyboard-config: . files X-SVN-Commit-Revision: 530221 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.29 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: Wed, 01 Apr 2020 15:35:56 -0000 Author: zeising Date: Wed Apr 1 15:25:35 2020 New Revision: 530221 URL: https://svnweb.freebsd.org/changeset/ports/530221 Log: x11/xkeyboard-config: Update to 2.29 Update xkeyboard-config to 2.29 Upstream has switched to use python to generate certan things during build, add a build dependency on on python3.5+. Change MASTER_SITES to actually work now that XORG_CAT is no more, this should fix fetch. Previously it pulled from distcache. Try to fix the optional etersoft symbols patch. Modified: head/x11/xkeyboard-config/Makefile head/x11/xkeyboard-config/distinfo head/x11/xkeyboard-config/files/etersoft-patch-symbols-typo head/x11/xkeyboard-config/pkg-plist Modified: head/x11/xkeyboard-config/Makefile ============================================================================== --- head/x11/xkeyboard-config/Makefile Wed Apr 1 15:08:05 2020 (r530220) +++ head/x11/xkeyboard-config/Makefile Wed Apr 1 15:25:35 2020 (r530221) @@ -1,9 +1,9 @@ # $FreeBSD$ PORTNAME= xkeyboard-config -PORTVERSION= 2.27 +PORTVERSION= 2.29 CATEGORIES= x11 -MASTER_SITES= XORG/individual/${XORG_CAT}/${PORTNAME} +MASTER_SITES= XORG/individual/data/${PORTNAME} MAINTAINER= x11@FreeBSD.org COMMENT= X Keyboard Configuration Database @@ -13,11 +13,14 @@ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= xkbcomp:x11/xkbcomp -USES= gmake gnome localbase pathfix perl5 xorg-cat:data +USES= gmake gnome localbase pathfix perl5 python:3.5+,build \ + shebangfix xorg-cat:data NO_ARCH= yes USE_GNOME= libxslt:build USE_PERL5= build +SHEBANG_FILES= rules/merge.py \ + rules/compat/map-variants.py CONFIGURE_ARGS= --with-xkb-base=${PREFIX}/share/X11/xkb \ --with-xkb-rules-symlink=xorg @@ -36,10 +39,6 @@ PLIST_SUB+= NLS="" #CONFIGURE_ARGS+=--disable-nls #PLIST_SUB+= NLS="@comment " #.endif - -post-patch: - @${REINPLACE_CMD} -e 's|/bin/bash|/bin/sh|g' -e 's|==|=|g' \ - ${WRKSRC}/rules/merge.sh post-install: @${MKDIR} ${STAGEDIR}/var/lib/xkb Modified: head/x11/xkeyboard-config/distinfo ============================================================================== --- head/x11/xkeyboard-config/distinfo Wed Apr 1 15:08:05 2020 (r530220) +++ head/x11/xkeyboard-config/distinfo Wed Apr 1 15:25:35 2020 (r530221) @@ -1,3 +1,3 @@ -TIMESTAMP = 1560370074 -SHA256 (xorg/data/xkeyboard-config-2.27.tar.bz2) = 690daec8fea63526c07620c90e6f3f10aae34e94b6db6e30906173480721901f -SIZE (xorg/data/xkeyboard-config-2.27.tar.bz2) = 1664454 +TIMESTAMP = 1585258061 +SHA256 (xorg/data/xkeyboard-config-2.29.tar.bz2) = 1d4175278bf06000683656763a8b1d3282c61a314b6db41260c8efe92d621802 +SIZE (xorg/data/xkeyboard-config-2.29.tar.bz2) = 1707176 Modified: head/x11/xkeyboard-config/files/etersoft-patch-symbols-typo ============================================================================== --- head/x11/xkeyboard-config/files/etersoft-patch-symbols-typo Wed Apr 1 15:08:05 2020 (r530220) +++ head/x11/xkeyboard-config/files/etersoft-patch-symbols-typo Wed Apr 1 15:25:35 2020 (r530221) @@ -12,11 +12,12 @@ Description (in Russian) and the picture of keyboard l --- symbols/typo.orig 2015-04-05 00:48:56.000000000 +0200 +++ symbols/typo 2015-10-17 14:23:59.906594000 +0200 -@@ -29,7 +29,10 @@ +@@ -29,8 +29,10 @@ key { [ NoSymbol, NoSymbol, EuroSign, NoSymbol ] }; // "e" key { [ NoSymbol, NoSymbol, registered, NoSymbol ] }; // "r" key { [ NoSymbol, NoSymbol, trademark, NoSymbol ] }; // "t" - key { [ NoSymbol, NoSymbol, yen, NoSymbol ] }; // "y" +- key { [ NoSymbol, NoSymbol, U20B4, NoSymbol ] }; // "u" + key { [ NoSymbol, NoSymbol, U0463, U0462 ] }; + key { [ NoSymbol, NoSymbol, U0475, U0474 ] }; + key { [ NoSymbol, NoSymbol, U0456, U0406 ] }; Modified: head/x11/xkeyboard-config/pkg-plist ============================================================================== --- head/x11/xkeyboard-config/pkg-plist Wed Apr 1 15:08:05 2020 (r530220) +++ head/x11/xkeyboard-config/pkg-plist Wed Apr 1 15:25:35 2020 (r530221) @@ -8,6 +8,7 @@ share/X11/xkb/compat/complete share/X11/xkb/compat/iso9995 share/X11/xkb/compat/japan share/X11/xkb/compat/ledcaps +share/X11/xkb/compat/ledcompose share/X11/xkb/compat/lednum share/X11/xkb/compat/ledscroll share/X11/xkb/compat/level5 @@ -80,7 +81,6 @@ share/X11/xkb/rules/evdev share/X11/xkb/rules/evdev.extras.xml share/X11/xkb/rules/evdev.lst share/X11/xkb/rules/evdev.xml -share/X11/xkb/rules/xkb.its share/X11/xkb/rules/xfree98 share/X11/xkb/rules/xkb.dtd share/X11/xkb/rules/xorg @@ -152,6 +152,7 @@ share/X11/xkb/symbols/is share/X11/xkb/symbols/it share/X11/xkb/symbols/jolla_vndr/sbj share/X11/xkb/symbols/jp +share/X11/xkb/symbols/jv share/X11/xkb/symbols/ke share/X11/xkb/symbols/keypad share/X11/xkb/symbols/kg