Update to ruby 1.9.3-p374.

This commit is contained in:
jeremy 2013-01-23 18:18:41 +00:00
parent bdc2476119
commit 5c7f88bbcf
6 changed files with 30 additions and 43 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.32 2012/12/11 22:20:02 jeremy Exp $
# $OpenBSD: Makefile,v 1.33 2013/01/23 18:18:41 jeremy Exp $
BROKEN-sparc64 = doesnt reliably build, and depending ports randomly fail to build
@ -9,7 +9,7 @@ COMMENT-tk = tk interface for ruby
COMMENT-ri_docs = ri documentation files for ruby
VERSION = 1.9.3
PATCHLEVEL = 327
PATCHLEVEL = 374
RUBYLIBREV = 1.9.1
SHARED_LIBS = ruby19 1.0
@ -19,8 +19,6 @@ PKGNAME-dbm = ruby-dbm-${VERSION}.${PATCHLEVEL}
PKGNAME-tk = ruby-tk-${VERSION}.${PATCHLEVEL}
PKGNAME-ri_docs = ruby-ri_docs-${VERSION}.${PATCHLEVEL}
REVISION-dbm = 0
PKG_ARCH-ri_docs = *
WANTLIB-ri_docs = # empty

View File

@ -1,2 +1,2 @@
SHA256 (ruby-1.9.3-p327.tar.gz) = Ud12Ri0/brLGWadekPlJ9W2ljEK/tXZiEkeBYLfyPXE=
SIZE (ruby-1.9.3-p327.tar.gz) = 12484826
SHA256 (ruby-1.9.3-p374.tar.gz) = DQ4yo1VIZ+Pt27I/vzCnLEdIYi4BDCPjEwLYmfwAVXQ=
SIZE (ruby-1.9.3-p374.tar.gz) = 12555429

View File

@ -1,10 +1,10 @@
$OpenBSD: patch-common_mk,v 1.4 2012/02/28 00:20:41 jeremy Exp $
$OpenBSD: patch-common_mk,v 1.5 2013/01/23 18:18:41 jeremy Exp $
Don't regenerate rdoc documentation during install.
--- common.mk.orig Mon Feb 6 04:53:11 2012
+++ common.mk Thu Feb 16 08:18:24 2012
@@ -394,7 +394,7 @@ dont-install-man: $(PREP)
--- common.mk.orig Thu Dec 20 02:10:05 2012
+++ common.mk Thu Jan 17 08:27:13 2013
@@ -395,7 +395,7 @@ dont-install-man: $(PREP)
post-no-install-man::
@$(NULLCMD)

View File

@ -1,39 +1,22 @@
$OpenBSD: patch-configure,v 1.6 2012/02/28 00:20:41 jeremy Exp $
$OpenBSD: patch-configure,v 1.7 2013/01/23 18:18:41 jeremy Exp $
Fix so name, checking for DOT and DOXYGEN.
Fix so name.
Override the arch setting to remove OpenBSD version from it,
so ports don't have to be bumped when OpenBSD version changes.
--- configure.orig Thu Feb 16 01:04:54 2012
+++ configure Thu Feb 16 08:18:24 2012
@@ -15563,13 +15563,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`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -l$pthread_lib" >&5
-$as_echo_n "checking for pthread_kill in -l$pthread_lib... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_kill in -$pthread_lib" >&5
+$as_echo_n "checking for pthread_kill in -$pthread_lib... " >&6; }
if eval \${$as_ac_Lib+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-l$pthread_lib $LIBS"
+LIBS="-$pthread_lib $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -16633,7 +16633,7 @@ case "$enable_shared" in #(
openbsd*) :
--- configure.orig Wed Jan 16 20:57:31 2013
+++ configure Thu Jan 17 08:59:36 2013
@@ -39481,7 +39481,7 @@ _ACEOF
;;
openbsd*)
SOLIBS='$(LIBS)'
- LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR).'`expr ${MINOR} \* 10 + ${TEENY}`
+ LIBRUBY_SO='lib$(RUBY_SO_NAME).so.'${LIBruby19_VERSION}
;; #(
solaris*) :
@@ -17455,7 +17455,10 @@ _ACEOF
;;
solaris*)
SOLIBS='$(LIBS)'
@@ -40500,7 +40500,10 @@ _ACEOF
_ACEOF
else

View File

@ -1,13 +1,13 @@
$OpenBSD: patch-lib_fileutils_rb,v 1.2 2011/11/08 23:38:57 jeremy Exp $
$OpenBSD: patch-lib_fileutils_rb,v 1.3 2013/01/23 18:18:41 jeremy Exp $
Make FileUtils.mkdir_p act more like mkdir(1) -p, by not attempting
to create directories that already exist. This fixes systrace
warnings when building ports.
--- lib/fileutils.rb.orig Sat May 21 19:12:15 2011
+++ lib/fileutils.rb Sun Oct 30 19:07:09 2011
--- lib/fileutils.rb.orig Sat Feb 25 00:11:07 2012
+++ lib/fileutils.rb Thu Jan 17 08:27:13 2013
@@ -205,7 +205,7 @@ module FileUtils
list.map {|path| path.sub(%r</\z>, '') }.each do |path|
list.map {|path| path.chomp(?/) }.each do |path|
# optimize for the most common case
begin
- fu_mkdir path, options[:mode]

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-ri_docs,v 1.4 2012/10/24 22:49:05 jeremy Exp $
@comment $OpenBSD: PLIST-ri_docs,v 1.5 2013/01/23 18:18:41 jeremy Exp $
@option no-default-conflict
@conflict ruby-ri_docs->=1.9,<1.10
share/ri/${RUBYLIBREV}/system/ACL/
@ -27,9 +27,11 @@ share/ri/${RUBYLIBREV}/system/ARGF/cdesc-ARGF.ri
share/ri/${RUBYLIBREV}/system/ARGF/chars-i.ri
share/ri/${RUBYLIBREV}/system/ARGF/close-i.ri
share/ri/${RUBYLIBREV}/system/ARGF/closed%3f-i.ri
share/ri/${RUBYLIBREV}/system/ARGF/codepoints-i.ri
share/ri/${RUBYLIBREV}/system/ARGF/each-i.ri
share/ri/${RUBYLIBREV}/system/ARGF/each_byte-i.ri
share/ri/${RUBYLIBREV}/system/ARGF/each_char-i.ri
share/ri/${RUBYLIBREV}/system/ARGF/each_codepoint-i.ri
share/ri/${RUBYLIBREV}/system/ARGF/each_line-i.ri
share/ri/${RUBYLIBREV}/system/ARGF/eof%3f-i.ri
share/ri/${RUBYLIBREV}/system/ARGF/eof-i.ri
@ -6220,6 +6222,7 @@ share/ri/${RUBYLIBREV}/system/Object/is_a%3f-i.ri
share/ri/${RUBYLIBREV}/system/Object/kind_of%3f-i.ri
share/ri/${RUBYLIBREV}/system/Object/ln-i.ri
share/ri/${RUBYLIBREV}/system/Object/method-i.ri
share/ri/${RUBYLIBREV}/system/Object/methods-i.ri
share/ri/${RUBYLIBREV}/system/Object/mkdir-i.ri
share/ri/${RUBYLIBREV}/system/Object/mkmf-i.ri
share/ri/${RUBYLIBREV}/system/Object/mv-i.ri
@ -6227,8 +6230,11 @@ share/ri/${RUBYLIBREV}/system/Object/nil%3f-i.ri
share/ri/${RUBYLIBREV}/system/Object/object_id-i.ri
share/ri/${RUBYLIBREV}/system/Object/pretty_print-i.ri
share/ri/${RUBYLIBREV}/system/Object/pretty_print_cycle-i.ri
share/ri/${RUBYLIBREV}/system/Object/private_methods-i.ri
share/ri/${RUBYLIBREV}/system/Object/protected_methods-i.ri
share/ri/${RUBYLIBREV}/system/Object/psych_to_yaml-i.ri
share/ri/${RUBYLIBREV}/system/Object/public_method-i.ri
share/ri/${RUBYLIBREV}/system/Object/public_methods-i.ri
share/ri/${RUBYLIBREV}/system/Object/public_send-i.ri
share/ri/${RUBYLIBREV}/system/Object/remove_instance_variable-i.ri
share/ri/${RUBYLIBREV}/system/Object/respond_to%3f-i.ri