2 files changed, 27 insertions, 19 deletions

diff --git a/devel/valgrind/Makefile b/devel/valgrind/Makefile
index b976b3bb4be0..d76cf3099917 100644
--- a/devel/valgrind/Makefile
+++ b/devel/valgrind/Makefile
@@ -37,7 +37,15 @@ IGNORE=	your FreeBSD version is not supported
 
 .if ${ARCH} == "amd64"
 PLIST_SUB+=	AMD64=""
+. if !exists(/usr/lib32)
+CONFIGURE_ARGS+=	--enable-only64bit
+PLIST_SUB+=	X86="@comment "
+. else
+PLIST_SUB+=	X86=""
+. else
+. endif
 .else
+PLIST_SUB+=	X86=""
 PLIST_SUB+=	AMD64="@comment "
 .endif
 
diff --git a/devel/valgrind/pkg-plist b/devel/valgrind/pkg-plist
index 5fc0128cb4e2..8e37c3738869 100644
--- a/devel/valgrind/pkg-plist
+++ b/devel/valgrind/pkg-plist
@@ -77,44 +77,44 @@ include/valgrind/vki/vki-x86-freebsd.h
 include/valgrind/vki/vki-x86-linux.h
 libdata/pkgconfig/valgrind.pc
 %%AMD64%%lib/valgrind/cachegrind-amd64-freebsd
-lib/valgrind/cachegrind-x86-freebsd
+%%X86%%lib/valgrind/cachegrind-x86-freebsd
 %%AMD64%%lib/valgrind/callgrind-amd64-freebsd
-lib/valgrind/callgrind-x86-freebsd
+%%X86%%lib/valgrind/callgrind-x86-freebsd
 lib/valgrind/default.supp
 %%AMD64%%lib/valgrind/drd-amd64-freebsd
-lib/valgrind/drd-x86-freebsd
+%%X86%%lib/valgrind/drd-x86-freebsd
 %%AMD64%%lib/valgrind/exp-bbv-amd64-freebsd
-lib/valgrind/exp-bbv-x86-freebsd
+%%X86%%lib/valgrind/exp-bbv-x86-freebsd
 %%AMD64%%lib/valgrind/exp-ptrcheck-amd64-freebsd
-lib/valgrind/exp-ptrcheck-x86-freebsd
+%%X86%%lib/valgrind/exp-ptrcheck-x86-freebsd
 %%AMD64%%lib/valgrind/helgrind-amd64-freebsd
-lib/valgrind/helgrind-x86-freebsd
+%%X86%%lib/valgrind/helgrind-x86-freebsd
 %%AMD64%%lib/valgrind/lackey-amd64-freebsd
-lib/valgrind/lackey-x86-freebsd
+%%X86%%lib/valgrind/lackey-x86-freebsd
 %%AMD64%%lib/valgrind/libcoregrind-amd64-freebsd.a
-lib/valgrind/libcoregrind-x86-freebsd.a
+%%X86%%lib/valgrind/libcoregrind-x86-freebsd.a
 %%AMD64%%lib/valgrind/libreplacemalloc_toolpreload-amd64-freebsd.a
-lib/valgrind/libreplacemalloc_toolpreload-x86-freebsd.a
+%%X86%%lib/valgrind/libreplacemalloc_toolpreload-x86-freebsd.a
 %%AMD64%%lib/valgrind/libvex-amd64-freebsd.a
-lib/valgrind/libvex-x86-freebsd.a
+%%X86%%lib/valgrind/libvex-x86-freebsd.a
 %%AMD64%%lib/valgrind/massif-amd64-freebsd
-lib/valgrind/massif-x86-freebsd
+%%X86%%lib/valgrind/massif-x86-freebsd
 %%AMD64%%lib/valgrind/memcheck-amd64-freebsd
-lib/valgrind/memcheck-x86-freebsd
+%%X86%%lib/valgrind/memcheck-x86-freebsd
 %%AMD64%%lib/valgrind/none-amd64-freebsd
-lib/valgrind/none-x86-freebsd
+%%X86%%lib/valgrind/none-x86-freebsd
 %%AMD64%%lib/valgrind/vgpreload_core-amd64-freebsd.so
-lib/valgrind/vgpreload_core-x86-freebsd.so
+%%X86%%lib/valgrind/vgpreload_core-x86-freebsd.so
 %%AMD64%%lib/valgrind/vgpreload_drd-amd64-freebsd.so
-lib/valgrind/vgpreload_drd-x86-freebsd.so
+%%X86%%lib/valgrind/vgpreload_drd-x86-freebsd.so
 %%AMD64%%lib/valgrind/vgpreload_exp-ptrcheck-amd64-freebsd.so
-lib/valgrind/vgpreload_exp-ptrcheck-x86-freebsd.so
+%%X86%%lib/valgrind/vgpreload_exp-ptrcheck-x86-freebsd.so
 %%AMD64%%lib/valgrind/vgpreload_helgrind-amd64-freebsd.so
-lib/valgrind/vgpreload_helgrind-x86-freebsd.so
+%%X86%%lib/valgrind/vgpreload_helgrind-x86-freebsd.so
 %%AMD64%%lib/valgrind/vgpreload_massif-amd64-freebsd.so
-lib/valgrind/vgpreload_massif-x86-freebsd.so
+%%X86%%lib/valgrind/vgpreload_massif-x86-freebsd.so
 %%AMD64%%lib/valgrind/vgpreload_memcheck-amd64-freebsd.so
-lib/valgrind/vgpreload_memcheck-x86-freebsd.so
+%%X86%%lib/valgrind/vgpreload_memcheck-x86-freebsd.so
 @dirrm lib/valgrind
 @dirrm include/valgrind/vki
 @dirrm include/valgrind