From 5940458461de8a0c2bd180ea6eaab461bdb7b925 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Fri, 13 Dec 2013 17:00:34 +0100
Subject: [PATCH] libxau: update recipe and patch

---
 x11-libs/libxau/libxau-1.0.5.recipe        | 47 +++++++++++++++++++---
 x11-libs/libxau/patches/libxau-1.0.5.patch | 18 +++++++--
 2 files changed, 55 insertions(+), 10 deletions(-)

diff --git a/x11-libs/libxau/libxau-1.0.5.recipe b/x11-libs/libxau/libxau-1.0.5.recipe
index 262bf426b..405de17e6 100644
--- a/x11-libs/libxau/libxau-1.0.5.recipe
+++ b/x11-libs/libxau/libxau-1.0.5.recipe
@@ -1,22 +1,57 @@
+SUMMARY="libxau" 
 DESCRIPTION="libxau" 
 HOMEPAGE="http://xorg.freedesktop.org/releases/individual/lib/" 
 SRC_URI="http://xorg.freedesktop.org/releases/individual/lib/libXau-1.0.5.tar.gz"
 CHECKSUM_MD5="1a421d9376f43596fe068ce209a70b84"
 REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="pkgconfig >= 0.23
-        x11-misc/util-macros >= 1.7.0"
+COPYRIGHT="1988, 1993, 1994, 1998  The Open Group"
+LICENSE="MIT (no promotion)"
+
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+PROVIDES="
+	libxau$secondaryArchSuffix = $portVersion
+	lib:libxau$secondaryArchSuffix = $portVersion
+	lib:libXau$secondaryArchSuffix = $portVersion
+	devel:libxau$secondaryArchSuffix = $portVersion
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	xproto$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	devel:xproto$secondaryArchSuffix
+	"
+
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:util_macros$secondaryArchSuffix
+	cmd:autoconf
+	cmd:libtool
+	cmd:aclocal
+	cmd:make
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:pkg_config$secondaryArchSuffix
+	"
+
+SOURCE_DIR="libXau-$portVersion"
+
+PATCHES="libxau-1.0.5.patch"
+
 BUILD()
 {
-	cd libXau-1.0.5
 	libtoolize --force --copy --install
 	autoreconf -i
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
+	runConfigure ./configure
 	make
 }
 
 INSTALL()
 {
-	cd libXau-1.0.5
 	make install
+	prepareInstalledDevelLibs libXau
 }
diff --git a/x11-libs/libxau/patches/libxau-1.0.5.patch b/x11-libs/libxau/patches/libxau-1.0.5.patch
index b131ea47e..7779a6f82 100644
--- a/x11-libs/libxau/patches/libxau-1.0.5.patch
+++ b/x11-libs/libxau/patches/libxau-1.0.5.patch
@@ -1,7 +1,17 @@
-diff -Naur libXau-1.0.5/configure.ac libXau-1.0.5-haiku/configure.ac
---- libXau-1.0.5/configure.ac	2009-08-28 04:34:23.023855104 +0000
-+++ libXau-1.0.5-haiku/configure.ac	2010-04-26 23:21:53.573308928 +0000
-@@ -58,6 +58,9 @@
+diff --git a/configure.ac b/configure.ac
+index c63adcb..0d981c6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -28,7 +28,7 @@ AC_INIT(libXau, 1.0.5, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]
+ AM_INIT_AUTOMAKE([dist-bzip2])
+ AM_MAINTAINER_MODE
+ 
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADER(config.h)
+ 
+ # Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG, XORG_WITH_LINT
+ m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
+@@ -58,6 +58,9 @@ if test "x$xthreads" = "xyes" ; then
      if test "x$mtsafe" = "x" ; then
  	AC_CHECK_LIB(nsl, gethostbyname_r, [mtsafe=yes])
      fi