Index: devel/valgrind-devel/Makefile
===================================================================
--- devel/valgrind-devel/Makefile	(revision 569015)
+++ devel/valgrind-devel/Makefile	(working copy)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	valgrind
-PORTVERSION=	3.17.0.g20210219
+PORTVERSION=	3.18.0.g20210323
 DISTVERSIONPREFIX=	freebsd-
 #PORTREVISION=	0
 PORTEPOCH=	1
@@ -31,7 +31,7 @@
 USE_GITHUB=	yes
 GH_ACCOUNT=	paulfloyd
 GH_PROJECT=	freebsd_valgrind
-GH_TAGNAME=	e1df1e6
+GH_TAGNAME=	bd87bbc
 
 CONFIGURE_ENV+=	ac_cv_path_PERL=${PERL}
 
Index: devel/valgrind-devel/distinfo
===================================================================
--- devel/valgrind-devel/distinfo	(revision 569015)
+++ devel/valgrind-devel/distinfo	(working copy)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1613742728
-SHA256 (paulfloyd-freebsd_valgrind-freebsd-3.17.0.g20210219-e1df1e6_GH0.tar.gz) = 5dc7957f9f8bd3877a387c41884dbc36e0d9e6864d12b4e8243253c7f92c04ca
-SIZE (paulfloyd-freebsd_valgrind-freebsd-3.17.0.g20210219-e1df1e6_GH0.tar.gz) = 15775887
+TIMESTAMP = 1616492557
+SHA256 (paulfloyd-freebsd_valgrind-freebsd-3.18.0.g20210323-bd87bbc_GH0.tar.gz) = d426b56b534ddcfd9880644e51bb389ebace52915873cb9fda35789be4c7ecc0
+SIZE (paulfloyd-freebsd_valgrind-freebsd-3.18.0.g20210323-bd87bbc_GH0.tar.gz) = 15797700
Index: devel/valgrind-devel/pkg-plist
===================================================================
--- devel/valgrind-devel/pkg-plist	(revision 569015)
+++ devel/valgrind-devel/pkg-plist	(working copy)
@@ -135,60 +135,60 @@
 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
-%%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/dhat-amd64-freebsd
-%%X86%%lib/valgrind/dhat-x86-freebsd
-%%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/getoff-amd64-freebsd
-%%X86%%lib/valgrind/getoff-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
-%%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
@@ -199,92 +199,92 @@
 %%X86%%lib/valgrind/libvex-x86-freebsd.a
 %%AMD64%%lib/valgrind/libvexmultiarch-amd64-freebsd.a
 %%X86%%lib/valgrind/libvexmultiarch-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
-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
-%%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-valgrind-s1.xml
-lib/valgrind/power-core-valgrind-s2.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/power-vsx-valgrind-s1.xml
-lib/valgrind/power-vsx-valgrind-s2.xml
-lib/valgrind/power-vsx.xml
-lib/valgrind/power64-core-valgrind-s1.xml
-lib/valgrind/power64-core-valgrind-s2.xml
-lib/valgrind/power64-core.xml
-lib/valgrind/power64-core2-valgrind-s1.xml
-lib/valgrind/power64-core2-valgrind-s2.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
-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/s390-vx-valgrind-s1.xml
-lib/valgrind/s390-vx-valgrind-s2.xml
-lib/valgrind/s390-vx.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
-lib/valgrind/s390x-vx-linux-valgrind.xml
-lib/valgrind/s390x-vx-linux.xml
-%%AMD64%%lib/valgrind/vgpreload_core-amd64-freebsd.so
-%%X86%%lib/valgrind/vgpreload_core-x86-freebsd.so
-%%AMD64%%lib/valgrind/vgpreload_dhat-amd64-freebsd.so
-%%X86%%lib/valgrind/vgpreload_dhat-x86-freebsd.so
-%%AMD64%%lib/valgrind/vgpreload_drd-amd64-freebsd.so
-%%X86%%lib/valgrind/vgpreload_drd-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
+%%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