making Ruby 1.9 default

Steve Wills swills at FreeBSD.org
Thu Mar 17 03:15:33 UTC 2011 

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 03/16/11 22:54, Steve Wills wrote:
> Hi Martin,
> 
> On 03/16/11 00:46, Martin Wilke wrote:
>> I'd like to say come up with patches, and let see how the result is. If
>> it works
>> i vote +1 to make it default.
> 
> Of course, you are right, the results are all that matter. I just wanted
> to ensure I was on the right path before proceeding.
> 
> Please take a look at the attached patch. If you have questions about
> it, I can explain the reasons behind all the changes. Any testing is of
> course very welcome and appreciated.

Sorry, I got a little overzealous fixing things there and tried to do
too much. Please see attached instead.

Steve
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.16 (FreeBSD)

iQEcBAEBAgAGBQJNgXzMAAoJEPXPYrMgexuhYXEIAJu1/7vZkF/5F2NE68YBskXl
IhoZXDONwvpEbcVaRFsxzhgxS1hpWU5Ell0V07CUY5ECPMfTvJRroSmsWyRb/8eO
wa6LYWXIuQZ802q8ZdrtcApamhWBXAPKITFopAzgJ34wRPJb9uvfXCYAiSjfLEB7
BVOXVQBtuBCUlN+Gli826xmeO0Z7o8Ow5HXXR73YiNewMmeRbcA3UGo/rpaqsvzA
oblc6KEhtmBwns36sLNnSj1wOm58cNaQXA8DT+boj/Hmd020U9g5oOGmAXnUTwf6
4POoeV0GfKfVvRV1TY31O07RMCq2A8+joyhQBHgt19LWoP4dDH5QA3VJ5B+Fih0=
=jHm4
-----END PGP SIGNATURE-----
-------------- next part --------------
Index: Mk/bsd.ruby.mk
===================================================================
RCS file: /home/ncvs/ports/Mk/bsd.ruby.mk,v
retrieving revision 1.203
diff -u -r1.203 bsd.ruby.mk
--- Mk/bsd.ruby.mk	22 Nov 2010 05:47:07 -0000	1.203
+++ Mk/bsd.ruby.mk	17 Mar 2011 02:58:39 -0000
@@ -136,7 +136,7 @@
 # RUBY_ELISPDIR		- Installation path for emacs lisp files.
 #
 
-RUBY_DEFAULT_VER?=	1.8
+RUBY_DEFAULT_VER?=	1.9
 RAKE_VER=	0.8.7
 
 RUBY_VER?=		${RUBY_DEFAULT_VER}
@@ -201,7 +201,7 @@
 RUBY_RELVERSION=	1.9.2
 RUBY_PORTREVISION=	0
 RUBY_PORTEPOCH=		1
-RUBY_PATCHLEVEL=	0
+RUBY_PATCHLEVEL=	180
 
 RUBY_VERSION?=		${RUBY_RELVERSION}.${RUBY_PATCHLEVEL}
 RUBY_DISTVERSION?=	${RUBY_RELVERSION}-p${RUBY_PATCHLEVEL}
@@ -382,10 +382,8 @@
 #
 .if defined(USE_RUBYGEMS)
 
-. if ${RUBY_VER} == 1.8
 BUILD_DEPENDS+=	${RUBYGEMBIN}:${PORTSDIR}/devel/ruby-gems
-RUN_DEPENDS+=	${BUILD_DEPENDS}
-. endif
+RUN_DEPENDS+=	${RUBYGEMBIN}:${PORTSDIR}/devel/ruby-gems
 
 PKGNAMEPREFIX?=	rubygem-
 EXTRACT_SUFX=	.gem
Index: lang/ruby19/Makefile
===================================================================
RCS file: /home/ncvs/ports/lang/ruby19/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- lang/ruby19/Makefile	4 Dec 2010 07:32:24 -0000	1.10
+++ lang/ruby19/Makefile	16 Mar 2011 22:39:02 -0000
@@ -86,10 +86,7 @@
 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 rake gem
+INSTALLED_SCRIPTS=	irb erb rdoc ri ruby testrb
 
 EXTSAMPLES=	bigdecimal/sample/*.rb	\
 		curses/hello.rb		\
@@ -104,7 +101,7 @@
 		syslog/syslog.txt
 
 MAN1=		${RUBY_NAME}.1 erb${RUBY_SUFFIX}.1  irb${RUBY_SUFFIX}.1 \
-		rake${RUBY_SUFFIX}.1 ri${RUBY_SUFFIX}.1
+		ri${RUBY_SUFFIX}.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' --
@@ -136,6 +133,17 @@
 	${MV} ${BUILD_WRKSRC}/ext/${d} ${WRKDIR}/
 .endfor
 
+# we get ruby-gems from ports
+.for d in bin/gem doc/rubygems lib/rubygems test/rubygems \
+	lib/rubygems.rb lib/ubygems.rb gem_prelude.rb
+	${RM} -rf ${BUILD_WRKSRC}/${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
+
 post-build:
 #
 # Hack to allow modules to be installed into separate PREFIX and/or under user
@@ -161,10 +169,6 @@
 	${TOUCH} ${RUBY_DOCDIR}/.keep_me
 	${TOUCH} ${RUBY_SITEARCHLIBDIR}/.keep_me
 	${TOUCH} ${RUBY_VENDORARCHLIBDIR}/.keep_me
-.for D in cache doc gems
-	${MKDIR} ${GEMS_DIR}/${D}
-	${TOUCH} ${GEMS_DIR}/${D}/.keep_me
-.endfor
 
 post-install:
 #
@@ -216,13 +220,6 @@
 #
 # Add generated doxygen files to pkg-plist
 #
-.if defined(WITH_RDOC) && !defined(NOPORTDOCS)
-	@${FIND} -ds ${RUBY_DOCDIR}/capi ! -type d | \
-		${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
-	@${FIND} -ds ${RUBY_DOCDIR}/capi -type d | \
-		${SED} -E -e 's,^${PREFIX}/, at dirrm ,' >> ${TMPPLIST}
-.endif
-
 	@${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}
@@ -252,12 +249,10 @@
 #
 # Vendor and site libs
 #
-	@${FIND} -Eds ${RUBY_DOCDIR}/ ! -type d ! -name .keep_me \
-		! -regex "${RUBY_DOCDIR}/capi/?.*" | \
+	@${FIND} -Eds ${RUBY_DOCDIR}/ ! -type d ! -name .keep_me | \
 		${SED} 's,^${RUBY_DOCDIR},%%PORTDOCS%%%%RUBY_DOCDIR%%,' \
 		 >> pkg-plist
-	@${FIND} -Eds ${RUBY_DOCDIR}/ -type d -mindepth 1 ! \
-		-regex "${RUBY_DOCDIR}/capi/?.*" | ${SORT} -r | \
+	@${FIND} -Eds ${RUBY_DOCDIR}/ -type d -mindepth 1 | ${SORT} -r | \
 		${SED} -E -e \
 		's,^${RUBY_DOCDIR}(.*),%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%\1,' \
 		>> pkg-plist
@@ -291,29 +286,6 @@
 	@${FIND} -ds ${RUBY_LIBDIR}/ -type d | ${SORT} -r | \
 		${SED} -E -e 's,^${RUBY_LIBDIR}(.*), at dirrm %%RUBY_LIBDIR%%\1,' >> pkg-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}(.*), at 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
-	@${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/gems" >> 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)
 
Index: lang/ruby19/distinfo
===================================================================
RCS file: /home/ncvs/ports/lang/ruby19/distinfo,v
retrieving revision 1.8
diff -u -r1.8 distinfo
--- lang/ruby19/distinfo	11 Oct 2010 03:09:54 -0000	1.8
+++ lang/ruby19/distinfo	16 Mar 2011 18:31:12 -0000
@@ -1,3 +1,2 @@
-MD5 (ruby/ruby-1.9.2-p0.tar.bz2) = d8a02cadf57d2571cd4250e248ea7e4b
-SHA256 (ruby/ruby-1.9.2-p0.tar.bz2) = e9710990ed8c2e794123aba509010471915fb13c27dae0118831d2001a9c8d3b
-SIZE (ruby/ruby-1.9.2-p0.tar.bz2) = 8495472
+SHA256 (ruby/ruby-1.9.2-p180.tar.bz2) = 06520c4d4b4512d08000f7dfff11d1fabc1d458c3c289c76a2f1ddb7f5a03f4d
+SIZE (ruby/ruby-1.9.2-p180.tar.bz2) = 8815756
Index: lang/ruby19/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/lang/ruby19/pkg-plist,v
retrieving revision 1.7
diff -u -r1.7 pkg-plist
--- lang/ruby19/pkg-plist	20 Dec 2010 02:46:25 -0000	1.7
+++ lang/ruby19/pkg-plist	16 Mar 2011 21:14:01 -0000
@@ -10,10 +10,6 @@
 %%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%%
@@ -69,40 +65,18 @@
 %%PORTDOCS%%%%RUBY_DOCDIR%%/pty/README.expect
 %%PORTDOCS%%%%RUBY_DOCDIR%%/pty/README.expect.ja
 %%PORTDOCS%%%%RUBY_DOCDIR%%/pty/README.ja
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rake/CHANGES
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rake/README
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rake/command_line_usage.rdoc
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rake/example/Rakefile1
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rake/example/Rakefile2
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rake/example/a.c
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rake/example/b.c
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rake/example/main.c
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rake/glossary.rdoc
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rake/jamis.rb
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rake/proto_rake.rdoc
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rake/rakefile.rdoc
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rake/rational.rdoc
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rake/release_notes/rake-0.8.7.rdoc
 %%PORTDOCS%%%%RUBY_DOCDIR%%/re.rdoc
 %%PORTDOCS%%%%RUBY_DOCDIR%%/readline/README
 %%PORTDOCS%%%%RUBY_DOCDIR%%/readline/README.ja
 %%PORTDOCS%%%%RUBY_DOCDIR%%/ripper/README
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rubygems/ChangeLog
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rubygems/History.txt
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rubygems/LICENSE.txt
-%%PORTDOCS%%%%RUBY_DOCDIR%%/rubygems/README
 %%PORTDOCS%%%%RUBY_DOCDIR%%/shell.rd
 %%PORTDOCS%%%%RUBY_DOCDIR%%/shell.rd.ja
 %%PORTDOCS%%%%RUBY_DOCDIR%%/stringio/README
 %%PORTDOCS%%%%RUBY_DOCDIR%%/syslog/syslog.txt
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/syslog
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/stringio
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/rubygems
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/ripper
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/readline
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/rake/release_notes
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/rake/example
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/rake
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/pty
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/irb
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/images
@@ -541,23 +515,6 @@
 %%RUBY_LIBDIR%%/psych/visitors.rb
 %%RUBY_LIBDIR%%/psych.rb
 %%RUBY_LIBDIR%%/racc/parser.rb
-%%RUBY_LIBDIR%%/rake/classic_namespace.rb
-%%RUBY_LIBDIR%%/rake/clean.rb
-%%RUBY_LIBDIR%%/rake/contrib/compositepublisher.rb
-%%RUBY_LIBDIR%%/rake/contrib/ftptools.rb
-%%RUBY_LIBDIR%%/rake/contrib/publisher.rb
-%%RUBY_LIBDIR%%/rake/contrib/rubyforgepublisher.rb
-%%RUBY_LIBDIR%%/rake/contrib/sshpublisher.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/runtest.rb
-%%RUBY_LIBDIR%%/rake/tasklib.rb
-%%RUBY_LIBDIR%%/rake/testtask.rb
-%%RUBY_LIBDIR%%/rake/win32.rb
-%%RUBY_LIBDIR%%/rake.rb
 %%RUBY_LIBDIR%%/rational.rb
 %%RUBY_LIBDIR%%/rbconfig/datadir.rb
 %%RUBY_LIBDIR%%/rdoc/alias.rb
@@ -765,91 +722,6 @@
 %%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/owner_command.rb
-%%RUBY_LIBDIR%%/rubygems/commands/pristine_command.rb
-%%RUBY_LIBDIR%%/rubygems/commands/push_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/setup_command.rb
-%%RUBY_LIBDIR%%/rubygems/commands/sources_command.rb
-%%RUBY_LIBDIR%%/rubygems/commands/specification_command.rb
-%%RUBY_LIBDIR%%/rubygems/commands/stale_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/doc_manager.rb
-%%RUBY_LIBDIR%%/rubygems/errors.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_openssl.rb
-%%RUBY_LIBDIR%%/rubygems/gem_path_searcher.rb
-%%RUBY_LIBDIR%%/rubygems/gem_runner.rb
-%%RUBY_LIBDIR%%/rubygems/gemcutter_utilities.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/package/f_sync_dir.rb
-%%RUBY_LIBDIR%%/rubygems/package/tar_header.rb
-%%RUBY_LIBDIR%%/rubygems/package/tar_input.rb
-%%RUBY_LIBDIR%%/rubygems/package/tar_output.rb
-%%RUBY_LIBDIR%%/rubygems/package/tar_reader/entry.rb
-%%RUBY_LIBDIR%%/rubygems/package/tar_reader.rb
-%%RUBY_LIBDIR%%/rubygems/package/tar_writer.rb
-%%RUBY_LIBDIR%%/rubygems/package.rb
-%%RUBY_LIBDIR%%/rubygems/package_task.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/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/spec_fetcher.rb
-%%RUBY_LIBDIR%%/rubygems/specification.rb
-%%RUBY_LIBDIR%%/rubygems/test_utilities.rb
-%%RUBY_LIBDIR%%/rubygems/text.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
@@ -891,7 +763,6 @@
 %%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
@@ -962,11 +833,6 @@
 @dirrm %%RUBY_LIBDIR%%/test
 @dirrm %%RUBY_LIBDIR%%/syck
 @dirrm %%RUBY_LIBDIR%%/shell
- at dirrm %%RUBY_LIBDIR%%/rubygems/package/tar_reader
- at dirrm %%RUBY_LIBDIR%%/rubygems/package
- at dirrm %%RUBY_LIBDIR%%/rubygems/ext
- at dirrm %%RUBY_LIBDIR%%/rubygems/commands
- at dirrm %%RUBY_LIBDIR%%/rubygems
 @dirrm %%RUBY_LIBDIR%%/rss/maker
 @dirrm %%RUBY_LIBDIR%%/rss/dublincore
 @dirrm %%RUBY_LIBDIR%%/rss/content
@@ -990,9 +856,6 @@
 @dirrm %%RUBY_LIBDIR%%/rdoc/generator
 @dirrm %%RUBY_LIBDIR%%/rdoc
 @dirrm %%RUBY_LIBDIR%%/rbconfig
- at dirrm %%RUBY_LIBDIR%%/rake/loaders
- at dirrm %%RUBY_LIBDIR%%/rake/contrib
- at dirrm %%RUBY_LIBDIR%%/rake
 @dirrm %%RUBY_LIBDIR%%/racc
 @dirrm %%RUBY_LIBDIR%%/psych/visitors
 @dirrm %%RUBY_LIBDIR%%/psych/nodes
@@ -1029,17 +892,6 @@
 @dirrm %%RUBY_LIBDIR%%/%%RUBY_ARCH%%/digest
 @dirrm %%RUBY_LIBDIR%%/%%RUBY_ARCH%%
 @dirrm %%RUBY_LIBDIR%%/
-%%GEMS_DIR%%/cache/.keep_me
-%%GEMS_DIR%%/doc/.keep_me
-%%GEMS_DIR%%/gems/.keep_me
-%%GEMS_DIR%%/specifications/minitest.gemspec
-%%GEMS_DIR%%/specifications/rake.gemspec
-%%GEMS_DIR%%/specifications/rdoc.gemspec
- at dirrm %%GEMS_DIR%%/specifications
- at dirrm %%GEMS_DIR%%/gems
- at dirrm %%GEMS_DIR%%/doc
- at dirrm %%GEMS_DIR%%/cache
- at dirrm %%GEMS_DIR%%/
 %%RUBY_SITEARCHLIBDIR%%/.keep_me
 @dirrm %%RUBY_SITEARCHLIBDIR%%
 @dirrm %%RUBY_SITELIBDIR%%
@@ -1048,5 +900,4 @@
 @dirrm %%RUBY_VENDORARCHLIBDIR%%
 @dirrm %%RUBY_VENDORLIBDIR%%
 @dirrm lib/ruby/vendor_ruby
- at dirrm lib/ruby/gems
 @dirrm lib/ruby
Index: lang/ruby19/files/patch-common-mk
===================================================================
RCS file: lang/ruby19/files/patch-common-mk
diff -N lang/ruby19/files/patch-common-mk
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lang/ruby19/files/patch-common-mk	16 Mar 2011 22:04:59 -0000
@@ -0,0 +1,19 @@
+--- common.mk.orig	2011-03-16 22:04:22.000000000 +0000
++++ common.mk	2011-03-16 22:04:26.000000000 +0000
+@@ -96,7 +96,7 @@
+ 
+ GOLFOBJS      = goruby.$(OBJEXT) golf_prelude.$(OBJEXT)
+ 
+-PRELUDE_SCRIPTS = $(srcdir)/prelude.rb $(srcdir)/enc/prelude.rb $(srcdir)/gem_prelude.rb
++PRELUDE_SCRIPTS = $(srcdir)/prelude.rb $(srcdir)/enc/prelude.rb
+ PRELUDES      = prelude.c miniprelude.c
+ GOLFPRELUDES = golf_prelude.c
+ 
+@@ -738,7 +738,6 @@
+ 	$(BASERUBY) -I$(srcdir) $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $@
+ 
+ prelude.c: $(srcdir)/tool/compile_prelude.rb $(RBCONFIG) \
+-	   $(srcdir)/lib/rubygems/defaults.rb $(srcdir)/lib/rubygems/custom_require.rb \
+ 	   $(PRELUDE_SCRIPTS) $(PREP)
+ 	$(COMPILE_PRELUDE) $(PRELUDE_SCRIPTS) $@
+ 
Index: lang/ruby19/files/patch-tools-rbinstall-rb
===================================================================
RCS file: lang/ruby19/files/patch-tools-rbinstall-rb
diff -N lang/ruby19/files/patch-tools-rbinstall-rb
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lang/ruby19/files/patch-tools-rbinstall-rb	16 Mar 2011 22:21:11 -0000
@@ -0,0 +1,42 @@
+--- tool/rbinstall.rb.orig	2011-03-16 22:17:55.000000000 +0000
++++ tool/rbinstall.rb	2011-03-16 22:19:20.000000000 +0000
+@@ -491,39 +491,6 @@
+   end
+ end
+ 
+-install?(:ext, :comm, :gem) do
+-  directories = []
+-  IO.foreach(File.join(srcdir, "lib/rubygems.rb")) do |line|
+-    if /^\s*DIRECTORIES\s*=\s*%w\[(.*?)\]/ =~ line
+-      directories = $1.split
+-      break
+-    end
+-  end
+-  gpath = CONFIG["sitelibdir"].sub(%r'/site_ruby/(?=[^/]+)', '/gems/')
+-  prepare "default gems", gpath, directories
+-
+-  destdir = File.join(gpath, directories.grep(/^spec/)[0])
+-  default_gems = [
+-    ['rake', 'rake.rb'],
+-    ['rdoc', 'rdoc.rb'],
+-    ['minitest', 'minitest/unit.rb'],
+-  ]
+-  default_gems.each do |name, src|
+-    src = File.join(srcdir, "lib", src)
+-    version = open(src) {|f| f.find {|s| /^\s*\w*VERSION\s*=(?!=)/ =~ s}} or next
+-    version = version.split(%r"=\s*", 2)[1].strip[/\A([\'\"])(.*?)\1/, 2]
+-    puts "#{" "*30}#{name} #{version}"
+-    gemspec = <<-GEMSPEC
+-Gem::Specification.new do |s|
+-  s.name = #{name.dump}
+-  s.version = #{version.dump}
+-  s.summary = "This #{name} is bundled with Ruby"
+-end
+-    GEMSPEC
+-    open_for_install(File.join(destdir, "#{name}-#{version}.gemspec"), $data_mode) { gemspec }
+-  end
+-end
+-
+ parse_args()
+ 
+ include FileUtils
Index: devel/ruby-gems/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/ruby-gems/Makefile,v
retrieving revision 1.39
diff -u -r1.39 Makefile
--- devel/ruby-gems/Makefile	14 Mar 2011 13:12:28 -0000	1.39
+++ devel/ruby-gems/Makefile	17 Mar 2011 01:08:52 -0000
@@ -20,11 +20,11 @@
 
 USE_RUBY=	yes
 RUBY_SETUP=	setup.rb
-RUBY_VER=	1.8
 
 NO_BUILD=	yes
 
-PLIST_SUB+=	DISTNAME="${DISTNAME}"
+PLIST_SUB+=	DISTNAME="${DISTNAME}" \
+		RUBY_SUFFIX="${RUBY_SUFFIX}"
 
 .if !defined(NOPORTDOCS)
 RUBY_SETUP_OPTIONS=
@@ -43,10 +43,6 @@
 
 .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} ${RUBY_SETUP_OPTIONS}
 
Index: devel/ruby-gems/distinfo
===================================================================
RCS file: /home/ncvs/ports/devel/ruby-gems/distinfo,v
retrieving revision 1.22
diff -u -r1.22 distinfo
--- devel/ruby-gems/distinfo	8 Mar 2011 14:01:26 -0000	1.22
+++ devel/ruby-gems/distinfo	16 Mar 2011 22:50:34 -0000
@@ -1,2 +1,2 @@
-SHA256 (ruby/rubygems-1.6.1.tgz) = 95d8db41662cb13b134e1c1e5f9f008361ce6bac6a72852f81bd8cf4525cb577
-SIZE (ruby/rubygems-1.6.1.tgz) = 242148
+SHA256 (ruby/rubygems-1.6.2.tgz) = cb5261818b931b5ea2cb54bc1d583c47823543fcf9682f0d6298849091c1cea7
+SIZE (ruby/rubygems-1.6.2.tgz) = 242518
Index: devel/ruby-gems/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/devel/ruby-gems/pkg-plist,v
retrieving revision 1.24
diff -u -r1.24 pkg-plist
--- devel/ruby-gems/pkg-plist	21 Feb 2011 04:02:51 -0000	1.24
+++ devel/ruby-gems/pkg-plist	17 Mar 2011 01:06:46 -0000
@@ -1,7 +1,7 @@
 @comment $FreeBSD: ports/devel/ruby-gems/pkg-plist,v 1.24 2011/02/21 04:02:51 clsung Exp $
 bin/gem
-bin/gem18
-bin/update_rubygems18
+bin/gem%%RUBY_SUFFIX%%
+bin/update_rubygems%%RUBY_SUFFIX%%
 lib/ruby/gems/%%RUBY_VER%%/cache/sources-0.0.2.gem
 lib/ruby/gems/%%RUBY_VER%%/gems/sources-0.0.2/lib/sources.rb
 lib/ruby/gems/%%RUBY_VER%%/specifications/sources-0.0.2.gemspec
-------------- next part --------------
A non-text attachment was scrubbed...
Name: ruby_19_hacks.txt.sig
Type: application/octet-stream
Size: 287 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/freebsd-ruby/attachments/20110317/29ef2c71/ruby_19_hacks.txt.obj

More information about the freebsd-ruby mailing list