From 7a07a8d0681d6e7365073fccba8b6738835a2d1b Mon Sep 17 00:00:00 2001
From: Scott McCreary <scottmc2@gmail.com>
Date: Sat, 4 Sep 2010 22:18:19 +0000
Subject: [PATCH] Updated paladin bep and patch file

---
 haiku-apps/paladin/paladin-1.3.bep           | 22 ++++------
 haiku-apps/paladin/patches/paladin-1.3.patch | 43 +++-----------------
 2 files changed, 15 insertions(+), 50 deletions(-)

diff --git a/haiku-apps/paladin/paladin-1.3.bep b/haiku-apps/paladin/paladin-1.3.bep
index db0fd2a99..63231b76c 100644
--- a/haiku-apps/paladin/paladin-1.3.bep
+++ b/haiku-apps/paladin/paladin-1.3.bep
@@ -4,35 +4,31 @@ SRC_URI="http://sourceforge.net/projects/paladin/files/Paladin-1.3.src.zip/downl
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="dev-libs/libpcre >= 8.02"
-CHECKSUM_MD5="36ad2e8dfa71218b37a469311c09c408"
+CHECKSUM_MD5="5cf4b445f77626f71956ccc325ed77dc"
 BUILD {
-	cd Paladin
+	cd Paladin-1.3.src/Paladin
 	chmod 755 buildhaikugcc2.sh
 	chmod 755 buildhaikugcc4.sh
 	if [ -n "$(setgcc | grep '2')" ]; then
-    		./buildhaikugcc2.sh
-		cd ../SymbolFinder
-		../Paladin/Paladin -r -d SymbolFinder.pld
+   		./buildhaikugcc2.sh
 	else
 		./buildhaikugcc4.sh
-		cd ../SymbolFinder
-		make		
 	fi
+	cd ../SymbolFinder
+	../Paladin/Paladin -r -d SymbolFinder.pld
 	cd ../PalEdit
 	jam
 }
 
 INSTALL {
+	cd Paladin-1.3.src
 	mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Paladin
 	cp -f Paladin/Paladin ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Paladin/
 	cp -f Paladin/WHAT* ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Paladin/
 	cp -f Paladin/README ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Paladin/
+	cp -f -r Paladin/Templates ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Paladin/
 	cp -f -r PalEdit/generated/distro/* ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Paladin/
-	if [ -n "$(setgcc | grep '2')" ]; then
-		cp -f SymbolFinder/SymbolFinder ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Paladin/
-	else
-		cp -f SymbolFinder/objects.x86-gcc4-release/SymbolFinder ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Paladin/
-	fi
+	cp -f SymbolFinder/SymbolFinder ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Paladin/
 }
 LICENSE="MIT"
-COPYRIGHT="2008-2010 Jon Yoder"
+COPYRIGHT="2008-2010 DarkWyrm"
diff --git a/haiku-apps/paladin/patches/paladin-1.3.patch b/haiku-apps/paladin/patches/paladin-1.3.patch
index 6e818346d..75964e55c 100644
--- a/haiku-apps/paladin/patches/paladin-1.3.patch
+++ b/haiku-apps/paladin/patches/paladin-1.3.patch
@@ -1,6 +1,6 @@
-diff -urN PalEdit/Jamfile PalEdit-jam/Jamfile
---- PalEdit/Jamfile	1970-01-01 00:00:00.000000000 +0000
-+++ PalEdit-jam/Jamfile	2010-09-02 05:47:38.009175040 +0000
+diff -urN Paladin-1.3.src/PalEdit/Jamfile PalEdit-jam/Jamfile
+--- Paladin-1.3.src/PalEdit/Jamfile	1970-01-01 00:00:00.000000000 +0000
++++ Paladin-1.3.src/PalEdit-jam/Jamfile	2010-09-02 05:47:38.009175040 +0000
 @@ -0,0 +1,10 @@
 +SubDir TOP ;
 +
@@ -12,9 +12,9 @@ diff -urN PalEdit/Jamfile PalEdit-jam/Jamfile
 +
 +MakeDistro distro ;
 +
-diff -urN PalEdit/Jamrules PalEdit-jam/Jamrules
---- PalEdit/Jamrules	1970-01-01 00:00:00.000000000 +0000
-+++ PalEdit-jam/Jamrules	2010-09-02 05:47:45.931921920 +0000
+diff -urN Paladin-1.3.src/PalEdit/Jamrules Paladin-1.3.src/PalEdit-jam/Jamrules
+--- Paladin-1.3.src/PalEdit/Jamrules	1970-01-01 00:00:00.000000000 +0000
++++ Paladin-1.3.src/PalEdit-jam/Jamrules	2010-09-02 05:47:45.931921920 +0000
 @@ -0,0 +1,67 @@
 +
 +# The directories used by the build.
@@ -83,34 +83,3 @@ diff -urN PalEdit/Jamrules PalEdit-jam/Jamrules
 +	cp -a $(COMMON_FOLDER)/lib/libpcre*.so $(DISTRO_DIR)/lib/ ;
 +}
 +
-diff -urN SymbolFinder/Makefile SymbolFinder-gcc4/Makefile
---- SymbolFinder/Makefile	1970-01-01 00:00:00.000000000 +0000
-+++ SymbolFinder-gcc4/Makefile	2010-09-03 15:40:49.521666560 +0000
-@@ -0,0 +1,27 @@
-+NAME= SymbolFinder
-+TYPE= APP
-+SRCS= App.cpp DPath.cpp DWindow.cpp MainWindow.cpp
-+RSRCS=
-+LIBS= /boot/develop/lib/x86/libroot.so /boot/develop/lib/x86/libbe.so /boot/system/lib/gcc4/libstdc++.so /boot/develop/lib/x86/libsupc++.so /boot/develop/lib/x86/libstdc++.so
-+LIBPATHS=
-+SYSTEM_INCLUDE_PATHS= /boot/develop/headers/be /boot/develop/headers/cpp /boot/develop/headers/posix /boot/home/config/include
-+LOCAL_INCLUDE_PATHS=
-+OPTIMIZE=FULL
-+#	specify any preprocessor symbols to be defined.  The symbols will not
-+#	have their values set automatically; you must supply the value (if any)
-+#	to use.  For example, setting DEFINES to "DEBUG=1" will cause the
-+#	compiler option "-DDEBUG=1" to be used.  Setting DEFINES to "DEBUG"
-+#	would pass "-DDEBUG" on the compiler's command line.
-+DEFINES=
-+#	specify special warning levels
-+#	if unspecified default warnings will be used
-+#	NONE = supress all warnings
-+#	ALL = enable all warnings
-+WARNINGS =
-+# Build with debugging symbols if set to TRUE
-+SYMBOLS=
-+COMPILER_FLAGS=
-+LINKER_FLAGS=
-+
-+## include the makefile-engine
-+include $(BUILDHOME)/etc/makefile-engine