Attachment #122109 for bug #165223

Lines 168-174 Link Here

(-)Mk/bsd.ruby.mk (-2 / +2 lines)
168	RUBY_RELVERSION= 1.8.7	168	RUBY_RELVERSION= 1.8.7
169	RUBY_PORTREVISION= 0	169	RUBY_PORTREVISION= 0
170	RUBY_PORTEPOCH= 1	170	RUBY_PORTEPOCH= 1
171	RUBY_PATCHLEVEL= 357	171	RUBY_PATCHLEVEL= 358
172		172
173	. if ${RUBY_PATCHLEVEL} == 0	173	. if ${RUBY_PATCHLEVEL} == 0
174	RUBY_VERSION?= ${RUBY_RELVERSION}	174	RUBY_VERSION?= ${RUBY_RELVERSION}
Lines 196-202 Link Here
196	RUBY_RELVERSION= 1.9.3	196	RUBY_RELVERSION= 1.9.3
197	RUBY_PORTREVISION= 0	197	RUBY_PORTREVISION= 0
198	RUBY_PORTEPOCH= 1	198	RUBY_PORTEPOCH= 1
199	RUBY_PATCHLEVEL= 0	199	RUBY_PATCHLEVEL= 125
200		200
201	RUBY_VERSION?= ${RUBY_RELVERSION}.${RUBY_PATCHLEVEL}	201	RUBY_VERSION?= ${RUBY_RELVERSION}.${RUBY_PATCHLEVEL}
202	RUBY_DISTVERSION?= ${RUBY_RELVERSION}-p${RUBY_PATCHLEVEL}	202	RUBY_DISTVERSION?= ${RUBY_RELVERSION}-p${RUBY_PATCHLEVEL}

Lines 1-2 Link Here

(-)lang/ruby18/distinfo (-2 / +2 lines)
1	SHA256 (ruby/ruby-1.8.7-p357.tar.bz2) = 5c64b63a597b4cb545887364e1fd1e0601a7aeb545e576e74a6d8e88a2765a37	1	SHA256 (ruby/ruby-1.8.7-p358.tar.bz2) = 309ccd427e47ef41a70f96462bd3c2ef2e7911ce1b22432ab502f5bc6e949c1b
2	SIZE (ruby/ruby-1.8.7-p357.tar.bz2) = 4208157	2	SIZE (ruby/ruby-1.8.7-p358.tar.bz2) = 4209883

Lines 19-25 Link Here

(-)lang/ruby19/Makefile (-1 / +2 lines)
19	COMMENT?= An object-oriented interpreted scripting language	19	COMMENT?= An object-oriented interpreted scripting language
20		20
21	LIB_DEPENDS= ffi.5:${PORTSDIR}/devel/libffi \	21	LIB_DEPENDS= ffi.5:${PORTSDIR}/devel/libffi \
22	yaml-0.2:${PORTSDIR}/textproc/libyaml	22	yaml-0.2:${PORTSDIR}/textproc/libyaml \
		23	execinfo.1:${PORTSDIR}/devel/libexecinfo
23		24
24	GNU_CONFIGURE= yes	25	GNU_CONFIGURE= yes
25	WRKSRC= ${RUBY_WRKSRC}	26	WRKSRC= ${RUBY_WRKSRC}

Lines 1-2 Link Here

(-)lang/ruby19/distinfo (-2 / +2 lines)
1	SHA256 (ruby/ruby-1.9.3-p0.tar.bz2) = ca8ba4e564fc5f98b210a5784e43dfffef9471222849e46f8e848b37e9f38acf	1	SHA256 (ruby/ruby-1.9.3-p125.tar.bz2) = c67a59443052b5a9219eb4cee3892bdfbc6f250f0c8e214e02256a4cc7ef5526
2	SIZE (ruby/ruby-1.9.3-p0.tar.bz2) = 9554576	2	SIZE (ruby/ruby-1.9.3-p125.tar.bz2) = 9733962




--- 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"])

 if test "${enable_win95}" = maybe; then
     AC_HAVE_LIBRARY(unicows, [enable_win95=yes], [enable_win95=no])
 fi
@@ -1815,7 +1815,7 @@
 fi
 
 if test x"$enable_pthread" = xyes; then

 	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 @@
     if test x"$rb_with_pthread" = xyes; then
 	AC_DEFINE(_REENTRANT)
 	AC_DEFINE(_THREAD_SAFE)
+	[pthread],  [MAINLIBS="-pthread $MAINLIBS"],
 	AC_DEFINE(HAVE_LIBPTHREAD)
 	AC_CHECK_HEADERS(pthread_np.h, [], [], [@%:@include <pthread.h>])
 	AS_CASE([$pthread_lib],

Lines 1-11 Link Here

(-)lang/ruby19/files/patch-cont.c (-4 / +4 lines)
1	--- cont.c.orig 2011-11-18 03:37:32.000000000 -0800	1	--- cont.c.orig 2012-02-16 22:31:17.691397569 -0500
2	+++ cont.c 2011-11-18 03:38:22.000000000 -0800	2	+++ cont.c 2012-02-16 22:31:31.507395417 -0500
3	@@ -15,7 +15,7 @@	3	@@ -15,7 +15,7 @@
4	#include "gc.h"	4	#include "gc.h"
5	#include "eval_intern.h"	5	#include "eval_intern.h"
6		6
7	-#if ((defined(_WIN32) && _WIN32_WINNT >= 0x0400) \|\| defined(HAVE_SETCONTEXT)) && !defined(__NetBSD__) && !defined(sun) && !defined(FIBER_USE_NATIVE)	7	-#if ((defined(_WIN32) && _WIN32_WINNT >= 0x0400) \|\| (defined(HAVE_GETCONTEXT) && defined(HAVE_SETCONTEXT))) && !defined(__NetBSD__) && !defined(sun) && !defined(FIBER_USE_NATIVE)
8	+#if ((defined(_WIN32) && _WIN32_WINNT >= 0x0400) \|\| defined(HAVE_SETCONTEXT)) && !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(sun) && !defined(FIBER_USE_NATIVE)	8	+#if ((defined(_WIN32) && _WIN32_WINNT >= 0x0400) \|\| (defined(HAVE_GETCONTEXT) && defined(HAVE_SETCONTEXT))) && !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(sun) && !defined(FIBER_USE_NATIVE)
9	#define FIBER_USE_NATIVE 1	9	#define FIBER_USE_NATIVE 1
10		10
11	/* FIBER_USE_NATIVE enables Fiber performance improvement using system	11	/* FIBER_USE_NATIVE enables Fiber performance improvement using system

Return to bug 165223

Lines 1-6 Link Here

(-)lang/ruby19/files/patch-configure.in (-11 / +11 lines)
1	--- configure.in.orig 2011-10-09 06:17:20.000000000 -0700	1	--- configure.in.orig 2012-02-15 19:26:09.000000000 -0500
2	+++ configure.in 2011-11-04 00:52:17.000000000 -0700	2	+++ configure.in 2012-02-16 22:28:27.617422641 -0500
3	@@ -1112,11 +1112,11 @@	3	@@ -1118,11 +1118,11 @@
4	[superux*], [ ac_cv_func_setitimer=no	4	[superux*], [ ac_cv_func_setitimer=no
5	],	5	],
6	[ LIBS="-lm $LIBS"])	6	[ LIBS="-lm $LIBS"])
Lines 17-23 Link Here
17	if test "${enable_win95}" = maybe; then	17	if test "${enable_win95}" = maybe; then
18	AC_HAVE_LIBRARY(unicows, [enable_win95=yes], [enable_win95=no])	18	AC_HAVE_LIBRARY(unicows, [enable_win95=yes], [enable_win95=no])
19	fi	19	fi
20	@@ -1808,7 +1808,7 @@	20	@@ -1815,7 +1815,7 @@
21	fi	21	fi
22		22
23	if test x"$enable_pthread" = xyes; then	23	if test x"$enable_pthread" = xyes; then
Lines 26-36 Link Here
26	AC_CHECK_LIB($pthread_lib, pthread_kill,	26	AC_CHECK_LIB($pthread_lib, pthread_kill,
27	rb_with_pthread=yes, rb_with_pthread=no)	27	rb_with_pthread=yes, rb_with_pthread=no)
28	if test "$rb_with_pthread" = "yes"; then break; fi	28	if test "$rb_with_pthread" = "yes"; then break; fi
29	@@ -1822,6 +1822,7 @@	29	@@ -1823,6 +1823,7 @@
30	[c], [],	30	if test x"$rb_with_pthread" = xyes; then
31	[root], [],	31	AC_DEFINE(_REENTRANT)
32	[c_r], [MAINLIBS="-pthread $MAINLIBS"],	32	AC_DEFINE(_THREAD_SAFE)
33	+ [pthread], [MAINLIBS="-pthread $MAINLIBS"],	33	+ [pthread], [MAINLIBS="-pthread $MAINLIBS"],
34	[LIBS="-l$pthread_lib $LIBS"])	34	AC_DEFINE(HAVE_LIBPTHREAD)
35	else	35	AC_CHECK_HEADERS(pthread_np.h, [], [], [@%:@include <pthread.h>])
36	AC_MSG_WARN("Don't know how to find pthread library on your system -- thread support disabled")	36	AS_CASE([$pthread_lib],