R: remove superfluous "-Wl," in configure patch

Bump PKGREVISION.

Fix some pkglint while here.

6 files changed, 17 insertions, 16 deletions

diff --git a/math/R/Makefile b/math/R/Makefile
index 4aaccc6b1ad..71b1e1e16e9 100644
--- a/math/R/Makefile
+++ b/math/R/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.231 2022/03/19 23:13:59 brook Exp $
+# $NetBSD: Makefile,v 1.232 2022/03/23 21:16:44 wiz Exp $
 
 #
 # If updating this package, please try to ensure PLIST.Darwin is kept in sync
 # to avoid unnecessarily breaking macOS users.
 #
 DISTNAME=	R-4.1.3
+PKGREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_R_CRAN:=base/R-4/}
 
@@ -61,7 +62,7 @@ PLIST.x11=		yes
 # BLAS/LAPACK by default and only on request accelerate. Just
 # BLAS_ACCEPTED=	${_BLAS_TYPES} accelerate.framework
 # (here and in buildlink3.mk) and deleting the first conditional
-# branch might work, given that R knows what todo with 
+# branch might work, given that R knows what todo with
 # -framework Accelerate. Someone on Darwin really needs to test.
 .if exists(/System/Library/Frameworks/Accelerate.framework)
 CONFIGURE_ARGS+=	--with-blas="-framework Accelerate"
@@ -156,7 +157,7 @@ CTF_FILES_SKIP+=	lib/R/library/mgcv/libs/mgcv.so
 CHECK_WRKREF_SKIP+=	lib/R/etc/Makeconf
 
 pre-configure:
-	${RUN} cd ${WRKSRC} && autoreconf -fvi || echo Ignore the warnings from autoreconf
+	${RUN} cd ${WRKSRC} && autoreconf -fvi || ${ECHO} Ignore the warnings from autoreconf
 
 # Fix library names.  Relies on build system using -headerpad_max_install_names.
 .if ${OPSYS} == "Darwin"
diff --git a/math/R/Makefile.extension b/math/R/Makefile.extension
index 3c1587bcd89..332bca4bab9 100644
--- a/math/R/Makefile.extension
+++ b/math/R/Makefile.extension
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.extension,v 1.27 2020/07/31 17:04:12 brook Exp $
+# $NetBSD: Makefile.extension,v 1.28 2022/03/23 21:16:44 wiz Exp $
 #
 # This Makefile fragment is included by packages for R library packages.
 #
@@ -70,7 +70,7 @@ R_PKG_INSTALL_ARGS+=	--configure-args='${CONFIGURE_ARGS}'
 .endif
 
 GENERATE_PLIST+=	( cd ${DESTDIR}${PREFIX}; for dir in ${R_INST_DIRS}; do \
-	${FIND} ${R_LIB}/$${dir} \( -type f -o -type l \) -print; done ) | ${SORT} -u;
+			${FIND} ${R_LIB}/$${dir} \( -type f -o -type l \) -print; done ) | ${SORT} -u;
 
 INSTALL_TEMPLATES+=	../../math/R/files/pkg-index.tmpl
 DEINSTALL_TEMPLATES+=	../../math/R/files/pkg-index.tmpl
diff --git a/math/R/PLIST.Darwin b/math/R/PLIST.Darwin
index 7db2baae5b9..63f6a47fa4a 100644
--- a/math/R/PLIST.Darwin
+++ b/math/R/PLIST.Darwin
@@ -1,17 +1,17 @@
-@comment $NetBSD: PLIST.Darwin,v 1.11 2021/12/07 12:42:15 jperkin Exp $
-@comment 
+@comment $NetBSD: PLIST.Darwin,v 1.12 2022/03/23 21:16:44 wiz Exp $
+@comment
 @comment The configure script has explicit check for darwin and sets
 @comment   --with-internal-tzcode=yes
 @comment which results in these files in lib/R/share/zoneinfo
-@comment 
+@comment
 @comment This source file:
 @comment   https://svn.r-project.org/R/trunk/src/extra/tzone/Notes
 @comment explains that osx has problems stemming from 32 bit limitations in zic.
 @comment Some further discussion found at
 @comment   https://github.com/tzinfo/tzinfo-data/issues/1
-@comment 
+@comment
 @comment Even darwin 10.10.3 (osx 14D131) still shows zic --version of 7.116
-@comment 
+@comment
 lib/R/share/zoneinfo/Africa/Abidjan
 lib/R/share/zoneinfo/Africa/Accra
 lib/R/share/zoneinfo/Africa/Addis_Ababa
diff --git a/math/R/buildlink3.mk b/math/R/buildlink3.mk
index 68644c713bc..1823cf1be07 100644
--- a/math/R/buildlink3.mk
+++ b/math/R/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2020/10/12 21:51:58 bacon Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2022/03/23 21:16:44 wiz Exp $
 
 BUILDLINK_TREE+=	R
 
@@ -8,7 +8,6 @@ R_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.R+=	R>=1.7.0
 BUILDLINK_ABI_DEPENDS.R+=	R>=4.0.3nb1
 BUILDLINK_PKGSRCDIR.R?=		../../math/R
-.endif # R_BUILDLINK3_MK
 
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../archivers/xz/buildlink3.mk"
@@ -17,5 +16,6 @@ BUILDLINK_PKGSRCDIR.R?=		../../math/R
 .if !exists(/System/Library/Frameworks/Accelerate.framework)
 .include "../../mk/blas.buildlink3.mk"
 .endif
+.endif # R_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-R
diff --git a/math/R/distinfo b/math/R/distinfo
index 721ba8c72bd..646cb3a1642 100644
--- a/math/R/distinfo
+++ b/math/R/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.94 2022/03/19 23:13:59 brook Exp $
+$NetBSD: distinfo,v 1.95 2022/03/23 21:16:44 wiz Exp $
 
 BLAKE2s (R-4.1.3.tar.gz) = bee2174be0be0102367553b25fbf38b1ed2324a9193310a3fe98babec69b7988
 SHA512 (R-4.1.3.tar.gz) = cb71cc6c9551cc9cef4819ed778a8d0ef40490ec2bed27669c8e93d464a93bef5e73c2a03a714db03c87112b291a752ec2d21194e5abef81d85cb6c62643127c
 Size (R-4.1.3.tar.gz) = 35026517 bytes
-SHA1 (patch-configure.ac) = 967450ec49d375cce254e108b062ad73857d261d
+SHA1 (patch-configure.ac) = d6661984716a131bbfa1a2aa56385c535881d43d
 SHA1 (patch-m4_R.m4) = 704d5514e10adf0b5217bb71b06f44a612eca6e0
 SHA1 (patch-src_library_stats_src_Makefile.in) = 4eb93292858392792c37a706399e2cef91821bbe
 SHA1 (patch-src_main_character.c) = 842ae5d291f36f2beead4d32c1d41b18cbff878d
diff --git a/math/R/patches/patch-configure.ac b/math/R/patches/patch-configure.ac
index ff4b43489d6..42889a60b59 100644
--- a/math/R/patches/patch-configure.ac
+++ b/math/R/patches/patch-configure.ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure.ac,v 1.5 2022/03/19 23:13:59 brook Exp $
+$NetBSD: patch-configure.ac,v 1.6 2022/03/23 21:16:44 wiz Exp $
 
 Do not include system paths in R_LD_LIBRARY_PATH.
 NetBSD, FreeBSD, DragonFly, Darwin and Solaris fixes
@@ -18,7 +18,7 @@ NetBSD, FreeBSD, DragonFly, Darwin and Solaris fixes
  ## 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)\""
-+  LIBR0="-Wl,@COMPILER_RPATH_FLAG@${prefix}/lib/R/lib\$(R_ARCH) -L\"\$(R_HOME)/lib\$(R_ARCH)\""
++  LIBR0="@COMPILER_RPATH_FLAG@${prefix}/lib/R/lib\$(R_ARCH) -L\"\$(R_HOME)/lib\$(R_ARCH)\""
    LIBR1=-lR
  else
    LIBR0=