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

---
 x11-libs/libxft/libxft-2.3.2.recipe | 56 +++++++++++++----------------
 1 file changed, 24 insertions(+), 32 deletions(-)

diff --git a/x11-libs/libxft/libxft-2.3.2.recipe b/x11-libs/libxft/libxft-2.3.2.recipe
index c61d6edfd..f3243c040 100644
--- a/x11-libs/libxft/libxft-2.3.2.recipe
+++ b/x11-libs/libxft/libxft-2.3.2.recipe
@@ -6,7 +6,7 @@ glyph drawing; otherwise, the core X protocol is used."
 HOMEPAGE="https://www.x.org/"
 COPYRIGHT="2000-2003 Keith Packard"
 LICENSE="libXft"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://www.x.org/releases/individual/lib/libXft-$portVersion.tar.bz2"
 CHECKSUM_SHA256="f5a3c824761df351ca91827ac221090943ef28b248573486050de89f4bfcdc4c"
 SOURCE_DIR="libXft-$portVersion"
@@ -19,44 +19,39 @@ libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
 
 PROVIDES="
 	libxft$secondaryArchSuffix = $portVersion
-	lib:libxft$secondaryArchSuffix = $libVersionCompat
+	lib:libXft$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libfontconfig$secondaryArchSuffix
 	lib:libfreetype$secondaryArchSuffix
-	lib:libx11$secondaryArchSuffix
-	lib:libxrender$secondaryArchSuffix
+	lib:libX11$secondaryArchSuffix
+	lib:libXrender$secondaryArchSuffix
 	"
 
 PROVIDES_devel="
 	libxft${secondaryArchSuffix}_devel = $portVersion
-	devel:libxft$secondaryArchSuffix = $libVersionCompat
+	devel:libXft$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	libxft$secondaryArchSuffix == $portVersion base
-	devel:libx11$secondaryArchSuffix
-	devel:libxau$secondaryArchSuffix
-	devel:libxcb$secondaryArchSuffix
+	devel:libfontconfig$secondaryArchSuffix
+	devel:libfreetype$secondaryArchSuffix
+	devel:libXrender$secondaryArchSuffix
+	devel:xproto
 	"
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:kbproto$secondaryArchSuffix
 	devel:libfontconfig$secondaryArchSuffix
-	devel:libpthread_stubs$secondaryArchSuffix
-	devel:libx11$secondaryArchSuffix
-	devel:libxrender$secondaryArchSuffix
-	devel:renderproto$secondaryArchSuffix
-	devel:util_macros$secondaryArchSuffix
+	devel:libfreetype$secondaryArchSuffix
+	devel:libX11$secondaryArchSuffix
+	devel:libXrender$secondaryArchSuffix
+	devel:util_macros
 	"
 BUILD_PREREQUIRES="
-	cmd:autoconf
-	cmd:automake
-	cmd:autoreconf
+	cmd:awk
 	cmd:gcc$secondaryArchSuffix
-	cmd:ld$secondaryArchSuffix
-	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
 	"
@@ -66,7 +61,6 @@ defineDebugInfoPackage libxft$secondaryArchSuffix \
 
 BUILD()
 {
-	autoreconf -i
 	runConfigure ./configure
 	make $jobArgs
 }
@@ -75,25 +69,23 @@ INSTALL()
 {
 	make install
 
+	if [ -z "$secondaryArchSuffix" ]; then
+		install -m 0755 -d "$developDocDir"
+		install -m 0644 -t "$developDocDir" README
+		maybe_manDir="$manDir"
+	else
+		rm -rf "$manDir"
+		rm -rf "$developDir/documentation"
+		maybe_manDir=
+	fi
+
 	# remove libtool library file
 	rm -f "$libDir"/libXft.la
 
 	prepareInstalledDevelLib libXft
 	fixPkgconfig
 
-	if [ -n "$secondaryArchSuffix" ]; then
-		rm -rf "$documentationDir"
-		maybe_manDir=
-	else
-		maybe_manDir="$manDir"
-	fi
-
 	packageEntries devel \
 		"$developDir" \
 		${maybe_manDir:+"$maybe_manDir"}
 }
-
-TEST()
-{
-	make check
-}