From 2c74828bd34aac882ba7080105c2f02c742680e0 Mon Sep 17 00:00:00 2001
From: waddlesplash <waddlesplash@gmail.com>
Date: Wed, 25 Jul 2018 18:15:16 -0400
Subject: [PATCH] xorgproto: CONFLICTS with the individual protos.

---
 x11-proto/xorgproto/xorgproto-2018.4.recipe | 35 ++++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/x11-proto/xorgproto/xorgproto-2018.4.recipe b/x11-proto/xorgproto/xorgproto-2018.4.recipe
index c60a7bbc1..59dc6aa46 100644
--- a/x11-proto/xorgproto/xorgproto-2018.4.recipe
+++ b/x11-proto/xorgproto/xorgproto-2018.4.recipe
@@ -8,7 +8,7 @@ COPYRIGHT="1991 Oracle and/or its affiliates. All rights reserved.
 	1989 Hewlett-Packard Company.
 	1999 The XFree86 Project Inc."
 LICENSE="MIT (no promotion)"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://xorg.freedesktop.org/archive/individual/proto/xorgproto-$portVersion.tar.bz2"
 CHECKSUM_SHA256="fee885e0512899ea5280c593fdb2735beb1693ad170c22ebcc844470eec415a0"
 PATCHES="xorgproto-$portVersion.patchset"
@@ -52,6 +52,39 @@ PROVIDES="
 REQUIRES="
 	haiku
 	"
+CONFLICTS="
+	applewmproto
+	bigreqsproto
+	compositeproto
+	damageproto
+	dmxproto
+	dri2proto
+	dri3proto
+	fixesproto
+	fontsproto
+	glproto
+	inputproto
+	kbproto
+	presentproto
+	randrproto
+	recordproto
+	renderproto
+	resourceproto
+	scrnsaverproto
+	trapproto
+	videoproto
+	windowswmproto
+	xcmiscproto
+	xextproto
+	xf86bigfontproto
+	xf86dgaproto
+	xf86driproto
+	xf86miscproto
+	xf86vidmodeproto
+	xineramaproto
+	xproto
+	xproxymngproto
+	"
 
 BUILD_REQUIRES="
 	haiku_devel