From 4c2feda91ab39bb142bd95b8b948de49b2a53d90 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Mon, 1 Jan 2018 19:17:06 +0100
Subject: [PATCH] libXfont, bump version (#2033)

---
 ...ont-1.5.3.recipe => libxfont-1.5.4.recipe} | 53 +++++++++++--------
 1 file changed, 30 insertions(+), 23 deletions(-)
 rename x11-libs/libxfont/{libxfont-1.5.3.recipe => libxfont-1.5.4.recipe} (52%)

diff --git a/x11-libs/libxfont/libxfont-1.5.3.recipe b/x11-libs/libxfont/libxfont-1.5.4.recipe
similarity index 52%
rename from x11-libs/libxfont/libxfont-1.5.3.recipe
rename to x11-libs/libxfont/libxfont-1.5.4.recipe
index 6330d519e..c1eaae73b 100644
--- a/x11-libs/libxfont/libxfont-1.5.3.recipe
+++ b/x11-libs/libxfont/libxfont-1.5.4.recipe
@@ -1,31 +1,41 @@
 SUMMARY="X Font rasterisation library"
-DESCRIPTION="libXfont provides various services for X servers, most notably \
-font selection and rasterisation (through external libraries such as freetype)."
-HOMEPAGE="http://xorg.freedesktop.org/releases/individual/lib/"
-COPYRIGHT="1994-1996 Silicon Graphics Computer Systems, Inc."
+DESCRIPTION="libxfont provides an X Window System client interface to \
+the RandR extension to the X protocol. \
+The RandR extension allows for run-time configuration of display attributes \
+such as resolution, rotation, and reflection."
+HOMEPAGE="https://www.x.org/releases/individual/lib/"
+COPYRIGHT="2000, Compaq Computer Corporation.
+	2002 Hewlett-Packard Company, Inc.
+	2006 Intel Corporation
+	2008 Red Hat, Inc.
+	2011 Dave Airlie
+	2006 Keith Packard"
 LICENSE="MIT (no promotion)"
 REVISION="1"
-SOURCE_URI="https://www.x.org/archive/individual/lib/libXfont-$portVersion.tar.gz"
-CHECKSUM_SHA256="e8e3538dacf0a3c0317f0b92a092a3bd9d70fd23de10a6d895435ac78de54b7c"
+SOURCE_URI="https://www.x.org/releases/individual/lib/libXfont-$portVersion.tar.bz2"
+CHECKSUM_SHA256="1a7f7490774c87f2052d146d1e0e64518d32e6848184a18654e8d0bb57883242"
 SOURCE_DIR="libXfont-$portVersion"
 
-ARCHITECTURES="?x86_gcc2 x86 x86_64"
+libVersion=1.4.1
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	libxfont$secondaryArchSuffix = $portVersion
-	lib:libxfont$secondaryArchSuffix = 1.4.1 compat >= 1
+	lib:libXfont$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
-	lib:libfontenc$secondaryArchSuffix
 	lib:libfreetype$secondaryArchSuffix
+	lib:libfontenc$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
 
 PROVIDES_devel="
 	libxfont${secondaryArchSuffix}_devel = $portVersion
-	devel:libxfont$secondaryArchSuffix = 1.4.1 compat >= 1
+	devel:libXfont$secondaryArchSuffix = $libVersion
 	"
 REQUIRES_devel="
 	libxfont$secondaryArchSuffix == $portVersion base
@@ -42,39 +52,36 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	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
 	"
 
+defineDebugInfoPackage libxfont$secondaryArchSuffix \
+	$libDir/libXfont.so.$libVersion
+
 BUILD()
 {
 	export LDFLAGS="-lnetwork"
 
-	libtoolize --force --copy --install
-	autoreconf -i
+	autoreconf -vfi
 	runConfigure ./configure
+	make $jobArgs
 }
 
 INSTALL()
 {
 	make install
 
-	rm -rf $libDir/libXfont.la
+	rm -f $libDir/*.la
 
-	fixPkgconfig
 	prepareInstalledDevelLib libXfont
+	fixPkgconfig
 
 	# devel package
 	packageEntries devel \
 		$developDir
 }
-
-TEST()
-{
-	make check
-}