CVS commit: pkgsrc/math/R

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Wed Mar 25 01:47:19 UTC 2026

Modified Files:
        pkgsrc/math/R: distinfo
        pkgsrc/math/R/patches: patch-configure.ac

Log Message:
R: fix install-time error on Darwin builds by restoring patch lost in update

There seem to be more missing hunks plus some weird lines ending with a
vertical bar in patch-configure.ac, but I'm doing minimal changes to fix
an issue at the moment.


To generate a diff of this commit:
cvs rdiff -u -r1.114 -r1.115 pkgsrc/math/R/distinfo
cvs rdiff -u -r1.14 -r1.15 pkgsrc/math/R/patches/patch-configure.ac

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

Modified files:

Index: pkgsrc/math/R/distinfo
diff -u pkgsrc/math/R/distinfo:1.114 pkgsrc/math/R/distinfo:1.115
--- pkgsrc/math/R/distinfo:1.114        Mon Feb 16 23:44:02 2026
+++ pkgsrc/math/R/distinfo      Wed Mar 25 01:47:18 2026
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.114 2026/02/16 23:44:02 mef Exp $
+$NetBSD: distinfo,v 1.115 2026/03/25 01:47:18 maya Exp $
 
 BLAKE2s (R-4.5.2.tar.gz) = 89aaf25d047df226ec7340bf5550db5223163bec0b5ff1d5a3bfae691aa2106a
 SHA512 (R-4.5.2.tar.gz) = abc4ff1a1b18a1f480e7bceb3267074e30453b5a571034b4c2a1c53e1650a1bafaf86bc6ca37f117a2e4f6617039dedeedef4ba8743f38720fc70e4bed2ff0a4
 Size (R-4.5.2.tar.gz) = 40546249 bytes
-SHA1 (patch-configure.ac) = 61904b7918019204634d61bce2421c01c81ed640
+SHA1 (patch-configure.ac) = 9d5d4d33a5150493812b4eb8a4991a3f5d1161c8
 SHA1 (patch-src_extra_xdr_xdr__mem.c) = 2e607b070db8b24a6ad5501e9c7c1549bf1b1d82
 SHA1 (patch-src_extra_xdr_xdr__stdio.c) = 91ea16599693e9dc14e631880fbe1c52f0f2009f
 SHA1 (patch-src_include_R__ext_Error.h) = 2d1eaebff5e57d73d301f7e818daa0b959a5c0f2

Index: pkgsrc/math/R/patches/patch-configure.ac
diff -u pkgsrc/math/R/patches/patch-configure.ac:1.14 pkgsrc/math/R/patches/patch-configure.ac:1.15
--- pkgsrc/math/R/patches/patch-configure.ac:1.14       Mon Feb 16 23:44:02 2026
+++ pkgsrc/math/R/patches/patch-configure.ac    Wed Mar 25 01:47:18 2026
@@ -1,4 +1,6 @@
-$NetBSD: patch-configure.ac,v 1.14 2026/02/16 23:44:02 mef Exp $
+$NetBSD: patch-configure.ac,v 1.15 2026/03/25 01:47:18 maya Exp $
+
+Fix Darwin -install_name path for libR.dylib
 
 on NetBSD/amd64 9.4: getting
 
@@ -20,9 +22,9 @@ release    line # 
 10.99.12   4770   withval=$with_blas; if test "${withval}" = no; then
  9.3       4392   withval=$with_blas; R_ARG_USE(blas)
 
---- configure.ac       2026-01-03 17:00:22.984847292 +0900
-+++ configure.ac       2026-01-03 17:00:22.984847292 +0900
-@@ -33,6 +33,7 @@
+--- configure.ac.orig  2025-04-20 22:15:02.000000000 +0000
++++ configure.ac
+@@ -33,6 +33,7 @@ m4_define([R_VERSION],
  AC_INIT([R],[R_VERSION],[https://bugs.r-project.org],[R],[https://www.r-project.org])
  AC_CONFIG_SRCDIR([src/include/Defn.h])
  AC_CONFIG_AUX_DIR([tools])
@@ -30,7 +32,7 @@ release    line # 
  
  ### * Information on the package.
  
-@@ -317,6 +318,8 @@
+@@ -322,6 +323,8 @@ AC_ARG_ENABLE([BLAS-shlib],
  ## As from R 3.2.0 split up -L... and -lR
  if test "${want_R_shlib}" = yes; then
    LIBR0="-L\"\$(R_HOME)/lib\$(R_ARCH)\""
@@ -39,3 +41,14 @@ release    line # 
    LIBR1=-lR
  else
    LIBR0=
+@@ -1864,8 +1867,8 @@ dnl     ;;
+     DYLIB_EXT=".dylib"
+     dylib_ldflags="${darwin_dylib_ldflags}"
+     MAJR_VERSION=`echo "${PACKAGE_VERSION}" | sed  -e "s/[[\.]][[1-9]]$/.0/"` 
+-    LIBR_LDFLAGS="-install_name libR.dylib -compatibility_version ${MAJR_VERSION}  -current_version ${PACKAGE_VERSION}  -headerpad_max_install_names"
+-    RLAPACK_LDFLAGS="-install_name libRlapack.dylib -compatibility_version ${MAJR_VERSION} -current_version ${PACKAGE_VERSION}  -headerpad_max_install_names"
++    LIBR_LDFLAGS="-install_name ${PREFIX}/lib/R/lib/libR.dylib -compatibility_version ${MAJR_VERSION}  -current_version ${PACKAGE_VERSION}  -headerpad_max_install_names"
++    RLAPACK_LDFLAGS="-install_name ${PREFIX}/lib/R/lib/libRlapack.dylib -compatibility_version ${MAJR_VERSION} -current_version ${PACKAGE_VERSION}  -headerpad_max_install_names"
+     ## don't use version in libRblas so we can replace it with any BLAS implementation
+     RBLAS_LDFLAGS="-install_name libRblas.dylib -headerpad_max_install_names"
+     ;;