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

Update to ruby 2.1.4

Browse Source 
Bump lib major due to struct change.

Add VERSION to SUBST_VARS, since test-unit gem version always matches it.

Remove configure patch for issue fixed upstream.
This commit is contained in:
jeremy 2014-11-01 04:53:09 +00:00
parent 6b1af994ab
commit 9b1b92ab0b
4 changed files with 12 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lang/ruby/2.1/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.9 2014/10/15 02:06:36 jeremy Exp $
# $OpenBSD: Makefile,v 1.10 2014/11/01 04:53:09 jeremy Exp $
BROKEN-hppa = miniruby abort trap when generating rdoc
BROKEN-alpha = miniruby abort trap when generating rdoc
@ -9,16 +9,15 @@ COMMENT-gdbm = gdbm interface for ruby
COMMENT-tk = tk interface for ruby
COMMENT-ri_docs = ri documentation files for ruby
VERSION = 2.1.3
VERSION = 2.1.4
RUBYLIBREV = 2.1
DISTNAME = ruby-${VERSION}
SHARED_LIBS = ruby21 0.0
SHARED_LIBS = ruby21 1.0
PKGNAME-main = ruby-${VERSION}
PKGNAME-gdbm = ruby21-gdbm-${VERSION}
PKGNAME-tk = ruby21-tk-${VERSION}
PKGNAME-ri_docs = ruby21-ri_docs-${VERSION}
REVISION-main = 0
PKG_ARCH-ri_docs = *
WANTLIB-ri_docs = # empty
@ -87,7 +86,7 @@ ALL_TARGET += rdoc
INSTALL_TARGET += install-doc
.endif
SUBST_VARS += RUBYLIBREV
SUBST_VARS += VERSION RUBYLIBREV
TEST_DEPENDS = ${FULLPKGNAME-main}:${BUILD_PKGPATH}

4
lang/ruby/2.1/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (ruby-2.1.3.tar.gz) = CBi+t7EM6aBYzSHYXP4dzSM+mLc0LTLppdS+vpg0fwE=
SIZE (ruby-2.1.3.tar.gz) = 15129183
SHA256 (ruby-2.1.4.tar.gz) = v5lSzes6DGpaJ3Rcm0wOXiZOkrZpsrCO+zY/UVZUkgQ=
SIZE (ruby-2.1.4.tar.gz) = 15127418

15
lang/ruby/2.1/patches/patch-configure
View File

@ -1,12 +1,10 @@
$OpenBSD: patch-configure,v 1.2 2014/09/22 15:15:41 jeremy Exp $
$OpenBSD: patch-configure,v 1.3 2014/11/01 04:53:09 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.
Remove invalid shell syntax, fixed upstream in r45715.
--- configure.orig Thu Sep 18 10:04:39 2014
+++ configure Fri Sep 19 09:12:21 2014
@@ -21056,7 +21056,7 @@ esac
@ -18,17 +16,6 @@ Remove invalid shell syntax, fixed upstream in r45715.
;; #(
solaris*) :
@@ -21538,8 +21538,8 @@ if test x$setjmp_prefix = xsig; then
else
unset setjmp_sigmask
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${setjmp_prefix}setjmp${setjmp_suffix}${setjmp_cast:+($setjmp_cast)}" >&5
-$as_echo "${setjmp_prefix}setjmp${setjmp_suffix}${setjmp_cast:+($setjmp_cast)}" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${setjmp_prefix}setjmp${setjmp_suffix}" >&5
+$as_echo "${setjmp_prefix}setjmp${setjmp_suffix}" >&6; }
cat >>confdefs.h <<_ACEOF
#define RUBY_SETJMP(env) ${setjmp_prefix}setjmp${setjmp_suffix}($setjmp_cast(env)${setjmp_sigmask+,0})
_ACEOF
@@ -22300,7 +22300,10 @@ _ACEOF
_ACEOF

10
lang/ruby/2.1/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.4 2014/09/22 15:15:41 jeremy Exp $
@comment $OpenBSD: PLIST-main,v 1.5 2014/11/01 04:53:09 jeremy Exp $
@option no-default-conflict
@conflict ruby->=2.1,<2.2
bin/erb21
@ -1039,9 +1039,9 @@ lib/ruby/gems/${RUBYLIBREV}/gems/rdoc-4.1.0/
lib/ruby/gems/${RUBYLIBREV}/gems/rdoc-4.1.0/bin/
lib/ruby/gems/${RUBYLIBREV}/gems/rdoc-4.1.0/bin/rdoc
lib/ruby/gems/${RUBYLIBREV}/gems/rdoc-4.1.0/bin/ri
lib/ruby/gems/${RUBYLIBREV}/gems/test-unit-${RUBYLIBREV}.3.0/
lib/ruby/gems/${RUBYLIBREV}/gems/test-unit-${RUBYLIBREV}.3.0/bin/
lib/ruby/gems/${RUBYLIBREV}/gems/test-unit-${RUBYLIBREV}.3.0/bin/testrb
lib/ruby/gems/${RUBYLIBREV}/gems/test-unit-${VERSION}.0/
lib/ruby/gems/${RUBYLIBREV}/gems/test-unit-${VERSION}.0/bin/
lib/ruby/gems/${RUBYLIBREV}/gems/test-unit-${VERSION}.0/bin/testrb
lib/ruby/gems/${RUBYLIBREV}/specifications/
lib/ruby/gems/${RUBYLIBREV}/specifications/default/
lib/ruby/gems/${RUBYLIBREV}/specifications/default/bigdecimal-1.2.4.gemspec
@ -1051,7 +1051,7 @@ lib/ruby/gems/${RUBYLIBREV}/specifications/default/minitest-4.7.5.gemspec
lib/ruby/gems/${RUBYLIBREV}/specifications/default/psych-2.0.5.gemspec
lib/ruby/gems/${RUBYLIBREV}/specifications/default/rake-10.1.0.gemspec
lib/ruby/gems/${RUBYLIBREV}/specifications/default/rdoc-4.1.0.gemspec
lib/ruby/gems/${RUBYLIBREV}/specifications/default/test-unit-${RUBYLIBREV}.3.0.gemspec
lib/ruby/gems/${RUBYLIBREV}/specifications/default/test-unit-${VERSION}.0.gemspec
lib/ruby/site_ruby/
lib/ruby/site_ruby/${RUBYLIBREV}/
lib/ruby/site_ruby/${RUBYLIBREV}/${SUB}/