CVS commit: pkgsrc/lang/ruby31-base

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Mon Dec  5 11:47:03 UTC 2022

Modified Files:
        pkgsrc/lang/ruby31-base: distinfo
        pkgsrc/lang/ruby31-base/patches: patch-configure

Log Message:
ruby31-base: Fix Darwin library naming.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/lang/ruby31-base/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/ruby31-base/patches/patch-configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/ruby31-base/distinfo
diff -u pkgsrc/lang/ruby31-base/distinfo:1.8 pkgsrc/lang/ruby31-base/distinfo:1.9
--- pkgsrc/lang/ruby31-base/distinfo:1.8        Sat Nov 26 13:02:49 2022
+++ pkgsrc/lang/ruby31-base/distinfo    Mon Dec  5 11:47:02 2022
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.8 2022/11/26 13:02:49 taca Exp $
+$NetBSD: distinfo,v 1.9 2022/12/05 11:47:02 jperkin Exp $
 
 BLAKE2s (ruby-3.1.3.tar.xz) = ed377b463a7602520d5f2dda4f172f3846b1d817eb9a4bbfd27c8449d983997c
 SHA512 (ruby-3.1.3.tar.xz) = 4b0fd334ae56132ba98b8a69adad54bdcf7f7aeabd5eba5b0f0399a3868e2054f9026ca1b1cb2dbb197a9e9b0610b263481949c0623a62071546bc5adff8ca69
 Size (ruby-3.1.3.tar.xz) = 15300224 bytes
 SHA1 (patch-common.mk) = c23eed58427b2fd4ba8fdb3692f609701a666c6d
-SHA1 (patch-configure) = 90e976f6a8af9f4962587ba0cb404ff38e704fbd
+SHA1 (patch-configure) = 7bce8e1de07e3ff81cc984faef9ba12518557b7a
 SHA1 (patch-ext_openssl_openssl__missing.h) = 3f8d79736fd14806dfaf76e333eec63ff3ff5890
 SHA1 (patch-include_ruby_internal_static__assert.h) = 7d5c3ae7ff674b9b34639924fcf08237164de9f8
 SHA1 (patch-lib_mkmf.rb) = 4a3cd18548dbdf43a13695d4e76f817c0347e335

Index: pkgsrc/lang/ruby31-base/patches/patch-configure
diff -u pkgsrc/lang/ruby31-base/patches/patch-configure:1.3 pkgsrc/lang/ruby31-base/patches/patch-configure:1.4
--- pkgsrc/lang/ruby31-base/patches/patch-configure:1.3 Sat Nov 26 13:02:49 2022
+++ pkgsrc/lang/ruby31-base/patches/patch-configure     Mon Dec  5 11:47:03 2022
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.3 2022/11/26 13:02:49 taca Exp $
+$NetBSD: patch-configure,v 1.4 2022/12/05 11:47:03 jperkin Exp $
 
 * Avoid bash specific variable substitution.
 * Adding Interix support.
@@ -115,7 +115,20 @@ $NetBSD: patch-configure,v 1.3 2022/11/2
        if test "$rb_cv_binary_elf" != "yes"
  then :
  
-@@ -31872,7 +31871,12 @@ fi
+@@ -31847,9 +31846,10 @@ esac
+        ;; #(
+   darwin*) :
+ 
++      RUBY_SO_NAME="${RUBY_SO_NAME}"'.$(RUBY_PROGRAM_VERSION)'
+       LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT)'
+-      LIBRUBY_SONAME='$(LIBRUBY_SO)'
+-      LIBRUBY_ALIASES='lib$(RUBY_INSTALL_NAME).$(SOEXT)'
++      LIBRUBY_SONAME='lib$(RUBY_BASE_NAME).$(RUBY_API_VERSION).$(SOEXT)'
++      LIBRUBY_ALIASES='$(LIBRUBY_SONAME) lib$(RUBY_INSTALL_NAME).$(SOEXT)'
+       if test "$load_relative" = yes
+ then :
+ 
+@@ -31872,7 +31872,12 @@ fi
         ;; #(
    interix*) :
  
@@ -129,7 +142,7 @@ $NetBSD: patch-configure,v 1.3 2022/11/2
         ;; #(
    cygwin*|msys*|mingw*|mswin*) :
  
-@@ -32065,7 +32069,7 @@ then :
+@@ -32065,7 +32070,7 @@ then :
  esac
      rpathflag=`IFS="$PATH_SEPARATOR"
          echo x "$rpathflag" |
@@ -138,7 +151,7 @@ $NetBSD: patch-configure,v 1.3 2022/11/2
      `
      LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS${rpathflag}"
      LIBRUBYARG_SHARED="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_SHARED"
-@@ -33706,7 +33710,7 @@ guard=INCLUDE_RUBY_CONFIG_H
+@@ -33706,7 +33711,7 @@ guard=INCLUDE_RUBY_CONFIG_H
  (
    if test "x$CONFIGURE_TTY" = xyes
  then :
@@ -147,7 +160,7 @@ $NetBSD: patch-configure,v 1.3 2022/11/2
  else $as_nop
    color=
  fi
-@@ -34930,21 +34934,7 @@ which seems to be undefined.  Please mak
+@@ -34930,21 +34935,7 @@ which seems to be undefined.  Please mak
      "Makefile":F)
      tmpmk=confmk$$.tmp
      {