CVS commit: pkgsrc/math/R

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

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Fri Nov 22 15:28:52 UTC 2024

Modified Files:
        pkgsrc/math/R: Makefile.extension

Log Message:
R: Ensure all "-" are converted to "." in PKGVERSION.

math/R-robustbase is apparently the first package to use multiple "-" in its
R_PKGVER, resulting in 0.99-4-1 being parsed as version "1", and breaking a
bunch of DEPENDS matches.  Hopefully this fixes bulk builds without causing
any regressions.


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 pkgsrc/math/R/Makefile.extension

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.extension
diff -u pkgsrc/math/R/Makefile.extension:1.28 pkgsrc/math/R/Makefile.extension:1.29
--- pkgsrc/math/R/Makefile.extension:1.28       Wed Mar 23 21:16:44 2022
+++ pkgsrc/math/R/Makefile.extension    Fri Nov 22 15:28:52 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.extension,v 1.28 2022/03/23 21:16:44 wiz Exp $
+# $NetBSD: Makefile.extension,v 1.29 2024/11/22 15:28:52 jperkin Exp $
 #
 # This Makefile fragment is included by packages for R library packages.
 #
@@ -24,7 +24,7 @@ R_PKGVER?=    ${DISTNAME:C/.*_//}
 .else
 DISTNAME?=     ${R_PKGNAME}_${R_PKGVER}
 .endif
-PKGNAME?=      R-${R_PKGNAME}-${R_PKGVER:S/-/./}
+PKGNAME?=      R-${R_PKGNAME}-${R_PKGVER:S/-/./g}
 MASTER_SITES?= ${MASTER_SITE_R_CRAN:=contrib/} \
                ${MASTER_SITE_R_CRAN:=contrib/Archive/${R_PKGNAME}/}
 DIST_SUBDIR?=  R