From owner-svn-ports-all@freebsd.org Thu Mar 25 18:58:15 2021 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 102A45C7C6C; Thu, 25 Mar 2021 18:58:15 +0000 (UTC) (envelope-from jbeich@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 4F5vWV73bSz4WkC; Thu, 25 Mar 2021 18:58:14 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E482A42E6; Thu, 25 Mar 2021 18:58:14 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 12PIwErM091560; Thu, 25 Mar 2021 18:58:14 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 12PIwEcC091558; Thu, 25 Mar 2021 18:58:14 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202103251858.12PIwEcC091558@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Thu, 25 Mar 2021 18:58:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r569221 - in head: x11-servers/xorg-server x11/libxcvt X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in head: x11-servers/xorg-server x11/libxcvt X-SVN-Commit-Revision: 569221 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Mar 2021 18:58:15 -0000 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 +@comment bin/cvt include/libxcvt/libxcvt.h include/libxcvt/libxcvt_mode.h lib/libxcvt.so libdata/pkgconfig/libxcvt.pc -man/man1/cvt.1.gz +@comment man/man1/cvt.1.gz