git: bdcc09175265 - main - x11/libinput: simplify port

From: Adriaan de Groot <adridg_at_FreeBSD.org>
Date: Mon, 11 Oct 2021 14:07:22 UTC
The branch main has been updated by adridg:

URL: https://cgit.FreeBSD.org/ports/commit/?id=bdcc09175265fc4657a5686d68276cde72b3aa55

commit bdcc09175265fc4657a5686d68276cde72b3aa55
Author:     Adriaan de Groot <adridg@FreeBSD.org>
AuthorDate: 2021-10-10 22:59:21 +0000
Commit:     Adriaan de Groot <adridg@FreeBSD.org>
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