From 5f0caf553a5c47e38ffd6a5c0c407b5600d372c0 Mon Sep 17 00:00:00 2001
From: hanya <hanya.runo@gmail.com>
Date: Fri, 4 May 2018 02:56:22 +0900
Subject: [PATCH] Aobook: enable secondary arch (#2519)

---
 app-text/aobook/aobook-1.0.3.recipe   | 69 --------------------------
 app-text/aobook/aobook-1.0.3_4.recipe | 70 +++++++++++++++++++++++++++
 2 files changed, 70 insertions(+), 69 deletions(-)
 delete mode 100644 app-text/aobook/aobook-1.0.3.recipe
 create mode 100644 app-text/aobook/aobook-1.0.3_4.recipe

diff --git a/app-text/aobook/aobook-1.0.3.recipe b/app-text/aobook/aobook-1.0.3.recipe
deleted file mode 100644
index 8f82b70d9..000000000
--- a/app-text/aobook/aobook-1.0.3.recipe
+++ /dev/null
@@ -1,69 +0,0 @@
-SUMMARY="Aozora Bunko text viewer"
-DESCRIPTION="Aobook is a viewer for Aozora Bunko which is a digital library \
-of Japanese-language literature."
-HOMEPAGE="https://osdn.net/projects/aobook/"
-COPYRIGHT="2014-2017 Azel"
-LICENSE="BSD (3-clause)"
-REVISION="2"
-localRevision="3"
-SOURCE_URI="https://github.com/hanya/aobook-haiku/archive/v$portVersion-$localRevision.tar.gz"
-CHECKSUM_SHA256="9b39981a204e6094563c2435979da4eea1aa2ef3d1a5e9580961a4e9812d34a7"
-SOURCE_DIR="aobook-haiku-$portVersion-$localRevision"
-
-ARCHITECTURES="!x86_gcc2 x86 x86_64"
-
-PROVIDES="
-	aobook = $portVersion
-	app:Aobook = $portVersion
-	"
-REQUIRES="
-	haiku
-	lib:libfontconfig
-	lib:libfreetype
-	lib:libiconv
-	lib:libjpeg
-	lib:libpng
-	lib:libz
-	"
-BUILD_REQUIRES="
-	haiku_devel
-	devel:libfontconfig
-	devel:libfreetype
-	devel:libiconv
-	devel:libjpeg
-	devel:libpng
-	devel:libz
-	"
-BUILD_PREREQUIRES="
-	makefile_engine
-	cmd:g++
-	cmd:gcc
-	cmd:make
-	"
-
-USER_SETTINGS_FILES="
-	settings/aobook directory
-	"
-
-BUILD()
-{
-	cd mlib
-	make -f Makefile.haiku $jobArgs OBJ_DIR=objects
-
-	cd ../src
-	make -f Makefile.haiku $jobArgs OBJ_DIR=objects
-	make -f Makefile.haiku catalogs OBJ_DIR=objects
-	make -f Makefile.haiku bindcatalogs OBJ_DIR=objects
-}
-
-INSTALL()
-{
-	mkdir -p $appsDir
-	cp -af src/objects/aobook $appsDir/Aobook
-
-	mkdir -p $dataDir/aobook/doc
-	cp -af doc/manual.html $dataDir/aobook/doc
-
-	addAppDeskbarSymlink $appsDir/Aobook
-}
-
diff --git a/app-text/aobook/aobook-1.0.3_4.recipe b/app-text/aobook/aobook-1.0.3_4.recipe
new file mode 100644
index 000000000..9233f21e9
--- /dev/null
+++ b/app-text/aobook/aobook-1.0.3_4.recipe
@@ -0,0 +1,70 @@
+SUMMARY="Aozora Bunko text viewer"
+DESCRIPTION="Aobook is a viewer for Aozora Bunko which is a digital library \
+of Japanese-language literature."
+HOMEPAGE="https://osdn.net/projects/aobook/"
+COPYRIGHT="2014-2018 Azel"
+LICENSE="BSD (3-clause)"
+REVISION="1"
+SOURCE_URI="https://github.com/hanya/aobook-haiku/archive/v${portVersion/_/-}.tar.gz"
+CHECKSUM_SHA256="f840a98b0f0c1f3fa31ae19498bc9051106e068b9af95eb4065643693f7f1e07"
+SOURCE_FILENAME="aobook-haiku-${portVersion/_/-}.tar.gz"
+SOURCE_DIR="aobook-haiku-${portVersion/_/-}"
+
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	aobook$secondaryArchSuffix = $portVersion
+	app:Aobook = $portVersion
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libfontconfig$secondaryArchSuffix
+	lib:libfreetype$secondaryArchSuffix
+	lib:libiconv$secondaryArchSuffix
+	lib:libjpeg$secondaryArchSuffix
+	lib:libpng16$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	devel:libfontconfig$secondaryArchSuffix
+	devel:libfreetype$secondaryArchSuffix
+	devel:libiconv$secondaryArchSuffix
+	devel:libjpeg$secondaryArchSuffix
+	devel:libpng16$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	makefile_engine
+	cmd:g++$secondaryArchSuffix
+	cmd:gcc$secondaryArchSuffix
+	cmd:make
+	cmd:sed
+	"
+
+USER_SETTINGS_FILES="
+	settings/aobook directory
+	"
+
+BUILD()
+{
+	make -C mlib -f Makefile.haiku $jobArgs OBJ_DIR=objects
+	make -C src -f Makefile.haiku $jobArgs OBJ_DIR=objects \
+		default catalogs bindcatalogs
+}
+
+INSTALL()
+{
+	mkdir -p $appsDir
+	cp -af src/objects/aobook $appsDir/Aobook
+
+	mkdir -p $dataDir/aobook/doc
+	cp -af doc/manual.html $dataDir/aobook/doc
+
+	addAppDeskbarSymlink $appsDir/Aobook
+
+	mkdir -p $dataDir/locale/catalogs/x-vnd.azsky.aobook
+	cp src/objects/x-vnd.azsky.aobook/* \
+		$dataDir/locale/catalogs/x-vnd.azsky.aobook
+}