5 files changed, 44 insertions, 48 deletions
diff --git a/devel/ruby-racc/DESCR b/devel/ruby-racc/DESCR
index 8b1f5a32dd0..d7391bf28ad 100644
--- a/devel/ruby-racc/DESCR
+++ b/devel/ruby-racc/DESCR
@@ -1,5 +1,3 @@
 Racc is an LALR(1) parser generator for Ruby.  It is written in Ruby
 and generates Ruby code.  Almost all functions of yacc(1) are
 implemented.
-
-Author:	Minero Aoki <aamine@dp.u-netsurf.ne.jp>
diff --git a/devel/ruby-racc/Makefile b/devel/ruby-racc/Makefile
index 534c89b39fd..0d070072fdf 100644
--- a/devel/ruby-racc/Makefile
+++ b/devel/ruby-racc/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2004/03/16 02:01:10 taca Exp $
+# $NetBSD: Makefile,v 1.9 2004/11/27 15:22:15 taca Exp $
 # FreeBSD: ports/devel/ruby-racc/Makefile,v 1.20 2001/01/27 09:54:30 knu Exp
 
-DISTNAME=	racc-${RACC_VERSION}-all-2
-PKGNAME=	${RUBY_PKGNAMEPREFIX}racc-${RACC_VERSION}
-PKGREVISION=	1
+DISTNAME=	racc-${RACC_VERSION}
+PKGNAME=	${RUBY_PKGPREFIX}-racc-${RACC_VERSION}
 CATEGORIES=	devel ruby
 MASTER_SITES=	http://www.loveruby.net/archive/racc/
 
@@ -11,48 +10,33 @@ MAINTAINER=	taca@NetBSD.org
 HOMEPAGE=	http://www.loveruby.net/en/racc.html
 COMMENT=	LALR(1) parser generator for Ruby
 
-DEPENDS+= ${RUBY_PKGNAMEPREFIX}strscan>=0.6.1:../../devel/ruby-strscan
+RUBY_VERSION_SUPPORTED=	18
+USE_RUBY_SETUP=		yes
+RACC_VERSION=		1.4.4
 
-CONFLICTS=	racc-runtime-*
-
-RACC_VERSION=	1.4.3
-DIST_SUBDIR=	ruby
-USE_RUBY=	yes
-USE_RUBY_SETUP=	yes
-CONFIGURE_ARGS+=--with=racc,raccrt
-# work around for current distfile's name
-WRKSRC=		${WRKDIR}/racc-${RACC_VERSION}-all
-
-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
+DOCS=		ChangeLog README.en README.ja TODO
+DOCS_HTML=	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_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} \
+.for f in ${DOCS_HTML}
+	${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}/packages/racc/sample/${f} \
+	${INSTALL_DATA} ${WRKSRC}/sample/${f} \
 		${RUBY_EXAMPLESDIR}/racc
 .endfor
 
-.include "../../lang/ruby-base/Makefile.common"
+.include "../../lang/ruby/modules.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/ruby-racc/PLIST b/devel/ruby-racc/PLIST
index 8c51b2746b2..e64229f8342 100644
--- a/devel/ruby-racc/PLIST
+++ b/devel/ruby-racc/PLIST
@@ -1,40 +1,36 @@
-@comment $NetBSD: PLIST,v 1.6 2004/03/10 11:04:50 taca Exp $
+@comment $NetBSD: PLIST,v 1.7 2004/11/27 15:22:15 taca Exp $
 bin/racc
 bin/racc2y
 bin/y2racc
-${RUBY_SITEARCHLIBDIR}/racc/cparse.so
-@dirrm ${RUBY_SITEARCHLIBDIR}/racc
+${RUBY_SITELIBDIR}/racc/compat.rb
 ${RUBY_SITELIBDIR}/racc/compiler.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/parser.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_SITELIBDIR}/racc/usercodeparser.rb
 @dirrm ${RUBY_SITELIBDIR}/racc
-${RUBY_DOCDIR}/racc/BUGS.en
-${RUBY_DOCDIR}/racc/BUGS.ja
+${RUBY_DOCDIR}/racc/ChangeLog
 ${RUBY_DOCDIR}/racc/README.en
 ${RUBY_DOCDIR}/racc/README.ja
-${RUBY_DOCDIR}/racc/en/changes.html
+${RUBY_DOCDIR}/racc/TODO
+${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
diff --git a/devel/ruby-racc/distinfo b/devel/ruby-racc/distinfo
index 4af3bf61f80..2f5c16a5367 100644
--- a/devel/ruby-racc/distinfo
+++ b/devel/ruby-racc/distinfo
@@ -1,4 +1,6 @@
-$NetBSD: distinfo,v 1.5 2004/03/10 11:04:50 taca Exp $
+$NetBSD: distinfo,v 1.6 2004/11/27 15:22:15 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
diff --git a/devel/ruby-racc/raccversion.mk b/devel/ruby-racc/raccversion.mk
new file mode 100644
index 00000000000..5749bd8a77e
--- /dev/null
+++ b/devel/ruby-racc/raccversion.mk
@@ -0,0 +1,16 @@
+# $NetBSD: raccversion.mk,v 1.1 2004/11/27 15:22:15 taca Exp $
+.ifndef _RUBY_RACCVERSION_MK
+
+_RUBY_RACCVERSION_MK=	# defined
+
+.if ${RUBY_NAME} != "ruby${RUBY_VER_DEFAULT}"
+RACC?=		racc-${RUBY_VER}
+RACC2Y?=	racc2y-${RUBY_VER}
+Y2RACC?=	y2racc-${RUBY_VER}
+.else
+RACC?=		racc
+RACC2Y?=	racc2y
+Y2RACC?=	y2racc
+.endif
+
+.endif