Date: Tue, 25 Oct 2016 17:04:38 +0000 (UTC) From: Joseph Mingrone <jrm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r424635 - in head/Mk: . Uses Message-ID: <201610251704.u9PH4cdY072317@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jrm Date: Tue Oct 25 17:04:38 2016 New Revision: 424635 URL: https://svnweb.freebsd.org/changeset/ports/424635 Log: Include MASTER_SITE_CRAN in Mk/bsd.sites.mk With this change, math/R, math/libRmath, and all cran ports can share one list of sites. Reviewed by: mat Approved by: swills (mentor) Differential Revision: https://reviews.freebsd.org/D8328 Modified: head/Mk/Uses/cran.mk head/Mk/bsd.sites.mk Modified: head/Mk/Uses/cran.mk ============================================================================== --- head/Mk/Uses/cran.mk Tue Oct 25 16:29:17 2016 (r424634) +++ head/Mk/Uses/cran.mk Tue Oct 25 17:04:38 2016 (r424635) @@ -14,20 +14,7 @@ .if !defined(_INCLUDE_USES_CRAN_MK) _INCLUDE_USES_CRAN_MK= yes -MASTER_SITE_CRAN+= http://cran.ms.unimelb.edu.au/src/contrib/ \ - http://mirror.its.dal.ca/cran/src/contrib/ \ - http://mirrors.dotsrc.org/cran/src/contrib/ \ - http://cran.univ-lyon1.fr/src/contrib/ \ - http://ftp5.gwdg.de/pub/misc/cran/src/contrib/ \ - http://cran.stat.unipd.it/src/contrib/ \ - http://cran.md.tsukuba.ac.jp/src/contrib/ \ - http://mirrors.ibiblio.org/pub/mirrors/CRAN/src/contrib/ \ - http://cran.cnr.berkeley.edu/src/contrib/ \ - http://cran.rakanu.com/src/contrib/ \ - http://ftp.ctex.org/mirrors/CRAN/src/contrib/ -MASTER_SITE_CRAN_ARCHIVE+= ${MASTER_SITE_CRAN:S,$,Archive/${PORTNAME}/,} - -MASTER_SITES?= ${MASTER_SITE_CRAN} ${MASTER_SITE_CRAN_ARCHIVE} +MASTER_SITES?= CRAN/src/contrib CRAN_ARCHIVE/src/contrib BUILD_DEPENDS+= ${LOCALBASE}/bin/R:math/R RUN_DEPENDS+= ${LOCALBASE}/bin/R:math/R Modified: head/Mk/bsd.sites.mk ============================================================================== --- head/Mk/bsd.sites.mk Tue Oct 25 16:29:17 2016 (r424634) +++ head/Mk/bsd.sites.mk Tue Oct 25 17:04:38 2016 (r424635) @@ -117,6 +117,25 @@ MASTER_SITE_COMP_SOURCES+= \ http://ftp.fi.netbsd.org/pub/misc/archive/comp.sources.%SUBDIR%/ .endif +.if !defined(IGNORE_MASTER_SITE_CRAN) +MASTER_SITE_CRAN+= \ + https://cloud.r-project.org/%SUBDIR%/ \ + https://stat.ethz.ch/CRAN/%SUBDIR%/ \ + http://cran.utstat.utoronto.ca/%SUBDIR%/ \ + https://cran.cnr.berkeley.edu/%SUBDIR%/ \ + http://cran.csiro.au/%SUBDIR%/ \ + https://mirrors.tuna.tsinghua.edu.cn/CRAN/%SUBDIR%/ \ + http://camoruco.ing.uc.edu.ve/cran/%SUBDIR%/ \ + https://mirror.las.iastate.edu/CRAN/%SUBDIR%/ \ + https://cran.ma.imperial.ac.uk/%SUBDIR%/ \ + https://cran.gis-lab.info/%SUBDIR%/ \ + https://cran.ism.ac.jp/%SUBDIR%/ +.endif + +.if !defined(IGNORE_MASTER_SITE_CRAN_ARCHIVE) +MASTER_SITE_CRAN_ARCHIVE+= ${MASTER_SITE_CRAN:S,$,Archive/${PORTNAME}/,} +.endif + .if !defined(IGNORE_MASTER_SITE_DEBIAN) MASTER_SITE_DEBIAN+= \ http://cdn.debian.net/debian/%SUBDIR%/ \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201610251704.u9PH4cdY072317>