From 25e1cc7166cc9dcc2c7a63a50039807e26064fca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Mon, 18 Feb 2019 19:46:14 +0100
Subject: [PATCH] Cleanup

---
 generic/additional-files/projectx.rdef.in     |  2 +-
 generic/generic_cmd-1.2.3.recipe              | 13 ++++++-------
 .../generic_cmd_secondary_arch-1.2.3.recipe   | 19 +++++++++----------
 generic/generic_font-1.2.3.recipe             | 14 +++-----------
 4 files changed, 19 insertions(+), 29 deletions(-)

diff --git a/generic/additional-files/projectx.rdef.in b/generic/additional-files/projectx.rdef.in
index d8044441..c2ee6c52 100644
--- a/generic/additional-files/projectx.rdef.in
+++ b/generic/additional-files/projectx.rdef.in
@@ -9,7 +9,7 @@ resource app_version {
 	variety = B_APPV_FINAL,
 	internal = 0,
 
-	short_info = "Audacious",
+	short_info = "Project X",
 	long_info = "@LONG_INFO@"
 };
 
diff --git a/generic/generic_cmd-1.2.3.recipe b/generic/generic_cmd-1.2.3.recipe
index 4185b523..3e1967c9 100644
--- a/generic/generic_cmd-1.2.3.recipe
+++ b/generic/generic_cmd-1.2.3.recipe
@@ -15,9 +15,12 @@ SOURCE_URI="https://github.com/HaikuArchives/ProjectX/archive/projectx-$portVers
 CHECKSUM_SHA256="000000000000000000000000000000000"
 SOURCE_DIR="$portVersionedName"
 PATCHES="projectx-$portVersion.patchset"
-ADDITIONAL_FILES="projectx.rdef"
 
-ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64"
+ARCHITECTURES="?all"
+
+GLOBAL_WRITABLE_FILES="
+	settings/projectx.conf keep-old
+	"
 
 PROVIDES="
 	projectx = $portVersion
@@ -35,12 +38,8 @@ BUILD_PREREQUIRES="
 	cmd:gcc
 	"
 
-GLOBAL_WRITABLE_FILES="
-	settings/projectx.conf keep-old
-	"
-
 defineDebugInfoPackage projectx \
-	"$commandBinDir"/projectx
+	"$binDir"/projectx
 
 BUILD()
 {
diff --git a/generic/generic_cmd_secondary_arch-1.2.3.recipe b/generic/generic_cmd_secondary_arch-1.2.3.recipe
index d2e417cf..495ff62b 100644
--- a/generic/generic_cmd_secondary_arch-1.2.3.recipe
+++ b/generic/generic_cmd_secondary_arch-1.2.3.recipe
@@ -15,9 +15,8 @@ SOURCE_URI="https://github.com/HaikuArchives/ProjectX/archive/projectx-$portVers
 CHECKSUM_SHA256="000000000000000000000000000000000"
 SOURCE_DIR="$portVersionedName"
 PATCHES="projectx-$portVersion.patchset"
-ADDITIONAL_FILES="projectx.rdef"
 
-ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64"
+ARCHITECTURES="?all ?x86_gcc2"
 SECONDARY_ARCHITECTURES="?x86"
 
 # On x86_gcc2 we don't want to install the commands in bin/<arch>/, but in bin/.
@@ -28,24 +27,24 @@ if [ "$targetArchitecture" = x86_gcc2 ]; then
 	commandBinDir=$prefix/bin
 fi
 
+GLOBAL_WRITABLE_FILES="
+	settings/projectx.conf keep-old
+	"
+
 PROVIDES="
-	projectx = $portVersion
+	projectx$secondaryArchSuffix = $portVersion
 	cmd:projectx$commandSuffix = $portVersion
 	"
 REQUIRES="
-	haiku
+	haiku$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	haiku_devel
+	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
 	cmd:make
-	cmd:gcc
-	"
-
-GLOBAL_WRITABLE_FILES="
-	settings/projectx.conf keep-old
+	cmd:gcc$secondaryArchSuffix
 	"
 
 defineDebugInfoPackage projectx \
diff --git a/generic/generic_font-1.2.3.recipe b/generic/generic_font-1.2.3.recipe
index f58b27c5..32b27de9 100644
--- a/generic/generic_font-1.2.3.recipe
+++ b/generic/generic_font-1.2.3.recipe
@@ -19,18 +19,10 @@ DISABLE_SOURCE_PACKAGE=yes
 PROVIDES="
 	generic_font = $portVersion
 	"
-REQUIRES="
-	"
-
-BUILD_REQUIRES="
-	"
-BUILD_PREREQUIRES="
-	"
+REQUIRES=""
 
-BUILD()
-{
-	: # means nothing.
-}
+BUILD_REQUIRES=""
+BUILD_PREREQUIRES=""
 
 INSTALL()
 {