From b71268bbff22ae1915848566a8417846e305ff3e Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Thu, 4 May 2023 10:29:58 +0200
Subject: [PATCH] libxpm, disable x86_gcc2, disable static library (#8579)

---
 x11-libs/libxpm/libxpm-3.5.11.recipe | 108 ---------------------------
 x11-libs/libxpm/libxpm-3.5.12.recipe |  32 ++++----
 2 files changed, 17 insertions(+), 123 deletions(-)
 delete mode 100644 x11-libs/libxpm/libxpm-3.5.11.recipe

diff --git a/x11-libs/libxpm/libxpm-3.5.11.recipe b/x11-libs/libxpm/libxpm-3.5.11.recipe
deleted file mode 100644
index a35ceb492..000000000
--- a/x11-libs/libxpm/libxpm-3.5.11.recipe
+++ /dev/null
@@ -1,108 +0,0 @@
-SUMMARY="X.Org Xpm library"
-DESCRIPTION="The X.Org project provides an open source implementation of the \
-X Window System. \
-The development work is being done in conjunction with the freedesktop.org \
-community. \
-The X.Org Foundation is the educational non-profit corporation whose \
-Board serves this effort, and whose Members lead this work."
-HOMEPAGE="https://www.x.org/"
-COPYRIGHT="1989-95 GROUPE BULL
-	1998 Arnaud LE HORS
-	1996 Lorens Younes"
-# TODO: check all the licenses in the COPYING file in the next century.
-LICENSE="MIT"
-REVISION="4"
-SOURCE_URI="https://www.x.org/releases/individual/lib/libXpm-$portVersion.tar.gz"
-CHECKSUM_SHA256="53ddf924441b7ed2de994d4934358c13d9abf4828b1b16e1255ade5032b31df7"
-SOURCE_DIR="libXpm-$portVersion"
-
-ARCHITECTURES="all"
-SECONDARY_ARCHITECTURES="x86_gcc2 x86"
-
-PROVIDES="
-	libxpm$secondaryArchSuffix = $portVersion
-	lib:libxpm$secondaryArchSuffix = $portVersion
-	"
-if [ -z "$secondaryArchSuffix" ]; then
-	PROVIDES="$PROVIDES
-		cmd:cxpm = $portVersion
-		"
-fi
-
-REQUIRES="
-	haiku$secondaryArchSuffix
-	lib:libx11$secondaryArchSuffix
-	lib:libxcb$secondaryArchSuffix
-	lib:libxau$secondaryArchSuffix
-	"
-
-PROVIDES_devel="
-	libxpm${secondaryArchSuffix}_devel = $portVersion
-	devel:libxpm$secondaryArchSuffix = $portVersion
-	"
-REQUIRES_devel="
-	libxpm$secondaryArchSuffix == $portVersion base
-	devel:libx11$secondaryArchSuffix
-	devel:libxcb$secondaryArchSuffix
-	devel:libxau$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
-	"
-BUILD_PREREQUIRES="
-	cmd:gcc$secondaryArchSuffix
-	cmd:ld$secondaryArchSuffix
-	cmd:libtoolize$secondaryArchSuffix
-	cmd:automake
-	cmd:autoconf
-	cmd:autoreconf
-	cmd:make
-	cmd:pkg_config$secondaryArchSuffix
-	"
-
-BUILD()
-{
-	libtoolize --force --copy --install
-	autoreconf -i
-	runConfigure ./configure
-	make $jobArgs
-}
-
-INSTALL()
-{
-	make install
-
-	# remove libtool library file
-	rm $libDir/libXpm.la
-
-	prepareInstalledDevelLibs \
-		libXpm
-
-	fixPkgconfig
-
-	if [ -n "$secondaryArchSuffix" ]; then
-		rm -rf $binDir $documentationDir
-	fi
-
-	packageEntries devel \
-		$developDir
-}
-
-TEST()
-{
-	make check
-}
diff --git a/x11-libs/libxpm/libxpm-3.5.12.recipe b/x11-libs/libxpm/libxpm-3.5.12.recipe
index 60daea90c..af789ed6d 100644
--- a/x11-libs/libxpm/libxpm-3.5.12.recipe
+++ b/x11-libs/libxpm/libxpm-3.5.12.recipe
@@ -11,21 +11,28 @@ COPYRIGHT="1989-95 GROUPE BULL
 	1996 Lorens Younes"
 # TODO: check all the licenses in the COPYING file in the next century.
 LICENSE="MIT"
-REVISION="4"
+REVISION="5"
 SOURCE_URI="https://www.x.org/releases/individual/lib/libXpm-$portVersion.tar.bz2"
 CHECKSUM_SHA256="fd6a6de3da48de8d1bb738ab6be4ad67f7cb0986c39bd3f7d51dd24f7854bdec"
 SOURCE_DIR="libXpm-$portVersion"
 
-ARCHITECTURES="all"
-SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+ARCHITECTURES="all !x86_gcc2"
+SECONDARY_ARCHITECTURES="x86"
+
+commandBinDir=$binDir
+commandSuffix=$secondaryArchSuffix
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	commandSuffix=
+	commandBinDir=$prefix/bin
+fi
 
 libVersion="4.11.0"
 libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
 
 PROVIDES="
 	libxpm$secondaryArchSuffix = $portVersion
-	cmd:cxpm$secondaryArchSuffix
-	cmd:sxpm$secondaryArchSuffix
+	cmd:cxpm$commandSuffix
+	cmd:sxpm$commandSuffix
 	lib:libXpm$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
@@ -67,7 +74,9 @@ defineDebugInfoPackage libxpm$secondaryArchSuffix \
 
 BUILD()
 {
-	runConfigure ./configure
+	runConfigure --omit-dirs binDir ./configure \
+		--bindir=$commandBinDir \
+		--disable-static
 	make $jobArgs
 }
 
@@ -75,15 +84,8 @@ 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
+	install -m 0755 -d "$docDir"
+	install -m 0644 -t "$docDir" README
 
 	# remove libtool library file
 	rm $libDir/libXpm.la