- update to 0.9.9.1

- add build dependencies on bison and flex

while here:
- trim Makefile header
- remove redundant tabs in Makefile
- use SF shortcut in MASTER_SITES
- remove indefinite article from COMMENT
- remove exclicit dependency on qmake, since it is already defined in USE_QT4
- change BUILD_DEPENDS usage to more common
- remove trailing whitespace in pkg-descr

PR:		172583
Submitted by:	Fernando <fernando.apesteguia at gmail dot com> (maintainer)
Feature safe:	yes

5 files changed, 45 insertions, 36 deletions

diff --git a/lang/basic256/Makefile b/lang/basic256/Makefile
index ea2ccc54ba08..cfa44f7d74a5 100644
--- a/lang/basic256/Makefile
+++ b/lang/basic256/Makefile
@@ -1,33 +1,28 @@
-# New ports collection makefile for:	BASIC256
-# Date created:                Aug 17 2011
-# Whom:                        Fernando Apesteguia <fernando.apesteguia@gmail.com>
-#
+# Created by: Fernando Apesteguia <fernando.apesteguia@gmail.com>
 # $FreeBSD$
 
-PORTNAME=		basic256
-PORTVERSION=		0.9.6.69a
-CATEGORIES=		lang
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	kidbasic/basic256
-DISTNAME=		${PORTNAME}_${PORTVERSION}
-EXTRACT_SUFX=		.tgz
+PORTNAME=	basic256
+PORTVERSION=	0.9.9.1
+CATEGORIES=	lang
+MASTER_SITES=	SF
+MASTER_SITE_SUBDIR=	kidbasic/${PORTNAME}
+DISTNAME=	${PORTNAME}_${PORTVERSION}
+EXTRACT_SUFX=	.tgz
 
-MAINTAINER=		fernando.apesteguia@gmail.com
-COMMENT=		An easy to use BASIC language and IDE for education
+MAINTAINER=	fernando.apesteguia@gmail.com
+COMMENT=	Easy to use BASIC language and IDE for education
 
-BUILD_DEPENDS=		espeak:${PORTSDIR}/audio/espeak
-BUILD_DEPENDS+=		sqlite3:${PORTSDIR}/databases/sqlite3
-BUILD_DEPENDS+=		qmake-qt4:${PORTSDIR}/devel/qmake4
+BUILD_DEPENDS=	espeak:${PORTSDIR}/audio/espeak \
+		sqlite3:${PORTSDIR}/databases/sqlite3 \
+		flex:${PORTSDIR}/textproc/flex
 
-WRKSRC=			${WRKDIR}
+WRKSRC=		${WRKDIR}
 
-USE_SDL=		sdl mixer
-
-USE_QT4=		corelib gui network xml webkit moc_build qmake_build rcc_build uic_build
-
-USE_DOS2UNIX=		yes
-
-HAS_CONFIGURE=		yes
+USE_BISON=	build
+USE_SDL=	sdl mixer
+USE_QT4=	corelib gui network xml webkit moc_build qmake_build rcc_build uic_build
+USE_DOS2UNIX=	yes
+HAS_CONFIGURE=	yes
 
 do-configure:
 	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
diff --git a/lang/basic256/distinfo b/lang/basic256/distinfo
index 4648515c0f6f..f88e21c77e67 100644
--- a/lang/basic256/distinfo
+++ b/lang/basic256/distinfo
@@ -1,2 +1,2 @@
-SHA256 (basic256_0.9.6.69a.tgz) = 38a2246081d6d5572aeffe737ac4db4575f656705ee4479d4322e8bdd45f9140
-SIZE (basic256_0.9.6.69a.tgz) = 15708072
+SHA256 (basic256_0.9.9.1.tgz) = cb959497b8576c790731eea0898855612f444f7a84bc743a9aae14680f40e372
+SIZE (basic256_0.9.9.1.tgz) = 7938684
diff --git a/lang/basic256/files/patch-Stack.cpp b/lang/basic256/files/patch-Stack.cpp
new file mode 100644
index 000000000000..6e01bd006548
--- /dev/null
+++ b/lang/basic256/files/patch-Stack.cpp
@@ -0,0 +1,12 @@
+--- Stack.cpp.orig	2012-10-09 17:42:07.000000000 +0200
++++ Stack.cpp	2012-10-09 17:42:30.000000000 +0200
+@@ -53,7 +53,8 @@
+ int Stack::height()
+ {
+ 	// return the height of the stack in elements
+-	return ((unsigned int) top - (unsigned int) bottom)/sizeof(stackval);
++       // magic of pointer math returns number of elements
++       return ((int) (top - bottom));
+ }
+ 
+ void
diff --git a/lang/basic256/pkg-descr b/lang/basic256/pkg-descr
index 086db4d2ee44..b84969d1415d 100644
--- a/lang/basic256/pkg-descr
+++ b/lang/basic256/pkg-descr
@@ -1,11 +1,11 @@
 BASIC-256 is an easy to use version of BASIC designed to teach anybody
-(especially middle and high-school students) the basics of computer 
+(especially middle and high-school students) the basics of computer
 programming.
 
 It uses traditional control structures like gosub, for/next, and goto,
-which helps kids easily see how program flow-control works. It has a 
-built-in graphics mode which lets them draw pictures on screen in 
-minutes, and a set of detailed, easy-to-follow tutorials that 
+which helps kids easily see how program flow-control works. It has a
+built-in graphics mode which lets them draw pictures on screen in
+minutes, and a set of detailed, easy-to-follow tutorials that
 introduce programming concepts through fun exercises.
 
 WWW: http://www.basic256.org
diff --git a/lang/basic256/pkg-plist b/lang/basic256/pkg-plist
index e60bc43cc5e8..937cc011247d 100644
--- a/lang/basic256/pkg-plist
+++ b/lang/basic256/pkg-plist
@@ -1,10 +1,13 @@
 bin/BASIC256
 share/basic256/Examples/15puzzle.kbs
+share/basic256/Examples/15puzzle_new.kbs
 share/basic256/Examples/BASICtest1.kbs
 share/basic256/Examples/arrays.kbs
 share/basic256/Examples/ballaccel.kbs
+share/basic256/Examples/ballaccel_2.kbs
 share/basic256/Examples/ballanim.kbs
 share/basic256/Examples/basic256_icon.kbs
+share/basic256/Examples/basic256_icon_V1.kbs
 share/basic256/Examples/card_suites.kbs
 share/basic256/Examples/cards_deal5.kbs
 share/basic256/Examples/checkerboard.kbs
@@ -13,8 +16,11 @@ share/basic256/Examples/collision3.kbs
 share/basic256/Examples/databasefoo.kbs
 share/basic256/Examples/db_quote.kbs
 share/basic256/Examples/dice/dice.kbs
+share/basic256/Examples/dice/dice_2.kbs
 share/basic256/Examples/dice/dicewood.wav
 share/basic256/Examples/errortrapping.kbs
+share/basic256/Examples/function_factorial.kbs
+share/basic256/Examples/function_randint.kbs
 share/basic256/Examples/hangman.kbs
 share/basic256/Examples/hello.kbs
 share/basic256/Examples/imgload/animatedhelp.kbs
@@ -60,6 +66,8 @@ share/basic256/Examples/sqrt.kbs
 share/basic256/Examples/stamp.kbs
 share/basic256/Examples/stamp_flower.kbs
 share/basic256/Examples/story.kbs
+share/basic256/Examples/subroutine_global.kbs
+share/basic256/Examples/subroutine_squares.kbs
 share/basic256/Examples/testing/2darraytest.kbs
 share/basic256/Examples/testing/2dstrarraytest.kbs
 share/basic256/Examples/testing/KalRGB.kbs
@@ -132,12 +140,6 @@ share/basic256/help/fr/sin.jpg
 share/basic256/help/fr/stamp.png
 share/basic256/help/fr/style.css
 share/basic256/help/fr/tan.jpg
-share/basic256/help/ru/cir.png
-share/basic256/help/ru/color.png
-share/basic256/help/ru/fonttext.png
-share/basic256/help/ru/poly.png
-share/basic256/help/ru/radians.png
-share/basic256/help/ru/stamp.png
 share/basic256/help/ru/style.css
 @dirrm share/basic256/help/ru
 @dirrm share/basic256/help/fr