Attachment 122109 Details for Bug 165223 – file.diff

[patch] file.diff

file.diff (text/plain), 5.58 KB, created by Steve Wills on 2012-02-17 04:10:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Steve Wills

Created: 2012-02-17 04:10:09 UTC

Size: 5.58 KB

patch

obsolete

>Index: Mk/bsd.ruby.mk
>===================================================================
>RCS file: /home/pcvs/ports/Mk/bsd.ruby.mk,v
>retrieving revision 1.216
>diff -u -r1.216 bsd.ruby.mk
>--- Mk/bsd.ruby.mk	21 Jan 2012 15:40:26 -0000	1.216
>+++ Mk/bsd.ruby.mk	17 Feb 2012 03:45:39 -0000
>@@ -168,7 +168,7 @@
> RUBY_RELVERSION=	1.8.7
> RUBY_PORTREVISION=	0
> RUBY_PORTEPOCH=		1
>-RUBY_PATCHLEVEL=	357
>+RUBY_PATCHLEVEL=	358
> 
> .  if ${RUBY_PATCHLEVEL} == 0
> RUBY_VERSION?=		${RUBY_RELVERSION}
>@@ -196,7 +196,7 @@
> RUBY_RELVERSION=	1.9.3
> RUBY_PORTREVISION=	0
> RUBY_PORTEPOCH=		1
>-RUBY_PATCHLEVEL=	0
>+RUBY_PATCHLEVEL=	125
> 
> RUBY_VERSION?=		${RUBY_RELVERSION}.${RUBY_PATCHLEVEL}
> RUBY_DISTVERSION?=	${RUBY_RELVERSION}-p${RUBY_PATCHLEVEL}
>Index: lang/ruby18/distinfo
>===================================================================
>RCS file: /home/pcvs/ports/lang/ruby18/distinfo,v
>retrieving revision 1.75
>diff -u -r1.75 distinfo
>--- lang/ruby18/distinfo	21 Jan 2012 15:40:26 -0000	1.75
>+++ lang/ruby18/distinfo	17 Feb 2012 03:45:39 -0000
>@@ -1,2 +1,2 @@
>-SHA256 (ruby/ruby-1.8.7-p357.tar.bz2) = 5c64b63a597b4cb545887364e1fd1e0601a7aeb545e576e74a6d8e88a2765a37
>-SIZE (ruby/ruby-1.8.7-p357.tar.bz2) = 4208157
>+SHA256 (ruby/ruby-1.8.7-p358.tar.bz2) = 309ccd427e47ef41a70f96462bd3c2ef2e7911ce1b22432ab502f5bc6e949c1b
>+SIZE (ruby/ruby-1.8.7-p358.tar.bz2) = 4209883
>Index: lang/ruby19/Makefile
>===================================================================
>RCS file: /home/pcvs/ports/lang/ruby19/Makefile,v
>retrieving revision 1.16
>diff -u -r1.16 Makefile
>--- lang/ruby19/Makefile	21 Nov 2011 20:59:09 -0000	1.16
>+++ lang/ruby19/Makefile	17 Feb 2012 03:45:39 -0000
>@@ -19,7 +19,8 @@
> COMMENT?=	An object-oriented interpreted scripting language
> 
> LIB_DEPENDS=	ffi.5:${PORTSDIR}/devel/libffi \
>-		yaml-0.2:${PORTSDIR}/textproc/libyaml
>+		yaml-0.2:${PORTSDIR}/textproc/libyaml \
>+		execinfo.1:${PORTSDIR}/devel/libexecinfo
> 
> GNU_CONFIGURE=	yes
> WRKSRC=		${RUBY_WRKSRC}
>Index: lang/ruby19/distinfo
>===================================================================
>RCS file: /home/pcvs/ports/lang/ruby19/distinfo,v
>retrieving revision 1.11
>diff -u -r1.11 distinfo
>--- lang/ruby19/distinfo	21 Nov 2011 20:59:09 -0000	1.11
>+++ lang/ruby19/distinfo	17 Feb 2012 03:45:39 -0000
>@@ -1,2 +1,2 @@
>-SHA256 (ruby/ruby-1.9.3-p0.tar.bz2) = ca8ba4e564fc5f98b210a5784e43dfffef9471222849e46f8e848b37e9f38acf
>-SIZE (ruby/ruby-1.9.3-p0.tar.bz2) = 9554576
>+SHA256 (ruby/ruby-1.9.3-p125.tar.bz2) = c67a59443052b5a9219eb4cee3892bdfbc6f250f0c8e214e02256a4cc7ef5526
>+SIZE (ruby/ruby-1.9.3-p125.tar.bz2) = 9733962
>Index: lang/ruby19/files/patch-configure.in
>===================================================================
>RCS file: /home/pcvs/ports/lang/ruby19/files/patch-configure.in,v
>retrieving revision 1.2
>diff -u -r1.2 patch-configure.in
>--- lang/ruby19/files/patch-configure.in	21 Nov 2011 20:59:09 -0000	1.2
>+++ lang/ruby19/files/patch-configure.in	17 Feb 2012 03:45:39 -0000
>@@ -1,6 +1,6 @@
>---- configure.in.orig	2011-10-09 06:17:20.000000000 -0700
>-+++ configure.in	2011-11-04 00:52:17.000000000 -0700
>-@@ -1112,11 +1112,11 @@
>+--- 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
>  		],
>  [	LIBS="-lm $LIBS"])
>@@ -17,7 +17,7 @@
>  if test "${enable_win95}" = maybe; then
>      AC_HAVE_LIBRARY(unicows, [enable_win95=yes], [enable_win95=no])
>  fi
>-@@ -1808,7 +1808,7 @@
>+@@ -1815,7 +1815,7 @@
>  fi
>  
>  if test x"$enable_pthread" = xyes; then
>@@ -26,11 +26,11 @@
>  	AC_CHECK_LIB($pthread_lib, pthread_kill,
>  		     rb_with_pthread=yes, rb_with_pthread=no)
>  	if test "$rb_with_pthread" = "yes"; then break; fi
>-@@ -1822,6 +1822,7 @@
>- 	[c],    [],
>- 	[root], [],
>- 	[c_r],  [MAINLIBS="-pthread $MAINLIBS"],
>+@@ -1823,6 +1823,7 @@
>+     if test x"$rb_with_pthread" = xyes; then
>+ 	AC_DEFINE(_REENTRANT)
>+ 	AC_DEFINE(_THREAD_SAFE)
> +	[pthread],  [MAINLIBS="-pthread $MAINLIBS"],
>- 	        [LIBS="-l$pthread_lib $LIBS"])
>-     else
>- 	AC_MSG_WARN("Don't know how to find pthread library on your system -- thread support disabled")
>+ 	AC_DEFINE(HAVE_LIBPTHREAD)
>+ 	AC_CHECK_HEADERS(pthread_np.h, [], [], [@%:@include <pthread.h>])
>+ 	AS_CASE([$pthread_lib],
>Index: lang/ruby19/files/patch-cont.c
>===================================================================
>RCS file: /home/pcvs/ports/lang/ruby19/files/patch-cont.c,v
>retrieving revision 1.1
>diff -u -r1.1 patch-cont.c
>--- lang/ruby19/files/patch-cont.c	21 Nov 2011 20:59:09 -0000	1.1
>+++ lang/ruby19/files/patch-cont.c	17 Feb 2012 03:45:39 -0000
>@@ -1,11 +1,11 @@
>---- cont.c.orig	2011-11-18 03:37:32.000000000 -0800
>-+++ cont.c	2011-11-18 03:38:22.000000000 -0800
>+--- cont.c.orig	2012-02-16 22:31:17.691397569 -0500
>++++ cont.c	2012-02-16 22:31:31.507395417 -0500
> @@ -15,7 +15,7 @@
>  #include "gc.h"
>  #include "eval_intern.h"
>  
>--#if ((defined(_WIN32) && _WIN32_WINNT >= 0x0400) || defined(HAVE_SETCONTEXT)) && !defined(__NetBSD__) && !defined(sun) && !defined(FIBER_USE_NATIVE)
>-+#if ((defined(_WIN32) && _WIN32_WINNT >= 0x0400) || 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(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)
>  #define FIBER_USE_NATIVE 1
>  
>  /* FIBER_USE_NATIVE enables Fiber performance improvement using system

Actions: View | Diff

Attachments on bug 165223: 122109 | 122110