diff --git a/x11-libs/libxfixes/libxfixes-5.0.3.recipe b/x11-libs/libxfixes/libxfixes-5.0.3.recipe index 01adef39d..a1e7bd13c 100644 --- a/x11-libs/libxfixes/libxfixes-5.0.3.recipe +++ b/x11-libs/libxfixes/libxfixes-5.0.3.recipe @@ -9,7 +9,7 @@ COPYRIGHT="2001-2003 Keith Packard 2006 Oracle and/or its affiliates 2011 Red Hat" LICENSE="libXfixes" -REVISION="3" +REVISION="4" SOURCE_URI="https://www.x.org/archive/individual/lib/libXfixes-$portVersion.tar.bz2" CHECKSUM_SHA256="de1cd33aff226e08cefd0e6759341c2c8e8c9faf8ce9ac6ec38d43e287b22ad6" SOURCE_DIR="libXfixes-$portVersion" @@ -22,43 +22,32 @@ libVersionCompat="$libVersion compat >= ${libVersion%%.*}" PROVIDES=" libxfixes$secondaryArchSuffix = $portVersion - lib:libxfixes$secondaryArchSuffix = $libVersionCompat + lib:libXfixes$secondaryArchSuffix = $libVersionCompat " REQUIRES=" haiku$secondaryArchSuffix - lib:libx11$secondaryArchSuffix - lib:libxau$secondaryArchSuffix - lib:libxcb$secondaryArchSuffix - lib:libxdmcp$secondaryArchSuffix + lib:libX11$secondaryArchSuffix " PROVIDES_devel=" libxfixes${secondaryArchSuffix}_devel = $portVersion - devel:libxfixes$secondaryArchSuffix = $libVersionCompat + devel:libXfixes$secondaryArchSuffix = $libVersionCompat " REQUIRES_devel=" libxfixes$secondaryArchSuffix == $portVersion base + devel:fixesproto + devel:libX11$secondaryArchSuffix + devel:xproto " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - devel:fixesproto - devel:kbproto - devel:libpthread_stubs - devel:libx11$secondaryArchSuffix - devel:libxau$secondaryArchSuffix - devel:libxcb$secondaryArchSuffix - devel:libxdmcp$secondaryArchSuffix + devel:libX11$secondaryArchSuffix devel:util_macros - devel:xextproto - devel:xproto " BUILD_PREREQUIRES=" - cmd:aclocal - cmd:autoconf cmd:awk cmd:gcc$secondaryArchSuffix - cmd:libtoolize$secondaryArchSuffix cmd:make cmd:pkg_config$secondaryArchSuffix " @@ -68,7 +57,6 @@ defineDebugInfoPackage libxfixes$secondaryArchSuffix \ BUILD() { - autoreconf -vfi runConfigure ./configure make $jobArgs } @@ -76,8 +64,14 @@ BUILD() INSTALL() { make install - install -d "$docDir" - install -t "$docDir" README + if [ -z "$secondaryArchSuffix" ]; then + install -d -m 755 "$developDocDir" + install -m 644 -t "$developDocDir" README + maybe_manDir="$manDir" + else + rm -rf "$manDir" + maybe_manDir= + fi rm -f "$libDir"/libXfixes.la @@ -87,5 +81,5 @@ INSTALL() # devel package packageEntries devel \ "$developDir" \ - "$manDir" + ${maybe_manDir:+"$maybe_manDir"} }