From c5c72ebe7603cfdb272ed2453061661f7225e6f0 Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Thu, 16 Aug 2018 09:40:08 +0200
Subject: [PATCH] libXcm, bump revision, cleanup, fix REQUIRES_devel

---
 media-libs/libxcm/libxcm-0.5.4.recipe | 36 +++++++++++++++++++--------
 1 file changed, 26 insertions(+), 10 deletions(-)

diff --git a/media-libs/libxcm/libxcm-0.5.4.recipe b/media-libs/libxcm/libxcm-0.5.4.recipe
index 9956052fe..a3bfa4a15 100644
--- a/media-libs/libxcm/libxcm-0.5.4.recipe
+++ b/media-libs/libxcm/libxcm-0.5.4.recipe
@@ -6,12 +6,12 @@ HOMEPAGE="http://www.oyranos.org/libxcm/"
 COPYRIGHT="2008 Tomas Carnecky
 	2008-2010 Kai-Uwe Behrmann"
 LICENSE="MIT"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://github.com/oyranos-cms/libxcm/archive/$portVersion.tar.gz"
 CHECKSUM_SHA256="7d97f168be4f87a5118417d7be764e35a1eb94eac5020003c005f3a97a521cc1"
 SOURCE_FILENAME="libxcm-$portVersion.tar.gz"
 
-ARCHITECTURES="?x86_gcc2 ?x86 x86_64"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 portVersionCompat="$portVersion compat >= 0.5"
@@ -27,6 +27,10 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
+	lib:libX11$secondaryArchSuffix
+	lib:libXfixes$secondaryArchSuffix
+	lib:libXmu$secondaryArchSuffix
+	lib:libXt$secondaryArchSuffix
 	"
 
 PROVIDES_devel="
@@ -38,20 +42,24 @@ PROVIDES_devel="
 	"
 REQUIRES_devel="
 	libxcm$secondaryArchSuffix == $portVersion base
+	devel:libX11$secondaryArchSuffix
+	devel:libXcmX11$secondaryArchSuffix
+	devel:libXcmEDID$secondaryArchSuffix
+	devel:xproto
 	"
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libxfixes$secondaryArchSuffix
-	devel:libxmu$secondaryArchSuffix
-	devel:xextproto$secondaryArchSuffix
+	devel:libX11$secondaryArchSuffix
+	devel:libXfixes$secondaryArchSuffix
+	devel:libXmu$secondaryArchSuffix
+	devel:libXt$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
 	cmd:aclocal
 	cmd:autoconf
-	cmd:automake
+	cmd:awk
 	cmd:gcc$secondaryArchSuffix
-	cmd:ld$secondaryArchSuffix
 	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
@@ -65,8 +73,8 @@ defineDebugInfoPackage libxcm$secondaryArchSuffix \
 
 BUILD()
 {
-	autoreconf -fi
-	runConfigure ./configure
+	autoreconf -vfi
+	runConfigure --omit-dirs docDir ./configure --docdir=$developDocDir
 	make $jobArgs
 }
 
@@ -74,6 +82,14 @@ INSTALL()
 {
 	make install
 
+	if [ -z "$secondaryArchSuffix" ]; then
+		maybe_manDir="$manDir"
+	else
+		rm -rf "$manDir"
+		rm -rf "$developDir/documentation"
+		maybe_manDir=
+	fi
+
 	rm -f "$libDir"/libXcm*.la
 
 	prepareInstalledDevelLibs libXcm libXcmDDC libXcmEDID libXcmX11
@@ -86,5 +102,5 @@ INSTALL()
 	packageEntries devel \
 		"$dataDir"/cmake \
 		"$developDir" \
-		"$manDir"
+		${maybe_manDir:+"$maybe_manDir"}
 }