git: d0cbe7ba85c0 - main - Revert "security/gnupg: Fix dirmngr crash caused by gettext 0.22"

The branch main has been updated by tijl:

URL: https://cgit.FreeBSD.org/ports/commit/?id=d0cbe7ba85c00f24f4b85a2c6221533e6a4db44d

commit d0cbe7ba85c00f24f4b85a2c6221533e6a4db44d
Author:     Tijl Coosemans <tijl@FreeBSD.org>
AuthorDate: 2023-07-17 18:59:17 +0000
Commit:     Tijl Coosemans <tijl@FreeBSD.org>
CommitDate: 2023-07-17 19:08:47 +0000

    Revert "security/gnupg: Fix dirmngr crash caused by gettext 0.22"
    
    This reverts commit 7fa24cff0d8a99e5d44839d4b358fafaf69cffbe.
    
    The problem has been fixed in libintl in fb889ca82944.
    
    PR:             272472
---
 security/gnupg/Makefile                        |  2 +-
 security/gnupg/files/patch-dirmngr_Makefile.in | 12 ------------
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile
index ca13f0c944f9..02637667f41b 100644
--- a/security/gnupg/Makefile
+++ b/security/gnupg/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	gnupg
 DISTVERSION=	2.4.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	GNUPG
 
diff --git a/security/gnupg/files/patch-dirmngr_Makefile.in b/security/gnupg/files/patch-dirmngr_Makefile.in
deleted file mode 100644
index 96607396e75d..000000000000
--- a/security/gnupg/files/patch-dirmngr_Makefile.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- dirmngr/Makefile.in.orig	2023-07-04 14:09:03 UTC
-+++ dirmngr/Makefile.in
-@@ -719,8 +719,8 @@ dirmngr_LDADD = $(libcommonpth) $(DNSLIBS) $(LIBASSUAN
- @USE_LDAP_FALSE@ldaplibs = 
- @USE_LDAP_TRUE@ldaplibs = $(LDAPLIBS)
- dirmngr_LDADD = $(libcommonpth) $(DNSLIBS) $(LIBASSUAN_LIBS) \
--	$(KSBA_LIBS) $(NPTH_LIBS) $(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) \
- 	$(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) $(LIBICONV) \
-+	$(KSBA_LIBS) $(NPTH_LIBS) $(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) \
- 	$(NETLIBS) $(dirmngr_rc_objs) $(am__append_11)
- dirmngr_LDFLAGS = 
- dirmngr_DEPENDENCIES = $(dirmngr_rc_objs)