Update ruby-racc package to 1.4.4 (racc-1.4.4).

- support Ruby 1.8.0
- distribution's content changed.
- miscellous bug fixes.

pkgsrc changes:

- ruby-racc-runtime is obsolete now and please use "racc -E"
  for ruby 1.6.X.

5 files changed, 57 insertions, 63 deletions

diff --git a/devel/ruby-racc/MESSAGE b/devel/ruby-racc/MESSAGE
new file mode 100644
index 00000000000..7a7b7ad447f
--- /dev/null
+++ b/devel/ruby-racc/MESSAGE
@@ -0,0 +1,7 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2004/03/07 14:32:28 taca Exp $
+
+ruby-racc-runtime package has gone since it is included in Ruby 1.8 and
+lator.  Please use racc with "-E" option prior to Ruby 1.8 release.
+
+===========================================================================
diff --git a/devel/ruby-racc/Makefile b/devel/ruby-racc/Makefile
index e1302ddef96..eecf3bd046e 100644
--- a/devel/ruby-racc/Makefile
+++ b/devel/ruby-racc/Makefile
@@ -1,49 +1,50 @@
-# $NetBSD: Makefile,v 1.5 2003/08/30 08:21:57 taca Exp $
+# $NetBSD: Makefile,v 1.6 2004/03/07 14:32:28 taca Exp $
 # FreeBSD: ports/devel/ruby-racc/Makefile,v 1.20 2001/01/27 09:54:30 knu Exp
 
-DISTNAME=	${RACC_DISTFILE}
-PKGNAME?=	${RACC_NAME}-${RACC_VERSION}
+DISTNAME=	racc-1.4.4
+PKGNAME=	${RUBY_PKGNAMEPREFIX}${DISTNAME}
 CATEGORIES=	devel
-MASTER_SITES=	${RACC_SITES}
+MASTER_SITES=	http://www.loveruby.net/archive/racc/
 
 MAINTAINER=	taca@NetBSD.org
-HOMEPAGE=	${RACC_HOMEPAGE}
+HOMEPAGE=	http://www.loveruby.net/en/racc.html
 COMMENT=	LALR(1) parser generator for Ruby
 
-DEPENDS+= ${RACC_NAME}-runtime>=${RACC_VERSION}:../../devel/ruby-racc-runtime
 DEPENDS+= ${RUBY_PKGNAMEPREFIX}strscan>=0.6.1:../../devel/ruby-strscan
 
-CONFIGURE_ARGS+=--with=racc
+CONFLICTS=	racc-runtime-*
 
-DOCS=		BUGS.en BUGS.ja README.en README.ja
-DOCS_EN=	changes.html command.html debug.html grammar.html index.html \
-		notes.html parser.html usage.html
-DOCS_JA=	changes.html command.html debug.html grammar.html index.html \
-		notes.html parser.html usage.html
+DIST_SUBDIR=	ruby
+USE_RUBY=	yes
+USE_RUBY_SETUP=	yes
+
+DOCS=		ChangeLog NEWS.en NEWS.ja README.en README.ja
+DOCS_EN=	NEWS.html command.html debug.html grammar.html index.html \
+		parser.html usage.html
+DOCS_JA=	NEWS.html command.html debug.html grammar.html index.html \
+		parser.html usage.html
 EXAMPLES=	array.y array2.y calc-ja.y calc.y conflict.y hash.y lalr.y \
 		syntax.y yyerr.y
 
-pre-configure:
-	${CP} -p ${WRKSRC}/packages/racc/misc/* ${WRKSRC}/packages/racc/bin
-
 post-install:
-	${INSTALL_DATA_DIR} ${RUBY_EXAMPLESDIR}/racc
-.for f in ${EXAMPLES}
-	${INSTALL_DATA} ${WRKSRC}/packages/racc/sample/${f} \
-		${RUBY_EXAMPLESDIR}/racc
-.endfor
 	${INSTALL_DATA_DIR} ${RUBY_DOCDIR}/racc/en
-	${INSTALL_DATA_DIR} ${RUBY_DOCDIR}/racc/ja
 .for f in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/packages/racc/${f} ${RUBY_DOCDIR}/racc
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/racc
 .endfor
 .for f in ${DOCS_EN}
-	${INSTALL_DATA} ${WRKSRC}/packages/racc/doc.en/${f} \
+	${INSTALL_DATA} ${WRKSRC}/doc.en/${f} \
 		${RUBY_DOCDIR}/racc/en
 .endfor
+	${INSTALL_DATA_DIR} ${RUBY_DOCDIR}/racc/ja
 .for f in ${DOCS_JA}
-	${INSTALL_DATA} ${WRKSRC}/packages/racc/doc.ja/${f} \
+	${INSTALL_DATA} ${WRKSRC}/doc.ja/${f} \
 		${RUBY_DOCDIR}/racc/ja
 .endfor
+	${INSTALL_DATA_DIR} ${RUBY_EXAMPLESDIR}/racc
+.for f in ${EXAMPLES}
+	${INSTALL_DATA} ${WRKSRC}/sample/${f} \
+		${RUBY_EXAMPLESDIR}/racc
+.endfor
 
-.include "Makefile.common"
+.include "../../lang/ruby-base/Makefile.common"
+.include "../../mk/bsd.pkg.mk"
diff --git a/devel/ruby-racc/Makefile.common b/devel/ruby-racc/Makefile.common
deleted file mode 100644
index ec80657c623..00000000000
--- a/devel/ruby-racc/Makefile.common
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD: Makefile.common,v 1.2 2003/08/30 08:21:58 taca Exp $
-RACC_DISTFILE=	racc-${RACC_VERSION}-all-2
-RACC_NAME=	${RUBY_PKGNAMEPREFIX}racc
-RACC_VERSION=	1.4.3
-RACC_HOMEPAGE=	http://www.loveruby.net/en/racc.html
-RACC_SITES=	http://www.loveruby.net/archive/racc/
-
-DIST_SUBDIR=	ruby
-USE_RUBY=	yes
-USE_RUBY_SETUP=	yes
-# work around for current distfile's name
-WRKSRC=		${WRKDIR}/racc-${RACC_VERSION}-all
-
-.include "../../lang/ruby-base/Makefile.common"
-.include "../../mk/bsd.pkg.mk"
diff --git a/devel/ruby-racc/PLIST b/devel/ruby-racc/PLIST
index acf12e099b4..219a1653c56 100644
--- a/devel/ruby-racc/PLIST
+++ b/devel/ruby-racc/PLIST
@@ -1,47 +1,48 @@
-@comment $NetBSD: PLIST,v 1.4 2003/08/30 08:30:26 taca Exp $
+@comment $NetBSD: PLIST,v 1.5 2004/03/07 14:32:28 taca Exp $
 bin/racc
 bin/racc2y
 bin/y2racc
 ${RUBY_SITELIBDIR}/racc/compiler.rb
+${RUBY_SITELIBDIR}/racc/compat.rb
 ${RUBY_SITELIBDIR}/racc/grammar.rb
+${RUBY_SITELIBDIR}/racc/grammarfileparser.rb
+${RUBY_SITELIBDIR}/racc/grammarfilescanner.rb
 ${RUBY_SITELIBDIR}/racc/info.rb
 ${RUBY_SITELIBDIR}/racc/iset.rb
 ${RUBY_SITELIBDIR}/racc/output.rb
-${RUBY_SITELIBDIR}/racc/raccp.rb
-${RUBY_SITELIBDIR}/racc/raccs.rb
 ${RUBY_SITELIBDIR}/racc/rubyloader.rb
 ${RUBY_SITELIBDIR}/racc/state.rb
-${RUBY_SITELIBDIR}/racc/ucodep.rb
-${RUBY_EXAMPLESDIR}/racc/array.y
-${RUBY_EXAMPLESDIR}/racc/array2.y
-${RUBY_EXAMPLESDIR}/racc/calc-ja.y
-${RUBY_EXAMPLESDIR}/racc/calc.y
-${RUBY_EXAMPLESDIR}/racc/conflict.y
-${RUBY_EXAMPLESDIR}/racc/hash.y
-${RUBY_EXAMPLESDIR}/racc/lalr.y
-${RUBY_EXAMPLESDIR}/racc/syntax.y
-${RUBY_EXAMPLESDIR}/racc/yyerr.y
-@dirrm ${RUBY_EXAMPLESDIR}/racc
-${RUBY_DOCDIR}/racc/BUGS.en
-${RUBY_DOCDIR}/racc/BUGS.ja
+${RUBY_SITELIBDIR}/racc/usercodeparser.rb
+@dirrm ${RUBY_SITELIBDIR}/racc
+${RUBY_DOCDIR}/racc/ChangeLog
+${RUBY_DOCDIR}/racc/NEWS.en
+${RUBY_DOCDIR}/racc/NEWS.ja
 ${RUBY_DOCDIR}/racc/README.en
 ${RUBY_DOCDIR}/racc/README.ja
-${RUBY_DOCDIR}/racc/en/changes.html
+${RUBY_DOCDIR}/racc/en/NEWS.html
 ${RUBY_DOCDIR}/racc/en/command.html
 ${RUBY_DOCDIR}/racc/en/debug.html
 ${RUBY_DOCDIR}/racc/en/grammar.html
 ${RUBY_DOCDIR}/racc/en/index.html
-${RUBY_DOCDIR}/racc/en/notes.html
 ${RUBY_DOCDIR}/racc/en/parser.html
 ${RUBY_DOCDIR}/racc/en/usage.html
 @dirrm ${RUBY_DOCDIR}/racc/en
-${RUBY_DOCDIR}/racc/ja/changes.html
+${RUBY_DOCDIR}/racc/ja/NEWS.html
 ${RUBY_DOCDIR}/racc/ja/command.html
 ${RUBY_DOCDIR}/racc/ja/debug.html
 ${RUBY_DOCDIR}/racc/ja/grammar.html
 ${RUBY_DOCDIR}/racc/ja/index.html
-${RUBY_DOCDIR}/racc/ja/notes.html
 ${RUBY_DOCDIR}/racc/ja/parser.html
 ${RUBY_DOCDIR}/racc/ja/usage.html
 @dirrm ${RUBY_DOCDIR}/racc/ja
 @dirrm ${RUBY_DOCDIR}/racc
+${RUBY_EXAMPLESDIR}/racc/array.y
+${RUBY_EXAMPLESDIR}/racc/array2.y
+${RUBY_EXAMPLESDIR}/racc/calc-ja.y
+${RUBY_EXAMPLESDIR}/racc/calc.y
+${RUBY_EXAMPLESDIR}/racc/conflict.y
+${RUBY_EXAMPLESDIR}/racc/hash.y
+${RUBY_EXAMPLESDIR}/racc/lalr.y
+${RUBY_EXAMPLESDIR}/racc/syntax.y
+${RUBY_EXAMPLESDIR}/racc/yyerr.y
+@dirrm ${RUBY_EXAMPLESDIR}/racc
diff --git a/devel/ruby-racc/distinfo b/devel/ruby-racc/distinfo
index 88e4564c4f7..9b08183631f 100644
--- a/devel/ruby-racc/distinfo
+++ b/devel/ruby-racc/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2003/08/30 08:21:58 taca Exp $
+$NetBSD: distinfo,v 1.4 2004/03/07 14:32:28 taca Exp $
 
-SHA1 (ruby/racc-1.4.3-all-2.tar.gz) = c73a7f25d8c4a08fbc75b210891cf78b88b6eac5
-Size (ruby/racc-1.4.3-all-2.tar.gz) = 105554 bytes
+SHA1 (ruby/racc-1.4.4.tar.gz) = 05ec265568fcf22d83b810c0377ea9edb0ca9999
+Size (ruby/racc-1.4.4.tar.gz) = 115343 bytes