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,9 +1,9 @@
 PKGNAMESUFFIX=		-nogtk
 
-OPTIONS_EXCLUDE=	GTK2 GTK3
+OPTIONS_EXCLUDE=	GTK3
 
-CONFLICTS_INSTALL=	pssh putty putty-gtk2
+CONFLICTS_INSTALL=	pssh* putty*
 
 MASTERDIR=		${.CURDIR}/../../security/putty
 
 .include "${MASTERDIR}/Makefile"
diff --git a/security/putty/Makefile b/security/putty/Makefile
index 86ede48a8a20..d6c0e6b3cd44 100644
--- a/security/putty/Makefile
+++ b/security/putty/Makefile
@@ -1,117 +1,117 @@
 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/
 MASTER_SITES=	https://tartarus.org/~simon/putty-prerel-snapshots/
 EXTRA_PATCHES+=	${FILESDIR}/0001-Unix-GSSAPI-support-krb5-config-as-well-as-pkg-confi.patch
 EXTRA_PATCHES+=	${FILESDIR}/0002-Unix-static-GSSAPI-fix-an-uninitialised-structure-fi.patch
 EXTRA_PATCHES+=	${FILESDIR}/0003-Unix-GSSAPI-support-static-linking-against-Heimdal.patch
 EXTRA_PATCHES+=	${FILESDIR}/0004-GSSAPI-fix-don-t-pass-GSS_C_NO_NAME-to-inquire_cred_.patch
 PATCH_STRIP=	-p1
 
 MAINTAINER=	mandree@FreeBSD.org
 COMMENT=	Secure shell and telnet client including xterm emulator
 WWW=		https://www.chiark.greenend.org.uk/~sgtatham/putty/
 # test plan: test ALL 4 GSSAPI_* options, GTK3 yes/no, WITH_DEBUG=yes build.
 
 LICENSE=	MIT
 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 \
 		bin/pscp \
 		bin/psftp \
 		bin/psusan \
 		bin/puttygen \
 		share/man/man1/pageant.1.gz \
 		share/man/man1/plink.1.gz \
 		share/man/man1/pscp.1.gz \
 		share/man/man1/psftp.1.gz \
 		share/man/man1/psusan.1.gz \
 		share/man/man1/puttygen.1.gz
 
 OPTIONS_DEFINE=			GTK3
 OPTIONS_DEFAULT=		GSSAPI_BASE GTK3
 OPTIONS_SINGLE=			GSSAPI_SELECT
 OPTIONS_SINGLE_GSSAPI_SELECT=	GSSAPI_BASE \
 				GSSAPI_HEIMDAL \
 				GSSAPI_MIT \
 				GSSAPI_NONE \
 				# GSSAPI_DYNAMIC
 GSSAPI_DYNAMIC_DESC=	EXPERIMENTAL dynamic runtime load of GSS libs
 
 .include <bsd.port.options.mk>
 
 LDFLAGS+=	-Wl,--as-needed
 
 # XXX FIXME this is simplified on these assumptions:
 # - we only support GTK3 in FreeBSD
 #   (Putty would support EOL GTK2 and GTK1 as well)
 # - Putty 0.77 cannot have X11 without the gdk/gdkx.h header i. e. GTK.
 .if ${PORT_OPTIONS:MGTK3} && !defined(WITHOUT_X11)
 USES+=		xorg
 USE_XORG=	x11
 USES+=		gnome
 USE_GNOME=	cairo gdkpixbuf2 gtk30
 CMAKE_ARGS+=	-DPUTTY_GTK_VERSION:STRING=3
 
 PLIST_FILES+=	bin/pterm \
 		bin/putty \
 		share/man/man1/pterm.1.gz \
 		share/man/man1/putty.1.gz \
 		share/pixmaps/putty.ico
 DESKTOP_ENTRIES=	"PuTTY" \
 			"${COMMENT}" \
 			"${PREFIX}/share/pixmaps/${PORTNAME}.ico" \
 			"${PORTNAME}" \
 			"" \
 			false
 .else
 # XXX FIXME HACK ALERT
 # PUTTY_GTK_VERSION=OFF is not a valid choice, but manages to
 # skip all version comparisons for GTK in cmake/gtk.cmake:
 CMAKE_ARGS+=	-DPUTTY_GTK_VERSION:STRING=OFF
 # this is standard stuff:
 CMAKE_ARGS+=	-DCMAKE_DISABLE_FIND_PACKAGE_X11:BOOL=TRUE
 .endif
 
 .if ${PORT_OPTIONS:MGSSAPI_BASE} # Heimdal-like in base system
 USES+=		gssapi:base,flags
 CMAKE_ARGS+=	-DPUTTY_GSSAPI:STRING=STATIC
 .elif ${PORT_OPTIONS:MGSSAPI_HEIMDAL}
 USES+=		gssapi:heimdal,flags
 CMAKE_ARGS+=	-DPUTTY_GSSAPI:STRING=STATIC
 .elif ${PORT_OPTIONS:MGSSAPI_MIT}
 USES+=		gssapi:mit,flags
 CMAKE_ARGS+=	-DPUTTY_GSSAPI:STRING=STATIC
 .elif ${PORT_OPTIONS:MGSSAPI_DYNAMIC}
 BROKEN=		GSSAPI_DYNAMIC does not work as of putty 0.78~pre20220916.e1b73f0
 CMAKE_ARGS+=	-DPUTTY_GSSAPI:STRING=DYNAMIC
 USES+=		gssapi:base,flags
 .else
 CMAKE_ARGS+=	-DPUTTY_GSSAPI:STRING=OFF
 .endif
 
 post-patch:
 	# we don't want to inherit FreeBSD commits
 	# as PUTTY Git commit revisions,
 	# so pretend we do not have Git:
 	${REINPLACE_CMD} '/FindGit/d' \
 		${WRKSRC}/cmake/setup.cmake \
 		${WRKSRC}/doc/CMakeLists.txt
 
 post-install:
 .if ${PORT_OPTIONS:MGTK3}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps
 	${INSTALL_DATA} ${WRKSRC}/windows/putty.ico \
 		${STAGEDIR}${PREFIX}/share/pixmaps/
 .endif
 
 .include <bsd.port.mk>
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). */