Update ruby-racc package to 1.4.6.

* Add LICENSE.
* Ajust new ruby package's framework.
* Add CONFLICTS since it will install the same name commands both
  ruby18 and ruby19 based packages.
* Add patch to suport both ruby18 and ruby19.


=== 1.4.6

* Bugfixes

  * bin/racc -g option renamed to -t
  * racc/compiler.rb is removed
  * '|' is allowed with meta rules
  * Ruby 1.8.7 compatibility fixes
  * Ruby 1.9 compatibility fixes

4 files changed, 60 insertions, 38 deletions

diff --git a/devel/ruby-racc/Makefile b/devel/ruby-racc/Makefile
index 0edde69ab1b..8174641d817 100644
--- a/devel/ruby-racc/Makefile
+++ b/devel/ruby-racc/Makefile
@@ -1,19 +1,21 @@
-# $NetBSD: Makefile,v 1.16 2008/07/14 12:56:03 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2010/09/12 03:20:02 taca Exp $
 
 DISTNAME=	racc-${RACC_VERSION}
-PKGNAME=	${RUBY_PKGPREFIX}-racc-${RACC_VERSION}
-PKGREVISION=	1
 CATEGORIES=	devel ruby
-MASTER_SITES=	http://i.loveruby.net/archive/racc/
+MASTER_SITES=	http://rubyforge.org/frs/download.php/49028/
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	taca@NetBSD.org
 HOMEPAGE=	http://i.loveruby.net/en/projects/racc/
 COMMENT=	LALR(1) parser generator for Ruby
+LICENSE=	gnu-lgpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
+CONFLICTS+=		ruby[1-9][0-9]-racc-*
+
 USE_RUBY_SETUP=		yes
-RACC_VERSION=		1.4.5
+RACC_VERSION=		1.4.6
 
 CONFIGURE_ARGS+=	--siteruby=${PREFIX}/${RUBY_VENDORLIB_BASE} \
 			--siterubyver=${PREFIX}/${RUBY_VENDORLIB} \
@@ -21,22 +23,18 @@ CONFIGURE_ARGS+=	--siteruby=${PREFIX}/${RUBY_VENDORLIB_BASE} \
 INSTALLATION_DIRS=	${RUBY_DOC}/racc/en ${RUBY_DOC}/racc/ja \
 			${RUBY_EG}/racc
 
-DOCS=		ChangeLog README.en README.ja TODO
-DOCS_HTML=	NEWS.html command.html debug.html grammar.html index.html \
-		parser.html usage.html
+DOCS=		ChangeLog README.en.rdoc README.ja.rdoc TODO
 EXAMPLES=	array.y array2.y calc-ja.y calc.y conflict.y hash.y lalr.y \
-		syntax.y yyerr.y
+		lists.y syntax.y yyerr.y
 
 post-install:
 .for f in ${DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/${RUBY_DOC}/racc
 .endfor
-.for f in ${DOCS_HTML}
-	${INSTALL_DATA} ${WRKSRC}/doc.en/${f} \
+	${INSTALL_DATA} ${WRKSRC}/doc/en/* \
 		${DESTDIR}${PREFIX}/${RUBY_DOC}/racc/en
-	${INSTALL_DATA} ${WRKSRC}/doc.ja/${f} \
+	${INSTALL_DATA} ${WRKSRC}/doc/ja/* \
 		${DESTDIR}${PREFIX}/${RUBY_DOC}/racc/ja
-.endfor
 .for f in ${EXAMPLES}
 	${INSTALL_DATA} ${WRKSRC}/sample/${f} \
 		${DESTDIR}${PREFIX}/${RUBY_EG}/racc
diff --git a/devel/ruby-racc/PLIST b/devel/ruby-racc/PLIST
index 7851a2e59b8..0236db54be1 100644
--- a/devel/ruby-racc/PLIST
+++ b/devel/ruby-racc/PLIST
@@ -1,37 +1,42 @@
-@comment $NetBSD: PLIST,v 1.11 2009/06/14 17:49:11 joerg Exp $
+@comment $NetBSD: PLIST,v 1.12 2010/09/12 03:20:02 taca Exp $
 bin/racc
 bin/racc2y
 bin/y2racc
+${RUBY_VENDORLIB}/racc.rb
 ${RUBY_VENDORLIB}/racc/compat.rb
-${RUBY_VENDORLIB}/racc/compiler.rb
+${RUBY_VENDORLIB}/racc/debugflags.rb
 ${RUBY_VENDORLIB}/racc/exception.rb
 ${RUBY_VENDORLIB}/racc/grammar.rb
 ${RUBY_VENDORLIB}/racc/grammarfileparser.rb
-${RUBY_VENDORLIB}/racc/grammarfilescanner.rb
 ${RUBY_VENDORLIB}/racc/info.rb
 ${RUBY_VENDORLIB}/racc/iset.rb
-${RUBY_VENDORLIB}/racc/output.rb
+${RUBY_VENDORLIB}/racc/logfilegenerator.rb
 ${RUBY_VENDORLIB}/racc/parser-text.rb
+${RUBY_VENDORLIB}/racc/parser.rb
+${RUBY_VENDORLIB}/racc/parserfilegenerator.rb
+${RUBY_VENDORLIB}/racc/sourcetext.rb
 ${RUBY_VENDORLIB}/racc/state.rb
-${RUBY_VENDORLIB}/racc/usercodeparser.rb
+${RUBY_VENDORLIB}/racc/statetransitiontable.rb
+${RUBY_VENDORLIB}/racc/static.rb
+${RUBY_VENDORARCHLIB}/racc/cparse.${RUBY_DLEXT}
 ${RUBY_DOC}/racc/ChangeLog
-${RUBY_DOC}/racc/README.en
-${RUBY_DOC}/racc/README.ja
+${RUBY_DOC}/racc/README.en.rdoc
+${RUBY_DOC}/racc/README.ja.rdoc
 ${RUBY_DOC}/racc/TODO
-${RUBY_DOC}/racc/en/NEWS.html
-${RUBY_DOC}/racc/en/command.html
-${RUBY_DOC}/racc/en/debug.html
-${RUBY_DOC}/racc/en/grammar.html
-${RUBY_DOC}/racc/en/index.html
-${RUBY_DOC}/racc/en/parser.html
-${RUBY_DOC}/racc/en/usage.html
-${RUBY_DOC}/racc/ja/NEWS.html
-${RUBY_DOC}/racc/ja/command.html
-${RUBY_DOC}/racc/ja/debug.html
-${RUBY_DOC}/racc/ja/grammar.html
-${RUBY_DOC}/racc/ja/index.html
-${RUBY_DOC}/racc/ja/parser.html
-${RUBY_DOC}/racc/ja/usage.html
+${RUBY_DOC}/racc/en/NEWS.en.rdoc
+${RUBY_DOC}/racc/en/command.en.html
+${RUBY_DOC}/racc/en/debug.en.rdoc
+${RUBY_DOC}/racc/en/grammar.en.rdoc
+${RUBY_DOC}/racc/en/index.en.html
+${RUBY_DOC}/racc/en/parser.en.rdoc
+${RUBY_DOC}/racc/en/usage.en.html
+${RUBY_DOC}/racc/ja/NEWS.ja.rdoc
+${RUBY_DOC}/racc/ja/command.ja.html
+${RUBY_DOC}/racc/ja/debug.ja.rdoc
+${RUBY_DOC}/racc/ja/grammar.ja.rdoc
+${RUBY_DOC}/racc/ja/index.ja.html
+${RUBY_DOC}/racc/ja/parser.ja.rdoc
+${RUBY_DOC}/racc/ja/usage.ja.html
 ${RUBY_EG}/racc/array.y
 ${RUBY_EG}/racc/array2.y
 ${RUBY_EG}/racc/calc-ja.y
@@ -39,5 +44,6 @@ ${RUBY_EG}/racc/calc.y
 ${RUBY_EG}/racc/conflict.y
 ${RUBY_EG}/racc/hash.y
 ${RUBY_EG}/racc/lalr.y
+${RUBY_EG}/racc/lists.y
 ${RUBY_EG}/racc/syntax.y
 ${RUBY_EG}/racc/yyerr.y
diff --git a/devel/ruby-racc/distinfo b/devel/ruby-racc/distinfo
index e54b619fa8d..ea582a22b22 100644
--- a/devel/ruby-racc/distinfo
+++ b/devel/ruby-racc/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.10 2007/03/17 15:49:43 taca Exp $
+$NetBSD: distinfo,v 1.11 2010/09/12 03:20:02 taca Exp $
 
-SHA1 (racc-1.4.5.tar.gz) = 1eeafd937b6b0ea1f7a8f2a6ba695bc9841500db
-RMD160 (racc-1.4.5.tar.gz) = 0d3f874140cd7e2cd900b2492266bccf7f24235b
-Size (racc-1.4.5.tar.gz) = 103324 bytes
+SHA1 (racc-1.4.6.tgz) = c32fc77c003f7ea54e00e03cba4445ea2b592739
+RMD160 (racc-1.4.6.tgz) = 43dc4829c83bea69956dd0d78ce0965711734b7c
+Size (racc-1.4.6.tgz) = 106588 bytes
+SHA1 (patch-aa) = 316ae6cc21d9579f56e056f07bb4f8bdc08dac08
diff --git a/devel/ruby-racc/patches/patch-aa b/devel/ruby-racc/patches/patch-aa
new file mode 100644
index 00000000000..f06dfddd057
--- /dev/null
+++ b/devel/ruby-racc/patches/patch-aa
@@ -0,0 +1,17 @@
+$NetBSD: patch-aa,v 1.1 2010/09/12 03:20:02 taca Exp $
+
+Support both Ruby 1.8.x and 1.9.x.
+
+--- ext/racc/cparse/cparse.c.orig	2008-11-30 07:09:20.000000000 +0000
++++ ext/racc/cparse/cparse.c
+@@ -11,7 +11,10 @@
+ 
+ */
+ 
++#include "ruby.h"
++#ifdef HAVE_RUBY_RUBY_H
+ #include "ruby/ruby.h"
++#endif
+ 
+ /* -----------------------------------------------------------------------
+                         Important Constants