2 files changed, 6 insertions, 18 deletions

diff --git a/devel/ruby-racc/Makefile b/devel/ruby-racc/Makefile
index d21948cb3947..b3419da736bd 100644
--- a/devel/ruby-racc/Makefile
+++ b/devel/ruby-racc/Makefile
@@ -25,6 +25,12 @@ USE_RUBY=	yes
 USE_RUBY_AMSTD=	yes
 USE_RUBY_SETUP=	yes
 
+.if defined(RUNTIME)
+CONFIGURE_ARGS=	--with=lib/raccrt,ext/cparse
+.else
+CONFIGURE_ARGS=	--with=bin/racc,lib/racc,ext/cscan
+.endif
+
 DOCS_EN=	changes.html command.html debug.html grammer.html \
 		index.html parser.html usage.html
 DOCS_JA=	changes.html command.html debug.html grammer.html \
@@ -32,23 +38,6 @@ DOCS_JA=	changes.html command.html debug.html grammer.html \
 EXAMPLES=	array.y array2.y calc-ja.y calc.y conflict.y \
 		hash.y lalr.y lists.y syntax.y yyerr.y
 
-post-extract:
-	${PERL} -i -ne '/^amstd\b/ || /^strscan\b/ || print' ${WRKSRC}/lib/PATHCONV
-	${RM} -rf ${WRKSRC}/lib/amstd ${WRKSRC}/lib/strscan
-.if defined(RUNTIME)
-	${PERL} -i -ne '/^racc\b/ || print' ${WRKSRC}/bin/PATHCONV
-	${RM} -rf ${WRKSRC}/bin/racc
-	${PERL} -i -ne '/^cscan\b/ || print' ${WRKSRC}/ext/PATHCONV
-	${RM} -rf ${WRKSRC}/ext/cscan
-	${PERL} -i -ne '/^racc\b/ || print' ${WRKSRC}/lib/PATHCONV
-	${RM} -rf ${WRKSRC}/lib/racc
-.else
-	${RM} -rf ${WRKSRC}/ext
-	${PERL} -i -ne '/^raccrt\b/ || print' ${WRKSRC}/lib/PATHCONV
-	${RM} -rf ${WRKSRC}/lib/raccrt
-	${RM} -rf ${WRKSRC}/lib/racc/parser.rb
-.endif
-
 .if !defined(RUNTIME)
 post-patch:
 	${PERL} -i -pe '$$. == 1 && s,^#!\s*\S+,#!${RUBY},' \
diff --git a/devel/ruby-racc/pkg-plist b/devel/ruby-racc/pkg-plist
index cfc9328d6d3d..55e4220758d1 100644
--- a/devel/ruby-racc/pkg-plist
+++ b/devel/ruby-racc/pkg-plist
@@ -6,7 +6,6 @@ bin/y2racc
 %%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/state.rb