[pkgsrc/trunk]: pkgsrc Drop ftp.cyrusimap.org from MASTER_SITES

[nros <nros%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1ff21d5409ae
branches:  trunk
changeset: 418830:1ff21d5409ae
user:      nros <nros%pkgsrc.org@localhost>
date:      Thu Dec 05 10:57:54 2019 +0000

description:
Drop ftp.cyrusimap.org from MASTER_SITES

ftp.cyrusimap.org has been down for months. Asked about this on the
cyrus-info mailinglist months ago with no responses. So lets drop it from
MASTER_SITES.
The directory old on the ftp is also available in the http download so I
added that to MASTER_SITES as well.

diffstat:

 mail/cyrus-imapd23/Makefile         |  5 ++---
 mail/cyrus-imapd24/Makefile         |  5 ++---
 security/cyrus-sasl/Makefile.common |  4 ++--
 3 files changed, 6 insertions(+), 8 deletions(-)

diffs (52 lines):

diff -r f85c7b7ee94b -r 1ff21d5409ae mail/cyrus-imapd23/Makefile
--- a/mail/cyrus-imapd23/Makefile       Thu Dec 05 10:02:35 2019 +0000
+++ b/mail/cyrus-imapd23/Makefile       Thu Dec 05 10:57:54 2019 +0000
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.55 2019/08/11 13:21:26 wiz Exp $
+# $NetBSD: Makefile,v 1.56 2019/12/05 10:57:54 nros Exp $
 
 DISTNAME=      cyrus-imapd-2.3.18
 PKGREVISION=   31
 CATEGORIES=    mail
 MASTER_SITES=  http://cyrusimap.org/releases/
-MASTER_SITES+= ftp://ftp.cyrusimap.org/cyrus-imapd/
-MASTER_SITES+= ftp://ftp.cyrusimap.org/cyrus-imapd/OLD-VERSIONS/
+MASTER_SITES+= https://www.cyrusimap.org/releases/old/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://www.cyrusimap.org/
diff -r f85c7b7ee94b -r 1ff21d5409ae mail/cyrus-imapd24/Makefile
--- a/mail/cyrus-imapd24/Makefile       Thu Dec 05 10:02:35 2019 +0000
+++ b/mail/cyrus-imapd24/Makefile       Thu Dec 05 10:57:54 2019 +0000
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.62 2019/11/02 16:25:19 rillig Exp $
+# $NetBSD: Makefile,v 1.63 2019/12/05 10:57:54 nros Exp $
 
 DISTNAME=      cyrus-imapd-2.4.20
 PKGREVISION=   7
 CATEGORIES=    mail
 MASTER_SITES=  http://cyrusimap.org/releases/
-MASTER_SITES+= ftp://ftp.cyrusimap.org/cyrus-imapd/
-MASTER_SITES+= ftp://ftp.cyrusimap.org/cyrus-imapd/OLD-VERSIONS/
+MASTER_SITES+= https://www.cyrusimap.org/releases/old/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://www.cyrusimap.org/
diff -r f85c7b7ee94b -r 1ff21d5409ae security/cyrus-sasl/Makefile.common
--- a/security/cyrus-sasl/Makefile.common       Thu Dec 05 10:02:35 2019 +0000
+++ b/security/cyrus-sasl/Makefile.common       Thu Dec 05 10:57:54 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.30 2019/11/04 21:12:52 rillig Exp $
+# $NetBSD: Makefile.common,v 1.31 2019/12/05 10:57:54 nros Exp $
 #
 # used by security/cyrus-sasl/Makefile
 # used by security/cy2-anonymous/Makefile
@@ -21,7 +21,7 @@
 DISTFILES=             ${DISTNAME}-rc7${EXTRACT_SUFX}
 CATEGORIES=            security
 MASTER_SITES=          https://www.cyrusimap.org/releases/
-MASTER_SITES+=         ftp://ftp.cyrusimap.org/cyrus-sasl/
+MASTER_SITES+=         https://www.cyrusimap.org/releases/old/
 #MASTER_SITES+=                ftp://ftp.cyrusimap.org/cyrus-sasl/OLD-VERSIONS/
 #PATCHFILES+=          cyrus-sasl-dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d.patch.v2
 #SITES.cyrus-sasl-dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d.patch.v2= \