[pkgsrc/trunk]: pkgsrc Revert "Define and use MASTER_SITE_OPENBSD.",

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/83d22db0ce4a
branches:  trunk
changeset: 645674:83d22db0ce4a
user:      obache <obache%pkgsrc.org@localhost>
date:      Sun Feb 01 09:07:40 2015 +0000

description:
Revert "Define and use MASTER_SITE_OPENBSD.",
proposed/discussed is required for such changes.

diffstat:

 mk/fetch/sites.mk         |  7 +------
 net/openntpd/Makefile     |  7 +++++--
 security/openssh/Makefile |  9 +++++++--
 3 files changed, 13 insertions(+), 10 deletions(-)

diffs (59 lines):

diff -r 8aee9596ec27 -r 83d22db0ce4a mk/fetch/sites.mk
--- a/mk/fetch/sites.mk Sun Feb 01 08:58:52 2015 +0000
+++ b/mk/fetch/sites.mk Sun Feb 01 09:07:40 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: sites.mk,v 1.109 2015/01/17 05:51:43 obache Exp $
+# $NetBSD: sites.mk,v 1.110 2015/02/01 09:07:40 obache Exp $
 #
 # This Makefile fragment defines read-only MASTER_SITE_* variables
 # representing some well-known master distribution sites for software.
@@ -383,11 +383,6 @@
        http://www.netlib.no/netlib/ \
        http://www.mirrorservice.org/sites/netlib.bell-labs.com/netlib/
 
-MASTER_SITE_OPENBSD+= \
-       ftp://ftp.OpenBSD.org/pub/OpenBSD/ \
-       ftp://ftp3.usa.openbsd.org/pub/OpenBSD/ \
-       ftp://ftp.jaist.ac.jp/pub/OpenBSD/
-
 MASTER_SITE_RUBYGEMS+= \
        http://rubygems.org/downloads/ \
 
diff -r 8aee9596ec27 -r 83d22db0ce4a net/openntpd/Makefile
--- a/net/openntpd/Makefile     Sun Feb 01 08:58:52 2015 +0000
+++ b/net/openntpd/Makefile     Sun Feb 01 09:07:40 2015 +0000
@@ -1,8 +1,11 @@
-# $NetBSD: Makefile,v 1.39 2015/02/01 01:47:27 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2015/02/01 09:07:40 obache Exp $
 
 DISTNAME=              openntpd-5.7p3
 CATEGORIES=            net
-MASTER_SITES=          ${MASTER_SITE_OPENBSD:=OpenNTPD/}
+MASTER_SITES=          ftp://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/ \
+                       ftp://ftp3.usa.openbsd.org/pub/OpenBSD/OpenNTPD/ \
+                       ftp://ftp.jaist.ac.jp/pub/OpenBSD/OpenNTPD/
+
 
 MAINTAINER=            henson%acm.org@localhost
 HOMEPAGE=              http://www.openntpd.org/
diff -r 8aee9596ec27 -r 83d22db0ce4a security/openssh/Makefile
--- a/security/openssh/Makefile Sun Feb 01 08:58:52 2015 +0000
+++ b/security/openssh/Makefile Sun Feb 01 09:07:40 2015 +0000
@@ -1,10 +1,15 @@
-# $NetBSD: Makefile,v 1.225 2015/01/17 05:51:43 obache Exp $
+# $NetBSD: Makefile,v 1.226 2015/02/01 09:07:40 obache Exp $
 
 DISTNAME=              openssh-6.6p1
 PKGNAME=               openssh-6.6.1
 PKGREVISION=           4
 CATEGORIES=            security
-MASTER_SITES=          ${MASTER_SITE_OPENBSD:=OpenSSH/portable/}
+MASTER_SITES=          ftp://ftp.openssh.com/pub/OpenBSD/OpenSSH/portable/ \
+                       ftp://ftp3.usa.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \
+                       ftp://gd.tuwien.ac.at/opsys/OpenBSD/OpenSSH/portable/ \
+                       ftp://ftp.freenet.de/pub/ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \
+                       ftp://ftp.jaist.ac.jp/pub/OpenBSD/OpenSSH/portable/
+
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              http://www.openssh.com/