Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 11 Jul 2020 17:45:18 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r541999 - head/x11/libxkbcommon
Message-ID:  <202007111745.06BHjIGU023856@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <bsd.port.pre.mk>
 

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



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