From 3f14b4c88b89ca79cc3b6b17b009f2651cef83ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Fri, 27 Dec 2013 21:50:21 +0100
Subject: [PATCH] jamvm: Update recipe

---
 dev-java/jamvm/jamvm-1.5.4.recipe | 54 ++++++++++++++++++++++++-------
 1 file changed, 43 insertions(+), 11 deletions(-)

diff --git a/dev-java/jamvm/jamvm-1.5.4.recipe b/dev-java/jamvm/jamvm-1.5.4.recipe
index 771a21d35..2308cea60 100644
--- a/dev-java/jamvm/jamvm-1.5.4.recipe
+++ b/dev-java/jamvm/jamvm-1.5.4.recipe
@@ -1,28 +1,60 @@
-DESCRIPTION="JamVM" 
-HOMEPAGE="http://jamvm.sourceforge.net" 
+SUMMARY="JamVM"
+DESCRIPTION="JamVM is a new Java Virtual Machine which conforms to the JVM specification version 2 (blue book).
+	In comparison to most other VM's (free and commercial) it is extremely small,"
+HOMEPAGE="http://jamvm.sourceforge.net/" 
 SRC_URI="http://sourceforge.net/projects/jamvm/files/jamvm/JamVM%201.5.4/jamvm-1.5.4.tar.gz/download"
 REVISION="1"
-STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="7654e9657691f5f09c4f481ed4686176"
-MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."
+LICENSE="GNU GPL v2"
+COPYRIGHT="2003-2010 Robert Lougher"
+
+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="
+	jamvm$secondaryArchSuffix = $portVersion
+	cmd:jamvm$secondaryArchSuffix = $portVersion
+	lib:libjvm_x86
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:libz$secondaryArchSuffix >= 1.2.8
+	"
+BUILD_PREREQUIRES="
+	cmd:autoconf
+	cmd:aclocal
+	cmd:libtool
+	cmd:make
+	cmd:gcc$secondaryArchSuffix
+	"
+
+
+PATCHES="jamvm-1.5.4.patch"
 
 BUILD()
 {
-	cd jamvm-1.5.4
 	libtoolize --force --copy --install
 	aclocal
 	autoconf
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
-		--with-classpath-install-dir=`finddir B_COMMON_DIRECTORY`
+	runConfigure ./configure \
+		--with-classpath-install-dir=
 	make
 }
 
 INSTALL()
 {
-	cd jamvm-1.5.4
 	make install
+	prepareInstalledDevelLibs
 }
-
-LICENSE="GNU GPL v2"
-COPYRIGHT="2003-2010 Robert Lougher"