aboutsummaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorJan Beich <jbeich@FreeBSD.org>2021-03-25 18:58:14 +0000
committerJan Beich <jbeich@FreeBSD.org>2021-03-25 18:58:14 +0000
commit862a720c830ac23e16b2644b91b122ca4aca2dbf (patch)
tree2b06fa007db4a29d9fa17a5da0ca536711de987d /x11
parent79eb8c447447ef8d0ff33e39668c947a53fafbdf (diff)
downloadports-862a720c830ac23e16b2644b91b122ca4aca2dbf.tar.gz
ports-862a720c830ac23e16b2644b91b122ca4aca2dbf.zip
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).
Notes
Notes: svn path=/head/; revision=569221
Diffstat (limited to 'x11')
-rw-r--r--x11/libxcvt/Makefile2
-rw-r--r--x11/libxcvt/pkg-plist4
2 files changed, 2 insertions, 4 deletions
diff --git a/x11/libxcvt/Makefile b/x11/libxcvt/Makefile
index ee2edfbdfbf8..5c1902d71135 100644
--- a/x11/libxcvt/Makefile
+++ b/x11/libxcvt/Makefile
@@ -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
diff --git a/x11/libxcvt/pkg-plist b/x11/libxcvt/pkg-plist
index cf19adbb7a70..20384f802cbe 100644
--- a/x11/libxcvt/pkg-plist
+++ b/x11/libxcvt/pkg-plist
@@ -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