Update to latest release, 6.9. Fix HOMEPAGE and MASTER_SITES. Some patches

were applied upstream, so remove. Comment, update, and defuzz remaining ones.

Ragel 6.9 - Oct 13, 2014
========================
 -updated command-line synopsis
 -ocaml: fix missing semicolon
 -ocaml: support -G1
 -ocaml: choose a unique name for type state
 -ruby: reduce the amount of calls to GET_WIDE_KEY()
 -union test case: warning fix
 -omit line directives around expression-oriented write statements
 -use AS_IF and test command to check if the DIST file is present
 -added missing std:: using
 -go: added '//line' directive support

Ragel 6.8 - Feb 11, 2013
========================

 -The -G2 code generator for Go1 was rewritten. Table, flat and switch-based
  code generators were added. (Anton Ageev)
 -The CXXFLAGS variable is not longer set in the configure script.

7 files changed, 14 insertions, 153 deletions

diff --git a/devel/ragel/Makefile b/devel/ragel/Makefile
index 904f1e289e1..c9643fbe7af 100644
--- a/devel/ragel/Makefile
+++ b/devel/ragel/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.7 2012/10/31 11:19:37 asau Exp $
+# $NetBSD: Makefile,v 1.8 2015/03/27 03:50:55 rodent Exp $
 
-DISTNAME=	ragel-6.7
+DISTNAME=	ragel-6.9
 CATEGORIES=	devel
-MASTER_SITES=	http://www.complang.org/ragel/
+MASTER_SITES=	http://www.colm.net/files/ragel/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.complang.org/ragel/
+HOMEPAGE=	http://www.colm.net/open-source/ragel/
 COMMENT=	State machine compiler
 LICENSE=	gnu-gpl-v2
 
diff --git a/devel/ragel/distinfo b/devel/ragel/distinfo
index 55319fa8163..a562a9eccc1 100644
--- a/devel/ragel/distinfo
+++ b/devel/ragel/distinfo
@@ -1,10 +1,7 @@
-$NetBSD: distinfo,v 1.7 2013/06/10 18:56:05 joerg Exp $
+$NetBSD: distinfo,v 1.8 2015/03/27 03:50:55 rodent Exp $
 
-SHA1 (ragel-6.7.tar.gz) = bf12b634f5a25e5ba305edfee59a455069ed3b0a
-RMD160 (ragel-6.7.tar.gz) = 003a29121bd44cdcdddd0721524fe90cf421c05d
-Size (ragel-6.7.tar.gz) = 1182734 bytes
-SHA1 (patch-aapl_avlcommon.h) = b0023b24e2ead4e196f2cacb58b9cd5b0b02b655
-SHA1 (patch-aapl_bstcommon.h) = 2d672f350c72a332de62396ef05cd05482a82b31
-SHA1 (patch-aapl_bubblesort.h) = 05233121bf82b91c4fdb65a2a2b7589ff27b820e
-SHA1 (patch-aapl_mergesort.h) = 42fc0fa8eadd476f599ee05b83f150a04993ad76
-SHA1 (patch-ragel_javacodegen.cpp) = f5095d5b36d795bf1b1a50626bd057296254dc8b
+SHA1 (ragel-6.9.tar.gz) = 70a7fe77aee8423be610fa14c3fa1f96b3119e1d
+RMD160 (ragel-6.9.tar.gz) = 67c7b1f39956f9707742201a1a681c164cff84ab
+Size (ragel-6.9.tar.gz) = 1226871 bytes
+SHA1 (patch-aapl_bstcommon.h) = 540e74d2ff3ace21d3fb0cd817027cf18837bc98
+SHA1 (patch-ragel_javacodegen.cpp) = 3fc6b892b18993a769c7eb80bb89bbef63d71c7d
diff --git a/devel/ragel/patches/patch-aapl_avlcommon.h b/devel/ragel/patches/patch-aapl_avlcommon.h
deleted file mode 100644
index 472b5b6480a..00000000000
--- a/devel/ragel/patches/patch-aapl_avlcommon.h
+++ /dev/null
@@ -1,52 +0,0 @@
-$NetBSD: patch-aapl_avlcommon.h,v 1.1 2012/11/19 02:53:28 joerg Exp $
-
---- aapl/avlcommon.h.orig	2012-11-19 02:08:19.000000000 +0000
-+++ aapl/avlcommon.h
-@@ -881,9 +881,9 @@ template <AVLMEL_TEMPDEF> Element *AvlTr
- 		}
- 
- #ifdef AVL_BASIC
--		keyRelation = compare( *element, *curEl );
-+		keyRelation = this->compare( *element, *curEl );
- #else
--		keyRelation = compare( element->BASEKEY(getKey()), 
-+		keyRelation = this->compare( element->BASEKEY(getKey()), 
- 				curEl->BASEKEY(getKey()) );
- #endif
- 
-@@ -920,7 +920,7 @@ template <AVLMEL_TEMPDEF> Element *AvlTr
- 	long keyRelation;
- 
- 	while (curEl) {
--		keyRelation = compare( *element, *curEl );
-+		keyRelation = this->compare( *element, *curEl );
- 
- 		/* Do we go left? */
- 		if ( keyRelation < 0 )
-@@ -969,7 +969,7 @@ template <AVLMEL_TEMPDEF> Element *AvlTr
- 			return element;
- 		}
- 
--		keyRelation = compare( key, curEl->BASEKEY(getKey()) );
-+		keyRelation = this->compare( key, curEl->BASEKEY(getKey()) );
- 
- 		/* Do we go left? */
- 		if ( keyRelation < 0 ) {
-@@ -1023,7 +1023,7 @@ template <AVLMEL_TEMPDEF> Element *AvlTr
- 			return element;
- 		}
- 
--		keyRelation = compare(key, curEl->getKey());
-+		keyRelation = this->compare(key, curEl->getKey());
- 
- 		/* Do we go left? */
- 		if ( keyRelation < 0 ) {
-@@ -1058,7 +1058,7 @@ template <AVLMEL_TEMPDEF> Element *AvlTr
- 	long keyRelation;
- 
- 	while (curEl) {
--		keyRelation = compare( key, curEl->BASEKEY(getKey()) );
-+		keyRelation = this->compare( key, curEl->BASEKEY(getKey()) );
- 
- 		/* Do we go left? */
- 		if ( keyRelation < 0 )
diff --git a/devel/ragel/patches/patch-aapl_bstcommon.h b/devel/ragel/patches/patch-aapl_bstcommon.h
index e268ec1ca37..10db79dc5a7 100644
--- a/devel/ragel/patches/patch-aapl_bstcommon.h
+++ b/devel/ragel/patches/patch-aapl_bstcommon.h
@@ -1,4 +1,4 @@
-$NetBSD: patch-aapl_bstcommon.h,v 1.1 2012/11/19 02:53:28 joerg Exp $
+$NetBSD: patch-aapl_bstcommon.h,v 1.2 2015/03/27 03:50:55 rodent Exp $
 
 --- aapl/bstcommon.h.orig	2012-11-19 02:08:41.000000000 +0000
 +++ aapl/bstcommon.h
@@ -11,63 +11,3 @@ $NetBSD: patch-aapl_bstcommon.h,v 1.1 2012/11/19 02:53:28 joerg Exp $
  
  		if ( keyRelation < 0 )
  			upper = mid - 1;
-@@ -373,12 +373,12 @@ template <BST_TEMPL_DEF> bool BstTable<B
- 
- 			lower = mid - 1;
- 			while ( lower != lowEnd && 
--					compare(key, GET_KEY(*lower)) == 0 )
-+					this->compare(key, GET_KEY(*lower)) == 0 )
- 				lower--;
- 
- 			upper = mid + 1;
- 			while ( upper != highEnd && 
--					compare(key, GET_KEY(*upper)) == 0 )
-+					this->compare(key, GET_KEY(*upper)) == 0 )
- 				upper++;
- 			
- 			low = (Element*)lower + 1;
-@@ -419,7 +419,7 @@ template <BST_TEMPL_DEF> Element *BstTab
- 		}
- 
- 		mid = lower + ((upper-lower)>>1);
--		keyRelation = compare(key, GET_KEY(*mid));
-+		keyRelation = this->compare(key, GET_KEY(*mid));
- 
- 		if ( keyRelation < 0 )
- 			upper = mid - 1;
-@@ -457,7 +457,7 @@ template <BST_TEMPL_DEF> Element *BstTab
- 		}
- 
- 		mid = lower + ((upper-lower)>>1);
--		keyRelation = compare(key, GET_KEY(*mid));
-+		keyRelation = this->compare(key, GET_KEY(*mid));
- 
- 		if ( keyRelation < 0 )
- 			upper = mid - 1;
-@@ -508,7 +508,7 @@ template <BST_TEMPL_DEF> Element *BstTab
- 		}
- 
- 		mid = lower + ((upper-lower)>>1);
--		keyRelation = compare(key, GET_KEY(*mid));
-+		keyRelation = this->compare(key, GET_KEY(*mid));
- 
- 		if ( keyRelation < 0 )
- 			upper = mid - 1;
-@@ -603,7 +603,7 @@ template <BST_TEMPL_DEF> Element *BstTab
- 		}
- 
- 		mid = lower + ((upper-lower)>>1);
--		keyRelation = compare(GET_KEY(el), GET_KEY(*mid));
-+		keyRelation = this->compare(GET_KEY(el), GET_KEY(*mid));
- 
- 		if ( keyRelation < 0 )
- 			upper = mid - 1;
-@@ -662,7 +662,7 @@ template <BST_TEMPL_DEF> Element *BstTab
- 		}
- 
- 		mid = lower + ((upper-lower)>>1);
--		keyRelation = compare(GET_KEY(el), GET_KEY(*mid));
-+		keyRelation = this->compare(GET_KEY(el), GET_KEY(*mid));
- 
- 		if ( keyRelation < 0 )
- 			upper = mid - 1;
diff --git a/devel/ragel/patches/patch-aapl_bubblesort.h b/devel/ragel/patches/patch-aapl_bubblesort.h
deleted file mode 100644
index a986be830c0..00000000000
--- a/devel/ragel/patches/patch-aapl_bubblesort.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aapl_bubblesort.h,v 1.1 2012/11/19 02:53:28 joerg Exp $
-
---- aapl/bubblesort.h.orig	2012-11-19 02:09:50.000000000 +0000
-+++ aapl/bubblesort.h
-@@ -72,7 +72,7 @@ template <class T, class Compare> void B
- 		changed = false;
- 		for ( long i = 0; i < len-pass; i++ ) {
- 			/* Do we swap pos with the next one? */
--			if ( compare( data[i], data[i+1] ) > 0 ) {
-+			if ( this->compare( data[i], data[i+1] ) > 0 ) {
- 				char tmp[sizeof(T)];
- 
- 				/* Swap the two items. */
diff --git a/devel/ragel/patches/patch-aapl_mergesort.h b/devel/ragel/patches/patch-aapl_mergesort.h
deleted file mode 100644
index ee5e237634b..00000000000
--- a/devel/ragel/patches/patch-aapl_mergesort.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aapl_mergesort.h,v 1.1 2012/11/19 02:53:28 joerg Exp $
-
---- aapl/mergesort.h.orig	2012-11-19 02:09:32.000000000 +0000
-+++ aapl/mergesort.h
-@@ -110,7 +110,7 @@ template< class T, class Compare> void M
- 		}
- 		else {
- 			/* Both upper and lower left. */
--			if ( compare(*lower, *upper) <= 0 )
-+			if ( this->compare(*lower, *upper) <= 0 )
- 				memcpy( dest++, lower++, sizeof(T) );
- 			else
- 				memcpy( dest++, upper++, sizeof(T) );
diff --git a/devel/ragel/patches/patch-ragel_javacodegen.cpp b/devel/ragel/patches/patch-ragel_javacodegen.cpp
index a2daa98fd66..6b4969e86ee 100644
--- a/devel/ragel/patches/patch-ragel_javacodegen.cpp
+++ b/devel/ragel/patches/patch-ragel_javacodegen.cpp
@@ -1,4 +1,6 @@
-$NetBSD: patch-ragel_javacodegen.cpp,v 1.1 2013/06/10 18:56:05 joerg Exp $
+$NetBSD: patch-ragel_javacodegen.cpp,v 1.2 2015/03/27 03:50:55 rodent Exp $
+
+Make sure setiosflags is visible in the default scope.
 
 --- ragel/javacodegen.cpp.orig	2013-06-07 15:59:16.000000000 +0000
 +++ ragel/javacodegen.cpp