svn commit: r362997 - in head: Mk lang/ruby20 lang/ruby20/files

[Steve Wills]

Author: swills
Date: Sat Jul 26 23:24:45 2014
New Revision: 362997
URL: http://svnweb.freebsd.org/changeset/ports/362997
QAT: https://qat.redports.org/buildarchive/r362997/

Log:
  lang/ruby20: Update to Ruby 2.0.0-p481

Deleted:
  head/lang/ruby20/files/extra-patch-ext__readline__readline.c
  head/lang/ruby20/files/patch-ext__dl__extconf.rb
  head/lang/ruby20/files/patch-thread_pthread.c
Modified:
  head/Mk/bsd.ruby.mk
  head/lang/ruby20/Makefile
  head/lang/ruby20/distinfo
  head/lang/ruby20/files/patch-configure.in

Modified: head/Mk/bsd.ruby.mk
==============================================================================
--- head/Mk/bsd.ruby.mk	Sat Jul 26 23:08:04 2014	(r362996)
+++ head/Mk/bsd.ruby.mk	Sat Jul 26 23:24:45 2014	(r362997)
@@ -193,9 +193,9 @@ RUBY21=			"@comment "
 # Ruby 2.0
 #
 RUBY_RELVERSION=	2.0.0
-RUBY_PORTREVISION=	6
+RUBY_PORTREVISION=	0
 RUBY_PORTEPOCH=		1
-RUBY_PATCHLEVEL=	353
+RUBY_PATCHLEVEL=	481
 
 #
 # PLIST_SUB helpers

Modified: head/lang/ruby20/Makefile
==============================================================================
--- head/lang/ruby20/Makefile	Sat Jul 26 23:08:04 2014	(r362996)
+++ head/lang/ruby20/Makefile	Sat Jul 26 23:24:45 2014	(r362997)
@@ -103,7 +103,6 @@ CONFIGURE_ARGS+=	--enable-libedit --with
 BUILD_DEPENDS+=	readline>=0:${PORTSDIR}/devel/readline
 RUN_DEPENDS+=	readline>=0:${PORTSDIR}/devel/readline
 CONFIGURE_ARGS+=	--disable-libedit --with-readline-prefix=${LOCALBASE}
-EXTRA_PATCHES+=		${FILESDIR}/extra-patch-ext__readline__readline.c
 .endif
 
 .if ${RUBY_VER} == ${RUBY_DEFAULT_VER}
@@ -330,6 +329,6 @@ validate:
 	rm -rf ${WRKSRC}/rubyspec/*
 	(cd ${WRKSRC}/rubyspec && git clone git://github.com/rubyspec/rubyspec.git)
 	(cd ${WRKSRC}/rubyspec && git clone git://github.com/rubyspec/mspec.git)
-	(cd ${WRKSRC}/rubyspec/rubyspec && env PATH=${WRKSRC}/rubyspec/mspec/bin:${PATH} mspec -t ${STAGEDIR}${PREFIX}/bin/ruby${RUBY_SUFFIX})
+	(cd ${WRKSRC}/rubyspec/rubyspec && env PATH=${WRKSRC}/rubyspec/mspec/bin:${PATH} mspec -t ${PREFIX}/bin/ruby${RUBY_SUFFIX} .)
 
 .include <bsd.port.post.mk>

Modified: head/lang/ruby20/distinfo
==============================================================================
--- head/lang/ruby20/distinfo	Sat Jul 26 23:08:04 2014	(r362996)
+++ head/lang/ruby20/distinfo	Sat Jul 26 23:24:45 2014	(r362997)
@@ -1,2 +1,2 @@
-SHA256 (ruby/ruby-2.0.0-p353.tar.bz2) = 3de4e4d9aff4682fa4f8ed2b70bd0d746fae17452fc3d3a8e8f505ead9105ad9
-SIZE (ruby/ruby-2.0.0-p353.tar.bz2) = 10730412
+SHA256 (ruby/ruby-2.0.0-p481.tar.bz2) = 0762dad7e96d8091bdf33b3e3176c2066fbf3dc09dfe85fbf40e74e83c63d8e2
+SIZE (ruby/ruby-2.0.0-p481.tar.bz2) = 10727244

Modified: head/lang/ruby20/files/patch-configure.in
==============================================================================
--- head/lang/ruby20/files/patch-configure.in	Sat Jul 26 23:08:04 2014	(r362996)
+++ head/lang/ruby20/files/patch-configure.in	Sat Jul 26 23:24:45 2014	(r362997)
@@ -1,6 +1,6 @@
---- configure.in.orig	2014-03-20 05:47:33.807394460 +0000
-+++ configure.in	2014-03-20 05:47:49.855394229 +0000
-@@ -1386,11 +1386,11 @@
+--- configure.in.orig	2014-01-30 15:58:25.000000000 +0000
++++ configure.in	2014-07-26 19:30:21.165009183 +0000
+@@ -1401,11 +1401,11 @@
  AC_CHECK_DECLS([sys_nerr], [], [], [$ac_includes_default
  @%:@include <errno.h>])
  
@@ -17,7 +17,7 @@
  
  AS_CASE(["$target_cpu"],
  [alpha*|sh4|sh4el|sh4eb], [AS_CASE(["$target_os"::"$GCC"],
-@@ -2081,7 +2081,7 @@
+@@ -2096,7 +2096,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
-@@ -2095,6 +2095,7 @@
+@@ -2110,6 +2110,7 @@
  	[c],    [],
  	[root], [],
  	[c_r],  [MAINLIBS="-pthread $MAINLIBS"],
@@ -34,15 +34,15 @@
  	        [AS_CASE(["$target_os"],
  		    [openbsd*], [LIBS="-pthread $LIBS"],
  		    [LIBS="-l$pthread_lib $LIBS"])])
-@@ -2326,7 +2327,6 @@
+@@ -2341,7 +2342,6 @@
  			: ${LDSHARED='$(CC) -shared'}
  			if test "$rb_cv_binary_elf" = yes; then
  			    LDFLAGS="$LDFLAGS -rdynamic"
--			    DLDFLAGS="$DLDFLAGS "'-Wl,-soname,$(.TARGET)'
+-			    DLDFLAGS="$DLDFLAGS "'-Wl,-soname,$@'
  			else
  			  test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED='$(LD) -Bshareable'
  			fi
-@@ -2713,6 +2713,7 @@
+@@ -2728,6 +2728,7 @@
      [freebsd*|dragonfly*], [
  	SOLIBS='$(LIBS)'
  	LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)'