From c0e373cad8d4c8ab993842b8881f1592ed7e5221 Mon Sep 17 00:00:00 2001 From: fbrosson Date: Wed, 13 Jul 2016 21:23:57 +0000 Subject: [PATCH] libxau: create _devel pkg, switch HOMEPAGE & SOURCE_URI to https. (#692) Also drop unneeded {lib,devel}:libXau and only keep lowercase libxau. --- x11-libs/libxau/libxau-1.0.8.recipe | 48 +++++++++++++------ ...bxau-1.0.8.patch => libxau-1.0.8.patchset} | 0 2 files changed, 34 insertions(+), 14 deletions(-) rename x11-libs/libxau/patches/{libxau-1.0.8.patch => libxau-1.0.8.patchset} (100%) diff --git a/x11-libs/libxau/libxau-1.0.8.recipe b/x11-libs/libxau/libxau-1.0.8.recipe index 90c996b01..5b89e8b72 100644 --- a/x11-libs/libxau/libxau-1.0.8.recipe +++ b/x11-libs/libxau/libxau-1.0.8.recipe @@ -3,44 +3,47 @@ DESCRIPTION="LibXau manipulates .Xauthority files, used by xauth, X servers, \ and display managers to store shared secret data such as MIT-MAGIC-COOKIEs \ used for authenticating X clients attempting to connect to an X server. LibXau is used by both Xlib and XCB." -HOMEPAGE="http://xorg.freedesktop.org/releases/individual/lib/" +HOMEPAGE="https://www.x.org/" COPYRIGHT="1988, 1993, 1994, 1998 The Open Group" LICENSE="MIT (no promotion)" -REVISION="2" -SOURCE_URI="http://xorg.freedesktop.org/releases/individual/lib/libXau-1.0.8.tar.bz2" +REVISION="3" +SOURCE_URI="https://www.x.org/releases/individual/lib/libXau-$portVersion.tar.bz2" CHECKSUM_SHA256="fdd477320aeb5cdd67272838722d6b7d544887dfe7de46e1e7cc0c27c2bea4f2" SOURCE_DIR="libXau-$portVersion" -PATCHES="libxau-1.0.8.patch" +PATCHES="libxau-$portVersion.patchset" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" -#TODO: make a _devel package ? PROVIDES=" libxau$secondaryArchSuffix = $portVersion lib:libxau$secondaryArchSuffix = $portVersion - lib:libXau$secondaryArchSuffix = $portVersion - devel:libxau$secondaryArchSuffix = $portVersion - devel:libXau$secondaryArchSuffix = $portVersion " REQUIRES=" haiku$secondaryArchSuffix + " + +PROVIDES_devel=" + libxau${secondaryArchSuffix}_devel = $portVersion + devel:libxau$secondaryArchSuffix = $portVersion + " +REQUIRES_devel=" + libxau$secondaryArchSuffix == $portVersion base xproto$secondaryArchSuffix " BUILD_REQUIRES=" - haiku$secondaryArchSuffix - devel:xproto$secondaryArchSuffix + haiku${secondaryArchSuffix}_devel + xproto$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel devel:util_macros$secondaryArchSuffix - cmd:autoconf - cmd:libtool cmd:aclocal - cmd:make + cmd:autoconf cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix + cmd:libtoolize$secondaryArchSuffix + cmd:make cmd:pkg_config$secondaryArchSuffix " @@ -55,6 +58,23 @@ BUILD() INSTALL() { make install + prepareInstalledDevelLibs libXau fixPkgconfig + + if [ -n "$secondaryArchSuffix" ]; then + rm -rf $documentationDir + maybe_manDir_man3= + else + maybe_manDir_man3=$manDir/man3 + fi + + packageEntries devel \ + $developDir \ + $maybe_manDir_man3 +} + +TEST() +{ + make check } diff --git a/x11-libs/libxau/patches/libxau-1.0.8.patch b/x11-libs/libxau/patches/libxau-1.0.8.patchset similarity index 100% rename from x11-libs/libxau/patches/libxau-1.0.8.patch rename to x11-libs/libxau/patches/libxau-1.0.8.patchset