Received: by mail.netbsd.org (Postfix, from userid 605) id 656C28502D; Sat, 28 Jul 2018 14:53:48 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 5443684F05 for ; Sat, 28 Jul 2018 14:53:47 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id bb9nYrOpkE2N for ; Sat, 28 Jul 2018 14:53:46 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 84EB484E52 for ; Sat, 28 Jul 2018 14:53:46 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 75231FBEC; Sat, 28 Jul 2018 14:53:46 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_153278962641860" MIME-Version: 1.0 Date: Sat, 28 Jul 2018 14:53:46 +0000 From: "Brook Milligan" Subject: CVS commit: pkgsrc/math To: pkgsrc-changes@NetBSD.org Reply-To: brook@netbsd.org X-Mailer: log_accum Message-Id: <20180728145346.75231FBEC@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_153278962641860 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: brook Date: Sat Jul 28 14:53:46 UTC 2018 Modified Files: pkgsrc/math/R: Makefile.extension pkgsrc/math/R-prob: Makefile Log Message: 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. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 pkgsrc/math/R/Makefile.extension cvs rdiff -u -r1.1 -r1.2 pkgsrc/math/R-prob/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_153278962641860 Content-Disposition: inline Content-Length: 1433 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/math/R/Makefile.extension diff -u pkgsrc/math/R/Makefile.extension:1.22 pkgsrc/math/R/Makefile.extension:1.23 --- pkgsrc/math/R/Makefile.extension:1.22 Thu Apr 12 15:40:18 2018 +++ pkgsrc/math/R/Makefile.extension Sat Jul 28 14:53:46 2018 @@ -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} Index: pkgsrc/math/R-prob/Makefile diff -u pkgsrc/math/R-prob/Makefile:1.1 pkgsrc/math/R-prob/Makefile:1.2 --- pkgsrc/math/R-prob/Makefile:1.1 Fri Mar 2 19:04:13 2018 +++ pkgsrc/math/R-prob/Makefile Sat Jul 28 14:53:46 2018 @@ -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/ --_----------=_153278962641860--