svn commit: r568606 - head/devel/valgrind-devel

Yuri Victorovich yuri at FreeBSD.org
Tue Mar 16 19:46:58 UTC 2021 

Author: yuri
Date: Tue Mar 16 19:46:57 2021
New Revision: 568606
URL: https://svnweb.freebsd.org/changeset/ports/568606

Log:
  devel/valgrind-devel: Fix duplicate file listing on i386
  
  PR:		254342
  Submitted by:	pjfloyd at wanadoo.fr (maintainer)
  Reported by:	dim

Modified:
  head/devel/valgrind-devel/Makefile
  head/devel/valgrind-devel/pkg-plist

Modified: head/devel/valgrind-devel/Makefile
==============================================================================
--- head/devel/valgrind-devel/Makefile	Tue Mar 16 19:26:03 2021	(r568605)
+++ head/devel/valgrind-devel/Makefile	Tue Mar 16 19:46:57 2021	(r568606)
@@ -57,7 +57,7 @@ MPI_LIB_DEPENDS=	libmpich.so:net/mpich
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == "amd64"
-PLIST_SUB+=	AMD64="" ARCH=amd64
+PLIST_SUB+=	AMD64=""
 . if !${PORT_OPTIONS:M32BIT}
 CONFIGURE_ARGS+=	--enable-only64bit
 PLIST_SUB+=	X86="@comment "
@@ -69,8 +69,8 @@ distribution or run 'make config' and uncheck 32BIT op
 PLIST_SUB+=	X86=""
 . endif
 .else
-PLIST_SUB+=	X86="" ARCH=x86
 PLIST_SUB+=	AMD64="@comment "
+PLIST_SUB+=	X86=""
 .endif
 
 .if !${PORT_OPTIONS:MDOCS}

Modified: head/devel/valgrind-devel/pkg-plist
==============================================================================
--- head/devel/valgrind-devel/pkg-plist	Tue Mar 16 19:26:03 2021	(r568605)
+++ head/devel/valgrind-devel/pkg-plist	Tue Mar 16 19:46:57 2021	(r568606)
@@ -16,7 +16,7 @@ include/valgrind/helgrind.h
 include/valgrind/libvex.h
 include/valgrind/libvex_basictypes.h
 include/valgrind/libvex_emnote.h
-include/valgrind/libvex_guest_%%ARCH%%.h
+%%AMD64%%include/valgrind/libvex_guest_amd64.h
 include/valgrind/libvex_guest_arm.h
 include/valgrind/libvex_guest_arm64.h
 include/valgrind/libvex_guest_mips32.h
@@ -25,7 +25,7 @@ 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
+%%X86%%include/valgrind/libvex_guest_x86.h
 include/valgrind/libvex_inner.h
 include/valgrind/libvex_ir.h
 include/valgrind/libvex_s390x_common.h
@@ -75,8 +75,8 @@ 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-%%ARCH%%-freebsd.h
-include/valgrind/vki/vki-%%ARCH%%-linux.h
+%%AMD64%%include/valgrind/vki/vki-amd64-freebsd.h
+%%AMD64%%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
@@ -84,12 +84,12 @@ 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-%%ARCH%%-freebsd.h
-include/valgrind/vki/vki-machine-types-x86-freebsd.h
+%%AMD64%%include/valgrind/vki/vki-machine-types-amd64-freebsd.h
+%%X86%%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-%%ARCH%%-linux.h
+%%AMD64%%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
@@ -98,12 +98,12 @@ 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
+%%X86%%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-%%ARCH%%-linux.h
+%%AMD64%%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
@@ -116,11 +116,11 @@ 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
+%%X86%%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
+%%X86%%include/valgrind/vki/vki-x86-freebsd.h
+%%X86%%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
@@ -156,12 +156,12 @@ 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/%%ARCH%%-avx-coresse-valgrind.xml
-lib/valgrind/%%ARCH%%-avx-coresse.xml
-lib/valgrind/%%ARCH%%-avx-linux-valgrind.xml
-lib/valgrind/%%ARCH%%-avx-linux.xml
-lib/valgrind/%%ARCH%%-coresse-valgrind.xml
-lib/valgrind/%%ARCH%%-linux-valgrind.xml
+%%AMD64%%lib/valgrind/amd64-avx-coresse-valgrind.xml
+%%AMD64%%lib/valgrind/amd64-avx-coresse.xml
+%%AMD64%%lib/valgrind/amd64-avx-linux-valgrind.xml
+%%AMD64%%lib/valgrind/amd64-avx-linux.xml
+%%AMD64%%lib/valgrind/amd64-coresse-valgrind.xml
+%%AMD64%%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
@@ -170,39 +170,39 @@ 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/cachegrind-%%ARCH%%-freebsd
-lib/valgrind/cachegrind-x86-freebsd
-lib/valgrind/callgrind-%%ARCH%%-freebsd
-lib/valgrind/callgrind-x86-freebsd
+%%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
-lib/valgrind/dhat-%%ARCH%%-freebsd
-lib/valgrind/dhat-x86-freebsd
-lib/valgrind/drd-%%ARCH%%-freebsd
-lib/valgrind/drd-x86-freebsd
-lib/valgrind/exp-bbv-%%ARCH%%-freebsd
-lib/valgrind/exp-bbv-x86-freebsd
-lib/valgrind/getoff-%%ARCH%%-freebsd
-lib/valgrind/getoff-x86-freebsd
-lib/valgrind/helgrind-%%ARCH%%-freebsd
-lib/valgrind/helgrind-x86-freebsd
+%%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
-lib/valgrind/lackey-%%ARCH%%-freebsd
-lib/valgrind/lackey-x86-freebsd
-lib/valgrind/libcoregrind-%%ARCH%%-freebsd.a
-lib/valgrind/libcoregrind-x86-freebsd.a
-lib/valgrind/libgcc-sup-%%ARCH%%-freebsd.a
-lib/valgrind/libgcc-sup-x86-freebsd.a
-lib/valgrind/libreplacemalloc_toolpreload-%%ARCH%%-freebsd.a
-lib/valgrind/libreplacemalloc_toolpreload-x86-freebsd.a
-lib/valgrind/libvex-%%ARCH%%-freebsd.a
-lib/valgrind/libvex-x86-freebsd.a
-lib/valgrind/libvexmultiarch-%%ARCH%%-freebsd.a
-lib/valgrind/libvexmultiarch-x86-freebsd.a
-lib/valgrind/massif-%%ARCH%%-freebsd
-lib/valgrind/massif-x86-freebsd
-lib/valgrind/memcheck-%%ARCH%%-freebsd
-lib/valgrind/memcheck-x86-freebsd
+%%AMD64%%lib/valgrind/lackey-amd64-freebsd
+%%X86%%lib/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/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
@@ -225,8 +225,8 @@ 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/none-%%ARCH%%-freebsd
-lib/valgrind/none-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
@@ -273,18 +273,18 @@ 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
-lib/valgrind/vgpreload_core-%%ARCH%%-freebsd.so
-lib/valgrind/vgpreload_core-x86-freebsd.so
-lib/valgrind/vgpreload_dhat-%%ARCH%%-freebsd.so
-lib/valgrind/vgpreload_dhat-x86-freebsd.so
-lib/valgrind/vgpreload_drd-%%ARCH%%-freebsd.so
-lib/valgrind/vgpreload_drd-x86-freebsd.so
-lib/valgrind/vgpreload_helgrind-%%ARCH%%-freebsd.so
-lib/valgrind/vgpreload_helgrind-x86-freebsd.so
-lib/valgrind/vgpreload_massif-%%ARCH%%-freebsd.so
-lib/valgrind/vgpreload_massif-x86-freebsd.so
-lib/valgrind/vgpreload_memcheck-%%ARCH%%-freebsd.so
-lib/valgrind/vgpreload_memcheck-x86-freebsd.so
+%%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
 libdata/pkgconfig/valgrind.pc
 libexec/valgrind/dh_view.css
 libexec/valgrind/dh_view.html

More information about the svn-ports-all mailing list