3 files changed, 18 insertions, 9 deletions

diff --git a/devel/ruby-racc/Makefile b/devel/ruby-racc/Makefile
index b690ffed7522..7b8730e8a03a 100644
--- a/devel/ruby-racc/Makefile
+++ b/devel/ruby-racc/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	racc
-PORTVERSION=	1.2.1
+PORTVERSION=	1.2.2
 CATEGORIES=	devel	# ruby
 MASTER_SITES=	http://www1.u-netsurf.ne.jp/~brew/mine/soft/
 PKGNAMEPREFIX=	ruby-
@@ -24,8 +24,8 @@ RUBY=		${LOCALBASE}/bin/ruby
 RUBY_VER=	1.4
 RUBY_ARCH=	${ARCH}-freebsd${OSREL}
 
-MODULES=	facade.rb format.rb info.rb libracc.rb raccp.rb raccs.rb \
-		register.rb state.rb
+MODULES=	facade.rb format.rb grammer.rb info.rb iset.rb \
+		libracc.rb raccp.rb raccs.rb state.rb
 MODULES_RT=	parser.rb
 DOCS_EN=	changes.html command.html debug.html grammer.html \
 		index.html usage.html
@@ -33,6 +33,11 @@ DOCS_JA=	changes.html command.html debug.html grammer.html \
 		index.html parser.html usage.html
 EXAMPLES=	calc.y calc2-ja.y compile.rb
 
+post-patch:
+	${PERL} -i -pe '$$. == 1 && s,^#!\s*\S+,#!${RUBY},' \
+		${WRKSRC}/misc/racc2y \
+		${WRKSRC}/misc/y2racc
+
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${RUBY} setup.rb config
 
@@ -40,7 +45,8 @@ do-build:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${RUBY} setup.rb setup
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/racc/racc ${PREFIX}/bin/
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/racc/racc \
+		${WRKSRC}/misc/racc2y ${WRKSRC}/misc/y2racc ${PREFIX}/bin/
 	${MKDIR} ${PREFIX}/lib/ruby/site_ruby/${RUBY_VER}/racc
 .for f in ${MODULES}
 	${INSTALL_DATA} ${WRKSRC}/lib/racc/${f} \
diff --git a/devel/ruby-racc/distinfo b/devel/ruby-racc/distinfo
index 1549f1937c9f..4e539e80ed44 100644
--- a/devel/ruby-racc/distinfo
+++ b/devel/ruby-racc/distinfo
@@ -1 +1 @@
-MD5 (ruby/racc-1.2.1.tar.gz) = 6a48cfdbdb480ae726a8cc5a06650e55
+MD5 (ruby/racc-1.2.2.tar.gz) = 9d7cea1cf2716945701453b0a95961d3
diff --git a/devel/ruby-racc/pkg-plist b/devel/ruby-racc/pkg-plist
index 74a40deebdf8..81a5f11948c0 100644
--- a/devel/ruby-racc/pkg-plist
+++ b/devel/ruby-racc/pkg-plist
@@ -1,12 +1,15 @@
 bin/racc
-lib/ruby/site_ruby/%%RUBY_VER%%/racc/libracc.rb
+bin/racc2y
+bin/y2racc
 lib/ruby/site_ruby/%%RUBY_VER%%/racc/facade.rb
-lib/ruby/site_ruby/%%RUBY_VER%%/racc/raccs.rb
-lib/ruby/site_ruby/%%RUBY_VER%%/racc/register.rb
-lib/ruby/site_ruby/%%RUBY_VER%%/racc/state.rb
 lib/ruby/site_ruby/%%RUBY_VER%%/racc/format.rb
+lib/ruby/site_ruby/%%RUBY_VER%%/racc/grammer.rb
 lib/ruby/site_ruby/%%RUBY_VER%%/racc/info.rb
+lib/ruby/site_ruby/%%RUBY_VER%%/racc/iset.rb
+lib/ruby/site_ruby/%%RUBY_VER%%/racc/libracc.rb
 lib/ruby/site_ruby/%%RUBY_VER%%/racc/raccp.rb
+lib/ruby/site_ruby/%%RUBY_VER%%/racc/raccs.rb
+lib/ruby/site_ruby/%%RUBY_VER%%/racc/state.rb
 lib/ruby/site_ruby/%%RUBY_VER%%/racc/parser.rb
 lib/ruby/site_ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/racc/cparse.so
 @dirrm lib/ruby/site_ruby/%%RUBY_VER%%/racc