devel/valgrind: Update to be based on release version of Valgrind 3.17

Also, re-assign the submitter as maintainer.

PR:		254506
Approved by:	zeising (maintainer)

4 files changed, 216 insertions, 190 deletions

diff --git a/devel/valgrind/Makefile b/devel/valgrind/Makefile
index 6e3b4d1f77c0..f5584df81a8a 100644
--- a/devel/valgrind/Makefile
+++ b/devel/valgrind/Makefile
@@ -1,30 +1,40 @@
 # Created by: Simon Barner <barner@gmx.de>
 
 PORTNAME=	valgrind
-PORTVERSION=	3.10.1.20160113
+PORTVERSION=	3.17.0.g20210319
 DISTVERSIONPREFIX=	freebsd-
-PORTREVISION=	8
+#PORTREVISION=	0
 PORTEPOCH=	1
 CATEGORIES=	devel
-MASTER_SITES=	https://bitbucket.org/${BB_ACCOUNT}/${BB_PROJECT}/get/${BB_COMMIT}.tar.gz?dummy=/ \
-		http://mirror.shatow.net/freebsd/${PORTNAME}/
+MASTER_SITES=	https://valgrind.org/
+PKGNAMESUFFIX=	-devel
 
-MAINTAINER=	zeising@FreeBSD.org
+MAINTAINER=	pjfloyd@wanadoo.fr
 COMMENT=	Memory debugging and profiling tool
 
-BB_COMMIT=	ce1acb28953f
-BB_ACCOUNT=	stass
-BB_PROJECT=	valgrind-freebsd
-
 LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+ONLY_FOR_ARCHS=	amd64 i386
+
+USES=		pathfix pkgconfig gmake perl5 shebangfix autoreconf
+USE_PERL5=	build
+
+GNU_CONFIGURE=	yes
+SHEBANG_FILES=	callgrind/callgrind_annotate.in callgrind/callgrind_control.in
+SSP_UNSAFE=	yes
+LIB32_PATH?=	/usr/lib32/libc.so
 
-BROKEN=		fails at runtime: valgrind: mmap(0x200000, 45056) failed in UME with error 22 (Invalid argument)
+CONFLICTS=	valgrind-[0-9]*
 
-CONFLICTS=	valgrind-devel-[0-9]*
+USE_GITHUB=	yes
+GH_ACCOUNT=	paulfloyd
+GH_PROJECT=	freebsd_valgrind
+GH_TAGNAME=	d333c54
 
-ONLY_FOR_ARCHS=	i386 amd64
+CONFIGURE_ENV+=	ac_cv_path_PERL=${PERL}
 
-LIB32_PATH?=	${DESTDIR}/usr/lib32/libc.so
+PORTDOCS=	html
 
 OPTIONS_DEFINE=		DOCS MANPAGES MPI
 OPTIONS_DEFINE_amd64=	32BIT
@@ -32,42 +42,21 @@ OPTIONS_DEFAULT=	MANPAGES
 .if exists(${LIB32_PATH})
 OPTIONS_DEFAULT_amd64=	32BIT
 .endif
+OPTIONS_SUB=	yes
+
 32BIT_DESC=	Enable debugging of 32-bit programs (requires lib32)
 MPI_DESC=	Enable build of MPI wrappers
 
-DOCS_BUILD_DEPENDS=    docbook-xsl>=0:textproc/docbook-xsl \
-                       xsltproc:textproc/libxslt
-MANPAGES_BUILD_DEPENDS=        docbook-xsl>=0:textproc/docbook-xsl \
-                       xsltproc:textproc/libxslt
+DOCS_BUILD_DEPENDS=	docbook-xsl>=0:textproc/docbook-xsl \
+			xsltproc:textproc/libxslt
+MANPAGES_BUILD_DEPENDS=	docbook-xsl>=0:textproc/docbook-xsl \
+			xsltproc:textproc/libxslt
 MPI_LIB_DEPENDS=	libmpich.so:net/mpich
 
-OPTIONS_SUB=	yes
-USES=		pathfix pkgconfig gmake perl5 shebangfix autoreconf
-USE_PERL5=	build
-GNU_CONFIGURE=	yes
-USE_LDCONFIG=	yes
-SHEBANG_FILES=	callgrind/callgrind_annotate.in callgrind/callgrind_control.in
-
-EXTRA_PATCHES=	\
-		${FILESDIR}/accept4_syscall.patch:-p1 \
-		${FILESDIR}/jail_syscalls.patch:-p1 \
-		${FILESDIR}/kldload_syscalls.patch:-p1 \
-		${FILESDIR}/missing_fcntls.patch:-p1
-
-PORTDOCS=	html
-
-WRKSRC=		${WRKDIR}/${BB_ACCOUNT}-${BB_PROJECT}-${BB_COMMIT}
-
-CONFIGURE_ENV+=	ac_cv_path_PERL=${PERL}
-
 .include <bsd.port.options.mk>
 
-.if ${OSVERSION} > 1200030
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-ino64:-p1
-.endif
-
 .if ${ARCH} == "amd64"
-PLIST_SUB+=	AMD64="" ARCH=amd64
+PLIST_SUB+=	AMD64=""
 . if !${PORT_OPTIONS:M32BIT}
 CONFIGURE_ARGS+=	--enable-only64bit
 PLIST_SUB+=	X86="@comment "
@@ -79,8 +68,8 @@ distribution or run 'make config' and uncheck 32BIT option
 PLIST_SUB+=	X86=""
 . endif
 .else
-PLIST_SUB+=	X86="" ARCH=x86
 PLIST_SUB+=	AMD64="@comment "
+PLIST_SUB+=	X86=""
 .endif
 
 .if !${PORT_OPTIONS:MDOCS}
diff --git a/devel/valgrind/distinfo b/devel/valgrind/distinfo
index d87dc04b6bc0..c7364c85ea6f 100644
--- a/devel/valgrind/distinfo
+++ b/devel/valgrind/distinfo
@@ -1,2 +1,3 @@
-SHA256 (valgrind-freebsd-3.10.1.20160113.tar.gz) = b580fcacf06befce33a4ba4badaa346b5e57c25774f62af38488dec6ad01eb8c
-SIZE (valgrind-freebsd-3.10.1.20160113.tar.gz) = 12084614
+TIMESTAMP = 1616493211
+SHA256 (paulfloyd-freebsd_valgrind-freebsd-3.17.0.g20210319-d333c54_GH0.tar.gz) = 2f631d7768fda08a62d6327cea0ea56062becad0083ba2751262215c2390387e
+SIZE (paulfloyd-freebsd_valgrind-freebsd-3.17.0.g20210319-d333c54_GH0.tar.gz) = 15796240
diff --git a/devel/valgrind/pkg-descr b/devel/valgrind/pkg-descr
index c86d78e045cc..8a88d8b1cf4e 100644
--- a/devel/valgrind/pkg-descr
+++ b/devel/valgrind/pkg-descr
@@ -4,12 +4,17 @@ and threading bugs, avoiding hours of frustrating bug-hunting, making your
 programs more stable. You can also perform detailed profiling, to speed up and
 reduce memory use of your programs.
 
-The Valgrind distribution includes five tools: two memory error detectors, a
-thread error detector, a cache profiler and a heap profiler. Several other
-tools have been built with Valgrind.
+The Valgrind distribution includes 10 tools:
+ - memcheck, the primary tool, a memory error detector
+ - helgrind and drd, thread error detectors
+ - callgrind and cachegrind, execution and cache profiling tools
+ - massif, a memory tracker
+ - dhat, a memory content profiler
+ - lackey, an example of using the framework
+ - none, does no instumentation and can check that Valgrind runs correctly
+ - exp-bbv, and experimental profiling tool using sampling
 
-Valgrind was initially ported to FreeBSD by
-Doug Rabson (http://www.rabson.org/).
+Valgrind was initially ported to FreeBSD by Doug Rabson.
 
-WWW: https://bitbucket.org/stass/valgrind-freebsd/overview
+WWW: https://github.com/paulfloyd/freebsd_valgrind
 WWW: http://www.valgrind.org/
diff --git a/devel/valgrind/pkg-plist b/devel/valgrind/pkg-plist
index 83ff888ec4bd..32014f5c9231 100644
--- a/devel/valgrind/pkg-plist
+++ b/devel/valgrind/pkg-plist
@@ -10,6 +10,7 @@ bin/valgrind-listener
 bin/vgdb
 include/valgrind/callgrind.h
 include/valgrind/config.h
+include/valgrind/dhat.h
 include/valgrind/drd.h
 include/valgrind/helgrind.h
 include/valgrind/libvex.h
@@ -25,6 +26,7 @@ include/valgrind/libvex_guest_ppc32.h
 include/valgrind/libvex_guest_ppc64.h
 include/valgrind/libvex_guest_s390x.h
 include/valgrind/libvex_guest_x86.h
+include/valgrind/libvex_inner.h
 include/valgrind/libvex_ir.h
 include/valgrind/libvex_s390x_common.h
 include/valgrind/libvex_trc_values.h
@@ -36,11 +38,12 @@ include/valgrind/pub_tool_basics.h
 include/valgrind/pub_tool_basics_asm.h
 include/valgrind/pub_tool_clientstate.h
 include/valgrind/pub_tool_clreq.h
-include/valgrind/pub_tool_deduppoolalloc.h
 include/valgrind/pub_tool_debuginfo.h
+include/valgrind/pub_tool_deduppoolalloc.h
 include/valgrind/pub_tool_errormgr.h
 include/valgrind/pub_tool_execontext.h
 include/valgrind/pub_tool_gdbserver.h
+include/valgrind/pub_tool_guest.h
 include/valgrind/pub_tool_hashtable.h
 include/valgrind/pub_tool_libcassert.h
 include/valgrind/pub_tool_libcbase.h
@@ -63,11 +66,14 @@ include/valgrind/pub_tool_sparsewa.h
 include/valgrind/pub_tool_stacktrace.h
 include/valgrind/pub_tool_threadstate.h
 include/valgrind/pub_tool_tooliface.h
+include/valgrind/pub_tool_transtab.h
 include/valgrind/pub_tool_vki.h
 include/valgrind/pub_tool_vkiscnums.h
 include/valgrind/pub_tool_vkiscnums_asm.h
 include/valgrind/pub_tool_wordfm.h
 include/valgrind/pub_tool_xarray.h
+include/valgrind/pub_tool_xtmemory.h
+include/valgrind/pub_tool_xtree.h
 include/valgrind/valgrind.h
 include/valgrind/vki/vki-amd64-freebsd.h
 include/valgrind/vki/vki-amd64-linux.h
@@ -75,14 +81,20 @@ include/valgrind/vki/vki-arm-linux.h
 include/valgrind/vki/vki-arm64-linux.h
 include/valgrind/vki/vki-darwin.h
 include/valgrind/vki/vki-freebsd.h
+include/valgrind/vki/vki-linux-drm.h
+include/valgrind/vki/vki-linux-io_uring.h
 include/valgrind/vki/vki-linux.h
 include/valgrind/vki/vki-machine-types-amd64-freebsd.h
 include/valgrind/vki/vki-machine-types-x86-freebsd.h
 include/valgrind/vki/vki-mips32-linux.h
+include/valgrind/vki/vki-mips64-linux.h
+include/valgrind/vki/vki-nanomips-linux.h
 include/valgrind/vki/vki-posixtypes-amd64-linux.h
 include/valgrind/vki/vki-posixtypes-arm-linux.h
 include/valgrind/vki/vki-posixtypes-arm64-linux.h
 include/valgrind/vki/vki-posixtypes-mips32-linux.h
+include/valgrind/vki/vki-posixtypes-mips64-linux.h
+include/valgrind/vki/vki-posixtypes-nanomips-linux.h
 include/valgrind/vki/vki-posixtypes-ppc32-linux.h
 include/valgrind/vki/vki-posixtypes-ppc64-linux.h
 include/valgrind/vki/vki-posixtypes-s390x-linux.h
@@ -90,181 +102,200 @@ include/valgrind/vki/vki-posixtypes-x86-linux.h
 include/valgrind/vki/vki-ppc32-linux.h
 include/valgrind/vki/vki-ppc64-linux.h
 include/valgrind/vki/vki-s390x-linux.h
+include/valgrind/vki/vki-scnums-32bit-linux.h
 include/valgrind/vki/vki-scnums-amd64-linux.h
 include/valgrind/vki/vki-scnums-arm-linux.h
 include/valgrind/vki/vki-scnums-arm64-linux.h
 include/valgrind/vki/vki-scnums-darwin.h
 include/valgrind/vki/vki-scnums-freebsd.h
 include/valgrind/vki/vki-scnums-mips32-linux.h
+include/valgrind/vki/vki-scnums-mips64-linux.h
+include/valgrind/vki/vki-scnums-nanomips-linux.h
 include/valgrind/vki/vki-scnums-ppc32-linux.h
 include/valgrind/vki/vki-scnums-ppc64-linux.h
 include/valgrind/vki/vki-scnums-s390x-linux.h
+include/valgrind/vki/vki-scnums-shared-linux.h
+include/valgrind/vki/vki-scnums-solaris.h
 include/valgrind/vki/vki-scnums-x86-linux.h
+include/valgrind/vki/vki-solaris-repcache.h
+include/valgrind/vki/vki-solaris.h
 include/valgrind/vki/vki-x86-freebsd.h
 include/valgrind/vki/vki-x86-linux.h
-include/valgrind/vki/vki-linux-drm.h
-include/valgrind/vki/vki-mips64-linux.h
-include/valgrind/vki/vki-posixtypes-mips64-linux.h
-include/valgrind/vki/vki-scnums-mips64-linux.h
 include/valgrind/vki/vki-xen-domctl.h
 include/valgrind/vki/vki-xen-evtchn.h
 include/valgrind/vki/vki-xen-gnttab.h
 include/valgrind/vki/vki-xen-hvm.h
 include/valgrind/vki/vki-xen-memory.h
 include/valgrind/vki/vki-xen-mmuext.h
+include/valgrind/vki/vki-xen-physdev.h
+include/valgrind/vki/vki-xen-schedop.h
 include/valgrind/vki/vki-xen-sysctl.h
 include/valgrind/vki/vki-xen-tmem.h
 include/valgrind/vki/vki-xen-version.h
 include/valgrind/vki/vki-xen-x86.h
+include/valgrind/vki/vki-xen-xsm.h
 include/valgrind/vki/vki-xen.h
-lib/valgrind/32bit-core-valgrind-s1.xml
-lib/valgrind/32bit-core-valgrind-s2.xml
-lib/valgrind/32bit-core.xml
-lib/valgrind/32bit-linux-valgrind-s1.xml
-lib/valgrind/32bit-linux-valgrind-s2.xml
-lib/valgrind/32bit-linux.xml
-lib/valgrind/32bit-sse-valgrind-s1.xml
-lib/valgrind/32bit-sse-valgrind-s2.xml
-lib/valgrind/32bit-sse.xml
-lib/valgrind/64bit-avx-valgrind-s1.xml
-lib/valgrind/64bit-avx-valgrind-s2.xml
-lib/valgrind/64bit-avx.xml
-lib/valgrind/64bit-core-valgrind-s1.xml
-lib/valgrind/64bit-core-valgrind-s2.xml
-lib/valgrind/64bit-core.xml
-lib/valgrind/64bit-linux-valgrind-s1.xml
-lib/valgrind/64bit-linux-valgrind-s2.xml
-lib/valgrind/64bit-linux.xml
-lib/valgrind/64bit-sse-valgrind-s1.xml
-lib/valgrind/64bit-sse-valgrind-s2.xml
-lib/valgrind/64bit-sse.xml
-lib/valgrind/amd64-avx-coresse-valgrind.xml
-lib/valgrind/amd64-avx-coresse.xml
-lib/valgrind/amd64-avx-linux-valgrind.xml
-lib/valgrind/amd64-avx-linux.xml
-lib/valgrind/amd64-coresse-valgrind.xml
-lib/valgrind/amd64-linux-valgrind.xml
-lib/valgrind/arm-core-valgrind-s1.xml
-lib/valgrind/arm-core-valgrind-s2.xml
-lib/valgrind/arm-core.xml
-lib/valgrind/arm-vfpv3-valgrind-s1.xml
-lib/valgrind/arm-vfpv3-valgrind-s2.xml
-lib/valgrind/arm-vfpv3.xml
-lib/valgrind/arm-with-vfpv3-valgrind.xml
-lib/valgrind/arm-with-vfpv3.xml
-lib/valgrind/mips-cp0-valgrind-s1.xml
-lib/valgrind/mips-cp0-valgrind-s2.xml
-lib/valgrind/mips-cp0.xml
-lib/valgrind/mips-cpu-valgrind-s1.xml
-lib/valgrind/mips-cpu-valgrind-s2.xml
-lib/valgrind/mips-cpu.xml
-lib/valgrind/mips-fpu-valgrind-s1.xml
-lib/valgrind/mips-fpu-valgrind-s2.xml
-lib/valgrind/mips-fpu.xml
-lib/valgrind/mips-linux-valgrind.xml
-lib/valgrind/mips-linux.xml
-lib/valgrind/mips64-cp0-valgrind-s1.xml
-lib/valgrind/mips64-cp0-valgrind-s2.xml
-lib/valgrind/mips64-cp0.xml
-lib/valgrind/mips64-cpu-valgrind-s1.xml
-lib/valgrind/mips64-cpu-valgrind-s2.xml
-lib/valgrind/mips64-cpu.xml
-lib/valgrind/mips64-fpu-valgrind-s1.xml
-lib/valgrind/mips64-fpu-valgrind-s2.xml
-lib/valgrind/mips64-fpu.xml
-lib/valgrind/mips64-linux-valgrind.xml
-lib/valgrind/mips64-linux.xml
-lib/valgrind/power-core-valgrind-s1.xml
-lib/valgrind/power-core-valgrind-s2.xml
-lib/valgrind/s390-acr-valgrind-s1.xml
-lib/valgrind/s390-acr-valgrind-s2.xml
-lib/valgrind/s390-acr.xml
-lib/valgrind/s390-fpr-valgrind-s1.xml
-lib/valgrind/s390-fpr-valgrind-s2.xml
-lib/valgrind/s390-fpr.xml
-lib/valgrind/s390x-core64-valgrind-s1.xml
-lib/valgrind/s390x-core64-valgrind-s2.xml
-lib/valgrind/s390x-core64.xml
-lib/valgrind/s390x-generic-valgrind.xml
-lib/valgrind/s390x-generic.xml
-lib/valgrind/s390x-linux64-valgrind-s1.xml
-lib/valgrind/s390x-linux64-valgrind-s2.xml
-lib/valgrind/s390x-linux64.xml
-%%AMD64%%lib/valgrind/cachegrind-amd64-freebsd
-%%X86%%lib/valgrind/cachegrind-x86-freebsd
-%%AMD64%%lib/valgrind/callgrind-amd64-freebsd
-%%X86%%lib/valgrind/callgrind-x86-freebsd
-lib/valgrind/default.supp
-%%AMD64%%lib/valgrind/drd-amd64-freebsd
-%%X86%%lib/valgrind/drd-x86-freebsd
-%%AMD64%%lib/valgrind/exp-bbv-amd64-freebsd
-%%X86%%lib/valgrind/exp-bbv-x86-freebsd
-%%AMD64%%lib/valgrind/exp-dhat-amd64-freebsd
-%%X86%%lib/valgrind/exp-dhat-x86-freebsd
-%%AMD64%%lib/valgrind/exp-sgcheck-amd64-freebsd
-%%X86%%lib/valgrind/exp-sgcheck-x86-freebsd
-%%AMD64%%lib/valgrind/helgrind-amd64-freebsd
-%%X86%%lib/valgrind/helgrind-x86-freebsd
-lib/valgrind/i386-coresse-valgrind.xml
-lib/valgrind/i386-linux-valgrind.xml
-%%X86%%lib/valgrind/getoff-x86-freebsd
-%%AMD64%%lib/valgrind/getoff-amd64-freebsd
-%%AMD64%%lib/valgrind/lackey-amd64-freebsd
-%%X86%%lib/valgrind/lackey-x86-freebsd
+libexec/valgrind/32bit-core-valgrind-s1.xml
+libexec/valgrind/32bit-core-valgrind-s2.xml
+libexec/valgrind/32bit-core.xml
+libexec/valgrind/32bit-linux-valgrind-s1.xml
+libexec/valgrind/32bit-linux-valgrind-s2.xml
+libexec/valgrind/32bit-linux.xml
+libexec/valgrind/32bit-sse-valgrind-s1.xml
+libexec/valgrind/32bit-sse-valgrind-s2.xml
+libexec/valgrind/32bit-sse.xml
+libexec/valgrind/64bit-avx-valgrind-s1.xml
+libexec/valgrind/64bit-avx-valgrind-s2.xml
+libexec/valgrind/64bit-avx.xml
+libexec/valgrind/64bit-core-valgrind-s1.xml
+libexec/valgrind/64bit-core-valgrind-s2.xml
+libexec/valgrind/64bit-core.xml
+libexec/valgrind/64bit-linux-valgrind-s1.xml
+libexec/valgrind/64bit-linux-valgrind-s2.xml
+libexec/valgrind/64bit-linux.xml
+libexec/valgrind/64bit-sse-valgrind-s1.xml
+libexec/valgrind/64bit-sse-valgrind-s2.xml
+libexec/valgrind/64bit-sse.xml
+libexec/valgrind/amd64-avx-coresse-valgrind.xml
+libexec/valgrind/amd64-avx-coresse.xml
+libexec/valgrind/amd64-avx-linux-valgrind.xml
+libexec/valgrind/amd64-avx-linux.xml
+libexec/valgrind/amd64-coresse-valgrind.xml
+libexec/valgrind/amd64-linux-valgrind.xml
+libexec/valgrind/arm-core-valgrind-s1.xml
+libexec/valgrind/arm-core-valgrind-s2.xml
+libexec/valgrind/arm-core.xml
+libexec/valgrind/arm-vfpv3-valgrind-s1.xml
+libexec/valgrind/arm-vfpv3-valgrind-s2.xml
+libexec/valgrind/arm-vfpv3.xml
+libexec/valgrind/arm-with-vfpv3-valgrind.xml
+libexec/valgrind/arm-with-vfpv3.xml
+%%AMD64%%libexec/valgrind/cachegrind-amd64-freebsd
+%%X86%%libexec/valgrind/cachegrind-x86-freebsd
+%%AMD64%%libexec/valgrind/callgrind-amd64-freebsd
+%%X86%%libexec/valgrind/callgrind-x86-freebsd
+libexec/valgrind/default.supp
+%%AMD64%%libexec/valgrind/dhat-amd64-freebsd
+%%X86%%libexec/valgrind/dhat-x86-freebsd
+%%AMD64%%libexec/valgrind/drd-amd64-freebsd
+%%X86%%libexec/valgrind/drd-x86-freebsd
+%%AMD64%%libexec/valgrind/exp-bbv-amd64-freebsd
+%%X86%%libexec/valgrind/exp-bbv-x86-freebsd
+%%AMD64%%libexec/valgrind/getoff-amd64-freebsd
+%%X86%%libexec/valgrind/getoff-x86-freebsd
+%%AMD64%%libexec/valgrind/helgrind-amd64-freebsd
+%%X86%%libexec/valgrind/helgrind-x86-freebsd
+libexec/valgrind/i386-coresse-valgrind.xml
+libexec/valgrind/i386-linux-valgrind.xml
+%%AMD64%%libexec/valgrind/lackey-amd64-freebsd
+%%X86%%libexec/valgrind/lackey-x86-freebsd
 %%AMD64%%lib/valgrind/libcoregrind-amd64-freebsd.a
 %%X86%%lib/valgrind/libcoregrind-x86-freebsd.a
+%%AMD64%%lib/valgrind/libgcc-sup-amd64-freebsd.a
+%%X86%%lib/valgrind/libgcc-sup-x86-freebsd.a
 %%AMD64%%lib/valgrind/libreplacemalloc_toolpreload-amd64-freebsd.a
 %%X86%%lib/valgrind/libreplacemalloc_toolpreload-x86-freebsd.a
 %%AMD64%%lib/valgrind/libvex-amd64-freebsd.a
 %%X86%%lib/valgrind/libvex-x86-freebsd.a
-%%AMD64%%lib/valgrind/massif-amd64-freebsd
-%%X86%%lib/valgrind/massif-x86-freebsd
-%%AMD64%%lib/valgrind/memcheck-amd64-freebsd
-%%X86%%lib/valgrind/memcheck-x86-freebsd
-%%AMD64%%lib/valgrind/none-amd64-freebsd
-%%X86%%lib/valgrind/none-x86-freebsd
-lib/valgrind/power-altivec-valgrind-s1.xml
-lib/valgrind/power-altivec-valgrind-s2.xml
-lib/valgrind/power-altivec.xml
-lib/valgrind/power-core.xml
-lib/valgrind/power-fpu-valgrind-s1.xml
-lib/valgrind/power-fpu-valgrind-s2.xml
-lib/valgrind/power-fpu.xml
-lib/valgrind/power-linux-valgrind-s1.xml
-lib/valgrind/power-linux-valgrind-s2.xml
-lib/valgrind/power-linux.xml
-lib/valgrind/power64-core-valgrind-s1.xml
-lib/valgrind/power64-core-valgrind-s2.xml
-lib/valgrind/power64-core.xml
-lib/valgrind/power64-linux-valgrind-s1.xml
-lib/valgrind/power64-linux-valgrind-s2.xml
-lib/valgrind/power64-linux.xml
-lib/valgrind/powerpc-altivec32l-valgrind.xml
-lib/valgrind/powerpc-altivec32l.xml
-lib/valgrind/powerpc-altivec64l-valgrind.xml
-lib/valgrind/powerpc-altivec64l.xml
-%%AMD64%%lib/valgrind/vgpreload_core-amd64-freebsd.so
-%%X86%%lib/valgrind/vgpreload_core-x86-freebsd.so
-%%AMD64%%lib/valgrind/vgpreload_drd-amd64-freebsd.so
-%%X86%%lib/valgrind/vgpreload_drd-x86-freebsd.so
-%%AMD64%%lib/valgrind/vgpreload_exp-dhat-amd64-freebsd.so
-%%X86%%lib/valgrind/vgpreload_exp-dhat-x86-freebsd.so
-%%AMD64%%lib/valgrind/vgpreload_exp-sgcheck-amd64-freebsd.so
-%%X86%%lib/valgrind/vgpreload_exp-sgcheck-x86-freebsd.so
-%%AMD64%%lib/valgrind/vgpreload_helgrind-amd64-freebsd.so
-%%X86%%lib/valgrind/vgpreload_helgrind-x86-freebsd.so
-%%AMD64%%lib/valgrind/vgpreload_massif-amd64-freebsd.so
-%%X86%%lib/valgrind/vgpreload_massif-x86-freebsd.so
-%%AMD64%%lib/valgrind/vgpreload_memcheck-amd64-freebsd.so
-%%X86%%lib/valgrind/vgpreload_memcheck-x86-freebsd.so
-%%MPI%%lib/valgrind/libmpiwrap-%%ARCH%%-freebsd.so
+%%AMD64%%lib/valgrind/libvexmultiarch-amd64-freebsd.a
+%%X86%%lib/valgrind/libvexmultiarch-x86-freebsd.a
+%%AMD64%%libexec/valgrind/massif-amd64-freebsd
+%%X86%%libexec/valgrind/massif-x86-freebsd
+%%AMD64%%libexec/valgrind/memcheck-amd64-freebsd
+%%X86%%libexec/valgrind/memcheck-x86-freebsd
+libexec/valgrind/mips-cp0-valgrind-s1.xml
+libexec/valgrind/mips-cp0-valgrind-s2.xml
+libexec/valgrind/mips-cp0.xml
+libexec/valgrind/mips-cpu-valgrind-s1.xml
+libexec/valgrind/mips-cpu-valgrind-s2.xml
+libexec/valgrind/mips-cpu.xml
+libexec/valgrind/mips-fpu-valgrind-s1.xml
+libexec/valgrind/mips-fpu-valgrind-s2.xml
+libexec/valgrind/mips-fpu.xml
+libexec/valgrind/mips-linux-valgrind.xml
+libexec/valgrind/mips-linux.xml
+libexec/valgrind/mips64-cp0-valgrind-s1.xml
+libexec/valgrind/mips64-cp0-valgrind-s2.xml
+libexec/valgrind/mips64-cp0.xml
+libexec/valgrind/mips64-cpu-valgrind-s1.xml
+libexec/valgrind/mips64-cpu-valgrind-s2.xml
+libexec/valgrind/mips64-cpu.xml
+libexec/valgrind/mips64-fpu-valgrind-s1.xml
+libexec/valgrind/mips64-fpu-valgrind-s2.xml
+libexec/valgrind/mips64-fpu.xml
+libexec/valgrind/mips64-linux-valgrind.xml
+libexec/valgrind/mips64-linux.xml
+%%AMD64%%libexec/valgrind/none-amd64-freebsd
+%%X86%%libexec/valgrind/none-x86-freebsd
+libexec/valgrind/power-altivec-valgrind-s1.xml
+libexec/valgrind/power-altivec-valgrind-s2.xml
+libexec/valgrind/power-altivec.xml
+libexec/valgrind/power-core-valgrind-s1.xml
+libexec/valgrind/power-core-valgrind-s2.xml
+libexec/valgrind/power-core.xml
+libexec/valgrind/power-fpu-valgrind-s1.xml
+libexec/valgrind/power-fpu-valgrind-s2.xml
+libexec/valgrind/power-fpu.xml
+libexec/valgrind/power-linux-valgrind-s1.xml
+libexec/valgrind/power-linux-valgrind-s2.xml
+libexec/valgrind/power-linux.xml
+libexec/valgrind/power-vsx-valgrind-s1.xml
+libexec/valgrind/power-vsx-valgrind-s2.xml
+libexec/valgrind/power-vsx.xml
+libexec/valgrind/power64-core-valgrind-s1.xml
+libexec/valgrind/power64-core-valgrind-s2.xml
+libexec/valgrind/power64-core.xml
+libexec/valgrind/power64-core2-valgrind-s1.xml
+libexec/valgrind/power64-core2-valgrind-s2.xml
+libexec/valgrind/power64-linux-valgrind-s1.xml
+libexec/valgrind/power64-linux-valgrind-s2.xml
+libexec/valgrind/power64-linux.xml
+libexec/valgrind/powerpc-altivec32l-valgrind.xml
+libexec/valgrind/powerpc-altivec32l.xml
+libexec/valgrind/powerpc-altivec64l-valgrind.xml
+libexec/valgrind/powerpc-altivec64l.xml
+libexec/valgrind/s390-acr-valgrind-s1.xml
+libexec/valgrind/s390-acr-valgrind-s2.xml
+libexec/valgrind/s390-acr.xml
+libexec/valgrind/s390-fpr-valgrind-s1.xml
+libexec/valgrind/s390-fpr-valgrind-s2.xml
+libexec/valgrind/s390-fpr.xml
+libexec/valgrind/s390-vx-valgrind-s1.xml
+libexec/valgrind/s390-vx-valgrind-s2.xml
+libexec/valgrind/s390-vx.xml
+libexec/valgrind/s390x-core64-valgrind-s1.xml
+libexec/valgrind/s390x-core64-valgrind-s2.xml
+libexec/valgrind/s390x-core64.xml
+libexec/valgrind/s390x-generic-valgrind.xml
+libexec/valgrind/s390x-generic.xml
+libexec/valgrind/s390x-linux64-valgrind-s1.xml
+libexec/valgrind/s390x-linux64-valgrind-s2.xml
+libexec/valgrind/s390x-linux64.xml
+libexec/valgrind/s390x-vx-linux-valgrind.xml
+libexec/valgrind/s390x-vx-linux.xml
+%%AMD64%%libexec/valgrind/vgpreload_core-amd64-freebsd.so
+%%X86%%libexec/valgrind/vgpreload_core-x86-freebsd.so
+%%AMD64%%libexec/valgrind/vgpreload_dhat-amd64-freebsd.so
+%%X86%%libexec/valgrind/vgpreload_dhat-x86-freebsd.so
+%%AMD64%%libexec/valgrind/vgpreload_drd-amd64-freebsd.so
+%%X86%%libexec/valgrind/vgpreload_drd-x86-freebsd.so
+%%AMD64%%libexec/valgrind/vgpreload_helgrind-amd64-freebsd.so
+%%X86%%libexec/valgrind/vgpreload_helgrind-x86-freebsd.so
+%%AMD64%%libexec/valgrind/vgpreload_massif-amd64-freebsd.so
+%%X86%%libexec/valgrind/vgpreload_massif-x86-freebsd.so
+%%AMD64%%libexec/valgrind/vgpreload_memcheck-amd64-freebsd.so
+%%X86%%libexec/valgrind/vgpreload_memcheck-x86-freebsd.so
 libdata/pkgconfig/valgrind.pc
+libexec/valgrind/dh_view.css
+libexec/valgrind/dh_view.html
+libexec/valgrind/dh_view.js
 %%MANPAGES%%man/man1/callgrind_annotate.1.gz
 %%MANPAGES%%man/man1/callgrind_control.1.gz
 %%MANPAGES%%man/man1/cg_annotate.1.gz
 %%MANPAGES%%man/man1/cg_diff.1.gz
 %%MANPAGES%%man/man1/cg_merge.1.gz
 %%MANPAGES%%man/man1/ms_print.1.gz
+%%MANPAGES%%man/man1/valgrind-di-server.1.gz
 %%MANPAGES%%man/man1/valgrind-listener.1.gz
 %%MANPAGES%%man/man1/valgrind.1.gz
 %%MANPAGES%%man/man1/vgdb.1.gz