diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2021-03-25 18:58:14 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2021-03-25 18:58:14 +0000 |
| commit | 862a720c830ac23e16b2644b91b122ca4aca2dbf (patch) | |
| tree | 2b06fa007db4a29d9fa17a5da0ca536711de987d /x11-servers | |
| parent | 79eb8c447447ef8d0ff33e39668c947a53fafbdf (diff) | |
| download | ports-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-servers')
| -rw-r--r-- | x11-servers/xorg-server/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile index 638090921b5b..bf56659f4dbd 100644 --- a/x11-servers/xorg-server/Makefile +++ b/x11-servers/xorg-server/Makefile @@ -81,7 +81,6 @@ BUILD_DEPENDS+= libepoxy>0:graphics/libepoxy # only for configure .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 \ |