2 files changed, 36 insertions, 40 deletions

diff --git a/devel/ruby-amstd/Makefile b/devel/ruby-amstd/Makefile
index 7ae1114399f8..b60257189421 100644
--- a/devel/ruby-amstd/Makefile
+++ b/devel/ruby-amstd/Makefile
@@ -9,21 +9,15 @@ PORTNAME=	amstd
 PORTVERSION=	1.9.3
 CATEGORIES=	devel ruby
 MASTER_SITES=	http://www1.u-netsurf.ne.jp/~brew/mine/soft/
-PKGNAMEPREFIX=	ruby-
+PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DIST_SUBDIR=	ruby
 
 MAINTAINER=	knu@FreeBSD.org
 
-RUN_DEPENDS=	ruby:${PORTSDIR}/lang/ruby
+USE_RUBY=	yes
 
 NO_BUILD=	yes
 
-PLIST_SUB=	RUBY_VER="${RUBY_VER}" RUBY_ARCH="${RUBY_ARCH}"
-
-RUBY?=		${LOCALBASE}/bin/ruby
-RUBY_VER?=	1.4
-RUBY_ARCH?=	${ARCH}-freebsd${OSREL}
-
 DOCS_EN=	README.en
 DOCS_JA=	README.ja
 MODULES=	bench.rb \
@@ -49,19 +43,21 @@ MODULES=	bench.rb \
 		version.rb
 
 do-install:
-	${MKDIR} ${PREFIX}/lib/ruby/site_ruby/${RUBY_VER}/amstd
+	${MKDIR} ${RUBY_SITELIBDIR}/amstd
 .for f in ${MODULES}
 	${INSTALL_DATA} ${WRKSRC}/lib/amstd/${f} \
-			${PREFIX}/lib/ruby/site_ruby/${RUBY_VER}/amstd/
+			${RUBY_SITELIBDIR}/amstd/
 .endfor
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/ruby/amstd/ja
+	${MKDIR} ${RUBY_DOCDIR}/amstd/ja
 .for f in ${DOCS_EN}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/ruby/amstd/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/amstd/
 .endfor
 .for f in ${DOCS_JA}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/ruby/amstd/ja/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/amstd/ja/
 .endfor
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/Mk/bsd.ruby.mk"
+.include <bsd.port.post.mk>
diff --git a/devel/ruby-amstd/pkg-plist b/devel/ruby-amstd/pkg-plist
index 3c401737d6ae..a0c9f781be89 100644
--- a/devel/ruby-amstd/pkg-plist
+++ b/devel/ruby-amstd/pkg-plist
@@ -1,26 +1,26 @@
-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
-@dirrm lib/ruby/site_ruby/%%RUBY_VER%%/amstd
-share/doc/ruby/amstd/README.en
-share/doc/ruby/amstd/ja/README.ja
-@dirrm share/doc/ruby/amstd/ja
-@dirrm share/doc/ruby/amstd
+%%RUBY_SITELIBDIR%%/amstd/bench.rb
+%%RUBY_SITELIBDIR%%/amstd/bug.rb
+%%RUBY_SITELIBDIR%%/amstd/collfrom.rb
+%%RUBY_SITELIBDIR%%/amstd/dispatch.rb
+%%RUBY_SITELIBDIR%%/amstd/errutil.rb
+%%RUBY_SITELIBDIR%%/amstd/extmod.rb
+%%RUBY_SITELIBDIR%%/amstd/fileutils.rb
+%%RUBY_SITELIBDIR%%/amstd/futils.rb
+%%RUBY_SITELIBDIR%%/amstd/gconst.rb
+%%RUBY_SITELIBDIR%%/amstd/getdep.rb
+%%RUBY_SITELIBDIR%%/amstd/info.rb
+%%RUBY_SITELIBDIR%%/amstd/must.rb
+%%RUBY_SITELIBDIR%%/amstd/pipeline.rb
+%%RUBY_SITELIBDIR%%/amstd/rbparams.rb
+%%RUBY_SITELIBDIR%%/amstd/recycle.rb
+%%RUBY_SITELIBDIR%%/amstd/rubyemu.rb
+%%RUBY_SITELIBDIR%%/amstd/strquote.rb
+%%RUBY_SITELIBDIR%%/amstd/symbol.rb
+%%RUBY_SITELIBDIR%%/amstd/timer.rb
+%%RUBY_SITELIBDIR%%/amstd/to_s.rb
+%%RUBY_SITELIBDIR%%/amstd/version.rb
+@dirrm %%RUBY_SITELIBDIR%%/amstd
+%%RUBY_DOCDIR%%/amstd/README.en
+%%RUBY_DOCDIR%%/amstd/ja/README.ja
+@dirrm %%RUBY_DOCDIR%%/amstd/ja
+@dirrm %%RUBY_DOCDIR%%/amstd