From db2f18c1264a1dbc0415f74a62e6133c062b59b1 Mon Sep 17 00:00:00 2001
From: Augustin Cavalier <waddlesplash@gmail.com>
Date: Fri, 5 Dec 2014 11:59:41 -0500
Subject: [PATCH] ResourceEdit: create working recipe.

---
 .../resourceedit/resourceedit-1.0_git.recipe  | 46 ++++++++++++++++
 haiku-apps/resourceedit/resourceedit-1.recipe | 52 -------------------
 2 files changed, 46 insertions(+), 52 deletions(-)
 create mode 100644 haiku-apps/resourceedit/resourceedit-1.0_git.recipe
 delete mode 100644 haiku-apps/resourceedit/resourceedit-1.recipe

diff --git a/haiku-apps/resourceedit/resourceedit-1.0_git.recipe b/haiku-apps/resourceedit/resourceedit-1.0_git.recipe
new file mode 100644
index 000000000..d1b8a0cc2
--- /dev/null
+++ b/haiku-apps/resourceedit/resourceedit-1.0_git.recipe
@@ -0,0 +1,46 @@
+SUMMARY="Graphical RSRC resource editor"
+DESCRIPTION="An editor for binary resource files (.rsrc) that get compiled \
+into an application and can then be used within the application."
+HOMEPAGE="https://github.com/HaikuArchives/ResourceEdit"
+LICENSE="MIT"
+COPYRIGHT="2012-2013 Tri-Edge AI"
+SRC_URI="https://github.com/HaikuArchives/ResourceEdit/archive/8c3f779d08525ed1e607627213278436a0502125.tar.gz"
+CHECKSUM_SHA256="848b4e6d8a30737793d858d95360d33219efa615635b0b79c845bc4b78f6a64b"
+SOURCE_DIR="ResourceEdit-8c3f779d08525ed1e607627213278436a0502125"
+REVISION="1"
+
+ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+
+PROVIDES="
+	resourceedit = $portVersion
+	app:ResourceEdit = $portVersion
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	"
+BUILD_PREREQUIRES="
+	makefile_engine
+	cmd:gcc
+	cmd:ld
+	cmd:make
+	cmd:mkdepend
+	"
+
+BUILD()
+{
+	cd source
+	make $jobArgs OBJ_DIR=objects
+}
+
+INSTALL()
+{
+	cd source
+	mkdir -p $appsDir
+	cp objects/ResourceEdit $appsDir
+	addAppDeskbarSymlink $appsDir/ResourceEdit
+}
diff --git a/haiku-apps/resourceedit/resourceedit-1.recipe b/haiku-apps/resourceedit/resourceedit-1.recipe
deleted file mode 100644
index 76bd028e5..000000000
--- a/haiku-apps/resourceedit/resourceedit-1.recipe
+++ /dev/null
@@ -1,52 +0,0 @@
-DESCRIPTION="
-This is an editor for resource files (.rsrc), binary files that get compiled \
-into an application and can then be accessed by that application.
-"
-SUMMARY="Resource editor"
-HOMEPAGE="https://github.com/HaikuArchives/ResourceEdit"
-LICENSE="MIT"
-COPYRIGHT="2012-2013 Tri-Edge AI"
-SRC_URI="git+https://github.com/HaikuArchives/ResourceEdit.git#1873c33591e2d2ccb3dccb692c175e9f10a0e450"
-REVISION="1"
-
-ARCHITECTURES="!x86 ?x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	# x86_gcc2 is fine as primary target architecture as long as we're building
-	# for a different secondary architecture.
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-else
-	ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
-fi
-SECONDARY_ARCHITECTURES="!x86"
-
-PROVIDES="
-	resourceedit$secondaryArchSuffix = $portVersion
-	app:ResourceEdit = $portVersion
-	"
-
-REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
-	"
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
-	"
-BUILD_PREREQUIRES="
-	makefile_engine
-	cmd:gcc$secondaryArchSuffix
-	cmd:ld$secondaryArchSuffix
-	cmd:make
-	cmd:mkdepend
-	"
-	
-BUILD()
-{
-	make
-}
-
-INSTALL()
-{
-	# supports "x86" architecture only
-	mkdir $appsDir
-	cp objects.x86-gcc4-release/ResourceEdit $appsDir
-	addAppDeskbarSymlink $appsDir/ResourceEdit
-}