From owner-svn-ports-head@freebsd.org Sat Jul 11 17:45:18 2020 Return-Path: Delivered-To: svn-ports-head@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 D1CD536A8F0; Sat, 11 Jul 2020 17:45:18 +0000 (UTC) (envelope-from jbeich@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 4B3y3y5Hbzz4GYH; Sat, 11 Jul 2020 17:45:18 +0000 (UTC) (envelope-from jbeich@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 98C8D16D8B; Sat, 11 Jul 2020 17:45:18 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 06BHjI1m023857; Sat, 11 Jul 2020 17:45:18 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 06BHjIGU023856; Sat, 11 Jul 2020 17:45:18 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202007111745.06BHjIGU023856@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sat, 11 Jul 2020 17:45:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r541999 - head/x11/libxkbcommon X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: head/x11/libxkbcommon X-SVN-Commit-Revision: 541999 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 Jul 2020 17:45:18 -0000 Author: jbeich Date: Sat Jul 11 17:45:18 2020 New Revision: 541999 URL: https://svnweb.freebsd.org/changeset/ports/541999 Log: x11/libxkbcommon: make X11 optional PR: 247520 Approved by: zeising Modified: head/x11/libxkbcommon/Makefile (contents, props changed) head/x11/libxkbcommon/pkg-plist (contents, props changed) Modified: head/x11/libxkbcommon/Makefile ============================================================================== --- head/x11/libxkbcommon/Makefile Sat Jul 11 17:26:30 2020 (r541998) +++ head/x11/libxkbcommon/Makefile Sat Jul 11 17:45:18 2020 (r541999) @@ -15,11 +15,18 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= xkeyboard-config>0:x11/xkeyboard-config -USES= bison meson pkgconfig tar:xz xorg -USE_XORG= xcb +USES= bison meson pkgconfig tar:xz MESON_ARGS= -Denable-docs=false \ -Denable-wayland=false \ -Dx-locale-root="${PREFIX}/lib/X11/locale" + +OPTIONS_DEFINE= X11 +OPTIONS_DEFAULT=X11 +OPTIONS_SUB= yes + +X11_USES= xorg +X11_USE= XORG=xcb +X11_MESON_TRUE= enable-x11 .include Modified: head/x11/libxkbcommon/pkg-plist ============================================================================== --- head/x11/libxkbcommon/pkg-plist Sat Jul 11 17:26:30 2020 (r541998) +++ head/x11/libxkbcommon/pkg-plist Sat Jul 11 17:45:18 2020 (r541999) @@ -3,12 +3,12 @@ include/xkbcommon/xkbcommon-compat.h include/xkbcommon/xkbcommon-compose.h include/xkbcommon/xkbcommon-keysyms.h include/xkbcommon/xkbcommon-names.h -include/xkbcommon/xkbcommon-x11.h +%%X11%%include/xkbcommon/xkbcommon-x11.h lib/libxkbcommon.so lib/libxkbcommon.so.0 lib/libxkbcommon.so.0.0.0 -lib/libxkbcommon-x11.so -lib/libxkbcommon-x11.so.0 -lib/libxkbcommon-x11.so.0.0.0 +%%X11%%lib/libxkbcommon-x11.so +%%X11%%lib/libxkbcommon-x11.so.0 +%%X11%%lib/libxkbcommon-x11.so.0.0.0 libdata/pkgconfig/xkbcommon.pc -libdata/pkgconfig/xkbcommon-x11.pc +%%X11%%libdata/pkgconfig/xkbcommon-x11.pc