Date: Tue, 28 May 2013 00:46:33 +0000 (UTC) From: Steve Wills <swills@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r319289 - in head: Mk lang/ruby20 lang/ruby20/files Message-ID: <201305280046.r4S0kXwY031998@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: swills Date: Tue May 28 00:46:32 2013 New Revision: 319289 URL: http://svnweb.freebsd.org/changeset/ports/319289 Log: - 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] Modified: head/Mk/bsd.ruby.mk head/lang/ruby20/Makefile head/lang/ruby20/distinfo head/lang/ruby20/files/patch-configure.in head/lang/ruby20/files/patch-tool_mkconfig.rb head/lang/ruby20/pkg-plist Modified: head/Mk/bsd.ruby.mk ============================================================================== --- head/Mk/bsd.ruby.mk Mon May 27 23:13:06 2013 (r319288) +++ head/Mk/bsd.ruby.mk Tue May 28 00:46:32 2013 (r319289) @@ -225,7 +225,7 @@ RUBY20= "@comment " RUBY_RELVERSION= 2.0.0 RUBY_PORTREVISION= 1 RUBY_PORTEPOCH= 1 -RUBY_PATCHLEVEL= 0 +RUBY_PATCHLEVEL= 195 RUBY_VERSION?= ${RUBY_RELVERSION}.${RUBY_PATCHLEVEL} RUBY_DISTVERSION?= ${RUBY_RELVERSION}-p${RUBY_PATCHLEVEL} Modified: head/lang/ruby20/Makefile ============================================================================== --- head/lang/ruby20/Makefile Mon May 27 23:13:06 2013 (r319288) +++ head/lang/ruby20/Makefile Tue May 28 00:46:32 2013 (r319289) @@ -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) Modified: head/lang/ruby20/distinfo ============================================================================== --- head/lang/ruby20/distinfo Mon May 27 23:13:06 2013 (r319288) +++ head/lang/ruby20/distinfo Tue May 28 00:46:32 2013 (r319289) @@ -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 Modified: head/lang/ruby20/files/patch-configure.in ============================================================================== --- head/lang/ruby20/files/patch-configure.in Mon May 27 23:13:06 2013 (r319288) +++ head/lang/ruby20/files/patch-configure.in Tue May 28 00:46:32 2013 (r319289) @@ -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)' Modified: head/lang/ruby20/files/patch-tool_mkconfig.rb ============================================================================== --- head/lang/ruby20/files/patch-tool_mkconfig.rb Mon May 27 23:13:06 2013 (r319288) +++ head/lang/ruby20/files/patch-tool_mkconfig.rb Tue May 28 00:46:32 2013 (r319289) @@ -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}" Modified: head/lang/ruby20/pkg-plist ============================================================================== --- head/lang/ruby20/pkg-plist Mon May 27 23:13:06 2013 (r319288) +++ head/lang/ruby20/pkg-plist Tue May 28 00:46:32 2013 (r319289) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305280046.r4S0kXwY031998>