23 files changed, 596 insertions, 685 deletions

diff --git a/archivers/ruby-zlib/Makefile b/archivers/ruby-zlib/Makefile
index b09f703bba76..7f059c513aeb 100644
--- a/archivers/ruby-zlib/Makefile
+++ b/archivers/ruby-zlib/Makefile
@@ -9,39 +9,31 @@ PORTNAME=	zlib
 PORTVERSION=	0.3.1
 CATEGORIES=	archivers ruby
 MASTER_SITES=	http://www.blue.sky.or.jp/atelier/ruby/
-PKGNAMEPREFIX=	ruby-
+PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
 DIST_SUBDIR=	ruby
 
 MAINTAINER=	knu@FreeBSD.org
 
-BUILD_DEPENDS=	ruby:${PORTSDIR}/lang/ruby
-RUN_DEPENDS=	ruby:${PORTSDIR}/lang/ruby
+USE_RUBY=	yes
+USE_RUBY_EXTCONF=	yes
 
 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}
-
 DOCS_EN=	ChangeLog zlib.en.html
 DOCS_JA=	zlib.ja.html
 
-do-configure:
-	@cd ${WRKSRC}; \
-	${SETENV} ${CONFIGURE_ENV} ${RUBY} extconf.rb
-
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/ruby/zlib/ja
+	${MKDIR} ${RUBY_DOCDIR}/zlib/ja
 .for f in ${DOCS_EN}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/ruby/zlib/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/zlib/
 .endfor
 .for f in ${DOCS_JA}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/ruby/zlib/ja/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/zlib/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/archivers/ruby-zlib/pkg-plist b/archivers/ruby-zlib/pkg-plist
index 22703b0f1794..59323b5126d4 100644
--- a/archivers/ruby-zlib/pkg-plist
+++ b/archivers/ruby-zlib/pkg-plist
@@ -1,6 +1,6 @@
-lib/ruby/site_ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/zlib.so
-share/doc/ruby/zlib/ChangeLog
-share/doc/ruby/zlib/zlib.en.html
-share/doc/ruby/zlib/ja/zlib.ja.html
-@dirrm share/doc/ruby/zlib/ja
-@dirrm share/doc/ruby/zlib
+%%RUBY_SITEARCHLIBDIR%%/zlib.so
+%%RUBY_DOCDIR%%/zlib/ChangeLog
+%%RUBY_DOCDIR%%/zlib/zlib.en.html
+%%RUBY_DOCDIR%%/zlib/ja/zlib.ja.html
+@dirrm %%RUBY_DOCDIR%%/zlib/ja
+@dirrm %%RUBY_DOCDIR%%/zlib
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
diff --git a/mail/ruby-tmail/Makefile b/mail/ruby-tmail/Makefile
index ca3cea1881d2..229700020b9b 100644
--- a/mail/ruby-tmail/Makefile
+++ b/mail/ruby-tmail/Makefile
@@ -9,26 +9,17 @@ PORTNAME=	tmail
 PORTVERSION=	0.8.12
 CATEGORIES=	mail ruby
 MASTER_SITES=	http://www1.u-netsurf.ne.jp/~brew/mine/soft/
-PKGNAMEPREFIX=	ruby-
+PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DIST_SUBDIR=	ruby
 
 MAINTAINER=	knu@FreeBSD.org
 
-BUILD_DEPENDS=	ruby:${PORTSDIR}/lang/ruby \
-		${RUBY_SITELIBDIR}/amstd/info.rb:${PORTSDIR}/devel/ruby-amstd
-RUN_DEPENDS=	ruby:${PORTSDIR}/lang/ruby \
-		${RUBY_SITELIBDIR}/amstd/info.rb:${PORTSDIR}/devel/ruby-amstd \
-		${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
 
-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
+USE_RUBY_AMSTD=	yes
+USE_RUBY_SETUP=	yes
 
 post-patch:
 	${PERL} -i -ne '/\btmail\b/ and print' \
@@ -36,23 +27,15 @@ post-patch:
 	for d in cparse strscanso; do ${RM} -rf ${WRKSRC}/ext/$$d; done
 	for d in amstd raccrt strscan; do ${RM} -rf ${WRKSRC}/lib/$$d; done
 
-do-configure:
-	@cd ${WRKSRC}; \
-	${SETENV} ${CONFIGURE_ENV} ${RUBY} setup.rb config
-
-do-build:
-	@cd ${WRKSRC}; \
-	${SETENV} ${MAKE_ENV} ${RUBY} setup.rb setup
-
 do-install:
-	@cd ${WRKSRC}; \
-	${SETENV} ${MAKE_ENV} ${RUBY} setup.rb install
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/examples/ruby/tmail
-	${CP} -R ${WRKSRC}/sample/ ${PREFIX}/share/examples/ruby/tmail/
-	${MKDIR} ${PREFIX}/share/doc/ruby/tmail/ja
-	${CP} -R ${WRKSRC}/README.en ${WRKSRC}/doc.en/ ${PREFIX}/share/doc/ruby/tmail/
-	${CP} -R ${WRKSRC}/README.ja ${WRKSRC}/doc.ja/ ${PREFIX}/share/doc/ruby/tmail/ja/
+	${MKDIR} ${RUBY_EXAMPLESDIR}/tmail
+	${CP} -R ${WRKSRC}/sample/ ${RUBY_EXAMPLESDIR}/tmail/
+	${MKDIR} ${RUBY_DOCDIR}/tmail/ja
+	${CP} -R ${WRKSRC}/README.en ${WRKSRC}/doc.en/ ${RUBY_DOCDIR}/tmail/
+	${CP} -R ${WRKSRC}/README.ja ${WRKSRC}/doc.ja/ ${RUBY_DOCDIR}/tmail/ja/
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/Mk/bsd.ruby.mk"
+.include <bsd.port.post.mk>
diff --git a/mail/ruby-tmail/pkg-plist b/mail/ruby-tmail/pkg-plist
index 830d169d0cff..b44dbfd0966e 100644
--- a/mail/ruby-tmail/pkg-plist
+++ b/mail/ruby-tmail/pkg-plist
@@ -1,45 +1,45 @@
-lib/ruby/site_ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/tmail/mails.so
-@dirrm lib/ruby/site_ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/tmail
-lib/ruby/site_ruby/%%RUBY_VER%%/tmail/encode.rb
-lib/ruby/site_ruby/%%RUBY_VER%%/tmail/info.rb
-lib/ruby/site_ruby/%%RUBY_VER%%/tmail/mailp.rb
-lib/ruby/site_ruby/%%RUBY_VER%%/tmail/port.rb
-lib/ruby/site_ruby/%%RUBY_VER%%/tmail/field.rb
-lib/ruby/site_ruby/%%RUBY_VER%%/tmail/loader.rb
-lib/ruby/site_ruby/%%RUBY_VER%%/tmail/mails.rb
-lib/ruby/site_ruby/%%RUBY_VER%%/tmail/tmail.rb
-@dirrm lib/ruby/site_ruby/%%RUBY_VER%%/tmail
-share/examples/ruby/tmail/from-check.rb
-share/examples/ruby/tmail/hf2class.rb
-share/examples/ruby/tmail/multipart.rb
-share/examples/ruby/tmail/parse-bench.rb
-share/examples/ruby/tmail/parse-test.rb
-share/examples/ruby/tmail/sendmail.rb
-share/examples/ruby/tmail/m/normal
-share/examples/ruby/tmail/m/simple
-share/examples/ruby/tmail/m/multipart
-share/examples/ruby/tmail/m/sendtest
-@dirrm share/examples/ruby/tmail/m
-@dirrm share/examples/ruby/tmail
-share/doc/ruby/tmail/README.en
-share/doc/ruby/tmail/bugs.html
-share/doc/ruby/tmail/changes.html
-share/doc/ruby/tmail/concept.html
-share/doc/ruby/tmail/field.html
-share/doc/ruby/tmail/index.html
-share/doc/ruby/tmail/item.html
-share/doc/ruby/tmail/loader.html
-share/doc/ruby/tmail/port.html
-share/doc/ruby/tmail/tmail.html
-share/doc/ruby/tmail/ja/README.ja
-share/doc/ruby/tmail/ja/bugs.html
-share/doc/ruby/tmail/ja/changes.html
-share/doc/ruby/tmail/ja/concept.html
-share/doc/ruby/tmail/ja/field.html
-share/doc/ruby/tmail/ja/index.html
-share/doc/ruby/tmail/ja/item.html
-share/doc/ruby/tmail/ja/loader.html
-share/doc/ruby/tmail/ja/port.html
-share/doc/ruby/tmail/ja/tmail.html
-@dirrm share/doc/ruby/tmail/ja
-@dirrm share/doc/ruby/tmail
+%%RUBY_SITEARCHLIBDIR%%/tmail/mails.so
+@dirrm %%RUBY_SITEARCHLIBDIR%%/tmail
+%%RUBY_SITELIBDIR%%/tmail/encode.rb
+%%RUBY_SITELIBDIR%%/tmail/info.rb
+%%RUBY_SITELIBDIR%%/tmail/mailp.rb
+%%RUBY_SITELIBDIR%%/tmail/port.rb
+%%RUBY_SITELIBDIR%%/tmail/field.rb
+%%RUBY_SITELIBDIR%%/tmail/loader.rb
+%%RUBY_SITELIBDIR%%/tmail/mails.rb
+%%RUBY_SITELIBDIR%%/tmail/tmail.rb
+@dirrm %%RUBY_SITELIBDIR%%/tmail
+%%RUBY_EXAMPLESDIR%%/tmail/from-check.rb
+%%RUBY_EXAMPLESDIR%%/tmail/hf2class.rb
+%%RUBY_EXAMPLESDIR%%/tmail/multipart.rb
+%%RUBY_EXAMPLESDIR%%/tmail/parse-bench.rb
+%%RUBY_EXAMPLESDIR%%/tmail/parse-test.rb
+%%RUBY_EXAMPLESDIR%%/tmail/sendmail.rb
+%%RUBY_EXAMPLESDIR%%/tmail/m/normal
+%%RUBY_EXAMPLESDIR%%/tmail/m/simple
+%%RUBY_EXAMPLESDIR%%/tmail/m/multipart
+%%RUBY_EXAMPLESDIR%%/tmail/m/sendtest
+@dirrm %%RUBY_EXAMPLESDIR%%/tmail/m
+@dirrm %%RUBY_EXAMPLESDIR%%/tmail
+%%RUBY_DOCDIR%%/tmail/README.en
+%%RUBY_DOCDIR%%/tmail/bugs.html
+%%RUBY_DOCDIR%%/tmail/changes.html
+%%RUBY_DOCDIR%%/tmail/concept.html
+%%RUBY_DOCDIR%%/tmail/field.html
+%%RUBY_DOCDIR%%/tmail/index.html
+%%RUBY_DOCDIR%%/tmail/item.html
+%%RUBY_DOCDIR%%/tmail/loader.html
+%%RUBY_DOCDIR%%/tmail/port.html
+%%RUBY_DOCDIR%%/tmail/tmail.html
+%%RUBY_DOCDIR%%/tmail/ja/README.ja
+%%RUBY_DOCDIR%%/tmail/ja/bugs.html
+%%RUBY_DOCDIR%%/tmail/ja/changes.html
+%%RUBY_DOCDIR%%/tmail/ja/concept.html
+%%RUBY_DOCDIR%%/tmail/ja/field.html
+%%RUBY_DOCDIR%%/tmail/ja/index.html
+%%RUBY_DOCDIR%%/tmail/ja/item.html
+%%RUBY_DOCDIR%%/tmail/ja/loader.html
+%%RUBY_DOCDIR%%/tmail/ja/port.html
+%%RUBY_DOCDIR%%/tmail/ja/tmail.html
+@dirrm %%RUBY_DOCDIR%%/tmail/ja
+@dirrm %%RUBY_DOCDIR%%/tmail
diff --git a/mail/rubygem-tmail/Makefile b/mail/rubygem-tmail/Makefile
index ca3cea1881d2..229700020b9b 100644
--- a/mail/rubygem-tmail/Makefile
+++ b/mail/rubygem-tmail/Makefile
@@ -9,26 +9,17 @@ PORTNAME=	tmail
 PORTVERSION=	0.8.12
 CATEGORIES=	mail ruby
 MASTER_SITES=	http://www1.u-netsurf.ne.jp/~brew/mine/soft/
-PKGNAMEPREFIX=	ruby-
+PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DIST_SUBDIR=	ruby
 
 MAINTAINER=	knu@FreeBSD.org
 
-BUILD_DEPENDS=	ruby:${PORTSDIR}/lang/ruby \
-		${RUBY_SITELIBDIR}/amstd/info.rb:${PORTSDIR}/devel/ruby-amstd
-RUN_DEPENDS=	ruby:${PORTSDIR}/lang/ruby \
-		${RUBY_SITELIBDIR}/amstd/info.rb:${PORTSDIR}/devel/ruby-amstd \
-		${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
 
-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
+USE_RUBY_AMSTD=	yes
+USE_RUBY_SETUP=	yes
 
 post-patch:
 	${PERL} -i -ne '/\btmail\b/ and print' \
@@ -36,23 +27,15 @@ post-patch:
 	for d in cparse strscanso; do ${RM} -rf ${WRKSRC}/ext/$$d; done
 	for d in amstd raccrt strscan; do ${RM} -rf ${WRKSRC}/lib/$$d; done
 
-do-configure:
-	@cd ${WRKSRC}; \
-	${SETENV} ${CONFIGURE_ENV} ${RUBY} setup.rb config
-
-do-build:
-	@cd ${WRKSRC}; \
-	${SETENV} ${MAKE_ENV} ${RUBY} setup.rb setup
-
 do-install:
-	@cd ${WRKSRC}; \
-	${SETENV} ${MAKE_ENV} ${RUBY} setup.rb install
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/examples/ruby/tmail
-	${CP} -R ${WRKSRC}/sample/ ${PREFIX}/share/examples/ruby/tmail/
-	${MKDIR} ${PREFIX}/share/doc/ruby/tmail/ja
-	${CP} -R ${WRKSRC}/README.en ${WRKSRC}/doc.en/ ${PREFIX}/share/doc/ruby/tmail/
-	${CP} -R ${WRKSRC}/README.ja ${WRKSRC}/doc.ja/ ${PREFIX}/share/doc/ruby/tmail/ja/
+	${MKDIR} ${RUBY_EXAMPLESDIR}/tmail
+	${CP} -R ${WRKSRC}/sample/ ${RUBY_EXAMPLESDIR}/tmail/
+	${MKDIR} ${RUBY_DOCDIR}/tmail/ja
+	${CP} -R ${WRKSRC}/README.en ${WRKSRC}/doc.en/ ${RUBY_DOCDIR}/tmail/
+	${CP} -R ${WRKSRC}/README.ja ${WRKSRC}/doc.ja/ ${RUBY_DOCDIR}/tmail/ja/
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/Mk/bsd.ruby.mk"
+.include <bsd.port.post.mk>
diff --git a/mail/rubygem-tmail/pkg-plist b/mail/rubygem-tmail/pkg-plist
index 830d169d0cff..b44dbfd0966e 100644
--- a/mail/rubygem-tmail/pkg-plist
+++ b/mail/rubygem-tmail/pkg-plist
@@ -1,45 +1,45 @@
-lib/ruby/site_ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/tmail/mails.so
-@dirrm lib/ruby/site_ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/tmail
-lib/ruby/site_ruby/%%RUBY_VER%%/tmail/encode.rb
-lib/ruby/site_ruby/%%RUBY_VER%%/tmail/info.rb
-lib/ruby/site_ruby/%%RUBY_VER%%/tmail/mailp.rb
-lib/ruby/site_ruby/%%RUBY_VER%%/tmail/port.rb
-lib/ruby/site_ruby/%%RUBY_VER%%/tmail/field.rb
-lib/ruby/site_ruby/%%RUBY_VER%%/tmail/loader.rb
-lib/ruby/site_ruby/%%RUBY_VER%%/tmail/mails.rb
-lib/ruby/site_ruby/%%RUBY_VER%%/tmail/tmail.rb
-@dirrm lib/ruby/site_ruby/%%RUBY_VER%%/tmail
-share/examples/ruby/tmail/from-check.rb
-share/examples/ruby/tmail/hf2class.rb
-share/examples/ruby/tmail/multipart.rb
-share/examples/ruby/tmail/parse-bench.rb
-share/examples/ruby/tmail/parse-test.rb
-share/examples/ruby/tmail/sendmail.rb
-share/examples/ruby/tmail/m/normal
-share/examples/ruby/tmail/m/simple
-share/examples/ruby/tmail/m/multipart
-share/examples/ruby/tmail/m/sendtest
-@dirrm share/examples/ruby/tmail/m
-@dirrm share/examples/ruby/tmail
-share/doc/ruby/tmail/README.en
-share/doc/ruby/tmail/bugs.html
-share/doc/ruby/tmail/changes.html
-share/doc/ruby/tmail/concept.html
-share/doc/ruby/tmail/field.html
-share/doc/ruby/tmail/index.html
-share/doc/ruby/tmail/item.html
-share/doc/ruby/tmail/loader.html
-share/doc/ruby/tmail/port.html
-share/doc/ruby/tmail/tmail.html
-share/doc/ruby/tmail/ja/README.ja
-share/doc/ruby/tmail/ja/bugs.html
-share/doc/ruby/tmail/ja/changes.html
-share/doc/ruby/tmail/ja/concept.html
-share/doc/ruby/tmail/ja/field.html
-share/doc/ruby/tmail/ja/index.html
-share/doc/ruby/tmail/ja/item.html
-share/doc/ruby/tmail/ja/loader.html
-share/doc/ruby/tmail/ja/port.html
-share/doc/ruby/tmail/ja/tmail.html
-@dirrm share/doc/ruby/tmail/ja
-@dirrm share/doc/ruby/tmail
+%%RUBY_SITEARCHLIBDIR%%/tmail/mails.so
+@dirrm %%RUBY_SITEARCHLIBDIR%%/tmail
+%%RUBY_SITELIBDIR%%/tmail/encode.rb
+%%RUBY_SITELIBDIR%%/tmail/info.rb
+%%RUBY_SITELIBDIR%%/tmail/mailp.rb
+%%RUBY_SITELIBDIR%%/tmail/port.rb
+%%RUBY_SITELIBDIR%%/tmail/field.rb
+%%RUBY_SITELIBDIR%%/tmail/loader.rb
+%%RUBY_SITELIBDIR%%/tmail/mails.rb
+%%RUBY_SITELIBDIR%%/tmail/tmail.rb
+@dirrm %%RUBY_SITELIBDIR%%/tmail
+%%RUBY_EXAMPLESDIR%%/tmail/from-check.rb
+%%RUBY_EXAMPLESDIR%%/tmail/hf2class.rb
+%%RUBY_EXAMPLESDIR%%/tmail/multipart.rb
+%%RUBY_EXAMPLESDIR%%/tmail/parse-bench.rb
+%%RUBY_EXAMPLESDIR%%/tmail/parse-test.rb
+%%RUBY_EXAMPLESDIR%%/tmail/sendmail.rb
+%%RUBY_EXAMPLESDIR%%/tmail/m/normal
+%%RUBY_EXAMPLESDIR%%/tmail/m/simple
+%%RUBY_EXAMPLESDIR%%/tmail/m/multipart
+%%RUBY_EXAMPLESDIR%%/tmail/m/sendtest
+@dirrm %%RUBY_EXAMPLESDIR%%/tmail/m
+@dirrm %%RUBY_EXAMPLESDIR%%/tmail
+%%RUBY_DOCDIR%%/tmail/README.en
+%%RUBY_DOCDIR%%/tmail/bugs.html
+%%RUBY_DOCDIR%%/tmail/changes.html
+%%RUBY_DOCDIR%%/tmail/concept.html
+%%RUBY_DOCDIR%%/tmail/field.html
+%%RUBY_DOCDIR%%/tmail/index.html
+%%RUBY_DOCDIR%%/tmail/item.html
+%%RUBY_DOCDIR%%/tmail/loader.html
+%%RUBY_DOCDIR%%/tmail/port.html
+%%RUBY_DOCDIR%%/tmail/tmail.html
+%%RUBY_DOCDIR%%/tmail/ja/README.ja
+%%RUBY_DOCDIR%%/tmail/ja/bugs.html
+%%RUBY_DOCDIR%%/tmail/ja/changes.html
+%%RUBY_DOCDIR%%/tmail/ja/concept.html
+%%RUBY_DOCDIR%%/tmail/ja/field.html
+%%RUBY_DOCDIR%%/tmail/ja/index.html
+%%RUBY_DOCDIR%%/tmail/ja/item.html
+%%RUBY_DOCDIR%%/tmail/ja/loader.html
+%%RUBY_DOCDIR%%/tmail/ja/port.html
+%%RUBY_DOCDIR%%/tmail/ja/tmail.html
+@dirrm %%RUBY_DOCDIR%%/tmail/ja
+@dirrm %%RUBY_DOCDIR%%/tmail
diff --git a/security/ruby-tcpwrap/Makefile b/security/ruby-tcpwrap/Makefile
index 13fde84eee96..4023f21b6d56 100644
--- a/security/ruby-tcpwrap/Makefile
+++ b/security/ruby-tcpwrap/Makefile
@@ -9,52 +9,45 @@ PORTNAME=	tcpwrap
 PORTVERSION=	0.1
 CATEGORIES=	security ruby
 MASTER_SITES=	http://www.ruby-lang.org/~shugo/ruby-tcpwrap/
-PKGNAMEPREFIX=	ruby-
+PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
 DIST_SUBDIR=	ruby
 
 MAINTAINER=	knu@FreeBSD.org
 
-BUILD_DEPENDS=	ruby:${PORTSDIR}/lang/ruby \
-		${LOCALBASE}/lib/libident.a:${PORTSDIR}/security/libident
+BUILD_DEPENDS=	${LOCALBASE}/lib/libident.a:${PORTSDIR}/security/libident
 .if !exists(/usr/include/tcpd.h)
 LIB_DEPENDS=	wrap.7:${PORTSDIR}/security/tcp_wrapper
 .endif
-RUN_DEPENDS=	ruby:${PORTSDIR}/lang/ruby
 
-INSTALL_TARGET=	site-install
+USE_RUBY=	yes
+USE_RUBY_EXTCONF=	yes
+
+WRKSRC=		${WRKDIR}/${PKGNAMEPREFIX}${PORTNAME}
 CONFIGURE_ARGS=	--with-ident-dir="${LOCALBASE}"
 .if !exists(/usr/include/tcpd.h)
 CONFIGURE_ARGS+=	--with-libwrap-dir="/usr"
 .else
 CONFIGURE_ARGS+=	--with-libwrap-dir="${LOCALBASE}"
 .endif
-
-WRKSRC=		${WRKDIR}/${PKGNAMEPREFIX}${PORTNAME}
-PLIST_SUB=	RUBY_VER="${RUBY_VER}" RUBY_ARCH="${RUBY_ARCH}"
-
-RUBY?=		${LOCALBASE}/bin/ruby
-RUBY_VER?=	1.4
-RUBY_ARCH?=	${ARCH}-freebsd${OSREL}
+INSTALL_TARGET=	site-install
 
 DOCS_EN=	README.en	doc/tcpwrap.html.en
 DOCS_JA=	README.ja	doc/tcpwrap.html.ja
 
-do-configure:
-	@cd ${WRKSRC}; \
-	${SETENV} ${CONFIGURE_ENV} ${RUBY} extconf.rb ${CONFIGURE_ARGS}
-
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/examples/ruby/tcpwrap
-	${INSTALL_DATA} ${WRKSRC}/sample/echod.rb ${PREFIX}/share/examples/ruby/tcpwrap/
-	${MKDIR} ${PREFIX}/share/doc/ruby/tcpwrap/ja
+	${MKDIR} ${RUBY_EXAMPLESDIR}/tcpwrap
+	${INSTALL_DATA} ${WRKSRC}/sample/echod.rb ${RUBY_EXAMPLESDIR}/tcpwrap/
+	${MKDIR} ${RUBY_DOCDIR}/tcpwrap/ja
 .for f in ${DOCS_EN}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/ruby/tcpwrap/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/tcpwrap/
 .endfor
 .for f in ${DOCS_JA}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/ruby/tcpwrap/ja/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/tcpwrap/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/security/ruby-tcpwrap/pkg-plist b/security/ruby-tcpwrap/pkg-plist
index e248781c92a2..1d24e1535ddd 100644
--- a/security/ruby-tcpwrap/pkg-plist
+++ b/security/ruby-tcpwrap/pkg-plist
@@ -1,9 +1,9 @@
-lib/ruby/site_ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/tcpwrap.so
-share/examples/ruby/tcpwrap/echod.rb
-@dirrm share/examples/ruby/tcpwrap
-share/doc/ruby/tcpwrap/README.en
-share/doc/ruby/tcpwrap/tcpwrap.html.en
-share/doc/ruby/tcpwrap/ja/README.ja
-share/doc/ruby/tcpwrap/ja/tcpwrap.html.ja
-@dirrm share/doc/ruby/tcpwrap/ja
-@dirrm share/doc/ruby/tcpwrap
+%%RUBY_SITEARCHLIBDIR%%/tcpwrap.so
+%%RUBY_EXAMPLESDIR%%/tcpwrap/echod.rb
+@dirrm %%RUBY_EXAMPLESDIR%%/tcpwrap
+%%RUBY_DOCDIR%%/tcpwrap/README.en
+%%RUBY_DOCDIR%%/tcpwrap/tcpwrap.html.en
+%%RUBY_DOCDIR%%/tcpwrap/ja/README.ja
+%%RUBY_DOCDIR%%/tcpwrap/ja/tcpwrap.html.ja
+@dirrm %%RUBY_DOCDIR%%/tcpwrap/ja
+@dirrm %%RUBY_DOCDIR%%/tcpwrap
diff --git a/textproc/eruby/Makefile b/textproc/eruby/Makefile
index 7d01da624941..0282bbad7d21 100644
--- a/textproc/eruby/Makefile
+++ b/textproc/eruby/Makefile
@@ -13,15 +13,10 @@ DIST_SUBDIR=	ruby
 
 MAINTAINER=	knu@FreeBSD.org
 
-BUILD_DEPENDS=	ruby:${PORTSDIR}/lang/ruby
-RUN_DEPENDS=	ruby:${PORTSDIR}/lang/ruby
+USE_RUBY=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-RUBY?=		${LOCALBASE}/bin/ruby
-RUBY_VER?=	1.4
-RUBY_ARCH?=	${ARCH}-freebsd${OSREL}
-
 DOCS_EN=	ChangeLog README.en
 DOCS_JA=	README.ja
 
@@ -30,13 +25,15 @@ do-configure:
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/ruby/eruby/ja
+	${MKDIR} ${RUBY_DOCDIR}/eruby/ja
 .for f in ${DOCS_EN}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/ruby/eruby/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/eruby/
 .endfor
 .for f in ${DOCS_JA}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/ruby/eruby/ja/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/eruby/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/textproc/eruby/pkg-plist b/textproc/eruby/pkg-plist
index ef823ed224b2..6dde67b527ad 100644
--- a/textproc/eruby/pkg-plist
+++ b/textproc/eruby/pkg-plist
@@ -1,6 +1,6 @@
 bin/eruby
-share/doc/ruby/eruby/ChangeLog
-share/doc/ruby/eruby/README.en
-share/doc/ruby/eruby/ja/README.ja
-@dirrm share/doc/ruby/eruby/ja
-@dirrm share/doc/ruby/eruby
+%%RUBY_DOCDIR%%/eruby/ChangeLog
+%%RUBY_DOCDIR%%/eruby/README.en
+%%RUBY_DOCDIR%%/eruby/ja/README.ja
+@dirrm %%RUBY_DOCDIR%%/eruby/ja
+@dirrm %%RUBY_DOCDIR%%/eruby
diff --git a/www/mod_ruby/Makefile b/www/mod_ruby/Makefile
index 66bf99fe9251..5f5a7435a44e 100644
--- a/www/mod_ruby/Makefile
+++ b/www/mod_ruby/Makefile
@@ -13,19 +13,15 @@ DIST_SUBDIR=	ruby
 
 MAINTAINER=	knu@FreeBSD.org
 
-BUILD_DEPENDS=	${APXS}:${PORTSDIR}/www/apache13 \
-		ruby:${PORTSDIR}/lang/ruby
-RUN_DEPENDS=	${APXS}:${PORTSDIR}/www/apache13 \
-		ruby:${PORTSDIR}/lang/ruby
+BUILD_DEPENDS=	${APXS}:${PORTSDIR}/www/apache13
+RUN_DEPENDS=	${APXS}:${PORTSDIR}/www/apache13
+
+USE_RUBY=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 APXS=		${LOCALBASE}/sbin/apxs
 
-RUBY?=		${LOCALBASE}/bin/ruby
-RUBY_VER?=	1.4
-RUBY_ARCH?=	${ARCH}-freebsd${OSREL}
-
 DOCS_EN=	ChangeLog README.en
 DOCS_JA=	README.ja
 
@@ -35,14 +31,16 @@ do-configure:
 do-install:
 	${APXS} -i -A -n ruby ${WRKSRC}/mod_ruby.so
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/ruby/mod_ruby/ja
+	${MKDIR} ${RUBY_DOCDIR}/mod_ruby/ja
 .for f in ${DOCS_EN}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/ruby/mod_ruby/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/mod_ruby/
 .endfor
 .for f in ${DOCS_JA}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/ruby/mod_ruby/ja/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/mod_ruby/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/www/mod_ruby/pkg-plist b/www/mod_ruby/pkg-plist
index de0b83996cdb..15457774a9b9 100644
--- a/www/mod_ruby/pkg-plist
+++ b/www/mod_ruby/pkg-plist
@@ -1,8 +1,8 @@
 libexec/apache/mod_ruby.so
 @exec %D/sbin/apxs -e -A -n ruby %D/%F
 @unexec %D/sbin/apxs -e -A -n ruby %D/%F
-share/doc/ruby/mod_ruby/ChangeLog
-share/doc/ruby/mod_ruby/README.en
-share/doc/ruby/mod_ruby/ja/README.ja
-@dirrm share/doc/ruby/mod_ruby/ja
-@dirrm share/doc/ruby/mod_ruby
+%%RUBY_DOCDIR%%/mod_ruby/ChangeLog
+%%RUBY_DOCDIR%%/mod_ruby/README.en
+%%RUBY_DOCDIR%%/mod_ruby/ja/README.ja
+@dirrm %%RUBY_DOCDIR%%/mod_ruby/ja
+@dirrm %%RUBY_DOCDIR%%/mod_ruby
diff --git a/x11-toolkits/ruby-qt/Makefile b/x11-toolkits/ruby-qt/Makefile
index 6b79a7adce98..da9d815fe021 100644
--- a/x11-toolkits/ruby-qt/Makefile
+++ b/x11-toolkits/ruby-qt/Makefile
@@ -9,26 +9,21 @@ PORTNAME=	qt
 PORTVERSION=	0.12
 CATEGORIES=	x11-toolkits ruby
 MASTER_SITES=	http://sfns.u-shizuoka-ken.ac.jp/geneng/horie_hp/ruby/
-PKGNAMEPREFIX=	ruby-
+PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
 DIST_SUBDIR=	ruby
 
 MAINTAINER=	knu@FreeBSD.org
 
-BUILD_DEPENDS=	ruby:${PORTSDIR}/lang/ruby
 LIB_DEPENDS=	${QTLIB}.${QTLIB_SHLIBVER}:${PORTSDIR}/x11-toolkits/${QT_PORTNAME}
-RUN_DEPENDS=	ruby:${PORTSDIR}/lang/ruby
 
-INSTALL_TARGET=	site-install
-CONFIGURE_ARGS=	--with-qt-include=${X11BASE}/include/X11/qt \
-		--with-qt-lib=${X11BASE}/lib
+USE_RUBY=	yes
+USE_RUBY_EXTCONF=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
-PLIST_SUB=	RUBY_VER="${RUBY_VER}" RUBY_ARCH="${RUBY_ARCH}"
-
-RUBY?=		${LOCALBASE}/bin/ruby
-RUBY_VER?=	1.4
-RUBY_ARCH?=	${ARCH}-freebsd${OSREL}
+CONFIGURE_ARGS=	--with-qt-include=${X11BASE}/include/X11/qt \
+		--with-qt-lib=${X11BASE}/lib
+INSTALL_TARGET=	site-install
 
 .if defined(WITH_I18N)
 I18NQT=		-DI18NQT
@@ -47,18 +42,16 @@ post-patch:
 		s,/usr/X11\b,${X11BASE},g; \
 		' ${WRKSRC}/lib/qt.rb
 
-do-configure:
-	@cd ${WRKSRC}; \
-	${SETENV} ${CONFIGURE_ENV} ${RUBY} extconf.rb ${CONFIGURE_ARGS}
-
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/examples/ruby/qt
-	${CP} -R ${WRKSRC}/examples/ ${PREFIX}/share/examples/ruby/qt/
-	${MKDIR} ${PREFIX}/share/doc/ruby/qt/ja
-	${CP} -R ${WRKSRC}/tutorial ${PREFIX}/share/doc/ruby/qt/
-	${INSTALL_DATA} ${WRKSRC}/README.txt ${PREFIX}/share/doc/ruby/qt/
-	${INSTALL_DATA} ${WRKSRC}/README.jp ${PREFIX}/share/doc/ruby/qt/ja/
+	${MKDIR} ${RUBY_EXAMPLESDIR}/qt
+	${CP} -R ${WRKSRC}/examples/ ${RUBY_EXAMPLESDIR}/qt/
+	${MKDIR} ${RUBY_DOCDIR}/qt/ja
+	${CP} -R ${WRKSRC}/tutorial ${RUBY_DOCDIR}/qt/
+	${INSTALL_DATA} ${WRKSRC}/README.txt ${RUBY_DOCDIR}/qt/
+	${INSTALL_DATA} ${WRKSRC}/README.jp ${RUBY_DOCDIR}/qt/ja/
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/Mk/bsd.ruby.mk"
+.include <bsd.port.post.mk>
diff --git a/x11-toolkits/ruby-qt/pkg-plist b/x11-toolkits/ruby-qt/pkg-plist
index e865f003b5a0..9081867fcaf7 100644
--- a/x11-toolkits/ruby-qt/pkg-plist
+++ b/x11-toolkits/ruby-qt/pkg-plist
@@ -1,136 +1,136 @@
-lib/ruby/site_ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/qt.so
-lib/ruby/site_ruby/%%RUBY_VER%%/qt.rb
-share/examples/ruby/qt/aclock/README.qt.orig
-share/examples/ruby/qt/aclock/aclock.rb
-share/examples/ruby/qt/aclock/aclock_lib.rb
-share/examples/ruby/qt/application/application.rb
-share/examples/ruby/qt/application/application_lib.rb
-share/examples/ruby/qt/application/fileopen.xpm
-share/examples/ruby/qt/application/fileprint.xpm
-share/examples/ruby/qt/application/filesave.xpm
-share/examples/ruby/qt/classbrows/rbbr_rb.rb
-share/examples/ruby/qt/classbrows/rbbr_qt.rb
-share/examples/ruby/qt/classbrows/qtbrows2.rb
-share/examples/ruby/qt/classbrows/splitter.rb
-share/examples/ruby/qt/connect/connect.rb
-share/examples/ruby/qt/connect/README.orig
-share/examples/ruby/qt/cursor/README.orig
-share/examples/ruby/qt/cursor/cursor.rb
-share/examples/ruby/qt/cursor/cb.xbm
-share/examples/ruby/qt/cursor/cm.xbm
-share/examples/ruby/qt/dclock/README.qt.orig
-share/examples/ruby/qt/dclock/dclock.rb
-share/examples/ruby/qt/dclock/dclock_sub.rb
-share/examples/ruby/qt/forever/README.orig
-share/examples/ruby/qt/forever/forever2.rb
-share/examples/ruby/qt/forever/forever.rb
-share/examples/ruby/qt/hello/README.orig
-share/examples/ruby/qt/hello/hello_lib.rb
-share/examples/ruby/qt/hello/hello.rb
-share/examples/ruby/qt/hello2/hello.rb
-share/examples/ruby/qt/hello_simple/hello.rb
-share/examples/ruby/qt/movies/README.orig
-share/examples/ruby/qt/movies/movies.rb
-share/examples/ruby/qt/movies/trolltech.gif
-share/examples/ruby/qt/pinguin/pinguin.xpm
-share/examples/ruby/qt/pinguin/pixbutton.rb
-share/examples/ruby/qt/rubyedit/rubyedit.rb
-share/examples/ruby/qt/rubyedit/rubyedit_lib.rb
-share/examples/ruby/qt/rubyedit/editcopy.xpm
-share/examples/ruby/qt/rubyedit/editcut.xpm
-share/examples/ruby/qt/rubyedit/fileopen.xpm
-share/examples/ruby/qt/rubyedit/fileprint.xpm
-share/examples/ruby/qt/rubyedit/filesave.xpm
-share/examples/ruby/qt/rubyedit/editpaste.xpm
-share/examples/ruby/qt/rubyedit/readme.txt
-share/examples/ruby/qt/rubyedit/kde2ps
-share/examples/ruby/qt/rubyedit/rubyedit_win.rb
-share/examples/ruby/qt/scribble/qtscribble.rb
-share/examples/ruby/qt/scribble/qtscribble_win.rb
-share/examples/ruby/qt/signal/hello_signal.rb
-share/examples/ruby/qt/signal/hello_signal_jp.rb
-share/examples/ruby/qt/widgets/widgets.rb
-share/examples/ruby/qt/widgets/aclock_lib.rb
-share/examples/ruby/qt/widgets/dclock_lib.rb
-share/examples/ruby/qt/widgets/qt.bmp
-share/examples/ruby/qt/widgets/trolltech.bmp
-share/examples/ruby/qt/widgets/trolltech.gif
-share/examples/ruby/qt/widgets/widgets_win.rb
-share/examples/ruby/qt/xform/image.any
-share/examples/ruby/qt/xform/README.orig
-share/examples/ruby/qt/xform/xform.rb
-@dirrm share/examples/ruby/qt/aclock
-@dirrm share/examples/ruby/qt/application
-@dirrm share/examples/ruby/qt/classbrows
-@dirrm share/examples/ruby/qt/connect
-@dirrm share/examples/ruby/qt/cursor
-@dirrm share/examples/ruby/qt/dclock
-@dirrm share/examples/ruby/qt/forever
-@dirrm share/examples/ruby/qt/hello
-@dirrm share/examples/ruby/qt/hello2
-@dirrm share/examples/ruby/qt/hello_simple
-@dirrm share/examples/ruby/qt/movies
-@dirrm share/examples/ruby/qt/pinguin
-@dirrm share/examples/ruby/qt/rubyedit
-@dirrm share/examples/ruby/qt/scribble
-@dirrm share/examples/ruby/qt/signal
-@dirrm share/examples/ruby/qt/widgets
-@dirrm share/examples/ruby/qt/xform
-@dirrm share/examples/ruby/qt
-share/doc/ruby/qt/tutorial/README.qt.orig
-share/doc/ruby/qt/tutorial/t1/t1.rb
-share/doc/ruby/qt/tutorial/t10/cannon.rb
-share/doc/ruby/qt/tutorial/t10/lcdrange.rb
-share/doc/ruby/qt/tutorial/t10/t10.rb
-share/doc/ruby/qt/tutorial/t11/cannon.rb
-share/doc/ruby/qt/tutorial/t11/lcdrange.rb
-share/doc/ruby/qt/tutorial/t11/t11.rb
-share/doc/ruby/qt/tutorial/t12/cannon.rb
-share/doc/ruby/qt/tutorial/t12/lcdrange.rb
-share/doc/ruby/qt/tutorial/t12/t12.rb
-share/doc/ruby/qt/tutorial/t13/cannon.rb
-share/doc/ruby/qt/tutorial/t13/cannonj.rb
-share/doc/ruby/qt/tutorial/t13/gamebrd.rb
-share/doc/ruby/qt/tutorial/t13/gamebrdj.rb
-share/doc/ruby/qt/tutorial/t13/lcdrange.rb
-share/doc/ruby/qt/tutorial/t13/t13.rb
-share/doc/ruby/qt/tutorial/t13/t13j.rb
-share/doc/ruby/qt/tutorial/t14/cannon.rb
-share/doc/ruby/qt/tutorial/t14/gamebrd.rb
-share/doc/ruby/qt/tutorial/t14/lcdrange.rb
-share/doc/ruby/qt/tutorial/t14/t14.rb
-share/doc/ruby/qt/tutorial/t2/t2.rb
-share/doc/ruby/qt/tutorial/t3/t3.rb
-share/doc/ruby/qt/tutorial/t4/t4.rb
-share/doc/ruby/qt/tutorial/t5/t5.rb
-share/doc/ruby/qt/tutorial/t6/t6.rb
-share/doc/ruby/qt/tutorial/t7/cannon.rb
-share/doc/ruby/qt/tutorial/t7/lcdmain.rb
-share/doc/ruby/qt/tutorial/t7/lcdrange.rb
-share/doc/ruby/qt/tutorial/t7/lcdsub.rb
-share/doc/ruby/qt/tutorial/t7/t7.rb
-share/doc/ruby/qt/tutorial/t8/cannon.rb
-share/doc/ruby/qt/tutorial/t8/lcdrange.rb
-share/doc/ruby/qt/tutorial/t8/t8.rb
-share/doc/ruby/qt/tutorial/t9/cannon.rb
-share/doc/ruby/qt/tutorial/t9/lcdrange.rb
-share/doc/ruby/qt/tutorial/t9/t9.rb
-@dirrm share/doc/ruby/qt/tutorial/t1
-@dirrm share/doc/ruby/qt/tutorial/t10
-@dirrm share/doc/ruby/qt/tutorial/t11
-@dirrm share/doc/ruby/qt/tutorial/t12
-@dirrm share/doc/ruby/qt/tutorial/t13
-@dirrm share/doc/ruby/qt/tutorial/t14
-@dirrm share/doc/ruby/qt/tutorial/t2
-@dirrm share/doc/ruby/qt/tutorial/t3
-@dirrm share/doc/ruby/qt/tutorial/t4
-@dirrm share/doc/ruby/qt/tutorial/t5
-@dirrm share/doc/ruby/qt/tutorial/t6
-@dirrm share/doc/ruby/qt/tutorial/t7
-@dirrm share/doc/ruby/qt/tutorial/t8
-@dirrm share/doc/ruby/qt/tutorial/t9
-@dirrm share/doc/ruby/qt/tutorial
-share/doc/ruby/qt/README.txt
-share/doc/ruby/qt/ja/README.jp
-@dirrm share/doc/ruby/qt/ja
-@dirrm share/doc/ruby/qt
+%%RUBY_SITEARCHLIBDIR%%/qt.so
+%%RUBY_SITELIBDIR%%/qt.rb
+%%RUBY_EXAMPLESDIR%%/qt/aclock/README.qt.orig
+%%RUBY_EXAMPLESDIR%%/qt/aclock/aclock.rb
+%%RUBY_EXAMPLESDIR%%/qt/aclock/aclock_lib.rb
+%%RUBY_EXAMPLESDIR%%/qt/application/application.rb
+%%RUBY_EXAMPLESDIR%%/qt/application/application_lib.rb
+%%RUBY_EXAMPLESDIR%%/qt/application/fileopen.xpm
+%%RUBY_EXAMPLESDIR%%/qt/application/fileprint.xpm
+%%RUBY_EXAMPLESDIR%%/qt/application/filesave.xpm
+%%RUBY_EXAMPLESDIR%%/qt/classbrows/rbbr_rb.rb
+%%RUBY_EXAMPLESDIR%%/qt/classbrows/rbbr_qt.rb
+%%RUBY_EXAMPLESDIR%%/qt/classbrows/qtbrows2.rb
+%%RUBY_EXAMPLESDIR%%/qt/classbrows/splitter.rb
+%%RUBY_EXAMPLESDIR%%/qt/connect/connect.rb
+%%RUBY_EXAMPLESDIR%%/qt/connect/README.orig
+%%RUBY_EXAMPLESDIR%%/qt/cursor/README.orig
+%%RUBY_EXAMPLESDIR%%/qt/cursor/cursor.rb
+%%RUBY_EXAMPLESDIR%%/qt/cursor/cb.xbm
+%%RUBY_EXAMPLESDIR%%/qt/cursor/cm.xbm
+%%RUBY_EXAMPLESDIR%%/qt/dclock/README.qt.orig
+%%RUBY_EXAMPLESDIR%%/qt/dclock/dclock.rb
+%%RUBY_EXAMPLESDIR%%/qt/dclock/dclock_sub.rb
+%%RUBY_EXAMPLESDIR%%/qt/forever/README.orig
+%%RUBY_EXAMPLESDIR%%/qt/forever/forever2.rb
+%%RUBY_EXAMPLESDIR%%/qt/forever/forever.rb
+%%RUBY_EXAMPLESDIR%%/qt/hello/README.orig
+%%RUBY_EXAMPLESDIR%%/qt/hello/hello_lib.rb
+%%RUBY_EXAMPLESDIR%%/qt/hello/hello.rb
+%%RUBY_EXAMPLESDIR%%/qt/hello2/hello.rb
+%%RUBY_EXAMPLESDIR%%/qt/hello_simple/hello.rb
+%%RUBY_EXAMPLESDIR%%/qt/movies/README.orig
+%%RUBY_EXAMPLESDIR%%/qt/movies/movies.rb
+%%RUBY_EXAMPLESDIR%%/qt/movies/trolltech.gif
+%%RUBY_EXAMPLESDIR%%/qt/pinguin/pinguin.xpm
+%%RUBY_EXAMPLESDIR%%/qt/pinguin/pixbutton.rb
+%%RUBY_EXAMPLESDIR%%/qt/rubyedit/rubyedit.rb
+%%RUBY_EXAMPLESDIR%%/qt/rubyedit/rubyedit_lib.rb
+%%RUBY_EXAMPLESDIR%%/qt/rubyedit/editcopy.xpm
+%%RUBY_EXAMPLESDIR%%/qt/rubyedit/editcut.xpm
+%%RUBY_EXAMPLESDIR%%/qt/rubyedit/fileopen.xpm
+%%RUBY_EXAMPLESDIR%%/qt/rubyedit/fileprint.xpm
+%%RUBY_EXAMPLESDIR%%/qt/rubyedit/filesave.xpm
+%%RUBY_EXAMPLESDIR%%/qt/rubyedit/editpaste.xpm
+%%RUBY_EXAMPLESDIR%%/qt/rubyedit/readme.txt
+%%RUBY_EXAMPLESDIR%%/qt/rubyedit/kde2ps
+%%RUBY_EXAMPLESDIR%%/qt/rubyedit/rubyedit_win.rb
+%%RUBY_EXAMPLESDIR%%/qt/scribble/qtscribble.rb
+%%RUBY_EXAMPLESDIR%%/qt/scribble/qtscribble_win.rb
+%%RUBY_EXAMPLESDIR%%/qt/signal/hello_signal.rb
+%%RUBY_EXAMPLESDIR%%/qt/signal/hello_signal_jp.rb
+%%RUBY_EXAMPLESDIR%%/qt/widgets/widgets.rb
+%%RUBY_EXAMPLESDIR%%/qt/widgets/aclock_lib.rb
+%%RUBY_EXAMPLESDIR%%/qt/widgets/dclock_lib.rb
+%%RUBY_EXAMPLESDIR%%/qt/widgets/qt.bmp
+%%RUBY_EXAMPLESDIR%%/qt/widgets/trolltech.bmp
+%%RUBY_EXAMPLESDIR%%/qt/widgets/trolltech.gif
+%%RUBY_EXAMPLESDIR%%/qt/widgets/widgets_win.rb
+%%RUBY_EXAMPLESDIR%%/qt/xform/image.any
+%%RUBY_EXAMPLESDIR%%/qt/xform/README.orig
+%%RUBY_EXAMPLESDIR%%/qt/xform/xform.rb
+@dirrm %%RUBY_EXAMPLESDIR%%/qt/aclock
+@dirrm %%RUBY_EXAMPLESDIR%%/qt/application
+@dirrm %%RUBY_EXAMPLESDIR%%/qt/classbrows
+@dirrm %%RUBY_EXAMPLESDIR%%/qt/connect
+@dirrm %%RUBY_EXAMPLESDIR%%/qt/cursor
+@dirrm %%RUBY_EXAMPLESDIR%%/qt/dclock
+@dirrm %%RUBY_EXAMPLESDIR%%/qt/forever
+@dirrm %%RUBY_EXAMPLESDIR%%/qt/hello
+@dirrm %%RUBY_EXAMPLESDIR%%/qt/hello2
+@dirrm %%RUBY_EXAMPLESDIR%%/qt/hello_simple
+@dirrm %%RUBY_EXAMPLESDIR%%/qt/movies
+@dirrm %%RUBY_EXAMPLESDIR%%/qt/pinguin
+@dirrm %%RUBY_EXAMPLESDIR%%/qt/rubyedit
+@dirrm %%RUBY_EXAMPLESDIR%%/qt/scribble
+@dirrm %%RUBY_EXAMPLESDIR%%/qt/signal
+@dirrm %%RUBY_EXAMPLESDIR%%/qt/widgets
+@dirrm %%RUBY_EXAMPLESDIR%%/qt/xform
+@dirrm %%RUBY_EXAMPLESDIR%%/qt
+%%RUBY_DOCDIR%%/qt/tutorial/README.qt.orig
+%%RUBY_DOCDIR%%/qt/tutorial/t1/t1.rb
+%%RUBY_DOCDIR%%/qt/tutorial/t10/cannon.rb
+%%RUBY_DOCDIR%%/qt/tutorial/t10/lcdrange.rb
+%%RUBY_DOCDIR%%/qt/tutorial/t10/t10.rb
+%%RUBY_DOCDIR%%/qt/tutorial/t11/cannon.rb
+%%RUBY_DOCDIR%%/qt/tutorial/t11/lcdrange.rb
+%%RUBY_DOCDIR%%/qt/tutorial/t11/t11.rb
+%%RUBY_DOCDIR%%/qt/tutorial/t12/cannon.rb
+%%RUBY_DOCDIR%%/qt/tutorial/t12/lcdrange.rb
+%%RUBY_DOCDIR%%/qt/tutorial/t12/t12.rb
+%%RUBY_DOCDIR%%/qt/tutorial/t13/cannon.rb
+%%RUBY_DOCDIR%%/qt/tutorial/t13/cannonj.rb
+%%RUBY_DOCDIR%%/qt/tutorial/t13/gamebrd.rb
+%%RUBY_DOCDIR%%/qt/tutorial/t13/gamebrdj.rb
+%%RUBY_DOCDIR%%/qt/tutorial/t13/lcdrange.rb
+%%RUBY_DOCDIR%%/qt/tutorial/t13/t13.rb
+%%RUBY_DOCDIR%%/qt/tutorial/t13/t13j.rb
+%%RUBY_DOCDIR%%/qt/tutorial/t14/cannon.rb
+%%RUBY_DOCDIR%%/qt/tutorial/t14/gamebrd.rb
+%%RUBY_DOCDIR%%/qt/tutorial/t14/lcdrange.rb
+%%RUBY_DOCDIR%%/qt/tutorial/t14/t14.rb
+%%RUBY_DOCDIR%%/qt/tutorial/t2/t2.rb
+%%RUBY_DOCDIR%%/qt/tutorial/t3/t3.rb
+%%RUBY_DOCDIR%%/qt/tutorial/t4/t4.rb
+%%RUBY_DOCDIR%%/qt/tutorial/t5/t5.rb
+%%RUBY_DOCDIR%%/qt/tutorial/t6/t6.rb
+%%RUBY_DOCDIR%%/qt/tutorial/t7/cannon.rb
+%%RUBY_DOCDIR%%/qt/tutorial/t7/lcdmain.rb
+%%RUBY_DOCDIR%%/qt/tutorial/t7/lcdrange.rb
+%%RUBY_DOCDIR%%/qt/tutorial/t7/lcdsub.rb
+%%RUBY_DOCDIR%%/qt/tutorial/t7/t7.rb
+%%RUBY_DOCDIR%%/qt/tutorial/t8/cannon.rb
+%%RUBY_DOCDIR%%/qt/tutorial/t8/lcdrange.rb
+%%RUBY_DOCDIR%%/qt/tutorial/t8/t8.rb
+%%RUBY_DOCDIR%%/qt/tutorial/t9/cannon.rb
+%%RUBY_DOCDIR%%/qt/tutorial/t9/lcdrange.rb
+%%RUBY_DOCDIR%%/qt/tutorial/t9/t9.rb
+@dirrm %%RUBY_DOCDIR%%/qt/tutorial/t1
+@dirrm %%RUBY_DOCDIR%%/qt/tutorial/t10
+@dirrm %%RUBY_DOCDIR%%/qt/tutorial/t11
+@dirrm %%RUBY_DOCDIR%%/qt/tutorial/t12
+@dirrm %%RUBY_DOCDIR%%/qt/tutorial/t13
+@dirrm %%RUBY_DOCDIR%%/qt/tutorial/t14
+@dirrm %%RUBY_DOCDIR%%/qt/tutorial/t2
+@dirrm %%RUBY_DOCDIR%%/qt/tutorial/t3
+@dirrm %%RUBY_DOCDIR%%/qt/tutorial/t4
+@dirrm %%RUBY_DOCDIR%%/qt/tutorial/t5
+@dirrm %%RUBY_DOCDIR%%/qt/tutorial/t6
+@dirrm %%RUBY_DOCDIR%%/qt/tutorial/t7
+@dirrm %%RUBY_DOCDIR%%/qt/tutorial/t8
+@dirrm %%RUBY_DOCDIR%%/qt/tutorial/t9
+@dirrm %%RUBY_DOCDIR%%/qt/tutorial
+%%RUBY_DOCDIR%%/qt/README.txt
+%%RUBY_DOCDIR%%/qt/ja/README.jp
+@dirrm %%RUBY_DOCDIR%%/qt/ja
+@dirrm %%RUBY_DOCDIR%%/qt
diff --git a/x11-toolkits/ruby-qt2/Makefile b/x11-toolkits/ruby-qt2/Makefile
index 6b79a7adce98..da9d815fe021 100644
--- a/x11-toolkits/ruby-qt2/Makefile
+++ b/x11-toolkits/ruby-qt2/Makefile
@@ -9,26 +9,21 @@ PORTNAME=	qt
 PORTVERSION=	0.12
 CATEGORIES=	x11-toolkits ruby
 MASTER_SITES=	http://sfns.u-shizuoka-ken.ac.jp/geneng/horie_hp/ruby/
-PKGNAMEPREFIX=	ruby-
+PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
 DIST_SUBDIR=	ruby
 
 MAINTAINER=	knu@FreeBSD.org
 
-BUILD_DEPENDS=	ruby:${PORTSDIR}/lang/ruby
 LIB_DEPENDS=	${QTLIB}.${QTLIB_SHLIBVER}:${PORTSDIR}/x11-toolkits/${QT_PORTNAME}
-RUN_DEPENDS=	ruby:${PORTSDIR}/lang/ruby
 
-INSTALL_TARGET=	site-install
-CONFIGURE_ARGS=	--with-qt-include=${X11BASE}/include/X11/qt \
-		--with-qt-lib=${X11BASE}/lib
+USE_RUBY=	yes
+USE_RUBY_EXTCONF=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
-PLIST_SUB=	RUBY_VER="${RUBY_VER}" RUBY_ARCH="${RUBY_ARCH}"
-
-RUBY?=		${LOCALBASE}/bin/ruby
-RUBY_VER?=	1.4
-RUBY_ARCH?=	${ARCH}-freebsd${OSREL}
+CONFIGURE_ARGS=	--with-qt-include=${X11BASE}/include/X11/qt \
+		--with-qt-lib=${X11BASE}/lib
+INSTALL_TARGET=	site-install
 
 .if defined(WITH_I18N)
 I18NQT=		-DI18NQT
@@ -47,18 +42,16 @@ post-patch:
 		s,/usr/X11\b,${X11BASE},g; \
 		' ${WRKSRC}/lib/qt.rb
 
-do-configure:
-	@cd ${WRKSRC}; \
-	${SETENV} ${CONFIGURE_ENV} ${RUBY} extconf.rb ${CONFIGURE_ARGS}
-
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/examples/ruby/qt
-	${CP} -R ${WRKSRC}/examples/ ${PREFIX}/share/examples/ruby/qt/
-	${MKDIR} ${PREFIX}/share/doc/ruby/qt/ja
-	${CP} -R ${WRKSRC}/tutorial ${PREFIX}/share/doc/ruby/qt/
-	${INSTALL_DATA} ${WRKSRC}/README.txt ${PREFIX}/share/doc/ruby/qt/
-	${INSTALL_DATA} ${WRKSRC}/README.jp ${PREFIX}/share/doc/ruby/qt/ja/
+	${MKDIR} ${RUBY_EXAMPLESDIR}/qt
+	${CP} -R ${WRKSRC}/examples/ ${RUBY_EXAMPLESDIR}/qt/
+	${MKDIR} ${RUBY_DOCDIR}/qt/ja
+	${CP} -R ${WRKSRC}/tutorial ${RUBY_DOCDIR}/qt/
+	${INSTALL_DATA} ${WRKSRC}/README.txt ${RUBY_DOCDIR}/qt/
+	${INSTALL_DATA} ${WRKSRC}/README.jp ${RUBY_DOCDIR}/qt/ja/
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/Mk/bsd.ruby.mk"
+.include <bsd.port.post.mk>
diff --git a/x11-toolkits/ruby-qt2/pkg-plist b/x11-toolkits/ruby-qt2/pkg-plist
index e865f003b5a0..9081867fcaf7 100644
--- a/x11-toolkits/ruby-qt2/pkg-plist
+++ b/x11-toolkits/ruby-qt2/pkg-plist
@@ -1,136 +1,136 @@
-lib/ruby/site_ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/qt.so
-lib/ruby/site_ruby/%%RUBY_VER%%/qt.rb
-share/examples/ruby/qt/aclock/README.qt.orig
-share/examples/ruby/qt/aclock/aclock.rb
-share/examples/ruby/qt/aclock/aclock_lib.rb
-share/examples/ruby/qt/application/application.rb
-share/examples/ruby/qt/application/application_lib.rb
-share/examples/ruby/qt/application/fileopen.xpm
-share/examples/ruby/qt/application/fileprint.xpm
-share/examples/ruby/qt/application/filesave.xpm
-share/examples/ruby/qt/classbrows/rbbr_rb.rb
-share/examples/ruby/qt/classbrows/rbbr_qt.rb
-share/examples/ruby/qt/classbrows/qtbrows2.rb
-share/examples/ruby/qt/classbrows/splitter.rb
-share/examples/ruby/qt/connect/connect.rb
-share/examples/ruby/qt/connect/README.orig
-share/examples/ruby/qt/cursor/README.orig
-share/examples/ruby/qt/cursor/cursor.rb
-share/examples/ruby/qt/cursor/cb.xbm
-share/examples/ruby/qt/cursor/cm.xbm
-share/examples/ruby/qt/dclock/README.qt.orig
-share/examples/ruby/qt/dclock/dclock.rb
-share/examples/ruby/qt/dclock/dclock_sub.rb
-share/examples/ruby/qt/forever/README.orig
-share/examples/ruby/qt/forever/forever2.rb
-share/examples/ruby/qt/forever/forever.rb
-share/examples/ruby/qt/hello/README.orig
-share/examples/ruby/qt/hello/hello_lib.rb
-share/examples/ruby/qt/hello/hello.rb
-share/examples/ruby/qt/hello2/hello.rb
-share/examples/ruby/qt/hello_simple/hello.rb
-share/examples/ruby/qt/movies/README.orig
-share/examples/ruby/qt/movies/movies.rb
-share/examples/ruby/qt/movies/trolltech.gif
-share/examples/ruby/qt/pinguin/pinguin.xpm
-share/examples/ruby/qt/pinguin/pixbutton.rb
-share/examples/ruby/qt/rubyedit/rubyedit.rb
-share/examples/ruby/qt/rubyedit/rubyedit_lib.rb
-share/examples/ruby/qt/rubyedit/editcopy.xpm
-share/examples/ruby/qt/rubyedit/editcut.xpm
-share/examples/ruby/qt/rubyedit/fileopen.xpm
-share/examples/ruby/qt/rubyedit/fileprint.xpm
-share/examples/ruby/qt/rubyedit/filesave.xpm
-share/examples/ruby/qt/rubyedit/editpaste.xpm
-share/examples/ruby/qt/rubyedit/readme.txt
-share/examples/ruby/qt/rubyedit/kde2ps
-share/examples/ruby/qt/rubyedit/rubyedit_win.rb
-share/examples/ruby/qt/scribble/qtscribble.rb
-share/examples/ruby/qt/scribble/qtscribble_win.rb
-share/examples/ruby/qt/signal/hello_signal.rb
-share/examples/ruby/qt/signal/hello_signal_jp.rb
-share/examples/ruby/qt/widgets/widgets.rb
-share/examples/ruby/qt/widgets/aclock_lib.rb
-share/examples/ruby/qt/widgets/dclock_lib.rb
-share/examples/ruby/qt/widgets/qt.bmp
-share/examples/ruby/qt/widgets/trolltech.bmp
-share/examples/ruby/qt/widgets/trolltech.gif
-share/examples/ruby/qt/widgets/widgets_win.rb
-share/examples/ruby/qt/xform/image.any
-share/examples/ruby/qt/xform/README.orig
-share/examples/ruby/qt/xform/xform.rb
-@dirrm share/examples/ruby/qt/aclock
-@dirrm share/examples/ruby/qt/application
-@dirrm share/examples/ruby/qt/classbrows
-@dirrm share/examples/ruby/qt/connect
-@dirrm share/examples/ruby/qt/cursor
-@dirrm share/examples/ruby/qt/dclock
-@dirrm share/examples/ruby/qt/forever
-@dirrm share/examples/ruby/qt/hello
-@dirrm share/examples/ruby/qt/hello2
-@dirrm share/examples/ruby/qt/hello_simple
-@dirrm share/examples/ruby/qt/movies
-@dirrm share/examples/ruby/qt/pinguin
-@dirrm share/examples/ruby/qt/rubyedit
-@dirrm share/examples/ruby/qt/scribble
-@dirrm share/examples/ruby/qt/signal
-@dirrm share/examples/ruby/qt/widgets
-@dirrm share/examples/ruby/qt/xform
-@dirrm share/examples/ruby/qt
-share/doc/ruby/qt/tutorial/README.qt.orig
-share/doc/ruby/qt/tutorial/t1/t1.rb
-share/doc/ruby/qt/tutorial/t10/cannon.rb
-share/doc/ruby/qt/tutorial/t10/lcdrange.rb
-share/doc/ruby/qt/tutorial/t10/t10.rb
-share/doc/ruby/qt/tutorial/t11/cannon.rb
-share/doc/ruby/qt/tutorial/t11/lcdrange.rb
-share/doc/ruby/qt/tutorial/t11/t11.rb
-share/doc/ruby/qt/tutorial/t12/cannon.rb
-share/doc/ruby/qt/tutorial/t12/lcdrange.rb
-share/doc/ruby/qt/tutorial/t12/t12.rb
-share/doc/ruby/qt/tutorial/t13/cannon.rb
-share/doc/ruby/qt/tutorial/t13/cannonj.rb
-share/doc/ruby/qt/tutorial/t13/gamebrd.rb
-share/doc/ruby/qt/tutorial/t13/gamebrdj.rb
-share/doc/ruby/qt/tutorial/t13/lcdrange.rb
-share/doc/ruby/qt/tutorial/t13/t13.rb
-share/doc/ruby/qt/tutorial/t13/t13j.rb
-share/doc/ruby/qt/tutorial/t14/cannon.rb
-share/doc/ruby/qt/tutorial/t14/gamebrd.rb
-share/doc/ruby/qt/tutorial/t14/lcdrange.rb
-share/doc/ruby/qt/tutorial/t14/t14.rb
-share/doc/ruby/qt/tutorial/t2/t2.rb
-share/doc/ruby/qt/tutorial/t3/t3.rb
-share/doc/ruby/qt/tutorial/t4/t4.rb
-share/doc/ruby/qt/tutorial/t5/t5.rb
-share/doc/ruby/qt/tutorial/t6/t6.rb
-share/doc/ruby/qt/tutorial/t7/cannon.rb
-share/doc/ruby/qt/tutorial/t7/lcdmain.rb
-share/doc/ruby/qt/tutorial/t7/lcdrange.rb
-share/doc/ruby/qt/tutorial/t7/lcdsub.rb
-share/doc/ruby/qt/tutorial/t7/t7.rb
-share/doc/ruby/qt/tutorial/t8/cannon.rb
-share/doc/ruby/qt/tutorial/t8/lcdrange.rb
-share/doc/ruby/qt/tutorial/t8/t8.rb
-share/doc/ruby/qt/tutorial/t9/cannon.rb
-share/doc/ruby/qt/tutorial/t9/lcdrange.rb
-share/doc/ruby/qt/tutorial/t9/t9.rb
-@dirrm share/doc/ruby/qt/tutorial/t1
-@dirrm share/doc/ruby/qt/tutorial/t10
-@dirrm share/doc/ruby/qt/tutorial/t11
-@dirrm share/doc/ruby/qt/tutorial/t12
-@dirrm share/doc/ruby/qt/tutorial/t13
-@dirrm share/doc/ruby/qt/tutorial/t14
-@dirrm share/doc/ruby/qt/tutorial/t2
-@dirrm share/doc/ruby/qt/tutorial/t3
-@dirrm share/doc/ruby/qt/tutorial/t4
-@dirrm share/doc/ruby/qt/tutorial/t5
-@dirrm share/doc/ruby/qt/tutorial/t6
-@dirrm share/doc/ruby/qt/tutorial/t7
-@dirrm share/doc/ruby/qt/tutorial/t8
-@dirrm share/doc/ruby/qt/tutorial/t9
-@dirrm share/doc/ruby/qt/tutorial
-share/doc/ruby/qt/README.txt
-share/doc/ruby/qt/ja/README.jp
-@dirrm share/doc/ruby/qt/ja
-@dirrm share/doc/ruby/qt
+%%RUBY_SITEARCHLIBDIR%%/qt.so
+%%RUBY_SITELIBDIR%%/qt.rb
+%%RUBY_EXAMPLESDIR%%/qt/aclock/README.qt.orig
+%%RUBY_EXAMPLESDIR%%/qt/aclock/aclock.rb
+%%RUBY_EXAMPLESDIR%%/qt/aclock/aclock_lib.rb
+%%RUBY_EXAMPLESDIR%%/qt/application/application.rb
+%%RUBY_EXAMPLESDIR%%/qt/application/application_lib.rb
+%%RUBY_EXAMPLESDIR%%/qt/application/fileopen.xpm
+%%RUBY_EXAMPLESDIR%%/qt/application/fileprint.xpm
+%%RUBY_EXAMPLESDIR%%/qt/application/filesave.xpm
+%%RUBY_EXAMPLESDIR%%/qt/classbrows/rbbr_rb.rb
+%%RUBY_EXAMPLESDIR%%/qt/classbrows/rbbr_qt.rb
+%%RUBY_EXAMPLESDIR%%/qt/classbrows/qtbrows2.rb
+%%RUBY_EXAMPLESDIR%%/qt/classbrows/splitter.rb
+%%RUBY_EXAMPLESDIR%%/qt/connect/connect.rb
+%%RUBY_EXAMPLESDIR%%/qt/connect/README.orig
+%%RUBY_EXAMPLESDIR%%/qt/cursor/README.orig
+%%RUBY_EXAMPLESDIR%%/qt/cursor/cursor.rb
+%%RUBY_EXAMPLESDIR%%/qt/cursor/cb.xbm
+%%RUBY_EXAMPLESDIR%%/qt/cursor/cm.xbm
+%%RUBY_EXAMPLESDIR%%/qt/dclock/README.qt.orig
+%%RUBY_EXAMPLESDIR%%/qt/dclock/dclock.rb
+%%RUBY_EXAMPLESDIR%%/qt/dclock/dclock_sub.rb
+%%RUBY_EXAMPLESDIR%%/qt/forever/README.orig
+%%RUBY_EXAMPLESDIR%%/qt/forever/forever2.rb
+%%RUBY_EXAMPLESDIR%%/qt/forever/forever.rb
+%%RUBY_EXAMPLESDIR%%/qt/hello/README.orig
+%%RUBY_EXAMPLESDIR%%/qt/hello/hello_lib.rb
+%%RUBY_EXAMPLESDIR%%/qt/hello/hello.rb
+%%RUBY_EXAMPLESDIR%%/qt/hello2/hello.rb
+%%RUBY_EXAMPLESDIR%%/qt/hello_simple/hello.rb
+%%RUBY_EXAMPLESDIR%%/qt/movies/README.orig
+%%RUBY_EXAMPLESDIR%%/qt/movies/movies.rb
+%%RUBY_EXAMPLESDIR%%/qt/movies/trolltech.gif
+%%RUBY_EXAMPLESDIR%%/qt/pinguin/pinguin.xpm
+%%RUBY_EXAMPLESDIR%%/qt/pinguin/pixbutton.rb
+%%RUBY_EXAMPLESDIR%%/qt/rubyedit/rubyedit.rb
+%%RUBY_EXAMPLESDIR%%/qt/rubyedit/rubyedit_lib.rb
+%%RUBY_EXAMPLESDIR%%/qt/rubyedit/editcopy.xpm
+%%RUBY_EXAMPLESDIR%%/qt/rubyedit/editcut.xpm
+%%RUBY_EXAMPLESDIR%%/qt/rubyedit/fileopen.xpm
+%%RUBY_EXAMPLESDIR%%/qt/rubyedit/fileprint.xpm
+%%RUBY_EXAMPLESDIR%%/qt/rubyedit/filesave.xpm
+%%RUBY_EXAMPLESDIR%%/qt/rubyedit/editpaste.xpm
+%%RUBY_EXAMPLESDIR%%/qt/rubyedit/readme.txt
+%%RUBY_EXAMPLESDIR%%/qt/rubyedit/kde2ps
+%%RUBY_EXAMPLESDIR%%/qt/rubyedit/rubyedit_win.rb
+%%RUBY_EXAMPLESDIR%%/qt/scribble/qtscribble.rb
+%%RUBY_EXAMPLESDIR%%/qt/scribble/qtscribble_win.rb
+%%RUBY_EXAMPLESDIR%%/qt/signal/hello_signal.rb
+%%RUBY_EXAMPLESDIR%%/qt/signal/hello_signal_jp.rb
+%%RUBY_EXAMPLESDIR%%/qt/widgets/widgets.rb
+%%RUBY_EXAMPLESDIR%%/qt/widgets/aclock_lib.rb
+%%RUBY_EXAMPLESDIR%%/qt/widgets/dclock_lib.rb
+%%RUBY_EXAMPLESDIR%%/qt/widgets/qt.bmp
+%%RUBY_EXAMPLESDIR%%/qt/widgets/trolltech.bmp
+%%RUBY_EXAMPLESDIR%%/qt/widgets/trolltech.gif
+%%RUBY_EXAMPLESDIR%%/qt/widgets/widgets_win.rb
+%%RUBY_EXAMPLESDIR%%/qt/xform/image.any
+%%RUBY_EXAMPLESDIR%%/qt/xform/README.orig
+%%RUBY_EXAMPLESDIR%%/qt/xform/xform.rb
+@dirrm %%RUBY_EXAMPLESDIR%%/qt/aclock
+@dirrm %%RUBY_EXAMPLESDIR%%/qt/application
+@dirrm %%RUBY_EXAMPLESDIR%%/qt/classbrows
+@dirrm %%RUBY_EXAMPLESDIR%%/qt/connect
+@dirrm %%RUBY_EXAMPLESDIR%%/qt/cursor
+@dirrm %%RUBY_EXAMPLESDIR%%/qt/dclock
+@dirrm %%RUBY_EXAMPLESDIR%%/qt/forever
+@dirrm %%RUBY_EXAMPLESDIR%%/qt/hello
+@dirrm %%RUBY_EXAMPLESDIR%%/qt/hello2
+@dirrm %%RUBY_EXAMPLESDIR%%/qt/hello_simple
+@dirrm %%RUBY_EXAMPLESDIR%%/qt/movies
+@dirrm %%RUBY_EXAMPLESDIR%%/qt/pinguin
+@dirrm %%RUBY_EXAMPLESDIR%%/qt/rubyedit
+@dirrm %%RUBY_EXAMPLESDIR%%/qt/scribble
+@dirrm %%RUBY_EXAMPLESDIR%%/qt/signal
+@dirrm %%RUBY_EXAMPLESDIR%%/qt/widgets
+@dirrm %%RUBY_EXAMPLESDIR%%/qt/xform
+@dirrm %%RUBY_EXAMPLESDIR%%/qt
+%%RUBY_DOCDIR%%/qt/tutorial/README.qt.orig
+%%RUBY_DOCDIR%%/qt/tutorial/t1/t1.rb
+%%RUBY_DOCDIR%%/qt/tutorial/t10/cannon.rb
+%%RUBY_DOCDIR%%/qt/tutorial/t10/lcdrange.rb
+%%RUBY_DOCDIR%%/qt/tutorial/t10/t10.rb
+%%RUBY_DOCDIR%%/qt/tutorial/t11/cannon.rb
+%%RUBY_DOCDIR%%/qt/tutorial/t11/lcdrange.rb
+%%RUBY_DOCDIR%%/qt/tutorial/t11/t11.rb
+%%RUBY_DOCDIR%%/qt/tutorial/t12/cannon.rb
+%%RUBY_DOCDIR%%/qt/tutorial/t12/lcdrange.rb
+%%RUBY_DOCDIR%%/qt/tutorial/t12/t12.rb
+%%RUBY_DOCDIR%%/qt/tutorial/t13/cannon.rb
+%%RUBY_DOCDIR%%/qt/tutorial/t13/cannonj.rb
+%%RUBY_DOCDIR%%/qt/tutorial/t13/gamebrd.rb
+%%RUBY_DOCDIR%%/qt/tutorial/t13/gamebrdj.rb
+%%RUBY_DOCDIR%%/qt/tutorial/t13/lcdrange.rb
+%%RUBY_DOCDIR%%/qt/tutorial/t13/t13.rb
+%%RUBY_DOCDIR%%/qt/tutorial/t13/t13j.rb
+%%RUBY_DOCDIR%%/qt/tutorial/t14/cannon.rb
+%%RUBY_DOCDIR%%/qt/tutorial/t14/gamebrd.rb
+%%RUBY_DOCDIR%%/qt/tutorial/t14/lcdrange.rb
+%%RUBY_DOCDIR%%/qt/tutorial/t14/t14.rb
+%%RUBY_DOCDIR%%/qt/tutorial/t2/t2.rb
+%%RUBY_DOCDIR%%/qt/tutorial/t3/t3.rb
+%%RUBY_DOCDIR%%/qt/tutorial/t4/t4.rb
+%%RUBY_DOCDIR%%/qt/tutorial/t5/t5.rb
+%%RUBY_DOCDIR%%/qt/tutorial/t6/t6.rb
+%%RUBY_DOCDIR%%/qt/tutorial/t7/cannon.rb
+%%RUBY_DOCDIR%%/qt/tutorial/t7/lcdmain.rb
+%%RUBY_DOCDIR%%/qt/tutorial/t7/lcdrange.rb
+%%RUBY_DOCDIR%%/qt/tutorial/t7/lcdsub.rb
+%%RUBY_DOCDIR%%/qt/tutorial/t7/t7.rb
+%%RUBY_DOCDIR%%/qt/tutorial/t8/cannon.rb
+%%RUBY_DOCDIR%%/qt/tutorial/t8/lcdrange.rb
+%%RUBY_DOCDIR%%/qt/tutorial/t8/t8.rb
+%%RUBY_DOCDIR%%/qt/tutorial/t9/cannon.rb
+%%RUBY_DOCDIR%%/qt/tutorial/t9/lcdrange.rb
+%%RUBY_DOCDIR%%/qt/tutorial/t9/t9.rb
+@dirrm %%RUBY_DOCDIR%%/qt/tutorial/t1
+@dirrm %%RUBY_DOCDIR%%/qt/tutorial/t10
+@dirrm %%RUBY_DOCDIR%%/qt/tutorial/t11
+@dirrm %%RUBY_DOCDIR%%/qt/tutorial/t12
+@dirrm %%RUBY_DOCDIR%%/qt/tutorial/t13
+@dirrm %%RUBY_DOCDIR%%/qt/tutorial/t14
+@dirrm %%RUBY_DOCDIR%%/qt/tutorial/t2
+@dirrm %%RUBY_DOCDIR%%/qt/tutorial/t3
+@dirrm %%RUBY_DOCDIR%%/qt/tutorial/t4
+@dirrm %%RUBY_DOCDIR%%/qt/tutorial/t5
+@dirrm %%RUBY_DOCDIR%%/qt/tutorial/t6
+@dirrm %%RUBY_DOCDIR%%/qt/tutorial/t7
+@dirrm %%RUBY_DOCDIR%%/qt/tutorial/t8
+@dirrm %%RUBY_DOCDIR%%/qt/tutorial/t9
+@dirrm %%RUBY_DOCDIR%%/qt/tutorial
+%%RUBY_DOCDIR%%/qt/README.txt
+%%RUBY_DOCDIR%%/qt/ja/README.jp
+@dirrm %%RUBY_DOCDIR%%/qt/ja
+@dirrm %%RUBY_DOCDIR%%/qt
diff --git a/x11/ruby-kde/Makefile b/x11/ruby-kde/Makefile
index f446fc5f457b..95112fab5616 100644
--- a/x11/ruby-kde/Makefile
+++ b/x11/ruby-kde/Makefile
@@ -9,29 +9,24 @@ PORTNAME=	kde
 PORTVERSION=	0.12
 CATEGORIES=	x11 kde ruby
 MASTER_SITES=	http://sfns.u-shizuoka-ken.ac.jp/geneng/horie_hp/ruby/
-PKGNAMEPREFIX=	ruby-
+PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
 DIST_SUBDIR=	ruby
 
 MAINTAINER=	knu@FreeBSD.org
 
-BUILD_DEPENDS=	ruby:${PORTSDIR}/lang/ruby
 LIB_DEPENDS=	kdecore.${KDELIB_SHLIBVER}:${PORTSDIR}/x11/${KDE_PORTNAME}
-RUN_DEPENDS=	ruby:${PORTSDIR}/lang/ruby \
-		${LOCALBASE}/lib/ruby/site_ruby/${RUBY_VER}/qt.rb:${PORTSDIR}/x11-toolkits/${RUBY_QT_PORTNAME}
+RUN_DEPENDS=	${LOCALBASE}/lib/ruby/site_ruby/${RUBY_VER}/qt.rb:${PORTSDIR}/x11-toolkits/${RUBY_QT_PORTNAME}
 
-INSTALL_TARGET=	site-install
+USE_RUBY=	yes
+USE_RUBY_EXTCONF=	yes
+
+WRKSRC=		${WRKDIR}/${PORTNAME}
 CONFIGURE_ARGS=	--with-x-dir=${X11BASE} \
 		--with-qt-include=${X11BASE}/include/X11/qt \
 		--with-qt-lib=${X11BASE}/lib \
 		--with-kde-dir=${LOCALBASE}
-
-WRKSRC=		${WRKDIR}/${PORTNAME}
-PLIST_SUB=	RUBY_VER="${RUBY_VER}" RUBY_ARCH="${RUBY_ARCH}"
-
-RUBY?=		${LOCALBASE}/bin/ruby
-RUBY_VER?=	1.4
-RUBY_ARCH?=	${ARCH}-freebsd${OSREL}
+INSTALL_TARGET=	site-install
 
 .if defined(WITH_I18N)
 QTLIB=		qti18n
@@ -46,17 +41,15 @@ KDE_PORTNAME=	kdelibs11
 RUBY_QT_PORTNAME=	ruby-qt
 .endif
 
-do-configure:
-	@cd ${WRKSRC}; \
-	${SETENV} ${CONFIGURE_ENV} ${RUBY} extconf.rb ${CONFIGURE_ARGS}
-
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/examples/ruby/kde
-	${CP} -R ${WRKSRC}/examples/ ${PREFIX}/share/examples/ruby/kde/
-	${MKDIR} ${PREFIX}/share/doc/ruby/kde/ja
-	${INSTALL_DATA} ${WRKSRC}/README.txt ${PREFIX}/share/doc/ruby/kde/
-	${INSTALL_DATA} ${WRKSRC}/README.jp.txt ${PREFIX}/share/doc/ruby/kde/ja/
+	${MKDIR} ${RUBY_EXAMPLESDIR}/kde
+	${CP} -R ${WRKSRC}/examples/ ${RUBY_EXAMPLESDIR}/kde/
+	${MKDIR} ${RUBY_DOCDIR}/kde/ja
+	${INSTALL_DATA} ${WRKSRC}/README.txt ${RUBY_DOCDIR}/kde/
+	${INSTALL_DATA} ${WRKSRC}/README.jp.txt ${RUBY_DOCDIR}/kde/ja/
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/Mk/bsd.ruby.mk"
+.include <bsd.port.post.mk>
diff --git a/x11/ruby-kde/pkg-plist b/x11/ruby-kde/pkg-plist
index 30a6d47fa30c..61340fe23d65 100644
--- a/x11/ruby-kde/pkg-plist
+++ b/x11/ruby-kde/pkg-plist
@@ -1,55 +1,55 @@
-lib/ruby/site_ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/kde.so
-lib/ruby/site_ruby/%%RUBY_VER%%/kde.rb
-share/examples/ruby/kde/classbrows/kdebrows.rb
-share/examples/ruby/kde/classbrows/rbbr_qt.rb
-share/examples/ruby/kde/classbrows/rbbr_rb.rb
-share/examples/ruby/kde/classbrows/rbdump.rb
-share/examples/ruby/kde/classbrows/kdebrows2.rb
-share/examples/ruby/kde/kapp/kapp1.rb
-share/examples/ruby/kde/kredit/kredit_lib.pot
-share/examples/ruby/kde/kredit/kde2ps
-share/examples/ruby/kde/kredit/kredit.rb
-share/examples/ruby/kde/kredit/kredit.rb.po
-share/examples/ruby/kde/kredit/kredit.rb.pot
-share/examples/ruby/kde/kredit/kredit_lib.rb
-share/examples/ruby/kde/kredit/readme.txt
-share/examples/ruby/kde/kredit/kredit.po
-share/examples/ruby/kde/kredit/kredit.mo
-share/examples/ruby/kde/kredit/kredit.rb.mo
-share/examples/ruby/kde/kredit/make_pot
-share/examples/ruby/kde/ksc/pics/circle_fill.xpm
-share/examples/ruby/kde/ksc/pics/fileopen.xpm
-share/examples/ruby/kde/ksc/pics/filefloppy.xpm
-share/examples/ruby/kde/ksc/pics/fileprint.xpm
-share/examples/ruby/kde/ksc/pics/editcopy.xpm
-share/examples/ruby/kde/ksc/pics/editcut.xpm
-share/examples/ruby/kde/ksc/pics/editpaste.xpm
-share/examples/ruby/kde/ksc/pics/arrow.xpm
-share/examples/ruby/kde/ksc/pics/pen.xpm
-share/examples/ruby/kde/ksc/pics/line.xpm
-share/examples/ruby/kde/ksc/pics/circle.xpm
-share/examples/ruby/kde/ksc/pics/rectangle.xpm
-share/examples/ruby/kde/ksc/pics/erase.xpm
-share/examples/ruby/kde/ksc/pics/filenew.xpm
-share/examples/ruby/kde/ksc/scarea.rb
-share/examples/ruby/kde/ksc/scglobal.rb
-share/examples/ruby/kde/ksc/scwindow.rb
-share/examples/ruby/kde/ksc/ksc.rb.pot
-share/examples/ruby/kde/ksc/ksc.rb.po
-share/examples/ruby/kde/ksc/ksc.rb.mo
-share/examples/ruby/kde/ksc/ksc.rb
-share/examples/ruby/kde/ksc/make_pot
-share/examples/ruby/kde/kwidgets/kwid.rb
-share/examples/ruby/kde/slider/kslider3.rb
-@dirrm share/examples/ruby/kde/classbrows
-@dirrm share/examples/ruby/kde/kapp
-@dirrm share/examples/ruby/kde/kredit
-@dirrm share/examples/ruby/kde/ksc/pics
-@dirrm share/examples/ruby/kde/ksc
-@dirrm share/examples/ruby/kde/kwidgets
-@dirrm share/examples/ruby/kde/slider
-@dirrm share/examples/ruby/kde
-share/doc/ruby/kde/README.txt
-share/doc/ruby/kde/ja/README.jp.txt
-@dirrm share/doc/ruby/kde/ja
-@dirrm share/doc/ruby/kde
+%%RUBY_SITEARCHLIBDIR%%/kde.so
+%%RUBY_SITELIBDIR%%/kde.rb
+%%RUBY_EXAMPLESDIR%%/kde/classbrows/kdebrows.rb
+%%RUBY_EXAMPLESDIR%%/kde/classbrows/rbbr_qt.rb
+%%RUBY_EXAMPLESDIR%%/kde/classbrows/rbbr_rb.rb
+%%RUBY_EXAMPLESDIR%%/kde/classbrows/rbdump.rb
+%%RUBY_EXAMPLESDIR%%/kde/classbrows/kdebrows2.rb
+%%RUBY_EXAMPLESDIR%%/kde/kapp/kapp1.rb
+%%RUBY_EXAMPLESDIR%%/kde/kredit/kredit_lib.pot
+%%RUBY_EXAMPLESDIR%%/kde/kredit/kde2ps
+%%RUBY_EXAMPLESDIR%%/kde/kredit/kredit.rb
+%%RUBY_EXAMPLESDIR%%/kde/kredit/kredit.rb.po
+%%RUBY_EXAMPLESDIR%%/kde/kredit/kredit.rb.pot
+%%RUBY_EXAMPLESDIR%%/kde/kredit/kredit_lib.rb
+%%RUBY_EXAMPLESDIR%%/kde/kredit/readme.txt
+%%RUBY_EXAMPLESDIR%%/kde/kredit/kredit.po
+%%RUBY_EXAMPLESDIR%%/kde/kredit/kredit.mo
+%%RUBY_EXAMPLESDIR%%/kde/kredit/kredit.rb.mo
+%%RUBY_EXAMPLESDIR%%/kde/kredit/make_pot
+%%RUBY_EXAMPLESDIR%%/kde/ksc/pics/circle_fill.xpm
+%%RUBY_EXAMPLESDIR%%/kde/ksc/pics/fileopen.xpm
+%%RUBY_EXAMPLESDIR%%/kde/ksc/pics/filefloppy.xpm
+%%RUBY_EXAMPLESDIR%%/kde/ksc/pics/fileprint.xpm
+%%RUBY_EXAMPLESDIR%%/kde/ksc/pics/editcopy.xpm
+%%RUBY_EXAMPLESDIR%%/kde/ksc/pics/editcut.xpm
+%%RUBY_EXAMPLESDIR%%/kde/ksc/pics/editpaste.xpm
+%%RUBY_EXAMPLESDIR%%/kde/ksc/pics/arrow.xpm
+%%RUBY_EXAMPLESDIR%%/kde/ksc/pics/pen.xpm
+%%RUBY_EXAMPLESDIR%%/kde/ksc/pics/line.xpm
+%%RUBY_EXAMPLESDIR%%/kde/ksc/pics/circle.xpm
+%%RUBY_EXAMPLESDIR%%/kde/ksc/pics/rectangle.xpm
+%%RUBY_EXAMPLESDIR%%/kde/ksc/pics/erase.xpm
+%%RUBY_EXAMPLESDIR%%/kde/ksc/pics/filenew.xpm
+%%RUBY_EXAMPLESDIR%%/kde/ksc/scarea.rb
+%%RUBY_EXAMPLESDIR%%/kde/ksc/scglobal.rb
+%%RUBY_EXAMPLESDIR%%/kde/ksc/scwindow.rb
+%%RUBY_EXAMPLESDIR%%/kde/ksc/ksc.rb.pot
+%%RUBY_EXAMPLESDIR%%/kde/ksc/ksc.rb.po
+%%RUBY_EXAMPLESDIR%%/kde/ksc/ksc.rb.mo
+%%RUBY_EXAMPLESDIR%%/kde/ksc/ksc.rb
+%%RUBY_EXAMPLESDIR%%/kde/ksc/make_pot
+%%RUBY_EXAMPLESDIR%%/kde/kwidgets/kwid.rb
+%%RUBY_EXAMPLESDIR%%/kde/slider/kslider3.rb
+@dirrm %%RUBY_EXAMPLESDIR%%/kde/classbrows
+@dirrm %%RUBY_EXAMPLESDIR%%/kde/kapp
+@dirrm %%RUBY_EXAMPLESDIR%%/kde/kredit
+@dirrm %%RUBY_EXAMPLESDIR%%/kde/ksc/pics
+@dirrm %%RUBY_EXAMPLESDIR%%/kde/ksc
+@dirrm %%RUBY_EXAMPLESDIR%%/kde/kwidgets
+@dirrm %%RUBY_EXAMPLESDIR%%/kde/slider
+@dirrm %%RUBY_EXAMPLESDIR%%/kde
+%%RUBY_DOCDIR%%/kde/README.txt
+%%RUBY_DOCDIR%%/kde/ja/README.jp.txt
+@dirrm %%RUBY_DOCDIR%%/kde/ja
+@dirrm %%RUBY_DOCDIR%%/kde