From 35ce9d96c6f38ffa26dffc6ed20ab88989cfeefd Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Wed, 7 Aug 2013 15:53:35 +0200
Subject: [PATCH] ncurses: support building for secondary architecture

---
 sys-libs/ncurses/ncurses-5.9.recipe | 109 +++++++++++++++++-----------
 1 file changed, 65 insertions(+), 44 deletions(-)

diff --git a/sys-libs/ncurses/ncurses-5.9.recipe b/sys-libs/ncurses/ncurses-5.9.recipe
index 7c2c18f3d..888464f56 100644
--- a/sys-libs/ncurses/ncurses-5.9.recipe
+++ b/sys-libs/ncurses/ncurses-5.9.recipe
@@ -4,51 +4,61 @@ SRC_URI="http://ftp.gnu.org/pub/gnu/ncurses/ncurses-5.9.tar.gz"
 CHECKSUM_MD5="8cb9c412e5f2d96bc6f459aa8c6282a1"
 LICENSE="MIT"
 COPYRIGHT="1998-2011 Free Software Foundation, Inc."
-REVISION="8"
-ARCHITECTURES="x86_gcc2 ?x86"
+REVISION="9"
+ARCHITECTURES="x86_gcc2 x86"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PATCHES="ncurses-5.9.patchset"
 
 PROVIDES="
-	ncurses = $portVersion compat >= 5
-	cmd:captoinfo = $portVersion compat >= 5
-	cmd:clear = $portVersion compat >= 5
-	cmd:infocmp = $portVersion compat >= 5
-	cmd:infotocap = $portVersion compat >= 5
-	cmd:reset = $portVersion compat >= 5
-	cmd:tabs = $portVersion compat >= 5
-	cmd:tic = $portVersion compat >= 5
-	cmd:toe = $portVersion compat >= 5
-	cmd:tput = $portVersion compat >= 5
-	cmd:tset = $portVersion compat >= 5
-	lib:libform = $portVersion compat >= 5
-	lib:libformw = $portVersion compat >= 5
-	lib:libmenu = $portVersion compat >= 5
-	lib:libmenuw = $portVersion compat >= 5
-	lib:libncurses = $portVersion compat >= 5
-	lib:libncursesw = $portVersion compat >= 5
-	lib:libncurses++ = $portVersion compat >= 5
-	lib:libncurses++w = $portVersion compat >= 5
-	lib:libpanel = $portVersion compat >= 5
-	lib:libpanelw = $portVersion compat >= 5
+	ncurses$secondaryArchSuffix = $portVersion compat >= 5
+	lib:libform$secondaryArchSuffix = $portVersion compat >= 5
+	lib:libformw$secondaryArchSuffix = $portVersion compat >= 5
+	lib:libmenu$secondaryArchSuffix = $portVersion compat >= 5
+	lib:libmenuw$secondaryArchSuffix = $portVersion compat >= 5
+	lib:libncurses$secondaryArchSuffix = $portVersion compat >= 5
+	lib:libncursesw$secondaryArchSuffix = $portVersion compat >= 5
+	lib:libncurses++$secondaryArchSuffix = $portVersion compat >= 5
+	lib:libncurses++w$secondaryArchSuffix = $portVersion compat >= 5
+	lib:libpanel$secondaryArchSuffix = $portVersion compat >= 5
+	lib:libpanelw$secondaryArchSuffix = $portVersion compat >= 5
 	"
+if [ -z "$secondaryArchSuffix" ]; then
+	PROVIDES="$PROVIDES
+		cmd:captoinfo = $portVersion compat >= 5
+		cmd:clear = $portVersion compat >= 5
+		cmd:infocmp = $portVersion compat >= 5
+		cmd:infotocap = $portVersion compat >= 5
+		cmd:reset = $portVersion compat >= 5
+		cmd:tabs = $portVersion compat >= 5
+		cmd:tic = $portVersion compat >= 5
+		cmd:toe = $portVersion compat >= 5
+		cmd:tput = $portVersion compat >= 5
+		cmd:tset = $portVersion compat >= 5
+		"
+fi
+
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku$secondaryArchSuffix >= $haikuVersion
 	"
+if [ -n "$secondaryArchSuffix" ]; then
+	REQUIRES="$REQUIRES
+		ncurses == $portVersion base
+		"
+fi
+
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
-	cmd:gcc
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	cmd:gcc$secondaryArchSuffix
 	cmd:grep
-	cmd:ld
+	cmd:ld$secondaryArchSuffix
 	cmd:libtool
 	cmd:make
 	cmd:sed
 	"
 
-SOURCE_DIR="$portVersionedName"
-
 doBuild()
 {
 	if [ $# -lt 1 ]; then
@@ -78,6 +88,9 @@ BUILD()
 	# two times, installing in temporary directories from which we copy to the
 	# actual installation directory in INSTALL().
 	doBuild build-nowidec
+		# Note: For the secondary architecture we discard the programs later,
+		# but since building the terminfo DB can't be disabled, we need to build
+		# the anyway.
 	doBuild build-widec --enable-widec --without-progs
 }
 
@@ -94,12 +107,21 @@ INSTALL()
 	# fix ncurses[w]5-config
 	fixDevelopLibDirReferences $binDir/ncurses5-config $binDir/ncursesw5-config
 
+
 	# devel package
 	packageEntries devel \
 		$binDir/ncurses5-config \
 		$binDir/ncursesw5-config \
 		$developDir \
 		$manDir/man3
+
+	# For the secondary architecture package clean up stuff we don't need, since
+	# we make it depend on the primary architecture package.
+	if [ -n "$secondaryArchSuffix" ]; then
+		rm -rf $binDir
+		rm -rf $dataDir
+		rm -rf $documentationDir
+	fi
 }
 
 DESCRIPTION="The Ncurses (new curses) library is a free software emulation of curses in System V Release 4.0, and more. It uses Terminfo format, supports pads and color and multiple highlights and forms characters and function-key mapping, and has all the other SYSV-curses enhancements over BSD Curses.
@@ -110,22 +132,21 @@ The distribution includes the library and support utilities, including a terminf
 
 # ----- devel package -------------------------------------------------------
 
-SUMMARY_devel="The ncurses development files"
 PROVIDES_devel="
-	ncurses_devel = $portVersion compat >= 5
-	cmd:ncurses5_config = $portVersion compat >= 5
-	cmd:ncursesw5_config = $portVersion compat >= 5
-	devel:libform = $portVersion compat >= 5
-	devel:libformw = $portVersion compat >= 5
-	devel:libmenu = $portVersion compat >= 5
-	devel:libmenuw = $portVersion compat >= 5
-	devel:libncurses = $portVersion compat >= 5
-	devel:libncursesw = $portVersion compat >= 5
-	devel:libncurses++ = $portVersion compat >= 5
-	devel:libncurses++w = $portVersion compat >= 5
-	devel:libpanel = $portVersion compat >= 5
-	devel:libpanelw = $portVersion compat >= 5
+	ncurses${secondaryArchSuffix}_devel = $portVersion compat >= 5
+	cmd:ncurses5_config${secondaryArchSuffix} = $portVersion compat >= 5
+	cmd:ncursesw5_config${secondaryArchSuffix} = $portVersion compat >= 5
+	devel:libform${secondaryArchSuffix} = $portVersion compat >= 5
+	devel:libformw${secondaryArchSuffix} = $portVersion compat >= 5
+	devel:libmenu${secondaryArchSuffix} = $portVersion compat >= 5
+	devel:libmenuw${secondaryArchSuffix} = $portVersion compat >= 5
+	devel:libncurses${secondaryArchSuffix} = $portVersion compat >= 5
+	devel:libncursesw${secondaryArchSuffix} = $portVersion compat >= 5
+	devel:libncurses++${secondaryArchSuffix} = $portVersion compat >= 5
+	devel:libncurses++w${secondaryArchSuffix} = $portVersion compat >= 5
+	devel:libpanel${secondaryArchSuffix} = $portVersion compat >= 5
+	devel:libpanelw${secondaryArchSuffix} = $portVersion compat >= 5
 	"
 REQUIRES_devel="
-	ncurses == $portVersion base
+	ncurses${secondaryArchSuffix} == $portVersion base
 	"