git: fe6f1b42c85a - main - devel/valgrind: update to 3.22

The branch main has been updated by fernape:

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

commit fe6f1b42c85a8e56f51834798ff53c0ad9669237
Author:     Fernando Apesteguía <fernape@FreeBSD.org>
AuthorDate: 2023-11-01 10:31:27 +0000
Commit:     Fernando Apesteguía <fernape@FreeBSD.org>
CommitDate: 2023-11-02 07:26:24 +0000

    devel/valgrind: update to 3.22
    
    PR:             274836
    Reported by:    pjfloyd@wanadoo.fr (maintainer)
---
 devel/valgrind/Makefile                            |  3 +--
 devel/valgrind/distinfo                            |  6 ++---
 devel/valgrind/files/patch-configure.ac            | 27 -------------------
 .../valgrind/files/patch-coregrind-vg_preloaded.c  | 31 ----------------------
 devel/valgrind/pkg-plist                           |  1 +
 5 files changed, 5 insertions(+), 63 deletions(-)

diff --git a/devel/valgrind/Makefile b/devel/valgrind/Makefile
index 33f46d7e86d7..4698238c73ef 100644
--- a/devel/valgrind/Makefile
+++ b/devel/valgrind/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	valgrind
-PORTVERSION=	3.21.0
-PORTREVISION=	2
+PORTVERSION=	3.22.0
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	SOURCEWARE/valgrind
diff --git a/devel/valgrind/distinfo b/devel/valgrind/distinfo
index f5bac8b4be66..5d0efbe35ce5 100644
--- a/devel/valgrind/distinfo
+++ b/devel/valgrind/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1682710174
-SHA256 (valgrind-3.21.0.tar.bz2) = 10ce1618bb3e33fad16eb79552b0a3e1211762448a0d7fce11c8a6243b9ac971
-SIZE (valgrind-3.21.0.tar.bz2) = 17449484
+TIMESTAMP = 1698777812
+SHA256 (valgrind-3.22.0.tar.bz2) = c811db5add2c5f729944caf47c4e7a65dcaabb9461e472b578765dd7bf6d2d4c
+SIZE (valgrind-3.22.0.tar.bz2) = 16565502
diff --git a/devel/valgrind/files/patch-configure.ac b/devel/valgrind/files/patch-configure.ac
deleted file mode 100644
index f739e77592f4..000000000000
--- a/devel/valgrind/files/patch-configure.ac
+++ /dev/null
@@ -1,27 +0,0 @@
---- configure.ac.orig	2023-04-28 15:28:21 UTC
-+++ configure.ac
-@@ -398,6 +398,8 @@ case "${host_os}" in
-         freebsd_13_2=1320
-         AC_DEFINE([FREEBSD_14], 1400, [FREEBSD_VERS value for FreeBSD 14.x])
-         freebsd_14=1400
-+        AC_DEFINE([FREEBSD_15], 1500, [FREEBSD_VERS value for FreeBSD 15.x])
-+        freebsd_15=1500
- 
-         AC_MSG_CHECKING([for the kernel version])
-         kernel=`uname -r`
-@@ -451,9 +453,14 @@ case "${host_os}" in
-            AC_DEFINE([FREEBSD_VERS], FREEBSD_14, [FreeBSD version])
-            freebsd_vers=$freebsd_14
-            ;;
-+        15.*)
-+           AC_MSG_RESULT([FreeBSD 15.x (${kernel})])
-+           AC_DEFINE([FREEBSD_VERS], FREEBSD_15, [FreeBSD version])
-+           freebsd_vers=$freebsd_15
-+           ;;
-         *)
-            AC_MSG_RESULT([unsupported (${kernel})])
--           AC_MSG_ERROR([Valgrind works on FreeBSD 10.x to 14.x])
-+           AC_MSG_ERROR([Valgrind works on FreeBSD 10.x to 15.x])
-            ;;
-         esac
- 
diff --git a/devel/valgrind/files/patch-coregrind-vg_preloaded.c b/devel/valgrind/files/patch-coregrind-vg_preloaded.c
deleted file mode 100644
index 870626ec4edd..000000000000
--- a/devel/valgrind/files/patch-coregrind-vg_preloaded.c
+++ /dev/null
@@ -1,31 +0,0 @@
---- coregrind/vg_preloaded.c.orig	2023-09-19 20:30:09.413386000 +0200
-+++ coregrind/vg_preloaded.c	2023-09-19 20:32:14.366333000 +0200
-@@ -228,7 +228,27 @@
- 
- #elif defined(VGO_freebsd)
- 
--// nothing specific currently
-+#if (FREEBSD_VERS >= FREEBSD_14)
-+
-+void * VG_NOTIFY_ON_LOAD(ifunc_wrapper) (void);
-+void * VG_NOTIFY_ON_LOAD(ifunc_wrapper) (void)
-+{
-+    OrigFn fn;
-+    Addr result = 0;
-+    Addr fnentry;
-+
-+    /* Call the original indirect function and get it's result */
-+    VALGRIND_GET_ORIG_FN(fn);
-+    CALL_FN_W_v(result, fn);
-+
-+    fnentry = result;
-+
-+    VALGRIND_DO_CLIENT_REQUEST_STMT(VG_USERREQ__ADD_IFUNC_TARGET,
-+                                    fn.nraddr, fnentry, 0, 0, 0);
-+    return (void*)result;
-+}
-+
-+#endif
- 
- #elif defined(VGO_solaris)
- 
diff --git a/devel/valgrind/pkg-plist b/devel/valgrind/pkg-plist
index 42788f3cfbef..c2e725a96c33 100644
--- a/devel/valgrind/pkg-plist
+++ b/devel/valgrind/pkg-plist
@@ -8,6 +8,7 @@ bin/valgrind
 bin/valgrind-di-server
 bin/valgrind-listener
 bin/vgdb
+include/valgrind/cachegrind.h
 include/valgrind/callgrind.h
 include/valgrind/config.h
 include/valgrind/dhat.h