From b44b238d95ab58dc88f5fc0c431c6128ee2eb158 Mon Sep 17 00:00:00 2001
From: Scott McCreary <scottmc2@gmail.com>
Date: Sat, 14 Dec 2013 10:35:10 +0000
Subject: [PATCH] Added more requires to yab, but still not building.

---
 haiku-apps/yab/patches/yab-1.6.patch | 20 ---------------
 haiku-apps/yab/patches/yab-1.7.patch | 27 --------------------
 haiku-apps/yab/yab-1.7.recipe        | 38 +++++++++++++---------------
 3 files changed, 18 insertions(+), 67 deletions(-)
 delete mode 100644 haiku-apps/yab/patches/yab-1.6.patch
 delete mode 100644 haiku-apps/yab/patches/yab-1.7.patch

diff --git a/haiku-apps/yab/patches/yab-1.6.patch b/haiku-apps/yab/patches/yab-1.6.patch
deleted file mode 100644
index e3b3ee9e5..000000000
--- a/haiku-apps/yab/patches/yab-1.6.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -urN yab-1.6/src/Makefile yab-1.6-haiku/src/Makefile
---- yab-1.6/src/Makefile	2009-10-23 21:02:10.031195136 +0000
-+++ yab-1.6-haiku/src/Makefile	2011-06-01 16:17:53.000000000 +0000
-@@ -45,7 +45,7 @@
- ##
- ## Libraries
- ##
--LIBPATH = -L/boot/home/config/lib  
-+LIBPATH = -L/$(shell finddir B_COMMON_LIB_DIRECTORY)
- #-L/boot/home/yab/CalendarControl.a
- LIB = -lncurses -lbe -lroot -ltranslation -ltracker -lmedia $(ZETALIB)
- 
-@@ -98,6 +98,7 @@
- main.o: main.c yabasic.h config.h 
- 	$(GCC) $(GCC_OPT) -c main.c -o main.o
- flex.c: yabasic.flex
-+	chmod 755 ./flex
- 	./flex $(FLEXFLAGS) -t yabasic.flex >flex.c
- bison.c: yabasic.bison 
- 	bison $(BISONFLAGS) --output-file bison.c yabasic.bison  
diff --git a/haiku-apps/yab/patches/yab-1.7.patch b/haiku-apps/yab/patches/yab-1.7.patch
deleted file mode 100644
index 47dc5d7cd..000000000
--- a/haiku-apps/yab/patches/yab-1.7.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- apps/yab-1.7/src/Makefile	2012-01-24 07:55:38.018087936 -0800
-+++ /boot/home/Makefile	2013-10-21 14:17:35.131334144 -0700
-@@ -38,14 +38,14 @@
- ## GCC Options
- ##
- GCC = gcc
--GCC_OPT = $(DBG) $(OPT) -I. -I/boot/home/config/include/ -I/boot/home/config/include/ncurses/ -DHAVE_CONFIG -DUNIX $(HAIKUOPT)
-+GCC_OPT = $(DBG) $(OPT) -I. -I/$(shell finddir B_SYSTEM_HEADERS_DIRECTORY) -DHAVE_CONFIG -DUNIX $(HAIKUOPT)
- GPP = g++
- GPP_OPT = $(DBG) $(OPT) -I. -DHAVE_CONFIG -DUNIX $(HAIKUOPT)
- 
- ##
- ## Libraries
- ##
--LIBPATH = -L/boot/home/config/lib  
-+LIBPATH = -L/$(shell finddir B_SYSTEM_LIB_DIRECTORY)
- LIB = -lncurses -lbe -lroot -ltranslation -ltracker -lmedia -llocale 
- 
- ## flags for flex (-d for debugging)
-@@ -97,6 +97,7 @@
- main.o: main.c yabasic.h config.h 
- 	$(GCC) $(GCC_OPT) -c main.c -o main.o
- flex.c: yabasic.flex
-+	chmod 755 ./flex
- 	./flex $(FLEXFLAGS) -t yabasic.flex >flex.c
- bison.c: yabasic.bison 
- 	bison $(BISONFLAGS) --output-file bison.c yabasic.bison  
diff --git a/haiku-apps/yab/yab-1.7.recipe b/haiku-apps/yab/yab-1.7.recipe
index 30b286d03..f2a6efff2 100644
--- a/haiku-apps/yab/yab-1.7.recipe
+++ b/haiku-apps/yab/yab-1.7.recipe
@@ -1,17 +1,17 @@
 SUMMARY="yab is an extended version of yabsic, a BASIC programming language"
-DESCRIPTION="yab is an extended version of yabasic, a BASIC programming language, with special commands designed for BeOS, Haiku and Zeta." 
-HOMEPAGE="http://sourceforge.net/projects/yab-interpreter" 
-SRC_URI="http://ports-space.haiku-files.org/source/yab-1.7.zip"
+DESCRIPTION="yab is an extended version of yabasic, a BASIC programming language, with special commands designed for BeOS, Haiku and Zeta."
+HOMEPAGE="http://sourceforge.net/projects/yab-interpreter"
+SRC_URI="git+https://github.com/HaikuArchives/Yab.git"
 REVISION="2"
-CHECKSUM_MD5="2b465895d9eb2e8383f035dd67b88a20"
+#CHECKSUM_MD5="2b465895d9eb2e8383f035dd67b88a20"
 LICENSE="Artistic
 	GNU GPL v2"
 COPYRIGHT="1995-2006 Marc-Oliver Ihm (yabasic)
 	2006-2009 Jan Bungeroth (yab improvements)"
-	
-ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
 
-SOURCE_DIR="yab-$portVersion"
+ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64"
+
+#SOURCE_DIR="yab-$portVersion"
 
 PROVIDES="
 	cmd:yab
@@ -20,32 +20,30 @@ PROVIDES="
 REQUIRES="
 	haiku >= $haikuVersion
 	"
-	
+
 BUILD_REQUIRES="
-	haiku_devel
+	haiku_devel >= $haikuVersion
 	"
-	
+
 BUILD_PREREQUIRES="
-	haiku
+	cmd:bison
+	cmd:flex
 	cmd:gcc
 	cmd:make
+	cmd:mkdepend
+	cmd:perl
+	makefile_engine
 	"
 
 BUILD()
 {
-	ls
-	ls apps
-	ls apps/yab-${portVersion}
-	
-	cd apps/yab-${portVersion}/src
-	make clean
-	make
+	cd src
+	make $jobArgs BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY`
 }
 
 INSTALL()
 {
-	ls -r
-	$YABDIR=`FINDDIR(B_APPS_DIRECTORY`/yab
+	$YABDIR=$appsDir/yab
 	mkdir -p ${YABDIR}
 	cp -a ${YABDIR}apps/yab
 	cp -a Documentation ${YABDIR}