j...@wxcvbn.org (Jérémie Courrèges-Anglas) writes:

[...]

> Here's a diff to deal with gnupg and related ports.

I had forgotten security/pinentry.  security/opencdk seems to have
moved, untouched for now.

Index: devel/npth/Makefile
===================================================================
RCS file: /cvs/ports/devel/npth/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- devel/npth/Makefile 11 Mar 2013 10:50:12 -0000      1.2
+++ devel/npth/Makefile 11 Jul 2013 19:37:41 -0000
@@ -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
 
Index: infrastructure/templates/network.conf.template
===================================================================
RCS file: /cvs/ports/infrastructure/templates/network.conf.template,v
retrieving revision 1.182
diff -u -p -r1.182 network.conf.template
--- infrastructure/templates/network.conf.template      6 Apr 2013 19:57:48 
-0000       1.182
+++ infrastructure/templates/network.conf.template      11 Jul 2013 19:53:19 
-0000
@@ -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/
Index: security/gnupg/Makefile
===================================================================
RCS file: /cvs/ports/security/gnupg/Makefile,v
retrieving revision 1.88
diff -u -p -r1.88 Makefile
--- security/gnupg/Makefile     2 Jul 2013 16:20:25 -0000       1.88
+++ security/gnupg/Makefile     11 Jul 2013 19:43:23 -0000
@@ -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/
 
Index: security/gnupg2/Makefile
===================================================================
RCS file: /cvs/ports/security/gnupg2/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- security/gnupg2/Makefile    11 Mar 2013 11:41:24 -0000      1.24
+++ security/gnupg2/Makefile    11 Jul 2013 19:43:48 -0000
@@ -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/
 
Index: security/gpgme/Makefile
===================================================================
RCS file: /cvs/ports/security/gpgme/Makefile,v
retrieving revision 1.28
diff -u -p -r1.28 Makefile
--- security/gpgme/Makefile     21 Mar 2013 08:48:53 -0000      1.28
+++ security/gpgme/Makefile     11 Jul 2013 19:37:19 -0000
@@ -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
Index: security/libassuan/Makefile
===================================================================
RCS file: /cvs/ports/security/libassuan/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- security/libassuan/Makefile 23 Mar 2013 13:44:44 -0000      1.12
+++ security/libassuan/Makefile 11 Jul 2013 19:32:39 -0000
@@ -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
Index: security/libgcrypt/Makefile
===================================================================
RCS file: /cvs/ports/security/libgcrypt/Makefile,v
retrieving revision 1.28
diff -u -p -r1.28 Makefile
--- security/libgcrypt/Makefile 13 May 2013 08:52:01 -0000      1.28
+++ security/libgcrypt/Makefile 11 Jul 2013 19:35:34 -0000
@@ -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
Index: security/libgpg-error/Makefile
===================================================================
RCS file: /cvs/ports/security/libgpg-error/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- security/libgpg-error/Makefile      23 Mar 2013 13:38:06 -0000      1.16
+++ security/libgpg-error/Makefile      11 Jul 2013 19:36:00 -0000
@@ -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
 
Index: security/libksba/Makefile
===================================================================
RCS file: /cvs/ports/security/libksba/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- security/libksba/Makefile   21 Mar 2013 08:48:53 -0000      1.9
+++ security/libksba/Makefile   11 Jul 2013 19:36:40 -0000
@@ -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
 
Index: security/pinentry/Makefile
===================================================================
RCS file: /cvs/ports/security/pinentry/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- security/pinentry/Makefile  11 Mar 2013 11:41:27 -0000      1.7
+++ security/pinentry/Makefile  11 Jul 2013 20:09:56 -0000
@@ -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
 

Reply via email to