CVS commit: pkgsrc

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Apr  9 10:40:13 UTC 2025

Modified Files:
        pkgsrc/mail/gmime3: Makefile
        pkgsrc/security/gpgme: Makefile
        pkgsrc/security/libgcrypt: Makefile
        pkgsrc/security/libgnome-keyring: Makefile
        pkgsrc/security/libksba: Makefile
        pkgsrc/security/libsecret: Makefile
        pkgsrc/security/pinentry: Makefile.common
        pkgsrc/textproc/libxslt: Makefile

Log Message:
*: revert workaround for bug in libgpg-error 1.52, fixed in 1.53


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 pkgsrc/mail/gmime3/Makefile
cvs rdiff -u -r1.124 -r1.125 pkgsrc/security/gpgme/Makefile
cvs rdiff -u -r1.117 -r1.118 pkgsrc/security/libgcrypt/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/security/libgnome-keyring/Makefile
cvs rdiff -u -r1.45 -r1.46 pkgsrc/security/libksba/Makefile
cvs rdiff -u -r1.35 -r1.36 pkgsrc/security/libsecret/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/security/pinentry/Makefile.common
cvs rdiff -u -r1.138 -r1.139 pkgsrc/textproc/libxslt/Makefile

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

Modified files:

Index: pkgsrc/mail/gmime3/Makefile
diff -u pkgsrc/mail/gmime3/Makefile:1.20 pkgsrc/mail/gmime3/Makefile:1.21
--- pkgsrc/mail/gmime3/Makefile:1.20    Tue Apr  8 17:20:41 2025
+++ pkgsrc/mail/gmime3/Makefile Wed Apr  9 10:40:12 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2025/04/08 17:20:41 ryoon Exp $
+# $NetBSD: Makefile,v 1.21 2025/04/09 10:40:12 wiz Exp $
 
 DISTNAME=      gmime-3.2.15
 PKGNAME=       ${DISTNAME:S/gmime/gmime3/}
@@ -21,8 +21,6 @@ GNU_CONFIGURE=                yes
 CONFIGURE_ARGS+=       --enable-gtk-doc=no
 PKGCONFIG_OVERRIDE+=   gmime.pc.in
 
-CPPFLAGS+=             -DGPGRT_ENABLE_ES_MACROS
-
 # one test failure as of 3.2.6
 # test-filters:
 # https://github.com/jstedfast/gmime/issues/81

Index: pkgsrc/security/gpgme/Makefile
diff -u pkgsrc/security/gpgme/Makefile:1.124 pkgsrc/security/gpgme/Makefile:1.125
--- pkgsrc/security/gpgme/Makefile:1.124        Tue Apr  8 17:17:59 2025
+++ pkgsrc/security/gpgme/Makefile      Wed Apr  9 10:40:13 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.124 2025/04/08 17:17:59 ryoon Exp $
+# $NetBSD: Makefile,v 1.125 2025/04/09 10:40:13 wiz Exp $
 
 DISTNAME=      gpgme-1.24.2
 CATEGORIES=    security
@@ -26,7 +26,6 @@ SUBST_SED.pthread+=   -e 's,@PTHREAD_LIBS@
 SUBST_VARS.pthread=    PTHREAD_CFLAGS
 SUBST_STAGE.pthread=   pre-configure
 
-CPPFLAGS+=             -DGPGRT_ENABLE_ES_MACROS
 CPPFLAGS.Darwin=       -D_POSIX_C_SOURCE=200809L
 LIBS.SunOS+=           -lnsl -lsocket
 

Index: pkgsrc/security/libgcrypt/Makefile
diff -u pkgsrc/security/libgcrypt/Makefile:1.117 pkgsrc/security/libgcrypt/Makefile:1.118
--- pkgsrc/security/libgcrypt/Makefile:1.117    Tue Apr  8 16:15:42 2025
+++ pkgsrc/security/libgcrypt/Makefile  Wed Apr  9 10:40:13 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.117 2025/04/08 16:15:42 ryoon Exp $
+# $NetBSD: Makefile,v 1.118 2025/04/09 10:40:13 wiz Exp $
 
 DISTNAME=      libgcrypt-1.11.0
 PKGREVISION=   2
@@ -19,8 +19,6 @@ INFO_FILES=           yes
 
 .include "../../mk/compiler.mk"
 
-CPPFLAGS+=     -DGPGRT_ENABLE_ES_MACROS
-
 .if !empty(PKGSRC_COMPILER:Mclang)
 CFLAGS+=               -fheinous-gnu-extensions
 .endif

Index: pkgsrc/security/libgnome-keyring/Makefile
diff -u pkgsrc/security/libgnome-keyring/Makefile:1.19 pkgsrc/security/libgnome-keyring/Makefile:1.20
--- pkgsrc/security/libgnome-keyring/Makefile:1.19      Wed Apr  9 09:35:48 2025
+++ pkgsrc/security/libgnome-keyring/Makefile   Wed Apr  9 10:40:13 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2025/04/09 09:35:48 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2025/04/09 10:40:13 wiz Exp $
 
 DISTNAME=      libgnome-keyring-3.12.0
 PKGREVISION=   2
@@ -19,8 +19,6 @@ USE_LIBTOOL=          YES
 
 PKGCONFIG_OVERRIDE+=   library/gnome-keyring-1.pc.in
 
-CPPFLAGS+=             -DGPGRT_ENABLE_ES_MACROS
-
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../security/libgcrypt/buildlink3.mk"
 BUILDLINK_API_DEPENDS.dbus+=    dbus>=1.2.1

Index: pkgsrc/security/libksba/Makefile
diff -u pkgsrc/security/libksba/Makefile:1.45 pkgsrc/security/libksba/Makefile:1.46
--- pkgsrc/security/libksba/Makefile:1.45       Tue Apr  8 17:08:59 2025
+++ pkgsrc/security/libksba/Makefile    Wed Apr  9 10:40:13 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2025/04/08 17:08:59 ryoon Exp $
+# $NetBSD: Makefile,v 1.46 2025/04/09 10:40:13 wiz Exp $
 
 DISTNAME=      libksba-1.6.7
 CATEGORIES=    security
@@ -17,8 +17,6 @@ INFO_FILES=           yes
 TEST_TARGET=           check
 TEXINFO_REQD=          4.0
 
-CPPFLAGS+=             -DGPGRT_ENABLE_ES_MACROS
-
 .include "../../mk/bsd.prefs.mk"
 
 .if ${USE_CROSS_COMPILE:U:tl} == yes

Index: pkgsrc/security/libsecret/Makefile
diff -u pkgsrc/security/libsecret/Makefile:1.35 pkgsrc/security/libsecret/Makefile:1.36
--- pkgsrc/security/libsecret/Makefile:1.35     Wed Apr  9 09:34:05 2025
+++ pkgsrc/security/libsecret/Makefile  Wed Apr  9 10:40:13 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2025/04/09 09:34:05 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2025/04/09 10:40:13 wiz Exp $
 
 DISTNAME=      libsecret-0.20.5
 CATEGORIES=    security gnome
@@ -33,7 +33,6 @@ SUBST_FILES.python=   libsecret/mock-servi
 SUBST_SED.python=      -e 's,python3,${PYTHONBIN},'
 
 BUILDLINK_API_DEPENDS.glib2+=  glib2>=2.44.0
-CPPFLAGS+=                     -DGPGRT_ENABLE_ES_MACROS
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/meson/build.mk"

Index: pkgsrc/security/pinentry/Makefile.common
diff -u pkgsrc/security/pinentry/Makefile.common:1.20 pkgsrc/security/pinentry/Makefile.common:1.21
--- pkgsrc/security/pinentry/Makefile.common:1.20       Wed Apr  9 09:31:35 2025
+++ pkgsrc/security/pinentry/Makefile.common    Wed Apr  9 10:40:13 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.20 2025/04/09 09:31:35 wiz Exp $
+# $NetBSD: Makefile.common,v 1.21 2025/04/09 10:40:13 wiz Exp $
 #
 # used by security/pinentry/Makefile
 # used by security/pinentry-fltk/Makefile
@@ -25,7 +25,6 @@ CONFIGURE_ARGS+=      --with-libiconv-prefix=
 INFO_FILES=            yes
 
 .include "../../security/libassuan2/buildlink3.mk"
-CPPFLAGS+=     -DGPGRT_ENABLE_ES_MACROS
 BUILDLINK_API_DEPENDS.libgpg-error+=   libgpg-error>=1.16
 .include "../../security/libgpg-error/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"

Index: pkgsrc/textproc/libxslt/Makefile
diff -u pkgsrc/textproc/libxslt/Makefile:1.138 pkgsrc/textproc/libxslt/Makefile:1.139
--- pkgsrc/textproc/libxslt/Makefile:1.138      Tue Apr  8 16:25:39 2025
+++ pkgsrc/textproc/libxslt/Makefile    Wed Apr  9 10:40:13 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.138 2025/04/08 16:25:39 ryoon Exp $
+# $NetBSD: Makefile,v 1.139 2025/04/09 10:40:13 wiz Exp $
 
 PKGREVISION= 3
 .include "Makefile.common"
@@ -17,8 +17,6 @@ PKGCONFIG_OVERRIDE=   libxslt.pc.in
 PKGCONFIG_OVERRIDE+=   libexslt.pc.in
 TEST_TARGET=           check
 
-CPPFLAGS+=             -DGPGRT_ENABLE_ES_MACROS
-
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == SunOS