pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc

Module Name:    pkgsrc
Committed By:   nia
Date:           Mon Mar  3 21:32:28 UTC 2025

Modified Files:
        pkgsrc/mk/fetch: sites.mk
        pkgsrc/security/gnu-crypto: Makefile
        pkgsrc/security/gnupg: Makefile
        pkgsrc/security/gnupg2: Makefile
        pkgsrc/security/gnutls: Makefile
        pkgsrc/security/gpa: Makefile
        pkgsrc/security/gpgme: Makefile
        pkgsrc/security/libassuan2: Makefile
        pkgsrc/security/libgcrypt: Makefile options.mk
        pkgsrc/security/libgpg-error: Makefile
        pkgsrc/security/libksba: Makefile
        pkgsrc/security/qgpgme: Makefile

Log Message:
mk: Introduce and use MASTER_SITE_GNUPG

Various packages around the tree use a different variant
of MASTER_SITES to access various GnuPG mirrors, let's just
centralize them in one locaiton.

While here, fix some lint warnings.


To generate a diff of this commit:
cvs rdiff -u -r1.193 -r1.194 pkgsrc/mk/fetch/sites.mk
cvs rdiff -u -r1.13 -r1.14 pkgsrc/security/gnu-crypto/Makefile
cvs rdiff -u -r1.171 -r1.172 pkgsrc/security/gnupg/Makefile
cvs rdiff -u -r1.161 -r1.162 pkgsrc/security/gnupg2/Makefile
cvs rdiff -u -r1.265 -r1.266 pkgsrc/security/gnutls/Makefile
cvs rdiff -u -r1.74 -r1.75 pkgsrc/security/gpa/Makefile
cvs rdiff -u -r1.122 -r1.123 pkgsrc/security/gpgme/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/security/libassuan2/Makefile
cvs rdiff -u -r1.115 -r1.116 pkgsrc/security/libgcrypt/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/security/libgcrypt/options.mk
cvs rdiff -u -r1.91 -r1.92 pkgsrc/security/libgpg-error/Makefile
cvs rdiff -u -r1.43 -r1.44 pkgsrc/security/libksba/Makefile
cvs rdiff -u -r1.36 -r1.37 pkgsrc/security/qgpgme/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: pkgsrc/mk/fetch/sites.mk
diff -u pkgsrc/mk/fetch/sites.mk:1.193 pkgsrc/mk/fetch/sites.mk:1.194
--- pkgsrc/mk/fetch/sites.mk:1.193      Sat Dec 30 17:26:42 2023
+++ pkgsrc/mk/fetch/sites.mk    Mon Mar  3 21:32:26 2025
@@ -1,4 +1,4 @@
-# $NetBSD: sites.mk,v 1.193 2023/12/30 17:26:42 zafer Exp $
+# $NetBSD: sites.mk,v 1.194 2025/03/03 21:32:26 nia Exp $
 #
 # This Makefile fragment defines read-only MASTER_SITE_* variables
 # representing some well-known master distribution sites for software.
@@ -26,6 +26,12 @@ MASTER_SITE_GITLAB+= \
 MASTER_SITE_GNUSTEP+=   \
        ftp://ftp.gnustep.org/pub/gnustep/
 
+MASTER_SITE_GNUPG+=    \
+       https://mirrors.dotsrc.org/gcrypt/ \
+       https://www.mirrorservice.org/sites/ftp.gnupg.org/gcrypt/ \
+       http://gnupg.org/ftp/gcrypt/ \
+       http://www.ring.gr.jp/pub/net/gnupg/
+
 MASTER_SITE_OSDN+=     \
        http://jaist.dl.osdn.jp/ \
        http://iij.dl.osdn.jp/ \

Index: pkgsrc/security/gnu-crypto/Makefile
diff -u pkgsrc/security/gnu-crypto/Makefile:1.13 pkgsrc/security/gnu-crypto/Makefile:1.14
--- pkgsrc/security/gnu-crypto/Makefile:1.13    Sat Jan 18 23:35:06 2020
+++ pkgsrc/security/gnu-crypto/Makefile Mon Mar  3 21:32:26 2025
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.13 2020/01/18 23:35:06 rillig Exp $
+# $NetBSD: Makefile,v 1.14 2025/03/03 21:32:26 nia Exp $
 #
 
 DISTNAME=              gnu-crypto-2.0.1-bin
 PKGNAME=               ${DISTNAME:S/-bin$//}
 PKGREVISION=           1
 CATEGORIES=            security
-MASTER_SITES=          ftp://ftp.gnupg.org/GnuPG/gnu-crypto/
+MASTER_SITES=          ${MASTER_SITE_GNUPG:=gnu-crypto/}
 EXTRACT_SUFX=          .tar.bz2
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/security/gnupg/Makefile
diff -u pkgsrc/security/gnupg/Makefile:1.171 pkgsrc/security/gnupg/Makefile:1.172
--- pkgsrc/security/gnupg/Makefile:1.171        Thu Nov 14 22:21:28 2024
+++ pkgsrc/security/gnupg/Makefile      Mon Mar  3 21:32:26 2025
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.171 2024/11/14 22:21:28 wiz Exp $
+# $NetBSD: Makefile,v 1.172 2025/03/03 21:32:26 nia Exp $
 
 DISTNAME=      gnupg-1.4.23
 PKGREVISION=   23
 CATEGORIES=    security
-MASTER_SITES=  ftp://ftp.gnupg.org/gcrypt/gnupg/
-MASTER_SITES+= ftp://ftp.ring.gr.jp/pub/net/gnupg/gnupg/
+MASTER_SITES=  ${MASTER_SITE_GNUPG:=gnupg/}
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/security/gnupg2/Makefile
diff -u pkgsrc/security/gnupg2/Makefile:1.161 pkgsrc/security/gnupg2/Makefile:1.162
--- pkgsrc/security/gnupg2/Makefile:1.161       Tue Nov 26 11:54:18 2024
+++ pkgsrc/security/gnupg2/Makefile     Mon Mar  3 21:32:27 2025
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.161 2024/11/26 11:54:18 adam Exp $
+# $NetBSD: Makefile,v 1.162 2025/03/03 21:32:27 nia Exp $
 
 DISTNAME=      gnupg-2.4.7
 PKGNAME=       ${DISTNAME:S/gnupg-/gnupg2-/}
 CATEGORIES=    security
-MASTER_SITES=  https://gnupg.org/ftp/gcrypt/gnupg/
-MASTER_SITES+= http://mirrors.dotsrc.org/gcrypt/gnupg/
+MASTER_SITES=  ${MASTER_SITE_GNUPG:=gnupg/}
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    ada%netbsdfr.org@localhost

Index: pkgsrc/security/gnutls/Makefile
diff -u pkgsrc/security/gnutls/Makefile:1.265 pkgsrc/security/gnutls/Makefile:1.266
--- pkgsrc/security/gnutls/Makefile:1.265       Wed Feb 12 08:33:23 2025
+++ pkgsrc/security/gnutls/Makefile     Mon Mar  3 21:32:27 2025
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.265 2025/02/12 08:33:23 adam Exp $
+# $NetBSD: Makefile,v 1.266 2025/03/03 21:32:27 nia Exp $
 
 DISTNAME=      gnutls-3.8.9
 CATEGORIES=    security devel
-MASTER_SITES=  https://www.gnupg.org/ftp/gcrypt/gnutls/v${PKGVERSION_NOREV:R}/
+MASTER_SITES=  ${MASTER_SITE_GNUPG:=gnutls/v${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=  .tar.xz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/security/gpa/Makefile
diff -u pkgsrc/security/gpa/Makefile:1.74 pkgsrc/security/gpa/Makefile:1.75
--- pkgsrc/security/gpa/Makefile:1.74   Fri Dec 27 08:20:34 2024
+++ pkgsrc/security/gpa/Makefile        Mon Mar  3 21:32:27 2025
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.74 2024/12/27 08:20:34 wiz Exp $
+# $NetBSD: Makefile,v 1.75 2025/03/03 21:32:27 nia Exp $
 
 DISTNAME=      gpa-0.10.0
 PKGREVISION=   15
 CATEGORIES=    x11 security
-MASTER_SITES=  ftp://ftp.gnupg.org/gcrypt/gpa/
+MASTER_SITES=  ${MASTER_SITE_GNUPG:=gpa/}
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    pr%alles.prima.de@localhost

Index: pkgsrc/security/gpgme/Makefile
diff -u pkgsrc/security/gpgme/Makefile:1.122 pkgsrc/security/gpgme/Makefile:1.123
--- pkgsrc/security/gpgme/Makefile:1.122        Mon Feb 10 16:39:49 2025
+++ pkgsrc/security/gpgme/Makefile      Mon Mar  3 21:32:27 2025
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.122 2025/02/10 16:39:49 adam Exp $
+# $NetBSD: Makefile,v 1.123 2025/03/03 21:32:27 nia Exp $
 
 DISTNAME=      gpgme-1.24.2
 CATEGORIES=    security
-MASTER_SITES=  https://www.gnupg.org/ftp/gcrypt/gpgme/
+MASTER_SITES=  ${MASTER_SITE_GNUPG:=gpgme/}
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/security/libassuan2/Makefile
diff -u pkgsrc/security/libassuan2/Makefile:1.27 pkgsrc/security/libassuan2/Makefile:1.28
--- pkgsrc/security/libassuan2/Makefile:1.27    Wed Feb 19 19:26:04 2025
+++ pkgsrc/security/libassuan2/Makefile Mon Mar  3 21:32:27 2025
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.27 2025/02/19 19:26:04 adam Exp $
+# $NetBSD: Makefile,v 1.28 2025/03/03 21:32:27 nia Exp $
 
 DISTNAME=      libassuan-3.0.2
 CATEGORIES=    security
-MASTER_SITES=  ftp://ftp.gnupg.org/gcrypt/libassuan/
-MASTER_SITES+= http://mirrors.dotsrc.org/gcrypt/libassuan/
+MASTER_SITES=  ${MASTER_SITE_GNUPG:=libassuan/}
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/security/libgcrypt/Makefile
diff -u pkgsrc/security/libgcrypt/Makefile:1.115 pkgsrc/security/libgcrypt/Makefile:1.116
--- pkgsrc/security/libgcrypt/Makefile:1.115    Tue Feb 18 15:23:33 2025
+++ pkgsrc/security/libgcrypt/Makefile  Mon Mar  3 21:32:27 2025
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.115 2025/02/18 15:23:33 wiz Exp $
+# $NetBSD: Makefile,v 1.116 2025/03/03 21:32:27 nia Exp $
 
 DISTNAME=      libgcrypt-1.11.0
 PKGREVISION=   2
 CATEGORIES=    security
-MASTER_SITES=  https://gnupg.org/ftp/gcrypt/libgcrypt/
+MASTER_SITES=  ${MASTER_SITE_GNUPG:=libgcrypt/}
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
@@ -14,7 +14,7 @@ LICENSE=      gnu-gpl-v2 AND gnu-lgpl-v2.1
 USE_LIBTOOL=           yes
 GNU_CONFIGURE=         yes
 TEST_TARGET=           check
-TEXINFO_REQD=          4.0
+TEXINFO_REQD+=         4.0
 INFO_FILES=            yes
 
 .include "../../mk/compiler.mk"
@@ -45,8 +45,8 @@ CONFIGURE_ARGS+=      CC_FOR_BUILD=${NATIVE_C
 # dependencies like libgcrypt.  I don't see a way to use pkg-config or
 # anything reasonable to override this, so, we do the nonsense thing
 # instead.
-CONFIGURE_ARGS+=       GPGRT_CONFIG=${CROSS_DESTDIR:Q}${LOCALBASE}/bin/gpgrt-config
-CONFIGURE_ARGS+=       GPG_ERROR_CONFIG=${CROSS_DESTDIR:Q}${LOCALBASE}/bin/gpg-error-config
+CONFIGURE_ARGS+=       GPGRT_CONFIG=${CROSS_DESTDIR:Q}${PREFIX}/bin/gpgrt-config
+CONFIGURE_ARGS+=       GPG_ERROR_CONFIG=${CROSS_DESTDIR:Q}${PREFIX}/bin/gpg-error-config
 .endif
 
 .if ${OPSYS} == "Darwin"

Index: pkgsrc/security/libgcrypt/options.mk
diff -u pkgsrc/security/libgcrypt/options.mk:1.9 pkgsrc/security/libgcrypt/options.mk:1.10
--- pkgsrc/security/libgcrypt/options.mk:1.9    Fri Apr  7 09:15:55 2023
+++ pkgsrc/security/libgcrypt/options.mk        Mon Mar  3 21:32:27 2025
@@ -1,12 +1,12 @@
-# $NetBSD: options.mk,v 1.9 2023/04/07 09:15:55 adam Exp $
+# $NetBSD: options.mk,v 1.10 2025/03/03 21:32:27 nia Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.libgcrypt
 PKG_SUPPORTED_OPTIONS=
 
 .include "../../mk/bsd.prefs.mk"
+.include "../../mk/compiler.mk"
 
 .if ${MACHINE_ARCH} == "i386" && ${OPSYS} != "Darwin"
-.  include "../../mk/compiler.mk"
 # GCC 3.x (at least 3.3.3 on NetBSD) fails to compile asm() call in
 # cipher/rijndael.c:do_padlock()
 .  if !${CC_VERSION:Mgcc-3.*}

Index: pkgsrc/security/libgpg-error/Makefile
diff -u pkgsrc/security/libgpg-error/Makefile:1.91 pkgsrc/security/libgpg-error/Makefile:1.92
--- pkgsrc/security/libgpg-error/Makefile:1.91  Tue Nov 12 09:00:41 2024
+++ pkgsrc/security/libgpg-error/Makefile       Mon Mar  3 21:32:27 2025
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.91 2024/11/12 09:00:41 adam Exp $
+# $NetBSD: Makefile,v 1.92 2025/03/03 21:32:27 nia Exp $
 
 DISTNAME=      libgpg-error-1.51
 CATEGORIES=    security
-MASTER_SITES=  https://www.gnupg.org/ftp/gcrypt/libgpg-error/
-MASTER_SITES+= ftp://ftp.gnupg.org/gcrypt/libgpg-error/
-MASTER_SITES+= ftp://ftp.ring.gr.jp/pub/net/gnupg/libgpg-error/
+MASTER_SITES=  ${MASTER_SITE_GNUPG:=libgpg-error/}
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    minskim%NetBSD.org@localhost

Index: pkgsrc/security/libksba/Makefile
diff -u pkgsrc/security/libksba/Makefile:1.43 pkgsrc/security/libksba/Makefile:1.44
--- pkgsrc/security/libksba/Makefile:1.43       Wed Jun 26 19:32:34 2024
+++ pkgsrc/security/libksba/Makefile    Mon Mar  3 21:32:27 2025
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.43 2024/06/26 19:32:34 adam Exp $
+# $NetBSD: Makefile,v 1.44 2025/03/03 21:32:27 nia Exp $
 
 DISTNAME=      libksba-1.6.7
 CATEGORIES=    security
-MASTER_SITES=  ftp://ftp.gnupg.org/gcrypt/libksba/
+MASTER_SITES=  ${MASTER_SITE_GNUPG:=libksba/}
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/security/qgpgme/Makefile
diff -u pkgsrc/security/qgpgme/Makefile:1.36 pkgsrc/security/qgpgme/Makefile:1.37
--- pkgsrc/security/qgpgme/Makefile:1.36        Thu Nov 14 22:21:34 2024
+++ pkgsrc/security/qgpgme/Makefile     Mon Mar  3 21:32:27 2025
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.36 2024/11/14 22:21:34 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2025/03/03 21:32:27 nia Exp $
 
 DISTNAME=      gpgme-1.23.2
 PKGNAME=       qgpgme-1.23.2
 PKGREVISION=   6
 CATEGORIES=    security
-MASTER_SITES=  ftp://ftp.gnupg.org/gcrypt/gpgme/
+MASTER_SITES=  ${MASTER_SITE_GNUPG:=gpgme/}
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
Home | Main Index | Thread Index | Old Index