Tue Jul 13 12:05:48 2021 UTC ()
modular-xorg-server: note conflict with libxcvt


(wiz)
diff -r1.129 -r1.130 pkgsrc/x11/modular-xorg-server/Makefile
cvs diff -r1.129 -r1.130 pkgsrc/x11/modular-xorg-server/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/modular-xorg-server/Makefile 2020/08/26 10:28:39 1.129
+++ pkgsrc/x11/modular-xorg-server/Makefile 2021/07/13 12:05:48 1.130
@@ -1,22 +1,24 @@ @@ -1,22 +1,24 @@
1# $NetBSD: Makefile,v 1.129 2020/08/26 10:28:39 wiz Exp $ 1# $NetBSD: Makefile,v 1.130 2021/07/13 12:05:48 wiz Exp $
2 2
3DISTNAME= xorg-server-${XORG_VERSION} 3DISTNAME= xorg-server-${XORG_VERSION}
4PKGNAME= modular-${DISTNAME} 4PKGNAME= modular-${DISTNAME}
5 5
6MAINTAINER= pkgsrc-users@NetBSD.org 6MAINTAINER= pkgsrc-users@NetBSD.org
7COMMENT= Modular X11 server from modular X.org 7COMMENT= Modular X11 server from modular X.org
8 8
9SPECIAL_PERMS+= bin/Xorg ${SETUID_ROOT_PERMS} 9SPECIAL_PERMS+= bin/Xorg ${SETUID_ROOT_PERMS}
10 10
11NOT_FOR_PLATFORM= Darwin-*-* 11NOT_FOR_PLATFORM= Darwin-*-*
12 12
 13CONFLICTS+= libxcvt-[0-9]*
 14
13.include "Makefile.common" 15.include "Makefile.common"
14 16
15CONFIGURE_ARGS+= --enable-xorg 17CONFIGURE_ARGS+= --enable-xorg
16CONFIGURE_ARGS+= --disable-xephyr 18CONFIGURE_ARGS+= --disable-xephyr
17CONFIGURE_ARGS+= --disable-xwayland 19CONFIGURE_ARGS+= --disable-xwayland
18CONFIGURE_ARGS+= --disable-kdrive 20CONFIGURE_ARGS+= --disable-kdrive
19 21
20.include "options.mk" 22.include "options.mk"
21 23
22.include "../../mk/bsd.pkg.mk" 24.include "../../mk/bsd.pkg.mk"