libXau, bump revision after util-macros changes

x11-libs/libxau/libxau-1.0.5.recipe

@@ -1,59 +0,0 @@
-SUMMARY="X.Org's sample authorization protocol for X"
-DESCRIPTION="This example describes a very simple mechanism for providing \
-individual access to an X Window System display.  It uses existing core \
-protocol and library hooks for specifying authorization data in the \
-connection setup block to restrict use of the display to only those clients \
-that show that they know a server-specific key called a 'magic cookie'."
-HOMEPAGE="http://xorg.freedesktop.org/releases/individual/lib/"
-COPYRIGHT="1988, 1993, 1994, 1998  The Open Group"
-LICENSE="MIT (no promotion)"
-REVISION="1"
-SOURCE_URI="http://xorg.freedesktop.org/releases/individual/lib/libXau-1.0.5.tar.gz"
-CHECKSUM_SHA256="2ad4324cf204331d6773bba441baed58e46168e7913de2079f10b272eae5c4db"
-SOURCE_DIR="libXau-$portVersion"
-PATCHES="libxau-1.0.5.patch"
-
-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
-	xproto$secondaryArchSuffix
-	"
-
-BUILD_REQUIRES="
-	haiku$secondaryArchSuffix
-	devel:xproto$secondaryArchSuffix
-	"
-BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	devel:util_macros$secondaryArchSuffix
-	cmd:autoconf
-	cmd:libtool
-	cmd:aclocal
-	cmd:make
-	cmd:gcc$secondaryArchSuffix
-	cmd:ld$secondaryArchSuffix
-	cmd:pkg_config$secondaryArchSuffix
-	"
-
-BUILD()
-{
-	libtoolize --force --copy --install
-	autoreconf -i
-	runConfigure ./configure
-	make
-}
-
-INSTALL()
-{
-	make install
-	prepareInstalledDevelLibs libXau
-	fixPkgconfig
-}

x11-libs/libxau/libxau-1.0.8.recipe

@@ -6,7 +6,7 @@ LibXau is used by both Xlib and XCB."
 HOMEPAGE="https://www.x.org/"
 COPYRIGHT="1988, 1993, 1994, 1998  The Open Group"
 LICENSE="MIT (no promotion)"
-REVISION="4"
+REVISION="5"
 SOURCE_URI="https://www.x.org/releases/individual/lib/libXau-$portVersion.tar.bz2"
 CHECKSUM_SHA256="fdd477320aeb5cdd67272838722d6b7d544887dfe7de46e1e7cc0c27c2bea4f2"
 SOURCE_DIR="libXau-$portVersion"
@@ -15,9 +15,12 @@ PATCHES="libxau-$portVersion.patchset"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
+libVersion=6.0.0
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
 PROVIDES="
 	libxau$secondaryArchSuffix = $portVersion
-	lib:libxau$secondaryArchSuffix = $portVersion
+	lib:libxau$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -25,19 +28,18 @@ REQUIRES="
 
 PROVIDES_devel="
 	libxau${secondaryArchSuffix}_devel = $portVersion
-	devel:libxau$secondaryArchSuffix = $portVersion
+	devel:libxau$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	libxau$secondaryArchSuffix == $portVersion base
-	xproto$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	xproto$secondaryArchSuffix
+	devel:util_macros
+	devel:xproto
 	"
 BUILD_PREREQUIRES="
-	devel:util_macros$secondaryArchSuffix
 	cmd:aclocal
 	cmd:autoconf
 	cmd:gcc$secondaryArchSuffix
@@ -47,6 +49,9 @@ BUILD_PREREQUIRES="
 	cmd:pkg_config$secondaryArchSuffix
 	"
 
+defineDebugInfoPackage libxau$secondaryArchSuffix \
+	"$libDir"/libXau.so.$libVersion
+
 BUILD()
 {
 	libtoolize --force --copy --install
@@ -59,7 +64,7 @@ INSTALL()
 {
 	make install
 
-	prepareInstalledDevelLibs libXau
+	prepareInstalledDevelLib libXau
 	fixPkgconfig
 
 	if [ -n "$secondaryArchSuffix" ]; then

x11-libs/libxau/patches/libxau-1.0.5.patch

@@ -1,23 +0,0 @@
-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
-+    if test "x$mtsafe" = "x" ; then
-+	AC_CHECK_LIB(network, gethostbyname_r, [mtsafe=yes])
-+    fi
-     if test "x$mtsafe" = "xyes" ; then
- 	AC_DEFINE(XUSE_MTSAFE_API, 1, 
- 		  [Whether libXau needs to use MT safe API's])