From 2c7b436c6097b0cd2a183fb735f15c0bc14ae363 Mon Sep 17 00:00:00 2001
From: Radu Toma <radustoma@yahoo.com>
Date: Wed, 3 Dec 2014 19:46:04 +0000
Subject: [PATCH 1/2] Updated JamMin by removing patches, which were applied to
 the JamMin repo, and fixing some build and install errors.

---
 haiku-apps/jammin/jammin-0.1.0.recipe      |  7 ++-
 haiku-apps/jammin/patches/jampatch-1.patch | 51 ----------------------
 2 files changed, 3 insertions(+), 55 deletions(-)
 delete mode 100644 haiku-apps/jammin/patches/jampatch-1.patch

diff --git a/haiku-apps/jammin/jammin-0.1.0.recipe b/haiku-apps/jammin/jammin-0.1.0.recipe
index 304c280be..06ba969d5 100644
--- a/haiku-apps/jammin/jammin-0.1.0.recipe
+++ b/haiku-apps/jammin/jammin-0.1.0.recipe
@@ -6,7 +6,7 @@ Jamfiles are also used for organizing targets— each Jamfile is a separate \
 project that can be built independently from the other projects.
 "
 HOMEPAGE="https://github.com/HaikuArchives/JamMin"
-SRC_URI="git+https://github.com/HaikuArchives/JamMin.git#681e87d6d4"
+SRC_URI="git+https://github.com/HaikuArchives/JamMin.git"
 REVISION="2"
 COPYRIGHT="2003 Guido Casiraghi"
 LICENSE="MIT"
@@ -33,11 +33,10 @@ REQUIRES="
 	haiku >= $haikuVersion
 	"
 
-PATCHES="jampatch-1.patch"
-
 
 BUILD()
 {
+	cd source
 	make OBJ_DIR=objects \
 		BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY`
 }
@@ -45,6 +44,6 @@ BUILD()
 INSTALL()
 {
 	mkdir -p $appsDir
-	cp objects/JamApp $appsDir
+	cp source/objects/JamApp $appsDir
 	addAppDeskbarSymlink $appsDir/JamApp
 }
diff --git a/haiku-apps/jammin/patches/jampatch-1.patch b/haiku-apps/jammin/patches/jampatch-1.patch
deleted file mode 100644
index ab7bb8b26..000000000
--- a/haiku-apps/jammin/patches/jampatch-1.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff --git a/JamMin.rdef b/JamMin.rdef
-index 1707392..a46587d 100644
---- a/JamMin.rdef
-+++ b/JamMin.rdef
-@@ -13,10 +13,7 @@ resource app_version {
- 	variety = B_APPV_ALPHA,
- 	internal = 0,
- 
--	short_info = "The Jamfile Administrator",
--	long_info = #'CSTR' array {
--
--	}
-+	short_info = "The Jamfile Administrator"
- };
- 
- resource app_flags B_SINGLE_LAUNCH;
-diff --git a/JamMinWindow.cpp b/JamMinWindow.cpp
-index 2b0077f..2b3c9af 100644
---- a/JamMinWindow.cpp
-+++ b/JamMinWindow.cpp
-@@ -1001,10 +1001,6 @@ JamMinWindow::IsSystemLibraryPath(BPath* libPath)
- 	//if (ret == B_OK) {
- 		if ( strcmp(libPath->Path(), path.Path()) == 0 ) return true;
- 	//}
--	ret = find_directory(B_COMMON_LIB_DIRECTORY, &path);
--	if (ret == B_OK) {
--		if ( strcmp(libPath->Path(), path.Path()) == 0 ) return true;
--	}
- 	
- 	ret = find_directory(B_USER_LIB_DIRECTORY, &path); //the same as B_COMMON_LIB_DIRECTORY
- 	if (ret == B_OK) {
-diff --git a/makefile b/makefile
-new file mode 100644
-index 0000000..8514e9d
---- /dev/null
-+++ b/makefile
-@@ -0,0 +1,14 @@
-+## JamMin makefile for Haiku OS ##
-+
-+NAME= JamApp
-+
-+TYPE= APP
-+
-+SRCS= TargetSettingsWin.cpp TargetConfig.cpp main.cpp LinkerSettingsView.cpp JMOpenFilePanel.cpp JamMinWindow.cpp JamMinApp.cpp JamFile.cpp IncludeSettingsView.cpp GeneralSettingsView.cpp CompilerSettingsView.cpp
-+RDEFS= JamMin.rdef
-+LIBS= be stdc++.r4 root tracker
-+OPTIMIZE= FULL
-+WARNINGS = ALL
-+
-+## include makefile engine
-+include $(BUILDHOME)/etc/makefile-engine

From 38bea89e7306b2fd53a22d97bc23317c22558154 Mon Sep 17 00:00:00 2001
From: Radu Toma <radustoma@yahoo.com>
Date: Thu, 4 Dec 2014 17:56:42 +0000
Subject: [PATCH 2/2] Updated JamMin recipe

---
 haiku-apps/jammin/jammin-0.1.0.recipe | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/haiku-apps/jammin/jammin-0.1.0.recipe b/haiku-apps/jammin/jammin-0.1.0.recipe
index 06ba969d5..22ebdf6a8 100644
--- a/haiku-apps/jammin/jammin-0.1.0.recipe
+++ b/haiku-apps/jammin/jammin-0.1.0.recipe
@@ -6,8 +6,8 @@ Jamfiles are also used for organizing targets— each Jamfile is a separate \
 project that can be built independently from the other projects.
 "
 HOMEPAGE="https://github.com/HaikuArchives/JamMin"
-SRC_URI="git+https://github.com/HaikuArchives/JamMin.git"
-REVISION="2"
+SRC_URI="git+https://github.com/HaikuArchives/JamMin.git#85ce20ccc0"
+REVISION="3"
 COPYRIGHT="2003 Guido Casiraghi"
 LICENSE="MIT"