Small update to the latest patch level release of ruby 1.9.3. See
http://svn.ruby-lang.org/repos/ruby/tags/v1_9_3_374/ChangeLog for
details.
configure patch from previous patch level no longer applies cleanly,
so fix that and regen patches while here.
Tested on amd64 and i386. Will be committing next week unless I hear
objections.
Thanks,
Jeremy
Index: Makefile
===================================================================
RCS file: /cvs/ports/lang/ruby/1.9/Makefile,v
retrieving revision 1.32
diff -u -p -r1.32 Makefile
--- Makefile 11 Dec 2012 22:20:02 -0000 1.32
+++ Makefile 17 Jan 2013 16:43:18 -0000
@@ -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
@@ -18,8 +18,6 @@ PKGNAME-gdbm = ruby-gdbm-${VERSION}.${P
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
Index: distinfo
===================================================================
RCS file: /cvs/ports/lang/ruby/1.9/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo 20 Nov 2012 16:52:32 -0000 1.9
+++ distinfo 17 Jan 2013 16:27:04 -0000
@@ -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
Index: patches/patch-common_mk
===================================================================
RCS file: /cvs/ports/lang/ruby/1.9/patches/patch-common_mk,v
retrieving revision 1.4
diff -u -p -r1.4 patch-common_mk
--- patches/patch-common_mk 28 Feb 2012 00:20:41 -0000 1.4
+++ patches/patch-common_mk 17 Jan 2013 16:39:17 -0000
@@ -2,9 +2,9 @@ $OpenBSD: patch-common_mk,v 1.4 2012/02/
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)
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/lang/ruby/1.9/patches/patch-configure,v
retrieving revision 1.6
diff -u -p -r1.6 patch-configure
--- patches/patch-configure 28 Feb 2012 00:20:41 -0000 1.6
+++ patches/patch-configure 17 Jan 2013 16:59:56 -0000
@@ -1,39 +1,22 @@
$OpenBSD: patch-configure,v 1.6 2012/02/28 00:20: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
Index: patches/patch-lib_fileutils_rb
===================================================================
RCS file: /cvs/ports/lang/ruby/1.9/patches/patch-lib_fileutils_rb,v
retrieving revision 1.2
diff -u -p -r1.2 patch-lib_fileutils_rb
--- patches/patch-lib_fileutils_rb 8 Nov 2011 23:38:57 -0000 1.2
+++ patches/patch-lib_fileutils_rb 17 Jan 2013 16:39:17 -0000
@@ -4,10 +4,10 @@ Make FileUtils.mkdir_p act more like mkd
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]
Index: pkg/PLIST-ri_docs
===================================================================
RCS file: /cvs/ports/lang/ruby/1.9/pkg/PLIST-ri_docs,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST-ri_docs
--- pkg/PLIST-ri_docs 24 Oct 2012 22:49:05 -0000 1.4
+++ pkg/PLIST-ri_docs 17 Jan 2013 16:56:46 -0000
@@ -27,9 +27,11 @@ share/ri/${RUBYLIBREV}/system/ARGF/cdesc
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_
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
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
