From 604455e58290ef83fd11e0b100a74b0615927a32 Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Sat, 11 Aug 2018 10:27:18 +0200
Subject: [PATCH] libX11, use correct REQUIRES_devel

---
 x11-libs/libx11/libx11-1.6.5.recipe | 36 ++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/x11-libs/libx11/libx11-1.6.5.recipe b/x11-libs/libx11/libx11-1.6.5.recipe
index 1e88cf23d..123b21593 100644
--- a/x11-libs/libx11/libx11-1.6.5.recipe
+++ b/x11-libs/libx11/libx11-1.6.5.recipe
@@ -66,10 +66,11 @@ COPYRIGHT="2003-2006,2008 Jamey Sharp, Josh Triplett
 	"
 # TODO: check all the licenses in the COPYING file in the next century.
 LICENSE="MIT"
-REVISION="6"
+REVISION="7"
 SOURCE_URI="https://www.x.org/releases/individual/lib/libX11-$portVersion.tar.bz2"
 CHECKSUM_SHA256="4d3890db2ba225ba8c55ca63c6409c1ebb078a2806de59fb16342768ae63435d"
 SOURCE_DIR="libX11-$portVersion"
+# TODO: fix the remaining xmlto conversions
 PATCHES="libx11-$portVersion.patchset"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
@@ -79,33 +80,38 @@ SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
 	libx11$secondaryArchSuffix = $portVersion
-	lib:libx11$secondaryArchSuffix = 6.3.0 compat >= 6
-	lib:libx11_xcb$secondaryArchSuffix = 1.0.0 compat >= 1
+	lib:libX11$secondaryArchSuffix = 6.3.0 compat >= 6
+	lib:libX11_xcb$secondaryArchSuffix = 1.0.0 compat >= 1
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
-	lib:libxcb$secondaryArchSuffix
-	lib:libxau$secondaryArchSuffix
+	lib:libXau$secondaryArchSuffix
+	lib:libXcb$secondaryArchSuffix
+	lib:libXdmcp$secondaryArchSuffix
 	"
 
 PROVIDES_devel="
 	libx11${secondaryArchSuffix}_devel = $portVersion
-	devel:libx11$secondaryArchSuffix = 6.3.0 compat >= 6
-	devel:libx11_xcb$secondaryArchSuffix = 1.0.0 compat >= 1
+	devel:libX11$secondaryArchSuffix = 6.3.0 compat >= 6
+	devel:libX11_xcb$secondaryArchSuffix = 1.0.0 compat >= 1
 	"
 REQUIRES_devel="
 	libx11$secondaryArchSuffix == $portVersion base
+	devel:kbproto
+	devel:libXcb$secondaryArchSuffix
+	devel:xproto
 	"
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	#docbook_xml_dtd
-	#docbook_xsl_stylesheets
+	docbook_xml_dtd
+	docbook_xsl_stylesheets
 	devel:inputproto
 	devel:kbproto
 	devel:libpthread_stubs
-	devel:libxau$secondaryArchSuffix
-	devel:libxcb$secondaryArchSuffix
+	devel:libXau$secondaryArchSuffix
+	devel:libXcb$secondaryArchSuffix
+	devel:libXdmcp$secondaryArchSuffix
 	devel:util_macros
 	devel:xcb_proto
 	devel:xextproto
@@ -119,8 +125,8 @@ BUILD_PREREQUIRES="
 	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
-	#cmd:xmlto
-	#cmd:xsltproc
+	cmd:xmlto
+	cmd:xsltproc
 	"
 
 defineDebugInfoPackage libx11$secondaryArchSuffix \
@@ -138,6 +144,8 @@ BUILD()
 INSTALL()
 {
 	make install-strip
+	install -d -m 755 "$docDir"
+	install -m 644 -t "$docDir" README
 
 	rm -f $libDir/lib*.la
 
@@ -148,7 +156,7 @@ INSTALL()
 	fixPkgconfig
 
 	if [ -n "$secondaryArchSuffix" ]; then
-		rm -rf $documentationDir
+		rm -rf $manDir
 		maybe_manDir_man3=
 	else
 		maybe_manDir_man3=$manDir/man3