[pkgsrc/trunk]: pkgsrc/devel/valgrind Fix PLIST entries on amd64 and i386.

[alnsn <alnsn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/039d418b7326
branches:  trunk
changeset: 609936:039d418b7326
user:      alnsn <alnsn%pkgsrc.org@localhost>
date:      Sat Oct 13 22:17:35 2012 +0000

description:
Fix PLIST entries on amd64 and i386.

diffstat:

 devel/valgrind/Makefile |  20 ++++++++++++++++++--
 devel/valgrind/PLIST    |  44 ++++++++++++++++++++++----------------------
 2 files changed, 40 insertions(+), 24 deletions(-)

diffs (112 lines):

diff -r bdaf5087b320 -r 039d418b7326 devel/valgrind/Makefile
--- a/devel/valgrind/Makefile   Sat Oct 13 18:41:00 2012 +0000
+++ b/devel/valgrind/Makefile   Sat Oct 13 22:17:35 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2012/10/08 19:42:47 alnsn Exp $
+# $NetBSD: Makefile,v 1.10 2012/10/13 22:17:35 alnsn Exp $
 #
 
 DISTNAME=              valgrind-3.8.1
@@ -17,10 +17,26 @@
 PKGCONFIG_OVERRIDE+=   ${WRKSRC}/valgrind.pc.in
 GNU_CONFIGURE=         yes
 
-ONLY_FOR_PLATFORM=     Linux-*-*
+ONLY_FOR_PLATFORM=     Linux-*-x86_64 \
+                       Linux-*-i386   \
+                       Linux-*-arm*
 
 USE_TOOLS+=            gmake perl
 USE_LANGUAGES=         c c++
 TEST_TARGET=           regtest
 
+.if ${MACHINE_ARCH:C/arm.*/arm/} == "arm"
+PLIST_SUBST+=          VGCONF_ARCH_PRI=arm
+.endif
+
+.if ${MACHINE_ARCH} == "i386"
+PLIST_SUBST+=          VGCONF_ARCH_PRI=x86
+.endif
+
+.if ${MACHINE_ARCH} == "x86_64"
+PLIST_SUBST+=          VGCONF_ARCH_PRI=amd64
+#PLIST_SUBST+=         VGCONF_ARCH_SEC=x86
+CONFIGURE_ARGS+=       --enable-only64bit
+.endif
+
 .include "../../mk/bsd.pkg.mk"
diff -r bdaf5087b320 -r 039d418b7326 devel/valgrind/PLIST
--- a/devel/valgrind/PLIST      Sat Oct 13 18:41:00 2012 +0000
+++ b/devel/valgrind/PLIST      Sat Oct 13 22:17:35 2012 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2012/10/06 12:13:16 alnsn Exp $
+@comment $NetBSD: PLIST,v 1.4 2012/10/13 22:17:35 alnsn Exp $
 bin/callgrind_annotate
 bin/callgrind_control
 bin/cg_annotate
@@ -126,22 +126,22 @@
 lib/valgrind/arm-vfpv3.xml
 lib/valgrind/arm-with-vfpv3-valgrind.xml
 lib/valgrind/arm-with-vfpv3.xml
-lib/valgrind/cachegrind-arm-${LOWER_OPSYS}
-lib/valgrind/callgrind-arm-${LOWER_OPSYS}
+lib/valgrind/cachegrind-${VGCONF_ARCH_PRI}-${LOWER_OPSYS}
+lib/valgrind/callgrind-${VGCONF_ARCH_PRI}-${LOWER_OPSYS}
 lib/valgrind/default.supp
-lib/valgrind/drd-arm-${LOWER_OPSYS}
-lib/valgrind/exp-bbv-arm-${LOWER_OPSYS}
-lib/valgrind/exp-dhat-arm-${LOWER_OPSYS}
-lib/valgrind/exp-sgcheck-arm-${LOWER_OPSYS}
-lib/valgrind/helgrind-arm-${LOWER_OPSYS}
+lib/valgrind/drd-${VGCONF_ARCH_PRI}-${LOWER_OPSYS}
+lib/valgrind/exp-bbv-${VGCONF_ARCH_PRI}-${LOWER_OPSYS}
+lib/valgrind/exp-dhat-${VGCONF_ARCH_PRI}-${LOWER_OPSYS}
+lib/valgrind/exp-sgcheck-${VGCONF_ARCH_PRI}-${LOWER_OPSYS}
+lib/valgrind/helgrind-${VGCONF_ARCH_PRI}-${LOWER_OPSYS}
 lib/valgrind/i386-coresse-valgrind.xml
 lib/valgrind/i386-${LOWER_OPSYS}-valgrind.xml
-lib/valgrind/lackey-arm-${LOWER_OPSYS}
-lib/valgrind/libcoregrind-arm-${LOWER_OPSYS}.a
-lib/valgrind/libreplacemalloc_toolpreload-arm-${LOWER_OPSYS}.a
-lib/valgrind/libvex-arm-${LOWER_OPSYS}.a
-lib/valgrind/massif-arm-${LOWER_OPSYS}
-lib/valgrind/memcheck-arm-${LOWER_OPSYS}
+lib/valgrind/lackey-${VGCONF_ARCH_PRI}-${LOWER_OPSYS}
+lib/valgrind/libcoregrind-${VGCONF_ARCH_PRI}-${LOWER_OPSYS}.a
+lib/valgrind/libreplacemalloc_toolpreload-${VGCONF_ARCH_PRI}-${LOWER_OPSYS}.a
+lib/valgrind/libvex-${VGCONF_ARCH_PRI}-${LOWER_OPSYS}.a
+lib/valgrind/massif-${VGCONF_ARCH_PRI}-${LOWER_OPSYS}
+lib/valgrind/memcheck-${VGCONF_ARCH_PRI}-${LOWER_OPSYS}
 lib/valgrind/mips-cp0-valgrind-s1.xml
 lib/valgrind/mips-cp0-valgrind-s2.xml
 lib/valgrind/mips-cp0.xml
@@ -153,7 +153,7 @@
 lib/valgrind/mips-fpu.xml
 lib/valgrind/mips-${LOWER_OPSYS}-valgrind.xml
 lib/valgrind/mips-${LOWER_OPSYS}.xml
-lib/valgrind/none-arm-${LOWER_OPSYS}
+lib/valgrind/none-${VGCONF_ARCH_PRI}-${LOWER_OPSYS}
 lib/valgrind/power64-core-valgrind-s1.xml
 lib/valgrind/power64-core-valgrind-s2.xml
 lib/valgrind/power64-core.xml
@@ -190,13 +190,13 @@
 lib/valgrind/s390x-${LOWER_OPSYS}64-valgrind-s1.xml
 lib/valgrind/s390x-${LOWER_OPSYS}64-valgrind-s2.xml
 lib/valgrind/s390x-${LOWER_OPSYS}64.xml
-lib/valgrind/vgpreload_core-arm-${LOWER_OPSYS}.so
-lib/valgrind/vgpreload_drd-arm-${LOWER_OPSYS}.so
-lib/valgrind/vgpreload_exp-dhat-arm-${LOWER_OPSYS}.so
-lib/valgrind/vgpreload_exp-sgcheck-arm-${LOWER_OPSYS}.so
-lib/valgrind/vgpreload_helgrind-arm-${LOWER_OPSYS}.so
-lib/valgrind/vgpreload_massif-arm-${LOWER_OPSYS}.so
-lib/valgrind/vgpreload_memcheck-arm-${LOWER_OPSYS}.so
+lib/valgrind/vgpreload_core-${VGCONF_ARCH_PRI}-${LOWER_OPSYS}.so
+lib/valgrind/vgpreload_drd-${VGCONF_ARCH_PRI}-${LOWER_OPSYS}.so
+lib/valgrind/vgpreload_exp-dhat-${VGCONF_ARCH_PRI}-${LOWER_OPSYS}.so
+lib/valgrind/vgpreload_exp-sgcheck-${VGCONF_ARCH_PRI}-${LOWER_OPSYS}.so
+lib/valgrind/vgpreload_helgrind-${VGCONF_ARCH_PRI}-${LOWER_OPSYS}.so
+lib/valgrind/vgpreload_massif-${VGCONF_ARCH_PRI}-${LOWER_OPSYS}.so
+lib/valgrind/vgpreload_memcheck-${VGCONF_ARCH_PRI}-${LOWER_OPSYS}.so
 man/man1/callgrind_annotate.1
 man/man1/callgrind_control.1
 man/man1/cg_annotate.1