From nobody Mon Oct 11 14:07:22 2021 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 6561F17E53E8; Mon, 11 Oct 2021 14:07:22 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HSgbZ2TB1z4nKb; Mon, 11 Oct 2021 14:07:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3513C2258A; Mon, 11 Oct 2021 14:07:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 19BE7M3u095858; Mon, 11 Oct 2021 14:07:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19BE7M3N095857; Mon, 11 Oct 2021 14:07:22 GMT (envelope-from git) Date: Mon, 11 Oct 2021 14:07:22 GMT Message-Id: <202110111407.19BE7M3N095857@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Adriaan de Groot Subject: git: bdcc09175265 - main - x11/libinput: simplify port List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adridg X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bdcc09175265fc4657a5686d68276cde72b3aa55 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by adridg: URL: https://cgit.FreeBSD.org/ports/commit/?id=bdcc09175265fc4657a5686d68276cde72b3aa55 commit bdcc09175265fc4657a5686d68276cde72b3aa55 Author: Adriaan de Groot AuthorDate: 2021-10-10 22:59:21 +0000 Commit: Adriaan de Groot CommitDate: 2021-10-11 14:07:20 +0000 x11/libinput: simplify port - drop unnecessary OLD_CMD (this is one of the standard replacements, at least in combination with allowing all current Pythons) - don't add to MESON_ARGS, assign instead (they start out unset) - allow all relevant Pythons (any of the supported Python 3 versions) - use HTTPs by default (the http link redirects there anyway) - shebang all the Python scripts, even the ones not actually installed. --- x11/libinput/Makefile | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/x11/libinput/Makefile b/x11/libinput/Makefile index 5bdf3860571b..3a9b7954e3f2 100644 --- a/x11/libinput/Makefile +++ b/x11/libinput/Makefile @@ -1,7 +1,8 @@ PORTNAME= libinput -PORTVERSION= 1.19.1 +DISTVERSION= 1.19.1 +PORTREVISION= 1 CATEGORIES= x11 -MASTER_SITES= http://freedesktop.org/software/${PORTNAME}/ +MASTER_SITES= https://freedesktop.org/software/${PORTNAME}/ MAINTAINER= x11@FreeBSD.org COMMENT= Generic input library @@ -16,12 +17,11 @@ LIB_DEPENDS= libevdev.so:devel/libevdev \ libudev.so:devel/libudev-devd \ libmtdev.so:devel/libmtdev -USES= localbase meson pkgconfig python:3.4+,run shebangfix tar:xz +USES= localbase meson pkgconfig python:run shebangfix tar:xz USE_LDCONFIG= yes -MESON_ARGS+= -Ddocumentation=false -Dtests=false +MESON_ARGS= -Ddocumentation=false -Dtests=false -python_OLD_CMD= "/usr/bin/env python3" SHEBANG_FILES= tools/libinput-analyze-per-slot-delta.py \ tools/libinput-analyze-recording.py \ tools/libinput-analyze-touch-down-state.py \ @@ -31,6 +31,10 @@ SHEBANG_FILES= tools/libinput-analyze-per-slot-delta.py \ tools/libinput-measure-touchpad-size.py \ tools/libinput-measure-touchpad-tap.py \ tools/libinput-replay.py +# The following files are not installed, but might be +# run as part of the test suite. +SHEBANG_FILES+= tools/test_tool_option_parsing.py \ + tools/libinput-record-verify-yaml.py OPTIONS_DEFINE= DEBUG_GUI LIBWACOM OPTIONS_DEFAULT=LIBWACOM