Framework: sync with upstream

Taken from: FreeBSD
gesangt · Oct 25, 2016 · a46321c · a46321c
1 parent fc73c31
commit a46321c
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 17 deletions.
diff --git a/GIDs b/GIDs
@@ -118,7 +118,7 @@ polipo:*:173:
 flowtools:*:174:
 twms:*:175:
 mlvpn:*:176:
-# free: 177
+_mdnsd:*:177:
 otpw:*:178:
 gdnsd:*:179:
 rt:*:180:

diff --git a/Mk/Scripts/qa.sh b/Mk/Scripts/qa.sh
@@ -658,7 +658,7 @@ proxydeps() {
 			fi
 			already="${already} ${dep_file}"
 		done <<-EOT
-		$(LD_LIBRARY_PATH=${LOCALBASE}/lib ldd -a "${STAGEDIR}${file}" | \
+		$(ldd -a "${STAGEDIR}${file}" | \
 			awk '\
 			BEGIN {section=0}\
 			/^\// {section++}\

diff --git a/Mk/Uses/cran.mk b/Mk/Uses/cran.mk
@@ -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

diff --git a/Mk/bsd.sites.mk b/Mk/bsd.sites.mk
@@ -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%/ \

diff --git a/UIDs b/UIDs
@@ -123,7 +123,7 @@ polipo:*:173:173::0:0:polipo web cache:/nonexistent:/usr/sbin/nologin
 flowtools:*:174:174::0:0:Flow-tools collector pseudo-user:/nonexistent:/usr/sbin/nologin
 twms:*:175:175::0:0:tWMS pseudo-user:/nonexistent:/usr/sbin/nologin
 mlvpn:*:176:176::0:0:mlVPN pseudo-user:/var/run/mlvpn:/usr/sbin/nologin
-# free: 177
+_mdnsd:*:177:177::0:0:Multicast DNS Daemon:/var/empty:/usr/sbin/nologin
 otpw:*:178:178::0:0:OTPW pseudo-user:/var/lib/otpw:/usr/sbin/nologin
 gdnsd:*:179:179::0:0:gDNSd pseudo-user:/nonexistent:/usr/sbin/nologin
 # free: 180