Switch some MASTER_SITES from http/ftp to https.

Also some cleanup of dead entries.

PR:		226203
Submitted by:	Sam H
Sponsored by:	Absolight

26 files changed, 46 insertions, 36 deletions

diff --git a/Mk/bsd.sites.mk b/Mk/bsd.sites.mk
index 79e2aa54c442..6b1b18c75c38 100644
--- a/Mk/bsd.sites.mk
+++ b/Mk/bsd.sites.mk
@@ -275,6 +275,7 @@ MASTER_SITE_FESTIVAL_OGI+= \
 #
 .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 +733,7 @@ MASTER_SITE_MYSQL+= \
 
 .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 +747,7 @@ MASTER_SITE_NETBSD+= \
 .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 +766,14 @@ MASTER_SITE_NVIDIA+= \
 
 .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)
diff --git a/archivers/unrar/Makefile b/archivers/unrar/Makefile
index 20c9e2e1f1af..b5c961081307 100644
--- a/archivers/unrar/Makefile
+++ b/archivers/unrar/Makefile
@@ -5,7 +5,8 @@ PORTNAME=	unrar
 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
 
diff --git a/audio/flac/Makefile b/audio/flac/Makefile
index 371f709c82a3..cf90af0731cd 100644
--- a/audio/flac/Makefile
+++ b/audio/flac/Makefile
@@ -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/ \
+		SF/flac/flac-src
 
 MAINTAINER=	naddy@FreeBSD.org
 COMMENT=	Free lossless audio codec
diff --git a/audio/libogg/Makefile b/audio/libogg/Makefile
index da172eaf213b..d24fad117f1c 100644
--- a/audio/libogg/Makefile
+++ b/audio/libogg/Makefile
@@ -5,7 +5,8 @@ PORTNAME=	libogg
 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
diff --git a/audio/libvorbis/Makefile b/audio/libvorbis/Makefile
index 6f97d51c4629..b47687ad46da 100644
--- a/audio/libvorbis/Makefile
+++ b/audio/libvorbis/Makefile
@@ -6,7 +6,8 @@ PORTVERSION=	1.3.5
 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
diff --git a/devel/boehm-gc/Makefile b/devel/boehm-gc/Makefile
index 20e0f97ccc65..6a2b70753456 100644
--- a/devel/boehm-gc/Makefile
+++ b/devel/boehm-gc/Makefile
@@ -4,7 +4,8 @@
 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://github.com/ivmai/bdwgc/releases/download/v${PORTVERSION}/
 PKGNAMEPREFIX=	boehm-
 .ifdef GC_VARIANT
 PKGNAMESUFFIX=	-${GC_VARIANT}
diff --git a/devel/ccache/Makefile b/devel/ccache/Makefile
index b97663dc3c2a..1450ff4bab90 100644
--- a/devel/ccache/Makefile
+++ b/devel/ccache/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	ccache
 PORTVERSION=	3.3.5
 PORTREVISION=	0
 CATEGORIES=	devel
-MASTER_SITES=	http://www.samba.org/ftp/ccache/ \
+MASTER_SITES=	https://www.samba.org/ftp/ccache/ \
 		LOCAL/bdrewery
 
 MAINTAINER=	bdrewery@FreeBSD.org
diff --git a/devel/libedit/Makefile b/devel/libedit/Makefile
index 5a5147eb649d..6dc78065c025 100644
--- a/devel/libedit/Makefile
+++ b/devel/libedit/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	${EDITVERSION}.${EDITDATE}
 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
diff --git a/devel/py-xdg/Makefile b/devel/py-xdg/Makefile
index 672583f00486..7e2ad139e391 100644
--- a/devel/py-xdg/Makefile
+++ b/devel/py-xdg/Makefile
@@ -6,7 +6,7 @@ PORTNAME=	xdg
 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}
 
diff --git a/devel/yasm/Makefile b/devel/yasm/Makefile
index 81d586d70f16..1a2789118cce 100644
--- a/devel/yasm/Makefile
+++ b/devel/yasm/Makefile
@@ -3,7 +3,7 @@
 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/
 
 MAINTAINER=	johnson.peter@gmail.com
 COMMENT=	Complete rewrite of the NASM assembler
diff --git a/dns/ldns/Makefile b/dns/ldns/Makefile
index b260226fb940..e137d6337ae5 100644
--- a/dns/ldns/Makefile
+++ b/dns/ldns/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	ldns
 PORTVERSION=	1.7.0
 PORTREVISION=	1
 CATEGORIES=	dns
-MASTER_SITES=	http://www.nlnetlabs.nl/downloads/ldns/ \
+MASTER_SITES=	https://www.nlnetlabs.nl/downloads/ldns/ \
 		LOCAL/ehaupt
 
 MAINTAINER=	jaap@NLnetLabs.nl
diff --git a/dns/unbound/Makefile b/dns/unbound/Makefile
index c3188c7c9f1d..26bc8e237f6d 100644
--- a/dns/unbound/Makefile
+++ b/dns/unbound/Makefile
@@ -5,7 +5,8 @@ PORTNAME=	unbound
 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
diff --git a/lang/go/Makefile b/lang/go/Makefile
index a6d6639ffa79..642c8c556f17 100644
--- a/lang/go/Makefile
+++ b/lang/go/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	go
 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
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index aa87b4c9dae7..8d04303ba43a 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	ffmpeg
 PORTVERSION=	3.4.2
 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
diff --git a/multimedia/libtheora/Makefile b/multimedia/libtheora/Makefile
index a7bd4c417775..b67adcf56774 100644
--- a/multimedia/libtheora/Makefile
+++ b/multimedia/libtheora/Makefile
@@ -5,8 +5,8 @@ PORTNAME=	libtheora
 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
diff --git a/multimedia/x264/Makefile b/multimedia/x264/Makefile
index 55d2ed57717c..4746e19a46de 100644
--- a/multimedia/x264/Makefile
+++ b/multimedia/x264/Makefile
@@ -21,8 +21,8 @@ PORTNAME=	x264
 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
diff --git a/multimedia/x265/Makefile b/multimedia/x265/Makefile
index 42d81c6fd032..bbdfbdde4b3e 100644
--- a/multimedia/x265/Makefile
+++ b/multimedia/x265/Makefile
@@ -5,7 +5,8 @@ PORTNAME=	x265
 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
diff --git a/multimedia/xvid/Makefile b/multimedia/xvid/Makefile
index 64a11fc155a5..3a124377f6b9 100644
--- a/multimedia/xvid/Makefile
+++ b/multimedia/xvid/Makefile
@@ -5,7 +5,8 @@ PORTNAME=	xvid
 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
diff --git a/net/mtr/Makefile b/net/mtr/Makefile
index 61fac9ff9422..8a653ada7d40 100644
--- a/net/mtr/Makefile
+++ b/net/mtr/Makefile
@@ -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
diff --git a/net/vnstat/Makefile b/net/vnstat/Makefile
index 96ff8c365a6e..2397a693e67a 100644
--- a/net/vnstat/Makefile
+++ b/net/vnstat/Makefile
@@ -5,8 +5,8 @@ PORTNAME=	vnstat
 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
diff --git a/security/libsodium/Makefile b/security/libsodium/Makefile
index ef495375761c..eb3df64e3a11 100644
--- a/security/libsodium/Makefile
+++ b/security/libsodium/Makefile
@@ -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
diff --git a/textproc/docbook-sgml/Makefile b/textproc/docbook-sgml/Makefile
index f1c4bec500fe..2ef5c5b47f62 100644
--- a/textproc/docbook-sgml/Makefile
+++ b/textproc/docbook-sgml/Makefile
@@ -4,7 +4,7 @@ PORTNAME=	docbook
 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,}
 
diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index a8cd9d82be73..fd0ffdf9720b 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -5,9 +5,7 @@ PORTNAME=	libxml2
 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
diff --git a/textproc/libxslt/Makefile b/textproc/libxslt/Makefile
index 8c37d5183d30..7556608d1c09 100644
--- a/textproc/libxslt/Makefile
+++ b/textproc/libxslt/Makefile
@@ -5,9 +5,8 @@ PORTNAME=	libxslt
 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
diff --git a/textproc/sdocbook-xml/Makefile b/textproc/sdocbook-xml/Makefile
index 901e9f0406bb..85783cbf5894 100644
--- a/textproc/sdocbook-xml/Makefile
+++ b/textproc/sdocbook-xml/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	1.1
 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
diff --git a/textproc/xmlcharent/Makefile b/textproc/xmlcharent/Makefile
index f0acb79cbd42..c277e2d1770c 100644
--- a/textproc/xmlcharent/Makefile
+++ b/textproc/xmlcharent/Makefile
@@ -5,7 +5,8 @@ PORTNAME=	xmlcharent
 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