security/putty*: clean up options and patches

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
 

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 \

security/putty/files/patch-network.c

@@ -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>

security/putty/files/patch-pageant.c

@@ -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). */