svn commit: r569221 - in head: x11-servers/xorg-server x11/libxcvt

[Jan Beich]

Author: jbeich
Date: Thu Mar 25 18:58:14 2021
New Revision: 569221
URL: https://svnweb.freebsd.org/changeset/ports/569221

Log:
  x11/libxcvt: avoid conflict with xorg-server
  
  Nowadays, kde5 depends on both xorg-server and xwayland-devel.
  Once upstream of both switches to libxcvt and xwayland-devel is
  updated it'd make kde5 uninstallable. Backporting to xorg-server
  is complicated by numerious patch conflicts and autotools.
  
  Stop installing cvt(1) as Xwayland doesn't use xorg.conf(5).

Modified:
  head/x11-servers/xorg-server/Makefile   (contents, props changed)
  head/x11/libxcvt/Makefile   (contents, props changed)
  head/x11/libxcvt/pkg-plist   (contents, props changed)

Modified: head/x11-servers/xorg-server/Makefile
==============================================================================
--- head/x11-servers/xorg-server/Makefile	Thu Mar 25 18:30:04 2021	(r569220)
+++ head/x11-servers/xorg-server/Makefile	Thu Mar 25 18:58:14 2021	(r569221)
@@ -81,7 +81,6 @@ BUILD_DEPENDS+=	libepoxy>0:graphics/libepoxy	# only fo
 .endif
 
 .if ${SLAVE_PORT} == "no"
-CONFLICTS_INSTALL+=	libxcvt # bin/cvt, https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/637
 USE_GL+=	gbm
 USE_XORG+=	pciaccess
 CONFIGURE_ARGS+=--disable-dmx --disable-xephyr --disable-xnest --disable-xvfb \

Modified: head/x11/libxcvt/Makefile
==============================================================================
--- head/x11/libxcvt/Makefile	Thu Mar 25 18:30:04 2021	(r569220)
+++ head/x11/libxcvt/Makefile	Thu Mar 25 18:58:14 2021	(r569221)
@@ -10,8 +10,6 @@ COMMENT=	Calculate VESA CVT mode lines
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-CONFLICTS_INSTALL=	xorg-server # bin/cvt
-
 USES=		meson
 USE_GITLAB=	yes
 GL_SITE=	https://gitlab.freedesktop.org

Modified: head/x11/libxcvt/pkg-plist
==============================================================================
--- head/x11/libxcvt/pkg-plist	Thu Mar 25 18:30:04 2021	(r569220)
+++ head/x11/libxcvt/pkg-plist	Thu Mar 25 18:58:14 2021	(r569221)
@@ -1,6 +1,6 @@
-bin/cvt
+ at comment bin/cvt
 include/libxcvt/libxcvt.h
 include/libxcvt/libxcvt_mode.h
 lib/libxcvt.so
 libdata/pkgconfig/libxcvt.pc
-man/man1/cvt.1.gz
+ at comment man/man1/cvt.1.gz