From 1198f519dea292ae53f5cd5f63a7f90ea6215c92 Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Wed, 15 Aug 2018 16:44:51 +0200
Subject: [PATCH] libXaw, bump revision, cleanup, fix REQUIRES_devel

---
 x11-libs/libxaw/libxaw-1.0.13.recipe | 53 ++++++++++++++--------------
 1 file changed, 27 insertions(+), 26 deletions(-)

diff --git a/x11-libs/libxaw/libxaw-1.0.13.recipe b/x11-libs/libxaw/libxaw-1.0.13.recipe
index 7cb81c8c5..0d8490e1d 100644
--- a/x11-libs/libxaw/libxaw-1.0.13.recipe
+++ b/x11-libs/libxaw/libxaw-1.0.13.recipe
@@ -10,12 +10,12 @@ COPYRIGHT="1985-1990, 1994, 1998 The Open Group
 	1989 Prentice Hall
 	1985-1989, 1991, 1994 X Consortium"
 LICENSE="MIT"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://www.x.org/releases/individual/lib/libXaw-$portVersion.tar.bz2"
 CHECKSUM_SHA256="8ef8067312571292ccc2bbe94c41109dcf022ea5a4ec71656a83d8cce9edb0cd"
 SOURCE_DIR="libXaw-$portVersion"
 
-ARCHITECTURES="?x86_gcc2 x86 x86_64"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 libVersion6="6.0.1"
@@ -33,7 +33,7 @@ PROVIDES="
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libX11$secondaryArchSuffix
-	lib:libxext$secondaryArchSuffix
+	lib:libXext$secondaryArchSuffix
 	lib:libXmu$secondaryArchSuffix
 	lib:libXpm$secondaryArchSuffix
 	lib:libXt$secondaryArchSuffix
@@ -46,35 +46,34 @@ PROVIDES_devel="
 	"
 REQUIRES_devel="
 	libxaw$secondaryArchSuffix == $portVersion base
+	devel:libX11$secondaryArchSuffix
+	devel:libXext$secondaryArchSuffix
+	devel:libXmu$secondaryArchSuffix
+	devel:libXpm$secondaryArchSuffix
+	devel:libXt$secondaryArchSuffix
+	devel:xproto
 	"
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:kbproto$secondaryArchSuffix
-	devel:libICE$secondaryArchSuffix
-	devel:libpthread_stubs$secondaryArchSuffix
+	docbook_xml_dtd
+	docbook_xsl_stylesheets
 	devel:libX11$secondaryArchSuffix
-	devel:libxext$secondaryArchSuffix
+	devel:libXext$secondaryArchSuffix
 	devel:libXmu$secondaryArchSuffix
 	devel:libXpm$secondaryArchSuffix
 	devel:libXt$secondaryArchSuffix
-	devel:libSM$secondaryArchSuffix
-	devel:xextproto$secondaryArchSuffix
-	devel:xproto$secondaryArchSuffix
+	devel:util_macros
+	devel:xorg_sgml_doctools
 	"
 BUILD_PREREQUIRES="
-	devel:util_macros$secondaryArchSuffix
-	cmd:aclocal
-	cmd:autoconf
-	cmd:automake
-	cmd:autoheader
+	cmd:awk
 	cmd:gcc$secondaryArchSuffix
-	cmd:grep
 	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
-	cmd:makeinfo
 	cmd:pkg_config$secondaryArchSuffix
-	cmd:sed
+	cmd:xmlto
+	cmd:xsltproc
 	"
 
 defineDebugInfoPackage libxaw$secondaryArchSuffix \
@@ -83,7 +82,6 @@ defineDebugInfoPackage libxaw$secondaryArchSuffix \
 
 BUILD()
 {
-	autoreconf -vfi
 	runConfigure --omit-dirs docDir ./configure --docdir="$developDocDir"
 	make $jobArgs
 }
@@ -92,6 +90,15 @@ INSTALL()
 {
 	make install
 
+	if [ -z "$secondaryArchSuffix" ]; then
+		install -m 0644 -t "$developDocDir" README
+		maybe_manDir="$manDir"
+	else
+		rm -rf "$manDir"
+		rm -rf "$developDir/documentation"
+		maybe_manDir=
+	fi
+
 	rm -f $libDir/libXaw*.la
 
 	prepareInstalledDevelLibs \
@@ -103,14 +110,8 @@ INSTALL()
 	ln -s libXaw6.so.$libVersion6 $libDir/libXaw6.so.6
 	ln -s libXaw7.so.$libVersion7 $libDir/libXaw7.so.7
 
-	# fix path in the Xaw(3) man page
-	sed -i \
-		-e "s|$developDocDir|`finddir \
-			B_SYSTEM_DIRECTORY`/$relativeDevelopDocDir|;" \
-		$manDir/man3/Xaw.3
-
 	# devel package
 	packageEntries devel \
 		$developDir \
-		$manDir
+		${maybe_manDir:+"$maybe_manDir"}
 }