git: 7602a4002e7e - main - security/putty*: clean up options and patches

The branch main has been updated by mandree:

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

commit 7602a4002e7e273cd41c1fa879f7837f0b466816
Author:     Matthias Andree <mandree@FreeBSD.org>
AuthorDate: 2022-09-18 11:42:13 +0000
Commit:     Matthias Andree <mandree@FreeBSD.org>
CommitDate: 2022-09-18 11:42:48 +0000

    security/putty*: clean up options and patches
---
 security/putty-nogtk/Makefile        |  4 ++--
 security/putty/Makefile              |  4 ++--
 security/putty/files/patch-network.c | 16 ----------------
 security/putty/files/patch-pageant.c | 11 -----------
 4 files changed, 4 insertions(+), 31 deletions(-)

diff --git a/security/putty-nogtk/Makefile b/security/putty-nogtk/Makefile
index 9b5d7976bebe..968fce339c91 100644
--- a/security/putty-nogtk/Makefile
+++ b/security/putty-nogtk/Makefile
@@ -1,8 +1,8 @@
 PKGNAMESUFFIX=		-nogtk
 
-OPTIONS_EXCLUDE=	GTK2 GTK3
+OPTIONS_EXCLUDE=	GTK3
 
-CONFLICTS_INSTALL=	pssh putty putty-gtk2
+CONFLICTS_INSTALL=	pssh* putty*
 
 MASTERDIR=		${.CURDIR}/../../security/putty
 
diff --git a/security/putty/Makefile b/security/putty/Makefile
index 86ede48a8a20..d6c0e6b3cd44 100644
--- a/security/putty/Makefile
+++ b/security/putty/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	putty
 DISTVERSION=	0.78~pre20220916.e1b73f0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 #MASTER_SITES=	http://the.earth.li/~sgtatham/putty/${PORTVERSION}/ \
 #		ftp://ftp.chiark.greenend.org.uk/users/sgtatham/putty-latest/
@@ -22,7 +22,7 @@ LICENSE_FILE=	${PATCH_WRKSRC}/LICENCE
 USES=		cmake cpe perl5 pkgconfig
 USE_PERL5=	build
 
-CONFLICTS_INSTALL?=	pssh putty-nogtk
+CONFLICTS_INSTALL?=	pssh* putty-nogtk*
 
 PLIST_FILES=	bin/pageant \
 		bin/plink \
diff --git a/security/putty/files/patch-network.c b/security/putty/files/patch-network.c
deleted file mode 100644
index 61a5b64dc8ab..000000000000
--- a/security/putty/files/patch-network.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- unix/network.c.orig	2022-09-15 23:42:29 UTC
-+++ unix/network.c
-@@ -11,8 +11,13 @@
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <sys/ioctl.h>
-+#ifdef __FreeBSD__
-+#include <netinet/in.h>
- #include <arpa/inet.h>
-+#else
-+#include <arpa/inet.h>
- #include <netinet/in.h>
-+#endif
- #include <netinet/tcp.h>
- #include <netdb.h>
- #include <sys/un.h>
diff --git a/security/putty/files/patch-pageant.c b/security/putty/files/patch-pageant.c
deleted file mode 100644
index e1361c40a7bb..000000000000
--- a/security/putty/files/patch-pageant.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- unix/pageant.c.orig	2022-09-15 23:42:29 UTC
-+++ unix/pageant.c
-@@ -330,7 +330,7 @@ void pageant_fork_and_print_env(bool retain_tty)
-         /* Get out of our previous process group, to avoid being
-          * blasted by passing signals. But keep our controlling tty,
-          * so we can keep checking to see if we still have one. */
--        setpgrp();
-+        setpgrp(0,0);
-     } else {
-         /* Do that, but also leave our entire session and detach from
-          * the controlling tty (if any). */