security/putty: update to 0.78~pre20220922

This permits a FreeBSD build without patches; the two remaining
items are 1. avoiding the GSSAPI-related call into pkg-config because it
would not cover base-GSSAPI so we force the fallback to krb5-config
(which we control by way of ports/Mk/Uses/gssapi.mk), and
2. making sure PuTTY's build would not ascend directory hierarchy to
pick up our ports tree's Git information. We are only packaging
(pre-)release tarballs where we do not need to run Git.

Thanks to Simon Tatham, upstream maintainer, for issuing the
pre-releases and being very responsive and open to making the
build experience smooth for everyone.

5 files changed, 5 insertions, 100 deletions

diff --git a/security/putty/Makefile b/security/putty/Makefile
index 2e4ae7a5cb5a..6f030da7f8d7 100644
--- a/security/putty/Makefile
+++ b/security/putty/Makefile
@@ -1,15 +1,12 @@
 PORTNAME=	putty
-PORTVERSION=	0.78~pre20220919
-DISTVERSIONSUFFIX=	.fda41e1
+PORTVERSION=	0.78~pre20220922
+DISTVERSIONSUFFIX=	.9fcfd67
 PORTREVISION=	0
 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/ \
 		LOCAL/mandree/
-EXTRA_PATCHES+=	${FILESDIR}/0001-setpgrp-cmake-check-use-if-not-if-defined.patch
-EXTRA_PATCHES+=	${FILESDIR}/0002-Use-GTK_LDFLAGS-when-testing-for-Pango.patch
-EXTRA_PATCHES+= ${FILESDIR}/0001-Stop-trying-to-include-X11-headers-in-non-GTK-builds.patch
 PATCH_STRIP=	-p1
 
 MAINTAINER=	mandree@FreeBSD.org
diff --git a/security/putty/distinfo b/security/putty/distinfo
index bffdde6560a7..da5942e14783 100644
--- a/security/putty/distinfo
+++ b/security/putty/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1663606232
-SHA256 (putty-0.78~pre20220919.fda41e1.tar.gz) = 76be193cc2dd3b38849714ab5f1d4ac539d911ca22c2636a744fc2f09b72dc2a
-SIZE (putty-0.78~pre20220919.fda41e1.tar.gz) = 2811117
+TIMESTAMP = 1663867740
+SHA256 (putty-0.78~pre20220922.9fcfd67.tar.gz) = 6ec5ed3c341cd4c815f7233fbc51bc925accf433fe58e233aa3eb67078994f5c
+SIZE (putty-0.78~pre20220922.9fcfd67.tar.gz) = 2811211
diff --git a/security/putty/files/0001-Stop-trying-to-include-X11-headers-in-non-GTK-builds.patch b/security/putty/files/0001-Stop-trying-to-include-X11-headers-in-non-GTK-builds.patch
deleted file mode 100644
index 58ddf65280f4..000000000000
--- a/security/putty/files/0001-Stop-trying-to-include-X11-headers-in-non-GTK-builds.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 9fcfd679b49a015e95f70b3f0380243e0db8b035 Mon Sep 17 00:00:00 2001
-From: Simon Tatham <anakin@pobox.com>
-Date: Mon, 19 Sep 2022 20:21:01 +0100
-Subject: [PATCH] Stop trying to include X11 headers in non-GTK builds.
-
-In commit 732ec31a17a7fea I made the check for libX11 conditional on
-GTK - but I forgot that if we're building without GTK, I should
-_define_ NOT_X_WINDOWS, rather than leaving it undefined. As a result,
-the build would fail on files like unix/utils/x11_ignore_error.c.
----
- cmake/platforms/unix.cmake | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/cmake/platforms/unix.cmake b/cmake/platforms/unix.cmake
-index 98474485..4d056d0a 100644
---- a/cmake/platforms/unix.cmake
-+++ b/cmake/platforms/unix.cmake
-@@ -96,6 +96,10 @@ if(GTK_FOUND)
-     endif()
-   endfunction()
-   check_x11()
-+else()
-+  # If we didn't even have GTK, behave as if X11 is not available.
-+  # (There's nothing useful we could do with it even if there was.)
-+  set(NOT_X_WINDOWS ON)
- endif()
- 
- include_directories(${CMAKE_SOURCE_DIR}/charset ${GTK_INCLUDE_DIRS} ${X11_INCLUDE_DIR})
--- 
-2.37.3
-
diff --git a/security/putty/files/0001-setpgrp-cmake-check-use-if-not-if-defined.patch b/security/putty/files/0001-setpgrp-cmake-check-use-if-not-if-defined.patch
deleted file mode 100644
index b5b91d4e6a0e..000000000000
--- a/security/putty/files/0001-setpgrp-cmake-check-use-if-not-if-defined.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From ae2c0d40ae61f56994c8d0fc4613ec9758dc2f08 Mon Sep 17 00:00:00 2001
-From: Simon Tatham <anakin@pobox.com>
-Date: Mon, 19 Sep 2022 11:31:27 +0000
-Subject: [PATCH 1/2] setpgrp cmake check: use #if, not #if defined.
-
-I still haven't got out of the habit of doing this the autotools way,
-which doesn't work in cmake. cmake's HAVE_FOO variables are always
-defined, and they take values 0 or 1, so testing them with 'defined'
-will return the wrong value.
----
- unix/pageant.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/unix/pageant.c b/unix/pageant.c
-index 6d125fce..4558cd37 100644
---- a/unix/pageant.c
-+++ b/unix/pageant.c
-@@ -330,9 +330,9 @@ 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. */
--#if defined HAVE_NULLARY_SETPGRP
-+#if HAVE_NULLARY_SETPGRP
-         setpgrp();
--#elif defined HAVE_BINARY_SETPGRP
-+#elif HAVE_BINARY_SETPGRP
-         setpgrp(0, 0);
- #endif
-     } else {
--- 
-2.37.3
-
diff --git a/security/putty/files/0002-Use-GTK_LDFLAGS-when-testing-for-Pango.patch b/security/putty/files/0002-Use-GTK_LDFLAGS-when-testing-for-Pango.patch
deleted file mode 100644
index 1fdf5cd5b65f..000000000000
--- a/security/putty/files/0002-Use-GTK_LDFLAGS-when-testing-for-Pango.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 864b4c27fa67a95b2daa095923878bdba9fc6fcf Mon Sep 17 00:00:00 2001
-From: Simon Tatham <anakin@pobox.com>
-Date: Mon, 19 Sep 2022 11:34:21 +0000
-Subject: [PATCH 2/2] Use GTK_LDFLAGS when testing for Pango.
-
-On FreeBSD, the GTK libraries aren't stored on the standard library
-path, so pkg-config has to emit a -L option as well as -l options.
-This worked fine during the main build, but the -L option wasn't being
-passed through to check_symbol_exists() for the tests of Pango API
-function availability.
----
- cmake/gtk.cmake | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/cmake/gtk.cmake b/cmake/gtk.cmake
-index 34396d2f..13ff7705 100644
---- a/cmake/gtk.cmake
-+++ b/cmake/gtk.cmake
-@@ -74,6 +74,7 @@ if(GTK_FOUND)
-   # Check for some particular Pango functions.
-   function(pango_check_subscope)
-     set(CMAKE_REQUIRED_INCLUDES ${GTK_INCLUDE_DIRS})
-+    set(CMAKE_REQUIRED_LINK_OPTIONS ${GTK_LDFLAGS})
-     set(CMAKE_REQUIRED_LIBRARIES ${GTK_LIBRARIES})
-     check_symbol_exists(pango_font_family_is_monospace "pango/pango.h"
-       HAVE_PANGO_FONT_FAMILY_IS_MONOSPACE)
--- 
-2.37.3
-