- Do not install the 'gem' executable as part of ruby 1.9 install. The

  version supplied is too old for some applications, so we're switching
  to using the version from ports.
- Allow ruby-gems installation for ruby 1.9.

Submitted by:	swills@ (based on).

2 files changed, 7 insertions, 21 deletions

diff --git a/lang/ruby19/Makefile b/lang/ruby19/Makefile
index 6dde5e2cf66e..062bc821ebff 100644
--- a/lang/ruby19/Makefile
+++ b/lang/ruby19/Makefile
@@ -86,10 +86,7 @@ PLIST_SUB+=	IF_DEFAULT=""
 PLIST_SUB+=	IF_DEFAULT="@comment "
 .endif
 
-GEMS_DIR=	${PREFIX}/lib/ruby/gems/${RUBY_VER}
-PLIST_SUB+=	GEMS_DIR="lib/ruby/gems/${RUBY_VER}"
-
-INSTALLED_SCRIPTS=	irb erb rdoc ri ruby testrb gem
+INSTALLED_SCRIPTS=	irb erb rdoc ri ruby testrb
 
 EXTSAMPLES=	bigdecimal/sample/*.rb	\
 		curses/hello.rb		\
@@ -128,6 +125,12 @@ post-patch:
 .for d in win32ole
 	${RM} -rf ${BUILD_WRKSRC}/ext/${d}
 .endfor
+# We get rake from ports.
+.for d in bin/rake doc/rake lib/rake test/rake man/rake.1 lib/rake.rb
+	${RM} -rf ${BUILD_WRKSRC}/${d}
+.endfor
+# We get the gem executable from ports.
+	${RM} ${BUILD_WRKSRC}/bin/gem
 
 #
 # Prepare modules we are wanting to build via external ports
@@ -136,11 +139,6 @@ post-patch:
 	${MV} ${BUILD_WRKSRC}/ext/${d} ${WRKDIR}/
 .endfor
 
-# we get rake from ports
-.for d in bin/rake doc/rake lib/rake test/rake man/rake.1 lib/rake.rb
-	${RM} -rf ${BUILD_WRKSRC}/${d}
-.endfor
-
 post-build:
 #
 # Hack to allow modules to be installed into separate PREFIX and/or under user
@@ -166,8 +164,6 @@ pre-su-install:
 	${TOUCH} ${RUBY_DOCDIR}/.keep_me
 	${TOUCH} ${RUBY_SITEARCHLIBDIR}/.keep_me
 	${TOUCH} ${RUBY_VENDORARCHLIBDIR}/.keep_me
-	${MKDIR} ${GEMS_DIR}/gems
-	${TOUCH} ${GEMS_DIR}/gems/.keep_me
 
 post-install:
 #
@@ -288,11 +284,6 @@ plist::
 #
 # Find all gem files/folders
 #
-	@${FIND} -ds ${GEMS_DIR}/ ! -type d | \
-		${SED} 's,^${GEMS_DIR},%%GEMS_DIR%%,' >> pkg-plist
-	@${FIND} -ds ${GEMS_DIR}/ -type d | ${SORT} -r | \
-		${SED} -E -e 's,^${GEMS_DIR}(.*),@dirrm %%GEMS_DIR%%\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
diff --git a/lang/ruby19/pkg-plist b/lang/ruby19/pkg-plist
index a3d72f4b5826..073c7d040125 100644
--- a/lang/ruby19/pkg-plist
+++ b/lang/ruby19/pkg-plist
@@ -10,8 +10,6 @@ bin/ruby%%RUBY_SUFFIX%%
 %%IF_DEFAULT%%bin/ruby
 bin/testrb%%RUBY_SUFFIX%%
 %%IF_DEFAULT%%bin/testrb
-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%%
@@ -989,9 +987,6 @@ include/ruby-1.9/ruby.h
 @dirrm %%RUBY_LIBDIR%%/%%RUBY_ARCH%%/dl
 @dirrm %%RUBY_LIBDIR%%/%%RUBY_ARCH%%/digest
 @dirrm %%RUBY_LIBDIR%%/%%RUBY_ARCH%%
-%%GEMS_DIR%%/gems/.keep_me
-@dirrm %%GEMS_DIR%%/gems
-@dirrm %%GEMS_DIR%%
 @dirrm %%RUBY_LIBDIR%%/
 %%RUBY_SITEARCHLIBDIR%%/.keep_me
 @dirrm %%RUBY_SITEARCHLIBDIR%%