conky, add secondary architecture, fix build (#4629)

app-admin/conky/conky-1.11.6_pre.recipe

@@ -13,61 +13,71 @@ Audacious).
 and programs.
 • Built-in Imlib2 and Cairo bindings for arbitrary drawing with Lua.
 • Runs on Linux, FreeBSD, OpenBSD, DragonFlyBSD, NetBSD, Solaris, \
-Haiku OS, and macOS!
+Haiku, and macOS!
 and much much more.
 
 Conky can display information either as text, or using simple progress bars and
 graph widgets, with different fonts and colours."
 HOMEPAGE="https://github.com/brndnmtthws/conky"
 COPYRIGHT="2004 Hannu Saransaari and Lauri Hakkarainen
-	2005-2019 Brenden Matthews, Philip Kovacs, et. al."
+	2005-2020 Brenden Matthews, Philip Kovacs, et. al."
 LICENSE="GNU GPL v3
 	GNU LGPL v3
 	MIT"
-REVISION="1"
-srcGitRev="26d23cb70718956493df7d3102dc3000f0f56685"
-SOURCE_URI="https://github.com/mmuman/conky/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="7c503bf23870475cc852ca247694a3dd6f43c56da13236025d52fd648d108ded"
+REVISION="2"
+srcGitRev="6ad788b78d8b0cf384e97dac5cabd052cb8a53f2"
+SOURCE_URI="https://github.com/brndnmtthws/conky/archive/$srcGitRev.tar.gz"
+CHECKSUM_SHA256="2efa3f40626ee910de8f638d8c4648eda33c6565aea4905bfd4f2de742bf69ee"
+SOURCE_FILENAME="conky-$portVersion-$srcGitRev.tar.gz"
 SOURCE_DIR="conky-$srcGitRev"
 
-ARCHITECTURES="x86_64"
+ARCHITECTURES="!x86_gcc2 x86_64"
+SECONDARY_ARCHITECTURES="x86"
+
+GLOBAL_WRITABLE_FILES="
+	settings/conky_no_x11.conf keep-old
+	"
 
 PROVIDES="
-	conky = $portVersion
+	conky$secondaryArchSuffix = $portVersion
 	cmd:conky = $portVersion
 	"
 REQUIRES="
-	haiku
-	lib:libcurl
-	lib:libintl
-	lib:liblua
-	lib:libncurses
+	haiku$secondaryArchSuffix
+	lib:libcurl$secondaryArchSuffix
+	lib:libintl$secondaryArchSuffix
+	lib:liblua$secondaryArchSuffix
+	lib:libncurses$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	haiku_devel
-	devel:libcurl
-	devel:libintl
-	devel:liblua
-	devel:libncurses
+	haiku${secondaryArchSuffix}_devel
+	devel:libcurl$secondaryArchSuffix
+	devel:libintl$secondaryArchSuffix
+	devel:liblua$secondaryArchSuffix >= 5.3
+	devel:libncurses$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
 	cmd:cmake
 	cmd:gawk
-	cmd:gcc
+	cmd:gcc$secondaryArchSuffix
 	cmd:git
 	cmd:make
-	cmd:pkg_config
+	cmd:pkg_config$secondaryArchSuffix
 	"
 
 BUILD()
 {
-	cmake -DCMAKE_INSTALL_PREFIX=$prefix -DDOC_PATH=$relativeDocDir \
-		-DMAN_PATH=$relativeManDir -DBUILD_X11=false .
+	cmake -DCMAKE_INSTALL_PREFIX=$prefix \
+		-DDOC_PATH=$docDir \
+		-DMAN_PATH=$manDir \
+		-DXDG_CONFIG_FILE=$settingsDir/conky_no_x11.conf \
+		-DBUILD_X11=false .
 	make $jobArgs
 }
 
 INSTALL()
 {
 	make install
+	mv $docDir/conky_no_x11.conf $settingsDir
 }