ruby25-base: Fix build and install on Darwin.

3 files changed, 18 insertions, 8 deletions

diff --git a/lang/ruby25-base/Makefile b/lang/ruby25-base/Makefile
index 1373b729082..a6c9bc345fd 100644
--- a/lang/ruby25-base/Makefile
+++ b/lang/ruby25-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2018/01/08 14:19:06 taca Exp $
+# $NetBSD: Makefile,v 1.2 2018/01/17 11:19:46 jperkin Exp $
 
 DISTNAME=	${RUBY_DISTNAME}
 PKGNAME=	${RUBY_PKGPREFIX}-base-${RUBY_VERSION}
@@ -28,6 +28,8 @@ CONFIGURE_ARGS+= --with-ruby-version=${RUBY_VER_DIR}
 CONFIGURE_ARGS+= --with-ruby-pc="ruby-${RUBY_VERSION}.pc"
 .endif
 
+CONFIGURE_ENV.Darwin+=	ac_cv_prog_dsymutil=
+
 DOCS=	BSDL COPYING COPYING.ja ChangeLog LEGAL NEWS README.EXT README.EXT.ja \
 	README.ja.md README.md doc/ChangeLog-1.8.0 doc/ChangeLog-1.9.3 \
 	doc/ChangeLog-2.0.0 doc/ChangeLog-2.1.0 doc/ChangeLog-2.2.0 \
diff --git a/lang/ruby25-base/distinfo b/lang/ruby25-base/distinfo
index d150ee5afd8..8be72b6c3be 100644
--- a/lang/ruby25-base/distinfo
+++ b/lang/ruby25-base/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.2 2018/01/16 14:53:28 jperkin Exp $
+$NetBSD: distinfo,v 1.3 2018/01/17 11:19:46 jperkin Exp $
 
 SHA1 (ruby-2.5.0.tar.bz2) = 827b9a3bcffa86d1fc9ed96d403cb9dc37731688
 RMD160 (ruby-2.5.0.tar.bz2) = e09d8b3f89d3b494231026cf1295c5bf5da794e5
 SHA512 (ruby-2.5.0.tar.bz2) = 8f6fdf6708e7470f55bc009db2567cd8d4e633ad0678d83a015441ecf5b5d88bd7da8fb8533a42157ff83b74d00b6dc617d39bbb17fc2c6c12287a1d8eaa0f2c
 Size (ruby-2.5.0.tar.bz2) = 13955820 bytes
-SHA1 (patch-configure) = 347bdd41a2529cfe77ffbe053a6941756dffe694
+SHA1 (patch-configure) = 5e7e4f1ef02d0b094bedc772133d405b3c41521b
 SHA1 (patch-ext_dbm_extconf.rb) = c998f8735db54b1ae2bc8b6caa359ce88bc7a45b
 SHA1 (patch-lib_mkmf.rb) = 75d2261a8282a00cd5f811a5e629302d1667207e
 SHA1 (patch-lib_rdoc_ri_driver.rb) = f4d3e59e35b608acd4edc17916142c7f033e6198
diff --git a/lang/ruby25-base/patches/patch-configure b/lang/ruby25-base/patches/patch-configure
index 4665085751c..bc88ffdb5d3 100644
--- a/lang/ruby25-base/patches/patch-configure
+++ b/lang/ruby25-base/patches/patch-configure
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.2 2018/01/16 14:53:28 jperkin Exp $
+$NetBSD: patch-configure,v 1.3 2018/01/17 11:19:46 jperkin Exp $
 
 * Adding Interix support.
 * Ignore doxygen.
@@ -72,7 +72,15 @@ $NetBSD: patch-configure,v 1.2 2018/01/16 14:53:28 jperkin Exp $
  	LIBRUBY_SONAME='$(LIBRUBY_SO)'
  	if test "$rb_cv_binary_elf" != "yes" ; then :
  
-@@ -26334,7 +26343,12 @@ fi
+@@ -26326,6 +26335,7 @@ fi
+ 	    LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-Wl,-unexported_symbol,*_threadptr_*'
+ 
+ fi
++	RUBY_SO_NAME="${RUBY_SO_NAME}"'.$(RUBY_PROGRAM_VERSION)'
+ 	LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "' $(XLDFLAGS)'
+ 	LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT)'
+ 	LIBRUBY_SONAME='lib$(RUBY_BASE_NAME).$(RUBY_API_VERSION).$(SOEXT)'
+@@ -26334,7 +26344,12 @@ fi
  	 ;; #(
    interix*) :
  
@@ -86,7 +94,7 @@ $NetBSD: patch-configure,v 1.2 2018/01/16 14:53:28 jperkin Exp $
  	 ;; #(
    mingw*|cygwin*|mswin*) :
  
-@@ -26516,7 +26530,7 @@ if test "$enable_rpath" = yes; then :
+@@ -26516,7 +26531,7 @@ if test "$enable_rpath" = yes; then :
  esac
      rpathflag=`IFS="$PATH_SEPARATOR"
          echo x "$rpathflag" |
@@ -95,7 +103,7 @@ $NetBSD: patch-configure,v 1.2 2018/01/16 14:53:28 jperkin Exp $
      `
      LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS${rpathflag}"
      LIBRUBYARG_SHARED="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_SHARED"
-@@ -27058,15 +27072,7 @@ fi
+@@ -27058,15 +27073,7 @@ fi
  
  if test "$install_doc" != no; then :
  
@@ -112,7 +120,7 @@ $NetBSD: patch-configure,v 1.2 2018/01/16 14:53:28 jperkin Exp $
      if test "$install_capi" != no -a -n "$DOXYGEN"; then :
  
  	CAPITARGET="capi"
-@@ -29143,31 +29149,7 @@ which seems to be undefined.  Please mak
+@@ -29143,31 +29152,7 @@ which seems to be undefined.  Please mak
      "Makefile":F)
      tmpmk=confmk$$.tmp
      {