Date: Thu, 4 Jul 2013 01:32:53 GMT From: Mike Carlson <mike@bayphoto.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/180246: [patch] lang/ruby20: update to 2.0.0p247 Message-ID: <201307040132.r641WrZH067039@oldred.freebsd.org> Resent-Message-ID: <201307040140.r641e0AW005279@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 180246
>Category: ports
>Synopsis: [patch] lang/ruby20: update to 2.0.0p247
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Thu Jul 04 01:40:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Mike Carlson
>Release: 9.1-RELEASE
>Organization:
Bay Photo Lab
>Environment:
FreeBSD wos-app-1 9.1-RELEASE FreeBSD 9.1-RELEASE #0 r243825: Tue Dec 4 09:23:10 UTC 2012 root@farrell.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC amd64
>Description:
Can we update the Ruby20 port to the latest release on ruby-lang.org?
>How-To-Repeat:
Just a port update request, no real issue
>Fix:
see svn diff attached
Patch attached with submission follows:
Index: Mk/bsd.ruby.mk
===================================================================
--- Mk/bsd.ruby.mk (revision 322235)
+++ Mk/bsd.ruby.mk (working copy)
@@ -230,7 +230,7 @@
RUBY_RELVERSION= 2.0.0
RUBY_PORTREVISION= 1
RUBY_PORTEPOCH= 1
-RUBY_PATCHLEVEL= 195
+RUBY_PATCHLEVEL= 247
RUBY_VERSION?= ${RUBY_RELVERSION}.${RUBY_PATCHLEVEL}
RUBY_DISTVERSION?= ${RUBY_RELVERSION}-p${RUBY_PATCHLEVEL}
Index: lang/ruby20/distinfo
===================================================================
--- lang/ruby20/distinfo (revision 322235)
+++ lang/ruby20/distinfo (working copy)
@@ -1,2 +1,2 @@
-SHA256 (ruby/ruby-2.0.0-p195.tar.bz2) = 0be32aef7a7ab6e3708cc1d65cd3e0a99fa801597194bbedd5799c11d652eb5b
-SIZE (ruby/ruby-2.0.0-p195.tar.bz2) = 10807456
+SHA256 (ruby/ruby-2.0.0-p247.tar.bz2) = 08e3d4b85b8a1118a8e81261f59dd8b4ddcfd70b6ae554e0ec5ceb99c3185e8a
+SIZE (ruby/ruby-2.0.0-p247.tar.bz2) = 10804581
Index: lang/ruby20/files/patch-configure.in
===================================================================
--- lang/ruby20/files/patch-configure.in (revision 322235)
+++ lang/ruby20/files/patch-configure.in (working copy)
@@ -1,5 +1,5 @@
---- configure.in.orig 2013-05-27 03:48:52.340695232 +0000
-+++ configure.in 2013-05-27 03:49:12.060695078 +0000
+--- configure.in.orig 2013-07-03 09:59:00.000000000 -0700
++++ configure.in 2013-07-03 11:17:14.000000000 -0700
@@ -1380,11 +1380,11 @@
AC_CHECK_DECLS([sys_nerr], [], [], [$ac_includes_default
@%:@include <errno.h>])
@@ -10,10 +10,10 @@
-AC_CHECK_LIB(socket, socketpair) # SunOS/Solaris
-AC_CHECK_LIB(rt, clock_gettime) # GNU/Linux
+AC_SEARCH_LIBS(crypt, crypt)
-+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
++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"],
Index: lang/ruby20/files/patch-cont.c
===================================================================
--- lang/ruby20/files/patch-cont.c (revision 322235)
+++ lang/ruby20/files/patch-cont.c (working copy)
@@ -1,11 +1,12 @@
---- 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 @@
+--- cont.c.orig 2013-07-03 09:59:00.000000000 -0700
++++ cont.c 2013-07-03 11:12:48.000000000 -0700
+@@ -15,7 +15,8 @@
#include "gc.h"
#include "eval_intern.h"
-#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
Index: lang/ruby20/files/patch-lib_mkmf.rb
===================================================================
--- lang/ruby20/files/patch-lib_mkmf.rb (revision 322235)
+++ lang/ruby20/files/patch-lib_mkmf.rb (working copy)
@@ -1,11 +1,11 @@
---- 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"]
+--- lib/mkmf.rb.orig 2013-06-26 07:03:38.000000000 -0700
++++ lib/mkmf.rb 2013-07-03 17:43:05.000000000 -0700
+@@ -226,7 +226,7 @@
+ end
+ $extmk ||= false
+ 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)"
+ $arch_hdrdir = RbConfig::CONFIG["rubyarchhdrdir"]
elsif File.exist?(($hdrdir = ($top_srcdir ||= topdir) + "/include") + "/ruby.h")
Index: lang/ruby20/files/patch-lib_uri_generic.rb
===================================================================
--- lang/ruby20/files/patch-lib_uri_generic.rb (revision 322235)
+++ lang/ruby20/files/patch-lib_uri_generic.rb (working copy)
@@ -1,6 +1,6 @@
---- lib/uri/generic.rb.orig 2009-06-18 16:47:45.000000000 +0400
-+++ lib/uri/generic.rb 2009-06-18 16:48:54.000000000 +0400
-@@ -1032,7 +1032,15 @@
+--- lib/uri/generic.rb.orig 2012-07-19 18:56:21.000000000 -0700
++++ lib/uri/generic.rb 2013-07-03 10:13:51.000000000 -0700
+@@ -1481,7 +1481,15 @@
end
end
@@ -11,7 +11,7 @@
+ # Add URI delimiter if the path misses it (like as in FTP)
+ #
+ if not path.empty? and not str.empty? and path[0, 1] != '/'
-+ path = '/' + path
++ path = '/' + path
+ end
+ str << path
end
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307040132.r641WrZH067039>