From 49d9c2c78e3723fbcce88b20ae49ee5cad4add56 Mon Sep 17 00:00:00 2001 From: jca Date: Fri, 12 Jul 2013 00:49:23 +0000 Subject: [PATCH] Introduce MASTER_SITES_GNUPG and reuse it for various GnuPG (sub)projects. http:// urls first, then the primary ftp site for ''make peek-ftp'', as suggested by sthen@. ok sthen@ --- devel/npth/Makefile | 4 ++-- infrastructure/templates/network.conf.template | 8 +++++++- security/gnupg/Makefile | 8 ++------ security/gnupg2/Makefile | 11 ++--------- security/gpgme/Makefile | 4 ++-- security/libassuan/Makefile | 4 ++-- security/libgcrypt/Makefile | 8 ++------ security/libgpg-error/Makefile | 7 ++----- security/libksba/Makefile | 4 ++-- security/pinentry/Makefile | 4 ++-- 10 files changed, 25 insertions(+), 37 deletions(-) diff --git a/devel/npth/Makefile b/devel/npth/Makefile index 172c7f51ec7..6f8874d48bf 100644 --- a/devel/npth/Makefile +++ b/devel/npth/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2013/03/11 10:50:12 espie Exp $ +# $OpenBSD: Makefile,v 1.3 2013/07/12 00:49:23 jca Exp $ COMMENT= new GNU Portable Threads Library @@ -19,7 +19,7 @@ EXTRACT_SUFX= .tar.bz2 WANTLIB= pthread -MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/npth/ +MASTER_SITES= ${MASTER_SITES_GNUPG:=npth/} CONFIGURE_STYLE= gnu diff --git a/infrastructure/templates/network.conf.template b/infrastructure/templates/network.conf.template index 2977df8d2ad..d8f23e56c50 100644 --- a/infrastructure/templates/network.conf.template +++ b/infrastructure/templates/network.conf.template @@ -1,4 +1,4 @@ -# $OpenBSD: network.conf.template,v 1.182 2013/04/06 19:57:48 rpe Exp $ +# $OpenBSD: network.conf.template,v 1.183 2013/07/12 00:49:23 jca Exp $ # # NEVER EDIT THIS FILE DIRECTLY!!!! @@ -261,3 +261,9 @@ MASTER_SITE_DEBIAN += \ http://ftp.nl.debian.org/debian/pool/ \ http://ftp.uk.debian.org/debian/pool/ \ http://ftp.us.debian.org/debian/pool/ + +MASTER_SITES_GNUPG += \ + http://mirrors.dotsrc.org/gcrypt/ \ + http://ftp.linux.it/pub/mirrors/gnupg/ \ + ftp://ftp.gnupg.org/gcrypt/ \ + ftp://ftp.ring.gr.jp/pub/net/gnupg/ diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile index 637aaca918a..c00f3693108 100644 --- a/security/gnupg/Makefile +++ b/security/gnupg/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.88 2013/07/02 16:20:25 espie Exp $ +# $OpenBSD: Makefile,v 1.89 2013/07/12 00:49:23 jca Exp $ COMMENT= GNU privacy guard - a free PGP replacement @@ -9,11 +9,7 @@ REVISION = 0 # restrict, not compatible with gnupg-2. PKGSPEC = gnupg-<2 -MASTER_SITES= ftp://gd.tuwien.ac.at/privacy/gnupg/gnupg/ \ - ftp://mirrors.dotsrc.org/gcrypt/gnupg/ \ - ftp://ftp.linux.it/pub/mirrors/gnupg/gnupg/ \ - ftp://ftp.ring.gr.jp/pub/net/gnupg/ \ - ftp://ftp.gnupg.org/gcrypt/gnupg/ +MASTER_SITES= ${MASTER_SITES_GNUPG:=gnupg/} HOMEPAGE= http://www.gnupg.org/ diff --git a/security/gnupg2/Makefile b/security/gnupg2/Makefile index b47ff6c85bd..db32abbf4c3 100644 --- a/security/gnupg2/Makefile +++ b/security/gnupg2/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.24 2013/03/11 11:41:24 espie Exp $ +# $OpenBSD: Makefile,v 1.25 2013/07/12 00:49:23 jca Exp $ COMMENT = gnu privacy guard - a free PGP replacement @@ -6,14 +6,7 @@ DISTNAME = gnupg-2.0.19 REVISION = 3 CATEGORIES = security -MASTER_SITES = ftp://ftp.gnupg.org/gcrypt/gnupg/ \ - ftp://gd.tuwien.ac.at/privacy/gnupg/gnupg/ \ - ftp://crypto.yashy.com/pub/cryptography/gnupg/ \ - ftp://ftp.planetmirror.com/pub/gnupg/gnupg/ \ - ftp://sunsite.dk/pub/security/gcrypt/gnupg/ \ - ftp://ftp.linux.it/pub/mirrors/gnupg/gnupg/ \ - ftp://pgp.iijlab.net/pub/pgp/gnupg/ \ - ftp://ring.aist.go.jp/pub/net/gnupg/gnupg/ +MASTER_SITES = ${MASTER_SITES_GNUPG:=gnupg/} HOMEPAGE = http://www.gnupg.org/ diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile index 660c5e85fbb..40a1908f933 100644 --- a/security/gpgme/Makefile +++ b/security/gpgme/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.28 2013/03/21 08:48:53 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.29 2013/07/12 00:49:23 jca Exp $ COMMENT= GnuPG Made Easy @@ -16,7 +16,7 @@ PERMIT_PACKAGE_CDROM= Yes WANTLIB += assuan gpg-error -MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/gpgme/ +MASTER_SITES= ${MASTER_SITES_GNUPG:=gpgme/} EXTRACT_SUFX= .tar.bz2 CONFIGURE_STYLE= gnu diff --git a/security/libassuan/Makefile b/security/libassuan/Makefile index 0641d134c21..48d0711303e 100644 --- a/security/libassuan/Makefile +++ b/security/libassuan/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.12 2013/03/23 13:44:44 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.13 2013/07/12 00:49:23 jca Exp $ COMMENT= IPC library used by GnuPG and gpgme @@ -14,7 +14,7 @@ PERMIT_PACKAGE_CDROM= Yes WANTLIB += gpg-error -MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/libassuan/ +MASTER_SITES= ${MASTER_SITES_GNUPG:=libassuan/} MODULES= devel/gettext \ textproc/intltool diff --git a/security/libgcrypt/Makefile b/security/libgcrypt/Makefile index 13ce9d2e53e..4b819761837 100644 --- a/security/libgcrypt/Makefile +++ b/security/libgcrypt/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.28 2013/05/13 08:52:01 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.29 2013/07/12 00:49:23 jca Exp $ COMMENT= crypto library based on code used in GnuPG @@ -14,11 +14,7 @@ PERMIT_PACKAGE_CDROM= Yes WANTLIB += c gpg-error -MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/libgcrypt/ \ - ftp://gd.tuwien.ac.at/privacy/gnupg/libgcrypt/ \ - http://ftp.planetmirror.com/pub/gnupg/libgcrypt/ \ - http://sunsite.dk/pub/security/gcrypt/libgcrypt/ \ - http://ftp.linux.it/pub/mirrors/gnupg/libgcrypt/ +MASTER_SITES= ${MASTER_SITES_GNUPG:=libgcrypt/} MODULES= devel/gettext LIB_DEPENDS= security/libgpg-error diff --git a/security/libgpg-error/Makefile b/security/libgpg-error/Makefile index e9fbbf1dfe9..3988b7d66be 100644 --- a/security/libgpg-error/Makefile +++ b/security/libgpg-error/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.16 2013/03/23 13:38:06 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.17 2013/07/12 00:49:23 jca Exp $ COMMENT= error codes for GnuPG related software @@ -14,10 +14,7 @@ PERMIT_PACKAGE_CDROM= Yes WANTLIB += c -MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/libgpg-error/ \ - ftp://gd.tuwien.ac.at/privacy/gnupg/libgpg-error/ \ - http://sunsite.dk/pub/security/gcrypt/libgpg-error/ \ - http://ftp.linux.it/pub/mirrors/gnupg/libgpg-error/ +MASTER_SITES= ${MASTER_SITES_GNUPG:=libgpg-error/} MODULES= devel/gettext diff --git a/security/libksba/Makefile b/security/libksba/Makefile index 1037ec74b17..a748aff452e 100644 --- a/security/libksba/Makefile +++ b/security/libksba/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2013/03/21 08:48:53 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.10 2013/07/12 00:49:23 jca Exp $ COMMENT = X.509 library @@ -7,7 +7,7 @@ CATEGORIES = security SHARED_LIBS = ksba 0.2 #19 -MASTER_SITES = ftp://ftp.gnupg.org/gcrypt/libksba/ +MASTER_SITES = ${MASTER_SITES_GNUPG:=libksba/} HOMEPAGE = http://www.gnupg.org/related_software/libksba diff --git a/security/pinentry/Makefile b/security/pinentry/Makefile index 8d89666c8f3..563c42f9d7d 100644 --- a/security/pinentry/Makefile +++ b/security/pinentry/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2013/03/11 11:41:27 espie Exp $ +# $OpenBSD: Makefile,v 1.8 2013/07/12 00:49:23 jca Exp $ # pinentry builds against it's own stripped version of libassuan # I will see with upstream how to change this behavior @@ -15,7 +15,7 @@ REVISION-gtk2 = 0 PKGNAME-main = ${DISTNAME} PKGNAME-gtk2 = pinentry-gtk2-${VERSION} -MASTER_SITES = ftp://ftp.gnupg.org/gcrypt/pinentry/ +MASTER_SITES = ${MASTER_SITES_GNUPG:=pinentry/} HOMEPAGE = http://www.gnupg.org/related_software/pinentry/index.en.html