From 64780ffaeba68c1e8c98627ed91a1ead86a02432 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Fri, 18 Apr 2014 18:43:07 +0200
Subject: [PATCH] Yab: fixes and cleanup

* Fix some typos
* Shorten summary
* Add deskbar symlink
* Symlink documentation instead of duplicating it.
---
 dev-lang/yab/yab-1.7.02.recipe          | 18 ++++--------------
 haiku-apps/yab_ide/yab_ide-2.2.1.recipe | 25 +++++++++++++++----------
 2 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/dev-lang/yab/yab-1.7.02.recipe b/dev-lang/yab/yab-1.7.02.recipe
index 45caf7219..cd45c0cbc 100644
--- a/dev-lang/yab/yab-1.7.02.recipe
+++ b/dev-lang/yab/yab-1.7.02.recipe
@@ -1,4 +1,4 @@
-SUMMARY="yab is an extended version of yabsic, a BASIC programming language"
+SUMMARY="extended version of the yabsic programming language"
 DESCRIPTION="
 yab is an extended version of yabasic, a BASIC programming language, with \
 special commands designed for Haiku.
@@ -13,15 +13,13 @@ LICENSE="Artistic"
 
 COPYRIGHT="1995-2006 Marc-Oliver Ihm (yabasic)
 	2006-2009 Jan Bungeroth (yab improvements)
-	2013 Jim Saxton ( yab improvements)"
+	2013 Jim Saxton (yab improvements)"
 
 ARCHITECTURES="x86_gcc2 x86 ?x86_64"
-#SOURCE_DIR="yab-$portVersion"
 
 PROVIDES="
 	yab = $portVersion compat >=1.7.02 
 	cmd:yab= $portVersion compat >=1.7.02 
-	
 	"
 
 REQUIRES="
@@ -57,21 +55,13 @@ BUILD()
 
 INSTALL()
 {	
-	
-		
 	mkdir -p $binDir
-	
 	cp tmp/yab  $binDir/
 	
-	mkdir -p $documentationDir
-	
-	cp -r Documentation/ $documentationDir/yab-1.7.02
-	
 	mkdir -p $appsDir/yab-IDE
-
 	cp -r src $appsDir/yab-IDE/src
 	cp -r Documentation $appsDir/yab-IDE/Documentation
-	
 
-	
+	mkdir -p $documentationDir
+	ln -s $appsDir/yab-IDE/Documentation $documentationDir/yab-1.7.02
 }
diff --git a/haiku-apps/yab_ide/yab_ide-2.2.1.recipe b/haiku-apps/yab_ide/yab_ide-2.2.1.recipe
index 0a2e295dc..3352b6916 100644
--- a/haiku-apps/yab_ide/yab_ide-2.2.1.recipe
+++ b/haiku-apps/yab_ide/yab_ide-2.2.1.recipe
@@ -1,6 +1,10 @@
-SUMMARY="Yab ide is an integrated development environment for yab. "
+SUMMARY="integrated development environment for yab."
 DESCRIPTION="
-Yab allows fast prototyping with simple and clean code. yab contains a large number of BeAPI specific commands for GUI creation and much, much more.
+Yab allows fast prototyping with simple and clean code. yab contains a large \
+number of BeAPI specific commands for GUI creation and much, much more.
+
+yab wouldn't be complete without the yab-IDE, a powerful development \
+environment, which of course is programmed in yab itself.
 "
 HOMEPAGE="http://sourceforge.net/projects/yab-interpreter"
 SRC_URI="git+https://github.com/HaikuArchives/Yab.git#a5681d8a3403c142eae0ad416a59abd2aa7a28e4"
@@ -9,13 +13,10 @@ REVISION="2"
 LICENSE="Artistic"
 COPYRIGHT="1995-2006 Marc-Oliver Ihm (yabasic)
 	2006-2009 Jan Bungeroth (yab improvements)
-	2013 Jim Saxton ( yab improvements)"
+	2013 Jim Saxton (yab improvements)"
 
 ARCHITECTURES="x86_gcc2 x86 ?x86_64"
 
-
-#SOURCE_DIR="yab_ide-$portVersion"
-
 PROVIDES="
 	yab_ide$secondaryArchSuffix = $portVersion
 		"
@@ -23,7 +24,7 @@ PROVIDES="
 REQUIRES="
 	haiku$secondaryArchSuffix >= $haikuVersion
 	lib:libncurses$secondaryArchSuffix
-	yab$secondaryArchSuffix >=1.7.02 
+	yab$secondaryArchSuffix >= 1.7.02 
 	devel:libncurses$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix	
 	"
@@ -57,16 +58,20 @@ INSTALL()
 	mkdir -p $binDir
 	mkdir -p tmp
 	mkdir -p tmp/buildfactory
+
 	cp -r src/* tmp/buildfactory
 	cp -r yab-IDE/BuildFactory/* tmp/buildfactory/
 	unzip -o tmp/buildfactory/parts/yabstuff.zip -d tmp/buildfactory/parts
 	cp yab-IDE/src/yab-IDE.yab  tmp/buildfactory/	
-	cd tmp/buildfactory
+
+	pushd tmp/buildfactory
 	BuildFactory.yab yab-IDE yab-IDE.yab application/x-vnd.yab-IDE	
-	cd ..
-	cd ..
+	popd
+
 	mkdir -p $appsDir
 	cp -r yab-IDE/ $appsDir/
 	cp  tmp/buildfactory/yab-IDE $appsDir/yab-IDE/
 	cp yab-IDE/src/yab-IDE.yab $appsDir/yab-IDE/src/
+
+	addAppDeskbarSymlink $appsDir/yab-IDE/yab-IDE "Yab IDE"
 }