5 files changed, 42 insertions, 56 deletions

diff --git a/japanese/rbnamazu/Makefile b/japanese/rbnamazu/Makefile
index 68ea2298be90..9240189e57c9 100644
--- a/japanese/rbnamazu/Makefile
+++ b/japanese/rbnamazu/Makefile
@@ -13,20 +13,15 @@ DIST_SUBDIR=	ruby
 
 MAINTAINER=	knu@FreeBSD.org
 
+RUN_DEPENDS=	${RUBY_SITELIBDIR}/optparse.rb:${PORTSDIR}/devel/ruby-optparse
+
+USE_RUBY=	yes
 .if !defined(NOPORTDOCS)
-BUILD_DEPENDS+=	rd2:${PORTSDIR}/textproc/ruby-rdtool
+USE_RUBY_RD=	yes
 .endif
-RUN_DEPENDS=	ruby:${PORTSDIR}/lang/ruby \
-		${LOCALBASE}/lib/ruby/site_ruby/${RUBY_VER}/optparse.rb:${PORTSDIR}/devel/ruby-optparse
 
 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}
-
 MODULES=	rbnamazu.rb nmzqr.rb nmzqr.tab.rb nmzdoc.rb
 RD_DOCS=	rbnamazu.rd.ja rbnamazu.rd.en
 
@@ -34,20 +29,22 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/namazu.rb ${PREFIX}/bin/
 	${LN} -sf namazu.rb ${PREFIX}/bin/rbnamazu
 .for f in ${MODULES}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/lib/ruby/site_ruby/${RUBY_VER}/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_SITELIBDIR}
 .endfor
 .if !defined(NOPORTDOCS)
 .for f in ${RD_DOCS}
 	cd ${WRKSRC}; \
-	rd2 ${f} > ${f:S/.rd/.html/}
+	${RUBY_RD} ${f} > ${f:S/.rd/.html/}
 .endfor
-	${MKDIR} ${PREFIX}/share/doc/ruby/rbnamazu/ja
+	${MKDIR} ${RUBY_DOCDIR}/rbnamazu/ja
 .for f in ${RD_DOCS:S/.rd/.html/:M*.en}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/ruby/rbnamazu/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/rbnamazu/
 .endfor
 .for f in ${RD_DOCS:S/.rd/.html/:M*.ja}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/ruby/rbnamazu/ja/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/rbnamazu/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/japanese/rbnamazu/pkg-plist b/japanese/rbnamazu/pkg-plist
index 7a3365fd056a..593b17b37a8f 100644
--- a/japanese/rbnamazu/pkg-plist
+++ b/japanese/rbnamazu/pkg-plist
@@ -1,10 +1,10 @@
 bin/namazu.rb
 bin/rbnamazu
-lib/ruby/site_ruby/%%RUBY_VER%%/nmzdoc.rb
-lib/ruby/site_ruby/%%RUBY_VER%%/nmzqr.rb
-lib/ruby/site_ruby/%%RUBY_VER%%/nmzqr.tab.rb
-lib/ruby/site_ruby/%%RUBY_VER%%/rbnamazu.rb
-share/doc/ruby/rbnamazu/ja/rbnamazu.html.ja
-share/doc/ruby/rbnamazu/rbnamazu.html.en
-@dirrm share/doc/ruby/rbnamazu/ja
-@dirrm share/doc/ruby/rbnamazu
+%%RUBY_SITELIBDIR%%/nmzdoc.rb
+%%RUBY_SITELIBDIR%%/nmzqr.rb
+%%RUBY_SITELIBDIR%%/nmzqr.tab.rb
+%%RUBY_SITELIBDIR%%/rbnamazu.rb
+%%RUBY_DOCDIR%%/rbnamazu/ja/rbnamazu.html.ja
+%%RUBY_DOCDIR%%/rbnamazu/rbnamazu.html.en
+@dirrm %%RUBY_DOCDIR%%/rbnamazu/ja
+@dirrm %%RUBY_DOCDIR%%/rbnamazu
diff --git a/japanese/rskkserv/Makefile b/japanese/rskkserv/Makefile
index eca43f9d7ed6..fea21cea8a0d 100644
--- a/japanese/rskkserv/Makefile
+++ b/japanese/rskkserv/Makefile
@@ -13,20 +13,15 @@ DIST_SUBDIR=	ruby
 
 MAINTAINER=	knu@FreeBSD.org
 
-BUILD_DEPENDS=	ruby:${PORTSDIR}/lang/ruby
-RUN_DEPENDS=	ruby:${PORTSDIR}/lang/ruby \
-		${RUBY_LIBDIR}/tcpwrap.so:${PORTSDIR}/security/ruby-tcpwrap \
+RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/tcpwrap.so:${PORTSDIR}/security/ruby-tcpwrap \
 		${LOCALBASE}/share/skk/${SKKJISYO}:${SKK_MASTERDIR}
 
+USE_RUBY=	yes
+
 SKKJISYO_SIZE?=	L
 SKKJISYO?=	SKK-JISYO.${SKKJISYO_SIZE}
 SKK_MASTERDIR=	${PORTSDIR}/japanese/skk-jisyo
 
-RUBY?=		${LOCALBASE}/bin/ruby
-RUBY_VER?=	1.4
-RUBY_ARCH?=	${ARCH}-freebsd${OSREL}
-RUBY_LIBDIR=	${PREFIX}/lib/ruby/site_ruby/${RUBY_VER}/${RUBY_ARCH}
-
 STARTUP_SCRIPT=	${PREFIX}/etc/rc.d/rskkserv.sh
 MAKE_ARGS=	prefix="${PREFIX}" \
 		dicfile="${LOCALBASE}/share/skk/${SKKJISYO}"
@@ -56,4 +51,6 @@ do-install:
 		${CHMOD} ${BINMODE} ${STARTUP_SCRIPT}; \
 	fi
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/Mk/bsd.ruby.mk"
+.include <bsd.port.post.mk>
diff --git a/japanese/ruby-eb/Makefile b/japanese/ruby-eb/Makefile
index 193c2a3b4391..014abf717b7c 100644
--- a/japanese/ruby-eb/Makefile
+++ b/japanese/ruby-eb/Makefile
@@ -14,33 +14,25 @@ DIST_SUBDIR=	ruby
 
 MAINTAINER=	knu@FreeBSD.org
 
-BUILD_DEPENDS=	ruby:${PORTSDIR}/lang/ruby
 LIB_DEPENDS=	eb.3:${PORTSDIR}/japanese/eb
-RUN_DEPENDS=	ruby:${PORTSDIR}/lang/ruby
+
+USE_RUBY=	yes
+USE_RUBY_EXTCONF=	yes
 
 NO_WRKSUBDIR=	yes
-CONFIGURE_ARGS=	--with-opt-dir="${LOCALBASE}"
 INSTALL_TARGET=	site-install
-PLIST_SUB=	RUBY_VER="${RUBY_VER}" RUBY_ARCH="${RUBY_ARCH}"
-
-RUBY?=		${LOCALBASE}/bin/ruby
-RUBY_VER?=	1.4
-RUBY_ARCH?=	${ARCH}-freebsd${OSREL}
 
 .include <bsd.port.pre.mk>
+.include "${PORTSDIR}/Mk/bsd.ruby.mk"
 
-PKGNAMEPREFIX:=	${PKGNAMEPREFIX}ruby-
-
-do-configure:
-	@cd ${WRKSRC}; \
-	${SETENV} ${CONFIGURE_ENV} ${RUBY} extconf.rb ${CONFIGURE_ARGS}
+PKGNAMEPREFIX:=	${PKGNAMEPREFIX}${RUBY_PKGNAMEPREFIX}
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/examples/ruby/eb/ja/
-	${INSTALL_DATA} ${WRKSRC}/test.rb ${PREFIX}/share/examples/ruby/eb/ja/
-	${MKDIR} ${PREFIX}/share/doc/ruby/eb/ja
-	${INSTALL_DATA} ${WRKSRC}/eb.html ${PREFIX}/share/doc/ruby/eb/ja/
+	${MKDIR} ${RUBY_EXAMPLESDIR}/eb/ja/
+	${INSTALL_DATA} ${WRKSRC}/test.rb ${RUBY_EXAMPLESDIR}/eb/ja/
+	${MKDIR} ${RUBY_DOCDIR}/eb/ja
+	${INSTALL_DATA} ${WRKSRC}/eb.html ${RUBY_DOCDIR}/eb/ja/
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/japanese/ruby-eb/pkg-plist b/japanese/ruby-eb/pkg-plist
index 399d77563d1c..ae20ed631301 100644
--- a/japanese/ruby-eb/pkg-plist
+++ b/japanese/ruby-eb/pkg-plist
@@ -1,7 +1,7 @@
-lib/ruby/site_ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/eb.so
-share/examples/ruby/eb/ja/test.rb
-@dirrm share/examples/ruby/eb/ja
-@dirrm share/examples/ruby/eb
-share/doc/ruby/eb/ja/eb.html
-@dirrm share/doc/ruby/eb/ja
-@dirrm share/doc/ruby/eb
+%%RUBY_SITEARCHLIBDIR%%/eb.so
+%%RUBY_EXAMPLESDIR%%/eb/ja/test.rb
+@dirrm %%RUBY_EXAMPLESDIR%%/eb/ja
+@dirrm %%RUBY_EXAMPLESDIR%%/eb
+%%RUBY_DOCDIR%%/eb/ja/eb.html
+@dirrm %%RUBY_DOCDIR%%/eb/ja
+@dirrm %%RUBY_DOCDIR%%/eb