2 files changed, 39 insertions, 46 deletions

diff --git a/textproc/ruby-rdtool/Makefile b/textproc/ruby-rdtool/Makefile
index a7ff22b6520b..bb54add29ac0 100644
--- a/textproc/ruby-rdtool/Makefile
+++ b/textproc/ruby-rdtool/Makefile
@@ -9,28 +9,19 @@ PORTNAME=	rdtool
 PORTVERSION=	0.6.5
 CATEGORIES=	textproc ruby
 MASTER_SITES=	http://www2.pos.to/~tosh/ruby/rdtool/archive/
-PKGNAMEPREFIX=	ruby-
+PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DIST_SUBDIR=	ruby
 
 MAINTAINER=	knu@FreeBSD.org
 
-BUILD_DEPENDS=	ruby:${PORTSDIR}/lang/ruby \
-		racc:${PORTSDIR}/devel/ruby-racc \
+BUILD_DEPENDS=	racc:${PORTSDIR}/devel/ruby-racc \
 		${RUBY_SITEARCHLIBDIR}/strscan.so:${PORTSDIR}/devel/ruby-strscan \
 		${RUBY_SITELIBDIR}/optparse.rb:${PORTSDIR}/devel/ruby-optparse
-RUN_DEPENDS=	ruby:${PORTSDIR}/lang/ruby \
-		${RUBY_SITELIBDIR}/racc/parser.rb:${PORTSDIR}/devel/ruby-racc-runtime \
+RUN_DEPENDS=	${RUBY_SITELIBDIR}/racc/parser.rb:${PORTSDIR}/devel/ruby-racc-runtime \
 		${RUBY_SITEARCHLIBDIR}/strscan.so:${PORTSDIR}/devel/ruby-strscan \
 		${RUBY_SITELIBDIR}/optparse.rb:${PORTSDIR}/devel/ruby-optparse
 
-PLIST_SUB=	RUBY_VER="${RUBY_VER}" RUBY_ARCH="${RUBY_ARCH}"
-
-RUBY?=		${LOCALBASE}/bin/ruby
-RUBY_VER?=	1.4
-RUBY_ARCH?=	${ARCH}-freebsd${OSREL}
-
-RUBY_SITELIBDIR?=	${LOCALBASE}/lib/ruby/site_ruby/${RUBY_VER}
-RUBY_SITEARCHLIBDIR?=	${LOCALBASE}/lib/ruby/site_ruby/${RUBY_VER}/${RUBY_ARCH}
+USE_RUBY=	yes
 
 EMACSLISPDIR=	${PREFIX}/share/emacs/site-lisp
 XEMACSLISPDIR=	${PREFIX}/lib/xemacs/site-lisp
@@ -69,18 +60,20 @@ post-install:
 	${LN} -sf ${EMACSLISPDIR}/rd-mode.el ${XEMACSLISPDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/utils/rdswap.rb ${PREFIX}/bin/rdswap
 .if !defined(NOPORTDOCS)
-	rd2 ${PREFIX}/share/doc/ruby/optparse/ja/optparse.ja.rd \
-		> ${PREFIX}/share/doc/ruby/optparse/ja/optparse.ja.html
-	${MKDIR} ${PREFIX}/share/examples/ruby/rd
-	${CP} ${RUBY_SITELIBDIR}/rd/dot.rd2rc ${PREFIX}/share/examples/ruby/rd/
-	${MKDIR} ${PREFIX}/share/doc/ruby/rd/ja
+	rd2 ${RUBY_DOCDIR}/optparse/ja/optparse.ja.rd \
+		> ${RUBY_DOCDIR}/optparse/ja/optparse.ja.html
+	${MKDIR} ${RUBY_EXAMPLESDIR}/rd
+	${CP} ${RUBY_SITELIBDIR}/rd/dot.rd2rc ${RUBY_EXAMPLESDIR}/rd/
+	${MKDIR} ${RUBY_DOCDIR}/rd/ja
 .for f in ${DOCS_EN}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/ruby/rd/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/rd/
 .endfor
 .for f in ${DOCS_JA}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/ruby/rd/ja/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/rd/ja/
 .endfor
 .endif
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/Mk/bsd.ruby.mk"
+.include <bsd.port.post.mk>
diff --git a/textproc/ruby-rdtool/pkg-plist b/textproc/ruby-rdtool/pkg-plist
index d7056c3c91ed..fcbbd697f3e3 100644
--- a/textproc/ruby-rdtool/pkg-plist
+++ b/textproc/ruby-rdtool/pkg-plist
@@ -2,32 +2,32 @@ bin/rd2
 bin/rdswap
 bin/rmi2html
 bin/rmi2html.rb
-lib/ruby/site_ruby/%%RUBY_VER%%/rd/dot.rd2rc
-lib/ruby/site_ruby/%%RUBY_VER%%/rd/filter.rb
-lib/ruby/site_ruby/%%RUBY_VER%%/rd/rd2html-lib.rb
-lib/ruby/site_ruby/%%RUBY_VER%%/rd/rd2html-opt.rb
-lib/ruby/site_ruby/%%RUBY_VER%%/rd/rd2man-lib.rb
-lib/ruby/site_ruby/%%RUBY_VER%%/rd/rd2rdo-lib.rb
-lib/ruby/site_ruby/%%RUBY_VER%%/rd/rd2rmi-lib.rb
-lib/ruby/site_ruby/%%RUBY_VER%%/rd/rdblockparser.tab.rb
-lib/ruby/site_ruby/%%RUBY_VER%%/rd/rdfmt.rb
-lib/ruby/site_ruby/%%RUBY_VER%%/rd/rdinlineparser.tab.rb
-lib/ruby/site_ruby/%%RUBY_VER%%/rd/rdvisitor.rb
-@dirrm lib/ruby/site_ruby/%%RUBY_VER%%/rd
-share/examples/ruby/rd/dot.rd2rc
-@dirrm share/examples/ruby/rd
+%%RUBY_SITELIBDIR%%/rd/dot.rd2rc
+%%RUBY_SITELIBDIR%%/rd/filter.rb
+%%RUBY_SITELIBDIR%%/rd/rd2html-lib.rb
+%%RUBY_SITELIBDIR%%/rd/rd2html-opt.rb
+%%RUBY_SITELIBDIR%%/rd/rd2man-lib.rb
+%%RUBY_SITELIBDIR%%/rd/rd2rdo-lib.rb
+%%RUBY_SITELIBDIR%%/rd/rd2rmi-lib.rb
+%%RUBY_SITELIBDIR%%/rd/rdblockparser.tab.rb
+%%RUBY_SITELIBDIR%%/rd/rdfmt.rb
+%%RUBY_SITELIBDIR%%/rd/rdinlineparser.tab.rb
+%%RUBY_SITELIBDIR%%/rd/rdvisitor.rb
+@dirrm %%RUBY_SITELIBDIR%%/rd
+%%RUBY_EXAMPLESDIR%%/rd/dot.rd2rc
+@dirrm %%RUBY_EXAMPLESDIR%%/rd
 share/emacs/site-lisp/rd-mode.el
 lib/xemacs/site-lisp/rd-mode.el
 @unexec rmdir -p %D/share/emacs/site-lisp 2>/dev/null || true
 @unexec rmdir -p %D/lib/xemacs/site-lisp 2>/dev/null || true
-share/doc/ruby/optparse/ja/optparse.ja.html
-share/doc/ruby/rd/README.html
-share/doc/ruby/rd/rd-draft.html
-share/doc/ruby/rd/rd-draft.rd
-share/doc/ruby/rd/ja/README.ja.html
-share/doc/ruby/rd/ja/dev-note.ja.html
-share/doc/ruby/rd/ja/dev-note.rd.ja
-share/doc/ruby/rd/ja/rd-draft.ja.html
-share/doc/ruby/rd/ja/rd-draft.rd.ja
-@dirrm share/doc/ruby/rd/ja
-@dirrm share/doc/ruby/rd
+%%RUBY_DOCDIR%%/optparse/ja/optparse.ja.html
+%%RUBY_DOCDIR%%/rd/README.html
+%%RUBY_DOCDIR%%/rd/rd-draft.html
+%%RUBY_DOCDIR%%/rd/rd-draft.rd
+%%RUBY_DOCDIR%%/rd/ja/README.ja.html
+%%RUBY_DOCDIR%%/rd/ja/dev-note.ja.html
+%%RUBY_DOCDIR%%/rd/ja/dev-note.rd.ja
+%%RUBY_DOCDIR%%/rd/ja/rd-draft.ja.html
+%%RUBY_DOCDIR%%/rd/ja/rd-draft.rd.ja
+@dirrm %%RUBY_DOCDIR%%/rd/ja
+@dirrm %%RUBY_DOCDIR%%/rd