diff --git a/devel/valgrind/Makefile b/devel/valgrind/Makefile index 33f46d7e86d7..4698238c73ef 100644 --- a/devel/valgrind/Makefile +++ b/devel/valgrind/Makefile @@ -1,85 +1,84 @@ PORTNAME= valgrind -PORTVERSION= 3.21.0 -PORTREVISION= 2 +PORTVERSION= 3.22.0 PORTEPOCH= 1 CATEGORIES= devel MASTER_SITES= SOURCEWARE/valgrind MAINTAINER= pjfloyd@wanadoo.fr COMMENT= Memory debugging and profiling tool WWW= https://www.valgrind.org/ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING ONLY_FOR_ARCHS= amd64 i386 USES= autoreconf cpe gmake pathfix perl5 pkgconfig shebangfix \ python:3.9+,run tar:bz2 USE_PERL5= build SHEBANG_FILES= callgrind/callgrind_annotate.in callgrind/callgrind_control.in \ cachegrind/cg_merge.in cachegrind/cg_diff.in \ cachegrind/cg_annotate.in GNU_CONFIGURE= yes CONFIGURE_ENV+= ac_cv_path_PERL=${PERL} SSP_UNSAFE= yes LIB32_PATH?= /usr/lib32/libc.so CONFLICTS= valgrind-devel # Valgrind needs to read debuginfo from its own preload shared libraries # (quote from README_PACKAGERS #-- Don't strip the debug info off lib/valgrind/$platform/vgpreload*.so # in the installation tree. Either Valgrind won't work at all, or it # will still work if you do, but will generate less helpful error # messages.) STRIP= # empty PORTDOCS= html OPTIONS_DEFINE= DOCS MANPAGES MPI OPTIONS_DEFINE_amd64= 32BIT 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 MPI_LIB_DEPENDS= libmpich.so:net/mpich .include .if ${ARCH} == "amd64" PLIST_SUB+= AMD64="" . if !${PORT_OPTIONS:M32BIT} CONFIGURE_ARGS+= --enable-only64bit PLIST_SUB+= X86="@comment " . else . if !exists(${LIB32_PATH}) IGNORE= please either install the lib32 distribution or unset the 32BIT option . endif PLIST_SUB+= X86="" . endif .else PLIST_SUB+= AMD64="@comment " \ X86="" .endif post-patch-DOCS-off: @${RM} -r ${WRKSRC}/docs/html post-build-DOCS-on: cd ${WRKSRC}/docs && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} html-docs post-build-MANPAGES-on: cd ${WRKSRC}/docs && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} man-pages .include 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 @@ -1,305 +1,306 @@ bin/callgrind_annotate bin/callgrind_control bin/cg_annotate bin/cg_diff bin/cg_merge bin/ms_print 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 include/valgrind/drd.h include/valgrind/helgrind.h include/valgrind/libvex.h include/valgrind/libvex_basictypes.h include/valgrind/libvex_emnote.h include/valgrind/libvex_guest_amd64.h include/valgrind/libvex_guest_arm.h include/valgrind/libvex_guest_arm64.h include/valgrind/libvex_guest_mips32.h include/valgrind/libvex_guest_mips64.h include/valgrind/libvex_guest_offsets.h 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 include/valgrind/memcheck.h include/valgrind/pub_tool_addrinfo.h include/valgrind/pub_tool_aspacehl.h include/valgrind/pub_tool_aspacemgr.h 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_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 include/valgrind/pub_tool_libcfile.h include/valgrind/pub_tool_libcprint.h include/valgrind/pub_tool_libcproc.h include/valgrind/pub_tool_libcsetjmp.h include/valgrind/pub_tool_libcsignal.h include/valgrind/pub_tool_machine.h include/valgrind/pub_tool_mallocfree.h include/valgrind/pub_tool_options.h include/valgrind/pub_tool_oset.h include/valgrind/pub_tool_poolalloc.h include/valgrind/pub_tool_rangemap.h include/valgrind/pub_tool_redir.h include/valgrind/pub_tool_replacemalloc.h include/valgrind/pub_tool_seqmatch.h include/valgrind/pub_tool_signals.h 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 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 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-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 %%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/libvexmultiarch-amd64-freebsd.a %%X86%%lib/valgrind/libvexmultiarch-x86-freebsd.a libdata/pkgconfig/valgrind.pc 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 libexec/valgrind/dh_view.css libexec/valgrind/dh_view.html libexec/valgrind/dh_view.js %%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%%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 libexec/valgrind/valgrind-monitor-def.py libexec/valgrind/valgrind-monitor.py %%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 %%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 %%PORTDOCS%%%%DOCSDIR%%/valgrind_manual.pdf %%PORTDOCS%%%%DOCSDIR%%/valgrind_manual.ps