git: 498357a08463 - main - security/gnupg1: mark conflicts with next version of security/gnupg

From: Adriaan de Groot <adridg_at_FreeBSD.org>
Date: Tue, 16 Jun 2026 13:35:37 UTC 
The branch main has been updated by adridg:

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

commit 498357a08463853e5c2210d019667379d7b826db
Author:     Adriaan de Groot <adridg@FreeBSD.org>
AuthorDate: 2026-06-16 11:01:20 +0000
Commit:     Adriaan de Groot <adridg@FreeBSD.org>
CommitDate: 2026-06-16 13:35:25 +0000

    security/gnupg1: mark conflicts with next version of security/gnupg
    
    The ports are no longer co-installable because upstream dropped
    the gpg-is-gpg2 configure option.
---
 security/gnupg1/Makefile  | 4 +++-
 security/gnupg1/pkg-plist | 1 -
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/security/gnupg1/Makefile b/security/gnupg1/Makefile
index e7710a6a634d..511e06523f95 100644
--- a/security/gnupg1/Makefile
+++ b/security/gnupg1/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	gnupg
 PORTVERSION=	1.4.23
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	security
 MASTER_SITES=	GNUPG
 PKGNAMESUFFIX=	1
@@ -21,6 +21,8 @@ CONFIGURE_ARGS=	--enable-camellia \
 		--enable-noexecstack
 CFLAGS+=	-fcommon
 
+CONFLICTS_INSTALL=	gnupg-2.5*
+
 INFO=		gnupg1
 DOCSDIR=	${PREFIX}/share/doc/gnupg1
 PORTDOCS=	*
diff --git a/security/gnupg1/pkg-plist b/security/gnupg1/pkg-plist
index f55745cc3aa5..c2526de527f4 100644
--- a/security/gnupg1/pkg-plist
+++ b/security/gnupg1/pkg-plist
@@ -42,4 +42,3 @@ share/man/man1/gpgv.1.gz
 %%NLS%%share/locale/uk/LC_MESSAGES/gnupg.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/gnupg.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/gnupg.mo
-@postunexec [ ! -e %D/bin/gpg2 ] || ln -sf gpg2 %D/bin/gpg