Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 12 Dec 2020 18:34:03 +0000 (UTC)
From:      Guido Falsi <madpilot@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r557846 - head/sysutils/xfce4-settings
Message-ID:  <202012121834.0BCIY3IA076589@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: madpilot
Date: Sat Dec 12 18:34:03 2020
New Revision: 557846
URL: https://svnweb.freebsd.org/changeset/ports/557846

Log:
  Enable libinput support in xfce4-settings on FreeBSD 12 and 13 via
  option turned on by default.
  
  PR:		251742
  Submitted by:	wulf

Modified:
  head/sysutils/xfce4-settings/Makefile

Modified: head/sysutils/xfce4-settings/Makefile
==============================================================================
--- head/sysutils/xfce4-settings/Makefile	Sat Dec 12 18:32:04 2020	(r557845)
+++ head/sysutils/xfce4-settings/Makefile	Sat Dec 12 18:34:03 2020	(r557846)
@@ -3,6 +3,7 @@
 
 PORTNAME=	xfce4-settings
 PORTVERSION=	4.14.3
+PORTREVISION=	1
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	XFCE
 DIST_SUBDIR=	xfce4
@@ -24,17 +25,20 @@ USE_XFCE=	garcon libexo xfconf
 USE_XORG=	xorgproto x11 xcursor xi xrandr
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-xorg-libinput \
-		--enable-pluggable-dialogs
+CONFIGURE_ARGS=	--enable-pluggable-dialogs
 INSTALLS_ICONS=	yes
 
 PORTSCOUT=	limitw:1,even
 
-OPTIONS_DEFINE=		NOTIFY NLS UPOWER
+OPTIONS_DEFINE=		NOTIFY NLS UPOWER LIBINPUT
 OPTIONS_DEFAULT=	NOTIFY
 OPTIONS_SUB=		yes
+OPTIONS_DEFAULT_FreeBSD_12=	LIBINPUT
+OPTIONS_DEFAULT_FreeBSD_13=	LIBINPUT
+OPTIONS_DEFAULT+=	${OPTIONS_DEFAULT_${OPSYS}_${OSREL:R}}
 
 UPOWER_DESC=		Power management tasks
+LIBINPUT_DESC=		Libinput support
 
 NLS_CONFIGURE_ENABLE=		nls
 NLS_USES=			gettext-runtime
@@ -44,6 +48,9 @@ NOTIFY_LIB_DEPENDS=		libnotify.so:devel/libnotify
 
 UPOWER_CONFIGURE_ENABLE=	upower-glib
 UPOWER_LIB_DEPENDS=		libupower-glib.so:sysutils/upower
+
+LIBINPUT_BUILD_DEPENDS=	${LOCALBASE}/include/xorg/libinput-properties.h:x11-drivers/xf86-input-libinput
+LIBINPUT_CONFIGURE_ENABLE=	xorg-libinput
 
 .if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=	--enable-debug=yes



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202012121834.0BCIY3IA076589>