From 2d6df55acc63cf5c228666a0d3414fc2dcf35f6f Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@users.noreply.github.com>
Date: Sat, 16 Jun 2018 03:42:22 +0000
Subject: [PATCH] ncmpcpp: use commandBinDir, add commandSuffix.

commandBinDir was defined but never used, so pass it to configure.
---
 media-sound/ncmpcpp/ncmpcpp-0.8.2.recipe | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/media-sound/ncmpcpp/ncmpcpp-0.8.2.recipe b/media-sound/ncmpcpp/ncmpcpp-0.8.2.recipe
index 6d80b1216..8f9b60b9c 100644
--- a/media-sound/ncmpcpp/ncmpcpp-0.8.2.recipe
+++ b/media-sound/ncmpcpp/ncmpcpp-0.8.2.recipe
@@ -7,7 +7,7 @@ NCMPCPP is an ncurses based commandline client for Music Player Daemon."
 HOMEPAGE="https://rybczak.net/ncmpcpp/"
 COPYRIGHT="2008-2018 The NCMPCPP Project"
 LICENSE="GNU GPL v2"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://github.com/arybczak/ncmpcpp/archive/$portVersion.tar.gz"
 CHECKSUM_SHA256="682fa230029a917f8c8b54131e6c8fb4915aefed2cc5726ca7c3ab4f4fb97bda"
 SOURCE_DIR="ncmpcpp-$portVersion"
@@ -15,15 +15,16 @@ SOURCE_DIR="ncmpcpp-$portVersion"
 ARCHITECTURES="!x86_gcc2 x86 x86_64 ?arm ?ppc"
 SECONDARY_ARCHITECTURES="x86"
 
-if [ "$targetArchitecture" != x86_gcc2 ]; then
-	commandBinDir=$binDir
-else
+commandSuffix=$secondaryArchSuffix
+commandBinDir=$binDir
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	commandSuffix=
 	commandBinDir=$prefix/bin
 fi
 
 PROVIDES="
 	ncmpcpp$secondaryArchSuffix = $portVersion
-	cmd:ncmpcpp
+	cmd:ncmpcpp$commandSuffix
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -81,7 +82,7 @@ USER_SETTINGS_FILES="
 	"
 
 defineDebugInfoPackage ncmpcpp$secondaryArchSuffix \
-	"$binDir"/ncmpcpp
+	"$commandBinDir"/ncmpcpp
 
 BUILD()
 {
@@ -90,7 +91,7 @@ BUILD()
 
 	autoreconf -vfi
 
-	runConfigure ./configure \
+	runConfigure --omit-dirs binDir ./configure --bindir="$commandBinDir" \
 		--enable-outputs \
 		--enable-visualizer \
 		--enable-clock