From 9ad43bc2122a946354a076b26f0c16999e2d8c4c Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Wed, 15 Aug 2018 14:50:38 +0200
Subject: [PATCH] libXpm, bump revision, cleanup, fix REQUIRES_devel

---
 x11-libs/libxpm/libxpm-3.5.12.recipe | 81 +++++++++++++---------------
 1 file changed, 38 insertions(+), 43 deletions(-)

diff --git a/x11-libs/libxpm/libxpm-3.5.12.recipe b/x11-libs/libxpm/libxpm-3.5.12.recipe
index 35c2e35ba..c71a00de9 100644
--- a/x11-libs/libxpm/libxpm-3.5.12.recipe
+++ b/x11-libs/libxpm/libxpm-3.5.12.recipe
@@ -11,73 +11,63 @@ COPYRIGHT="1989-95 GROUPE BULL
 	1996 Lorens Younes"
 # TODO: check all the licenses in the COPYING file in the next century.
 LICENSE="MIT"
-REVISION="3"
-SOURCE_URI="https://www.x.org/releases/individual/lib/libXpm-$portVersion.tar.gz"
-CHECKSUM_SHA256="2523acc780eac01db5163267b36f5b94374bfb0de26fc0b5a7bee76649fd8501"
+REVISION="4"
+SOURCE_URI="https://www.x.org/releases/individual/lib/libXpm-$portVersion.tar.bz2"
+CHECKSUM_SHA256="fd6a6de3da48de8d1bb738ab6be4ad67f7cb0986c39bd3f7d51dd24f7854bdec"
 SOURCE_DIR="libXpm-$portVersion"
 
-ARCHITECTURES="?x86_gcc2 x86 x86_64"
-SECONDARY_ARCHITECTURES="?x86_gcc2 x86"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+libVersion="4.11.0"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
 
 PROVIDES="
 	libxpm$secondaryArchSuffix = $portVersion
-	lib:libxpm$secondaryArchSuffix = 4.11.0 compat >= 4
+	lib:libXpm$secondaryArchSuffix = $libVersionCompat
+	cmd:cxpm$secondaryArchSuffix
+	cmd:sxpm$secondaryArchSuffix
 	"
-if [ -z "$secondaryArchSuffix" ]; then
-	PROVIDES="$PROVIDES
-		cmd:cxpm = $portVersion
-		"
-fi
 
 REQUIRES="
 	haiku$secondaryArchSuffix
-	lib:libx11$secondaryArchSuffix
-	lib:libxcb$secondaryArchSuffix
-	lib:libxau$secondaryArchSuffix
+	lib:libintl$secondaryArchSuffix
+	lib:libX11$secondaryArchSuffix
+	lib:libXext$secondaryArchSuffix
+	lib:libXt$secondaryArchSuffix
 	"
 
 PROVIDES_devel="
 	libxpm${secondaryArchSuffix}_devel = $portVersion
-	devel:libxpm$secondaryArchSuffix = 4.11.0 compat >= 4
+	devel:libXpm$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	libxpm$secondaryArchSuffix == $portVersion base
-	devel:libx11$secondaryArchSuffix
-	devel:libxcb$secondaryArchSuffix
-	devel:libxau$secondaryArchSuffix
+	devel:libX11$secondaryArchSuffix
 	"
 
-# looks like all x11 deps are needed
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libx11$secondaryArchSuffix
-	devel:util_macros$secondaryArchSuffix
-	devel:xproto$secondaryArchSuffix
-	devel:xtrans$secondaryArchSuffix
-	devel:inputproto$secondaryArchSuffix
-	devel:kbproto$secondaryArchSuffix
-	devel:xcb_proto$secondaryArchSuffix
-	devel:libxslt$secondaryArchSuffix
-	devel:libpthread_stubs$secondaryArchSuffix
-	devel:libxcb$secondaryArchSuffix
-	devel:libxau$secondaryArchSuffix
-	devel:xextproto$secondaryArchSuffix
+	devel:libintl$secondaryArchSuffix
+	devel:libX11$secondaryArchSuffix
+	devel:libXext$secondaryArchSuffix
+	devel:libXt$secondaryArchSuffix
+	devel:util_macros
+	devel:xtrans
 	"
 BUILD_PREREQUIRES="
+	cmd:awk
 	cmd:gcc$secondaryArchSuffix
-	cmd:ld$secondaryArchSuffix
 	cmd:libtoolize$secondaryArchSuffix
-	cmd:automake
-	cmd:autoconf
-	cmd:autoreconf
 	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
 	"
 
+defineDebugInfoPackage libxpm$secondaryArchSuffix \
+	$libDir/libXpm.so.$libVersion
+
 BUILD()
 {
-	libtoolize --force --copy --install
-	autoreconf -i
 	runConfigure ./configure
 	make $jobArgs
 }
@@ -86,18 +76,23 @@ INSTALL()
 {
 	make install
 
+	if [ -z "$secondaryArchSuffix" ]; then
+		install -m 0755 -d "$developDocDir"
+		install -m 0644 -t "$developDocDir" README
+		#maybe_manDir="$manDir"
+	else
+		#rm -rf "$manDir"
+		rm -rf "$developDir/documentation"
+		#maybe_manDir=
+	fi
+
 	# remove libtool library file
 	rm $libDir/libXpm.la
 
-	prepareInstalledDevelLibs \
-		libXpm
+	prepareInstalledDevelLib libXpm
 
 	fixPkgconfig
 
-	if [ -n "$secondaryArchSuffix" ]; then
-		rm -rf $binDir $documentationDir
-	fi
-
 	packageEntries devel \
 		$developDir
 }