Date: Sun, 12 Jun 2011 18:05:59 -0400 From: Steve Wills <swills@FreeBSD.org> To: Stanislav Sedov <stas@FreeBSD.org> Cc: ruby@FreeBSD.org Subject: Re: ruby 1.9 update patch Message-ID: <4DF53847.2090405@FreeBSD.org> In-Reply-To: <20110525212639.18991589.stas@FreeBSD.org> References: <4DD47A2B.8070905@mouf.net> <4DD583F0.7030308@p6m7g8.com> <4DDCEDED.9030603@mouf.net> <20110525212639.18991589.stas@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format.
--------------080304040608020600000806
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On 05/26/11 00:26, Stanislav Sedov wrote:
> On Wed, 25 May 2011 07:54:21 -0400
> Steve Wills <steve@mouf.net> mentioned:
>
>> -----BEGIN PGP SIGNED MESSAGE-----
>> Hash: SHA1
>>
>> Thanks for the feedback!
>>
>> I was attempting to do some run time testing of this and stumbled upon a
>> strange issue. It seems that even without my patch (and with it too), if
>> you do this:
>>
>> cd /usr/ports/databases/ruby-bdb
>> env RUBY_VER=1.9 make install
>>
>> on a system without any ruby, it will install Ruby 1.9, then fail to
>> install the databases/ruby-bdb port since there will not be a "rdoc"
>> binary installed, but only "rdoc19". My patch doesn't make this worse,
>> but it doesn't help it either. Should I try to solve this and if so how?
>
> It should use ${RUBY_RDOC} instead of just calling rdoc directly.
> This way it will get the correct one.
>
Finally getting back to this.
Here's an updated version of the patch:
http://people.freebsd.org/~swills/ruby19_and_gems_changes3.diff.txt
This, along with a patch to ruby-bdb:
http://people.freebsd.org/~swills/ruby-bdb-patch-extconf-rb.diff.txt
and this patch to portupgrade:
http://people.freebsd.org/~swills/portupgrade-patch-lib-pkgmisc-rb.diff.txt
(all also attached)
seem to fix the issue and let me use portupgrade with Ruby 1.9.
I was never able to track down the PR related to this that was mentioned.
If anyone is willing to test, I would appreciate any feedback. I'm
thinking this will need a -exp run then be ready to inflict upon users. :)
Thanks,
Steve
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (FreeBSD)
iQEcBAEBAgAGBQJN9ThHAAoJEPXPYrMgexuhvYMH/3dJYj68uw8ESWEKdUG5wYHv
g0OaQ+xvRp67ecgkp5dY1IjsuSY+/LDIA6P37UMS5vsqQ2S6xrxL8GszuYlGrk46
+kYN/QwyfQ93/XnSDC1mpNYN1ZEpaDZbMZK9OTf1AtONW24ZA/EGwEzauP9XQfGJ
yiDUh8zN3c9T/T8M4zU92AERI08FiTq1MLrRjdI41gPpFS0h5/WRckXLI2C0s+s7
i8ZAMo8CjT5RNA+EcHx4WVsto+0DyeV15PNvx46R7RdkLyFcmjf2Q7LyGeH5+KLx
KnDolkzqYeza7n/c/x4w8WqLUK5Q6lqo8bECCE+YB+mb/OSfaZCdXtuoxNOopXc=
=f+/C
-----END PGP SIGNATURE-----
--------------080304040608020600000806
Content-Type: text/plain;
name="ruby19_and_gems_changes3.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename="ruby19_and_gems_changes3.diff"
Index: Mk/bsd.ruby.mk
===================================================================
RCS file: /home/ncvs/ports/Mk/bsd.ruby.mk,v
retrieving revision 1.205
diff -u -r1.205 bsd.ruby.mk
--- Mk/bsd.ruby.mk 11 May 2011 05:41:15 -0000 1.205
+++ Mk/bsd.ruby.mk 12 Jun 2011 19:40:29 -0000
@@ -201,7 +201,7 @@
RUBY_RELVERSION= 1.9.2
RUBY_PORTREVISION= 0
RUBY_PORTEPOCH= 1
-RUBY_PATCHLEVEL= 136
+RUBY_PATCHLEVEL= 180
RUBY_VERSION?= ${RUBY_RELVERSION}.${RUBY_PATCHLEVEL}
RUBY_DISTVERSION?= ${RUBY_RELVERSION}-p${RUBY_PATCHLEVEL}
@@ -267,7 +267,11 @@
# Commands
RUBY_RD2?= ${LOCALBASE}/bin/rd2
+.if ${RUBY_VER} == 1.8
RUBY_RDOC?= ${LOCALBASE}/bin/rdoc
+.else
+RUBY_RDOC?= ${LOCALBASE}/bin/rdoc${RUBY_VER:S/.//}
+.endif
# Ports
RUBY_BASE_PORT?= lang/ruby${RUBY_VER:S/.//}
@@ -325,6 +329,10 @@
RUBY18=${RUBY18} \
RUBY19=${RUBY19}
+.if defined(USE_RUBY_RDOC)
+MAKE_ENV+= RUBY_RDOC=${RUBY_RDOC}
+.endif
+
# require check
.if defined(RUBY_REQUIRE)
USE_RUBY= yes
@@ -382,10 +390,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
@@ -547,12 +553,8 @@
.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/rake${RUBY_VER:S/.//}
-.endif
.endif
.if defined(USE_RUBY_AMSTD)
Index: devel/ruby-gems/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/ruby-gems/Makefile,v
retrieving revision 1.41
diff -u -r1.41 Makefile
--- devel/ruby-gems/Makefile 8 Apr 2011 04:08:48 -0000 1.41
+++ devel/ruby-gems/Makefile 12 Jun 2011 19:25:37 -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/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/devel/ruby-gems/pkg-plist,v
retrieving revision 1.25
diff -u -r1.25 pkg-plist
--- devel/ruby-gems/pkg-plist 6 Apr 2011 07:23:00 -0000 1.25
+++ devel/ruby-gems/pkg-plist 12 Jun 2011 19:25:37 -0000
@@ -1,7 +1,7 @@
@comment $FreeBSD: ports/devel/ruby-gems/pkg-plist,v 1.25 2011/04/06 07:23:00 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
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 12 Jun 2011 19:25:37 -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}/,@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}(.*),@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}(.*),@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.9
diff -u -r1.9 distinfo
--- lang/ruby19/distinfo 11 May 2011 05:41:15 -0000 1.9
+++ lang/ruby19/distinfo 12 Jun 2011 19:25:37 -0000
@@ -1,2 +1,2 @@
-SHA256 (ruby/ruby-1.9.2-p136.tar.bz2) = 33092509aad118f07f0483a3db1d4c5adaccf4bb0324cd43f44e3bd3dd1858cb
-SIZE (ruby/ruby-1.9.2-p136.tar.bz2) = 8819324
+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.8
diff -u -r1.8 pkg-plist
--- lang/ruby19/pkg-plist 11 May 2011 05:41:15 -0000 1.8
+++ lang/ruby19/pkg-plist 12 Jun 2011 19:25:37 -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
-@dirrm %%RUBY_LIBDIR%%/rubygems/package/tar_reader
-@dirrm %%RUBY_LIBDIR%%/rubygems/package
-@dirrm %%RUBY_LIBDIR%%/rubygems/ext
-@dirrm %%RUBY_LIBDIR%%/rubygems/commands
-@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
-@dirrm %%RUBY_LIBDIR%%/rake/loaders
-@dirrm %%RUBY_LIBDIR%%/rake/contrib
-@dirrm %%RUBY_LIBDIR%%/rake
@dirrm %%RUBY_LIBDIR%%/racc
@dirrm %%RUBY_LIBDIR%%/psych/visitors
@dirrm %%RUBY_LIBDIR%%/psych/nodes
@@ -1029,20 +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-1.6.0.gemspec
-%%GEMS_DIR%%/specifications/minitest.gemspec
-%%GEMS_DIR%%/specifications/rake-0.8.7.gemspec
-%%GEMS_DIR%%/specifications/rake.gemspec
-%%GEMS_DIR%%/specifications/rdoc-2.5.8.gemspec
-%%GEMS_DIR%%/specifications/rdoc.gemspec
-@dirrm %%GEMS_DIR%%/specifications
-@dirrm %%GEMS_DIR%%/gems
-@dirrm %%GEMS_DIR%%/doc
-@dirrm %%GEMS_DIR%%/cache
-@dirrm %%GEMS_DIR%%/
%%RUBY_SITEARCHLIBDIR%%/.keep_me
@dirrm %%RUBY_SITEARCHLIBDIR%%
@dirrm %%RUBY_SITELIBDIR%%
@@ -1051,5 +900,4 @@
@dirrm %%RUBY_VENDORARCHLIBDIR%%
@dirrm %%RUBY_VENDORLIBDIR%%
@dirrmtry lib/ruby/vendor_ruby
-@dirrmtry lib/ruby/gems
@dirrmtry lib/ruby
Index: lang/ruby19/files/patch-common.mk
===================================================================
RCS file: /home/ncvs/ports/lang/ruby19/files/patch-common.mk,v
retrieving revision 1.1
diff -u -r1.1 patch-common.mk
--- lang/ruby19/files/patch-common.mk 11 Oct 2010 03:09:54 -0000 1.1
+++ lang/ruby19/files/patch-common.mk 12 Jun 2011 19:25:37 -0000
@@ -1,5 +1,14 @@
---- common.mk.orig 2010-10-10 16:40:15.000000000 -0700
-+++ common.mk 2010-10-10 16:40:42.000000000 -0700
+--- common.mk.orig 2011-05-17 21:19:20.689620679 -0400
++++ common.mk 2011-05-17 21:19:28.688621223 -0400
+@@ -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
+
@@ -256,7 +256,7 @@
install-capi: capi pre-install-capi do-install-capi post-install-capi
pre-install-capi:: install-prereq
@@ -9,3 +18,11 @@
post-install-capi::
@$(NULLCMD)
+@@ -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 12 Jun 2011 19:25:37 -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
--------------080304040608020600000806
Content-Type: text/plain;
name="ruby-bdb-patch-extconf-rb.diff.txt"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="ruby-bdb-patch-extconf-rb.diff.txt"
--- extconf.rb.orig 2011-06-12 14:46:03.000000000 +0000
+++ extconf.rb 2011-06-12 14:46:22.000000000 +0000
@@ -50,13 +50,13 @@
rdoc: docs/doc/index.html
docs/doc/index.html: $(RDOC)
-\t@-(cd docs; rdoc .)
+\t@-(cd docs; ${RUBY_RDOC} .)
ri:
-\t@-(rdoc -r docs/*rb)
+\t@-(${RUBY_RDOC} -r docs/*rb)
ri-site:
-\t@-(rdoc -R docs/*rb)
+\t@-(${RUBY_RDOC} -R docs/*rb)
rd2: html
--------------080304040608020600000806
Content-Type: text/plain;
name="portupgrade-patch-lib-pkgmisc-rb.diff.txt"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename="portupgrade-patch-lib-pkgmisc-rb.diff.txt"
--- lib/pkgmisc.rb.orig 2011-06-12 17:45:04.000000000 +0000
+++ lib/pkgmisc.rb 2011-06-12 17:45:11.000000000 +0000
@@ -107,17 +107,21 @@
module LIBC
PATH_MAX = 1024
- extend DL::Importable
+ begin
+ extend DL::Importable
+ rescue NameError
+ extend DL::Importer # Ruby 1.9 use this
+ end
dlload "libc.so"
extern "const char *realpath(char *, char *)"
end
- def File.realpath(path)
+ def realpath(path)
return LIBC.realpath(path, "\0" * LIBC::PATH_MAX) ||
File.expand_path(path)
end
rescue LoadError, RuntimeError
- def File.realpath(path)
+ def realpath(path)
return File.expand_path(path)
end
end
--------------080304040608020600000806
Content-Type: application/octet-stream;
name="ruby19_and_gems_changes3.diff.sig"
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="ruby19_and_gems_changes3.diff.sig"
iQEcBAABAgAGBQJN9ThHAAoJEPXPYrMgexuhSUUIAKB76Vbim9zrojwlYUokdfd9eJS3PsZd
wIN8fuiE5RUqqKVrTMks2sb7s6+7SJM2QPPvCcA8h8jL/26GdRjqGOQrzSUlmmlF+L+mMhKn
WN9jL+ctGIHgwg+EJUPZWTDRNgv2XOlv1/xf6R1eS4IKAiP0l4JQe555dLWvkmUTHlaNNDpA
CsRHQWShHhiEOSrZF2KTpo9ZnXetSCEtIZZ6uiij6i5cSnTCDMMxuJjobMPHxWSNzPdd4vpE
xPwgXS59gRdg55hAl3e9qFomuVbQxtg8v9EO+SB1cy67DkT5efIm0x+TdjFCrxgumKY057vh
cCEXU9sCZI1FoxGpGdE5qww=
--------------080304040608020600000806
Content-Type: application/octet-stream;
name="ruby-bdb-patch-extconf-rb.diff.txt.sig"
Content-Transfer-Encoding: base64
Content-Disposition: attachment;
filename="ruby-bdb-patch-extconf-rb.diff.txt.sig"
iQEcBAABAgAGBQJN9ThHAAoJEPXPYrMgexuhOGgH/ir6mCW67cqgU1YdyUQa84VpaeY1A/+5
cLKvvKtlxT74MrQ47KndK0VnVX5Esr9/3OAgNkzPFQGCSTinA/++Rg1thODT6UMXkA6OkJCO
g6yBW7D5s7Rr0xYFNRA1NlsI1IjaBB2omwN8VXBV583tetAG+kAC0aKTOSWmCTVXTGCekSOa
MNFB81sD19xiq07TM/gdIG6akBhD9YAwEoGowakq+u/HX/r6TJpFES2UxQWyHwQkrF1hCrT3
VTF63QI1a/OEGjGluBg4ivEfmth+rp3l2zLx32yatxGXE6pWNfJqQmOdfgU1QhV831WENvAT
S39PEDcUJebnuCsCls4X26g=
--------------080304040608020600000806
Content-Type: application/octet-stream;
name="portupgrade-patch-lib-pkgmisc-rb.diff.txt.sig"
Content-Transfer-Encoding: base64
Content-Disposition: attachment;
filename="portupgrade-patch-lib-pkgmisc-rb.diff.txt.sig"
iQEcBAABAgAGBQJN9ThHAAoJEPXPYrMgexuh86cH/jws3MIfe6C3G0z0WuOaLYc2KYBIHF6F
vcIMioL/M9LA2c5XfovmsTtqJPf4JhGxmWnOMI63xOHq/U93UL2XVlxkRgVKH04wPu9L/RsC
JQAHj2Htg4vzxdp3LOWNr5wIGOYnmbrPF3amrCEVt7ncbVyjQ0AS5QaewOZuoEo2/ub5LJAw
tfBZZRPfcPiq8vha40r5C/NW6md8Yrzf93VuFLxokwDPKpDW8TBelgWlM1mOLb0zNirgJWgr
NQNST9RXy/va/ntd1UUba4lTkx29vqPVgTyYeJWZEkIEOeEX8uknCc4gLr5KUjbQdst+20ff
qeNlcJ8maknkrO+FIf7vd5s=
--------------080304040608020600000806--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4DF53847.2090405>