Attachment 191020 Details for Bug 226203 – patch v4

[patch] patch v4

https4.diff (text/plain), 16.35 KB, created by Sam H on 2018-02-26 16:27:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sam H

Created: 2018-02-26 16:27:13 UTC

Size: 16.35 KB

patch

obsolete

>Index: Mk/bsd.port.mk
>===================================================================
>--- Mk/bsd.port.mk	(revision 462987)
>+++ Mk/bsd.port.mk	(working copy)
>@@ -2449,6 +2449,7 @@
> 
> # The primary backup site.
> MASTER_SITE_BACKUP?=	\
>+	https://pkg.FreeBSD.org/ports-distfiles/${DIST_SUBDIR}/ \
> 	http://distcache.FreeBSD.org/ports-distfiles/${DIST_SUBDIR}/
> MASTER_SITE_BACKUP:=	${MASTER_SITE_BACKUP:S^\${DIST_SUBDIR}/^^}
> 
>Index: Mk/bsd.sites.mk
>===================================================================
>--- Mk/bsd.sites.mk	(revision 462987)
>+++ Mk/bsd.sites.mk	(working copy)
>@@ -26,6 +26,7 @@
> # Where to put distfiles that don't have any other master site
> .if !defined(IGNORE_MASTER_SITE_LOCAL)
> MASTER_SITE_LOCAL+= \
>+	https://pkg.FreeBSD.org/local-distfiles/%SUBDIR%/ \
> 	http://distcache.FreeBSD.org/local-distfiles/%SUBDIR%/ \
> 	http://distcache.us-east.FreeBSD.org/local-distfiles/%SUBDIR%/ \
> 	http://distcache.eu.FreeBSD.org/local-distfiles/%SUBDIR%/ \
>@@ -275,6 +276,7 @@
> #
> .if !defined(IGNORE_MASTER_SITE_FREEBSD_ORG)
> MASTER_SITE_FREEBSD_ORG+= \
>+	https://download.FreeBSD.org/pub/FreeBSD/%SUBDIR%/ \
> 	ftp://ftp.FreeBSD.org/pub/FreeBSD/%SUBDIR%/ \
> 	ftp://ftp.se.FreeBSD.org/pub/FreeBSD/%SUBDIR%/ \
> 	ftp://ftp.jp.FreeBSD.org/pub/FreeBSD/%SUBDIR%/ \
>@@ -732,7 +734,7 @@
> 
> .if !defined(IGNORE_MASTER_SITE_NETBSD)
> MASTER_SITE_NETBSD+= \
>-	ftp://ftp.netbsd.org/pub/NetBSD/packages/distfiles/%SUBDIR%/ \
>+	https://ftp.netbsd.org/pub/NetBSD/packages/distfiles/%SUBDIR%/ \
> 	ftp://ftp.iastate.edu/pub/netbsd/packages/distfiles/%SUBDIR%/ \
> 	ftp://ftp.plig.net/pub/NetBSD/packages/distfiles/%SUBDIR%/ \
> 	ftp://ftp.proxad.net/mirrors/ftp.netbsd.org/packages/distfiles/%SUBDIR%/ \
>@@ -746,7 +748,7 @@
> .if !defined(IGNORE_MASTER_SITE_NETLIB)
> MASTER_SITE_NETLIB+= \
> 	http://www.netlib.org/%SUBDIR%/ \
>-	ftp://ftp.mirrorservice.org/sites/ftp.netlib.org/%SUBDIR%/ \
>+	https://ftp.mirrorservice.org/sites/ftp.netlib.org/%SUBDIR%/ \
> 	https://www.mirrorservice.org/sites/ftp.netlib.org/%SUBDIR%/ \
> 	ftp://ftp.irisa.fr/pub/netlib/%SUBDIR%/ \
> 	http://netlib.sandia.gov/%SUBDIR%/
>@@ -765,12 +767,14 @@
> 
> .if !defined(IGNORE_MASTER_SITE_OPENBSD)
> MASTER_SITE_OPENBSD+= \
>+	https://fastly.cdn.openbsd.org/pub/OpenBSD/%SUBDIR%/ \
>+	https://cloudflare.cdn.openbsd.org/pub/OpenBSD/%SUBDIR%/ \
> 	https://ftp.OpenBSD.org/pub/OpenBSD/%SUBDIR%/ \
> 	https://ftp.eu.openbsd.org/pub/OpenBSD/%SUBDIR%/ \
> 	https://ftp3.usa.openbsd.org/pub/OpenBSD/%SUBDIR%/ \
>+	https://mirror.leaseweb.com/pub/OpenBSD/%SUBDIR%/ \
> 	https://openbsd.hk/pub/OpenBSD/%SUBDIR%/ \
>-	https://mirror.aarnet.edu.au/pub/OpenBSD/%SUBDIR%/ \
>-	https://mirrors.evowise.com/pub/OpenBSD/%SUBDIR%/
>+	https://mirror.aarnet.edu.au/pub/OpenBSD/%SUBDIR%/
> .endif
> 
> .if !defined(IGNORE_MASTER_SITE_OSSP)
>Index: archivers/unrar/Makefile
>===================================================================
>--- archivers/unrar/Makefile	(revision 462987)
>+++ archivers/unrar/Makefile	(working copy)
>@@ -5,7 +5,8 @@
> DISTVERSION=	5.50
> PORTEPOCH=	6
> CATEGORIES+=	archivers
>-MASTER_SITES=	http://www.rarlab.com/rar/ \
>+MASTER_SITES=	https://www.rarlab.com/rar/ \
>+		https://distfiles.crux.guru/ \
> 		LOCAL/sunpoet
> DISTNAME=	unrarsrc-5.5.8
> 
>Index: audio/flac/Makefile
>===================================================================
>--- audio/flac/Makefile	(revision 462987)
>+++ audio/flac/Makefile	(working copy)
>@@ -4,7 +4,9 @@
> PORTNAME=	flac
> PORTVERSION=	1.3.2
> CATEGORIES=	audio
>-MASTER_SITES=	http://downloads.xiph.org/releases/flac/
>+MASTER_SITES=	https://downloads.xiph.org/releases/flac/ \
>+		https://download.videolan.org/contrib/flac/ \
>+		https://sourceforge.mirrorservice.org/f/fl/flac/flac-src/
> 
> MAINTAINER=	naddy@FreeBSD.org
> COMMENT=	Free lossless audio codec
>Index: audio/libogg/Makefile
>===================================================================
>--- audio/libogg/Makefile	(revision 462987)
>+++ audio/libogg/Makefile	(working copy)
>@@ -5,7 +5,8 @@
> PORTVERSION=	1.3.3
> PORTEPOCH=	4
> CATEGORIES=	audio
>-MASTER_SITES=	http://downloads.xiph.org/releases/ogg/
>+MASTER_SITES=	https://downloads.xiph.org/releases/ogg/ \
>+		https://download.videolan.org/videolan/testing/contrib/ogg/
> 
> MAINTAINER=	naddy@FreeBSD.org
> COMMENT=	Ogg bitstream library
>Index: audio/libvorbis/Makefile
>===================================================================
>--- audio/libvorbis/Makefile	(revision 462987)
>+++ audio/libvorbis/Makefile	(working copy)
>@@ -6,7 +6,8 @@
> PORTREVISION=	1
> PORTEPOCH=	3
> CATEGORIES=	audio
>-MASTER_SITES=	http://downloads.xiph.org/releases/vorbis/
>+MASTER_SITES=	https://downloads.xiph.org/releases/vorbis/ \
>+		https://download.videolan.org/videolan/testing/contrib/vorbis/
> 
> MAINTAINER=	naddy@FreeBSD.org
> COMMENT=	Audio compression codec library
>Index: devel/boehm-gc/Makefile
>===================================================================
>--- devel/boehm-gc/Makefile	(revision 462987)
>+++ devel/boehm-gc/Makefile	(working copy)
>@@ -4,7 +4,9 @@
> PORTNAME=	gc
> PORTVERSION=	7.6.2
> CATEGORIES=	devel
>-MASTER_SITES=	http://www.hboehm.info/gc/gc_source/
>+MASTER_SITES=	http://www.hboehm.info/gc/gc_source/ \
>+		https://ftp.osuosl.org/pub/blfs/conglomeration/gc/
>+
> PKGNAMEPREFIX=	boehm-
> .ifdef GC_VARIANT
> PKGNAMESUFFIX=	-${GC_VARIANT}
>Index: devel/ccache/Makefile
>===================================================================
>--- devel/ccache/Makefile	(revision 462987)
>+++ devel/ccache/Makefile	(working copy)
>@@ -5,7 +5,9 @@
> PORTVERSION=	3.3.5
> PORTREVISION=	0
> CATEGORIES=	devel
>-MASTER_SITES=	http://www.samba.org/ftp/ccache/ \
>+MASTER_SITES=	https://www.samba.org/ftp/ccache/ \
>+		https://download.samba.org/pub/ccache/ \
>+		https://ftp.heanet.ie/mirrors/OpenBSD/distfiles/ \
> 		LOCAL/bdrewery
> 
> MAINTAINER=	bdrewery@FreeBSD.org
>Index: devel/libedit/Makefile
>===================================================================
>--- devel/libedit/Makefile	(revision 462987)
>+++ devel/libedit/Makefile	(working copy)
>@@ -6,7 +6,8 @@
> PORTREVISION=	2
> PORTEPOCH=	1
> CATEGORIES=	devel
>-MASTER_SITES=	http://thrysoee.dk/editline/
>+MASTER_SITES=	https://thrysoee.dk/editline/
>+
> DISTNAME=	${PORTNAME}-${EDITDATE}-${EDITVERSION}
> 
> MAINTAINER=	bapt@FreeBSD.org
>Index: devel/libuv/Makefile
>===================================================================
>--- devel/libuv/Makefile	(revision 462987)
>+++ devel/libuv/Makefile	(working copy)
>@@ -5,7 +5,7 @@
> PORTVERSION=	1.19.2
> DISTVERSIONPREFIX=	v
> CATEGORIES=	devel
>-#MASTER_SITES=	http://dist.libuv.org/dist/v${PORTVERSION}/
>+MASTER_SITES=	https://dist.libuv.org/dist/v${PORTVERSION}/
> 
> MAINTAINER=	thierry@FreeBSD.org
> COMMENT=	Multi-platform support library with a focus on asynchronous I/O
>Index: devel/py-xdg/Makefile
>===================================================================
>--- devel/py-xdg/Makefile	(revision 462987)
>+++ devel/py-xdg/Makefile	(working copy)
>@@ -6,7 +6,8 @@
> PORTVERSION=	0.25
> PORTREVISION=	1
> CATEGORIES=	devel python
>-MASTER_SITES=	http://people.freedesktop.org/~takluyver/
>+MASTER_SITES=	https://people.freedesktop.org/~takluyver/
>+		
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
> DISTNAME=	py${PORTNAME}-${PORTVERSION}
> 
>Index: devel/stfl/Makefile
>===================================================================
>--- devel/stfl/Makefile	(revision 462987)
>+++ devel/stfl/Makefile	(working copy)
>@@ -4,7 +4,8 @@
> PORTNAME=	stfl
> PORTVERSION=	0.24
> CATEGORIES=	devel
>-MASTER_SITES=	http://www.clifford.at/stfl/
>+MASTER_SITES=	http://www.clifford.at/stfl/ \
>+		https://ftp.heanet.ie/mirrors/OpenBSD/distfiles/
> 
> MAINTAINER=	arved@FreeBSD.org
> COMMENT=	Structured Terminal Forms Language/Library
>Index: devel/yasm/Makefile
>===================================================================
>--- devel/yasm/Makefile	(revision 462987)
>+++ devel/yasm/Makefile	(working copy)
>@@ -3,7 +3,9 @@
> PORTNAME=	yasm
> PORTVERSION=	1.3.0
> CATEGORIES=	devel lang
>-MASTER_SITES=	http://www.tortall.net/projects/yasm/releases/
>+MASTER_SITES=	https://www.tortall.net/projects/yasm/releases/ \
>+		https://xyinn.org/gentoo/distfiles/ \
>+		https://ftp.uni-erlangen.de/gentoo/distfiles/
> 
> MAINTAINER=	johnson.peter@gmail.com
> COMMENT=	Complete rewrite of the NASM assembler
>Index: dns/ldns/Makefile
>===================================================================
>--- dns/ldns/Makefile	(revision 462987)
>+++ dns/ldns/Makefile	(working copy)
>@@ -5,7 +5,8 @@
> PORTVERSION=	1.7.0
> PORTREVISION=	1
> CATEGORIES=	dns
>-MASTER_SITES=	http://www.nlnetlabs.nl/downloads/ldns/ \
>+MASTER_SITES=	https://www.nlnetlabs.nl/downloads/ldns/ \
>+		https://ftp.heanet.ie/mirrors/OpenBSD/distfiles/ \
> 		LOCAL/ehaupt
> 
> MAINTAINER=	jaap@NLnetLabs.nl
>Index: dns/unbound/Makefile
>===================================================================
>--- dns/unbound/Makefile	(revision 462987)
>+++ dns/unbound/Makefile	(working copy)
>@@ -5,7 +5,8 @@
> PORTVERSION=	1.6.8
> PORTREVISION=	2
> CATEGORIES=	dns
>-MASTER_SITES=	http://unbound.net/downloads/
>+MASTER_SITES=	https://unbound.net/downloads/ \
>+		https://distfiles.crux.guru/
> 
> MAINTAINER=	jaap@NLnetLabs.nl
> COMMENT=	Validating, recursive, and caching DNS resolver
>Index: lang/go/Makefile
>===================================================================
>--- lang/go/Makefile	(revision 462987)
>+++ lang/go/Makefile	(working copy)
>@@ -5,7 +5,7 @@
> PORTVERSION=	1.10
> PORTEPOCH=	1
> CATEGORIES=	lang
>-MASTER_SITES=	http://golang.org/dl/
>+MASTER_SITES=	https://golang.org/dl/
> DISTNAME=	go${PORTVERSION}.src
> 
> MAINTAINER=	jlaffaye@FreeBSD.org
>Index: multimedia/ffmpeg/Makefile
>===================================================================
>--- multimedia/ffmpeg/Makefile	(revision 462987)
>+++ multimedia/ffmpeg/Makefile	(working copy)
>@@ -6,7 +6,7 @@
> PORTREVISION=	7
> PORTEPOCH=	1
> CATEGORIES=	multimedia audio ipv6 net
>-MASTER_SITES=	http://ffmpeg.org/releases/
>+MASTER_SITES=	https://ffmpeg.org/releases/
> 
> MAINTAINER=	multimedia@FreeBSD.org
> COMMENT=	Realtime audio/video encoder/converter and streaming server
>Index: multimedia/libtheora/Makefile
>===================================================================
>--- multimedia/libtheora/Makefile	(revision 462987)
>+++ multimedia/libtheora/Makefile	(working copy)
>@@ -5,8 +5,8 @@
> PORTVERSION=	1.1.1
> PORTREVISION=	7
> CATEGORIES=	multimedia
>-MASTER_SITES=	http://downloads.xiph.org/releases/theora/ \
>-		http://distfiles.master.finkmirrors.net/
>+MASTER_SITES=	https://downloads.xiph.org/releases/theora/ \
>+		https://repo.turris.cz/downloads/
> 
> MAINTAINER=	multimedia@FreeBSD.org
> COMMENT=	Theora video codec for the Ogg multimedia streaming system
>Index: multimedia/x264/Makefile
>===================================================================
>--- multimedia/x264/Makefile	(revision 462987)
>+++ multimedia/x264/Makefile	(working copy)
>@@ -21,8 +21,8 @@
> PORTVERSION=	0.${X264_BUILD}.${X264_REV}
> PORTREVISION?=	1 # 0 in libx264
> CATEGORIES=	multimedia
>-MASTER_SITES=	ftp://ftp.videolan.org/pub/videolan/x264/snapshots/ \
>-		http://samples.mplayerhq.hu/yuv4mpeg2/:pgo
>+MASTER_SITES=	https://downloads.videolan.org/pub/videolan/x264/snapshots/ \
>+		https://samples.mplayerhq.hu/yuv4mpeg2/:pgo
> DISTNAME=	${PORTNAME}-snapshot-${X264_SNAPSHOT}-2245-stable
> DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
> DIST_SUBDIR=	x264
>Index: multimedia/x265/Makefile
>===================================================================
>--- multimedia/x265/Makefile	(revision 462987)
>+++ multimedia/x265/Makefile	(working copy)
>@@ -5,7 +5,8 @@
> PORTVERSION=	2.6
> PORTREVISION=	1
> CATEGORIES=	multimedia
>-MASTER_SITES=	http://ftp.videolan.org/pub/videolan/${PORTNAME}/
>+MASTER_SITES=	https://downloads.videolan.org/pub/videolan/${PORTNAME}/ \
>+		https://mirror.leaseweb.com/videolan/x265/
> DISTNAME=	${PORTNAME}_${PORTVERSION}
> 
> MAINTAINER=	mi@aldan.algebra.com
>Index: multimedia/xvid/Makefile
>===================================================================
>--- multimedia/xvid/Makefile	(revision 462987)
>+++ multimedia/xvid/Makefile	(working copy)
>@@ -5,7 +5,8 @@
> PORTVERSION=	1.3.4
> PORTEPOCH=	1
> CATEGORIES=	multimedia
>-MASTER_SITES=	http://downloads.xvid.org/downloads/
>+MASTER_SITES=	https://downloads.xvid.com/downloads/ \
>+		https://source.ipfire.org/source-2.x/
> DISTNAME=	${PORTNAME}core-${PORTVERSION}
> 
> MAINTAINER=	riggs@FreeBSD.org
>Index: net/mtr/Makefile
>===================================================================
>--- net/mtr/Makefile	(revision 462987)
>+++ net/mtr/Makefile	(working copy)
>@@ -4,7 +4,7 @@
> PORTNAME=	mtr
> PORTVERSION=	0.92
> CATEGORIES=	net
>-MASTER_SITES=	ftp://ftp.bitwizard.nl/mtr/ \
>+MASTER_SITES=	https://www.bitwizard.nl/mtr/files/ \
> 		LOCAL/sunpoet
> 
> MAINTAINER=	sunpoet@FreeBSD.org
>Index: net/vnstat/Makefile
>===================================================================
>--- net/vnstat/Makefile	(revision 462987)
>+++ net/vnstat/Makefile	(working copy)
>@@ -5,8 +5,8 @@
> PORTVERSION=	1.15
> PORTREVISION=	0
> CATEGORIES=	net
>-MASTER_SITES=	http://humdi.net/vnstat/ \
>-		http://mirror.mcx2.org/
>+MASTER_SITES=	https://humdi.net/vnstat/ \
>+		https://source.ipfire.org/source-2.x/
> 
> MAINTAINER=	feld@FreeBSD.org
> COMMENT=	Console-based network traffic monitor
>Index: security/libsodium/Makefile
>===================================================================
>--- security/libsodium/Makefile	(revision 462987)
>+++ security/libsodium/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> PORTNAME=	libsodium
> PORTVERSION=	1.0.15
> CATEGORIES=	security
>-MASTER_SITES=	http://download.libsodium.org/libsodium/releases/
>+MASTER_SITES=	https://download.libsodium.org/libsodium/releases/
> 
> MAINTAINER=	vsevolod@FreeBSD.org
> COMMENT=	Library to build higher-level cryptographic tools
>Index: textproc/docbook-sgml/Makefile
>===================================================================
>--- textproc/docbook-sgml/Makefile	(revision 462987)
>+++ textproc/docbook-sgml/Makefile	(working copy)
>@@ -4,7 +4,7 @@
> PORTVERSION=	4.5
> PORTREVISION=	1
> CATEGORIES=	textproc
>-MASTER_SITES=	${DBFILES:C,(.*):(.*),http://www.oasis-open.org/docbook/sgml/\1/:\2,:C,:docbook-([0-9]+).([0-9]+),:db\1\2,}
>+MASTER_SITES=	${DBFILES:C,(.*):(.*),https://www.oasis-open.org/docbook/sgml/\1/:\2,:C,:docbook-([0-9]+).([0-9]+),:db\1\2,}
> PKGNAMESUFFIX=	-sgml
> DISTFILES=	${DBFILES:C,.*:(.*),\1.zip:\1,:C,:docbook-([0-9]+).([0-9]+),:db\1\2,}
> 
>Index: textproc/iso8879/Makefile
>===================================================================
>--- textproc/iso8879/Makefile	(revision 462987)
>+++ textproc/iso8879/Makefile	(working copy)
>@@ -5,7 +5,8 @@
> PORTVERSION=	1986
> PORTREVISION=	3
> CATEGORIES=	textproc
>-MASTER_SITES=	LOCAL/kuriyama
>+MASTER_SITES=	LOCAL/kuriyama \
>+		https://ftp.heanet.ie/mirrors/ftp.openbsd.org/distfiles/
> DISTNAME=	isoENTS
> 
> MAINTAINER=	kuriyama@FreeBSD.org
>Index: textproc/libxml2/Makefile
>===================================================================
>--- textproc/libxml2/Makefile	(revision 462987)
>+++ textproc/libxml2/Makefile	(working copy)
>@@ -5,9 +5,7 @@
> PORTVERSION=	2.9.7
> PORTREVISION?=	0
> CATEGORIES?=	textproc gnome
>-MASTER_SITES=	ftp://xmlsoft.org/libxml2/ \
>-		http://xmlsoft.org/sources/ \
>-		ftp://gd.tuwien.ac.at/pub/libxml/
>+MASTER_SITES=	http://xmlsoft.org/sources/
> DIST_SUBDIR=	gnome2
> 
> MAINTAINER?=	gnome@FreeBSD.org
>Index: textproc/libxslt/Makefile
>===================================================================
>--- textproc/libxslt/Makefile	(revision 462987)
>+++ textproc/libxslt/Makefile	(working copy)
>@@ -5,9 +5,8 @@
> PORTVERSION=	1.1.29
> PORTREVISION?=	1
> CATEGORIES?=	textproc gnome
>-MASTER_SITES=	ftp://xmlsoft.org/libxml2/ \
>-		http://xmlsoft.org/sources/ \
>-		ftp://gd.tuwien.ac.at/pub/libxml/
>+MASTER_SITES=	http://xmlsoft.org/sources/ \
>+		https://mirror.umd.edu/xbmc/build-deps/sources/
> DIST_SUBDIR=	gnome2
> 
> MAINTAINER?=	gnome@FreeBSD.org
>Index: textproc/sdocbook-xml/Makefile
>===================================================================
>--- textproc/sdocbook-xml/Makefile	(revision 462987)
>+++ textproc/sdocbook-xml/Makefile	(working copy)
>@@ -6,7 +6,7 @@
> PORTREVISION=	2
> PORTEPOCH=	2
> CATEGORIES=	textproc
>-MASTER_SITES=	http://www.oasis-open.org/docbook/xml/simple/${PORTVERSION}/
>+MASTER_SITES=	https://www.oasis-open.org/docbook/xml/simple/${PORTVERSION}/
> DISTNAME=	docbook-simple-${PORTVERSION}
> 
> MAINTAINER=	gabor@FreeBSD.org
>Index: textproc/xmlcharent/Makefile
>===================================================================
>--- textproc/xmlcharent/Makefile	(revision 462987)
>+++ textproc/xmlcharent/Makefile	(working copy)
>@@ -5,7 +5,8 @@
> PORTVERSION=	0.3
> PORTREVISION=	2
> CATEGORIES=	textproc
>-MASTER_SITES=	http://www.oasis-open.org/docbook/${PORTNAME}/${PORTVERSION}/
>+MASTER_SITES=	https://www.oasis-open.org/docbook/${PORTNAME}/${PORTVERSION}/ \
>+		https://library.syr.edu/digital/guides/lavender/
> 
> MAINTAINER=	hrs@FreeBSD.org
> COMMENT=	XML character entities

Actions: View | Diff

Attachments on bug 226203: 190997 | 191006 | 191007 | 191020 | 191023