From f086451dc7378113957bcb6e2ddf472827fb8374 Mon Sep 17 00:00:00 2001
From: Stanislav Sedov <stas@FreeBSD.org>
Date: Tue, 13 Jul 2010 01:54:18 +0000
Subject: [PATCH] - Update to 3.5.0-2:   - Fix build of MPI wrappers [1]   -
 Fix LDT handling in i386 case.   - Fix socketpair(2) syscall wrapper.

PR:		ports/144067 [1]
Reported by:	"O. Hartmann" <ohartman@zedat.fu-berlin.de> [1]
---
 devel/valgrind/Makefile  | 17 +++++++++++++----
 devel/valgrind/distinfo  |  6 +++---
 devel/valgrind/pkg-plist |  1 +
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/devel/valgrind/Makefile b/devel/valgrind/Makefile
index 9febe1b3b4ef..a4e0de9e689f 100644
--- a/devel/valgrind/Makefile
+++ b/devel/valgrind/Makefile
@@ -7,11 +7,11 @@
 
 PORTNAME=	valgrind
 PORTVERSION=	3.5.0
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.SpringDaemons.com/soft/
-DISTNAME=	${PORTNAME}-${PORTVERSION}-1
+DISTNAME=	${PORTNAME}-${PORTVERSION}-2
 
 MAINTAINER=	stas@FreeBSD.org
 COMMENT=	A (memory) debugging and profiling tool
@@ -27,6 +27,8 @@ GNU_CONFIGURE=	yes
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
+OPTIONS=	MPI "Enable build of MPI wrappers" off
+
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
@@ -36,8 +38,15 @@ post-install:
 IGNORE=	your FreeBSD version is not supported
 .endif
 
+.if defined(WITH_MPI) || exists(${LOCALBASE}/bin/mpicc)
+LIB_DEPENDS+=	mpich.1:${PORTSDIR}/net/mpich2
+PLIST_SUB+=	MPI=""
+.else
+PLIST_SUB+=	MPI="@comment "
+.endif
+
 .if ${ARCH} == "amd64"
-PLIST_SUB+=	AMD64=""
+PLIST_SUB+=	AMD64="" ARCH=amd64
 . if !exists(/usr/lib32)
 CONFIGURE_ARGS+=	--enable-only64bit
 PLIST_SUB+=	X86="@comment "
@@ -46,7 +55,7 @@ PLIST_SUB+=	X86=""
 . else
 . endif
 .else
-PLIST_SUB+=	X86=""
+PLIST_SUB+=	X86="" ARCH=x86
 PLIST_SUB+=	AMD64="@comment "
 .endif
 
diff --git a/devel/valgrind/distinfo b/devel/valgrind/distinfo
index 3fbe272de81c..91300ca54749 100644
--- a/devel/valgrind/distinfo
+++ b/devel/valgrind/distinfo
@@ -1,3 +1,3 @@
-MD5 (valgrind-3.5.0-1.tar.bz2) = 06d237a887aacad29ab1c5c0c0601e99
-SHA256 (valgrind-3.5.0-1.tar.bz2) = f2a23de5396063290af526149cc398245e99434604574d45d77b3ca49edc27e0
-SIZE (valgrind-3.5.0-1.tar.bz2) = 5061256
+MD5 (valgrind-3.5.0-2.tar.bz2) = 3e513ee44a50b4cc08c3d1624788469b
+SHA256 (valgrind-3.5.0-2.tar.bz2) = b0409456f987b1667ade447b1a1050c58b5b24915fa2a9c1e643048e9fc178e0
+SIZE (valgrind-3.5.0-2.tar.bz2) = 5129811
diff --git a/devel/valgrind/pkg-plist b/devel/valgrind/pkg-plist
index 8e37c3738869..421c4f1f5ce0 100644
--- a/devel/valgrind/pkg-plist
+++ b/devel/valgrind/pkg-plist
@@ -115,6 +115,7 @@ lib/valgrind/default.supp
 %%X86%%lib/valgrind/vgpreload_massif-x86-freebsd.so
 %%AMD64%%lib/valgrind/vgpreload_memcheck-amd64-freebsd.so
 %%X86%%lib/valgrind/vgpreload_memcheck-x86-freebsd.so
+%%MPI%%lib/valgrind/libmpiwrap-%%ARCH%%-freebsd.so
 @dirrm lib/valgrind
 @dirrm include/valgrind/vki
 @dirrm include/valgrind