pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

(math/R) +pkgsrc proper update (--dislabe-nls, MACOSX_DEPLOYMENT_TARGET)



Module Name:	pkgsrc-wip
Committed By:	Makoto Fujiwara <makoto%ki.nu@localhost>
Pushed By:	mef
Date:		Sun Jan 7 00:19:56 2024 +0900
Changeset:	42dbf1b6ca80e33134df3241db3d3252d7082546

Modified Files:
	R/Makefile

Log Message:
(math/R) +pkgsrc proper update (--dislabe-nls, MACOSX_DEPLOYMENT_TARGET)

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=42dbf1b6ca80e33134df3241db3d3252d7082546

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

diffstat:
 R/Makefile | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diffs:
diff --git a/R/Makefile b/R/Makefile
index 392ee4a854..371256bfa0 100644
--- a/R/Makefile
+++ b/R/Makefile
@@ -34,13 +34,16 @@ CONFIGURE_ARGS+=	--with-readline
 CONFIGURE_ARGS+=	--with-tcltk
 CONFIGURE_ARGS+=	--with-tcl-config=${BUILDLINK_PREFIX.tcl}/lib/tclConfig.sh
 CONFIGURE_ARGS+=	--with-tk-config=${BUILDLINK_PREFIX.tk}/lib/tkConfig.sh
-CONFIGURE_ARGS+=	--disable-nls
 
 .include "../../mk/bsd.prefs.mk"
 .if ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD"
 CONFIGURE_ARGS+=	--enable-long-double=no
 .endif
 
+.if ${OPSYS} == "NetBSD"
+CONFIGURE_ARGS+=	--disable-nls
+.endif
+
 .if ${OPSYS} != "Linux"
 USE_GNU_ICONV=		yes		# latin1 support, iconvlist
 .endif
@@ -103,6 +106,14 @@ SHAREMODE=		644
 
 CONFIGURE_ARGS.Darwin+=	--disable-openmp
 
+# Temporary fix for deprecated function ATSFontFindFromName() in R 4.2.0
+# Newer R versions should eliminate this function and obsolete this hack
+# https://trac.macports.org/ticket/66095
+# Darwin 21 corresponds to macOS 12
+.if ${OPSYS} == "Darwin" && ${OS_VERSION:R} > 21
+MAKE_ENV.Darwin+= MACOSX_DEPLOYMENT_TARGET="12.0"
+.endif
+
 # R_PAPERSIZE can be: A4, Letter, Legal, Executive
 .if defined(PAPERSIZE)
 R_PAPERSIZE?=		${PAPERSIZE}
@@ -195,6 +206,7 @@ fix-darwin-install-name:
 	done
 .endif
 
+# remove orig version left out
 post-install:
 	${RM}	${DESTDIR}${PREFIX}/lib/R/library/survival/NEWS.Rd.orig
 


Home | Main Index | Thread Index | Old Index