CVS commit: pkgsrc/security/gpgme

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Jan 28 10:50:49 UTC 2026

Modified Files:
        pkgsrc/security/gpgme: Makefile buildlink3.mk options.mk

Log Message:
gpgme: adapt for gnupg/gnupg2 binary name change

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.126 -r1.127 pkgsrc/security/gpgme/Makefile
cvs rdiff -u -r1.35 -r1.36 pkgsrc/security/gpgme/buildlink3.mk
cvs rdiff -u -r1.12 -r1.13 pkgsrc/security/gpgme/options.mk

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

Modified files:

Index: pkgsrc/security/gpgme/Makefile
diff -u pkgsrc/security/gpgme/Makefile:1.126 pkgsrc/security/gpgme/Makefile:1.127
--- pkgsrc/security/gpgme/Makefile:1.126        Tue May 20 07:31:24 2025
+++ pkgsrc/security/gpgme/Makefile      Wed Jan 28 10:50:49 2026
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.126 2025/05/20 07:31:24 adam Exp $
+# $NetBSD: Makefile,v 1.127 2026/01/28 10:50:49 wiz Exp $
 
 DISTNAME=      gpgme-1.24.3
+PKGREVISION=   1
 CATEGORIES=    security
 MASTER_SITES=  ${MASTER_SITE_GNUPG:=gpgme/}
 EXTRACT_SUFX=  .tar.bz2

Index: pkgsrc/security/gpgme/buildlink3.mk
diff -u pkgsrc/security/gpgme/buildlink3.mk:1.35 pkgsrc/security/gpgme/buildlink3.mk:1.36
--- pkgsrc/security/gpgme/buildlink3.mk:1.35    Fri Aug  9 09:42:33 2024
+++ pkgsrc/security/gpgme/buildlink3.mk Wed Jan 28 10:50:49 2026
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.35 2024/08/09 09:42:33 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.36 2026/01/28 10:50:49 wiz Exp $
 
 BUILDLINK_TREE+=       gpgme
 
@@ -18,11 +18,11 @@ pkgbase:=           gpgme
 .include "../../mk/pkg-build-options.mk"
 
 .if ${PKG_BUILD_OPTIONS.gpgme:Mgnupg2}
-DEPENDS+=              gnupg2>=2.2.0:../../security/gnupg2
-GPGME_GPG=             ${PREFIX}/bin/gpg2
-.else
-DEPENDS+=              gnupg>=1.4.2:../../security/gnupg
+DEPENDS+=              gnupg2>=2.5:../../security/gnupg2
 GPGME_GPG=             ${PREFIX}/bin/gpg
+.else
+DEPENDS+=              gnupg>=1.4.23nb28:../../security/gnupg
+GPGME_GPG=             ${PREFIX}/bin/gpg1
 .endif
 .if ${GNU_CONFIGURE:U""} == "yes"
 CONFIGURE_ARGS+=       ac_cv_path_GNUPG=${GPGME_GPG}

Index: pkgsrc/security/gpgme/options.mk
diff -u pkgsrc/security/gpgme/options.mk:1.12 pkgsrc/security/gpgme/options.mk:1.13
--- pkgsrc/security/gpgme/options.mk:1.12       Wed Jul  4 12:46:29 2018
+++ pkgsrc/security/gpgme/options.mk    Wed Jan 28 10:50:49 2026
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.12 2018/07/04 12:46:29 adam Exp $
+# $NetBSD: options.mk,v 1.13 2026/01/28 10:50:49 wiz Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.gpgme
 PKG_OPTIONS_REQUIRED_GROUPS=   gnupg
@@ -8,11 +8,11 @@ PKG_SUGGESTED_OPTIONS=                gnupg2
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mgnupg2)
-DEPENDS+=              gnupg2>=2.2.0:../../security/gnupg2
+DEPENDS+=              gnupg2>=2.5:../../security/gnupg2
 REPLACE_SH+=           tests/gpg/pinentry
-GPG_DEFAULT=           ${PREFIX}/bin/gpg2
 MAKE_FLAGS+=           GPG=${GPG_DEFAULT}
 .else
-DEPENDS+=              gnupg>=1.4.2:../../security/gnupg
+DEPENDS+=              gnupg>=1.4.23nb28:../../security/gnupg
+GPG_DEFAULT=           ${PREFIX}/bin/gpg1
 CONFIGURE_ARGS+=       --disable-gpgsm-test    # XXX: needs gpgsm
 .endif