cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to ruby 2.0.0-p594

Browse Source 
Bump lib major due to struct change.

Backport a fix to fix an error introduced when backporting a fix.
This commit is contained in:
jeremy 2014-11-01 04:54:43 +00:00
parent 9b1b92ab0b
commit ea355bad5e
5 changed files with 30 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lang/ruby/2.0/Makefile
View File

@ -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

4
lang/ruby/2.0/distinfo
View File

@ -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

8
lang/ruby/2.0/patches/patch-compile_c
View File

@ -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;

12
lang/ruby/2.0/patches/patch-configure
View File

@ -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

15
lang/ruby/2.0/patches/patch-test_rexml_test_document_rb Normal file
View File

@ -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
<!ENTITY % f "%e;%e;%e;%e;%e;%e;%e;%e;%e;%e;%e;%e;%e;%e;%e;">
<!ENTITY % g "%f;%f;%f;%f;%f;%f;%f;%f;%f;%f;%f;%f;%f;%f;%f;">
<!ENTITY test "test %g;">
-+]>
+]>
<cd></cd>
EOF