diff options
| author | brook <brook@pkgsrc.org> | 2018-07-28 14:53:46 +0000 |
|---|---|---|
| committer | brook <brook@pkgsrc.org> | 2018-07-28 14:53:46 +0000 |
| commit | 39cb71a6a3a5cb29f117412bab03cb069315d1f5 (patch) | |
| tree | 4f3c556daf5c11213c56ef4a9b175ed0ac166dda | |
| parent | 55af4570d6c4ce1988c7bfb90de029beec86838e (diff) | |
| download | pkgsrc-39cb71a6a3a5cb29f117412bab03cb069315d1f5.tar.gz | |
Add the CRAN archives to R package MASTER_SITES.
Distfiles for older R packges are moved on CRAN from contrib/ to
contrib/Archive/${R_PKGNAME}/. As a result, they may be inaccessible to
'make fetch'. Add the additional directory to MASTER_SITES in
math/R/Makefile.extension so that older distfiles will be retrieved
directly from CRAN. In addition, remove the definition of MASTER_SITES
from math/R-prob/Makefile, which is the only package directly referring to
the distfile archive. At this point all R packages should rely on
math/R/Makefile.extension to define MASTER_SITES; they should not be
defining MASTER_SITES directly.
| -rw-r--r-- | math/R-prob/Makefile | 3 | ||||
| -rw-r--r-- | math/R/Makefile.extension | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/math/R-prob/Makefile b/math/R-prob/Makefile index 8623735b1b6..d32c8e8231e 100644 --- a/math/R-prob/Makefile +++ b/math/R-prob/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.1 2018/03/02 19:04:13 minskim Exp $ +# $NetBSD: Makefile,v 1.2 2018/07/28 14:53:46 brook Exp $ CATEGORIES= math -MASTER_SITES= ${MASTER_SITE_R_CRAN:=contrib/Archive/prob/} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://prob.r-forge.r-project.org/ diff --git a/math/R/Makefile.extension b/math/R/Makefile.extension index dddb4564d51..14afbe62e49 100644 --- a/math/R/Makefile.extension +++ b/math/R/Makefile.extension @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.extension,v 1.22 2018/04/12 15:40:18 minskim Exp $ +# $NetBSD: Makefile.extension,v 1.23 2018/07/28 14:53:46 brook Exp $ # # This Makefile fragment is included by packages for R library packages. # @@ -15,7 +15,8 @@ R_PKGVER?= ${DISTNAME:C/.*_//} DISTNAME?= ${R_PKGNAME}_${R_PKGVER} .endif PKGNAME?= R-${R_PKGNAME}-${R_PKGVER:S/-/./} -MASTER_SITES?= ${MASTER_SITE_R_CRAN:=contrib/} +MASTER_SITES?= ${MASTER_SITE_R_CRAN:=contrib/} \ + ${MASTER_SITE_R_CRAN:=contrib/Archive/${R_PKGNAME}/} DIST_SUBDIR?= R CATEGORIES+= math HOMEPAGE?= https://CRAN.R-project.org/package=${R_PKGNAME} |