2 files changed, 20 insertions, 26 deletions

diff --git a/devel/ruby-racc/Makefile b/devel/ruby-racc/Makefile
index 49ce6354211f..43e1dba5d58b 100644
--- a/devel/ruby-racc/Makefile
+++ b/devel/ruby-racc/Makefile
@@ -14,7 +14,8 @@ PKGNAMEPREFIX=	ruby-
 MAINTAINER=	knu@FreeBSD.org
 
 BUILD_DEPENDS=	ruby:${PORTSDIR}/lang/ruby
-RUN_DEPENDS=	ruby:${PORTSDIR}/lang/ruby
+RUN_DEPENDS=	ruby:${PORTSDIR}/lang/ruby \
+		${LOCALBASE}/lib/ruby/site_ruby/${RUBY_VER}/amstd/info.rb:${PORTSDIR}/devel/ruby-amstd
 
 PLIST_SUB=	RUBY_VER="${RUBY_VER}" RUBY_ARCH="${RUBY_ARCH}"
 
@@ -22,6 +23,9 @@ 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_RT=	parser.rb
 DOCS_EN=	changes.html command.html debug.html grammer.html \
 		index.html usage.html
 DOCS_JA=	changes.html command.html debug.html grammer.html \
@@ -35,13 +39,25 @@ do-build:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${RUBY} setup.rb setup
 
 do-install:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${RUBY} setup.rb install
-.if !defined(NOPORTDOCS)
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/racc/racc ${PREFIX}/bin/
+	${MKDIR} ${PREFIX}/lib/ruby/site_ruby/${RUBY_VER}/racc
+.for f in ${MODULES}
+	${INSTALL_DATA} ${WRKSRC}/lib/racc/${f} \
+		${PREFIX}/lib/ruby/site_ruby/${RUBY_VER}/racc/
+.endfor
+.for f in ${MODULES_RT}
+	${INSTALL_DATA} ${WRKSRC}/lib/raccrt/${f} \
+		${PREFIX}/lib/ruby/site_ruby/${RUBY_VER}/racc/
+.endfor
+	${MKDIR} ${PREFIX}/lib/ruby/site_ruby/${RUBY_VER}/${RUBY_ARCH}/racc
+	${INSTALL_DATA} ${WRKSRC}/ext/cparse/cparse.so \
+		${PREFIX}/lib/ruby/site_ruby/${RUBY_VER}/${RUBY_ARCH}/racc/
 	${MKDIR} ${PREFIX}/share/examples/ruby/racc
-	${MKDIR} ${PREFIX}/share/doc/ruby/racc/ja
 .for f in ${EXAMPLES}
 	${INSTALL_DATA} ${WRKSRC}/sample/${f} ${PREFIX}/share/examples/ruby/racc/
 .endfor
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${PREFIX}/share/doc/ruby/racc/ja
 .for f in ${DOCS_EN}
 	${INSTALL_DATA} ${WRKSRC}/doc.en/${f} ${PREFIX}/share/doc/ruby/racc/
 .endfor
diff --git a/devel/ruby-racc/pkg-plist b/devel/ruby-racc/pkg-plist
index 240cab99d969..74a40deebdf8 100644
--- a/devel/ruby-racc/pkg-plist
+++ b/devel/ruby-racc/pkg-plist
@@ -1,25 +1,4 @@
 bin/racc
-lib/ruby/site_ruby/%%RUBY_VER%%/amstd/bench.rb
-lib/ruby/site_ruby/%%RUBY_VER%%/amstd/bug.rb
-lib/ruby/site_ruby/%%RUBY_VER%%/amstd/collfrom.rb
-lib/ruby/site_ruby/%%RUBY_VER%%/amstd/dispatch.rb
-lib/ruby/site_ruby/%%RUBY_VER%%/amstd/errutil.rb
-lib/ruby/site_ruby/%%RUBY_VER%%/amstd/extmod.rb
-lib/ruby/site_ruby/%%RUBY_VER%%/amstd/fileutils.rb
-lib/ruby/site_ruby/%%RUBY_VER%%/amstd/futils.rb
-lib/ruby/site_ruby/%%RUBY_VER%%/amstd/gconst.rb
-lib/ruby/site_ruby/%%RUBY_VER%%/amstd/getdep.rb
-lib/ruby/site_ruby/%%RUBY_VER%%/amstd/info.rb
-lib/ruby/site_ruby/%%RUBY_VER%%/amstd/must.rb
-lib/ruby/site_ruby/%%RUBY_VER%%/amstd/pipeline.rb
-lib/ruby/site_ruby/%%RUBY_VER%%/amstd/rbparams.rb
-lib/ruby/site_ruby/%%RUBY_VER%%/amstd/recycle.rb
-lib/ruby/site_ruby/%%RUBY_VER%%/amstd/rubyemu.rb
-lib/ruby/site_ruby/%%RUBY_VER%%/amstd/strquote.rb
-lib/ruby/site_ruby/%%RUBY_VER%%/amstd/symbol.rb
-lib/ruby/site_ruby/%%RUBY_VER%%/amstd/timer.rb
-lib/ruby/site_ruby/%%RUBY_VER%%/amstd/to_s.rb
-lib/ruby/site_ruby/%%RUBY_VER%%/amstd/version.rb
 lib/ruby/site_ruby/%%RUBY_VER%%/racc/libracc.rb
 lib/ruby/site_ruby/%%RUBY_VER%%/racc/facade.rb
 lib/ruby/site_ruby/%%RUBY_VER%%/racc/raccs.rb
@@ -30,7 +9,6 @@ lib/ruby/site_ruby/%%RUBY_VER%%/racc/info.rb
 lib/ruby/site_ruby/%%RUBY_VER%%/racc/raccp.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%%/amstd
 @dirrm lib/ruby/site_ruby/%%RUBY_VER%%/racc
 @dirrm lib/ruby/site_ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/racc
 share/examples/ruby/racc/calc.y