- Add ruby 1.9 support

- Implement new knobs for gems and rake (these are included in ruby 1.9 distribution already). Also move gem bits from ruby-gems/Makefile.common to bsd.ruby.mk[1]. Now to depend on gems or rake you should define USE_RUBYGEMS/USE_RAKE accordingly. Also RAKE_BIN variable is provided for pointing to the right rake executable. - Rewrite RUBY_SCHEBANG in awk to eliminate build dependency on ruby. Discussed with: Jonathan Weiss <jw@innerewut.de> [1] (gems maintainer) Tested by: ports@
author: Stanislav Sedov <stas@FreeBSD.org> 2008-04-06 08:58:21 +0000
committer: Stanislav Sedov <stas@FreeBSD.org> 2008-04-06 08:58:21 +0000
commit: fae8e0f615b1dfcff35249a7a11ebfba7391bc56 (patch)
tree: cbba292aa57c0d2e7bb423ca0366362b198eec85
parent: - Add entry for mail/postfix-policyd-weight (diff)
127 files changed, 1838 insertions, 432 deletions
diff --git a/Mk/bsd.ruby.mk b/Mk/bsd.ruby.mk
index 46686d39d53d..7995b10fa0f6 100644
--- a/Mk/bsd.ruby.mk
+++ b/Mk/bsd.ruby.mk
@@ -157,33 +157,68 @@ RUBY_NAME!=		${_RUBY_CONFIG} 'puts C["ruby_install_name"]'
 
 _RUBY_SYSLIBDIR!=	${_RUBY_CONFIG} 'puts C["libdir"]'
 _RUBY_SITEDIR!=		${_RUBY_CONFIG} 'puts C["sitedir"]'
+_RUBY_VENDORDIR!=	${_RUBY_CONFIG} 'puts C["vendordir"]'
 .else
 RUBY?=			${LOCALBASE}/bin/${RUBY_NAME}
 
-.if defined(RUBY_VER) && ${RUBY_VER} == 1.8
+.if defined(RUBY_VER)
+. if ${RUBY_VER} == 1.8
+#
+# Ruby 1.8
+#
 RUBY_RELVERSION=	1.8.6
 RUBY_PORTREVISION=	1
 RUBY_PORTEPOCH=		1
 RUBY_PATCHLEVEL=	111
 
-.if ${RUBY_PATCHLEVEL} == 0
+.  if ${RUBY_PATCHLEVEL} == 0
 RUBY_VERSION?=		${RUBY_RELVERSION}
 RUBY_DISTVERSION?=	${RUBY_RELVERSION}
-.else
+.  else
 RUBY_VERSION?=		${RUBY_RELVERSION}.${RUBY_PATCHLEVEL}
 RUBY_DISTVERSION?=	${RUBY_RELVERSION}-p${RUBY_PATCHLEVEL}
-.endif
+.  endif
 
 # Security patch
 RUBY_PATCHFILES?=	${RUBY_VERSION}-patch1.gz
 
-#RUBY_PORTVERSION?=	${RUBY_VERSION}
 RUBY_WRKSRC=		${WRKDIR}/ruby-${RUBY_DISTVERSION}
-#MASTER_SITE_SUBDIR_RUBY=	snapshots
-.else
-IGNORE=	Only ruby 1.8 supported
-.endif
-#      defined(RUBY_VER) && ${RUBY_VER} == 1.8
+
+#
+# PLIST_SUB helpers
+#
+RUBY18=			""
+RUBY19=			"@comment "
+
+. elif ${RUBY_VER} == 1.9
+#
+# Ruby 1.9
+#
+RUBY_RELVERSION=	1.9.0
+RUBY_PORTREVISION=	0
+RUBY_PORTEPOCH=		1
+RUBY_PATCHLEVEL=	0
+
+RUBY_VERSION?=		${RUBY_RELVERSION}.${RUBY_PATCHLEVEL}
+RUBY_DISTVERSION?=	${RUBY_RELVERSION}-${RUBY_PATCHLEVEL}
+
+RUBY_WRKSRC=		${WRKDIR}/ruby-${RUBY_DISTVERSION}
+
+RUBY_CONFIGURE_ARGS+=	--with-rubyhdrdir="${PREFIX}/include/ruby-1.9/"
+
+#
+# PLIST_SUB helpers
+#
+RUBY18=			"@comment "
+RUBY19=			""
+
+. else
+#
+# Other versions
+#
+IGNORE=	Only ruby 1.8 and 1.9 are supported
+. endif
+.endif # defined(RUBY_VER)
 
 CONFIGURE_TARGET?=	${ARCH}-portbld-freebsd${OSREL:C/\..*//}
 
@@ -192,6 +227,7 @@ RUBY_NAME?=		ruby${RUBY_SUFFIX}
 
 _RUBY_SYSLIBDIR?=	${PREFIX}/lib
 _RUBY_SITEDIR?=		${_RUBY_SYSLIBDIR}/ruby/site_ruby
+_RUBY_VENDORDIR?=	${_RUBY_SYSLIBDIR}/ruby/vendor_ruby
 .endif
 #      defined(RUBY)
 
@@ -246,6 +282,8 @@ RUBY_LIBDIR?=		${_RUBY_SYSLIBDIR}/ruby/${RUBY_VER}
 RUBY_ARCHLIBDIR?=	${RUBY_LIBDIR}/${RUBY_ARCH}
 RUBY_SITELIBDIR?=	${_RUBY_SITEDIR}/${RUBY_VER}
 RUBY_SITEARCHLIBDIR?=	${RUBY_SITELIBDIR}/${RUBY_ARCH}
+RUBY_VENDORLIBDIR?=	${_RUBY_VENDORDIR}/${RUBY_VER}
+RUBY_VENDORARCHLIBDIR?=	${RUBY_VENDORLIBDIR}/${RUBY_ARCH}
 RUBY_DOCDIR?=		${PREFIX}/share/doc/${RUBY_NAME}
 RUBY_EXAMPLESDIR?=	${PREFIX}/share/examples/${RUBY_NAME}
 RUBY_RIDIR?=		${PREFIX}/share/ri/${RUBY_VER}/system
@@ -259,6 +297,8 @@ PLIST_RUBY_DIRS=	RUBY_LIBDIR="${RUBY_LIBDIR}" \
 			RUBY_ARCHLIBDIR="${RUBY_ARCHLIBDIR}" \
 			RUBY_SITELIBDIR="${RUBY_SITELIBDIR}" \
 			RUBY_SITEARCHLIBDIR="${RUBY_SITEARCHLIBDIR}" \
+			RUBY_VENDORLIBDIR="${RUBY_VENDORLIBDIR}" \
+			RUBY_VENDORARCHLIBDIR="${RUBY_VENDORARCHLIBDIR}" \
 			RUBY_MODDOCDIR="${RUBY_MODDOCDIR}" \
 			RUBY_MODEXAMPLESDIR="${RUBY_MODEXAMPLESDIR}" \
 			RUBY_DOCDIR="${RUBY_DOCDIR}" \
@@ -267,20 +307,16 @@ PLIST_RUBY_DIRS=	RUBY_LIBDIR="${RUBY_LIBDIR}" \
 			RUBY_SITERIDIR="${RUBY_SITERIDIR}" \
 			RUBY_ELISPDIR="${RUBY_ELISPDIR}"
 
-PLIST_SUB+=	${PLIST_RUBY_DIRS:C,DIR="(${LOCALBASE}|${PREFIX})/,DIR=",} \
+PLIST_SUB+=		${PLIST_RUBY_DIRS:C,DIR="(${LOCALBASE}|${PREFIX})/,DIR=",} \
 			RUBY_VERSION="${RUBY_VERSION}" \
 			RUBY_VER="${RUBY_VER}" \
 			RUBY_SHLIBVER="${RUBY_SHLIBVER}" \
 			RUBY_ARCH="${RUBY_ARCH}" \
 			RUBY_SUFFIX="${RUBY_SUFFIX}" \
 			RUBY_NAME="${RUBY_NAME}" \
-			RUBY_DEFAULT_SUFFIX="${RUBY_DEFAULT_SUFFIX}"
-
-RUBY18_ONLY=		""
-RUBY16_ONLY=		"@comment "
-
-PLIST_SUB+=		RUBY16_ONLY=${RUBY16_ONLY} \
-			RUBY18_ONLY=${RUBY18_ONLY}
+			RUBY_DEFAULT_SUFFIX="${RUBY_DEFAULT_SUFFIX}" \
+			RUBY18=${RUBY18} \
+			RUBY19=${RUBY19}
 
 # require check
 .if defined(RUBY_REQUIRE)
@@ -308,15 +344,25 @@ post-patch:	ruby-shebang-patch
 ruby-shebang-patch:
 	@cd ${WRKSRC}; for f in ${RUBY_SHEBANG_FILES}; do \
 	${ECHO_MSG} "===>  Fixing the #! line of $$f"; \
-	${RUBY} ${RUBY_FLAGS} -i -p \
-			-e 'if $$. == 1; ' \
-			-e ' if /^#!/; ' \
-			-e '  sub /^#!\s*\S*(\benv\s+)?\bruby/, "#!${RUBY}";' \
-			-e ' else;' \
-			-e '  $$_ = "#!${RUBY}\n" + $$_;' \
-			-e ' end;' \
-			-e 'end' \
-			$$f; \
+	TMPFILE=`mktemp -t rubyshebang`; \
+	cp $$f $$TMPFILE; \
+	${AWK} 'BEGIN {flag = 0;}								\
+		{										\
+			if (flag == 0) {							\
+				if ($$0 ~ /^#!/) {						\
+					sub(/#!(.*\/)?(env[[:space:]]+)?ruby/, "#!${RUBY}", $$0);\
+					print $$0;						\
+				}								\
+				else {								\
+					print "#!${RUBY}";					\
+					print $$0;						\
+				}								\
+				flag = 1;							\
+			} else {								\
+				print $$0;							\
+			}									\
+		}' $$TMPFILE > $$f; \
+	rm -f $$TMPFILE; \
 	done
 .endif
 
@@ -324,7 +370,67 @@ ruby-shebang-patch:
 RUBY_FLAGS+=	-d
 .endif
 
-# extconf.rb
+#
+# RubyGems support
+#
+.if defined(USE_RUBYGEMS)
+
+. if ${RUBY_VER} == 1.8
+BUILD_DEPENDS+=	${RUBYGEMBIN}:${PORTSDIR}/devel/ruby-gems
+RUN_DEPENDS+=	${BUILD_DEPENDS}
+. endif
+
+PKGNAMEPREFIX?=	rubygem-
+EXTRACT_SUFX=	.gem
+EXTRACT_ONLY=
+DIST_SUBDIR=	rubygem
+
+NO_BUILD=	yes
+
+GEMS_BASE_DIR=	lib/ruby/gems/${RUBY_VER}
+GEMS_DIR=	${GEMS_BASE_DIR}/gems
+DOC_DIR=	${GEMS_BASE_DIR}/doc
+CACHE_DIR=	${GEMS_BASE_DIR}/cache
+SPEC_DIR=	${GEMS_BASE_DIR}/specifications
+GEM_NAME?=	${PORTNAME}-${PORTVERSION}
+GEM_LIB_DIR=	${GEMS_DIR}/${GEM_NAME}
+GEM_DOC_DIR=	${DOC_DIR}/${GEM_NAME}
+GEM_SPEC=	${SPEC_DIR}/${GEM_NAME}.gemspec
+GEM_CACHE=	${CACHE_DIR}/${GEM_NAME}.gem
+
+PLIST_SUB+=	PORTVERSION="${PORTVERSION}" \
+		REV="${RUBY_GEM}" \
+		GEMS_BASE_DIR="lib/ruby/gems/${RUBY_VER}" \
+		GEMS_DIR="${GEMS_DIR}" \
+		DOC_DIR="${DOC_DIR}" \
+		CACHE_DIR="${CACHE_DIR}" \
+		SPEC_DIR="${SPEC_DIR}" \
+		PORT="${PORTNAME}-${PORTVERSION}" \
+		GEM_NAME="${GEM_NAME}" \
+		GEM_LIB_DIR="${GEM_LIB_DIR}" \
+		GEM_DOC_DIR="${GEM_DOC_DIR}" \
+		GEM_SPEC="${GEM_SPEC}" \
+		GEM_CACHE="${GEM_CACHE}" \
+		EXTRACT_SUFX="${EXTRACT_SUFX}"
+
+RUBYGEMBIN=	${LOCALBASE}/bin/gem${RUBY_VER:S/.//}
+
+. if defined(DISTFILES)
+GEMFILES=	${DISTFILES:C/:[^:]+$//}
+. else
+GEMFILES=	${DISTNAME}${EXTRACT_SUFX}
+. endif
+
+do-install:
+.for _D in ${GEMFILES}
+	${SETENV} ${GEM_ENV} ${RUBYGEMBIN} install --no-update-sources --no-ri --install-dir ${PREFIX}/lib/ruby/gems/${RUBY_VER} ${DISTDIR}/${DIST_SUBDIR}/${_D} -- --build-args ${CONFIGURE_ARGS}
+.endfor
+
+.endif # USE_RUBYGEMS
+
+#
+# extconf.rb support
+#
 .if defined(USE_RUBY_EXTCONF)
 USE_RUBY=		yes
 
@@ -347,7 +453,9 @@ ruby-extconf-configure:
 .endif
 .endif
 
-# setup.rb
+#
+# setup.rb support
+#
 .if defined(USE_RUBY_SETUP)
 RUBY_SETUP?=		setup.rb
 
@@ -399,6 +507,15 @@ RUN_DEPENDS+=		${DEPEND_RUBY_ICONV}
 .undef _use
 .endif
 
+.if defined(USE_RAKE)
+. if ${RUBY_VER} == 1.8
+BUILD_DEPENDS+=		${LOCALBASE}/bin/rake:${PORTSDIR}/devel/rubygem-rake
+RAKE_BIN=	 ${LOCALBASE}/bin/rake
+. else
+RAKE_BIN=	 ${LOCALBASE}/bin/${RUBY_VER:S/.//}
+. endif
+.endif
+
 .if defined(USE_RUBY_AMSTD)
 BUILD_DEPENDS+=		${DEPEND_RUBY_AMSTD}
 RUN_DEPENDS+=		${DEPEND_RUBY_AMSTD}
diff --git a/archivers/rubygem-archive-tar-minitar/Makefile b/archivers/rubygem-archive-tar-minitar/Makefile
index 0a21ab2a8deb..e53a1d2078b1 100644
--- a/archivers/rubygem-archive-tar-minitar/Makefile
+++ b/archivers/rubygem-archive-tar-minitar/Makefile
@@ -14,6 +14,7 @@ DISTNAME=	archive-tar-minitar-${PORTVERSION}
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	library and command-line utility for tar archives
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+USE_RUBY=	yes
+USE_RUBYGEMS=	yes
+
+.include <bsd.port.mk>
diff --git a/audio/euphoria/Makefile b/audio/euphoria/Makefile
index 34f9c0b3dbe3..318dc6ea942f 100644
--- a/audio/euphoria/Makefile
+++ b/audio/euphoria/Makefile
@@ -15,8 +15,7 @@ MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 MAINTAINER=	stas@FreeBSD.org
 COMMENT=	XMMS2 GUI frontend written with Enlightenment e17 libraries
 
-BUILD_DEPENDS=	rake:${PORTSDIR}/devel/rubygem-rake \
-		edje_cc:${PORTSDIR}/graphics/edje
+BUILD_DEPENDS=	edje_cc:${PORTSDIR}/graphics/edje
 RUN_DEPENDS=	${SADIR}/edje.so:${PORTSDIR}/graphics/ruby-edje \
 		${SADIR}/esmart.so:${PORTSDIR}/graphics/ruby-esmart \
 		${SADIR}/evas.so:${PORTSDIR}/graphics/ruby-evas \
@@ -27,6 +26,7 @@ SADIR=		${RUBY_SITEARCHLIBDIR}
 
 USE_BZIP2=	yes
 USE_RUBY=	yes
+USE_RAKE=	yes
 RUBY_SHEBANG_FILES=	${WRKSRC}/bin/euphoria
 
 IGNORE=	Not updated to the DrJekyll clientlib API
@@ -37,10 +37,10 @@ BROKEN=		edje is broken on ia64
 .endif
 
 do-build:
-	@(cd ${WRKSRC}; ${LOCALBASE}/bin/rake)
+	@(cd ${WRKSRC}; ${RAKE_BIN})
 
 do-install:
-	@(cd ${WRKSRC}; ${LOCALBASE}/bin/rake install)
+	@(cd ${WRKSRC}; ${RAKE_BIN} install)
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/audio/rubygem-mp3info/Makefile b/audio/rubygem-mp3info/Makefile
index 6f3dce08ac3c..93b8283f3d17 100644
--- a/audio/rubygem-mp3info/Makefile
+++ b/audio/rubygem-mp3info/Makefile
@@ -16,7 +16,6 @@ MAINTAINER=	tha_walka@hotmail.com
 COMMENT=	A Ruby library to access information on mp3 files
 
 USE_RUBY=	yes
+USE_RUBYGEMS=	yes
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/rubygem-ruby-mp3info/Makefile b/audio/rubygem-ruby-mp3info/Makefile
index 6f3dce08ac3c..93b8283f3d17 100644
--- a/audio/rubygem-ruby-mp3info/Makefile
+++ b/audio/rubygem-ruby-mp3info/Makefile
@@ -16,7 +16,6 @@ MAINTAINER=	tha_walka@hotmail.com
 COMMENT=	A Ruby library to access information on mp3 files
 
 USE_RUBY=	yes
+USE_RUBYGEMS=	yes
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/snett/Makefile b/audio/snett/Makefile
index 817d24f335ea..65bc85ac5e9d 100644
--- a/audio/snett/Makefile
+++ b/audio/snett/Makefile
@@ -14,15 +14,15 @@ MAINTAINER=	alexbl@FreeBSD.org
 COMMENT=	A simple XMMS2 client inspired by strange-quark
 
 BUILD_DEPENDS=	${RUBY_SITEARCHLIBDIR}/xmmsclient.so:${PORTSDIR}/audio/ruby-xmms2 \
-		${RUBY_SITEARCHLIBDIR}/gtk2.so:${PORTSDIR}/x11-toolkits/ruby-gtk2 \
-		${LOCALBASE}/bin/rake:${PORTSDIR}/devel/rubygem-rake
+		${RUBY_SITEARCHLIBDIR}/gtk2.so:${PORTSDIR}/x11-toolkits/ruby-gtk2
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_RUBY=	yes
+USE_RAKE=	yes
 NO_BUILD=	yes
 
 BROKEN=	Not updated to the DrJekyll clientlib API
 do-install:
-	@cd ${WRKSRC} && ${LOCALBASE}/bin/rake PREFIX=${PREFIX}/ ${INSTALL_TARGET}
+	@cd ${WRKSRC} && ${RAKE_BIN} PREFIX=${PREFIX}/ ${INSTALL_TARGET}
 
 .include <bsd.port.mk>
diff --git a/audio/xmms2-scrobbler/Makefile b/audio/xmms2-scrobbler/Makefile
index da1dcebbb54b..4de91ff9e92f 100644
--- a/audio/xmms2-scrobbler/Makefile
+++ b/audio/xmms2-scrobbler/Makefile
@@ -13,12 +13,12 @@ MAINTAINER=	alexbl@FreeBSD.org
 COMMENT=	A last.fm submission client for XMMS2
 
 BUILD_DEPENDS=	${RUBY_SITEARCHLIBDIR}/xmmsclient_ext.so:${PORTSDIR}/audio/ruby-xmms2 \
-		${RUBY_SITELIBDIR}/event-loop.rb:${PORTSDIR}/devel/ruby-event-loop \
-		${LOCALBASE}/bin/rake:${PORTSDIR}/devel/rubygem-rake
+		${RUBY_SITELIBDIR}/event-loop.rb:${PORTSDIR}/devel/ruby-event-loop
 RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/xmmsclient_ext.so:${PORTSDIR}/audio/ruby-xmms2 \
 		${RUBY_SITELIBDIR}/event-loop.rb:${PORTSDIR}/devel/ruby-event-loop
 
 USE_RUBY=	yes
+USE_RAKE=	yes
 NO_BUILD=	yes
 
 PLIST_FILES=	bin/xmms2-scrobbler \
@@ -29,7 +29,7 @@ PLIST_DIRS=	%%DATADIR%%/filters %%DATADIR%%
 SUB_FILES=	pkg-message
 
 do-install:
-	@cd ${WRKSRC} && ${LOCALBASE}/bin/rake PREFIX=${PREFIX}/ ${INSTALL_TARGET}
+	@cd ${WRKSRC} && ${RAKE_BIN} PREFIX=${PREFIX}/ ${INSTALL_TARGET}
 
 post-install:
 	@${ECHO_MSG}
diff --git a/benchmarks/rubygem-railsbench/Makefile b/benchmarks/rubygem-railsbench/Makefile
index 915680a9dbc2..f2afbafef1c3 100644
--- a/benchmarks/rubygem-railsbench/Makefile
+++ b/benchmarks/rubygem-railsbench/Makefile
@@ -16,6 +16,9 @@ COMMENT=	Scripts designed for benchmarking of Rails applications
 BUILD_DEPENDS=	rubygem-hoe>=1.2.0:${PORTSDIR}/devel/rubygem-hoe
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
+USE_RUBY=	yes
+USE_RUBYGEMS=	yes
+
 OPTIONS=	GRUFF	"Plotting of perf data support using gruff"	off
 OPTIONSFILE=	${PORT_DBDIR}/rubygem-${PORTNAME}/options
 
@@ -25,5 +28,4 @@ OPTIONSFILE=	${PORT_DBDIR}/rubygem-${PORTNAME}/options
 RUN_DEPENDS+=	rubygem-gruff>=0.2.8:${PORTSDIR}/graphics/rubygem-gruff
 .endif
 
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
 .include <bsd.port.post.mk>
diff --git a/converters/ruby-iconv/Makefile b/converters/ruby-iconv/Makefile
index 0fb0ade081bc..797e4ad3ae0b 100644
--- a/converters/ruby-iconv/Makefile
+++ b/converters/ruby-iconv/Makefile
@@ -18,7 +18,7 @@ DISTNAME=	${PORTNAME}
 MAINTAINER=	stas@FreeBSD.org
 COMMENT=	An iconv wrapper class for Ruby
 
-BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/lang/ruby18:patch
+BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/${RUBY_PORT}:patch
 
 USE_ICONV=	yes
 
diff --git a/databases/ruby-gdbm/Makefile b/databases/ruby-gdbm/Makefile
index 99a31eb878f9..8ae567d8b3b1 100644
--- a/databases/ruby-gdbm/Makefile
+++ b/databases/ruby-gdbm/Makefile
@@ -28,9 +28,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 
 .include <bsd.port.pre.mk>
 
-.if ${RUBY_VER} >= 1.7
 MAKE_ARGS=	sitelibdir='$$(rubylibdir)'
-.endif
 
 do-extract:
 	${MKDIR} ${WRKDIR}
diff --git a/databases/rubygem-activerecord/Makefile b/databases/rubygem-activerecord/Makefile
index 688490fa7060..ebf3a22b68a8 100644
--- a/databases/rubygem-activerecord/Makefile
+++ b/databases/rubygem-activerecord/Makefile
@@ -23,6 +23,7 @@ OPTIONSFILE=	${PORT_DBDIR}/rubygem-${PORTNAME}/options
 
 # to get RUBY_SITEARCHLIBDIR
 USE_RUBY=	yes
+USE_RUBYGEMS=	yes
 
 # This target is only meant to be used by the port maintainer.
 x-generate-plist:
@@ -51,5 +52,4 @@ RUN_DEPENDS+=	rubygem-postgres>=0:${PORTSDIR}/databases/rubygem-postgres
 RUN_DEPENDS+=	rubygem-sqlite3>=1.2.1:${PORTSDIR}/databases/rubygem-sqlite3
 .endif
 
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
 .include <bsd.port.post.mk>
diff --git a/databases/rubygem-memcache-client/Makefile b/databases/rubygem-memcache-client/Makefile
index b38074cb7619..7234cceb00b0 100644
--- a/databases/rubygem-memcache-client/Makefile
+++ b/databases/rubygem-memcache-client/Makefile
@@ -13,11 +13,12 @@ MASTER_SITE_SUBDIR=	seattlerb
 MAINTAINER=	jw@innerewut.de
 COMMENT=	Ruby bindings for MemCached
 
-BUILD_DEPENDS=	rake:${PORTSDIR}/devel/rubygem-rake \
-		rubygem-zentest>=3.4.2:${PORTSDIR}/devel/rubygem-zentest \
+BUILD_DEPENDS=	rubygem-zentest>=3.4.2:${PORTSDIR}/devel/rubygem-zentest \
 		rubygem-hoe>=1.3.0:${PORTSDIR}/devel/rubygem-hoe
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+USE_RUBY=	yes
+USE_RAKE=	yes
+USE_RUBYGEMS=	yes
+
+.include <bsd.port.mk>
diff --git a/databases/rubygem-postgres/Makefile b/databases/rubygem-postgres/Makefile
index 4368e4167dbf..5d27c23c8ba9 100644
--- a/databases/rubygem-postgres/Makefile
+++ b/databases/rubygem-postgres/Makefile
@@ -20,6 +20,7 @@ PG_CONFIG=	${LOCALBASE}/bin/pg_config
 CONFIGURE_ARGS=	--with-pgsql-include-dir=`${PG_CONFIG} --includedir` \
 		--with-pgsql-lib-dir=`${PG_CONFIG} --libdir`
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+USE_RUBY=	yes
+USE_RUBYGEMS=	yes
+
+.include <bsd.port.mk>
diff --git a/databases/rubygem-rrdtool/Makefile b/databases/rubygem-rrdtool/Makefile
index 13cb034bc3d6..806c6c77a6f1 100644
--- a/databases/rubygem-rrdtool/Makefile
+++ b/databases/rubygem-rrdtool/Makefile
@@ -20,6 +20,9 @@ BUILD_DEPENDS=	sow:${PORTSDIR}/devel/rubygem-hoe
 GEM_NAME=	RubyRRDtool-0.6.0
 GEM_ENV=	MAKEFLAGS="CPPFLAGS=-I${LOCALBASE}/include"
 
+USE_RUBY=	yes
+USE_RUBYGEMS=	yes
+
 # This target is only meant to be used by the port maintainer.
 x-generate-plist:
 	(${PORTSDIR}/Tools/scripts/plist -d -m ${MTREE_FILE} ${PREFIX} \
@@ -33,6 +36,4 @@ x-generate-plist:
 		;s,^@dirrm (${SPEC_DIR}|${GEMS_DIR}|lib/ruby).*$$,,g \
 		' | ${TR} -s '\n') > temp-pkg-plist
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/databases/rubygem-sqlite3-ruby/Makefile b/databases/rubygem-sqlite3-ruby/Makefile
index 8cb1c21c60cf..d4e37410cfd0 100644
--- a/databases/rubygem-sqlite3-ruby/Makefile
+++ b/databases/rubygem-sqlite3-ruby/Makefile
@@ -20,6 +20,7 @@ LIB_DEPENDS=	sqlite3.8:${PORTSDIR}/databases/sqlite3
 
 GEM_NAME=	${DISTNAME}
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+USE_RUBY=	yes
+USE_RUBYGEMS=	yes
+
+.include <bsd.port.mk>
diff --git a/databases/rubygem-sqlite3/Makefile b/databases/rubygem-sqlite3/Makefile
index 8cb1c21c60cf..d4e37410cfd0 100644
--- a/databases/rubygem-sqlite3/Makefile
+++ b/databases/rubygem-sqlite3/Makefile
@@ -20,6 +20,7 @@ LIB_DEPENDS=	sqlite3.8:${PORTSDIR}/databases/sqlite3
 
 GEM_NAME=	${DISTNAME}
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+USE_RUBY=	yes
+USE_RUBYGEMS=	yes
+
+.include <bsd.port.mk>
diff --git a/devel/ruby-ecore/Makefile b/devel/ruby-ecore/Makefile
index 95ed9dc5d393..ae760a269c24 100644
--- a/devel/ruby-ecore/Makefile
+++ b/devel/ruby-ecore/Makefile
@@ -16,11 +16,11 @@ DISTNAME=	ruby-ecore-${PORTVERSION}
 MAINTAINER=	stas@FreeBSD.org
 COMMENT=	Ruby bindings for Ecore library
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/rake:${PORTSDIR}/devel/rubygem-rake \
-		${RUBY_SA}/evas/rb_evas.h:${PORTSDIR}/graphics/ruby-evas
+BUILD_DEPENDS=	${RUBY_SA}/evas/rb_evas.h:${PORTSDIR}/graphics/ruby-evas
 
 USE_BZIP2=	yes
 USE_RUBY=	yes
+USE_RAKE=	yes
 USE_EFL=	ecore
 USE_EFL_ECORE=	x11 con job evas
 
@@ -30,10 +30,10 @@ RUBY_SA=	${RUBY_SITEARCHLIBDIR}
 
 do-build:
 	@(cd ${WRKSRC}; ${SETENV} ECORE_PREFIX=${LOCALBASE} \
-		${LOCALBASE}/bin/rake)
+		${RAKE_BIN})
 
 do-install:
 	@(cd ${WRKSRC}; ${SETENV} ECORE_PREFIX=${LOCALBASE} \
-		${LOCALBASE}/bin/rake install)
+		${RAKE_BIN} install)
 
 .include <bsd.port.post.mk>
diff --git a/devel/ruby-eet/Makefile b/devel/ruby-eet/Makefile
index ab0fd6496bad..00d1c4abcffd 100644
--- a/devel/ruby-eet/Makefile
+++ b/devel/ruby-eet/Makefile
@@ -14,17 +14,17 @@ DISTNAME=	ruby-eet-${PORTVERSION}
 MAINTAINER=	alexbl@FreeBSD.org
 COMMENT=	Ruby support for reading and writing EET files
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/rake:${PORTSDIR}/devel/rubygem-rake
 LIB_DEPENDS=	eet.9:${PORTSDIR}/devel/eet
 
 USE_RUBY=	yes
+USE_RAKE=	yes
 
 .include <bsd.port.pre.mk>
 
 do-build:
-	@cd ${WRKSRC} && ${LOCALBASE}/bin/rake PREFIX=${PREFIX}/
+	@cd ${WRKSRC} && ${RAKE_BIN} PREFIX=${PREFIX}/
 
 do-install:
-	@cd ${WRKSRC} && ${LOCALBASE}/bin/rake PREFIX=${PREFIX}/ install
+	@cd ${WRKSRC} && ${RAKE_BIN} PREFIX=${PREFIX}/ install
 
 .include <bsd.port.post.mk>
diff --git a/devel/ruby-event-loop/Makefile b/devel/ruby-event-loop/Makefile
index 8ae39383a56c..f4986ce4185f 100644
--- a/devel/ruby-event-loop/Makefile
+++ b/devel/ruby-event-loop/Makefile
@@ -14,9 +14,8 @@ PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 MAINTAINER=	alexbl@FreeBSD.org
 COMMENT=	An Event loop for Ruby
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/rake:${PORTSDIR}/devel/rubygem-rake
-
 USE_RUBY=	yes
+USE_RAKE=	yes
 
 do-configure:
 	@cd ${WRKSRC} && ${RUBY} setup.rb config --prefix=${PREFIX}
diff --git a/devel/ruby-gems/Makefile b/devel/ruby-gems/Makefile
index 513fd5482bde..347d07ad79c5 100644
--- a/devel/ruby-gems/Makefile
+++ b/devel/ruby-gems/Makefile
@@ -27,10 +27,16 @@ NO_BUILD=	yes
 
 PLIST_SUB+=	DISTNAME="${DISTNAME}"
 
+.include <bsd.port.pre.mk>
+
+.if ${RUBY_VER} == 1.9
+IGNORE=	already included in this ruby distribution
+.endif
+
 do-install:
 	cd ${WRKSRC}; ${RUBY} ${RUBY_SETUP}
 
 post-install:
 	@${LN} -sf ${PREFIX}/bin/gem18 ${PREFIX}/bin/gem
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/devel/ruby-gems/Makefile.common b/devel/ruby-gems/Makefile.common
deleted file mode 100644
index a6805e0897a9..000000000000
--- a/devel/ruby-gems/Makefile.common
+++ /dev/null
@@ -1,53 +0,0 @@
-# $FreeBSD$
-# Ruby gem module common settings
-
-
-BUILD_DEPENDS+=	${RUBYGEMBIN}:${PORTSDIR}/devel/ruby-gems
-RUN_DEPENDS+=	${BUILD_DEPENDS}
-
-PKGNAMEPREFIX=	rubygem-
-EXTRACT_SUFX=	.gem
-EXTRACT_ONLY=
-DIST_SUBDIR=	rubygem
-
-NO_BUILD=	yes
-
-REV=		1.8
-GEMS_BASE_DIR=	lib/ruby/gems/${REV}
-GEMS_DIR=	${GEMS_BASE_DIR}/gems
-DOC_DIR=	${GEMS_BASE_DIR}/doc
-CACHE_DIR=	${GEMS_BASE_DIR}/cache
-SPEC_DIR=	${GEMS_BASE_DIR}/specifications
-GEM_NAME?=	${PORTNAME}-${PORTVERSION}
-GEM_LIB_DIR=	${GEMS_DIR}/${GEM_NAME}
-GEM_DOC_DIR=	${DOC_DIR}/${GEM_NAME}
-GEM_SPEC=	${SPEC_DIR}/${GEM_NAME}.gemspec
-GEM_CACHE=	${CACHE_DIR}/${GEM_NAME}.gem
-
-PLIST_SUB+=	PORTVERSION="${PORTVERSION}" \
-		REV="${REV}" \
-		GEMS_BASE_DIR="lib/ruby/gems/${REV}" \
-		GEMS_DIR="${GEMS_DIR}" \
-		DOC_DIR="${DOC_DIR}" \
-		CACHE_DIR="${CACHE_DIR}" \
-		SPEC_DIR="${SPEC_DIR}" \
-		PORT="${PORTNAME}-${PORTVERSION}" \
-		GEM_NAME="${GEM_NAME}" \
-		GEM_LIB_DIR="${GEM_LIB_DIR}" \
-		GEM_DOC_DIR="${GEM_DOC_DIR}" \
-		GEM_SPEC="${GEM_SPEC}" \
-		GEM_CACHE="${GEM_CACHE}" \
-		EXTRACT_SUFX="${EXTRACT_SUFX}"
-
-RUBYGEMBIN=	${LOCALBASE}/bin/gem18
-
-.if defined(DISTFILES)
-GEMFILES=	${DISTFILES:C/:[^:]+$//}
-.else
-GEMFILES=	${DISTNAME}${EXTRACT_SUFX}
-.endif
-
-do-install:
-.for _D in ${GEMFILES}
-	${SETENV} ${GEM_ENV} ${RUBYGEMBIN} install --no-update-sources --no-ri --install-dir ${PREFIX}/lib/ruby/gems/${REV} ${DISTDIR}/${DIST_SUBDIR}/${_D} -- --build-args ${CONFIGURE_ARGS}
-.endfor
diff --git a/devel/rubygem-activesupport/Makefile b/devel/rubygem-activesupport/Makefile
index 0cd545074eab..0cc39feb80c8 100644
--- a/devel/rubygem-activesupport/Makefile
+++ b/devel/rubygem-activesupport/Makefile
@@ -13,6 +13,9 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	jw@innerewut.de
 COMMENT=	Utility classes and extension that are required by Rails MVC Framework
 
+USE_RUBY=	yes
+USE_RUBYGEMS=	yes
+
 # This target is only meant to be used by the port maintainer.
 x-generate-plist:
 	(${PORTSDIR}/Tools/scripts/plist -d -m ${MTREE_FILE} ${PREFIX} \
@@ -26,6 +29,4 @@ x-generate-plist:
 		;s,^@dirrm (${SPEC_DIR}|${GEMS_DIR}|lib/ruby).*$$,,g \
 		' | ${TR} -s '\n') > temp-pkg-plist
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/rubygem-analogger/Makefile b/devel/rubygem-analogger/Makefile
index cb654f2e7da8..9b565a8a3204 100644
--- a/devel/rubygem-analogger/Makefile
+++ b/devel/rubygem-analogger/Makefile
@@ -16,6 +16,7 @@ COMMENT=	A fast, flexible, easy to use logging service for Ruby
 BUILD_DEPENDS=	rubygem-eventmachine>=0.7.0:${PORTSDIR}/devel/rubygem-eventmachine
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+USE_RUBY=	yes
+USE_RUBYGEMS=	yes
+
+.include <bsd.port.mk>
diff --git a/devel/rubygem-builder/Makefile b/devel/rubygem-builder/Makefile
index 7324ea6d52b8..cf1c73d2b2da 100644
--- a/devel/rubygem-builder/Makefile
+++ b/devel/rubygem-builder/Makefile
@@ -15,6 +15,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@logvinov.com
 COMMENT=	Facilitate programatic generation of XML markup
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+USE_RUBY=	yes
+USE_RUBYGEMS=	yes
+
+.include <bsd.port.mk>
diff --git a/devel/rubygem-daemons/Makefile b/devel/rubygem-daemons/Makefile
index d446ccfb7f42..2d2e55ef2c07 100644
--- a/devel/rubygem-daemons/Makefile
+++ b/devel/rubygem-daemons/Makefile
@@ -12,6 +12,9 @@ MASTER_SITES=	RF
 MAINTAINER=	ports@logvinov.com
 COMMENT=	A toolkit to convert your script to a controllable daemon
 
+USE_RUBY=	yes
+USE_RUBYGEMS=	yes
+
 # This target is only meant to be used by the port maintainer.
 x-generate-plist:
 	(${PORTSDIR}/Tools/scripts/plist -d -m ${MTREE_FILE} ${PREFIX} \
@@ -25,6 +28,4 @@ x-generate-plist:
 		;s,^@dirrm (${SPEC_DIR}|${GEMS_DIR}|lib/ruby).*$$,,g \
 		' | ${TR} -s '\n') > temp-pkg-plist
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/rubygem-eventmachine/Makefile b/devel/rubygem-eventmachine/Makefile
index b04d295dc50f..d028555fcd96 100644
--- a/devel/rubygem-eventmachine/Makefile
+++ b/devel/rubygem-eventmachine/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	RF
 MAINTAINER=	ports@logvinov.com
 COMMENT=	A fast, simple event-processing library for Ruby programs
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+USE_RUBY=	yes
+USE_RUBYGEMS=	yes
+
+.include <bsd.port.mk>
diff --git a/devel/rubygem-facets/Makefile b/devel/rubygem-facets/Makefile
index 32929c8c6771..a44a8b680c51 100644
--- a/devel/rubygem-facets/Makefile
+++ b/devel/rubygem-facets/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	yds@CoolRat.org
 COMMENT=	RubyGem port of the single most extensive additions and extensions
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+USE_RUBY=	yes
+USE_RUBYGEMS=	yes
+
+.include <bsd.port.mk>
diff --git a/devel/rubygem-fastercsv/Makefile b/devel/rubygem-fastercsv/Makefile
index 48fe135211be..5a8b924ce310 100644
--- a/devel/rubygem-fastercsv/Makefile
+++ b/devel/rubygem-fastercsv/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	RF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A complete replacement to the CSV standard library
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+USE_RUBY=	yes
+USE_RUBYGEMS=	yes
+
+.include <bsd.port.mk>
diff --git a/devel/rubygem-fastthread/Makefile b/devel/rubygem-fastthread/Makefile
index 10d8d49deaab..228b290f9971 100644
--- a/devel/rubygem-fastthread/Makefile
+++ b/devel/rubygem-fastthread/Makefile
@@ -13,6 +13,9 @@ MASTER_SITE_SUBDIR=	mongrel
 MAINTAINER=	ports@logvinov.com
 COMMENT=	Optimized replacement for thread.rb primitives
 
+USE_RUBY=	yes
+USE_RUBYGEMS=	yes
+
 # This target is only meant to be used by the port maintainer.
 x-generate-plist:
 	(${PORTSDIR}/Tools/scripts/plist -d -m ${MTREE_FILE} ${PREFIX} \
@@ -26,6 +29,4 @@ x-generate-plist:
 		;s,^@dirrm (${SPEC_DIR}|${GEMS_DIR}|lib/ruby).*$$,,g \
 		' | ${TR} -s '\n') > temp-pkg-plist
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/rubygem-gem_plugin/Makefile b/devel/rubygem-gem_plugin/Makefile
index 237a28346070..a10cf75ed369 100644
--- a/devel/rubygem-gem_plugin/Makefile
+++ b/devel/rubygem-gem_plugin/Makefile
@@ -13,9 +13,12 @@ MASTER_SITE_SUBDIR=     mongrel
 MAINTAINER=	ports@logvinov.com
 COMMENT=	Gem Based Plugin System
 
-BUILD_DEPENDS=	rake:${PORTSDIR}/devel/rubygem-rake
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
+USE_RUBY=	yes
+USE_RAKE=	yes
+USE_RUBYGEMS=	yes
+
 # This target is only meant to be used by the port maintainer.
 x-generate-plist:
 	(${PORTSDIR}/Tools/scripts/plist -d -m ${MTREE_FILE} ${PREFIX} \
@@ -29,6 +32,4 @@ x-generate-plist:
 		;s,^@dirrm (${SPEC_DIR}|${GEMS_DIR}|lib/ruby).*$$,,g \
 		' | ${TR} -s '\n') > temp-pkg-plist
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/rubygem-highline/Makefile b/devel/rubygem-highline/Makefile
index a0d3463e16ce..fd32e290266b 100644
--- a/devel/rubygem-highline/Makefile
+++ b/devel/rubygem-highline/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	pgollucci@p6m7g8.com
 COMMENT=	A high-level IO library for command-line interfaces
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+USE_RUBY=	yes
+USE_RUBYGEMS=	yes
+
+.include <bsd.port.mk>
diff --git a/devel/rubygem-hoe/Makefile b/devel/rubygem-hoe/Makefile
index 9a917a1bb834..7bb153514743 100644
--- a/devel/rubygem-hoe/Makefile
+++ b/devel/rubygem-hoe/Makefile
@@ -13,10 +13,13 @@ MASTER_SITE_SUBDIR=	seattlerb
 MAINTAINER=	jw@innerewut.de
 COMMENT=	A simple rake/rubygems helper for project Rakefiles
 
-BUILD_DEPENDS=	rake:${PORTSDIR}/devel/rubygem-rake \
-		rubyforge:${PORTSDIR}/devel/rubygem-rubyforge
+BUILD_DEPENDS=	rubyforge:${PORTSDIR}/devel/rubygem-rubyforge
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
+USE_RUBY=	yes
+USE_RAKE=	yes
+USE_RUBYGEMS=	yes
+
 post-install:
 	@${ECHO} bin/sow > ${TMPPLIST}
 	@${ECHO} ${GEM_CACHE} >> ${TMPPLIST}
@@ -26,6 +29,4 @@ post-install:
 	@${FIND} ${PREFIX}/${GEM_LIB_DIR} -type d -depth | ${SED} -e 's,${PREFIX}/${GEM_LIB_DIR},@dirrm ${GEM_LIB_DIR},' >> ${TMPPLIST}
 	@${FIND} ${PREFIX}/${GEM_DOC_DIR} -type d -depth | ${SED} -e 's,${PREFIX}/${GEM_DOC_DIR},@dirrm ${GEM_DOC_DIR},' >> ${TMPPLIST}
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/rubygem-inline/Makefile b/devel/rubygem-inline/Makefile
index 8da1280227db..ce6220aa16be 100644
--- a/devel/rubygem-inline/Makefile
+++ b/devel/rubygem-inline/Makefile
@@ -20,6 +20,7 @@ RUN_DEPENDS=	${BUILD_DEPENDS}
 
 GEM_NAME=	${DISTNAME}
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+USE_RUBY=	yes
+USE_RUBYGEMS=	yes
+
+.include <bsd.port.mk>
diff --git a/devel/rubygem-json/Makefile b/devel/rubygem-json/Makefile
index c2301e7ec7b3..17e5a152bdd4 100644
--- a/devel/rubygem-json/Makefile
+++ b/devel/rubygem-json/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	RF
 MAINTAINER=	clsung@FreeBSD.org
 COMMENT=	Parse JSON texts and generate them from ruby data structures
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+USE_RUBY=	yes
+USE_RUBYGEMS=	yes
+
+.include <bsd.port.mk>
diff --git a/devel/rubygem-needle/Makefile b/devel/rubygem-needle/Makefile
index 7b2733f8efca..ca9588f2694b 100644
--- a/devel/rubygem-needle/Makefile
+++ b/devel/rubygem-needle/Makefile
@@ -14,8 +14,9 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	r.s.a.vandomburg@nedforce.nl
 COMMENT=	Dependency-injection/inversion-of-control container
 
+USE_RUBY=	yes
+USE_RUBYGEMS=	yes
+
 FETCH_CMD=	/usr/bin/fetch -Rr
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/rubygem-open4/Makefile b/devel/rubygem-open4/Makefile
index 58f531d79c55..cbc9ad6d6495 100644
--- a/devel/rubygem-open4/Makefile
+++ b/devel/rubygem-open4/Makefile
@@ -14,7 +14,6 @@ MAINTAINER=	arved@FreeBSD.org
 COMMENT=	Open4 manages child processes and their io handles
 
 USE_RUBY=	yes
+USE_RUBYGEMS=	yes
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/rubygem-parsetree/Makefile b/devel/rubygem-parsetree/Makefile
index 024d8de567dc..646a944ed6d3 100644
--- a/devel/rubygem-parsetree/Makefile
+++ b/devel/rubygem-parsetree/Makefile
@@ -17,8 +17,9 @@ BUILD_DEPENDS=	rubygem-inline>=3.6.0:${PORTSDIR}/devel/rubygem-inline \
 		rubygem-hoe>=1.4.0:${PORTSDIR}/devel/rubygem-hoe
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
+USE_RUBY=	yes
+USE_RUBYGEMS=	yes
+
 GEM_NAME=       ${DISTNAME}
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/rubygem-ptreloaded/Makefile b/devel/rubygem-ptreloaded/Makefile
index fe04fb6a7eb9..9e6a1104a926 100644
--- a/devel/rubygem-ptreloaded/Makefile
+++ b/devel/rubygem-ptreloaded/Makefile
@@ -20,6 +20,9 @@ RUN_DEPENDS=	${BUILD_DEPENDS}
 
 GEM_NAME=	${DISTNAME}
 
+USE_RUBY=	yes
+USE_RUBYGEMS=	yes
+
 x-generate-plist:
 	${ECHO} %%GEM_CACHE%% > pkg-plist.new
 	${FIND} ${PREFIX}/${GEM_DOC_DIR} -type f | ${SED} -e 's,${PREFIX}/${GEM_DOC_DIR},%%GEM_DOC_DIR%%,' >> pkg-plist.new
@@ -28,6 +31,4 @@ x-generate-plist:
 	${FIND} ${PREFIX}/${GEM_LIB_DIR} -type d -depth | ${SED} -e 's,${PREFIX}/${GEM_LIB_DIR},@dirrm %%GEM_LIB_DIR%%,' >> pkg-plist.new
 	${FIND} ${PREFIX}/${GEM_DOC_DIR} -type d -depth | ${SED} -e 's,${PREFIX}/${GEM_DOC_DIR},@dirrm %%GEM_DOC_DIR%%,' >> pkg-plist.new
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/rubygem-rake/Makefile b/devel/rubygem-rake/Makefile
index f00e4e9f5db7..50f10b0c2aeb 100644
--- a/devel/rubygem-rake/Makefile
+++ b/devel/rubygem-rake/Makefile
@@ -13,6 +13,9 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	jw@innerewut.de
 COMMENT=	Ruby Make
 
+USE_RUBY=	yes
+USE_RUBYGEMS=	yes
+
 MANCOMPRESSED=	yes
 MAN1=		rake.1
 
@@ -26,7 +29,10 @@ x-generate-plist:
 	${FIND} ${PREFIX}/${GEM_DOC_DIR} -type d -depth | ${SED} -e 's,${PREFIX}/${GEM_DOC_DIR},@dirrm %%GEM_DOC_DIR%%,' >> pkg-plist.new
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
+
+.if ${RUBY_VER} == 1.9
+IGNORE=	already included in ruby distribution
+.endif
 
 post-install:
 	${MV} ${PREFIX}/${GEM_LIB_DIR}/doc/rake.1.gz \
diff --git a/devel/rubygem-rapt/Makefile b/devel/rubygem-rapt/Makefile
index dd6199351d6d..3a90a3c10992 100644
--- a/devel/rubygem-rapt/Makefile
+++ b/devel/rubygem-rapt/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES=	RF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Rails Plugin Tool
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+USE_RUBY=	yes
+USE_RUBYGEMS=	yes
+
+.include <bsd.port.mk>
diff --git a/devel/rubygem-rascut/Makefile b/devel/rubygem-rascut/Makefile
index 9954a2e7ac39..03a34ce3ad53 100644
--- a/devel/rubygem-rascut/Makefile
+++ b/devel/rubygem-rascut/Makefile
@@ -14,11 +14,12 @@ MASTER_SITE_SUBDIR=	hotchpotch
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Ruby ActionSCript UTility
 
-BUILD_DEPENDS=	rake:${PORTSDIR}/devel/rubygem-rake \
-		mongrel_rails:${PORTSDIR}/www/rubygem-mongrel \
+BUILD_DEPENDS=	mongrel_rails:${PORTSDIR}/www/rubygem-mongrel \
 		rackup:${PORTSDIR}/www/rubygem-rack \
 		fcsh:${PORTSDIR}/devel/flex_compiler_shell
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+USE_RUBY=	yes
+USE_RAKE=	yes
+USE_RUBYGEMS=	yes
+
+.include <bsd.port.mk>
diff --git a/devel/rubygem-rgl/Makefile b/devel/rubygem-rgl/Makefile
index 57c774c87708..98ded754428d 100644
--- a/devel/rubygem-rgl/Makefile
+++ b/devel/rubygem-rgl/Makefile
@@ -17,6 +17,7 @@ COMMENT=	Framework for graph datastructures and algorithms implemented in Ruby
 
 RUN_DEPENDS=	${LOCALBASE}/lib/ruby/gems/1.8/specifications/stream-0.5.gemspec:${PORTSDIR}/devel/rubygem-stream
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+USE_RUBY=	yes
+USE_RUBYGEMS=	yes
+
+.include <bsd.port.mk>
diff --git a/devel/rubygem-rscm/Makefile b/devel/rubygem-rscm/Makefile
index 43a8aebc7902..a32c109c5020 100644
--- a/devel/rubygem-rscm/Makefile
+++ b/devel/rubygem-rscm/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	daniel@roe.ch
 COMMENT=	Ruby SCM, an SCM-independent API for accessing SCMs
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+USE_RUBY=	yes
+USE_RUBYGEMS=	yes
+
+.include <bsd.port.mk>
diff --git a/devel/rubygem-rspec/Makefile b/devel/rubygem-rspec/Makefile
index 6e66daaf1e84..dbc1a00244f5 100644
--- a/devel/rubygem-rspec/Makefile
+++ b/devel/rubygem-rspec/Makefile
@@ -13,9 +13,10 @@ MASTER_SITE_SUBDIR=	rspec
 MAINTAINER=	romanbsd@yahoo.com
 COMMENT=	Behaviour Driven Development in Ruby
 
-BUILD_DEPENDS=	rake:${PORTSDIR}/devel/rubygem-rake
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+USE_RUBY=	yes
+USE_RAKE=	yes
+USE_RUBYGEMS=	yes
+
+.include <bsd.port.mk>
diff --git a/devel/rubygem-rtags/Makefile b/devel/rubygem-rtags/Makefile
index 7133a47efcb8..50e4a39a40e5 100644
--- a/devel/rubygem-rtags/Makefile
+++ b/devel/rubygem-rtags/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	clsung@FreeBSD.org
 COMMENT=	A Ruby replacement for ctags
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+USE_RUBY=	yes
+USE_RUBYGEMS=	yes
+
+.include <bsd.port.mk>
diff --git a/devel/rubygem-ruby-debug-base/Makefile b/devel/rubygem-ruby-debug-base/Makefile
index e25ce9e6a93a..300ddb45f847 100644
--- a/devel/rubygem-ruby-debug-base/Makefile
+++ b/devel/rubygem-ruby-debug-base/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	ruby-debug
 MAINTAINER=	gogo@cs.uni-sb.de
 COMMENT=	Fast implementation of the standard Ruby debugger
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+USE_RUBY=	yes
+USE_RUBYGEMS=	yes
+
+.include <bsd.port.mk>
diff --git a/devel/rubygem-ruby-debug/Makefile b/devel/rubygem-ruby-debug/Makefile
index aa2797813d6e..68f18e34f5bb 100644
--- a/devel/rubygem-ruby-debug/Makefile
+++ b/devel/rubygem-ruby-debug/Makefile
@@ -15,6 +15,7 @@ COMMENT=	A generic command line interface for ruby-debug
 
 RUN_DEPENDS=	rubygem-ruby-debug-base>=0.10.0:${PORTSDIR}/devel/rubygem-ruby-debug-base
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+USE_RUBY=	yes
+USE_RUBYGEMS=	yes
+
+.include <bsd.port.mk>
diff --git a/devel/rubygem-ruby-prof/Makefile b/devel/rubygem-ruby-prof/Makefile
index 77fb1fcb10e6..5e613edd667a 100644
--- a/devel/rubygem-ruby-prof/Makefile
+++ b/devel/rubygem-ruby-prof/Makefile
@@ -13,6 +13,9 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	gogo@cs.uni-sb.de
 COMMENT=	A fast profiler for Ruby
 
+USE_RUBY=	yes
+USE_RUBYGEMS=	yes
+
 # This target is only meant to be used by the port maintainer.
 x-generate-plist:
 	(${PORTSDIR}/Tools/scripts/plist -d -m ${MTREE_FILE} ${PREFIX} \
@@ -26,6 +29,4 @@ x-generate-plist:
 		;s,^@dirrm (${SPEC_DIR}|${GEMS_DIR}|lib/ruby).*$$,,g \
 		' | ${TR} -s '\n') > temp-pkg-plist
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/rubygem-ruby2ruby/Makefile b/devel/rubygem-ruby2ruby/Makefile
index ecfde08f0d6c..f4ebf20df0b7 100644
--- a/devel/rubygem-ruby2ruby/Makefile
+++ b/devel/rubygem-ruby2ruby/Makefile
@@ -18,6 +18,9 @@ BUILD_DEPENDS=	rubygem-parsetree>=0.0:${PORTSDIR}/devel/rubygem-parsetree \
 		rubygem-hoe>=1.4.0:${PORTSDIR}/devel/rubygem-hoe
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
+USE_RUBY=	yes
+USE_RUBYGEMS=	yes
+
 x-generate-plist:
 	${ECHO} bin/r2r_show > pkg-plist.new
 	${ECHO} %%GEM_CACHE%% >> pkg-plist.new
@@ -27,6 +30,4 @@ x-generate-plist:
 	${FIND} ${PREFIX}/${GEM_LIB_DIR} -type d -depth | ${SED} -e 's,${PREFIX}/${GEM_LIB_DIR},@dirrm %%GEM_LIB_DIR%%,' >> pkg-plist.new
 	${FIND} ${PREFIX}/${GEM_DOC_DIR} -type d -depth | ${SED} -e 's,${PREFIX}/${GEM_DOC_DIR},@dirrm %%GEM_DOC_DIR%%,' >> pkg-plist.new
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/rubygem-rubyforge/Makefile b/devel/rubygem-rubyforge/Makefile
index 45ac113b0203..ee13f39adc91 100644
--- a/devel/rubygem-rubyforge/Makefile
+++ b/devel/rubygem-rubyforge/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR=	codeforpeople
 MAINTAINER=	jw@innerewut.de
 COMMENT=	Simplistic script which automates rubyforge operations
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+USE_RUBY=	yes
+USE_RUBYGEMS=	yes
+
+.include <bsd.port.mk>
diff --git a/devel/rubygem-rubyinlineaccel/Makefile b/devel/rubygem-rubyinlineaccel/Makefile
index 5afd40c22d94..8e969337ea87 100644
--- a/devel/rubygem-rubyinlineaccel/Makefile
+++ b/devel/rubygem-rubyinlineaccel/Makefile
@@ -20,6 +20,9 @@ RUN_DEPENDS=	${BUILD_DEPENDS}
 
 GEM_NAME=	${DISTNAME}
 
+USE_RUBY=	yes
+USE_RUBYGEMS=	yes
+
 x-generate-plist:
 	${ECHO} %%GEM_CACHE%% > pkg-plist.new
 	${FIND} ${PREFIX}/${GEM_DOC_DIR} -type f | ${SED} -e 's,${PREFIX}/${GEM_DOC_DIR},%%GEM_DOC_DIR%%,' >> pkg-plist.new
@@ -28,6 +31,4 @@ x-generate-plist:
 	${FIND} ${PREFIX}/${GEM_LIB_DIR} -type d -depth | ${SED} -e 's,${PREFIX}/${GEM_LIB_DIR},@dirrm %%GEM_LIB_DIR%%,' >> pkg-plist.new
 	${FIND} ${PREFIX}/${GEM_DOC_DIR} -type d -depth | ${SED} -e 's,${PREFIX}/${GEM_DOC_DIR},@dirrm %%GEM_DOC_DIR%%,' >> pkg-plist.new
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/rubygem-stream/Makefile b/devel/rubygem-stream/Makefile
index 9498e007a2d5..f02c1f26cffc 100644
--- a/devel/rubygem-stream/Makefile
+++ b/devel/rubygem-stream/Makefile
@@ -16,6 +16,7 @@ MASTER_SITE_SUBDIR=	fenner
 MAINTAINER=	uspoerlein@gmail.com
 COMMENT=	Interface for external iterators
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+USE_RUBY=	yes
+USE_RUBYGEMS=	yes
+
+.include <bsd.port.mk>
diff --git a/devel/rubygem-transactionsimple/Makefile b/devel/rubygem-transactionsimple/Makefile
index 489a3fca5e04..b1aba32fb9a0 100644
--- a/devel/rubygem-transactionsimple/Makefile
+++ b/devel/rubygem-transactionsimple/Makefile
@@ -17,8 +17,8 @@ COMMENT=	Simple object transaction support
 BUILD_DEPENDS=	rubygem-hoe>=1.3.0:${PORTSDIR}/devel/rubygem-hoe
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
+USE_RUBY=	yes
+USE_RUBYGEMS=	yes
 GEM_NAME=	${DISTNAME}
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/rubygem-tzinfo/Makefile b/devel/rubygem-tzinfo/Makefile
index bc4913765f25..c5921e5cdc30 100644
--- a/devel/rubygem-tzinfo/Makefile
+++ b/devel/rubygem-tzinfo/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	RF
 MAINTAINER=	clsung@FreeBSD.org
 COMMENT=	Daylight-savings aware timezone support for Ruby
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+USE_RUBY=	yes
+USE_RUBYGEMS=	yes
+
+.include <bsd.port.mk>
diff --git a/devel/rubygem-zentest/Makefile b/devel/rubygem-zentest/Makefile
index 57a287e19b81..9df487fc2f0d 100644
--- a/devel/rubygem-zentest/Makefile
+++ b/devel/rubygem-zentest/Makefile
@@ -19,6 +19,7 @@ RUN_DEPENDS=    ${BUILD_DEPENDS}
 
 GEM_NAME=	${DISTNAME}
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+USE_RUBY=	yes
+USE_RUBYGEMS=	yes
+
+.include <bsd.port.mk>
diff --git a/graphics/ruby-edje/Makefile b/graphics/ruby-edje/Makefile
index a7467aabdf88..57cda383c4aa 100644
--- a/graphics/ruby-edje/Makefile
+++ b/graphics/ruby-edje/Makefile
@@ -16,11 +16,11 @@ DISTNAME=	ruby-edje-${PORTVERSION}
 MAINTAINER=	stas@FreeBSD.org
 COMMENT=	Ruby bindings for Edje library
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/rake:${PORTSDIR}/devel/rubygem-rake \
-		${RUBY_SA}/evas/rb_evas.h:${PORTSDIR}/graphics/ruby-evas
+BUILD_DEPENDS=	${RUBY_SA}/evas/rb_evas.h:${PORTSDIR}/graphics/ruby-evas
 
 USE_BZIP2=	yes
 USE_RUBY=	yes
+USE_RAKE=	yes
 USE_EFL=	edje
 
 RUBY_SA=	${RUBY_SITEARCHLIBDIR}
@@ -28,11 +28,10 @@ RUBY_SA=	${RUBY_SITEARCHLIBDIR}
 .include <bsd.port.pre.mk>
 
 do-build:
-	@(cd ${WRKSRC}; ${SETENV} EDJE_PREFIX=${LOCALBASE} \
-		${LOCALBASE}/bin/rake)
+	@(cd ${WRKSRC}; ${SETENV} EDJE_PREFIX=${LOCALBASE} ${RAKE_BIN})
 
 do-install:
 	@(cd ${WRKSRC}; ${SETENV} EDJE_PREFIX=${LOCALBASE} \
-		${LOCALBASE}/bin/rake install)
+		${RAKE_BIN} install)
 
 .include <bsd.port.post.mk>
diff --git a/graphics/ruby-esmart/Makefile b/graphics/ruby-esmart/Makefile
index f967e7f3728b..561178c18756 100644
--- a/graphics/ruby-esmart/Makefile
+++ b/graphics/ruby-esmart/Makefile
@@ -16,14 +16,13 @@ DISTNAME=	ruby-esmart-${PORTVERSION}
 MAINTAINER=	stas@FreeBSD.org
 COMMENT=	Ruby bindings for Esmart library
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/rake:${PORTSDIR}/devel/rubygem-rake \
-		${RUBY_SA}/evas/rb_evas.h:${PORTSDIR}/graphics/ruby-evas \
+BUILD_DEPENDS=	${RUBY_SA}/evas/rb_evas.h:${PORTSDIR}/graphics/ruby-evas \
 		${RUBY_SA}/ecore/rb_window.h:${PORTSDIR}/devel/ruby-ecore
 
 USE_BZIP2=	yes
 USE_RUBY=	yes
+USE_RAKE=	yes
 USE_EFL_ESMART=	trans_x11 container draggies
-
 CFLAGS+=	-I"${LOCALBASE}/include" -fPIC
 
 RUBY_SA=	${RUBY_SITEARCHLIBDIR}
@@ -32,10 +31,10 @@ RUBY_SA=	${RUBY_SITEARCHLIBDIR}
 
 do-build:
 	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ESMART_PREFIX=${LOCALBASE} \
-		${LOCALBASE}/bin/rake)
+		${RAKE_BIN})
 
 do-install:
 	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ESMART_PREFIX=${LOCALBASE} \
-		${LOCALBASE}/bin/rake install)
+		${RAKE_BIN} install)
 
 .include <bsd.port.post.mk>
diff --git a/graphics/ruby-evas/Makefile b/graphics/ruby-evas/Makefile
index 843c41d5fce7..b29112e40039 100644
--- a/graphics/ruby-evas/Makefile
+++ b/graphics/ruby-evas/Makefile
@@ -16,20 +16,19 @@ DISTNAME=	ruby-evas-${PORTVERSION}
 MAINTAINER=	stas@FreeBSD.org
 COMMENT=	Ruby bindings for Evas library
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/rake:${PORTSDIR}/devel/rubygem-rake
-
 USE_BZIP2=	yes
 USE_RUBY=	yes
+USE_RAKE=	yes
 USE_EFL=	evas
 
 .include <bsd.port.pre.mk>
 
 do-build:
 	@(cd ${WRKSRC}; ${SETENV} EVAS_PREFIX=${LOCALBASE} \
-		${LOCALBASE}/bin/rake)
+		${RAKE_BIN})
 
 do-install:
 	@(cd ${WRKSRC}; ${SETENV} EVAS_PREFIX=${LOCALBASE} \
-		${LOCALBASE}/bin/rake install)
+		${RAKE_BIN} install)
 
 .include <bsd.port.post.mk>
diff --git a/graphics/ruby-redact/Makefile b/graphics/ruby-redact/Makefile
index 6c7bdec710c3..1c8ca764b8a9 100644
--- a/graphics/ruby-redact/Makefile
+++ b/graphics/ruby-redact/Makefile
@@ -15,16 +15,16 @@ MAINTAINER=	alexbl@FreeBSD.org
 COMMENT=	An edje compiler written in ruby
 
 BUILD_DEPENDS=	${RUBY_SITEARCHLIBDIR}/imlib2.so:${PORTSDIR}/graphics/ruby-imlib2 \
-		${RUBY_SITELIBDIR}/eet.rb:${PORTSDIR}/devel/ruby-eet \
-		${LOCALBASE}/bin/rake:${PORTSDIR}/devel/rubygem-rake
+		${RUBY_SITELIBDIR}/eet.rb:${PORTSDIR}/devel/ruby-eet
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_RUBY=	yes
+USE_RAKE=	yes
 NO_BUILD=	yes
 
 .include <bsd.port.pre.mk>
 
 do-install:
-	@cd ${WRKSRC} && ${LOCALBASE}/bin/rake PREFIX=${PREFIX}/ install
+	@cd ${WRKSRC} && ${RAKE_BIN} PREFIX=${PREFIX}/ install
 
 .include <bsd.port.post.mk>
diff --git a/graphics/rubygem-captcha/Makefile b/graphics/rubygem-captcha/Makefile
index 82e1e4308848..9bbd5d776772 100644
--- a/graphics/rubygem-captcha/Makefile
+++ b/graphics/rubygem-captcha/Makefile
@@ -18,7 +18,6 @@ BUILD_DEPENDS=	${RUBY_SITEARCHLIBDIR}/GD.so:${PORTSDIR}/graphics/ruby-gd
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_RUBY=	yes
+USE_RUBYGEMS=	yes
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/rubygem-gd2/Makefile b/graphics/rubygem-gd2/Makefile
index 5b3762e67784..a68e1d52ceee 100644
--- a/graphics/rubygem-gd2/Makefile
+++ b/graphics/rubygem-gd2/Makefile
@@ -17,9 +17,10 @@ LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
 
 REINPLACE_ARGS=	-i ""
 
+USE_RUBY=	yes
+USE_RUBYGEMS=	yes
+
 post-install:
 	@${REINPLACE_CMD} 's|so.2|so.4|' ${PREFIX}/${GEM_LIB_DIR}/lib/gd2.rb
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/rubygem-gruff/Makefile b/graphics/rubygem-gruff/Makefile
index 67becde4966b..0daf8302bef0 100644
--- a/graphics/rubygem-gruff/Makefile
+++ b/graphics/rubygem-gruff/Makefile
@@ -19,7 +19,6 @@ RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/RMagick.so:${PORTSDIR}/graphics/ruby-rmagick
 		sow:${PORTSDIR}/devel/rubygem-hoe
 
 USE_RUBY=	yes
+USE_RUBYGEMS=	yes
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/rubygem-railroad/Makefile b/graphics/rubygem-railroad/Makefile
index 528c67dd8472..d92bedfc610f 100644
--- a/graphics/rubygem-railroad/Makefile
+++ b/graphics/rubygem-railroad/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@logvinov.com
 COMMENT=	A class diagrams generator for Ruby on Rails applications
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+USE_RUBY=	yes
+USE_RUBYGEMS=	yes
+
+.include <bsd.port.mk>
diff --git a/graphics/rubygem-scruffy/Makefile b/graphics/rubygem-scruffy/Makefile
index d6b2b6a0dc97..42c4fe716d26 100644
--- a/graphics/rubygem-scruffy/Makefile
+++ b/graphics/rubygem-scruffy/Makefile
@@ -17,6 +17,7 @@ COMMENT=	Beautiful Graphs for Ruby
 
 RUN_DEPENDS=	rubygem-builder>=2.0.0:${PORTSDIR}/devel/rubygem-builder
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+USE_RUBY=	yes
+USE_RUBYGEMS=	yes
+
+.include <bsd.port.mk>
diff --git a/graphics/rubygem-turing/Makefile b/graphics/rubygem-turing/Makefile
index f2ddf1eb8f53..68b9d271f3fa 100644
--- a/graphics/rubygem-turing/Makefile
+++ b/graphics/rubygem-turing/Makefile
@@ -16,6 +16,7 @@ COMMENT=	Easy to use and customize/extend implementation of captcha
 BUILD_DEPENDS=	rubygem-gd2>=1.0.0:${PORTSDIR}/graphics/rubygem-gd2
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+USE_RUBY=	yes
+USE_RUBYGEMS=	yes
+
+.include <bsd.port.mk>
diff --git a/japanese/rubygem-jpmobile/Makefile b/japanese/rubygem-jpmobile/Makefile
index f1c80a293137..f5be0c9113c5 100644
--- a/japanese/rubygem-jpmobile/Makefile
+++ b/japanese/rubygem-jpmobile/Makefile
@@ -20,6 +20,7 @@ RUN_DEPENDS=	rubygem-actionpack>=1.12.5:${PORTSDIR}/www/rubygem-actionpack \
 		rubygem-hpricot>=0.4:${PORTSDIR}/www/rubygem-hpricot
 
 USE_RUBY=	yes
+USE_RUBYGEMS=	yes
 
 post-install:
 	@${ECHO} ${GEM_CACHE} > ${TMPPLIST}
@@ -29,6 +30,4 @@ post-install:
 	@${FIND} ${PREFIX}/${GEM_LIB_DIR} -type d -depth | ${SED} -e 's,${PREFIX}/${GEM_LIB_DIR},@dirrm ${GEM_LIB_DIR},' >> ${TMPPLIST}
 	@${FIND} ${PREFIX}/${GEM_DOC_DIR} -type d -depth | ${SED} -e 's,${PREFIX}/${GEM_DOC_DIR},@dirrm ${GEM_DOC_DIR},' >> ${TMPPLIST}
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/lang/Makefile b/lang/Makefile
index cef5a885a02c..49c95f61233c 100644
--- a/lang/Makefile
+++ b/lang/Makefile
@@ -274,6 +274,7 @@
     SUBDIR += ruby-reference
     SUBDIR += ruby-usersguide
     SUBDIR += ruby18
+    SUBDIR += ruby19
     SUBDIR += sather-specification
     SUBDIR += sather-tutorial
     SUBDIR += sbcl
diff --git a/lang/ruby-extensions/Makefile b/lang/ruby-extensions/Makefile
index a3e9b6a93fc0..342b617cdd18 100644
--- a/lang/ruby-extensions/Makefile
+++ b/lang/ruby-extensions/Makefile
@@ -18,20 +18,20 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	boumenot@gmail.com
 COMMENT=	Useful extensions for Ruby's standard classes
 
-.if !defined(NOPORTDOCS)
-BUILD_DEPENDS=	${LOCALBASE}/bin/rake:${PORTSDIR}/devel/rubygem-rake
-.endif
-
 RUBY_SETUP=	install.rb
 USE_RUBY=	yes
 USE_RUBY_SETUP=	yes
 USE_RUBY_RDOC=	yes
 
+.if !defined(NOPORTDOCS)
+USE_RAKE=	yes
+.endif
+
 DOCS_EN=	README README.1st build/rdoc/*
 
 post-build:
 .if !defined(NOPORTDOCS)
-	cd ${WRKSRC} && rake rerdoc
+	cd ${WRKSRC} && ${RAKE_BIN} rerdoc
 .endif
 
 post-install:
diff --git a/lang/ruby19/Makefile b/lang/ruby19/Makefile
new file mode 100644
index 000000000000..f8e9a3686ae8
--- /dev/null
+++ b/lang/ruby19/Makefile
@@ -0,0 +1,287 @@
+# New ports collection makefile for:	ruby18
+# Date created:		6 May 2001
+# Whom:			Akinori MUSHA aka knu <knu@idaemons.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	ruby
+PORTVERSION=	${RUBY_PORTVERSION}
+PORTREVISION=	${RUBY_PORTREVISION}
+PORTEPOCH=	${RUBY_PORTEPOCH}
+CATEGORIES=	lang ruby ipv6
+MASTER_SITES=		${MASTER_SITE_RUBY}
+MASTER_SITE_SUBDIR=	${MASTER_SITE_SUBDIR_RUBY}
+DISTNAME=	${RUBY_DISTNAME}
+DIST_SUBDIR=	ruby
+
+MAINTAINER=	stas@FreeBSD.org
+COMMENT?=	An object-oriented interpreted scripting language
+
+GNU_CONFIGURE=	yes
+WRKSRC=		${RUBY_WRKSRC}
+CONFIGURE_ARGS=	${RUBY_CONFIGURE_ARGS} \
+		--enable-shared \
+		--enable-pthread \
+		--with-openssl-include=${OPENSSLINC}
+USE_OPENSSL=	yes
+USE_LDCONFIG=	yes
+
+WRKSRC=		${WRKDIR}/${PORTNAME}-${RUBY_DISTVERSION}
+
+RUBY_VER=		1.9
+USE_BZIP2=		yes
+USE_RUBY=		yes
+RUBY_NO_BUILD_DEPENDS=	yes
+RUBY_NO_RUN_DEPENDS=	yes
+_RUBY_SYSLIBDIR=	${PREFIX}/lib
+_RUBY_EXTDIR=		${PREFIX}/lib/ruby19
+
+NO_LATEST_LINK=	yes
+
+OPTIONS=	RDOC "Build and install Rdoc indexes" off \
+		DEBUG "Compile-in debug info" off
+
+.include <bsd.port.pre.mk>
+
+# PORTEPOCH/PORTREVISION hack
+
+.if ${PORTEPOCH} != 0
+_SUF2=	,${PORTEPOCH}
+.endif
+
+.if ${PORTREVISION} != 0
+_SUF1=	_${PORTREVISION}
+.endif
+
+PKGNAMESUFFIX=	#empty
+CFLAGS+=	${PTHREAD_CFLAGS}	# Keep this, else ruby will fail to load
+LDFLAGS+=	${PTHREAD_LIBS}		# libraries dependent op libpthread.
+
+.if defined(WITH_DEBUG)
+CFLAGS+=	-g
+STRIP=		# none
+.endif
+
+#
+# Disable doc generation if requested or docs disabled at all
+#
+.if defined(WITH_RDOC) && !defined(NOPORTDOCS)
+CONFIGURE_ARGS+=	--enable-install-doc
+.else
+CONFIGURE_ARGS+=	--disable-install-doc
+.endif
+
+CONFIGURE_ENV=	CFLAGS="${CFLAGS}" \
+		LIBS="${LDFLAGS}"
+
+.if ${RUBY_VER} == ${RUBY_DEFAULT_VER}
+MLINKS=		${RUBY_NAME}.1 ruby.1
+PLIST_SUB+=	IF_DEFAULT=""
+.else
+PLIST_SUB+=	IF_DEFAULT="@comment "
+.endif
+
+INSTALLED_SCRIPTS=	irb erb rdoc ri ruby testrb rake gem
+
+EXTSAMPLES=	bigdecimal/sample/*.rb	\
+		curses/hello.rb		\
+		curses/rain.rb		\
+		curses/view.rb		\
+		curses/view2.rb		\
+		pty/expect_sample.rb	\
+		pty/script.rb		\
+		pty/shl.rb
+
+EXTDOCS=	bigdecimal/bigdecimal_*.html	\
+		etc/etc.txt*			\
+		pty/README*			\
+		readline/README*		\
+		ripper/README			\
+		stringio/README			\
+		syslog/syslog.txt		\
+		zlib/doc/zlib.rd
+
+MAN1=		${RUBY_NAME}.1
+
+# Macros to change variables in rbconfig.rb
+RB_SET_CONF_VAR=${SH} -c '${REINPLACE_CMD} -E -e "s,(CONFIG\[\"$$0\"\][[:space:]]*=[[:space:]]*)(\(?)(.*)(\)?),\1\2$$1\4," ${WRKSRC}/rbconfig.rb' --
+
+post-patch:
+	@${REINPLACE_CMD} -E \
+		-e 's,-l$$pthread_lib,${PTHREAD_LIBS},g' \
+		-e '/^RUBY_LIB_PATH/s,\.\$$\{TEENY\},,' \
+		-e '/^RUBY_SITE_LIB_PATH2/s,\.\$$\{TEENY\},,' \
+		-e '/^RUBY_VENDOR_LIB_PATH2/s,\.\$$\{TEENY\},,' \
+		${WRKSRC}/configure
+
+#
+# Remove modules we don't want
+#
+.for d in win32ole
+	${RM} -rf ${BUILD_WRKSRC}/ext/${d}
+.endfor
+
+#
+# Prepare modules we are wanting to build via external ports
+#
+.for d in gdbm iconv tk
+	${MV} ${BUILD_WRKSRC}/ext/${d} ${WRKDIR}/
+.endfor
+
+post-build:
+#
+# Hack to allow modules to be installed into separate PREFIX and/or under user
+# privilegies
+#
+	@${RB_SET_CONF_VAR} "prefix" "ENV['PREFIX'] || \3"
+	@${RB_SET_CONF_VAR} "INSTALL" "ENV['RB_USER_INSTALL'] ? '/usr/bin/install -c' : '/usr/bin/install -c ${_BINOWNGRP}'"
+	@${RB_SET_CONF_VAR} "INSTALL_PROGRAM" "ENV['RB_USER_INSTALL'] ? '${INSTALL} ${COPY} ${STRIP} -m ${BINMODE}' : '${INSTALL_PROGRAM}'"
+	@${RB_SET_CONF_VAR} "INSTALL_SCRIPT" "ENV['RB_USER_INSTALL'] ? '${INSTALL} ${COPY} -m ${BINMODE}' : '${INSTALL_SCRIPT}'"
+	@${RB_SET_CONF_VAR} "INSTALL_DATA" "ENV['RB_USER_INSTALL'] ? '${INSTALL} ${COPY} -m ${SHAREMODE}' : '${INSTALL_DATA}'"
+
+pre-su-install:
+	${MKDIR}	${RUBY_DOCDIR}		\
+			${RUBY_EXAMPLESDIR}	\
+			${RUBY_RIDIR}		\
+			${RUBY_SITERIDIR}	\
+			${RUBY_SITEARCHLIBDIR}	\
+			${RUBY_VENDORARCHLIBDIR}
+
+	${SETENV} LC_TIME=C /bin/date > ${RUBY_RIDIR}/created.rid
+	${SETENV} LC_TIME=C /bin/date > ${RUBY_SITERIDIR}/created.rid
+	${TOUCH} ${RUBY_EXAMPLESDIR}/.keep_me
+	${TOUCH} ${RUBY_DOCDIR}/.keep_me
+	${TOUCH} ${RUBY_SITEARCHLIBDIR}/.keep_me
+	${TOUCH} ${RUBY_VENDORARCHLIBDIR}/.keep_me
+
+post-install:
+#
+# XXX: hack to strip ruby binary. Ruby uses its own install script that seems
+# bogus to hack.
+#
+.if defined(STRIP) && ${STRIP} == -s
+	${STRIP_CMD} ${PREFIX}/bin/${RUBY_NAME}
+.endif
+
+#
+# Link just installed "ruby" to "ruby18", etc.
+#
+.if ${RUBY_VER} == ${RUBY_DEFAULT_VER}
+. for FILE in ${INSTALLED_SCRIPTS}
+	${LN} -f ${PREFIX}/bin/${FILE}${RUBY_SUFFIX} ${PREFIX}/bin/${FILE}
+. endfor
+.endif
+
+.if !defined(NOPORTDOCS)
+	# Create all dirs required (":u" isn't avaiable in STABLE yet :-()
+	${MKDIR} ${EXTSAMPLES:C,^([^/]+)/.*,\1,:S,^,${RUBY_EXAMPLESDIR}/,}
+	${MKDIR} ${EXTDOCS:C,^([^/]+)/.*,\1,:S,^,${RUBY_DOCDIR}/,}
+.for FILE in ${EXTSAMPLES}
+	${INSTALL_DATA} ${WRKSRC}/ext/${FILE} \
+		${RUBY_EXAMPLESDIR}/${FILE:C,^([^/]+)/.*,\1,}/
+.endfor
+.for FILE in ${EXTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/ext/${FILE} \
+		${RUBY_DOCDIR}/${FILE:C,^([^/]+)/.*,\1,}/
+.endfor
+	@(cd ${WRKSRC}/sample/ && ${COPYTREE_SHARE} \* ${RUBY_EXAMPLESDIR}/)
+	@(cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} \* ${RUBY_DOCDIR}/)
+	${INSTALL_DATA} ${WRKSRC}/COPYING*	\
+			${WRKSRC}/ChangeLog	\
+			${WRKSRC}/LEGAL		\
+			${WRKSRC}/README*	\
+			${RUBY_DOCDIR}/
+.endif
+
+#
+# Add generated RI files to pkg-plist
+#
+	@${FIND} -ds ${RUBY_RIDIR}/ ! -type d ! -name created.rid | \
+		${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
+	@${FIND} -ds ${RUBY_RIDIR}/ -type d -mindepth 1 | \
+		${SED} -E -e 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
+
+	@${ECHO_CMD} "@unexec rmdir %D/${RUBY_SITERIDIR:S,^${PREFIX}/,,} 2>/dev/null || true" >> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec rmdir %D/${RUBY_RIDIR:S,^${PREFIX}/,,} 2>/dev/null || true" >> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec rmdir %D/share/ri/${RUBY_VER} 2>/dev/null || true" >> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec rmdir %D/share/ri 2>/dev/null || true" >> ${TMPPLIST}
+
+	@${CAT} ${PKGMESSAGE}
+
+plist::
+	truncate -s0 pkg-plist
+.for FILE in ${INSTALLED_SCRIPTS}
+	@${ECHO_CMD} "bin/${FILE}%%RUBY_SUFFIX%%" >> pkg-plist
+	@${ECHO_CMD} "%%IF_DEFAULT%%bin/${FILE}" >> pkg-plist
+.endfor
+	@${ECHO_CMD} "lib/lib%%RUBY_NAME%%-static.a" >> pkg-plist
+	@${ECHO_CMD} "lib/lib%%RUBY_NAME%%.so" >> pkg-plist
+	@${ECHO_CMD} "lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%" >> pkg-plist
+
+#
+# Includes
+#
+	@${FIND} -ds ${PREFIX}/include/ruby-${RUBY_VER} ! -type d | \
+		${SED} 's,^${PREFIX},,' >> pkg-plist
+	@${FIND} -ds ${PREFIX}/include/ruby-${RUBY_VER} -type d | \
+		${SED} 's,^${PREFIX},@dirrm ,' >> pkg-plist
+
+#
+# Vendor and site libs
+#
+	@${FIND} -ds ${RUBY_DOCDIR}/ ! -type d ! -name .keep_me | \
+		${SED} 's,^${RUBY_DOCDIR},%%PORTDOCS%%%%RUBY_DOCDIR%%,' \
+		 >> pkg-plist
+	@${FIND} -ds ${RUBY_DOCDIR}/ -type d -mindepth 1 | ${SORT} -r | \
+		${SED} -E -e \
+		's,^${RUBY_DOCDIR}(.*),%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%\1,' \
+		>> pkg-plist
+
+	@${FIND} -ds ${RUBY_EXAMPLESDIR}/ ! -type d ! -name .keep_me | \
+		${SED} 's,^${RUBY_EXAMPLESDIR},%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%,' \
+		 >> pkg-plist
+	@${FIND} -ds ${RUBY_EXAMPLESDIR}/ -type d -mindepth 1 | ${SORT} -r | \
+		${SED} -E -e \
+		's,^${RUBY_EXAMPLESDIR}(.*),%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%\1,' \
+		>> pkg-plist
+
+	@${ECHO_CMD} "%%RUBY_DOCDIR%%/.keep_me" >> pkg-plist
+	@${ECHO_CMD} "@dirrmtry %%RUBY_DOCDIR%%" >> pkg-plist
+
+	@${ECHO_CMD} "%%RUBY_EXAMPLESDIR%%/.keep_me" >> pkg-plist
+	@${ECHO_CMD} "@dirrmtry %%RUBY_EXAMPLESDIR%%" >> pkg-plist
+
+	@${ECHO_CMD} "@exec /bin/mkdir -p %D/%%RUBY_RIDIR%%" >> pkg-plist
+	@${ECHO_CMD} "@exec env LC_TIME=C /bin/date > %D/%%RUBY_RIDIR%%/created.rid" >> pkg-plist
+	@${ECHO_CMD} "@unexec /bin/rm -f %D/%%RUBY_RIDIR%%/created.rid" \
+		>> pkg-plist
+
+	@${ECHO_CMD} "@exec /bin/mkdir -p %D/%%RUBY_SITERIDIR%%" >> pkg-plist
+	@${ECHO_CMD} "@exec env LC_TIME=C /bin/date > %D/%%RUBY_SITERIDIR%%/created.rid"  >> pkg-plist
+	@${ECHO_CMD} "@unexec /bin/rm -f %D/%%RUBY_SITERIDIR%%/created.rid" \
+		>> pkg-plist
+
+	@${FIND} -ds ${RUBY_LIBDIR}/ ! -type d | \
+		${SED} 's,^${RUBY_LIBDIR},%%RUBY_LIBDIR%%,' >> pkg-plist
+	@${FIND} -ds ${RUBY_LIBDIR}/ -type d | ${SORT} -r | \
+		${SED} -E -e 's,^${RUBY_LIBDIR}(.*),@dirrm %%RUBY_LIBDIR%%\1,' >> pkg-plist
+
+	@${ECHO_CMD} "%%RUBY_SITEARCHLIBDIR%%/.keep_me" >> pkg-plist
+	@${ECHO_CMD} "@dirrmtry %%RUBY_SITEARCHLIBDIR%%" >> pkg-plist
+	@${ECHO_CMD} "@dirrmtry %%RUBY_SITELIBDIR%%" >> pkg-plist
+	@${ECHO_CMD} "@dirrmtry lib/ruby/site_ruby" >> pkg-plist
+
+	@${ECHO_CMD} "%%RUBY_VENDORARCHLIBDIR%%/.keep_me" >> pkg-plist
+	@${ECHO_CMD} "@dirrmtry %%RUBY_VENDORARCHLIBDIR%%" >> pkg-plist
+	@${ECHO_CMD} "@dirrmtry %%RUBY_VENDORLIBDIR%%" >> pkg-plist
+	@${ECHO_CMD} "@dirrmtry lib/ruby/vendor_ruby" >> pkg-plist
+
+	@${ECHO_CMD} "@dirrmtry lib/ruby" >> pkg-plist
+
+	@${SED} -i "" -E -e "s,${RUBY_ARCH},%%RUBY_ARCH%%,g" pkg-plist
+
+test:
+	@(cd ${WRKSRC}; ${MAKE} test)
+
+.include <bsd.port.post.mk>
diff --git a/lang/ruby19/distinfo b/lang/ruby19/distinfo
new file mode 100644
index 000000000000..7922e3482f0f
--- /dev/null
+++ b/lang/ruby19/distinfo
@@ -0,0 +1,3 @@
+MD5 (ruby/ruby-1.9.0-0.tar.bz2) = 407cc7d0032e19eb12216c0ebc7f17b3
+SHA256 (ruby/ruby-1.9.0-0.tar.bz2) = 7995fdb2879cbb67b1ae4b5bbdf5460f70221598086f4e48e15fa5f48f2866e3
+SIZE (ruby/ruby-1.9.0-0.tar.bz2) = 4999262
diff --git a/lang/ruby19/files/patch-configure b/lang/ruby19/files/patch-configure
new file mode 100644
index 000000000000..f7d79075f0d5
--- /dev/null
+++ b/lang/ruby19/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	Thu Jan 17 15:14:30 2008
++++ configure	Thu Jan 17 15:15:00 2008
+@@ -18065,7 +18065,7 @@
+ 
+ 
+ if test x"$enable_pthread" = xyes; then
+-    for pthread_lib in thr pthread pthreads c c_r; do
++    for pthread_lib in pthread thr pthreads c c_r; do
+  	as_ac_Lib=`echo "ac_cv_lib_$pthread_lib''_pthread_kill" | $as_tr_sh`
+ { echo "$as_me:$LINENO: checking for pthread_kill in -l$pthread_lib" >&5
+ echo $ECHO_N "checking for pthread_kill in -l$pthread_lib... $ECHO_C" >&6; }
diff --git a/lang/ruby19/files/patch-io.c b/lang/ruby19/files/patch-io.c
new file mode 100644
index 000000000000..8765d8119090
--- /dev/null
+++ b/lang/ruby19/files/patch-io.c
@@ -0,0 +1,20 @@
+--- io.c.orig	2007-12-28 02:17:32.000000000 +0300
++++ io.c	2007-12-28 02:17:58.000000000 +0300
+@@ -5324,7 +5324,7 @@
+ 
+ #if !defined(MSDOS) && !defined(__human68k__)
+ static int
+-io_cntl(int fd, int cmd, long narg, int io_p)
++io_cntl(int fd, unsigned long cmd, long narg, int io_p)
+ {
+     int retval;
+ 
+@@ -5352,7 +5352,7 @@
+ rb_io_ctl(VALUE io, VALUE req, VALUE arg, int io_p)
+ {
+ #if !defined(MSDOS) && !defined(__human68k__)
+-    int cmd = NUM2ULONG(req);
++    unsigned long cmd = NUM2ULONG(req);
+     rb_io_t *fptr;
+     long len = 0;
+     long narg = 0;
diff --git a/lang/ruby19/files/patch-lib_mkmf.rb b/lang/ruby19/files/patch-lib_mkmf.rb
new file mode 100644
index 000000000000..1b9d18fb9aa4
--- /dev/null
+++ b/lang/ruby19/files/patch-lib_mkmf.rb
@@ -0,0 +1,11 @@
+--- lib/mkmf.rb.orig	2008-01-03 21:11:38.000000000 +0300
++++ lib/mkmf.rb	2008-01-03 21:11:55.000000000 +0300
+@@ -148,7 +148,7 @@
+ path = File.expand_path($0)
+ $extmk = path[0, topdir.size+1] == topdir+"/" && %r"\A(ext|enc|tool)\z" =~ File.dirname(path[topdir.size+1..-1])
+ if not $extmk and File.exist?(($hdrdir = RbConfig::CONFIG["rubyhdrdir"]) + "/ruby/ruby.h")
+-  $topdir = $hdrdir
++  $topdir = $hdrdir + "/" + "#{CONFIG['arch']}/ruby/"
+   $top_srcdir = $hdrdir
+   $arch_hdrdir = $hdrdir + "/$(arch)"
+ elsif File.exist?(($hdrdir = ($top_srcdir ||= topdir) + "/include")  + "/ruby.h") and
diff --git a/lang/ruby19/files/patch-mkconfig.rb b/lang/ruby19/files/patch-mkconfig.rb
new file mode 100644
index 000000000000..fade6d89e2ab
--- /dev/null
+++ b/lang/ruby19/files/patch-mkconfig.rb
@@ -0,0 +1,11 @@
+--- mkconfig.rb.orig	2007-12-28 02:40:14.000000000 +0300
++++ mkconfig.rb	2007-12-28 02:40:25.000000000 +0300
+@@ -138,7 +138,7 @@
+ print(*v_fast)
+ print(*v_others)
+ print <<EOS
+-  CONFIG["ruby_version"] = "$(MAJOR).$(MINOR).$(TEENY)"
++  CONFIG["ruby_version"] = "$(MAJOR).$(MINOR)"
+   CONFIG["rubylibdir"] = "$(libdir)/ruby/$(ruby_version)"
+   CONFIG["archdir"] = "$(rubylibdir)/$(arch)"
+   CONFIG["sitelibdir"] = "$(sitedir)/$(ruby_version)"
diff --git a/lang/ruby19/pkg-descr b/lang/ruby19/pkg-descr
new file mode 100644
index 000000000000..f60c69314e2d
--- /dev/null
+++ b/lang/ruby19/pkg-descr
@@ -0,0 +1,20 @@
+Ruby is the interpreted scripting language for quick and
+easy object-oriented programming.  It has many features to
+process text files and to do system management tasks (as in
+Perl).  It is simple, straight-forward, and extensible.
+
+Features of Ruby are shown below.
+
+  + Simple Syntax
+  + *Normal* Object-Oriented features(ex. class, method calls)
+  + *Advanced* Object-Oriented features(ex. Mix-in, Singleton-method)
+  + Operator Overloading
+  + Exception Handling
+  + Iterators and Closures
+  + Garbage Collection
+  + Dynamic Loading of Object files(on some architecture)
+  + Highly Portable(works on many UNIX machines, and on DOS,
+    Windows, Mac, BeOS etc.)
+
+Author:	Matsumoto "matz" Yukihiro <matz@zetabits.com>
+WWW:	http://www.ruby-lang.org/en/
diff --git a/lang/ruby19/pkg-message b/lang/ruby19/pkg-message
new file mode 100644
index 000000000000..2f3db56f2280
--- /dev/null
+++ b/lang/ruby19/pkg-message
@@ -0,0 +1,15 @@
+====
+Note that some of the standard libraries are provided as separate
+ports since they require extra dependencies:
+
+	converters/ruby-iconv	iconv module
+
+	databases/ruby-gdbm:	GDBM module
+
+	x11-toolkits/ruby-tk:	Tcl/Tk modules
+	japanese/ruby-tk:	Tcl/Tk modules for Japanized Tcl/Tk
+
+	lang/ruby-mode.el:	Emacs lisp modules
+
+Install them as occasion demands.
+====
diff --git a/lang/ruby19/pkg-plist b/lang/ruby19/pkg-plist
new file mode 100644
index 000000000000..7be0ba81050f
--- /dev/null
+++ b/lang/ruby19/pkg-plist
@@ -0,0 +1,889 @@
+bin/irb%%RUBY_SUFFIX%%
+%%IF_DEFAULT%%bin/irb
+bin/erb%%RUBY_SUFFIX%%
+%%IF_DEFAULT%%bin/erb
+bin/rdoc%%RUBY_SUFFIX%%
+%%IF_DEFAULT%%bin/rdoc
+bin/ri%%RUBY_SUFFIX%%
+%%IF_DEFAULT%%bin/ri
+bin/ruby%%RUBY_SUFFIX%%
+%%IF_DEFAULT%%bin/ruby
+bin/testrb%%RUBY_SUFFIX%%
+%%IF_DEFAULT%%bin/testrb
+bin/rake%%RUBY_SUFFIX%%
+%%IF_DEFAULT%%bin/rake
+bin/gem%%RUBY_SUFFIX%%
+%%IF_DEFAULT%%bin/gem
+lib/lib%%RUBY_NAME%%-static.a
+lib/lib%%RUBY_NAME%%.so
+lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
+include/ruby-1.9/%%RUBY_ARCH%%/ruby/config.h
+include/ruby-1.9/ruby/defines.h
+include/ruby-1.9/ruby/digest.h
+include/ruby-1.9/ruby/dl.h
+include/ruby-1.9/ruby/encoding.h
+include/ruby-1.9/ruby/intern.h
+include/ruby-1.9/ruby/io.h
+include/ruby-1.9/ruby/missing.h
+include/ruby-1.9/ruby/node.h
+include/ruby-1.9/ruby/oniguruma.h
+include/ruby-1.9/ruby/re.h
+include/ruby-1.9/ruby/regex.h
+include/ruby-1.9/ruby/ruby.h
+include/ruby-1.9/ruby/signal.h
+include/ruby-1.9/ruby/st.h
+include/ruby-1.9/ruby/util.h
+include/ruby-1.9/ruby.h
+include/ruby-1.9/rubyio.h
+include/ruby-1.9/rubysig.h
+@dirrm /include/ruby-1.9/%%RUBY_ARCH%%/ruby
+@dirrm /include/ruby-1.9/%%RUBY_ARCH%%
+@dirrm /include/ruby-1.9/ruby
+@dirrm /include/ruby-1.9
+%%PORTDOCS%%%%RUBY_DOCDIR%%/COPYING
+%%PORTDOCS%%%%RUBY_DOCDIR%%/COPYING.ja
+%%PORTDOCS%%%%RUBY_DOCDIR%%/ChangeLog
+%%PORTDOCS%%%%RUBY_DOCDIR%%/ChangeLog-1.8.0
+%%PORTDOCS%%%%RUBY_DOCDIR%%/ChangeLog-YARV
+%%PORTDOCS%%%%RUBY_DOCDIR%%/LEGAL
+%%PORTDOCS%%%%RUBY_DOCDIR%%/NEWS
+%%PORTDOCS%%%%RUBY_DOCDIR%%/README
+%%PORTDOCS%%%%RUBY_DOCDIR%%/README.EXT
+%%PORTDOCS%%%%RUBY_DOCDIR%%/README.EXT.ja
+%%PORTDOCS%%%%RUBY_DOCDIR%%/README.ja
+%%PORTDOCS%%%%RUBY_DOCDIR%%/bigdecimal/bigdecimal_en.html
+%%PORTDOCS%%%%RUBY_DOCDIR%%/bigdecimal/bigdecimal_ja.html
+%%PORTDOCS%%%%RUBY_DOCDIR%%/etc/etc.txt
+%%PORTDOCS%%%%RUBY_DOCDIR%%/etc/etc.txt.ja
+%%PORTDOCS%%%%RUBY_DOCDIR%%/forwardable.rd
+%%PORTDOCS%%%%RUBY_DOCDIR%%/forwardable.rd.ja
+%%PORTDOCS%%%%RUBY_DOCDIR%%/irb/irb-tools.rd.ja
+%%PORTDOCS%%%%RUBY_DOCDIR%%/irb/irb.rd
+%%PORTDOCS%%%%RUBY_DOCDIR%%/irb/irb.rd.ja
+%%PORTDOCS%%%%RUBY_DOCDIR%%/pty/README
+%%PORTDOCS%%%%RUBY_DOCDIR%%/pty/README.expect
+%%PORTDOCS%%%%RUBY_DOCDIR%%/pty/README.expect.ja
+%%PORTDOCS%%%%RUBY_DOCDIR%%/pty/README.ja
+%%PORTDOCS%%%%RUBY_DOCDIR%%/readline/README
+%%PORTDOCS%%%%RUBY_DOCDIR%%/readline/README.ja
+%%PORTDOCS%%%%RUBY_DOCDIR%%/ripper/README
+%%PORTDOCS%%%%RUBY_DOCDIR%%/shell.rd
+%%PORTDOCS%%%%RUBY_DOCDIR%%/shell.rd.ja
+%%PORTDOCS%%%%RUBY_DOCDIR%%/stringio/README
+%%PORTDOCS%%%%RUBY_DOCDIR%%/syslog/syslog.txt
+%%PORTDOCS%%%%RUBY_DOCDIR%%/zlib/zlib.rd
+%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/zlib
+%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/syslog
+%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/stringio
+%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/ripper
+%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/readline
+%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/pty
+%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/irb
+%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/etc
+%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/bigdecimal
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/README
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/bigdecimal/linear.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/bigdecimal/nlsolve.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/bigdecimal/pi.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/biorhythm.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/cal.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/cbreak.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/clnt.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/curses/hello.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/curses/rain.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/curses/view.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/curses/view2.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/dir.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/drb/README.rd
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/drb/README.rd.ja
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/drb/darray.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/drb/darrayc.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/drb/dbiff.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/drb/dcdbiff.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/drb/dchatc.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/drb/dchats.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/drb/dhasen.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/drb/dhasenc.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/drb/dlogc.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/drb/dlogd.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/drb/dqin.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/drb/dqlib.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/drb/dqout.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/drb/dqueue.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/drb/drbc.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/drb/drbch.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/drb/drbm.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/drb/drbmc.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/drb/drbs-acl.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/drb/drbs.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/drb/drbssl_c.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/drb/drbssl_s.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/drb/extserv_test.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/drb/gw_ct.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/drb/gw_cu.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/drb/gw_s.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/drb/holderc.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/drb/holders.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/drb/http0.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/drb/http0serv.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/drb/name.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/drb/namec.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/drb/old_tuplespace.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/drb/rinda_ts.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/drb/rindac.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/drb/rindas.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/drb/ring_echo.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/drb/ring_inspect.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/drb/ring_place.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/drb/simpletuple.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/drb/speedc.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/drb/speeds.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/dualstack-fetch.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/dualstack-httpd.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/eval.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/export.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/exyacc.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fact.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fib.awk
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fib.pl
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fib.py
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fib.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fib.scm
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/freq.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/from.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fullpath.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/goodfriday.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/less.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/list.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/list2.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/list3.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/logger/app.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/logger/log.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/logger/shifting.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/mine.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/mkproto.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/mpart.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/observ.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/occur.pl
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/occur.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/occur2.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/openssl/c_rehash.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/openssl/cert2text.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/openssl/certstore.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/openssl/cipher.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/openssl/crlstore.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/openssl/echo_cli.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/openssl/echo_svr.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/openssl/gen_csr.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/openssl/smime_read.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/openssl/smime_write.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/openssl/wget.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/optparse/opttest.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/optparse/subcommand.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/philos.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/pi.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/pty/expect_sample.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/pty/script.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/pty/shl.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/rcs.awk
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/rcs.dat
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/rcs.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/ripper/ruby2html.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/ripper/strip-comment.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/rss/blend.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/rss/convert.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/rss/list_description.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/rss/re_read.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/rss/rss_recent.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/sieve.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/svr.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/test.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/testunit/adder.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/testunit/subtracter.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/testunit/tc_adder.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/testunit/tc_subtracter.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/testunit/ts_examples.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/time.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/trojan.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/tsvr.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/uumerge.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/webrick/demo-app.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/webrick/demo-multipart.cgi
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/webrick/demo-servlet.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/webrick/demo-urlencoded.cgi
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/webrick/hello.cgi
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/webrick/hello.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/webrick/httpd.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/webrick/httpproxy.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/webrick/httpsd.rb
+%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/webrick
+%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/testunit
+%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/rss
+%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/ripper
+%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/pty
+%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/optparse
+%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/openssl
+%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/logger
+%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/drb
+%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/curses
+%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/bigdecimal
+%%RUBY_DOCDIR%%/.keep_me
+@dirrmtry %%RUBY_DOCDIR%%
+%%RUBY_EXAMPLESDIR%%/.keep_me
+@dirrmtry %%RUBY_EXAMPLESDIR%%
+@exec /bin/mkdir -p %D/%%RUBY_RIDIR%%
+@exec env LC_TIME=C /bin/date > %D/%%RUBY_RIDIR%%/created.rid
+@unexec /bin/rm -f %D/%%RUBY_RIDIR%%/created.rid
+@exec /bin/mkdir -p %D/%%RUBY_SITERIDIR%%
+@exec env LC_TIME=C /bin/date > %D/%%RUBY_SITERIDIR%%/created.rid
+@unexec /bin/rm -f %D/%%RUBY_SITERIDIR%%/created.rid
+%%RUBY_LIBDIR%%/English.rb
+%%RUBY_LIBDIR%%/abbrev.rb
+%%RUBY_LIBDIR%%/benchmark.rb
+%%RUBY_LIBDIR%%/bigdecimal/jacobian.rb
+%%RUBY_LIBDIR%%/bigdecimal/ludcmp.rb
+%%RUBY_LIBDIR%%/bigdecimal/math.rb
+%%RUBY_LIBDIR%%/bigdecimal/newton.rb
+%%RUBY_LIBDIR%%/bigdecimal/util.rb
+%%RUBY_LIBDIR%%/cgi/session/pstore.rb
+%%RUBY_LIBDIR%%/cgi/session.rb
+%%RUBY_LIBDIR%%/cgi.rb
+%%RUBY_LIBDIR%%/complex.rb
+%%RUBY_LIBDIR%%/csv.rb
+%%RUBY_LIBDIR%%/date/format.rb
+%%RUBY_LIBDIR%%/date.rb
+%%RUBY_LIBDIR%%/debug.rb
+%%RUBY_LIBDIR%%/delegate.rb
+%%RUBY_LIBDIR%%/digest/hmac.rb
+%%RUBY_LIBDIR%%/digest/sha2.rb
+%%RUBY_LIBDIR%%/digest.rb
+%%RUBY_LIBDIR%%/dl/callback.rb
+%%RUBY_LIBDIR%%/dl/cparser.rb
+%%RUBY_LIBDIR%%/dl/func.rb
+%%RUBY_LIBDIR%%/dl/import.rb
+%%RUBY_LIBDIR%%/dl/pack.rb
+%%RUBY_LIBDIR%%/dl/stack.rb
+%%RUBY_LIBDIR%%/dl/struct.rb
+%%RUBY_LIBDIR%%/dl/types.rb
+%%RUBY_LIBDIR%%/dl/value.rb
+%%RUBY_LIBDIR%%/drb/acl.rb
+%%RUBY_LIBDIR%%/drb/drb.rb
+%%RUBY_LIBDIR%%/drb/eq.rb
+%%RUBY_LIBDIR%%/drb/extserv.rb
+%%RUBY_LIBDIR%%/drb/extservm.rb
+%%RUBY_LIBDIR%%/drb/gw.rb
+%%RUBY_LIBDIR%%/drb/invokemethod.rb
+%%RUBY_LIBDIR%%/drb/observer.rb
+%%RUBY_LIBDIR%%/drb/ssl.rb
+%%RUBY_LIBDIR%%/drb/timeridconv.rb
+%%RUBY_LIBDIR%%/drb/unix.rb
+%%RUBY_LIBDIR%%/drb.rb
+%%RUBY_LIBDIR%%/e2mmap.rb
+%%RUBY_LIBDIR%%/erb.rb
+%%RUBY_LIBDIR%%/expect.rb
+%%RUBY_LIBDIR%%/fileutils.rb
+%%RUBY_LIBDIR%%/find.rb
+%%RUBY_LIBDIR%%/forwardable.rb
+%%RUBY_LIBDIR%%/generator.rb
+%%RUBY_LIBDIR%%/getoptlong.rb
+%%RUBY_LIBDIR%%/gserver.rb
+%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/bigdecimal.so
+%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/continuation.so
+%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/curses.so
+%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/dbm.so
+%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/digest/bubblebabble.so
+%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/digest/md5.so
+%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/digest/rmd160.so
+%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/digest/sha1.so
+%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/digest/sha2.so
+%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/digest.so
+%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/dl.so
+%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/enc/iso_8859_1.so
+%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/enc/iso_8859_10.so
+%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/enc/iso_8859_11.so
+%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/enc/iso_8859_13.so
+%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/enc/iso_8859_14.so
+%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/enc/iso_8859_15.so
+%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/enc/iso_8859_16.so
+%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/enc/iso_8859_2.so
+%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/enc/iso_8859_3.so
+%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/enc/iso_8859_4.so
+%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/enc/iso_8859_5.so
+%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/enc/iso_8859_6.so
+%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/enc/iso_8859_7.so
+%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/enc/iso_8859_8.so
+%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/enc/iso_8859_9.so
+%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/enc/trans/japanese.so
+%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/enc/trans/single_byte.so
+%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/enc/us_ascii.so
+%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/etc.so
+%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/fcntl.so
+%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/fiber.so
+%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/io/wait.so
+%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/json/ext/generator.so
+%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/json/ext/parser.so
+%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/nkf.so
+%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/openssl.so
+%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/pty.so
+%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/racc/cparse.so
+%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/rbconfig.rb
+%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/readline.so
+%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/ripper.so
+%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/sdbm.so
+%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/socket.so
+%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/stringio.so
+%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/strscan.so
+%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/syck.so
+%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/syslog.so
+%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/zlib.so
+%%RUBY_LIBDIR%%/io/nonblock.rb
+%%RUBY_LIBDIR%%/ipaddr.rb
+%%RUBY_LIBDIR%%/irb/cmd/chws.rb
+%%RUBY_LIBDIR%%/irb/cmd/fork.rb
+%%RUBY_LIBDIR%%/irb/cmd/help.rb
+%%RUBY_LIBDIR%%/irb/cmd/load.rb
+%%RUBY_LIBDIR%%/irb/cmd/nop.rb
+%%RUBY_LIBDIR%%/irb/cmd/pushws.rb
+%%RUBY_LIBDIR%%/irb/cmd/subirb.rb
+%%RUBY_LIBDIR%%/irb/completion.rb
+%%RUBY_LIBDIR%%/irb/context.rb
+%%RUBY_LIBDIR%%/irb/ext/change-ws.rb
+%%RUBY_LIBDIR%%/irb/ext/history.rb
+%%RUBY_LIBDIR%%/irb/ext/loader.rb
+%%RUBY_LIBDIR%%/irb/ext/math-mode.rb
+%%RUBY_LIBDIR%%/irb/ext/multi-irb.rb
+%%RUBY_LIBDIR%%/irb/ext/save-history.rb
+%%RUBY_LIBDIR%%/irb/ext/tracer.rb
+%%RUBY_LIBDIR%%/irb/ext/use-loader.rb
+%%RUBY_LIBDIR%%/irb/ext/workspaces.rb
+%%RUBY_LIBDIR%%/irb/extend-command.rb
+%%RUBY_LIBDIR%%/irb/frame.rb
+%%RUBY_LIBDIR%%/irb/help.rb
+%%RUBY_LIBDIR%%/irb/init.rb
+%%RUBY_LIBDIR%%/irb/input-method.rb
+%%RUBY_LIBDIR%%/irb/lc/error.rb
+%%RUBY_LIBDIR%%/irb/lc/help-message
+%%RUBY_LIBDIR%%/irb/lc/ja/error.rb
+%%RUBY_LIBDIR%%/irb/lc/ja/help-message
+%%RUBY_LIBDIR%%/irb/locale.rb
+%%RUBY_LIBDIR%%/irb/notifier.rb
+%%RUBY_LIBDIR%%/irb/output-method.rb
+%%RUBY_LIBDIR%%/irb/ruby-lex.rb
+%%RUBY_LIBDIR%%/irb/ruby-token.rb
+%%RUBY_LIBDIR%%/irb/slex.rb
+%%RUBY_LIBDIR%%/irb/version.rb
+%%RUBY_LIBDIR%%/irb/workspace.rb
+%%RUBY_LIBDIR%%/irb/ws-for-case-2.rb
+%%RUBY_LIBDIR%%/irb/xmp.rb
+%%RUBY_LIBDIR%%/irb.rb
+%%RUBY_LIBDIR%%/json/add/core.rb
+%%RUBY_LIBDIR%%/json/add/rails.rb
+%%RUBY_LIBDIR%%/json/common.rb
+%%RUBY_LIBDIR%%/json/editor.rb
+%%RUBY_LIBDIR%%/json/ext.rb
+%%RUBY_LIBDIR%%/json/pure/generator.rb
+%%RUBY_LIBDIR%%/json/pure/parser.rb
+%%RUBY_LIBDIR%%/json/pure.rb
+%%RUBY_LIBDIR%%/json/version.rb
+%%RUBY_LIBDIR%%/json.rb
+%%RUBY_LIBDIR%%/kconv.rb
+%%RUBY_LIBDIR%%/logger.rb
+%%RUBY_LIBDIR%%/mathn.rb
+%%RUBY_LIBDIR%%/matrix.rb
+%%RUBY_LIBDIR%%/mkmf.rb
+%%RUBY_LIBDIR%%/monitor.rb
+%%RUBY_LIBDIR%%/mutex_m.rb
+%%RUBY_LIBDIR%%/net/ftp.rb
+%%RUBY_LIBDIR%%/net/http.rb
+%%RUBY_LIBDIR%%/net/https.rb
+%%RUBY_LIBDIR%%/net/imap.rb
+%%RUBY_LIBDIR%%/net/pop.rb
+%%RUBY_LIBDIR%%/net/protocol.rb
+%%RUBY_LIBDIR%%/net/smtp.rb
+%%RUBY_LIBDIR%%/net/telnet.rb
+%%RUBY_LIBDIR%%/observer.rb
+%%RUBY_LIBDIR%%/open-uri.rb
+%%RUBY_LIBDIR%%/open3.rb
+%%RUBY_LIBDIR%%/openssl/bn.rb
+%%RUBY_LIBDIR%%/openssl/buffering.rb
+%%RUBY_LIBDIR%%/openssl/cipher.rb
+%%RUBY_LIBDIR%%/openssl/digest.rb
+%%RUBY_LIBDIR%%/openssl/ssl.rb
+%%RUBY_LIBDIR%%/openssl/x509.rb
+%%RUBY_LIBDIR%%/openssl.rb
+%%RUBY_LIBDIR%%/optparse/date.rb
+%%RUBY_LIBDIR%%/optparse/shellwords.rb
+%%RUBY_LIBDIR%%/optparse/time.rb
+%%RUBY_LIBDIR%%/optparse/uri.rb
+%%RUBY_LIBDIR%%/optparse/version.rb
+%%RUBY_LIBDIR%%/optparse.rb
+%%RUBY_LIBDIR%%/ostruct.rb
+%%RUBY_LIBDIR%%/pathname.rb
+%%RUBY_LIBDIR%%/pp.rb
+%%RUBY_LIBDIR%%/prettyprint.rb
+%%RUBY_LIBDIR%%/profile.rb
+%%RUBY_LIBDIR%%/profiler.rb
+%%RUBY_LIBDIR%%/pstore.rb
+%%RUBY_LIBDIR%%/racc/parser.rb
+%%RUBY_LIBDIR%%/rake/classic_namespace.rb
+%%RUBY_LIBDIR%%/rake/clean.rb
+%%RUBY_LIBDIR%%/rake/gempackagetask.rb
+%%RUBY_LIBDIR%%/rake/loaders/makefile.rb
+%%RUBY_LIBDIR%%/rake/packagetask.rb
+%%RUBY_LIBDIR%%/rake/rake_test_loader.rb
+%%RUBY_LIBDIR%%/rake/rdoctask.rb
+%%RUBY_LIBDIR%%/rake/ruby182_test_unit_fix.rb
+%%RUBY_LIBDIR%%/rake/runtest.rb
+%%RUBY_LIBDIR%%/rake/tasklib.rb
+%%RUBY_LIBDIR%%/rake/testtask.rb
+%%RUBY_LIBDIR%%/rake.rb
+%%RUBY_LIBDIR%%/rational.rb
+%%RUBY_LIBDIR%%/rbconfig/datadir.rb
+%%RUBY_LIBDIR%%/rdoc/code_objects.rb
+%%RUBY_LIBDIR%%/rdoc/diagram.rb
+%%RUBY_LIBDIR%%/rdoc/dot/dot.rb
+%%RUBY_LIBDIR%%/rdoc/generators/chm_generator.rb
+%%RUBY_LIBDIR%%/rdoc/generators/html_generator.rb
+%%RUBY_LIBDIR%%/rdoc/generators/ri_generator.rb
+%%RUBY_LIBDIR%%/rdoc/generators/template/chm/chm.rb
+%%RUBY_LIBDIR%%/rdoc/generators/template/html/hefss.rb
+%%RUBY_LIBDIR%%/rdoc/generators/template/html/html.rb
+%%RUBY_LIBDIR%%/rdoc/generators/template/html/kilmer.rb
+%%RUBY_LIBDIR%%/rdoc/generators/template/html/old_html.rb
+%%RUBY_LIBDIR%%/rdoc/generators/template/html/one_page_html.rb
+%%RUBY_LIBDIR%%/rdoc/generators/template/xml/rdf.rb
+%%RUBY_LIBDIR%%/rdoc/generators/template/xml/xml.rb
+%%RUBY_LIBDIR%%/rdoc/generators/xml_generator.rb
+%%RUBY_LIBDIR%%/rdoc/markup/sample/rdoc2latex.rb
+%%RUBY_LIBDIR%%/rdoc/markup/sample/sample.rb
+%%RUBY_LIBDIR%%/rdoc/markup/simple_markup/fragments.rb
+%%RUBY_LIBDIR%%/rdoc/markup/simple_markup/inline.rb
+%%RUBY_LIBDIR%%/rdoc/markup/simple_markup/lines.rb
+%%RUBY_LIBDIR%%/rdoc/markup/simple_markup/preprocess.rb
+%%RUBY_LIBDIR%%/rdoc/markup/simple_markup/to_flow.rb
+%%RUBY_LIBDIR%%/rdoc/markup/simple_markup/to_html.rb
+%%RUBY_LIBDIR%%/rdoc/markup/simple_markup/to_latex.rb
+%%RUBY_LIBDIR%%/rdoc/markup/simple_markup.rb
+%%RUBY_LIBDIR%%/rdoc/markup/test/AllTests.rb
+%%RUBY_LIBDIR%%/rdoc/markup/test/TestInline.rb
+%%RUBY_LIBDIR%%/rdoc/markup/test/TestParse.rb
+%%RUBY_LIBDIR%%/rdoc/options.rb
+%%RUBY_LIBDIR%%/rdoc/parsers/parse_c.rb
+%%RUBY_LIBDIR%%/rdoc/parsers/parse_f95.rb
+%%RUBY_LIBDIR%%/rdoc/parsers/parse_rb.rb
+%%RUBY_LIBDIR%%/rdoc/parsers/parse_simple.rb
+%%RUBY_LIBDIR%%/rdoc/parsers/parserfactory.rb
+%%RUBY_LIBDIR%%/rdoc/rdoc.rb
+%%RUBY_LIBDIR%%/rdoc/ri/ri_cache.rb
+%%RUBY_LIBDIR%%/rdoc/ri/ri_descriptions.rb
+%%RUBY_LIBDIR%%/rdoc/ri/ri_display.rb
+%%RUBY_LIBDIR%%/rdoc/ri/ri_driver.rb
+%%RUBY_LIBDIR%%/rdoc/ri/ri_formatter.rb
+%%RUBY_LIBDIR%%/rdoc/ri/ri_options.rb
+%%RUBY_LIBDIR%%/rdoc/ri/ri_paths.rb
+%%RUBY_LIBDIR%%/rdoc/ri/ri_reader.rb
+%%RUBY_LIBDIR%%/rdoc/ri/ri_util.rb
+%%RUBY_LIBDIR%%/rdoc/ri/ri_writer.rb
+%%RUBY_LIBDIR%%/rdoc/template.rb
+%%RUBY_LIBDIR%%/rdoc/tokenstream.rb
+%%RUBY_LIBDIR%%/rdoc/usage.rb
+%%RUBY_LIBDIR%%/resolv-replace.rb
+%%RUBY_LIBDIR%%/resolv.rb
+%%RUBY_LIBDIR%%/rexml/attlistdecl.rb
+%%RUBY_LIBDIR%%/rexml/attribute.rb
+%%RUBY_LIBDIR%%/rexml/cdata.rb
+%%RUBY_LIBDIR%%/rexml/child.rb
+%%RUBY_LIBDIR%%/rexml/comment.rb
+%%RUBY_LIBDIR%%/rexml/doctype.rb
+%%RUBY_LIBDIR%%/rexml/document.rb
+%%RUBY_LIBDIR%%/rexml/dtd/attlistdecl.rb
+%%RUBY_LIBDIR%%/rexml/dtd/dtd.rb
+%%RUBY_LIBDIR%%/rexml/dtd/elementdecl.rb
+%%RUBY_LIBDIR%%/rexml/dtd/entitydecl.rb
+%%RUBY_LIBDIR%%/rexml/dtd/notationdecl.rb
+%%RUBY_LIBDIR%%/rexml/element.rb
+%%RUBY_LIBDIR%%/rexml/encoding.rb
+%%RUBY_LIBDIR%%/rexml/encodings/CP-1252.rb
+%%RUBY_LIBDIR%%/rexml/encodings/EUC-JP.rb
+%%RUBY_LIBDIR%%/rexml/encodings/ICONV.rb
+%%RUBY_LIBDIR%%/rexml/encodings/ISO-8859-1.rb
+%%RUBY_LIBDIR%%/rexml/encodings/ISO-8859-15.rb
+%%RUBY_LIBDIR%%/rexml/encodings/SHIFT-JIS.rb
+%%RUBY_LIBDIR%%/rexml/encodings/SHIFT_JIS.rb
+%%RUBY_LIBDIR%%/rexml/encodings/UNILE.rb
+%%RUBY_LIBDIR%%/rexml/encodings/US-ASCII.rb
+%%RUBY_LIBDIR%%/rexml/encodings/UTF-16.rb
+%%RUBY_LIBDIR%%/rexml/encodings/UTF-8.rb
+%%RUBY_LIBDIR%%/rexml/entity.rb
+%%RUBY_LIBDIR%%/rexml/formatters/default.rb
+%%RUBY_LIBDIR%%/rexml/formatters/pretty.rb
+%%RUBY_LIBDIR%%/rexml/formatters/transitive.rb
+%%RUBY_LIBDIR%%/rexml/functions.rb
+%%RUBY_LIBDIR%%/rexml/instruction.rb
+%%RUBY_LIBDIR%%/rexml/light/node.rb
+%%RUBY_LIBDIR%%/rexml/namespace.rb
+%%RUBY_LIBDIR%%/rexml/node.rb
+%%RUBY_LIBDIR%%/rexml/output.rb
+%%RUBY_LIBDIR%%/rexml/parent.rb
+%%RUBY_LIBDIR%%/rexml/parseexception.rb
+%%RUBY_LIBDIR%%/rexml/parsers/baseparser.rb
+%%RUBY_LIBDIR%%/rexml/parsers/lightparser.rb
+%%RUBY_LIBDIR%%/rexml/parsers/pullparser.rb
+%%RUBY_LIBDIR%%/rexml/parsers/sax2parser.rb
+%%RUBY_LIBDIR%%/rexml/parsers/streamparser.rb
+%%RUBY_LIBDIR%%/rexml/parsers/treeparser.rb
+%%RUBY_LIBDIR%%/rexml/parsers/ultralightparser.rb
+%%RUBY_LIBDIR%%/rexml/parsers/xpathparser.rb
+%%RUBY_LIBDIR%%/rexml/quickpath.rb
+%%RUBY_LIBDIR%%/rexml/rexml.rb
+%%RUBY_LIBDIR%%/rexml/sax2listener.rb
+%%RUBY_LIBDIR%%/rexml/source.rb
+%%RUBY_LIBDIR%%/rexml/streamlistener.rb
+%%RUBY_LIBDIR%%/rexml/syncenumerator.rb
+%%RUBY_LIBDIR%%/rexml/text.rb
+%%RUBY_LIBDIR%%/rexml/undefinednamespaceexception.rb
+%%RUBY_LIBDIR%%/rexml/validation/relaxng.rb
+%%RUBY_LIBDIR%%/rexml/validation/validation.rb
+%%RUBY_LIBDIR%%/rexml/validation/validationexception.rb
+%%RUBY_LIBDIR%%/rexml/xmldecl.rb
+%%RUBY_LIBDIR%%/rexml/xmltokens.rb
+%%RUBY_LIBDIR%%/rexml/xpath.rb
+%%RUBY_LIBDIR%%/rexml/xpath_parser.rb
+%%RUBY_LIBDIR%%/rinda/rinda.rb
+%%RUBY_LIBDIR%%/rinda/ring.rb
+%%RUBY_LIBDIR%%/rinda/tuplespace.rb
+%%RUBY_LIBDIR%%/ripper/core.rb
+%%RUBY_LIBDIR%%/ripper/filter.rb
+%%RUBY_LIBDIR%%/ripper/lexer.rb
+%%RUBY_LIBDIR%%/ripper/sexp.rb
+%%RUBY_LIBDIR%%/ripper.rb
+%%RUBY_LIBDIR%%/rss/0.9.rb
+%%RUBY_LIBDIR%%/rss/1.0.rb
+%%RUBY_LIBDIR%%/rss/2.0.rb
+%%RUBY_LIBDIR%%/rss/atom.rb
+%%RUBY_LIBDIR%%/rss/content/1.0.rb
+%%RUBY_LIBDIR%%/rss/content/2.0.rb
+%%RUBY_LIBDIR%%/rss/content.rb
+%%RUBY_LIBDIR%%/rss/converter.rb
+%%RUBY_LIBDIR%%/rss/dublincore/1.0.rb
+%%RUBY_LIBDIR%%/rss/dublincore/2.0.rb
+%%RUBY_LIBDIR%%/rss/dublincore/atom.rb
+%%RUBY_LIBDIR%%/rss/dublincore.rb
+%%RUBY_LIBDIR%%/rss/image.rb
+%%RUBY_LIBDIR%%/rss/itunes.rb
+%%RUBY_LIBDIR%%/rss/maker/0.9.rb
+%%RUBY_LIBDIR%%/rss/maker/1.0.rb
+%%RUBY_LIBDIR%%/rss/maker/2.0.rb
+%%RUBY_LIBDIR%%/rss/maker/atom.rb
+%%RUBY_LIBDIR%%/rss/maker/base.rb
+%%RUBY_LIBDIR%%/rss/maker/content.rb
+%%RUBY_LIBDIR%%/rss/maker/dublincore.rb
+%%RUBY_LIBDIR%%/rss/maker/entry.rb
+%%RUBY_LIBDIR%%/rss/maker/feed.rb
+%%RUBY_LIBDIR%%/rss/maker/image.rb
+%%RUBY_LIBDIR%%/rss/maker/itunes.rb
+%%RUBY_LIBDIR%%/rss/maker/slash.rb
+%%RUBY_LIBDIR%%/rss/maker/syndication.rb
+%%RUBY_LIBDIR%%/rss/maker/taxonomy.rb
+%%RUBY_LIBDIR%%/rss/maker/trackback.rb
+%%RUBY_LIBDIR%%/rss/maker.rb
+%%RUBY_LIBDIR%%/rss/parser.rb
+%%RUBY_LIBDIR%%/rss/rexmlparser.rb
+%%RUBY_LIBDIR%%/rss/rss.rb
+%%RUBY_LIBDIR%%/rss/slash.rb
+%%RUBY_LIBDIR%%/rss/syndication.rb
+%%RUBY_LIBDIR%%/rss/taxonomy.rb
+%%RUBY_LIBDIR%%/rss/trackback.rb
+%%RUBY_LIBDIR%%/rss/utils.rb
+%%RUBY_LIBDIR%%/rss/xml-stylesheet.rb
+%%RUBY_LIBDIR%%/rss/xml.rb
+%%RUBY_LIBDIR%%/rss/xmlparser.rb
+%%RUBY_LIBDIR%%/rss/xmlscanner.rb
+%%RUBY_LIBDIR%%/rss.rb
+%%RUBY_LIBDIR%%/rubygems/builder.rb
+%%RUBY_LIBDIR%%/rubygems/command.rb
+%%RUBY_LIBDIR%%/rubygems/command_manager.rb
+%%RUBY_LIBDIR%%/rubygems/commands/build_command.rb
+%%RUBY_LIBDIR%%/rubygems/commands/cert_command.rb
+%%RUBY_LIBDIR%%/rubygems/commands/check_command.rb
+%%RUBY_LIBDIR%%/rubygems/commands/cleanup_command.rb
+%%RUBY_LIBDIR%%/rubygems/commands/contents_command.rb
+%%RUBY_LIBDIR%%/rubygems/commands/dependency_command.rb
+%%RUBY_LIBDIR%%/rubygems/commands/environment_command.rb
+%%RUBY_LIBDIR%%/rubygems/commands/fetch_command.rb
+%%RUBY_LIBDIR%%/rubygems/commands/generate_index_command.rb
+%%RUBY_LIBDIR%%/rubygems/commands/help_command.rb
+%%RUBY_LIBDIR%%/rubygems/commands/install_command.rb
+%%RUBY_LIBDIR%%/rubygems/commands/list_command.rb
+%%RUBY_LIBDIR%%/rubygems/commands/lock_command.rb
+%%RUBY_LIBDIR%%/rubygems/commands/mirror_command.rb
+%%RUBY_LIBDIR%%/rubygems/commands/outdated_command.rb
+%%RUBY_LIBDIR%%/rubygems/commands/pristine_command.rb
+%%RUBY_LIBDIR%%/rubygems/commands/query_command.rb
+%%RUBY_LIBDIR%%/rubygems/commands/rdoc_command.rb
+%%RUBY_LIBDIR%%/rubygems/commands/search_command.rb
+%%RUBY_LIBDIR%%/rubygems/commands/server_command.rb
+%%RUBY_LIBDIR%%/rubygems/commands/sources_command.rb
+%%RUBY_LIBDIR%%/rubygems/commands/specification_command.rb
+%%RUBY_LIBDIR%%/rubygems/commands/uninstall_command.rb
+%%RUBY_LIBDIR%%/rubygems/commands/unpack_command.rb
+%%RUBY_LIBDIR%%/rubygems/commands/update_command.rb
+%%RUBY_LIBDIR%%/rubygems/commands/which_command.rb
+%%RUBY_LIBDIR%%/rubygems/config_file.rb
+%%RUBY_LIBDIR%%/rubygems/custom_require.rb
+%%RUBY_LIBDIR%%/rubygems/defaults.rb
+%%RUBY_LIBDIR%%/rubygems/dependency.rb
+%%RUBY_LIBDIR%%/rubygems/dependency_installer.rb
+%%RUBY_LIBDIR%%/rubygems/dependency_list.rb
+%%RUBY_LIBDIR%%/rubygems/digest/digest_adapter.rb
+%%RUBY_LIBDIR%%/rubygems/digest/md5.rb
+%%RUBY_LIBDIR%%/rubygems/digest/sha1.rb
+%%RUBY_LIBDIR%%/rubygems/digest/sha2.rb
+%%RUBY_LIBDIR%%/rubygems/doc_manager.rb
+%%RUBY_LIBDIR%%/rubygems/exceptions.rb
+%%RUBY_LIBDIR%%/rubygems/ext/builder.rb
+%%RUBY_LIBDIR%%/rubygems/ext/configure_builder.rb
+%%RUBY_LIBDIR%%/rubygems/ext/ext_conf_builder.rb
+%%RUBY_LIBDIR%%/rubygems/ext/rake_builder.rb
+%%RUBY_LIBDIR%%/rubygems/ext.rb
+%%RUBY_LIBDIR%%/rubygems/format.rb
+%%RUBY_LIBDIR%%/rubygems/gem_open_uri.rb
+%%RUBY_LIBDIR%%/rubygems/gem_openssl.rb
+%%RUBY_LIBDIR%%/rubygems/gem_path_searcher.rb
+%%RUBY_LIBDIR%%/rubygems/gem_runner.rb
+%%RUBY_LIBDIR%%/rubygems/indexer/abstract_index_builder.rb
+%%RUBY_LIBDIR%%/rubygems/indexer/marshal_index_builder.rb
+%%RUBY_LIBDIR%%/rubygems/indexer/master_index_builder.rb
+%%RUBY_LIBDIR%%/rubygems/indexer/quick_index_builder.rb
+%%RUBY_LIBDIR%%/rubygems/indexer.rb
+%%RUBY_LIBDIR%%/rubygems/install_update_options.rb
+%%RUBY_LIBDIR%%/rubygems/installer.rb
+%%RUBY_LIBDIR%%/rubygems/local_remote_options.rb
+%%RUBY_LIBDIR%%/rubygems/old_format.rb
+%%RUBY_LIBDIR%%/rubygems/open-uri.rb
+%%RUBY_LIBDIR%%/rubygems/package.rb
+%%RUBY_LIBDIR%%/rubygems/platform.rb
+%%RUBY_LIBDIR%%/rubygems/remote_fetcher.rb
+%%RUBY_LIBDIR%%/rubygems/require_paths_builder.rb
+%%RUBY_LIBDIR%%/rubygems/requirement.rb
+%%RUBY_LIBDIR%%/rubygems/rubygems_version.rb
+%%RUBY_LIBDIR%%/rubygems/security.rb
+%%RUBY_LIBDIR%%/rubygems/server.rb
+%%RUBY_LIBDIR%%/rubygems/source_index.rb
+%%RUBY_LIBDIR%%/rubygems/source_info_cache.rb
+%%RUBY_LIBDIR%%/rubygems/source_info_cache_entry.rb
+%%RUBY_LIBDIR%%/rubygems/specification.rb
+%%RUBY_LIBDIR%%/rubygems/timer.rb
+%%RUBY_LIBDIR%%/rubygems/uninstaller.rb
+%%RUBY_LIBDIR%%/rubygems/user_interaction.rb
+%%RUBY_LIBDIR%%/rubygems/validator.rb
+%%RUBY_LIBDIR%%/rubygems/version.rb
+%%RUBY_LIBDIR%%/rubygems/version_option.rb
+%%RUBY_LIBDIR%%/rubygems.rb
+%%RUBY_LIBDIR%%/scanf.rb
+%%RUBY_LIBDIR%%/securerandom.rb
+%%RUBY_LIBDIR%%/set.rb
+%%RUBY_LIBDIR%%/shell/builtin-command.rb
+%%RUBY_LIBDIR%%/shell/command-processor.rb
+%%RUBY_LIBDIR%%/shell/error.rb
+%%RUBY_LIBDIR%%/shell/filter.rb
+%%RUBY_LIBDIR%%/shell/process-controller.rb
+%%RUBY_LIBDIR%%/shell/system-command.rb
+%%RUBY_LIBDIR%%/shell/version.rb
+%%RUBY_LIBDIR%%/shell.rb
+%%RUBY_LIBDIR%%/shellwords.rb
+%%RUBY_LIBDIR%%/singleton.rb
+%%RUBY_LIBDIR%%/sync.rb
+%%RUBY_LIBDIR%%/tempfile.rb
+%%RUBY_LIBDIR%%/test/unit/assertionfailederror.rb
+%%RUBY_LIBDIR%%/test/unit/assertions.rb
+%%RUBY_LIBDIR%%/test/unit/autorunner.rb
+%%RUBY_LIBDIR%%/test/unit/collector/dir.rb
+%%RUBY_LIBDIR%%/test/unit/collector/objectspace.rb
+%%RUBY_LIBDIR%%/test/unit/collector.rb
+%%RUBY_LIBDIR%%/test/unit/error.rb
+%%RUBY_LIBDIR%%/test/unit/failure.rb
+%%RUBY_LIBDIR%%/test/unit/testcase.rb
+%%RUBY_LIBDIR%%/test/unit/testresult.rb
+%%RUBY_LIBDIR%%/test/unit/testsuite.rb
+%%RUBY_LIBDIR%%/test/unit/ui/console/testrunner.rb
+%%RUBY_LIBDIR%%/test/unit/ui/fox/testrunner.rb
+%%RUBY_LIBDIR%%/test/unit/ui/gtk/testrunner.rb
+%%RUBY_LIBDIR%%/test/unit/ui/gtk2/testrunner.rb
+%%RUBY_LIBDIR%%/test/unit/ui/testrunnermediator.rb
+%%RUBY_LIBDIR%%/test/unit/ui/testrunnerutilities.rb
+%%RUBY_LIBDIR%%/test/unit/ui/tk/testrunner.rb
+%%RUBY_LIBDIR%%/test/unit/util/backtracefilter.rb
+%%RUBY_LIBDIR%%/test/unit/util/observable.rb
+%%RUBY_LIBDIR%%/test/unit/util/procwrapper.rb
+%%RUBY_LIBDIR%%/test/unit.rb
+%%RUBY_LIBDIR%%/thread.rb
+%%RUBY_LIBDIR%%/thwait.rb
+%%RUBY_LIBDIR%%/time.rb
+%%RUBY_LIBDIR%%/timeout.rb
+%%RUBY_LIBDIR%%/tmpdir.rb
+%%RUBY_LIBDIR%%/tracer.rb
+%%RUBY_LIBDIR%%/tsort.rb
+%%RUBY_LIBDIR%%/ubygems.rb
+%%RUBY_LIBDIR%%/un.rb
+%%RUBY_LIBDIR%%/uri/common.rb
+%%RUBY_LIBDIR%%/uri/ftp.rb
+%%RUBY_LIBDIR%%/uri/generic.rb
+%%RUBY_LIBDIR%%/uri/http.rb
+%%RUBY_LIBDIR%%/uri/https.rb
+%%RUBY_LIBDIR%%/uri/ldap.rb
+%%RUBY_LIBDIR%%/uri/ldaps.rb
+%%RUBY_LIBDIR%%/uri/mailto.rb
+%%RUBY_LIBDIR%%/uri.rb
+%%RUBY_LIBDIR%%/weakref.rb
+%%RUBY_LIBDIR%%/webrick/accesslog.rb
+%%RUBY_LIBDIR%%/webrick/cgi.rb
+%%RUBY_LIBDIR%%/webrick/compat.rb
+%%RUBY_LIBDIR%%/webrick/config.rb
+%%RUBY_LIBDIR%%/webrick/cookie.rb
+%%RUBY_LIBDIR%%/webrick/htmlutils.rb
+%%RUBY_LIBDIR%%/webrick/httpauth/authenticator.rb
+%%RUBY_LIBDIR%%/webrick/httpauth/basicauth.rb
+%%RUBY_LIBDIR%%/webrick/httpauth/digestauth.rb
+%%RUBY_LIBDIR%%/webrick/httpauth/htdigest.rb
+%%RUBY_LIBDIR%%/webrick/httpauth/htgroup.rb
+%%RUBY_LIBDIR%%/webrick/httpauth/htpasswd.rb
+%%RUBY_LIBDIR%%/webrick/httpauth/userdb.rb
+%%RUBY_LIBDIR%%/webrick/httpauth.rb
+%%RUBY_LIBDIR%%/webrick/httpproxy.rb
+%%RUBY_LIBDIR%%/webrick/httprequest.rb
+%%RUBY_LIBDIR%%/webrick/httpresponse.rb
+%%RUBY_LIBDIR%%/webrick/https.rb
+%%RUBY_LIBDIR%%/webrick/httpserver.rb
+%%RUBY_LIBDIR%%/webrick/httpservlet/abstract.rb
+%%RUBY_LIBDIR%%/webrick/httpservlet/cgi_runner.rb
+%%RUBY_LIBDIR%%/webrick/httpservlet/cgihandler.rb
+%%RUBY_LIBDIR%%/webrick/httpservlet/erbhandler.rb
+%%RUBY_LIBDIR%%/webrick/httpservlet/filehandler.rb
+%%RUBY_LIBDIR%%/webrick/httpservlet/prochandler.rb
+%%RUBY_LIBDIR%%/webrick/httpservlet.rb
+%%RUBY_LIBDIR%%/webrick/httpstatus.rb
+%%RUBY_LIBDIR%%/webrick/httputils.rb
+%%RUBY_LIBDIR%%/webrick/httpversion.rb
+%%RUBY_LIBDIR%%/webrick/log.rb
+%%RUBY_LIBDIR%%/webrick/server.rb
+%%RUBY_LIBDIR%%/webrick/ssl.rb
+%%RUBY_LIBDIR%%/webrick/utils.rb
+%%RUBY_LIBDIR%%/webrick/version.rb
+%%RUBY_LIBDIR%%/webrick.rb
+%%RUBY_LIBDIR%%/xmlrpc/base64.rb
+%%RUBY_LIBDIR%%/xmlrpc/client.rb
+%%RUBY_LIBDIR%%/xmlrpc/config.rb
+%%RUBY_LIBDIR%%/xmlrpc/create.rb
+%%RUBY_LIBDIR%%/xmlrpc/datetime.rb
+%%RUBY_LIBDIR%%/xmlrpc/httpserver.rb
+%%RUBY_LIBDIR%%/xmlrpc/marshal.rb
+%%RUBY_LIBDIR%%/xmlrpc/parser.rb
+%%RUBY_LIBDIR%%/xmlrpc/server.rb
+%%RUBY_LIBDIR%%/xmlrpc/utils.rb
+%%RUBY_LIBDIR%%/yaml/baseemitter.rb
+%%RUBY_LIBDIR%%/yaml/basenode.rb
+%%RUBY_LIBDIR%%/yaml/constants.rb
+%%RUBY_LIBDIR%%/yaml/dbm.rb
+%%RUBY_LIBDIR%%/yaml/encoding.rb
+%%RUBY_LIBDIR%%/yaml/error.rb
+%%RUBY_LIBDIR%%/yaml/loader.rb
+%%RUBY_LIBDIR%%/yaml/rubytypes.rb
+%%RUBY_LIBDIR%%/yaml/store.rb
+%%RUBY_LIBDIR%%/yaml/stream.rb
+%%RUBY_LIBDIR%%/yaml/stringio.rb
+%%RUBY_LIBDIR%%/yaml/syck.rb
+%%RUBY_LIBDIR%%/yaml/tag.rb
+%%RUBY_LIBDIR%%/yaml/types.rb
+%%RUBY_LIBDIR%%/yaml/yamlnode.rb
+%%RUBY_LIBDIR%%/yaml/ypath.rb
+%%RUBY_LIBDIR%%/yaml.rb
+@dirrm %%RUBY_LIBDIR%%/yaml
+@dirrm %%RUBY_LIBDIR%%/xmlrpc
+@dirrm %%RUBY_LIBDIR%%/webrick/httpservlet
+@dirrm %%RUBY_LIBDIR%%/webrick/httpauth
+@dirrm %%RUBY_LIBDIR%%/webrick
+@dirrm %%RUBY_LIBDIR%%/uri
+@dirrm %%RUBY_LIBDIR%%/test/unit/util
+@dirrm %%RUBY_LIBDIR%%/test/unit/ui/tk
+@dirrm %%RUBY_LIBDIR%%/test/unit/ui/gtk2
+@dirrm %%RUBY_LIBDIR%%/test/unit/ui/gtk
+@dirrm %%RUBY_LIBDIR%%/test/unit/ui/fox
+@dirrm %%RUBY_LIBDIR%%/test/unit/ui/console
+@dirrm %%RUBY_LIBDIR%%/test/unit/ui
+@dirrm %%RUBY_LIBDIR%%/test/unit/collector
+@dirrm %%RUBY_LIBDIR%%/test/unit
+@dirrm %%RUBY_LIBDIR%%/test
+@dirrm %%RUBY_LIBDIR%%/shell
+@dirrm %%RUBY_LIBDIR%%/rubygems/indexer
+@dirrm %%RUBY_LIBDIR%%/rubygems/ext
+@dirrm %%RUBY_LIBDIR%%/rubygems/digest
+@dirrm %%RUBY_LIBDIR%%/rubygems/commands
+@dirrm %%RUBY_LIBDIR%%/rubygems
+@dirrm %%RUBY_LIBDIR%%/rss/maker
+@dirrm %%RUBY_LIBDIR%%/rss/dublincore
+@dirrm %%RUBY_LIBDIR%%/rss/content
+@dirrm %%RUBY_LIBDIR%%/rss
+@dirrm %%RUBY_LIBDIR%%/ripper
+@dirrm %%RUBY_LIBDIR%%/rinda
+@dirrm %%RUBY_LIBDIR%%/rexml/validation
+@dirrm %%RUBY_LIBDIR%%/rexml/parsers
+@dirrm %%RUBY_LIBDIR%%/rexml/light
+@dirrm %%RUBY_LIBDIR%%/rexml/formatters
+@dirrm %%RUBY_LIBDIR%%/rexml/encodings
+@dirrm %%RUBY_LIBDIR%%/rexml/dtd
+@dirrm %%RUBY_LIBDIR%%/rexml
+@dirrm %%RUBY_LIBDIR%%/rdoc/ri
+@dirrm %%RUBY_LIBDIR%%/rdoc/parsers
+@dirrm %%RUBY_LIBDIR%%/rdoc/markup/test
+@dirrm %%RUBY_LIBDIR%%/rdoc/markup/simple_markup
+@dirrm %%RUBY_LIBDIR%%/rdoc/markup/sample
+@dirrm %%RUBY_LIBDIR%%/rdoc/markup
+@dirrm %%RUBY_LIBDIR%%/rdoc/generators/template/xml
+@dirrm %%RUBY_LIBDIR%%/rdoc/generators/template/html
+@dirrm %%RUBY_LIBDIR%%/rdoc/generators/template/chm
+@dirrm %%RUBY_LIBDIR%%/rdoc/generators/template
+@dirrm %%RUBY_LIBDIR%%/rdoc/generators
+@dirrm %%RUBY_LIBDIR%%/rdoc/dot
+@dirrm %%RUBY_LIBDIR%%/rdoc
+@dirrm %%RUBY_LIBDIR%%/rbconfig
+@dirrm %%RUBY_LIBDIR%%/rake/loaders
+@dirrm %%RUBY_LIBDIR%%/rake
+@dirrm %%RUBY_LIBDIR%%/racc
+@dirrm %%RUBY_LIBDIR%%/optparse
+@dirrm %%RUBY_LIBDIR%%/openssl
+@dirrm %%RUBY_LIBDIR%%/net
+@dirrm %%RUBY_LIBDIR%%/json/pure
+@dirrm %%RUBY_LIBDIR%%/json/add
+@dirrm %%RUBY_LIBDIR%%/json
+@dirrm %%RUBY_LIBDIR%%/irb/lc/ja
+@dirrm %%RUBY_LIBDIR%%/irb/lc
+@dirrm %%RUBY_LIBDIR%%/irb/ext
+@dirrm %%RUBY_LIBDIR%%/irb/cmd
+@dirrm %%RUBY_LIBDIR%%/irb
+@dirrm %%RUBY_LIBDIR%%/io
+@dirrm %%RUBY_LIBDIR%%/%%RUBY_ARCH%%/racc
+@dirrm %%RUBY_LIBDIR%%/%%RUBY_ARCH%%/json/ext
+@dirrm %%RUBY_LIBDIR%%/%%RUBY_ARCH%%/json
+@dirrm %%RUBY_LIBDIR%%/%%RUBY_ARCH%%/io
+@dirrm %%RUBY_LIBDIR%%/%%RUBY_ARCH%%/enc/trans
+@dirrm %%RUBY_LIBDIR%%/%%RUBY_ARCH%%/enc
+@dirrm %%RUBY_LIBDIR%%/%%RUBY_ARCH%%/digest
+@dirrm %%RUBY_LIBDIR%%/%%RUBY_ARCH%%
+@dirrm %%RUBY_LIBDIR%%/drb
+@dirrm %%RUBY_LIBDIR%%/dl
+@dirrm %%RUBY_LIBDIR%%/digest
+@dirrm %%RUBY_LIBDIR%%/date
+@dirrm %%RUBY_LIBDIR%%/cgi/session
+@dirrm %%RUBY_LIBDIR%%/cgi
+@dirrm %%RUBY_LIBDIR%%/bigdecimal
+@dirrm %%RUBY_LIBDIR%%/
+%%RUBY_SITEARCHLIBDIR%%/.keep_me
+@dirrmtry %%RUBY_SITEARCHLIBDIR%%
+@dirrmtry %%RUBY_SITELIBDIR%%
+@dirrmtry lib/ruby/site_ruby
+%%RUBY_VENDORARCHLIBDIR%%/.keep_me
+@dirrmtry %%RUBY_VENDORARCHLIBDIR%%
+@dirrmtry %%RUBY_VENDORLIBDIR%%
+@dirrmtry lib/ruby/vendor_ruby
+@dirrmtry lib/ruby
diff --git a/mail/rubygem-actionmailer/Makefile b/mail/rubygem-actionmailer/Makefile
index c11bee610947..0763f59dd0b0 100644
--- a/mail/rubygem-actionmailer/Makefile
+++ b/mail/rubygem-actionmailer/Makefile
@@ -16,6 +16,9 @@ COMMENT=	Easy email delivery and testing for Ruby
 BUILD_DEPENDS=	${LOCALBASE}/${SPEC_DIR}/actionpack-1.13.6.gemspec:${PORTSDIR}/www/rubygem-actionpack
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
+USE_RUBY=	yes
+USE_RUBYGEMS=	yes
+
 # This target is only meant to be used by the port maintainer.
 x-generate-plist:
 	(${PORTSDIR}/Tools/scripts/plist -d -m ${MTREE_FILE} ${PREFIX} \
@@ -29,6 +32,4 @@ x-generate-plist:
 		;s,^@dirrm (${SPEC_DIR}|${GEMS_DIR}|lib/ruby).*$$,,g \
 		' | ${TR} -s '\n') > temp-pkg-plist
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net-mgmt/rubygem-snmp/Makefile b/net-mgmt/rubygem-snmp/Makefile
index 76b5fc2dc3e3..646694a9948f 100644
--- a/net-mgmt/rubygem-snmp/Makefile
+++ b/net-mgmt/rubygem-snmp/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}lib
 MAINTAINER=	mhjacks@swbell.net
 COMMENT=	SNMP library for Ruby
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+USE_RUBY=	yes
+USE_RUBYGEMS=	yes
+
+.include <bsd.port.mk>
diff --git a/net/rubygem-openid/Makefile b/net/rubygem-openid/Makefile
index 191c150cd678..408b0e24d229 100644
--- a/net/rubygem-openid/Makefile
+++ b/net/rubygem-openid/Makefile
@@ -18,11 +18,10 @@ BUILD_DEPENDS=	rubygem-yadis>=0.3.4:${PORTSDIR}/net/rubygem-yadis
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_RUBY=	yes
+USE_RUBYGEMS=	yes
 GEM_NAME=	${DISTNAME}
 
 post-install:
 	@${FIND} ${PREFIX}/${GEM_LIB_DIR} -name "*~" -delete
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/rubygem-twitter/Makefile b/net/rubygem-twitter/Makefile
index b94e9db06932..231cbab379fd 100644
--- a/net/rubygem-twitter/Makefile
+++ b/net/rubygem-twitter/Makefile
@@ -20,8 +20,7 @@ BUILD_DEPENDS=	rubygem-hpricot>0:${PORTSDIR}/www/rubygem-hpricot \
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_RUBY=	yes
+USE_RUBYGEMS=	yes
 GEM_NAME=	${DISTNAME}
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/rubygem-twitter4r/Makefile b/net/rubygem-twitter4r/Makefile
index ef27c9f82c85..572679f4d4d0 100644
--- a/net/rubygem-twitter4r/Makefile
+++ b/net/rubygem-twitter4r/Makefile
@@ -17,6 +17,7 @@ COMMENT=	Twitter client API in pure Ruby
 BUILD_DEPENDS=	rubygem-json>=0.4.3:${PORTSDIR}/devel/rubygem-json
 RUN_DEPENDS=	rubygem-json>=0.4.3:${PORTSDIR}/devel/rubygem-json
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+USE_RUBY=	yes
+USE_RUBYGEMS=	yes
+
+.include <bsd.port.mk>
diff --git a/net/rubygem-yadis/Makefile b/net/rubygem-yadis/Makefile
index d2c5d52e16bc..b85229cf9895 100644
--- a/net/rubygem-yadis/Makefile
+++ b/net/rubygem-yadis/Makefile
@@ -15,11 +15,10 @@ MAINTAINER=	clsung@FreeBSD.org
 COMMENT=	A Yadis Service discovery library written in pure Ruby
 
 USE_RUBY=	yes
+USE_RUBYGEMS=	yes
 GEM_NAME=	${DISTNAME}
 
 post-install:
 	@${FIND} ${PREFIX}/${GEM_LIB_DIR} -name "*~" -delete
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/sipxconfig/Makefile b/net/sipxconfig/Makefile
index b0bba1c0f7df..f0fdc89b7110 100644
--- a/net/sipxconfig/Makefile
+++ b/net/sipxconfig/Makefile
@@ -16,8 +16,6 @@ COMMENT=	sipX server for configuring sipX via a web interface
 
 BUILD_DEPENDS=	ant:${PORTSDIR}/devel/apache-ant \
 		${JAVALIBDIR}/junit.jar:${PORTSDIR}/java/junit \
-		gem:${PORTSDIR}/devel/ruby-gems \
-		rake:${PORTSDIR}/devel/rubygem-rake \
 		zip:${PORTSDIR}/archivers/zip \
 		ginstall:${PORTSDIR}/sysutils/coreutils
 LIB_DEPENDS=	sipXport:${PORTSDIR}/net/sipxportlib \
@@ -33,6 +31,7 @@ USE_AUTOTOOLS=	autoconf:261:env automake:19:env
 USE_JAVA=	1.4+
 USE_APACHE=	2.0+
 USE_RUBY=	yes
+USE_RAKE=	yes
 GNU_CONFIGURE=	yes
 LOCALSTATEDIR=	/var
 CONFIGURE_ENV+=	JAVA_HOME=${JAVA_HOME} \
@@ -48,6 +47,12 @@ SUB_FILES=	pkg-install pkg-deinstall
 
 PKGINSTALL=	${WRKDIR}/pkg-install
 
+.include <bsd.port.pre.mk>
+
+.if ${RUBY_VER} == 1.8
+BUILD_DEPENDS+=	gem:${PORTSDIR}/devel/ruby-gems
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e "s,/bin/bash,${PREFIX}/bin/bash," ${WRKSRC}/web/bin/sipxconfig.sh.in
 	@${REINPLACE_CMD} -e "s,@PREFIX@,${PREFIX}," ${WRKSRC}/web/bin/sipxconfig.sh.in
@@ -58,4 +63,4 @@ pre-install:
 post-install:
 	@${SH} ${PKGINSTALL} ${PORTNAME} POST-INSTALL
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/net/sipxproxy/Makefile b/net/sipxproxy/Makefile
index 49c691416290..a40697b9a673 100644
--- a/net/sipxproxy/Makefile
+++ b/net/sipxproxy/Makefile
@@ -21,8 +21,6 @@ LIB_DEPENDS=	sipXport:${PORTSDIR}/net/sipxportlib \
 RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash \
 		psql:${PORTSDIR}/databases/postgresql81-client
 BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
-		gem:${PORTSDIR}/devel/ruby-gems \
-		rake:${PORTSDIR}/devel/rubygem-rake \
 		ginstall:${PORTSDIR}/sysutils/coreutils \
 		cppunit-config:${PORTSDIR}/devel/cppunit
 
@@ -43,6 +41,12 @@ SUB_FILES=	pkg-install pkg-deinstall
 
 PKGINSTALL=	${WRKDIR}/pkg-install
 
+.include <bsd.port.pre.mk>
+
+.if ${RUBY_VER} == 1.8
+BUILD_DEPENDS+= gem:${PORTSDIR}/devel/ruby-gems
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e "s,/bin/bash,${PREFIX}/bin/bash," ${WRKSRC}/bin/sipxcallresolver.sh.in
 	@${REINPLACE_CMD} -e "s,/bin/bash,${PREFIX}/bin/bash," ${WRKSRC}/bin/sipproxy.sh.in
@@ -55,4 +59,4 @@ pre-install:
 post-install:
 	@${SH} ${PKGINSTALL} ${PORTNAME} POST-INSTALL
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/print/rubygem-color/Makefile b/print/rubygem-color/Makefile
index b8bb80235141..3dce6bb0d2e6 100644
--- a/print/rubygem-color/Makefile
+++ b/print/rubygem-color/Makefile
@@ -18,6 +18,7 @@ BUILD_DEPENDS=	rubygem-archive-tar-minitar>=0.5.1:${PORTSDIR}/archivers/rubygem-
 		rubygem-hoe>=1.3.0:${PORTSDIR}/devel/rubygem-hoe
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+USE_RUBY=	yes
+USE_RUBYGEMS=	yes
+
+.include <bsd.port.mk>
diff --git a/print/rubygem-colortools/Makefile b/print/rubygem-colortools/Makefile
index 142ece2b0383..3dac4fe36dd8 100644
--- a/print/rubygem-colortools/Makefile
+++ b/print/rubygem-colortools/Makefile
@@ -14,8 +14,8 @@ DISTNAME=	color-tools-${PORTVERSION}
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Provides colour space definition and manpiulation
 
+USE_RUBY=	yes
+USE_RUBYGEMS=	yes
 GEM_NAME=	${DISTNAME}
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/print/rubygem-pdfwriter/Makefile b/print/rubygem-pdfwriter/Makefile
index 3ec0df1671e4..d09653146e68 100644
--- a/print/rubygem-pdfwriter/Makefile
+++ b/print/rubygem-pdfwriter/Makefile
@@ -18,8 +18,8 @@ BUILD_DEPENDS=	rubygem-color>=1.4.0:${PORTSDIR}/print/rubygem-color \
 		rubygem-transactionsimple>=1.4.0:${PORTSDIR}/devel/rubygem-transactionsimple
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
+USE_RUBY=	yes
+USE_RUBYGEMS=	yes
 GEM_NAME=	${DISTNAME}
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/russian/rubygem-rutils/Makefile b/russian/rubygem-rutils/Makefile
index b410f18b40bf..118be0a64228 100644
--- a/russian/rubygem-rutils/Makefile
+++ b/russian/rubygem-rutils/Makefile
@@ -14,7 +14,6 @@ MAINTAINER=	ports@logvinov.com
 COMMENT=	Simple processing of russian strings
 
 USE_RUBY=	yes
+USE_RUBYGEMS=	yes
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/security/metasploit/Makefile b/security/metasploit/Makefile
index 429fa97a9c4f..b15c6890baad 100644
--- a/security/metasploit/Makefile
+++ b/security/metasploit/Makefile
@@ -15,7 +15,6 @@ MAINTAINER=	onatan@gmail.com
 COMMENT=	Exploit-Framework for Penetration-Testing
 
 RUN_DEPENDS=	${LOCALBASE}/bin/svn:${PORTSDIR}/devel/subversion \
-		${LOCALBASE}/bin/gem:${PORTSDIR}/devel/ruby-gems \
 		${LOCALBASE}/lib/ruby/gems/1.8/specifications/activerecord-1.15.6.gemspec:${PORTSDIR}/databases/rubygem-activerecord
 
 SCRIPTS=	msfcli msfconsole msfd msfencode msflicense msfopcode \
@@ -28,6 +27,10 @@ USE_RUBY=	yes
 
 .include <bsd.port.pre.mk>
 
+.if ${RUBY_VER} == 1.9
+RUN_DEPENDS+=	${LOCALBASE}/bin/gem:${PORTSDIR}/devel/ruby-gems
+.endif
+
 .if defined(WITH_MSFGUI)
 RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/wxruby.so:${PORTSDIR}/x11-toolkits/ruby-wx
 SCRIPTS+=	msfgui
diff --git a/security/rubygem-net-sftp/Makefile b/security/rubygem-net-sftp/Makefile
index b6a529ac989a..e7c0b95f8f4f 100644
--- a/security/rubygem-net-sftp/Makefile
+++ b/security/rubygem-net-sftp/Makefile
@@ -17,6 +17,7 @@ COMMENT=	Implementation of the SFTP client protocol
 
 RUN_DEPENDS=	${LOCALBASE}/${SPEC_DIR}/net-ssh-1.1.2.gemspec:${PORTSDIR}/security/rubygem-net-ssh
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+USE_RUBY=	yes
+USE_RUBYGEMS=	yes
+
+.include <bsd.port.mk>
diff --git a/security/rubygem-net-ssh/Makefile b/security/rubygem-net-ssh/Makefile
index 7efa8d45e247..ed4a9f1d4b4b 100644
--- a/security/rubygem-net-ssh/Makefile
+++ b/security/rubygem-net-ssh/Makefile
@@ -21,6 +21,7 @@ OPTIONSFILE?=	${PORT_DBDIR}/rubygem-${PORTNAME}/options
 
 # to get RUBY_SITEARCHLIBDIR
 USE_RUBY=	yes
+USE_RUBYGEMS=	yes
 
 .include <bsd.port.pre.mk>
 
@@ -28,5 +29,4 @@ USE_RUBY=	yes
 RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/termios.so:${PORTSDIR}/comms/ruby-termios
 .endif
 
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
 .include <bsd.port.post.mk>
diff --git a/sysutils/rubygem-capistrano/Makefile b/sysutils/rubygem-capistrano/Makefile
index ceb2a05d56e6..65ce9e8435c6 100644
--- a/sysutils/rubygem-capistrano/Makefile
+++ b/sysutils/rubygem-capistrano/Makefile
@@ -13,10 +13,13 @@ MASTER_SITES=	RF
 MAINTAINER=	r.s.a.vandomburg@nedforce.nl
 COMMENT=	A utility for executing commands in parallel on multiple machines
 
-RUN_DEPENDS=	rake:${PORTSDIR}/devel/rubygem-rake \
-		${LOCALBASE}/${SPEC_DIR}/net-sftp-1.1.0.gemspec:${PORTSDIR}/security/rubygem-net-sftp \
+RUN_DEPENDS=	${LOCALBASE}/${SPEC_DIR}/net-sftp-1.1.0.gemspec:${PORTSDIR}/security/rubygem-net-sftp \
 		rubygem-highline>=1.4.0:${PORTSDIR}/devel/rubygem-highline
 
+USE_RUBY=	yes
+USE_RAKE=	yes
+USE_RUBYGEMS=	yes
+
 post-install:
 	@${ECHO_MSG} "======================================================================"
 	@${ECHO_MSG}
@@ -27,6 +30,4 @@ post-install:
 	@${ECHO_MSG}
 	@${ECHO_MSG} "======================================================================"
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/sysutils/rubygem-god/Makefile b/sysutils/rubygem-god/Makefile
index 258d9379d6ce..16c6ac98bca9 100644
--- a/sysutils/rubygem-god/Makefile
+++ b/sysutils/rubygem-god/Makefile
@@ -15,6 +15,7 @@ COMMENT=	Monitoring framework written in Ruby
 
 BUILD_DEPENDS=	rubygem-hoe>=1.3.0:${PORTSDIR}/devel/rubygem-hoe
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+USE_RUBY=	yes
+USE_RUBYGEMS=	yes
+
+.include <bsd.port.mk>
diff --git a/textproc/rubygem-ferret/Makefile b/textproc/rubygem-ferret/Makefile
index 00e0a8c10701..83d9e80537e9 100644
--- a/textproc/rubygem-ferret/Makefile
+++ b/textproc/rubygem-ferret/Makefile
@@ -13,9 +13,9 @@ MASTER_SITES=	RF
 MAINTAINER=	clsung@FreeBSD.org
 COMMENT=	Ferret is a ruby port of Lucene
 
-BUILD_DEPENDS=	rake:${PORTSDIR}/devel/rubygem-rake
-
 USE_RUBY=	yes
+USE_RAKE=	yes
+USE_RUBYGEMS=	yes
 
 post-install:
 	@${FIND} ${PREFIX}/${GEM_LIB_DIR} ! -type d | \
@@ -27,6 +27,4 @@ post-install:
 	@${FIND} ${PREFIX}/${GEM_DOC_DIR} -type d | ${SORT} -r | \
 		${SED} "s,^${PREFIX}/,@dirrm ," >> ${TMPPLIST}
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/textproc/rubygem-formosa/Makefile b/textproc/rubygem-formosa/Makefile
index a9d65d1f3ab3..f36dd060519b 100644
--- a/textproc/rubygem-formosa/Makefile
+++ b/textproc/rubygem-formosa/Makefile
@@ -19,6 +19,7 @@ RUN_DEPENDS=	rubygem-activesupport>=1.4.2:${PORTSDIR}/devel/rubygem-activesuppor
 
 GEM_NAME=	${DISTNAME}
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+USE_RUBY=	yes
+USE_RUBYGEMS=	yes
+
+.include <bsd.port.mk>
diff --git a/textproc/rubygem-htmltools/Makefile b/textproc/rubygem-htmltools/Makefile
index 70d5659ca320..274eb2f6631e 100644
--- a/textproc/rubygem-htmltools/Makefile
+++ b/textproc/rubygem-htmltools/Makefile
@@ -14,6 +14,7 @@ DISTNAME=	htmltools-${PORTVERSION}
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Tools for parsing and manipulating HTML text in Ruby
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+USE_RUBY=	yes
+USE_RUBYGEMS=	yes
+
+.include <bsd.port.mk>
diff --git a/textproc/rubygem-ini/Makefile b/textproc/rubygem-ini/Makefile
index dca740f0c018..701de2cb7661 100644
--- a/textproc/rubygem-ini/Makefile
+++ b/textproc/rubygem-ini/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}file
 MAINTAINER=	yds@CoolRat.org
 COMMENT=	Ruby INI File Parser and Writer
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+USE_RUBY=	yes
+USE_RUBYGEMS=	yes
+
+.include <bsd.port.mk>
diff --git a/textproc/rubygem-rak/Makefile b/textproc/rubygem-rak/Makefile
index f6d972ea8342..dbb4610484ba 100644
--- a/textproc/rubygem-rak/Makefile
+++ b/textproc/rubygem-rak/Makefile
@@ -16,6 +16,7 @@ COMMENT=	A grep replacement in pure Ruby
 BUILD_DEPENDS=	rubygem-hoe>=1.3.0:${PORTSDIR}/devel/rubygem-hoe
 RUN_DEPENDS=	rubygem-hoe>=1.3.0:${PORTSDIR}/devel/rubygem-hoe
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+USE_RUBY=	yes
+USE_RUBYGEMS=	yes
+
+.include <bsd.port.mk>
diff --git a/textproc/rubygem-spreadsheet-excel/Makefile b/textproc/rubygem-spreadsheet-excel/Makefile
index da9e3264faa4..0f4aef20598d 100644
--- a/textproc/rubygem-spreadsheet-excel/Makefile
+++ b/textproc/rubygem-spreadsheet-excel/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR=	 spreadsheet
 MAINTAINER=	ports@logvinov.com
 COMMENT=	A Ruby module to generate Microsoft Excel compatible files
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+USE_RUBY=	yes
+USE_RUBYGEMS=	yes
+
+.include <bsd.port.mk>
diff --git a/textproc/rubygem-spreadsheet/Makefile b/textproc/rubygem-spreadsheet/Makefile
index da9e3264faa4..0f4aef20598d 100644
--- a/textproc/rubygem-spreadsheet/Makefile
+++ b/textproc/rubygem-spreadsheet/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR=	 spreadsheet
 MAINTAINER=	ports@logvinov.com
 COMMENT=	A Ruby module to generate Microsoft Excel compatible files
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+USE_RUBY=	yes
+USE_RUBYGEMS=	yes
+
+.include <bsd.port.mk>
diff --git a/textproc/rubygem-syntax/Makefile b/textproc/rubygem-syntax/Makefile
index cc263b117951..6a0376b5055b 100644
--- a/textproc/rubygem-syntax/Makefile
+++ b/textproc/rubygem-syntax/Makefile
@@ -14,14 +14,18 @@ PKGNAMEPREFIX=	rubygem-
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	A module for using Systax highlighting in Ruby
 
+USE_RUBY=	yes
+
 .include <bsd.port.pre.mk>
 #.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
 # syntax.gem has invalid content, we need to buuild the gem ourself
 
+.if ${RUBY_VER} == 1.8
 BUILD_DEPENDS+=	${RUBYGEMBIN}:${PORTSDIR}/devel/ruby-gems
 RUN_DEPENDS+=	${BUILD_DEPENDS}
+.endif
 
-REV=		1.8
+REV=		${RUBY_VER}
 GEMS_BASE_DIR=	lib/ruby/gems/${REV}
 GEMS_DIR=	${GEMS_BASE_DIR}/gems
 DOC_DIR=	${GEMS_BASE_DIR}/doc
@@ -48,7 +52,7 @@ PLIST_SUB+=	PORTVERSION="${PORTVERSION}" \
 		GEM_CACHE="${GEM_CACHE}" \
 		EXTRACT_SUFX="${EXTRACT_SUFX}"
 
-RUBYGEMBIN=	${LOCALBASE}/bin/gem18
+RUBYGEMBIN=	${LOCALBASE}/bin/gem${RUBY_VER:S/.//}
 
 do-build:
 	cd ${WRKSRC} && ${RUBYGEMBIN} build syntax.gemspec
diff --git a/textproc/rubygem-tidy/Makefile b/textproc/rubygem-tidy/Makefile
index 94edf87b2885..3b50400a45bd 100644
--- a/textproc/rubygem-tidy/Makefile
+++ b/textproc/rubygem-tidy/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	don@na.rim.or.jp
 COMMENT=	Ruby interface to HTML Tidy Library Project
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+USE_RUBY=	yes
+USE_RUBYGEMS=	yes
+
+.include <bsd.port.mk>
diff --git a/www/instiki/Makefile b/www/instiki/Makefile
index d1bd0fc9751a..dd6a217ea057 100644
--- a/www/instiki/Makefile
+++ b/www/instiki/Makefile
@@ -16,10 +16,9 @@ MAINTAINER=	beech@FreeBSD.org
 COMMENT=	Easy to set up wiki clone implemented in ruby
 
 LIB_DEPENDS=	sqlite3:${PORTSDIR}/databases/sqlite3
-BUILD_DEPENDS=	rake:${PORTSDIR}/devel/rubygem-rake
 
 USE_RUBY=	yes
-USE_RUBY_FEATURES=	1.8
+USE_RAKE=	yes
 USE_LDCONFIG=	yes
 
 INSTIKIPORT?=	2500
@@ -38,7 +37,7 @@ RUBY_SHEBANG_FILES=instiki
 # can't include this because it redefines do-install.
 # .include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
 # For now, copy and paste the definition of SPEC_DIR from the above
-REV=		1.8
+REV=		${RUBY_VER}
 GEMS_BASE_DIR=	lib/ruby/gems/${REV}
 SPEC_DIR=	${GEMS_BASE_DIR}/specifications
 BUILD_DEPENDS+=	${LOCALBASE}/${SPEC_DIR}/BlueCloth-1.0.0.gemspec:${PORTSDIR}/www/rubygem-bluecloth
@@ -53,7 +52,7 @@ post-patch:
 
 do-build:
 	( cd ${WRKSRC}/db/ && \
-	  rake environment RAILS_ENV=production db:migrate )
+	  ${RAKE_BIN} environment RAILS_ENV=production db:migrate )
 
 do-install:
 	@${FIND} -E ${WRKSRC} -type f -iregex ".*\._.+" -exec ${RM} "{}" \;
diff --git a/www/rubygem-actionpack/Makefile b/www/rubygem-actionpack/Makefile
index 48ea64cc70a3..84759612c096 100644
--- a/www/rubygem-actionpack/Makefile
+++ b/www/rubygem-actionpack/Makefile
@@ -16,6 +16,9 @@ COMMENT=	Action Controller and Action View of Rails MVC Framework
 BUILD_DEPENDS=	${LOCALBASE}/${SPEC_DIR}/activesupport-1.4.4.gemspec:${PORTSDIR}/devel/rubygem-activesupport
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
+USE_RUBY=	yes
+USE_RUBYGEMS=	yes
+
 # This target is only meant to be used by the port maintainer.
 x-generate-plist:
 	(${PORTSDIR}/Tools/scripts/plist -d -m ${MTREE_FILE} ${PREFIX} \
@@ -29,6 +32,4 @@ x-generate-plist:
 		;s,^@dirrm (${SPEC_DIR}|${GEMS_DIR}|lib/ruby).*$$,,g \
 		' | ${TR} -s '\n') > temp-pkg-plist
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/rubygem-actionwebservice/Makefile b/www/rubygem-actionwebservice/Makefile
index bef31eea6a7e..2aab9b3eb915 100644
--- a/www/rubygem-actionwebservice/Makefile
+++ b/www/rubygem-actionwebservice/Makefile
@@ -17,6 +17,9 @@ BUILD_DEPENDS=	${LOCALBASE}/${SPEC_DIR}/actionpack-1.13.6.gemspec:${PORTSDIR}/ww
 		${LOCALBASE}/${SPEC_DIR}/activerecord-1.15.6.gemspec:${PORTSDIR}/databases/rubygem-activerecord
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
+USE_RUBY=	yes
+USE_RUBYGEMS=	yes
+
 # This target is only meant to be used by the port maintainer.
 x-generate-plist:
 	(${PORTSDIR}/Tools/scripts/plist -d -m ${MTREE_FILE} ${PREFIX} \
@@ -30,6 +33,4 @@ x-generate-plist:
 		;s,^@dirrm (${SPEC_DIR}|${GEMS_DIR}|lib/ruby).*$$,,g \
 		' | ${TR} -s '\n') > temp-pkg-plist
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/rubygem-amazon-ecs/Makefile b/www/rubygem-amazon-ecs/Makefile
index 239866e54e43..f8566ef4a9aa 100644
--- a/www/rubygem-amazon-ecs/Makefile
+++ b/www/rubygem-amazon-ecs/Makefile
@@ -16,6 +16,9 @@ COMMENT=	A generic Amazon E-commerce REST API written in Ruby
 
 RUN_DEPENDS=	rubygem-hpricot>=0:${PORTSDIR}/www/rubygem-hpricot
 
+USE_RUBY=	yes
+USE_RUBYGEMS=	yes
+
 # This target is only meant to be used by the port maintainer.
 x-generate-plist:
 	${ECHO} %%GEM_CACHE%% > pkg-plist.new
@@ -25,6 +28,4 @@ x-generate-plist:
 	${FIND} ${PREFIX}/${GEM_LIB_DIR} -type d -depth | ${SED} -e 's,${PREFIX}/${GEM_LIB_DIR},@dirrm %%GEM_LIB_DIR%%,' >> pkg-plist.new
 	${FIND} ${PREFIX}/${GEM_DOC_DIR} -type d -depth | ${SED} -e 's,${PREFIX}/${GEM_DOC_DIR},@dirrm %%GEM_DOC_DIR%%,' >> pkg-plist.new
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/rubygem-bluecloth/Makefile b/www/rubygem-bluecloth/Makefile
index d8ce926ba5bc..39f5923d0572 100644
--- a/www/rubygem-bluecloth/Makefile
+++ b/www/rubygem-bluecloth/Makefile
@@ -14,6 +14,7 @@ COMMENT=	Ruby implementation of Markdown, a text-to-HTML conversion tool
 
 GEM_NAME=	${DISTNAME}
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+USE_RUBY=	yes
+USE_RUBYGEMS=	yes
+
+.include <bsd.port.mk>
diff --git a/www/rubygem-haml/Makefile b/www/rubygem-haml/Makefile
index 59e871926120..01dcc6209ae8 100644
--- a/www/rubygem-haml/Makefile
+++ b/www/rubygem-haml/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	gogo@cs.uni-sb.de
 COMMENT=	Markup language to describe XHTML
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+USE_RUBY=	yes
+USE_RUBYGEMS=	yes
+
+.include <bsd.port.mk>
diff --git a/www/rubygem-hpricot/Makefile b/www/rubygem-hpricot/Makefile
index ee10a0857598..d350049788cb 100644
--- a/www/rubygem-hpricot/Makefile
+++ b/www/rubygem-hpricot/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	gems
 MAINTAINER=	clsung@FreeBSD.org
 COMMENT=	A Fast, Enjoyable HTML Parser for Ruby
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+USE_RUBY=	yes
+USE_RUBYGEMS=	yes
+
+.include <bsd.port.mk>
diff --git a/www/rubygem-layout-yullio/Makefile b/www/rubygem-layout-yullio/Makefile
index f7284912acf8..a2af44291ca9 100644
--- a/www/rubygem-layout-yullio/Makefile
+++ b/www/rubygem-layout-yullio/Makefile
@@ -20,6 +20,7 @@ RUN_DEPENDS=	sow:${PORTSDIR}/devel/rubygem-hoe
 
 GEM_NAME=	${DISTNAME}
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+USE_RUBY=	yes
+USE_RUBYGEMS=	yes
+
+.include <bsd.port.mk>
diff --git a/www/rubygem-maruku/Makefile b/www/rubygem-maruku/Makefile
index 2419acf51eef..4a680e574bad 100644
--- a/www/rubygem-maruku/Makefile
+++ b/www/rubygem-maruku/Makefile
@@ -16,8 +16,7 @@ BUILD_DEPENDS=	rubygem-syntax>=1.0.0:${PORTSDIR}/textproc/rubygem-syntax
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_RUBY=	yes
+USE_RUBYGEMS=	yes
 USE_RUBY_FEATURES=	iconv
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/rubygem-mechanize/Makefile b/www/rubygem-mechanize/Makefile
index ca8f8382e11b..a59038f6d6aa 100644
--- a/www/rubygem-mechanize/Makefile
+++ b/www/rubygem-mechanize/Makefile
@@ -17,6 +17,7 @@ BUILD_DEPENDS=	rubygem-hpricot>=0:${PORTSDIR}/www/rubygem-hpricot \
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_RUBY=	yes
+USE_RUBYGEMS=	yes
 
 post-install:
 	@${ECHO} ${GEM_CACHE} > ${TMPPLIST}
@@ -26,6 +27,4 @@ post-install:
 	@${FIND} ${PREFIX}/${GEM_LIB_DIR} -type d -depth | ${SED} -e 's,${PREFIX}/${GEM_LIB_DIR},@dirrm ${GEM_LIB_DIR},' >> ${TMPPLIST}
 	@${FIND} ${PREFIX}/${GEM_DOC_DIR} -type d -depth | ${SED} -e 's,${PREFIX}/${GEM_DOC_DIR},@dirrm ${GEM_DOC_DIR},' >> ${TMPPLIST}
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/rubygem-mongrel/Makefile b/www/rubygem-mongrel/Makefile
index e373603259c3..02cd02f9d5e1 100644
--- a/www/rubygem-mongrel/Makefile
+++ b/www/rubygem-mongrel/Makefile
@@ -18,6 +18,9 @@ BUILD_DEPENDS=	gpgen:${PORTSDIR}/devel/rubygem-gem_plugin \
 		rubygem-fastthread>=1.0.1:${PORTSDIR}/devel/rubygem-fastthread
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
+USE_RUBY=	yes
+USE_RUBYGEMS=	yes
+
 PATCHNAME=	cgi_multipart_eof_fix-2.5.0
 PLIST_SUB=	CGIFIX="${PATCHNAME}"
 
@@ -37,6 +40,4 @@ x-generate-plist:
 		;s,^@dirrm (${SPEC_DIR}|${GEMS_DIR}|lib/ruby).*$$,,g \
 		' | ${TR} -s '\n') > temp-pkg-plist
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/rubygem-mongrel_cluster/Makefile b/www/rubygem-mongrel_cluster/Makefile
index 9d81a7b4abb3..6bf9c45cbbf1 100644
--- a/www/rubygem-mongrel_cluster/Makefile
+++ b/www/rubygem-mongrel_cluster/Makefile
@@ -18,6 +18,7 @@ RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_RC_SUBR=	mongrel_cluster
 USE_RUBY=	yes
+USE_RUBYGEMS=	yes
 REINPLACE_ARGS=	-i ""
 
 # This target is only meant to be used by the port maintainer.
@@ -42,6 +43,4 @@ post-install:
 	@${REINPLACE_CMD} -e 's|\"mongrel_rails\"|\"${PREFIX}/bin/mongrel_rails\"|g' \
 		${PREFIX}/${GEM_LIB_DIR}/lib/${PORTNAME}/init.rb
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/rubygem-rack/Makefile b/www/rubygem-rack/Makefile
index 839fcee7c21d..46b62c21fe0a 100644
--- a/www/rubygem-rack/Makefile
+++ b/www/rubygem-rack/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR=	rack
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Rack, a Ruby Webserver Interface
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+USE_RUBY=	yes
+USE_RUBYGEMS=	yes
+
+.include <bsd.port.mk>
diff --git a/www/rubygem-rails-app-installer/Makefile b/www/rubygem-rails-app-installer/Makefile
index 72e271005222..549653875c63 100644
--- a/www/rubygem-rails-app-installer/Makefile
+++ b/www/rubygem-rails-app-installer/Makefile
@@ -14,12 +14,15 @@ MASTER_SITE_SUBDIR=	rails-installer
 MAINTAINER=	geraud@gcu.info
 COMMENT=	An installer for Rails apps
 
-BUILD_DEPENDS=	rake:${PORTSDIR}/devel/rubygem-rake \
-		rubygem-sqlite3>=1.1.0:${PORTSDIR}/databases/rubygem-sqlite3 \
+BUILD_DEPENDS=	rubygem-sqlite3>=1.1.0:${PORTSDIR}/databases/rubygem-sqlite3 \
 		rubygem-mongrel>=0.3.13:${PORTSDIR}/www/rubygem-mongrel \
 		rubygem-mongrel_cluster>=0.2.0:${PORTSDIR}/www/rubygem-mongrel_cluster
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
+USE_RUBY=	yes
+USE_RAKE=	yes
+USE_RUBYGEMS=	yes
+
 # This target is only meant to be used by the port maintainer.
 x-generate-plist:
 	(${PORTSDIR}/Tools/scripts/plist -d -m ${MTREE_FILE} ${PREFIX} \
@@ -33,6 +36,4 @@ x-generate-plist:
 		;s,^@dirrm (${SPEC_DIR}|${GEMS_DIR}|lib/ruby).*$$,,g \
 		' | ${TR} -s '\n') > temp-pkg-plist
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/rubygem-rails/Makefile b/www/rubygem-rails/Makefile
index 8db6b6a370cc..887f36b7c513 100644
--- a/www/rubygem-rails/Makefile
+++ b/www/rubygem-rails/Makefile
@@ -13,8 +13,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	jw@innerewut.de
 COMMENT=	MVC web application framework
 
-BUILD_DEPENDS=	rake:${PORTSDIR}/devel/rubygem-rake \
-		${LOCALBASE}/${SPEC_DIR}/activesupport-1.4.4.gemspec:${PORTSDIR}/devel/rubygem-activesupport \
+BUILD_DEPENDS=	${LOCALBASE}/${SPEC_DIR}/activesupport-1.4.4.gemspec:${PORTSDIR}/devel/rubygem-activesupport \
 		${LOCALBASE}/${SPEC_DIR}/activerecord-1.15.6.gemspec:${PORTSDIR}/databases/rubygem-activerecord \
 		${LOCALBASE}/${SPEC_DIR}/actionpack-1.13.6.gemspec:${PORTSDIR}/www/rubygem-actionpack \
 		${LOCALBASE}/${SPEC_DIR}/actionmailer-1.3.6.gemspec:${PORTSDIR}/mail/rubygem-actionmailer \
@@ -27,6 +26,8 @@ OPTIONSFILE=	${PORT_DBDIR}/rubygem-${PORTNAME}/options
 
 # to get RUBY_SITEARCHLIBDIR
 USE_RUBY=	yes
+USE_RAKE=	yes
+USE_RUBYGEMS=	yes
 
 # This target is only meant to be used by the port maintainer.
 x-generate-plist:
@@ -51,5 +52,4 @@ RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/fcgi.so:${PORTSDIR}/www/ruby-fcgi
 RUN_DEPENDS+=	rubygem-memcache-client>=1.2.0:${PORTSDIR}/databases/rubygem-memcache-client
 .endif
 
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
 .include <bsd.port.post.mk>
diff --git a/www/rubygem-redcloth/Makefile b/www/rubygem-redcloth/Makefile
index 9b1eb4faebc4..1f4e88363c3e 100644
--- a/www/rubygem-redcloth/Makefile
+++ b/www/rubygem-redcloth/Makefile
@@ -14,8 +14,8 @@ DISTNAME=	RedCloth-${PORTVERSION}
 MAINTAINER=	jw@innerewut.de
 COMMENT=	A module for using Textile in Ruby
 
+USE_RUBY=	yes
+USE_RUBYGEMS=	yes
 GEM_NAME=	${DISTNAME}
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/rubygem-rubyfulsoup/Makefile b/www/rubygem-rubyfulsoup/Makefile
index 86c3ed492dc9..984b8ea52c91 100644
--- a/www/rubygem-rubyfulsoup/Makefile
+++ b/www/rubygem-rubyfulsoup/Makefile
@@ -18,8 +18,7 @@ BUILD_DEPENDS=	rubygem-htmltools>=1.10:${PORTSDIR}/textproc/rubygem-htmltools
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_RUBY=	yes
+USE_RUBYGEMS=	yes
 GEM_NAME=	rubyful_soup-${PORTVERSION}
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/rubygem-scrapi/Makefile b/www/rubygem-scrapi/Makefile
index 84435cbe4c5e..b68cfcbbdccf 100644
--- a/www/rubygem-scrapi/Makefile
+++ b/www/rubygem-scrapi/Makefile
@@ -17,6 +17,8 @@ COMMENT=	A scrAPI toolkit for Ruby
 BUILD_DEPENDS=	${LOCALBASE}/${SPEC_DIR}/tidy-1.1.2.gemspec:${PORTSDIR}/textproc/rubygem-tidy \
 		tidy:${PORTSDIR}/www/tidy-lib
 
+USE_RUBY=	yes
+USE_RUBYGEMS=	yes
 USE_LDCONFIG=	yes
 
 .include <bsd.port.pre.mk>
@@ -26,5 +28,4 @@ post-install:
 	${RM} -f ${LOCALBASE}/${GEM_LIB_DIR}/lib/tidy/libtidy.so
 	${LN} -sf ${LOCALBASE}/lib/libtidy.so ${LOCALBASE}/${GEM_LIB_DIR}/lib/tidy/
 
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
 .include <bsd.port.post.mk>
diff --git a/www/rubygem-scrubyt/Makefile b/www/rubygem-scrubyt/Makefile
index 736689785e96..8b2413649072 100644
--- a/www/rubygem-scrubyt/Makefile
+++ b/www/rubygem-scrubyt/Makefile
@@ -16,6 +16,9 @@ COMMENT=	A powerful web scraping toolkit written in Ruby
 
 RUN_DEPENDS=	rubygem-mechanize>=0.6.3:${PORTSDIR}/www/rubygem-mechanize
 
+USE_RUBY=	yes
+USE_RUBYGEMS=	yes
+
 # This target is only meant to be used by the port maintainer.
 x-generate-plist:
 	${ECHO} %%GEM_CACHE%% > pkg-plist.new
@@ -25,6 +28,4 @@ x-generate-plist:
 	${FIND} ${PREFIX}/${GEM_LIB_DIR} -type d -depth | ${SED} -e 's,${PREFIX}/${GEM_LIB_DIR},@dirrm %%GEM_LIB_DIR%%,' >> pkg-plist.new
 	${FIND} ${PREFIX}/${GEM_DOC_DIR} -type d -depth | ${SED} -e 's,${PREFIX}/${GEM_DOC_DIR},@dirrm %%GEM_DOC_DIR%%,' >> pkg-plist.new
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/rubygem-staticmatic/Makefile b/www/rubygem-staticmatic/Makefile
index f48c791f7e62..5ff03c674525 100644
--- a/www/rubygem-staticmatic/Makefile
+++ b/www/rubygem-staticmatic/Makefile
@@ -16,6 +16,7 @@ COMMENT=	Manage static websites using Haml and Sass
 RUN_DEPENDS=	rubygem-haml>=1.7.0:${PORTSDIR}/www/rubygem-haml \
 		rubygem-mongrel>=1.0.1:${PORTSDIR}/www/rubygem-mongrel
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+USE_RUBY=	yes
+USE_RUBYGEMS=	yes
+
+.include <bsd.port.mk>
diff --git a/www/rubygem-taggable/Makefile b/www/rubygem-taggable/Makefile
index 6d0feff1467f..e60421441dfb 100644
--- a/www/rubygem-taggable/Makefile
+++ b/www/rubygem-taggable/Makefile
@@ -18,6 +18,7 @@ COMMENT=	Add tagging capabilities to your ActiveRecord objects
 
 GEM_NAME=	${DISTNAME}
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+USE_RUBY=	yes
+USE_RUBYGEMS=	yes
+
+.include <bsd.port.mk>
diff --git a/www/rubygem-thin/Makefile b/www/rubygem-thin/Makefile
index 306b42484e41..71c40644c860 100644
--- a/www/rubygem-thin/Makefile
+++ b/www/rubygem-thin/Makefile
@@ -17,6 +17,7 @@ BUILD_DEPENDS=	rackup:${PORTSDIR}/www/rubygem-rack \
 		rubygem-daemons>=1.0.9:${PORTSDIR}/devel/rubygem-daemons
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+USE_RUBY=	yes
+USE_RUBYGEMS=	yes
+
+.include <bsd.port.mk>
diff --git a/x11-toolkits/ruby-tk/Makefile b/x11-toolkits/ruby-tk/Makefile
index d6e2b1a34382..2d8c777b9e49 100644
--- a/x11-toolkits/ruby-tk/Makefile
+++ b/x11-toolkits/ruby-tk/Makefile
@@ -48,9 +48,7 @@ CONFIGURE_ARGS=	${RUBY_CONFIGURE_ARGS} \
 CONFIGURE_ARGS+=--with-tcllib=tcl${TK_VERSION:S/.//} --with-tklib=tk${TK_VERSION:S/.//}
 .endif
 
-.if ${RUBY_VER} >= 1.7
 MAKE_ARGS=	sitelibdir='$$(rubylibdir)'
-.endif
 
 .if defined(PKGNAMEPREFIX)
 PKGNAMEPREFIX:=	${PKGNAMEPREFIX}${RUBY_PKGNAMEPREFIX}
@@ -70,12 +68,10 @@ post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${RUBY_MODEXAMPLESDIR}
 	${CP} -R ${WRKSRC}/sample/* ${RUBY_MODEXAMPLESDIR}/
-.if ${RUBY_VER} >= 1.8
 	${MKDIR} ${RUBY_MODDOCDIR}
-.for d in MANUAL_tcltklib.eng MANUAL_tcltklib.eucj README.fork README.1st README.ActiveTcl README.tcltklib
+. for d in MANUAL_tcltklib.eng MANUAL_tcltklib.eucj README.fork README.1st README.ActiveTcl README.tcltklib
 	${INSTALL_DATA} ${WRKSRC}/${d} ${RUBY_MODDOCDIR}/
-.endfor
-.endif
+. endfor
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/x11-toolkits/ruby-tk/pkg-plist b/x11-toolkits/ruby-tk/pkg-plist
index b1e81acae529..113bf98e140b 100644
--- a/x11-toolkits/ruby-tk/pkg-plist
+++ b/x11-toolkits/ruby-tk/pkg-plist
@@ -77,6 +77,7 @@
 %%RUBY_LIBDIR%%/tk/textwindow.rb
 %%RUBY_LIBDIR%%/tk/timer.rb
 %%RUBY_LIBDIR%%/tk/toplevel.rb
+%%RUBY19%%%%RUBY_LIBDIR%%/tk/ttk_selector.rb
 %%RUBY_LIBDIR%%/tk/txtwin_abst.rb
 %%RUBY_LIBDIR%%/tk/validation.rb
 %%RUBY_LIBDIR%%/tk/variable.rb
author	Stanislav Sedov <stas@FreeBSD.org>	2008-04-06 08:58:21 +0000
committer	Stanislav Sedov <stas@FreeBSD.org>	2008-04-06 08:58:21 +0000
commit	fae8e0f615b1dfcff35249a7a11ebfba7391bc56 (patch)
tree	cbba292aa57c0d2e7bb423ca0366362b198eec85
parent	- Add entry for mail/postfix-policyd-weight (diff)