- Update Ruby 2.0.0 to p195

- Disable dtrace support on powerpc [1]

PR:		ports/177485 [1]
Reported by:	Justin Hibbits <jrh29@alumni.cwru.edu> [1]

5 files changed, 23 insertions, 18 deletions

diff --git a/lang/ruby20/Makefile b/lang/ruby20/Makefile
index 77eefbd49e0f..8fc324dbafda 100644
--- a/lang/ruby20/Makefile
+++ b/lang/ruby20/Makefile
@@ -73,6 +73,10 @@ CONFIGURE_ARGS+=	--enable-install-doc
 CONFIGURE_ARGS+=	--disable-install-doc
 .endif
 
+.if ${ARCH} == "powerpc"
+CONFIGURE_ARGS+=	--disable-dtrace
+.endif
+
 CONFIGURE_ENV=	CFLAGS="-I${LOCALBASE}/include ${CFLAGS}" \
 		LIBS="-L${LOCALBASE}/lib ${LDFLAGS}" \
 		debugflags=
@@ -221,7 +225,7 @@ post-install:
 
 	@${CAT} ${PKGMESSAGE}
 
-plist::
+plist:
 	truncate -s0 pkg-plist
 .for FILE in ${INSTALLED_SCRIPTS}
 	@${ECHO_CMD} "bin/${FILE}%%RUBY_SUFFIX%%" >> pkg-plist
@@ -300,7 +304,7 @@ plist::
 test:
 	@(cd ${WRKSRC}; ${MAKE} test)
 
-validate::
+validate:
 	@${MKDIR} ${WRKSRC}/rubyspec
 	rm -rf ${WRKSRC}/rubyspec/*
 	(cd ${WRKSRC}/rubyspec && git clone git://github.com/rubyspec/rubyspec.git)
diff --git a/lang/ruby20/distinfo b/lang/ruby20/distinfo
index 2228afa8b977..5d0e1e65ab0e 100644
--- a/lang/ruby20/distinfo
+++ b/lang/ruby20/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ruby/ruby-2.0.0-p0.tar.bz2) = c680d392ccc4901c32067576f5b474ee186def2fcd3fcbfa485739168093295f
-SIZE (ruby/ruby-2.0.0-p0.tar.bz2) = 10814890
+SHA256 (ruby/ruby-2.0.0-p195.tar.bz2) = 0be32aef7a7ab6e3708cc1d65cd3e0a99fa801597194bbedd5799c11d652eb5b
+SIZE (ruby/ruby-2.0.0-p195.tar.bz2) = 10807456
diff --git a/lang/ruby20/files/patch-configure.in b/lang/ruby20/files/patch-configure.in
index c3316ff88b0d..c81b5ff31ee5 100644
--- a/lang/ruby20/files/patch-configure.in
+++ b/lang/ruby20/files/patch-configure.in
@@ -1,9 +1,9 @@
---- 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"])
+--- configure.in.orig	2013-05-27 03:48:52.340695232 +0000
++++ configure.in	2013-05-27 03:49:12.060695078 +0000
+@@ -1380,11 +1380,11 @@
+ AC_CHECK_DECLS([sys_nerr], [], [], [$ac_includes_default
+ @%:@include <errno.h>])
+ 
 -AC_CHECK_LIB(crypt, crypt)
 -AC_CHECK_LIB(dl, dlopen)	# Dynamic linking for SunOS/Solaris and SYSV
 -AC_CHECK_LIB(dld, shl_load)	# Dynamic linking for HP-UX
@@ -17,7 +17,7 @@
  
  AS_CASE(["$target_cpu"],
  [alpha*|sh4|sh4el|sh4eb], [AS_CASE(["$target_os"::"$GCC"],
-@@ -2018,7 +2018,7 @@
+@@ -2074,7 +2074,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
-@@ -2026,6 +2026,7 @@
+@@ -2082,6 +2082,7 @@
      if test x"$rb_with_pthread" = xyes; then
  	AC_DEFINE(_REENTRANT)
  	AC_DEFINE(_THREAD_SAFE)
@@ -34,7 +34,7 @@
  	AC_DEFINE(HAVE_LIBPTHREAD)
  	AC_CHECK_HEADERS(pthread_np.h, [], [], [@%:@include <pthread.h>])
  	AS_CASE([$pthread_lib],
-@@ -2263,7 +2264,6 @@
+@@ -2319,7 +2320,6 @@
  			: ${LDSHARED='$(CC) -shared'}
  			if test "$rb_cv_binary_elf" = yes; then
  			    LDFLAGS="$LDFLAGS -rdynamic"
@@ -42,7 +42,7 @@
  			else
  			  test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED='$(LD) -Bshareable'
  			fi
-@@ -2649,6 +2649,7 @@
+@@ -2703,6 +2703,7 @@
      [freebsd*|dragonfly*], [
  	SOLIBS='$(LIBS)'
  	LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)'
diff --git a/lang/ruby20/files/patch-tool_mkconfig.rb b/lang/ruby20/files/patch-tool_mkconfig.rb
index ad89fa2b0423..d9163e72ae3d 100644
--- a/lang/ruby20/files/patch-tool_mkconfig.rb
+++ b/lang/ruby20/files/patch-tool_mkconfig.rb
@@ -1,9 +1,9 @@
---- 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
+--- tool/mkconfig.rb.orig	2013-05-27 03:20:03.501815638 +0000
++++ tool/mkconfig.rb	2013-05-27 03:20:31.093814303 +0000
+@@ -173,7 +173,8 @@
  end
  vars["prefix"] = ""
+ vars["exec_prefix"] = ""
 -prefix = vars.expand(vars["rubyarchdir"])
 +major, minor, *rest = RUBY_VERSION.split('.')
 +prefix = "/lib/ruby/#{major}.#{minor}/#{arch}"
diff --git a/lang/ruby20/pkg-plist b/lang/ruby20/pkg-plist
index 4d14a013dfc3..29d4e8cac160 100644
--- a/lang/ruby20/pkg-plist
+++ b/lang/ruby20/pkg-plist
@@ -929,6 +929,7 @@ include/ruby-2.0/ruby.h
 %%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/GeoTrust_Global_CA.pem
 %%RUBY_LIBDIR%%/rubygems/ssl_certs/VerisignClass3PublicPrimaryCertificationAuthority-G2.pem
 %%RUBY_LIBDIR%%/rubygems/ssl_certs/ca-bundle.pem
 %%RUBY_LIBDIR%%/rubygems/syck_hack.rb