CVS commit: pkgsrc/math/R

["Havard Eidnes" <he%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   he
Date:           Mon Jan 20 21:26:02 UTC 2025

Modified Files:
        pkgsrc/math/R: Makefile distinfo
Added Files:
        pkgsrc/math/R/patches: patch-src_extra_xdr_xdr__mem.c
            patch-src_extra_xdr_xdr__stdio.c

Log Message:
math/R: on NetBSD, disable the ntohl / htonl dance.

These are already declared at the point in the code it's used,
and on macppc it causes build failure, and probably also on other
big-endian targets.

There still appears to be rpath issues, libR.so is installed in
${PREFIX}/lib/R/lib/, but that directory is not in rpath of other
libs or executables, so this does not install, at least not on
macppc at the moment.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.262 -r1.263 pkgsrc/math/R/Makefile
cvs rdiff -u -r1.109 -r1.110 pkgsrc/math/R/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/math/R/patches/patch-src_extra_xdr_xdr__mem.c \
    pkgsrc/math/R/patches/patch-src_extra_xdr_xdr__stdio.c

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/Makefile
diff -u pkgsrc/math/R/Makefile:1.262 pkgsrc/math/R/Makefile:1.263
--- pkgsrc/math/R/Makefile:1.262        Fri Dec 27 08:20:16 2024
+++ pkgsrc/math/R/Makefile      Mon Jan 20 21:26:02 2025
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.262 2024/12/27 08:20:16 wiz Exp $
+# $NetBSD: Makefile,v 1.263 2025/01/20 21:26:02 he Exp $
 
 #
 # If updating this package, please try to ensure PLIST.Darwin is kept in sync
 # to avoid unnecessarily breaking macOS users.
 #
 DISTNAME=      R-4.4.2
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    math
 MASTER_SITES=  ${MASTER_SITE_R_CRAN:=base/R-4/}
 

Index: pkgsrc/math/R/distinfo
diff -u pkgsrc/math/R/distinfo:1.109 pkgsrc/math/R/distinfo:1.110
--- pkgsrc/math/R/distinfo:1.109        Fri Jan 17 22:12:09 2025
+++ pkgsrc/math/R/distinfo      Mon Jan 20 21:26:02 2025
@@ -1,10 +1,12 @@
-$NetBSD: distinfo,v 1.109 2025/01/17 22:12:09 brook Exp $
+$NetBSD: distinfo,v 1.110 2025/01/20 21:26:02 he Exp $
 
 BLAKE2s (R-4.4.2.tar.gz) = eb8c3d41ba6d0e12401f03410d2c8bb37dc3344989824c990f9a33f08ebb6c5c
 SHA512 (R-4.4.2.tar.gz) = b29d82242f70487f52849a5726610c03dffa4e54f1a32a9f3f76784fcf61f91d5c40cddee1029eeb9c9837ff26f382f348e8518dd68c84e9fc2192b981013d9a
 Size (R-4.4.2.tar.gz) = 37582785 bytes
 SHA1 (patch-configure.ac) = 7a62031864a9cef7b40278a7579293469fba7446
 SHA1 (patch-m4_R.m4) = 3e1d390d8aa9895aee7cb479ddab371d82562b88
+SHA1 (patch-src_extra_xdr_xdr__mem.c) = 2e607b070db8b24a6ad5501e9c7c1549bf1b1d82
+SHA1 (patch-src_extra_xdr_xdr__stdio.c) = e4d8ace08ad282f44113941dd6a3b194769b8167
 SHA1 (patch-src_include_R__ext_Error.h) = bc55a8bba6bf931e3f6794577e63bfafdfc740cf
 SHA1 (patch-src_library_stats_src_Makefile.in) = 4eb93292858392792c37a706399e2cef91821bbe
 SHA1 (patch-src_main_character.c) = c1be2cae404ecbdd547343b70e9d072e9e1d5549

Added files:

Index: pkgsrc/math/R/patches/patch-src_extra_xdr_xdr__mem.c
diff -u /dev/null pkgsrc/math/R/patches/patch-src_extra_xdr_xdr__mem.c:1.1
--- /dev/null   Mon Jan 20 21:26:02 2025
+++ pkgsrc/math/R/patches/patch-src_extra_xdr_xdr__mem.c        Mon Jan 20 21:26:02 2025
@@ -0,0 +1,28 @@
+$NetBSD: patch-src_extra_xdr_xdr__mem.c,v 1.1 2025/01/20 21:26:02 he Exp $
+
+Don't do the ntohl() / htonl() dance on NetBSD.
+
+--- ./src/extra/xdr/xdr_mem.c.orig     2025-01-20 17:36:36.874607200 +0000
++++ ./src/extra/xdr/xdr_mem.c
+@@ -24,6 +24,8 @@ static uint32_t ntohl(uint32_t x)
+ #endif 
+ }
+ #else /* net is big-endian: little-endian hosts need byte-swap code */
++#if !defined(__NetBSD__)
++/* Not needed on NetBSD, ntohl() and htonl() already declared */
+ #ifndef WORDS_BIGENDIAN
+ static uint32_t ntohl (uint32_t x)
+ {
+@@ -33,7 +35,11 @@ static uint32_t ntohl (uint32_t x)
+ #define ntohl(x) (x)
+ #endif
+ #endif
+-#define htonl ntohl
++#endif
++#if !defined(__NetBSD__)
++/* Not needed on NetBSD, ntohl() and htonl() already declared */
++#define htonl(x) ntohl(x)
++#endif
+ 
+ /*********************************************************************
+  * RPC for the Windows NT Operating System
Index: pkgsrc/math/R/patches/patch-src_extra_xdr_xdr__stdio.c
diff -u /dev/null pkgsrc/math/R/patches/patch-src_extra_xdr_xdr__stdio.c:1.1
--- /dev/null   Mon Jan 20 21:26:02 2025
+++ pkgsrc/math/R/patches/patch-src_extra_xdr_xdr__stdio.c      Mon Jan 20 21:26:02 2025
@@ -0,0 +1,27 @@
+$NetBSD: patch-src_extra_xdr_xdr__stdio.c,v 1.1 2025/01/20 21:26:02 he Exp $
+
+Don't do the ntohl() / htonl() dance on NetBSD.
+
+--- src/extra/xdr/xdr_stdio.c.orig     2025-01-20 17:42:42.369938152 +0000
++++ src/extra/xdr/xdr_stdio.c
+@@ -20,6 +20,8 @@ static uint32_t ntohl(uint32_t x)
+ #endif
+ }
+ #else /* net is big-endian: little-endian hosts need byte-swap code */
++#if !defined(__NetBSD__)
++/* Not needed on NetBSD, ntohl() and htonl() already declared */
+ #ifndef WORDS_BIGENDIAN
+ /* #ifdef LITTLE_ENDIAN */
+ static uint32_t ntohl (uint32_t x)
+@@ -30,7 +32,11 @@ static uint32_t ntohl (uint32_t x)
+ #define ntohl(x) (x)
+ #endif
+ #endif
++#endif
++#if !defined(__NetBSD__)
++/* Not needed on NetBSD, ntohl() and htonl() already declared */
+ #define htonl ntohl
++#endif
+ 
+ /*********************************************************************
+  * RPC for the Windows NT Operating System