5 files changed, 8 insertions, 36 deletions

diff --git a/devel/ruby-racc-runtime/Makefile b/devel/ruby-racc-runtime/Makefile
deleted file mode 100644
index cbcac621a922..000000000000
--- a/devel/ruby-racc-runtime/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# New ports collection makefile for:	Ruby-Racc-runtime
-# Date created:		22 Aug 2000
-# Whom:			Akinori MUSHA aka knu <knu@idaemons.org>
-#
-# $FreeBSD$
-#
-
-MASTERDIR=	${.CURDIR}/../ruby-racc
-
-PKGNAMESUFFIX=	-runtime
-
-PKGDIR=		${.CURDIR}
-
-RUNTIME=	yes	
-
-.include "${MASTERDIR}/Makefile"
diff --git a/devel/ruby-racc-runtime/pkg-comment b/devel/ruby-racc-runtime/pkg-comment
deleted file mode 100644
index b13bc2caa0ea..000000000000
--- a/devel/ruby-racc-runtime/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Runtime libraries for Racc, an LALR(1) parser generator for Ruby
diff --git a/devel/ruby-racc-runtime/pkg-descr b/devel/ruby-racc-runtime/pkg-descr
deleted file mode 100644
index 34a213b8f27b..000000000000
--- a/devel/ruby-racc-runtime/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-This package only installs runtime libraries for Racc, an LALR(1)
-parser generator for Ruby.
-
-Author:	Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-WWW:	http://www1.u-netsurf.ne.jp/~brew/mine/en/index.html
diff --git a/devel/ruby-racc-runtime/pkg-plist b/devel/ruby-racc-runtime/pkg-plist
deleted file mode 100644
index f793951456e7..000000000000
--- a/devel/ruby-racc-runtime/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-%%RUBY_SITELIBDIR%%/racc/parser.rb
-%%RUBY_SITEARCHLIBDIR%%/racc/cparse.so
-@dirrm %%RUBY_SITELIBDIR%%/racc
-@dirrm %%RUBY_SITEARCHLIBDIR%%/racc
diff --git a/devel/ruby-racc/Makefile b/devel/ruby-racc/Makefile
index 36178a8e8db5..30085008c8df 100644
--- a/devel/ruby-racc/Makefile
+++ b/devel/ruby-racc/Makefile
@@ -17,21 +17,20 @@ DIST_SUBDIR=	ruby
 
 MAINTAINER=	knu@FreeBSD.org
 
-.if !defined(RUNTIME)
-RUN_DEPENDS=	${RUBY_SITELIBDIR}/racc/parser.rb:${PORTSDIR}/devel/ruby-racc-runtime \
-		${RUBY_SITELIBDIR}/strscan.rb:${PORTSDIR}/devel/ruby-strscan
-.endif
-
 USE_RUBY=	yes
 USE_RUBY_SETUP=	yes
 
-.if defined(RUNTIME)
-CONFIGURE_ARGS=	--with=raccrt
-.else
 CONFIGURE_ARGS=	--with=racc
 
 WRKDIR_RACC=	${WRKSRC}/packages/racc
 
+.include <bsd.port.pre.mk>
+
+.if ${RUBY_VER} < 1.7
+RUN_DEPENDS+=	${RUBY_SITELIBDIR}/racc/parser.rb:${PORTSDIR}/lang/ruby16-shim-ruby18 \
+		${RUBY_SITEARCHLIBDIR}/strscan.so:${PORTSDIR}/lang/ruby16-shim-ruby18
+.endif
+
 post-extract:
 	${CP} -p ${WRKDIR_RACC}/misc/* ${WRKDIR_RACC}/bin/
 
@@ -43,6 +42,5 @@ do-install:
 	${INSTALL_DATA} ${WRKDIR_RACC}/doc.en/* ${RUBY_DOCDIR}/${PORTNAME}/
 	${INSTALL_DATA} ${WRKDIR_RACC}/doc.ja/* ${RUBY_DOCDIR}/${PORTNAME}/ja/
 .endif
-.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>