From 30817cc0490cacb2accc2494f169e5843a18515e Mon Sep 17 00:00:00 2001
From: Humdinger <humdingerb@gmail.com>
Date: Thu, 18 Dec 2014 08:33:39 +0100
Subject: [PATCH 1/2] Smallish changes in the Paladin recipe:

* With changes in Paladin's source, we can now build for gcc4.
* Added "lua" to REQUIREMENT and "luagrep" and "luare" to PROVIDES.
  This enables the feature to find and replace strings in a project.
* Removed "SymbolFinder" from the Deskbar. It's normally started from
  Paladin's menu.
* Improved summary.
* Changed HOMEPAGE address to HaikuArchives.
---
 haiku-apps/paladin/paladin-git.recipe | 49 +++++++++++++++++++--------
 1 file changed, 34 insertions(+), 15 deletions(-)

diff --git a/haiku-apps/paladin/paladin-git.recipe b/haiku-apps/paladin/paladin-git.recipe
index 4e16a8cf5..0897e3235 100644
--- a/haiku-apps/paladin/paladin-git.recipe
+++ b/haiku-apps/paladin/paladin-git.recipe
@@ -1,9 +1,27 @@
-SUMMARY="Paladin is an open source integrated development environment (IDE)"
+SUMMARY="An open source integrated development environment (IDE)"
 DESCRIPTION="Paladin is an open source integrated development environment (IDE) \
-modeled after BeOS' BeIDE."
-HOMEPAGE="http://paladin.sourceforge.net"
-SRC_URI="git://github.com/HaikuArchives/Paladin#8929011"
-REVISION="4"
+modeled after BeOS' BeIDE.
+
+Paladin's feature set includes:
+
+- Command-line build support
+- Multithreaded builds
+- Revision control-friendly project files
+- More run options for projects
+- Explicit support for debugging with gdb under Haiku
+- Bundled helper tools
+- Streamlined project settings
+- Out-of-the-box support for Lex and Yacc
+- Support for text and binary resource files
+- Projects can include notes and other files that aren't source code
+- Project templates
+- Out-of-the-box makefile generation
+- Integrated source code management
+- 1-click project backups
+"
+HOMEPAGE="http://github.com/HaikuArchives/Paladin"
+SRC_URI="git://github.com/HaikuArchives/Paladin#dd61cdf"
+REVISION="5"
 LICENSE="MIT"
 COPYRIGHT="2001-2010 DarkWyrm
 	       2014 John Scipione
@@ -14,20 +32,22 @@ SECONDARY_ARCHITECTURES="x86_gcc2 x86 x86_64"
 
 PROVIDES="
 	paladin = $portVersion
-	app:Paladin = $portVersion
-	app:SymbolFinder = $portVersion
+	app:Paladin
+	app:SymbolFinder
+	cmd:luagrep
+	cmd:luare
 	"
 
 REQUIRES="
-	haiku
-	lib:libpcre
-	lib:libz
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libpcre$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	cmd:lua
 	"
 
 BUILD_REQUIRES="
-	haiku_devel
-	devel:libpcre
-	devel:libz
+	devel:libpcre$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
 	"
 
 BUILD_PREREQUIRES="
@@ -49,14 +69,13 @@ BUILD()
 INSTALL()
 {
 	mkdir -p $appsDir/Paladin $appsDir/Paladin/Documentation
-	mkdir -p $libDir
 	mkdir -p $binDir
 
 	cp -r Documentation $appsDir/Paladin
 	rm $appsDir/Paladin/Documentation/KeltFont.zip
 	cp -r Paladin/Paladin Paladin/Templates $appsDir/Paladin/
 	cp SymbolFinder/SymbolFinder $appsDir/Paladin/
+	cp luagrep luare $binDir
 
 	addAppDeskbarSymlink $appsDir/Paladin/Paladin Paladin
-	addAppDeskbarSymlink $appsDir/Paladin/SymbolFinder SymbolFinder
 }

From 55cab3f6473a26fb06b640d5aae0e90fd87e6264 Mon Sep 17 00:00:00 2001
From: Humdinger <humdingerb@gmail.com>
Date: Mon, 22 Dec 2014 10:10:43 +0100
Subject: [PATCH 2/2] Removed $haikuVersion from REQUIRES and
 BUILD_PREREQUIRES.

Not needed anymore after commit 35a5732 to haikuporter.
---
 haiku-apps/paladin/paladin-git.recipe | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/haiku-apps/paladin/paladin-git.recipe b/haiku-apps/paladin/paladin-git.recipe
index 0897e3235..c0e9c7240 100644
--- a/haiku-apps/paladin/paladin-git.recipe
+++ b/haiku-apps/paladin/paladin-git.recipe
@@ -39,7 +39,7 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
+	haiku$secondaryArchSuffix
 	lib:libpcre$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	cmd:lua
@@ -51,7 +51,7 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld
 	cmd:find