From owner-svn-ports-head@FreeBSD.ORG Sun Feb 24 15:41:09 2013 Return-Path: Delivered-To: svn-ports-head@FreeBSD.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 069B3445; Sun, 24 Feb 2013 15:41:09 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from mouf.net (mouf.net [IPv6:2607:fc50:0:4400:216:3eff:fe69:33b3]) by mx1.freebsd.org (Postfix) with ESMTP id 7AE9875E; Sun, 24 Feb 2013 15:41:08 +0000 (UTC) Received: from mouf.net (www@mouf [199.48.129.64]) by mouf.net (8.14.5/8.14.5) with ESMTP id r1OFejGc031717; Sun, 24 Feb 2013 15:40:50 GMT (envelope-from swills@FreeBSD.org) Received: from 2001:470:8:58f:d2df:9aff:fecf:9339 (SquirrelMail authenticated user swills) by mouf.net with HTTP; Sun, 24 Feb 2013 10:40:58 -0500 Message-ID: <4f1e57ea6b27260982ee94d1c7f211ac.squirrel@mouf.net> In-Reply-To: <201302241537.r1OFbNA0085713@svn.freebsd.org> References: <201302241537.r1OFbNA0085713@svn.freebsd.org> Date: Sun, 24 Feb 2013 10:40:58 -0500 Subject: Re: svn commit: r312871 - in head: Mk lang lang/ruby20 lang/ruby20/files From: "Steve Wills" To: ports-committers@FreeBSD.org, svn-ports-all@FreeBSD.org, svn-ports-head@FreeBSD.org User-Agent: SquirrelMail/1.4.22 MIME-Version: 1.0 Content-Type: text/plain;charset=iso-8859-1 Content-Transfer-Encoding: 8bit X-Priority: 3 (Normal) Importance: Normal X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.2.7 (mouf.net [199.48.129.64]); Sun, 24 Feb 2013 15:40:58 +0000 (UTC) X-Spam-Status: No, score=0.0 required=4.5 tests=none autolearn=unavailable version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on mouf.net X-Virus-Scanned: clamav-milter 0.97.6 at mouf.net X-Virus-Status: Clean X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Feb 2013 15:41:09 -0000 Forgot to say: PR: ports/174103 Submitted by: stas > Author: swills > Date: Sun Feb 24 15:37:23 2013 > New Revision: 312871 > URL: http://svnweb.freebsd.org/changeset/ports/312871 > > Log: > - Add Ruby 2.0 > > Added: > head/lang/ruby20/ > - copied from r310851, head/lang/ruby19/ > Deleted: > head/lang/ruby20/files/patch-common.mk > Modified: > head/Mk/bsd.ruby.mk > head/lang/Makefile > head/lang/ruby20/Makefile > head/lang/ruby20/distinfo > head/lang/ruby20/files/patch-configure.in (contents, props changed) > head/lang/ruby20/files/patch-cont.c (contents, props changed) > head/lang/ruby20/files/patch-lib_mkmf.rb (contents, props changed) > head/lang/ruby20/files/patch-tool_mkconfig.rb (contents, props > changed) > head/lang/ruby20/files/patch-tool_rbinstall.rb (contents, props > changed) > head/lang/ruby20/pkg-plist > > Modified: head/Mk/bsd.ruby.mk > ============================================================================== > --- head/Mk/bsd.ruby.mk Sun Feb 24 15:32:24 2013 (r312870) > +++ head/Mk/bsd.ruby.mk Sun Feb 24 15:37:23 2013 (r312871) > @@ -188,6 +188,7 @@ RUBY_WRKSRC= ${WRKDIR}/ruby-${RUBY_DIST > # > RUBY18= "" > RUBY19= "@comment " > +RUBY20= "@comment " > > . elif ${RUBY_VER} == 1.9 > # > @@ -215,12 +216,40 @@ RUBY_CONFIGURE_ARGS+= --with-rubyhdrdir= > # > RUBY18= "@comment " > RUBY19= "" > +RUBY20= "@comment " > + > +. elif ${RUBY_VER} == 2.0 > +# > +# Ruby 2.0 > +# > +RUBY_RELVERSION= 2.0.0 > +RUBY_PORTREVISION= 0 > +RUBY_PORTEPOCH= 1 > +RUBY_PATCHLEVEL= 0 > + > +RUBY_VERSION?= ${RUBY_RELVERSION}.${RUBY_PATCHLEVEL} > +RUBY_DISTVERSION?= ${RUBY_RELVERSION}-p${RUBY_PATCHLEVEL} > + > +RUBY_WRKSRC= ${WRKDIR}/ruby-${RUBY_DISTVERSION} > + > +RUBY_CONFIGURE_ARGS+= --with-rubyhdrdir="${PREFIX}/include/ruby-2.0/" \ > + --with-rubylibprefix="${PREFIX}/lib/ruby" \ > + --docdir="${RUBY_DOCDIR}" \ > + --with-soname=ruby20 > + > +# > +# PLIST_SUB helpers > +# > +RUBY18= "@comment " > +RUBY19= "@comment " > +RUBY20= "" > + > > . else > # > # Other versions > # > -IGNORE= Only ruby 1.8 and 1.9 are supported > +IGNORE= Only ruby 1.8, 1.9 and 2.0 are supported > . endif > .endif # defined(RUBY_VER) > > @@ -318,7 +347,8 @@ PLIST_SUB+= ${PLIST_RUBY_DIRS:C,DIR="($ > RUBY_NAME="${RUBY_NAME}" \ > RUBY_DEFAULT_SUFFIX="${RUBY_DEFAULT_SUFFIX}" \ > RUBY18=${RUBY18} \ > - RUBY19=${RUBY19} > + RUBY19=${RUBY19} \ > + RUBY20=${RUBY20} \ > > .if defined(USE_RUBY_RDOC) > MAKE_ENV+= RUBY_RDOC=${RUBY_RDOC} > @@ -546,9 +576,11 @@ RUN_DEPENDS+= ${DEPEND_RUBY} > > _use= ${USE_RUBY_FEATURES:Miconv} > .if !empty(_use) > +.if (${RUBY_VER} == 1.8) || (${RUBY_VER} == 1.9) > BUILD_DEPENDS+= ${DEPEND_RUBY_ICONV} > RUN_DEPENDS+= ${DEPEND_RUBY_ICONV} > .endif > +.endif > > .undef _use > .endif > > Modified: head/lang/Makefile > ============================================================================== > --- head/lang/Makefile Sun Feb 24 15:32:24 2013 (r312870) > +++ head/lang/Makefile Sun Feb 24 15:37:23 2013 (r312871) > @@ -297,6 +297,7 @@ > SUBDIR += ruby-usersguide > SUBDIR += ruby18 > SUBDIR += ruby19 > + SUBDIR += ruby20 > SUBDIR += runawk > SUBDIR += rust > SUBDIR += s9fes > > Modified: head/lang/ruby20/Makefile > ============================================================================== > --- head/lang/ruby19/Makefile Wed Jan 23 02:58:42 2013 (r310851) > +++ head/lang/ruby20/Makefile Sun Feb 24 15:37:23 2013 (r312871) > @@ -1,4 +1,4 @@ > -# Created by: Akinori MUSHA aka knu > +# Created by: Akinori MUSHA aka knu > # $FreeBSD$ > > PORTNAME= ruby > @@ -14,7 +14,7 @@ DIST_SUBDIR= ruby > MAINTAINER= ruby@FreeBSD.org > COMMENT?= An object-oriented interpreted scripting language > > -LIB_DEPENDS= ffi.5:${PORTSDIR}/devel/libffi \ > +LIB_DEPENDS= ffi:${PORTSDIR}/devel/libffi \ > yaml-0.2:${PORTSDIR}/textproc/libyaml \ > execinfo.1:${PORTSDIR}/devel/libexecinfo > > @@ -32,7 +32,7 @@ USE_AUTOTOOLS= autoconf > > WRKSRC= ${WRKDIR}/${PORTNAME}-${RUBY_DISTVERSION} > > -RUBY_VER= 1.9 > +RUBY_VER= 2.0 > USE_BZIP2= yes > USE_RUBY= yes > RUBY_NO_BUILD_DEPENDS= yes > @@ -92,8 +92,7 @@ EXTSAMPLES= bigdecimal/sample/*.rb \ > curses/view.rb \ > curses/view2.rb > > -EXTDOCS= bigdecimal/bigdecimal_*.html \ > - readline/README* \ > +EXTDOCS= readline/README* \ > ripper/README \ > stringio/README \ > syslog/syslog.txt > @@ -173,7 +172,7 @@ post-install: > .endif > > # > -# Link just installed "ruby" to "ruby18", etc. > +# Link just installed "ruby" to "ruby20", etc. > # > .if ${RUBY_VER} == ${RUBY_DEFAULT_VER} > . for FILE in ${INSTALLED_SCRIPTS} > @@ -231,7 +230,7 @@ plist:: > @${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 > - @${ECHO_CMD} "libdata/pkgconfig/ruby-1.9.pc" >> pkg-plist > + @${ECHO_CMD} "libdata/pkgconfig/ruby-2.0.pc" >> pkg-plist > > # > # Includes > @@ -293,7 +292,6 @@ 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 > > > Modified: head/lang/ruby20/distinfo > ============================================================================== > --- head/lang/ruby19/distinfo Wed Jan 23 02:58:42 2013 (r310851) > +++ head/lang/ruby20/distinfo Sun Feb 24 15:37:23 2013 (r312871) > @@ -1,2 +1,2 @@ > -SHA256 (ruby/ruby-1.9.3-p327.tar.bz2) = > d989465242f9b11a8a3aa8cbd2c75a9b3a8c0ec2f14a087a0c7b51abf164e488 > -SIZE (ruby/ruby-1.9.3-p327.tar.bz2) = 9975835 > +SHA256 (ruby/ruby-2.0.0-p0.tar.bz2) = > c680d392ccc4901c32067576f5b474ee186def2fcd3fcbfa485739168093295f > +SIZE (ruby/ruby-2.0.0-p0.tar.bz2) = 10814890 > > Modified: head/lang/ruby20/files/patch-configure.in > ============================================================================== > --- head/lang/ruby19/files/patch-configure.in Wed Jan 23 02:58:42 > 2013 (r310851) > +++ head/lang/ruby20/files/patch-configure.in Sun Feb 24 15:37:23 > 2013 (r312871) > @@ -1,8 +1,8 @@ > ---- configure.in.orig 2012-02-15 19:26:09.000000000 -0500 > -+++ configure.in 2012-02-16 22:28:27.617422641 -0500 > -@@ -1118,11 +1118,11 @@ > - [superux*], [ ac_cv_func_setitimer=no > - ], > +--- configure.in.orig 2013-02-24 14:27:36.217251070 +0000 > ++++ configure.in 2013-02-24 14:27:25.267251221 +0000 > +@@ -1308,11 +1308,11 @@ > + ac_cv_func_fcntl=no > + ], > [ LIBS="-lm $LIBS"]) > -AC_CHECK_LIB(crypt, crypt) > -AC_CHECK_LIB(dl, dlopen) # Dynamic linking for SunOS/Solaris and SYSV > @@ -10,14 +10,14 @@ > -AC_CHECK_LIB(socket, socketpair) # SunOS/Solaris > -AC_CHECK_LIB(rt, clock_gettime) # GNU/Linux > +AC_SEARCH_LIBS(crypt, crypt) > -+AC_SEARCH_LIBS(dlopen, dl) # Dynamic linking for SunOS/Solaris and SYSV > -+AC_SEARCH_LIBS(shl_load, dld) # Dynamic linking for HP-UX > -+AC_SEARCH_LIBS(socketpair, socket) # SunOS/Solaris > -+AC_SEARCH_LIBS(clock_gettime, rt) # GNU/Linux > - if test "${enable_win95}" = maybe; then > - AC_HAVE_LIBRARY(unicows, [enable_win95=yes], [enable_win95=no]) > - fi > -@@ -1815,7 +1815,7 @@ > ++AC_SEARCH_LIBS(dl, dlopen) # Dynamic linking for SunOS/Solaris and SYSV > ++AC_SEARCH_LIBS(dld, shl_load) # Dynamic linking for HP-UX > ++AC_SEARCH_LIBS(socket, socketpair) # SunOS/Solaris > ++AC_SEARCH_LIBS(rt, clock_gettime) # GNU/Linux > + > + AS_CASE(["$target_cpu"], > + [alpha*|sh4|sh4el|sh4eb], [AS_CASE(["$target_os"::"$GCC"], > +@@ -2018,7 +2018,7 @@ > fi > > if test x"$enable_pthread" = xyes; then > @@ -26,7 +26,7 @@ > AC_CHECK_LIB($pthread_lib, pthread_kill, > rb_with_pthread=yes, rb_with_pthread=no) > if test "$rb_with_pthread" = "yes"; then break; fi > -@@ -1823,6 +1823,7 @@ > +@@ -2026,6 +2026,7 @@ > if test x"$rb_with_pthread" = xyes; then > AC_DEFINE(_REENTRANT) > AC_DEFINE(_THREAD_SAFE) > @@ -34,3 +34,19 @@ > AC_DEFINE(HAVE_LIBPTHREAD) > AC_CHECK_HEADERS(pthread_np.h, [], [], [@%:@include ]) > AS_CASE([$pthread_lib], > +@@ -2263,7 +2264,6 @@ > + : ${LDSHARED='$(CC) -shared'} > + if test "$rb_cv_binary_elf" = yes; then > + LDFLAGS="$LDFLAGS -rdynamic" > +- DLDFLAGS="$DLDFLAGS "'-Wl,-soname,$(.TARGET)' > + else > + test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || > LDSHARED='$(LD) -Bshareable' > + fi > +@@ -2649,6 +2649,7 @@ > + [freebsd*|dragonfly*], [ > + SOLIBS='$(LIBS)' > + LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)' > ++ LIBRUBY_DLDFLAGS='-Wl,-soname,$(LIBRUBY_SO)' > + if test "$rb_cv_binary_elf" != "yes" ; then > + LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)" > + LIBRUBY_ALIASES='' > > Modified: head/lang/ruby20/files/patch-cont.c > ============================================================================== > --- head/lang/ruby19/files/patch-cont.c Wed Jan 23 02:58:42 2013 (r310851) > +++ head/lang/ruby20/files/patch-cont.c Sun Feb 24 15:37:23 2013 (r312871) > @@ -1,11 +1,11 @@ > ---- cont.c.orig 2012-02-16 22:31:17.691397569 -0500 > -+++ cont.c 2012-02-16 22:31:31.507395417 -0500 > +--- cont.c.orig 2013-01-30 04:17:59.000000000 +0000 > ++++ cont.c 2013-02-17 21:39:30.712834241 +0000 > @@ -15,7 +15,7 @@ > #include "gc.h" > #include "eval_intern.h" > > --#if ((defined(_WIN32) && _WIN32_WINNT >= 0x0400) || > (defined(HAVE_GETCONTEXT) && defined(HAVE_SETCONTEXT))) && > !defined(__NetBSD__) && !defined(sun) && !defined(FIBER_USE_NATIVE) > -+#if ((defined(_WIN32) && _WIN32_WINNT >= 0x0400) || > (defined(HAVE_GETCONTEXT) && defined(HAVE_SETCONTEXT))) && > !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(sun) && > !defined(FIBER_USE_NATIVE) > +-#if ((defined(_WIN32) && _WIN32_WINNT >= 0x0400) || > (defined(HAVE_GETCONTEXT) && defined(HAVE_SETCONTEXT))) && > !defined(__NetBSD__) && !defined(__sun) && !defined(__ia64) && > !defined(FIBER_USE_NATIVE) > ++#if ((defined(_WIN32) && _WIN32_WINNT >= 0x0400) || > (defined(HAVE_GETCONTEXT) && defined(HAVE_SETCONTEXT))) && > !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__sun) && > !defined(__ia64) && !defined(FIBER_USE_NATIVE) > #define FIBER_USE_NATIVE 1 > > /* FIBER_USE_NATIVE enables Fiber performance improvement using system > > Modified: head/lang/ruby20/files/patch-lib_mkmf.rb > ============================================================================== > --- head/lang/ruby19/files/patch-lib_mkmf.rb Wed Jan 23 02:58:42 > 2013 (r310851) > +++ head/lang/ruby20/files/patch-lib_mkmf.rb Sun Feb 24 15:37:23 > 2013 (r312871) > @@ -1,11 +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 > +--- lib/mkmf.rb.orig 2012-11-28 04:19:49.000000000 -0800 > ++++ lib/mkmf.rb 2012-12-03 23:18:58.000000000 -0800 > +@@ -204,7 +204,7 @@ > + $extmk &&= true > + if not $extmk and File.exist?(RbConfig::CONFIG["rubyhdrdir"] + > "/ruby/ruby.h") > + $hdrdir = CONFIG["rubyhdrdir"] > +- $topdir = $hdrdir > ++ $topdir = $hdrdir + "/" + "#{CONFIG['arch']}/ruby/" > + $top_srcdir = $hdrdir > + $arch_hdrdir = "$(hdrdir)/$(arch)" > + elsif File.exist?(($hdrdir = ($top_srcdir ||= topdir) + "/include") + > "/ruby.h") > > Modified: head/lang/ruby20/files/patch-tool_mkconfig.rb > ============================================================================== > --- head/lang/ruby19/files/patch-tool_mkconfig.rb Wed Jan 23 02:58:42 > 2013 (r310851) > +++ head/lang/ruby20/files/patch-tool_mkconfig.rb Sun Feb 24 15:37:23 > 2013 (r312871) > @@ -1,12 +1,12 @@ > ---- tool/mkconfig.rb.orig 2010-10-04 00:53:53.000000000 -0700 > -+++ tool/mkconfig.rb 2010-10-04 00:55:18.000000000 -0700 > -@@ -136,7 +136,8 @@ > - > - drive = File::PATH_SEPARATOR == ';' > - > --prefix = "/lib/ruby/#{version}/#{arch}" > +--- tool/mkconfig.rb.orig 2013-02-07 07:21:30.000000000 +0000 > ++++ tool/mkconfig.rb 2013-02-17 21:42:09.807835598 +0000 > +@@ -167,7 +167,8 @@ > + val > + end > + vars["prefix"] = "" > +-prefix = vars.expand(vars["rubyarchdir"]) > +major, minor, *rest = RUBY_VERSION.split('.') > +prefix = "/lib/ruby/#{major}.#{minor}/#{arch}" > print " TOPDIR = File.dirname(__FILE__).chomp!(#{prefix.dump})\n" > print " DESTDIR = ", (drive ? "TOPDIR && TOPDIR[/\\A[a-z]:/i] || " : > ""), "'' unless defined? DESTDIR\n" > - print " CONFIG = {}\n" > + print <<'ARCH' if universal > > Modified: head/lang/ruby20/files/patch-tool_rbinstall.rb > ============================================================================== > --- head/lang/ruby19/files/patch-tool_rbinstall.rb Wed Jan 23 02:58:42 > 2013 (r310851) > +++ head/lang/ruby20/files/patch-tool_rbinstall.rb Sun Feb 24 15:37:23 > 2013 (r312871) > @@ -1,14 +1,14 @@ > ---- tool/rbinstall.rb.orig 2011-07-30 07:19:11.000000000 -0700 > -+++ tool/rbinstall.rb 2011-11-19 00:08:56.000000000 -0800 > -@@ -292,6 +292,7 @@ > - > - bindir = CONFIG["bindir"] > - libdir = CONFIG["libdir"] > -+libdatadir = CONFIG["prefix"] + "/" + "libdata" > - archhdrdir = rubyhdrdir = CONFIG["rubyhdrdir"] > - archhdrdir += "/" + CONFIG["arch"] > - rubylibdir = CONFIG["rubylibdir"] > -@@ -349,7 +350,7 @@ > +--- tool/rbinstall.rb.orig 2013-02-07 08:02:31.000000000 +0000 > ++++ tool/rbinstall.rb 2013-02-17 21:44:37.906833639 +0000 > +@@ -307,6 +307,7 @@ > + libdir = CONFIG["libdir", true] > + rubyhdrdir = CONFIG["rubyhdrdir", true] > + archhdrdir = CONFIG["rubyarchhdrdir"] || (rubyhdrdir + "/" + > CONFIG['arch']) > ++libdatadir = CONFIG["prefix", true] + "/" + "libdata" > + rubylibdir = CONFIG["rubylibdir", true] > + archlibdir = CONFIG["rubyarchdir", true] > + sitelibdir = CONFIG["sitelibdir"] > +@@ -362,7 +363,7 @@ > install?(:local, :arch, :data) do > pc = CONFIG["ruby_pc"] > if pc and File.file?(pc) and File.size?(pc) > @@ -17,18 +17,23 @@ > install pc, pkgconfigdir, :mode => $data_mode > end > end > -@@ -531,54 +532,6 @@ > - end > +@@ -684,62 +685,6 @@ > end > + # :startdoc: > > -install?(:ext, :comm, :gem) do > - $:.unshift(File.join(srcdir, "lib")) > - require("rubygems.rb") > - gem_dir = Gem.default_dir > -- directories = Gem.ensure_gem_subdirectories(gem_dir) > +- # Gem.ensure_gem_subdirectories makes subdirectories group-writable. > +- directories = Gem::REPOSITORY_SUBDIRECTORIES > - prepare "default gems", gem_dir, directories > - > - spec_dir = File.join(gem_dir, directories.grep(/^spec/)[0]) > +- default_spec_dir = "#{spec_dir}/default" > +- makedirs(default_spec_dir) > +- > +- gems = {} > - File.foreach(File.join(srcdir, "defs/default_gems")) do |line| > - line.chomp! > - line.sub!(/\s*#.*/, '') > @@ -37,34 +42,37 @@ > - line.scan(/\G\s*([^\[\]\s]+|\[([^\[\]]*)\])/) do > - words << ($2 ? $2.split : $1) > - end > -- name, src, execs = *words > -- next unless name and src > -- execs ||= [] > -- src = File.join(srcdir, 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] > -- full_name = "#{name}-#{version}" > -- > -- puts "#{" "*30}#{name} #{version}" > -- open_for_install(File.join(spec_dir, "#{full_name}.gemspec"), > $data_mode) do > -- <<-GEMSPEC > --Gem::Specification.new do |s| > -- s.name = #{name.dump} > -- s.version = #{version.dump} > -- s.summary = "This #{name} is bundled with Ruby" > -- s.executables = #{execs.inspect} > --end > -- GEMSPEC > +- name, base_dir, src, execs = *words > +- next unless name and base_dir and src > +- > +- src = File.join(srcdir, src) > +- base_dir = File.join(srcdir, base_dir) > +- specgen = RbInstall::Specs::Generator.new(name, base_dir, src, > execs || []) > +- gems[name] ||= specgen > +- end > +- > +- Dir.glob(srcdir+"/{lib,ext}/**/*.gemspec").each do |src| > +- specgen = RbInstall::Specs::Reader.new(src) > +- gems[specgen.gemspec.name] ||= specgen > +- end > +- > +- gems.sort.each do |name, specgen| > +- gemspec = specgen.gemspec > +- base_dir = specgen.src.sub(/\A#{Regexp.escape(srcdir)}\//, "") > +- full_name = "#{gemspec.name}-#{gemspec.version}" > +- > +- puts "#{" "*30}#{gemspec.name} #{gemspec.version}" > +- gemspec_path = File.join(default_spec_dir, "#{full_name}.gemspec") > +- open_for_install(gemspec_path, $data_mode) do > +- specgen.spec_source > - end > - > -- unless execs.empty? then > +- unless gemspec.executables.empty? then > - bin_dir = File.join(gem_dir, 'gems', full_name, 'bin') > - makedirs(bin_dir) > - > -- execs.each do |exec| > -- exec = File.join(srcdir, 'bin', exec) > -- install(exec, bin_dir, :mode => $prog_mode) > -- end > +- execs = gemspec.executables.map {|exec| File.join(srcdir, 'bin', > exec)} > +- install(execs, bin_dir, :mode => $prog_mode) > - end > - end > -end > > Modified: head/lang/ruby20/pkg-plist > ============================================================================== > --- head/lang/ruby19/pkg-plist Wed Jan 23 02:58:42 2013 (r310851) > +++ head/lang/ruby20/pkg-plist Sun Feb 24 15:37:23 2013 (r312871) > @@ -13,35 +13,37 @@ bin/testrb%%RUBY_SUFFIX%% > lib/lib%%RUBY_NAME%%-static.a > lib/lib%%RUBY_NAME%%.so > lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%% > -libdata/pkgconfig/ruby-1.9.pc > -include/ruby-1.9/%%RUBY_ARCH%%/ruby/config.h > -include/ruby-1.9/ruby/backward/classext.h > -include/ruby-1.9/ruby/backward/rubyio.h > -include/ruby-1.9/ruby/backward/rubysig.h > -include/ruby-1.9/ruby/backward/st.h > -include/ruby-1.9/ruby/backward/util.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/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/st.h > -include/ruby-1.9/ruby/subst.h > -include/ruby-1.9/ruby/util.h > -include/ruby-1.9/ruby/version.h > -include/ruby-1.9/ruby/vm.h > -include/ruby-1.9/ruby.h > -@dirrm include/ruby-1.9/%%RUBY_ARCH%%/ruby > -@dirrm include/ruby-1.9/%%RUBY_ARCH%% > -@dirrm include/ruby-1.9/ruby/backward > -@dirrm include/ruby-1.9/ruby > -@dirrm include/ruby-1.9 > +libdata/pkgconfig/ruby-2.0.pc > +include/ruby-2.0/%%RUBY_ARCH%%/ruby/config.h > +include/ruby-2.0/ruby/backward/classext.h > +include/ruby-2.0/ruby/backward/rubyio.h > +include/ruby-2.0/ruby/backward/rubysig.h > +include/ruby-2.0/ruby/backward/st.h > +include/ruby-2.0/ruby/backward/util.h > +include/ruby-2.0/ruby/debug.h > +include/ruby-2.0/ruby/defines.h > +include/ruby-2.0/ruby/digest.h > +include/ruby-2.0/ruby/dl.h > +include/ruby-2.0/ruby/encoding.h > +include/ruby-2.0/ruby/intern.h > +include/ruby-2.0/ruby/io.h > +include/ruby-2.0/ruby/missing.h > +include/ruby-2.0/ruby/oniguruma.h > +include/ruby-2.0/ruby/re.h > +include/ruby-2.0/ruby/regex.h > +include/ruby-2.0/ruby/ruby.h > +include/ruby-2.0/ruby/st.h > +include/ruby-2.0/ruby/subst.h > +include/ruby-2.0/ruby/thread.h > +include/ruby-2.0/ruby/util.h > +include/ruby-2.0/ruby/version.h > +include/ruby-2.0/ruby/vm.h > +include/ruby-2.0/ruby.h > +@dirrm include/ruby-2.0/%%RUBY_ARCH%%/ruby > +@dirrm include/ruby-2.0/%%RUBY_ARCH%% > +@dirrm include/ruby-2.0/ruby/backward > +@dirrm include/ruby-2.0/ruby > +@dirrm include/ruby-2.0 > %%PORTDOCS%%%%RUBY_DOCDIR%%/COPYING > %%PORTDOCS%%%%RUBY_DOCDIR%%/COPYING.ja > %%PORTDOCS%%%%RUBY_DOCDIR%%/ChangeLog > @@ -52,19 +54,16 @@ include/ruby-1.9/ruby.h > %%PORTDOCS%%%%RUBY_DOCDIR%%/NEWS-1.8.7 > %%PORTDOCS%%%%RUBY_DOCDIR%%/NEWS-1.9.1 > %%PORTDOCS%%%%RUBY_DOCDIR%%/NEWS-1.9.2 > +%%PORTDOCS%%%%RUBY_DOCDIR%%/NEWS-1.9.3 > %%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.rd > %%PORTDOCS%%%%RUBY_DOCDIR%%/etc.rd.ja > -%%PORTDOCS%%%%RUBY_DOCDIR%%/forwardable.rd > %%PORTDOCS%%%%RUBY_DOCDIR%%/forwardable.rd.ja > +%%PORTDOCS%%%%RUBY_DOCDIR%%/globals.rdoc > %%PORTDOCS%%%%RUBY_DOCDIR%%/images/boottime-classes.png > %%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 > @@ -78,11 +77,24 @@ include/ruby-1.9/ruby.h > %%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%%/security.rdoc > %%PORTDOCS%%%%RUBY_DOCDIR%%/shell.rd.ja > +%%PORTDOCS%%%%RUBY_DOCDIR%%/standard_library.rdoc > %%PORTDOCS%%%%RUBY_DOCDIR%%/stringio/README > %%PORTDOCS%%%%RUBY_DOCDIR%%/syslog/syslog.txt > +%%PORTDOCS%%%%RUBY_DOCDIR%%/syntax.rdoc > +%%PORTDOCS%%%%RUBY_DOCDIR%%/syntax/assignment.rdoc > +%%PORTDOCS%%%%RUBY_DOCDIR%%/syntax/calling_methods.rdoc > +%%PORTDOCS%%%%RUBY_DOCDIR%%/syntax/control_expressions.rdoc > +%%PORTDOCS%%%%RUBY_DOCDIR%%/syntax/exceptions.rdoc > +%%PORTDOCS%%%%RUBY_DOCDIR%%/syntax/literals.rdoc > +%%PORTDOCS%%%%RUBY_DOCDIR%%/syntax/methods.rdoc > +%%PORTDOCS%%%%RUBY_DOCDIR%%/syntax/miscellaneous.rdoc > +%%PORTDOCS%%%%RUBY_DOCDIR%%/syntax/modules_and_classes.rdoc > +%%PORTDOCS%%%%RUBY_DOCDIR%%/syntax/precedence.rdoc > +%%PORTDOCS%%%%RUBY_DOCDIR%%/syntax/refinements.rdoc > %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/syslog > +%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/syntax > %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/stringio > %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/rubygems > %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/ripper > @@ -90,7 +102,6 @@ include/ruby-1.9/ruby.h > %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/pty > %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/irb > %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/images > -%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/bigdecimal > %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/README > %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/bigdecimal/linear.rb > %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/bigdecimal/nlsolve.rb > @@ -319,6 +330,7 @@ include/ruby-1.9/ruby.h > %%RUBY_LIBDIR%%/%%RUBY_ARCH%%/enc/utf_32be.so > %%RUBY_LIBDIR%%/%%RUBY_ARCH%%/enc/utf_32le.so > %%RUBY_LIBDIR%%/%%RUBY_ARCH%%/enc/windows_1251.so > +%%RUBY_LIBDIR%%/%%RUBY_ARCH%%/enc/windows_31j.so > %%RUBY_LIBDIR%%/%%RUBY_ARCH%%/etc.so > %%RUBY_LIBDIR%%/%%RUBY_ARCH%%/fcntl.so > %%RUBY_LIBDIR%%/%%RUBY_ARCH%%/fiber.so > @@ -344,7 +356,6 @@ include/ruby-1.9/ruby.h > %%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%%/base64.rb > @@ -397,7 +408,13 @@ include/ruby-1.9/ruby.h > %%RUBY_LIBDIR%%/erb.rb > %%RUBY_LIBDIR%%/expect.rb > %%RUBY_LIBDIR%%/fiddle/closure.rb > +%%RUBY_LIBDIR%%/fiddle/cparser.rb > %%RUBY_LIBDIR%%/fiddle/function.rb > +%%RUBY_LIBDIR%%/fiddle/import.rb > +%%RUBY_LIBDIR%%/fiddle/pack.rb > +%%RUBY_LIBDIR%%/fiddle/struct.rb > +%%RUBY_LIBDIR%%/fiddle/types.rb > +%%RUBY_LIBDIR%%/fiddle/value.rb > %%RUBY_LIBDIR%%/fiddle.rb > %%RUBY_LIBDIR%%/fileutils.rb > %%RUBY_LIBDIR%%/find.rb > @@ -448,11 +465,22 @@ include/ruby-1.9/ruby.h > %%RUBY_LIBDIR%%/irb/ws-for-case-2.rb > %%RUBY_LIBDIR%%/irb/xmp.rb > %%RUBY_LIBDIR%%/irb.rb > +%%RUBY_LIBDIR%%/json/add/bigdecimal.rb > %%RUBY_LIBDIR%%/json/add/complex.rb > %%RUBY_LIBDIR%%/json/add/core.rb > +%%RUBY_LIBDIR%%/json/add/date.rb > +%%RUBY_LIBDIR%%/json/add/date_time.rb > +%%RUBY_LIBDIR%%/json/add/exception.rb > +%%RUBY_LIBDIR%%/json/add/ostruct.rb > +%%RUBY_LIBDIR%%/json/add/range.rb > %%RUBY_LIBDIR%%/json/add/rational.rb > +%%RUBY_LIBDIR%%/json/add/regexp.rb > +%%RUBY_LIBDIR%%/json/add/struct.rb > +%%RUBY_LIBDIR%%/json/add/symbol.rb > +%%RUBY_LIBDIR%%/json/add/time.rb > %%RUBY_LIBDIR%%/json/common.rb > %%RUBY_LIBDIR%%/json/ext.rb > +%%RUBY_LIBDIR%%/json/generic_object.rb > %%RUBY_LIBDIR%%/json/version.rb > %%RUBY_LIBDIR%%/json.rb > %%RUBY_LIBDIR%%/kconv.rb > @@ -463,7 +491,9 @@ include/ruby-1.9/ruby.h > %%RUBY_LIBDIR%%/matrix.rb > %%RUBY_LIBDIR%%/minitest/autorun.rb > %%RUBY_LIBDIR%%/minitest/benchmark.rb > +%%RUBY_LIBDIR%%/minitest/hell.rb > %%RUBY_LIBDIR%%/minitest/mock.rb > +%%RUBY_LIBDIR%%/minitest/parallel_each.rb > %%RUBY_LIBDIR%%/minitest/pride.rb > %%RUBY_LIBDIR%%/minitest/spec.rb > %%RUBY_LIBDIR%%/minitest/unit.rb > @@ -471,6 +501,15 @@ include/ruby-1.9/ruby.h > %%RUBY_LIBDIR%%/monitor.rb > %%RUBY_LIBDIR%%/mutex_m.rb > %%RUBY_LIBDIR%%/net/ftp.rb > +%%RUBY_LIBDIR%%/net/http/backward.rb > +%%RUBY_LIBDIR%%/net/http/exceptions.rb > +%%RUBY_LIBDIR%%/net/http/generic_request.rb > +%%RUBY_LIBDIR%%/net/http/header.rb > +%%RUBY_LIBDIR%%/net/http/proxy_delta.rb > +%%RUBY_LIBDIR%%/net/http/request.rb > +%%RUBY_LIBDIR%%/net/http/requests.rb > +%%RUBY_LIBDIR%%/net/http/response.rb > +%%RUBY_LIBDIR%%/net/http/responses.rb > %%RUBY_LIBDIR%%/net/http.rb > %%RUBY_LIBDIR%%/net/https.rb > %%RUBY_LIBDIR%%/net/imap.rb > @@ -486,11 +525,10 @@ include/ruby-1.9/ruby.h > %%RUBY_LIBDIR%%/openssl/cipher.rb > %%RUBY_LIBDIR%%/openssl/config.rb > %%RUBY_LIBDIR%%/openssl/digest.rb > -%%RUBY_LIBDIR%%/openssl/ssl-internal.rb > %%RUBY_LIBDIR%%/openssl/ssl.rb > -%%RUBY_LIBDIR%%/openssl/x509-internal.rb > %%RUBY_LIBDIR%%/openssl/x509.rb > %%RUBY_LIBDIR%%/openssl.rb > +%%RUBY_LIBDIR%%/optparse/ac.rb > %%RUBY_LIBDIR%%/optparse/date.rb > %%RUBY_LIBDIR%%/optparse/shellwords.rb > %%RUBY_LIBDIR%%/optparse/time.rb > @@ -508,8 +546,9 @@ include/ruby-1.9/ruby.h > %%RUBY_LIBDIR%%/psych/coder.rb > %%RUBY_LIBDIR%%/psych/core_ext.rb > %%RUBY_LIBDIR%%/psych/deprecated.rb > -%%RUBY_LIBDIR%%/psych/handlers/document_stream.rb > %%RUBY_LIBDIR%%/psych/handler.rb > +%%RUBY_LIBDIR%%/psych/handlers/document_stream.rb > +%%RUBY_LIBDIR%%/psych/handlers/recorder.rb > %%RUBY_LIBDIR%%/psych/json/ruby_events.rb > %%RUBY_LIBDIR%%/psych/json/stream.rb > %%RUBY_LIBDIR%%/psych/json/tree_builder.rb > @@ -537,6 +576,7 @@ include/ruby-1.9/ruby.h > %%RUBY_LIBDIR%%/psych/visitors/visitor.rb > %%RUBY_LIBDIR%%/psych/visitors/yaml_tree.rb > %%RUBY_LIBDIR%%/psych/visitors.rb > +%%RUBY_LIBDIR%%/psych/y.rb > %%RUBY_LIBDIR%%/psych.rb > %%RUBY_LIBDIR%%/racc/parser.rb > %%RUBY_LIBDIR%%/rational.rb > @@ -549,16 +589,37 @@ include/ruby-1.9/ruby.h > %%RUBY_LIBDIR%%/rdoc/class_module.rb > %%RUBY_LIBDIR%%/rdoc/code_object.rb > %%RUBY_LIBDIR%%/rdoc/code_objects.rb > +%%RUBY_LIBDIR%%/rdoc/comment.rb > %%RUBY_LIBDIR%%/rdoc/constant.rb > +%%RUBY_LIBDIR%%/rdoc/context/section.rb > %%RUBY_LIBDIR%%/rdoc/context.rb > %%RUBY_LIBDIR%%/rdoc/cross_reference.rb > %%RUBY_LIBDIR%%/rdoc/encoding.rb > +%%RUBY_LIBDIR%%/rdoc/erb_partial.rb > %%RUBY_LIBDIR%%/rdoc/erbio.rb > +%%RUBY_LIBDIR%%/rdoc/extend.rb > %%RUBY_LIBDIR%%/rdoc/generator/darkfish.rb > +%%RUBY_LIBDIR%%/rdoc/generator/json_index.rb > %%RUBY_LIBDIR%%/rdoc/generator/markup.rb > %%RUBY_LIBDIR%%/rdoc/generator/ri.rb > -%%RUBY_LIBDIR%%/rdoc/generator/template/darkfish/classpage.rhtml > -%%RUBY_LIBDIR%%/rdoc/generator/template/darkfish/filepage.rhtml > +%%RUBY_LIBDIR%%/rdoc/generator/template/darkfish/_footer.rhtml > +%%RUBY_LIBDIR%%/rdoc/generator/template/darkfish/_head.rhtml > +%%RUBY_LIBDIR%%/rdoc/generator/template/darkfish/_sidebar_VCS_info.rhtml > +%%RUBY_LIBDIR%%/rdoc/generator/template/darkfish/_sidebar_classes.rhtml > +%%RUBY_LIBDIR%%/rdoc/generator/template/darkfish/_sidebar_extends.rhtml > +%%RUBY_LIBDIR%%/rdoc/generator/template/darkfish/_sidebar_in_files.rhtml > +%%RUBY_LIBDIR%%/rdoc/generator/template/darkfish/_sidebar_includes.rhtml > +%%RUBY_LIBDIR%%/rdoc/generator/template/darkfish/_sidebar_installed.rhtml > +%%RUBY_LIBDIR%%/rdoc/generator/template/darkfish/_sidebar_methods.rhtml > +%%RUBY_LIBDIR%%/rdoc/generator/template/darkfish/_sidebar_navigation.rhtml > +%%RUBY_LIBDIR%%/rdoc/generator/template/darkfish/_sidebar_pages.rhtml > +%%RUBY_LIBDIR%%/rdoc/generator/template/darkfish/_sidebar_parent.rhtml > +%%RUBY_LIBDIR%%/rdoc/generator/template/darkfish/_sidebar_search.rhtml > +%%RUBY_LIBDIR%%/rdoc/generator/template/darkfish/_sidebar_sections.rhtml > +%%RUBY_LIBDIR%%/rdoc/generator/template/darkfish/_sidebar_table_of_contents.rhtml > +%%RUBY_LIBDIR%%/rdoc/generator/template/darkfish/class.rhtml > +%%RUBY_LIBDIR%%/rdoc/generator/template/darkfish/images/add.png > +%%RUBY_LIBDIR%%/rdoc/generator/template/darkfish/images/arrow_up.png > %%RUBY_LIBDIR%%/rdoc/generator/template/darkfish/images/brick.png > %%RUBY_LIBDIR%%/rdoc/generator/template/darkfish/images/brick_link.png > %%RUBY_LIBDIR%%/rdoc/generator/template/darkfish/images/bug.png > @@ -566,6 +627,7 @@ include/ruby-1.9/ruby.h > %%RUBY_LIBDIR%%/rdoc/generator/template/darkfish/images/bullet_toggle_minus.png > %%RUBY_LIBDIR%%/rdoc/generator/template/darkfish/images/bullet_toggle_plus.png > %%RUBY_LIBDIR%%/rdoc/generator/template/darkfish/images/date.png > +%%RUBY_LIBDIR%%/rdoc/generator/template/darkfish/images/delete.png > %%RUBY_LIBDIR%%/rdoc/generator/template/darkfish/images/find.png > %%RUBY_LIBDIR%%/rdoc/generator/template/darkfish/images/loadingAnimation.gif > %%RUBY_LIBDIR%%/rdoc/generator/template/darkfish/images/macFFBgHack.png > @@ -575,26 +637,42 @@ include/ruby-1.9/ruby.h > %%RUBY_LIBDIR%%/rdoc/generator/template/darkfish/images/page_white_width.png > %%RUBY_LIBDIR%%/rdoc/generator/template/darkfish/images/plugin.png > %%RUBY_LIBDIR%%/rdoc/generator/template/darkfish/images/ruby.png > +%%RUBY_LIBDIR%%/rdoc/generator/template/darkfish/images/tag_blue.png > %%RUBY_LIBDIR%%/rdoc/generator/template/darkfish/images/tag_green.png > +%%RUBY_LIBDIR%%/rdoc/generator/template/darkfish/images/transparent.png > %%RUBY_LIBDIR%%/rdoc/generator/template/darkfish/images/wrench.png > %%RUBY_LIBDIR%%/rdoc/generator/template/darkfish/images/wrench_orange.png > %%RUBY_LIBDIR%%/rdoc/generator/template/darkfish/images/zoom.png > %%RUBY_LIBDIR%%/rdoc/generator/template/darkfish/index.rhtml > %%RUBY_LIBDIR%%/rdoc/generator/template/darkfish/js/darkfish.js > %%RUBY_LIBDIR%%/rdoc/generator/template/darkfish/js/jquery.js > -%%RUBY_LIBDIR%%/rdoc/generator/template/darkfish/js/quicksearch.js > -%%RUBY_LIBDIR%%/rdoc/generator/template/darkfish/js/thickbox-compressed.js > +%%RUBY_LIBDIR%%/rdoc/generator/template/darkfish/js/search.js > +%%RUBY_LIBDIR%%/rdoc/generator/template/darkfish/page.rhtml > %%RUBY_LIBDIR%%/rdoc/generator/template/darkfish/rdoc.css > +%%RUBY_LIBDIR%%/rdoc/generator/template/darkfish/servlet_not_found.rhtml > +%%RUBY_LIBDIR%%/rdoc/generator/template/darkfish/servlet_root.rhtml > +%%RUBY_LIBDIR%%/rdoc/generator/template/darkfish/table_of_contents.rhtml > +%%RUBY_LIBDIR%%/rdoc/generator/template/json_index/js/navigation.js > +%%RUBY_LIBDIR%%/rdoc/generator/template/json_index/js/searcher.js > %%RUBY_LIBDIR%%/rdoc/generator.rb > %%RUBY_LIBDIR%%/rdoc/ghost_method.rb > %%RUBY_LIBDIR%%/rdoc/include.rb > %%RUBY_LIBDIR%%/rdoc/known_classes.rb > +%%RUBY_LIBDIR%%/rdoc/markdown/entities.rb > +%%RUBY_LIBDIR%%/rdoc/markdown/literals_1_9.rb > +%%RUBY_LIBDIR%%/rdoc/markdown.rb > +%%RUBY_LIBDIR%%/rdoc/markup/attr_changer.rb > +%%RUBY_LIBDIR%%/rdoc/markup/attr_span.rb > %%RUBY_LIBDIR%%/rdoc/markup/attribute_manager.rb > +%%RUBY_LIBDIR%%/rdoc/markup/attributes.rb > %%RUBY_LIBDIR%%/rdoc/markup/blank_line.rb > +%%RUBY_LIBDIR%%/rdoc/markup/block_quote.rb > %%RUBY_LIBDIR%%/rdoc/markup/document.rb > %%RUBY_LIBDIR%%/rdoc/markup/formatter.rb > %%RUBY_LIBDIR%%/rdoc/markup/formatter_test_case.rb > +%%RUBY_LIBDIR%%/rdoc/markup/hard_break.rb > %%RUBY_LIBDIR%%/rdoc/markup/heading.rb > +%%RUBY_LIBDIR%%/rdoc/markup/include.rb > %%RUBY_LIBDIR%%/rdoc/markup/indented_paragraph.rb > %%RUBY_LIBDIR%%/rdoc/markup/inline.rb > %%RUBY_LIBDIR%%/rdoc/markup/list.rb > @@ -604,12 +682,18 @@ include/ruby-1.9/ruby.h > %%RUBY_LIBDIR%%/rdoc/markup/pre_process.rb > %%RUBY_LIBDIR%%/rdoc/markup/raw.rb > %%RUBY_LIBDIR%%/rdoc/markup/rule.rb > +%%RUBY_LIBDIR%%/rdoc/markup/special.rb > %%RUBY_LIBDIR%%/rdoc/markup/text_formatter_test_case.rb > %%RUBY_LIBDIR%%/rdoc/markup/to_ansi.rb > %%RUBY_LIBDIR%%/rdoc/markup/to_bs.rb > %%RUBY_LIBDIR%%/rdoc/markup/to_html.rb > %%RUBY_LIBDIR%%/rdoc/markup/to_html_crossref.rb > +%%RUBY_LIBDIR%%/rdoc/markup/to_html_snippet.rb > +%%RUBY_LIBDIR%%/rdoc/markup/to_joined_paragraph.rb > +%%RUBY_LIBDIR%%/rdoc/markup/to_label.rb > +%%RUBY_LIBDIR%%/rdoc/markup/to_markdown.rb > %%RUBY_LIBDIR%%/rdoc/markup/to_rdoc.rb > +%%RUBY_LIBDIR%%/rdoc/markup/to_table_of_contents.rb > %%RUBY_LIBDIR%%/rdoc/markup/to_test.rb > %%RUBY_LIBDIR%%/rdoc/markup/to_tt_only.rb > %%RUBY_LIBDIR%%/rdoc/markup/verbatim.rb > @@ -620,10 +704,18 @@ include/ruby-1.9/ruby.h > %%RUBY_LIBDIR%%/rdoc/normal_module.rb > %%RUBY_LIBDIR%%/rdoc/options.rb > %%RUBY_LIBDIR%%/rdoc/parser/c.rb > +%%RUBY_LIBDIR%%/rdoc/parser/changelog.rb > +%%RUBY_LIBDIR%%/rdoc/parser/markdown.rb > +%%RUBY_LIBDIR%%/rdoc/parser/rd.rb > %%RUBY_LIBDIR%%/rdoc/parser/ruby.rb > %%RUBY_LIBDIR%%/rdoc/parser/ruby_tools.rb > %%RUBY_LIBDIR%%/rdoc/parser/simple.rb > +%%RUBY_LIBDIR%%/rdoc/parser/text.rb > %%RUBY_LIBDIR%%/rdoc/parser.rb > +%%RUBY_LIBDIR%%/rdoc/rd/block_parser.rb > +%%RUBY_LIBDIR%%/rdoc/rd/inline.rb > +%%RUBY_LIBDIR%%/rdoc/rd/inline_parser.rb > +%%RUBY_LIBDIR%%/rdoc/rd.rb > %%RUBY_LIBDIR%%/rdoc/rdoc.rb > %%RUBY_LIBDIR%%/rdoc/require.rb > %%RUBY_LIBDIR%%/rdoc/ri/driver.rb > @@ -634,14 +726,18 @@ include/ruby-1.9/ruby.h > %%RUBY_LIBDIR%%/rdoc/ruby_lex.rb > %%RUBY_LIBDIR%%/rdoc/ruby_token.rb > %%RUBY_LIBDIR%%/rdoc/rubygems_hook.rb > +%%RUBY_LIBDIR%%/rdoc/servlet.rb > %%RUBY_LIBDIR%%/rdoc/single_class.rb > %%RUBY_LIBDIR%%/rdoc/stats/normal.rb > %%RUBY_LIBDIR%%/rdoc/stats/quiet.rb > %%RUBY_LIBDIR%%/rdoc/stats/verbose.rb > %%RUBY_LIBDIR%%/rdoc/stats.rb > +%%RUBY_LIBDIR%%/rdoc/store.rb > %%RUBY_LIBDIR%%/rdoc/task.rb > +%%RUBY_LIBDIR%%/rdoc/test_case.rb > %%RUBY_LIBDIR%%/rdoc/text.rb > %%RUBY_LIBDIR%%/rdoc/token_stream.rb > +%%RUBY_LIBDIR%%/rdoc/tom_doc.rb > %%RUBY_LIBDIR%%/rdoc/top_level.rb > %%RUBY_LIBDIR%%/rdoc.rb > %%RUBY_LIBDIR%%/resolv-replace.rb > @@ -746,7 +842,7 @@ include/ruby-1.9/ruby.h > %%RUBY_LIBDIR%%/rss/xmlparser.rb > %%RUBY_LIBDIR%%/rss/xmlscanner.rb > %%RUBY_LIBDIR%%/rss.rb > -%%RUBY_LIBDIR%%/rubygems/builder.rb > +%%RUBY_LIBDIR%%/rubygems/available_set.rb > %%RUBY_LIBDIR%%/rubygems/command.rb > %%RUBY_LIBDIR%%/rubygems/command_manager.rb > %%RUBY_LIBDIR%%/rubygems/commands/build_command.rb > @@ -762,6 +858,7 @@ include/ruby-1.9/ruby.h > %%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 > @@ -778,37 +875,39 @@ include/ruby-1.9/ruby.h > %%RUBY_LIBDIR%%/rubygems/commands/unpack_command.rb > %%RUBY_LIBDIR%%/rubygems/commands/update_command.rb > %%RUBY_LIBDIR%%/rubygems/commands/which_command.rb > +%%RUBY_LIBDIR%%/rubygems/commands/yank_command.rb > +%%RUBY_LIBDIR%%/rubygems/compatibility.rb > %%RUBY_LIBDIR%%/rubygems/config_file.rb > -%%RUBY_LIBDIR%%/rubygems/custom_require.rb > +%%RUBY_LIBDIR%%/rubygems/core_ext/kernel_gem.rb > +%%RUBY_LIBDIR%%/rubygems/core_ext/kernel_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/dependency_resolver.rb > %%RUBY_LIBDIR%%/rubygems/deprecate.rb > -%%RUBY_LIBDIR%%/rubygems/doc_manager.rb > +%%RUBY_LIBDIR%%/rubygems/doctor.rb > %%RUBY_LIBDIR%%/rubygems/errors.rb > %%RUBY_LIBDIR%%/rubygems/exceptions.rb > %%RUBY_LIBDIR%%/rubygems/ext/builder.rb > +%%RUBY_LIBDIR%%/rubygems/ext/cmake_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_message.rb > %%RUBY_LIBDIR%%/rubygems/install_update_options.rb > %%RUBY_LIBDIR%%/rubygems/installer.rb > %%RUBY_LIBDIR%%/rubygems/installer_test_case.rb > %%RUBY_LIBDIR%%/rubygems/local_remote_options.rb > %%RUBY_LIBDIR%%/rubygems/mock_gem_ui.rb > -%%RUBY_LIBDIR%%/rubygems/old_format.rb > -%%RUBY_LIBDIR%%/rubygems/package/f_sync_dir.rb > +%%RUBY_LIBDIR%%/rubygems/name_tuple.rb > +%%RUBY_LIBDIR%%/rubygems/package/digest_io.rb > +%%RUBY_LIBDIR%%/rubygems/package/old.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_test_case.rb > @@ -819,14 +918,25 @@ include/ruby-1.9/ruby.h > %%RUBY_LIBDIR%%/rubygems/platform.rb > %%RUBY_LIBDIR%%/rubygems/psych_additions.rb > %%RUBY_LIBDIR%%/rubygems/psych_tree.rb > +%%RUBY_LIBDIR%%/rubygems/rdoc.rb > %%RUBY_LIBDIR%%/rubygems/remote_fetcher.rb > -%%RUBY_LIBDIR%%/rubygems/require_paths_builder.rb > +%%RUBY_LIBDIR%%/rubygems/request_set.rb > %%RUBY_LIBDIR%%/rubygems/requirement.rb > +%%RUBY_LIBDIR%%/rubygems/security/policies.rb > +%%RUBY_LIBDIR%%/rubygems/security/policy.rb > +%%RUBY_LIBDIR%%/rubygems/security/signer.rb > +%%RUBY_LIBDIR%%/rubygems/security/trust_dir.rb > %%RUBY_LIBDIR%%/rubygems/security.rb > %%RUBY_LIBDIR%%/rubygems/server.rb > -%%RUBY_LIBDIR%%/rubygems/source_index.rb > +%%RUBY_LIBDIR%%/rubygems/source.rb > +%%RUBY_LIBDIR%%/rubygems/source_list.rb > +%%RUBY_LIBDIR%%/rubygems/source_local.rb > +%%RUBY_LIBDIR%%/rubygems/source_specific_file.rb > %%RUBY_LIBDIR%%/rubygems/spec_fetcher.rb > %%RUBY_LIBDIR%%/rubygems/specification.rb > +%%RUBY_LIBDIR%%/rubygems/ssl_certs/AddTrustExternalCARoot.pem > +%%RUBY_LIBDIR%%/rubygems/ssl_certs/Entrust_net-Secure-Server-Certification-Authority.pem > +%%RUBY_LIBDIR%%/rubygems/ssl_certs/VerisignClass3PublicPrimaryCertificationAuthority-G2.pem > %%RUBY_LIBDIR%%/rubygems/ssl_certs/ca-bundle.pem > %%RUBY_LIBDIR%%/rubygems/syck_hack.rb > %%RUBY_LIBDIR%%/rubygems/test_case.rb > @@ -852,22 +962,8 @@ include/ruby-1.9/ruby.h > %%RUBY_LIBDIR%%/shellwords.rb > %%RUBY_LIBDIR%%/singleton.rb > %%RUBY_LIBDIR%%/socket.rb > -%%RUBY_LIBDIR%%/syck/baseemitter.rb > -%%RUBY_LIBDIR%%/syck/basenode.rb > -%%RUBY_LIBDIR%%/syck/constants.rb > -%%RUBY_LIBDIR%%/syck/encoding.rb > -%%RUBY_LIBDIR%%/syck/error.rb > -%%RUBY_LIBDIR%%/syck/loader.rb > -%%RUBY_LIBDIR%%/syck/rubytypes.rb > -%%RUBY_LIBDIR%%/syck/stream.rb > -%%RUBY_LIBDIR%%/syck/stringio.rb > -%%RUBY_LIBDIR%%/syck/syck.rb > -%%RUBY_LIBDIR%%/syck/tag.rb > -%%RUBY_LIBDIR%%/syck/types.rb > -%%RUBY_LIBDIR%%/syck/yamlnode.rb > -%%RUBY_LIBDIR%%/syck/ypath.rb > -%%RUBY_LIBDIR%%/syck.rb > %%RUBY_LIBDIR%%/sync.rb > +%%RUBY_LIBDIR%%/syslog/logger.rb > %%RUBY_LIBDIR%%/tempfile.rb > %%RUBY_LIBDIR%%/test/unit/assertions.rb > %%RUBY_LIBDIR%%/test/unit/parallel.rb > @@ -937,9 +1033,9 @@ include/ruby-1.9/ruby.h > %%RUBY_LIBDIR%%/xmlrpc/parser.rb > %%RUBY_LIBDIR%%/xmlrpc/server.rb > %%RUBY_LIBDIR%%/xmlrpc/utils.rb > +%%RUBY_LIBDIR%%/xmlrpc.rb > %%RUBY_LIBDIR%%/yaml/dbm.rb > %%RUBY_LIBDIR%%/yaml/store.rb > -%%RUBY_LIBDIR%%/yaml/syck.rb > %%RUBY_LIBDIR%%/yaml.rb > @dirrm %%RUBY_LIBDIR%%/yaml > @dirrm %%RUBY_LIBDIR%%/xmlrpc > @@ -949,12 +1045,14 @@ include/ruby-1.9/ruby.h > @dirrm %%RUBY_LIBDIR%%/uri > @dirrm %%RUBY_LIBDIR%%/test/unit > @dirrm %%RUBY_LIBDIR%%/test > -@dirrm %%RUBY_LIBDIR%%/syck > +@dirrm %%RUBY_LIBDIR%%/syslog > @dirrm %%RUBY_LIBDIR%%/shell > @dirrm %%RUBY_LIBDIR%%/rubygems/ssl_certs > +@dirrm %%RUBY_LIBDIR%%/rubygems/security > @dirrm %%RUBY_LIBDIR%%/rubygems/package/tar_reader > @dirrm %%RUBY_LIBDIR%%/rubygems/package > @dirrm %%RUBY_LIBDIR%%/rubygems/ext > +@dirrm %%RUBY_LIBDIR%%/rubygems/core_ext > @dirrm %%RUBY_LIBDIR%%/rubygems/commands > @dirrm %%RUBY_LIBDIR%%/rubygems > @dirrm %%RUBY_LIBDIR%%/rss/maker > @@ -971,15 +1069,21 @@ include/ruby-1.9/ruby.h > @dirrm %%RUBY_LIBDIR%%/rexml > @dirrm %%RUBY_LIBDIR%%/rdoc/stats > @dirrm %%RUBY_LIBDIR%%/rdoc/ri > +@dirrm %%RUBY_LIBDIR%%/rdoc/rd > @dirrm %%RUBY_LIBDIR%%/rdoc/parser > @dirrm %%RUBY_LIBDIR%%/rdoc/markup > +@dirrm %%RUBY_LIBDIR%%/rdoc/markdown > +@dirrm %%RUBY_LIBDIR%%/rdoc/generator/template/json_index/js > +@dirrm %%RUBY_LIBDIR%%/rdoc/generator/template/json_index > @dirrm %%RUBY_LIBDIR%%/rdoc/generator/template/darkfish/js > @dirrm %%RUBY_LIBDIR%%/rdoc/generator/template/darkfish/images > @dirrm %%RUBY_LIBDIR%%/rdoc/generator/template/darkfish > @dirrm %%RUBY_LIBDIR%%/rdoc/generator/template > @dirrm %%RUBY_LIBDIR%%/rdoc/generator > +@dirrm %%RUBY_LIBDIR%%/rdoc/context > @dirrm %%RUBY_LIBDIR%%/rdoc > @dirrm %%RUBY_LIBDIR%%/rbconfig > +@dirrm %%RUBY_LIBDIR%%/racc/rdoc > @dirrm %%RUBY_LIBDIR%%/racc > @dirrm %%RUBY_LIBDIR%%/psych/visitors > @dirrm %%RUBY_LIBDIR%%/psych/nodes > @@ -988,6 +1092,7 @@ include/ruby-1.9/ruby.h > @dirrm %%RUBY_LIBDIR%%/psych > @dirrm %%RUBY_LIBDIR%%/optparse > @dirrm %%RUBY_LIBDIR%%/openssl > +@dirrm %%RUBY_LIBDIR%%/net/http > @dirrm %%RUBY_LIBDIR%%/net > @dirrm %%RUBY_LIBDIR%%/minitest > @dirrm %%RUBY_LIBDIR%%/matrix >