From 238e83cbea4793f6da9a37a7f2e3d328ead1635c Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Tue, 23 Apr 2019 19:35:32 +0200
Subject: [PATCH] lcdproc, enable secondary arch (#3777)

---
 app-misc/lcdproc/lcdproc-0.5.9.recipe | 83 ++++++++++++++++-----------
 1 file changed, 50 insertions(+), 33 deletions(-)

diff --git a/app-misc/lcdproc/lcdproc-0.5.9.recipe b/app-misc/lcdproc/lcdproc-0.5.9.recipe
index 72ab57540..0c557920a 100644
--- a/app-misc/lcdproc/lcdproc-0.5.9.recipe
+++ b/app-misc/lcdproc/lcdproc-0.5.9.recipe
@@ -5,63 +5,80 @@ Client/server model allows multiple clients to use one display."
 HOMEPAGE="http://www.lcdproc.org"
 COPYRIGHT="1998-2014 William W. Ferrell, Selene Scriven and many other contributors"
 LICENSE="GNU GPL v2"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://github.com/lcdproc/lcdproc/releases/download/v$portVersion/lcdproc-$portVersion.tar.gz"
 CHECKSUM_SHA256="d48a915496c96ff775b377d2222de3150ae5172bfb84a6ec9f9ceab962f97b83"
 PATCHES="lcdproc-$portVersion.patchset"
 
-ARCHITECTURES="x86_gcc2 x86 x86_64"
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86"
+
+# On x86_gcc2 we don't want to install the commands in bin/<arch>/, but in bin/.
+commandSuffix=$secondaryArchSuffix
+commandBinDir=$binDir
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	commandSuffix=
+	commandBinDir=$prefix/bin
+fi
 
 GLOBAL_WRITABLE_FILES="
 	settings/LCDd.conf keep-old
 	settings/lcdexec.conf keep-old
 	settings/lcdproc.conf keep-old
 	settings/lcdvc.conf keep-old
-"
+	"
 
 PROVIDES="
-	lcdproc = $portVersion
-	cmd:fortune.pl
-	cmd:iosock.pl
-	cmd:lcdd
-	cmd:lcdexec
-	cmd:lcdident.pl
-	cmd:lcdmetar.pl
-	cmd:lcdproc
-	cmd:lcdvc
-	cmd:tail.pl
-	cmd:x11amp.pl
-"
+	lcdproc$secondaryArchSuffix = $portVersion
+	cmd:fortune.pl$commandSuffix
+	cmd:iosock.pl$commandSuffix
+	cmd:LCDd$commandSuffix
+	cmd:lcdexec$commandSuffix
+	cmd:lcdident.pl$commandSuffix
+	cmd:lcdmetar.pl$commandSuffix
+	cmd:lcdproc$commandSuffix
+	cmd:lcdvc$commandSuffix
+	cmd:tail.pl$commandSuffix
+	cmd:x11amp.pl$commandSuffix
+	"
 REQUIRES="
-	haiku
-	lib:libncurses
-	lib:libpng
-	lib:libusb
-	lib:libusb_1.0
-"
+	haiku$secondaryArchSuffix
+	lib:libncurses$secondaryArchSuffix
+	lib:libpng16$secondaryArchSuffix
+	lib:libusb$secondaryArchSuffix
+	lib:libusb_1.0$secondaryArchSuffix
+	"
 
 BUILD_REQUIRES="
-	haiku_devel
-	devel:libncurses
-	devel:libpng
-	devel:libusb
-	devel:libusb_1.0
-"
+	haiku${secondaryArchSuffix}_devel
+	devel:libncurses$secondaryArchSuffix
+	devel:libpng16$secondaryArchSuffix
+	devel:libusb$secondaryArchSuffix
+	devel:libusb_1.0$secondaryArchSuffix
+	"
 BUILD_PREREQUIRES="
 	cmd:aclocal
+	cmd:autoreconf
 	cmd:autoconf
+	cmd:autoheader
 	cmd:automake
 	cmd:awk
-	cmd:gcc
+	cmd:gcc$secondaryArchSuffix
 	cmd:make
-	cmd:pkg_config
-"
+	cmd:pkg_config$secondaryArchSuffix
+	"
 
 BUILD()
 {
-	aclocal
-	automake
-	runConfigure ./configure CFLAGS="-DBSD_SOURCE" --enable-drivers=picolcd LDFLAGS="-lbsd" --enable-libusb --enable-libusb-1.0
+	export CFLAGS="-DBSD_SOURCE"
+	export LDFLAGS="-lbsd"
+	autoreconf -vfi
+	runConfigure --omit-dirs "bindir sbindir" ./configure \
+		--bindir=$commandBinDir \
+		--sbindir=$commandBinDir \
+		--enable-drivers=picolcd \
+		--enable-libusb \
+		--enable-libusb-1.0
 	make
 }