From ea355bad5eeed72c80f6d3232a839cd12ad937ef Mon Sep 17 00:00:00 2001 From: jeremy Date: Sat, 1 Nov 2014 04:54:43 +0000 Subject: [PATCH] Update to ruby 2.0.0-p594 Bump lib major due to struct change. Backport a fix to fix an error introduced when backporting a fix. --- lang/ruby/2.0/Makefile | 7 +++---- lang/ruby/2.0/distinfo | 4 ++-- lang/ruby/2.0/patches/patch-compile_c | 8 ++++---- lang/ruby/2.0/patches/patch-configure | 12 ++++++------ .../2.0/patches/patch-test_rexml_test_document_rb | 15 +++++++++++++++ 5 files changed, 30 insertions(+), 16 deletions(-) create mode 100644 lang/ruby/2.0/patches/patch-test_rexml_test_document_rb diff --git a/lang/ruby/2.0/Makefile b/lang/ruby/2.0/Makefile index 07f621de90e..3ff1451b0ab 100644 --- a/lang/ruby/2.0/Makefile +++ b/lang/ruby/2.0/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.15 2014/10/15 02:06:35 jeremy Exp $ +# $OpenBSD: Makefile,v 1.16 2014/11/01 04:54:43 jeremy Exp $ COMMENT-main = object oriented script language with threads COMMENT-gdbm = gdbm interface for ruby @@ -6,16 +6,15 @@ COMMENT-tk = tk interface for ruby COMMENT-ri_docs = ri documentation files for ruby VERSION = 2.0.0 -PATCHLEVEL = 576 +PATCHLEVEL = 594 RUBYLIBREV = 2.0 DISTNAME = ruby-${VERSION}-p${PATCHLEVEL} -SHARED_LIBS = ruby20 0.1 +SHARED_LIBS = ruby20 1.0 PKGNAME-main = ruby-${VERSION}.${PATCHLEVEL} PKGNAME-gdbm = ruby20-gdbm-${VERSION}.${PATCHLEVEL} PKGNAME-tk = ruby20-tk-${VERSION}.${PATCHLEVEL} PKGNAME-ri_docs = ruby20-ri_docs-${VERSION}.${PATCHLEVEL} -REVISION-main = 0 PKG_ARCH-ri_docs = * WANTLIB-ri_docs = # empty diff --git a/lang/ruby/2.0/distinfo b/lang/ruby/2.0/distinfo index 21bb34368b5..3901889e89b 100644 --- a/lang/ruby/2.0/distinfo +++ b/lang/ruby/2.0/distinfo @@ -1,2 +1,2 @@ -SHA256 (ruby-2.0.0-p576.tar.gz) = n1pZPYF2jIVhVb5rLS41e5YbXEPgS6VMHuURmH+sK2Y= -SIZE (ruby-2.0.0-p576.tar.gz) = 13610215 +SHA256 (ruby-2.0.0-p594.tar.gz) = 7lFd17F828EGOWzUMvVmK7C1r8BQREaRdZFKq2Xzxuc= +SIZE (ruby-2.0.0-p594.tar.gz) = 13606970 diff --git a/lang/ruby/2.0/patches/patch-compile_c b/lang/ruby/2.0/patches/patch-compile_c index c41e5accc5d..7a3394203b7 100644 --- a/lang/ruby/2.0/patches/patch-compile_c +++ b/lang/ruby/2.0/patches/patch-compile_c @@ -1,10 +1,10 @@ -$OpenBSD: patch-compile_c,v 1.1 2014/02/12 22:41:43 jeremy Exp $ +$OpenBSD: patch-compile_c,v 1.2 2014/11/01 04:54:43 jeremy Exp $ Disable peephole optimizer on sparc64, since it occasionally segfaults. ---- compile.c.orig Fri Jan 11 09:13:17 2013 -+++ compile.c Thu Jan 9 22:31:36 2014 -@@ -1706,6 +1706,9 @@ static int +--- compile.c.orig Sun Aug 31 00:55:32 2014 ++++ compile.c Mon Oct 27 20:08:11 2014 +@@ -1770,6 +1770,9 @@ static int iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcallopt) { INSN *iobj = (INSN *)list; diff --git a/lang/ruby/2.0/patches/patch-configure b/lang/ruby/2.0/patches/patch-configure index 174071235fe..3c51c3b2f6f 100644 --- a/lang/ruby/2.0/patches/patch-configure +++ b/lang/ruby/2.0/patches/patch-configure @@ -1,13 +1,13 @@ -$OpenBSD: patch-configure,v 1.3 2014/01/21 10:06:07 jasper Exp $ +$OpenBSD: patch-configure,v 1.4 2014/11/01 04:54:43 jeremy Exp $ Fix so name, checking for DOT and DOXYGEN. Override the arch setting to remove OpenBSD version from it, so ports don't have to be bumped when OpenBSD version changes. ---- configure.orig Fri Nov 22 05:23:39 2013 -+++ configure Tue Jan 21 09:54:37 2014 -@@ -17000,13 +17000,13 @@ fi +--- configure.orig Mon Oct 27 04:31:14 2014 ++++ configure Mon Oct 27 20:08:11 2014 +@@ -17178,13 +17178,13 @@ fi if test x"$enable_pthread" = xyes; then for pthread_lib in thr pthread pthreads c c_r root; do as_ac_Lib=`$as_echo "ac_cv_lib_$pthread_lib''_pthread_kill" | $as_tr_sh` @@ -24,7 +24,7 @@ so ports don't have to be bumped when OpenBSD version changes. cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -@@ -18290,7 +18290,7 @@ esac +@@ -18468,7 +18468,7 @@ esac openbsd*) : SOLIBS='$(LIBS)' @@ -33,7 +33,7 @@ so ports don't have to be bumped when OpenBSD version changes. ;; #( solaris*) : -@@ -19521,7 +19521,10 @@ _ACEOF +@@ -19699,7 +19699,10 @@ _ACEOF _ACEOF else diff --git a/lang/ruby/2.0/patches/patch-test_rexml_test_document_rb b/lang/ruby/2.0/patches/patch-test_rexml_test_document_rb new file mode 100644 index 00000000000..c532227c6a1 --- /dev/null +++ b/lang/ruby/2.0/patches/patch-test_rexml_test_document_rb @@ -0,0 +1,15 @@ +$OpenBSD: patch-test_rexml_test_document_rb,v 1.1 2014/11/01 04:54:43 jeremy Exp $ + +Fix error in backported patch. + +--- test/rexml/test_document.rb.orig Mon Oct 27 20:08:32 2014 ++++ test/rexml/test_document.rb Mon Oct 27 20:08:41 2014 +@@ -57,7 +57,7 @@ EOF + + + +-+]> ++]> + + EOF +