- Update to version 3.5.0.

Feature safe:	yes

16 files changed, 146 insertions, 616 deletions

diff --git a/devel/valgrind/Makefile b/devel/valgrind/Makefile
index 2f6b9ffbf3ac..b976b3bb4be0 100644
--- a/devel/valgrind/Makefile
+++ b/devel/valgrind/Makefile
@@ -1,96 +1,44 @@
 # Ports collection makefile for:	valgrind
-# Date created:				April 15 2004
+# Date created:				April 19 2004
 # Whom:					Simon Barner <barner@gmx.de>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	valgrind
-PORTVERSION=	352
-PORTREVISION=	7
+PORTVERSION=	3.5.0
+PORTREVISION=	0
 CATEGORIES=	devel
-MASTER_SITES=	http://www.rabson.org/
-DISTNAME=	${PORTNAME}-stable-${PORTVERSION}
+MASTER_SITES=	ftp://ftp.SpringDaemons.com/soft/
+PKGNAMESUFFIX=	-snapshot
 
 MAINTAINER=	stas@FreeBSD.org
 COMMENT=	A (memory) debugging and profiling tool
 
-ONLY_FOR_ARCHS=	i386
 CONFLICTS=	valgrind-snapshot-[0-9]*
-WRKSRC=		${WRKDIR}/${DISTNAME}
-USE_GMAKE=	yes
-USE_GNOME=	pkgconfig
-GNU_CONFIGURE=	yes
-USE_AUTOTOOLS+=	autoconf:262 aclocal:19 automake:19
-CONFIGURE_ARGS+=--enable-maintainer-mode
-USE_PERL5_BUILD=yes
-USE_GCC=	3.4
 
-.include <bsd.port.pre.mk>
+ONLY_FOR_ARCHS=	i386 amd64
 
-.if ${OSVERSION} >= 800000
-IGNORE=	FreeBSD 8.x is unsupported
-.elif ${OSVERSION} >= 700000
-PLIST_SUB+=	RELENG_6="@comment "
-PLIST_SUB+=	RELENG_7=""
-.else
-PLIST_SUB+=	RELENG_6=""
-PLIST_SUB+=	RELENG_7="@comment "
-.endif
-
-PROCFS!=	if test -r /proc/curproc/status; then echo "procfs"; else echo ""; fi
-
-pre-everything::
-
-.if ${PROCFS}
-	@${ECHO_CMD} ""
-	@${ECHO_CMD} "Check if procfs is running: YES"
-.else
-#
-# /proc is not mounted on the machine in the package building cluster that
-# that builds the list of IGNOREd ports (but it is on the build machines),
-# so we need to make an exception here.
-#
-.ifndef (PACKAGE_BUILDING)
-ECHO_MSG=/usr/bin/printf
-IGNORE=	needs a running procfs, which is not\n\
-\ \ \ \ \ activated on your system. Please read the procfs\(5\)\n\
-\ \ \ \ \ man page and add the following line to /etc/fstab:\n\
-\n\
-\ \ \ \ \ proc /proc procfs rw 0 0\n\
-\n\n
-.endif
-.endif
+USE_BZIP2=	yes
+USE_GMAKE=	yes
+USE_GNOME=	gnomehack pkgconfig
+GNU_CONFIGURE=	yes
 
-pre-patch:
-.ifdef(NOPORTDOCS)
-	${FIND} ${WRKSRC} -name "Makefile.am" -exec \
-		${REINPLACE_CMD} -e "s/docs//g" {} \;
-.endif
+WRKSRC=		${WRKDIR}/${DISTNAME}
 
 post-install:
-	@${INSTALL_DATA} ${WRKSRC}/coregrind/vg_unistd.h \
-		${PREFIX}/include/valgrind
+	@${CAT} ${PKGMESSAGE}
 
-.ifndef (PACKAGE_BUILDING)
-	@yes | ${PREFIX}/bin/valgrind --tool=memcheck --gen-suppressions=yes true 2>&1 \
-		| ${SED} -e 's,.*{$$,{,'  \
-		| ${GREP} -v '^=' \
-		> ${WRKDIR}/freebsd-default.supp || \
-		${RM} ${WRKDIR}/freebsd-default.supp
-.endif
+.include <bsd.port.pre.mk>
 
-	@${ECHO} ""
-	@${ECHO} ""
-	@${CAT} ${PKGMESSAGE} | ${SED} -e 's,%%PREFIX%%,${PREFIX},g'
-	@${ECHO} ""
+.if ${OSVERSION} < 700104
+IGNORE=	your FreeBSD version is not supported
+.endif
 
-.if exists(${WRKDIR}/freebsd-default.supp)
-	@${INSTALL_DATA} ${WRKDIR}/freebsd-default.supp \
-		${PREFIX}/lib/valgrind
-PLIST_SUB+=	VALGRIND_SUPPFILE=""
+.if ${ARCH} == "amd64"
+PLIST_SUB+=	AMD64=""
 .else
-PLIST_SUB+=	VALGRIND_SUPPFILE="@comment "
+PLIST_SUB+=	AMD64="@comment "
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/valgrind/distinfo b/devel/valgrind/distinfo
index bddca6df9acd..df50ca240df5 100644
--- a/devel/valgrind/distinfo
+++ b/devel/valgrind/distinfo
@@ -1,3 +1,3 @@
-MD5 (valgrind-stable-352.tar.gz) = dcf8f9d7d9f8092d2215362c169fd0ab
-SHA256 (valgrind-stable-352.tar.gz) = e2fa532f48157e4f48e4dd8a411d4a2b3ef03b7e5c51587535478e3711ed2d9d
-SIZE (valgrind-stable-352.tar.gz) = 1228052
+MD5 (valgrind-3.5.0.tar.bz2) = 68134cd3858488fcd2ad289c3cfc8aba
+SHA256 (valgrind-3.5.0.tar.bz2) = 70a09d8fdc2bdcaa302e74660e207e85ffb8ed0bd2f5b2b8fd09d9b36d2a1d02
+SIZE (valgrind-3.5.0.tar.bz2) = 5057490
diff --git a/devel/valgrind/files/patch-Makefile.am b/devel/valgrind/files/patch-Makefile.am
deleted file mode 100644
index 1d52c6bf7e90..000000000000
--- a/devel/valgrind/files/patch-Makefile.am
+++ /dev/null
@@ -1,54 +0,0 @@
---- Makefile.am.orig	Thu Apr  8 21:05:08 2004
-+++ Makefile.am	Tue Sep 20 00:01:29 2005
-@@ -50,26 +50,46 @@
- 
- install-exec-hook:
- 	$(mkinstalldirs) $(DESTDIR)$(valdir)
--	rm -f $(DESTDIR)$(valdir)/libpthread.so.0
-+
- if !IS_LINUX
- if IS_FREEBSD4
- 	rm -f $(DESTDIR)$(valdir)/libc_r.so.4
--else
-+endif
-+if IS_FREEBSD5
- 	rm -f $(DESTDIR)$(valdir)/libc_r.so.5
- 	rm -f $(DESTDIR)$(valdir)/libkse.so.1
- 	rm -f $(DESTDIR)$(valdir)/libthr.so.1
--	rm -f $(DESTDIR)$(valdir)/libpthread.so.1
-+endif
-+if IS_FREEBSD6
-+	rm -f $(DESTDIR)$(valdir)/libc_r.so.6
-+	rm -f $(DESTDIR)$(valdir)/libthr.so.2
-+	rm -f $(DESTDIR)$(valdir)/libpthread.so.2
-+endif
-+if IS_FREEBSD7
-+	rm -f $(DESTDIR)$(valdir)/libc_r.so.6
-+	rm -f $(DESTDIR)$(valdir)/libthr.so.2
-+	rm -f $(DESTDIR)$(valdir)/libpthread.so.2
- endif
- endif
--	$(LN_S) libpthread.so $(DESTDIR)$(valdir)/libpthread.so.0
- if !IS_LINUX
- if IS_FREEBSD4
- 	$(LN_S) libpthread.so $(DESTDIR)$(valdir)/libc_r.so.4
--else
-+endif
-+if IS_FREEBSD5
- 	$(LN_S) libpthread.so $(DESTDIR)$(valdir)/libc_r.so.5
- 	$(LN_S) libpthread.so $(DESTDIR)$(valdir)/libkse.so.1
- 	$(LN_S) libpthread.so $(DESTDIR)$(valdir)/libthr.so.1
- 	$(LN_S) libpthread.so $(DESTDIR)$(valdir)/libpthread.so.1
-+endif
-+if IS_FREEBSD6
-+	$(LN_S) libpthread.so $(DESTDIR)$(valdir)/libc_r.so.6
-+	$(LN_S) libpthread.so $(DESTDIR)$(valdir)/libthr.so.2
-+	$(LN_S) libpthread.so $(DESTDIR)$(valdir)/libpthread.so.2
-+endif
-+if IS_FREEBSD7
-+	$(LN_S) libpthread.so $(DESTDIR)$(valdir)/libc_r.so.6
-+	$(LN_S) libpthread.so $(DESTDIR)$(valdir)/libthr.so.2
-+	$(LN_S) libpthread.so $(DESTDIR)$(valdir)/libpthread.so.2
- endif
- endif
- 
diff --git a/devel/valgrind/files/patch-configure.in b/devel/valgrind/files/patch-configure.in
deleted file mode 100644
index 54349f9ffe06..000000000000
--- a/devel/valgrind/files/patch-configure.in
+++ /dev/null
@@ -1,49 +0,0 @@
---- configure.in.orig	Sun Mar 14 13:52:47 2004
-+++ configure.in	Mon Sep 19 23:58:01 2005
-@@ -135,11 +135,35 @@
- 
-         ;;
- 
-+	*freebsd7*)
-+	AC_MSG_RESULT([ok (${host_os})])
-+	VG_PLATFORM="x86-freebsd"
-+	AM_CONDITIONAL(IS_LINUX, false)
-+	AM_CONDITIONAL(IS_FREEBSD4, false)
-+	AM_CONDITIONAL(IS_FREEBSD5, false)
-+	AM_CONDITIONAL(IS_FREEBSD6, false)
-+	AM_CONDITIONAL(IS_FREEBSD7, true)
-+
-+	;;
-+	*freebsd6*)
-+	AC_MSG_RESULT([ok (${host_os})])
-+	VG_PLATFORM="x86-freebsd"
-+	AM_CONDITIONAL(IS_LINUX, false)
-+	AM_CONDITIONAL(IS_FREEBSD4, false)
-+	AM_CONDITIONAL(IS_FREEBSD5, false)
-+	AM_CONDITIONAL(IS_FREEBSD6, true)
-+	AM_CONDITIONAL(IS_FREEBSD7, false)
-+
-+	;;
-+
-      *freebsd5*)
-         AC_MSG_RESULT([ok (${host_os})])
-         VG_PLATFORM="x86-freebsd"
- 	AM_CONDITIONAL(IS_LINUX, false)
- 	AM_CONDITIONAL(IS_FREEBSD4, false)
-+	AM_CONDITIONAL(IS_FREEBSD5, true)
-+	AM_CONDITIONAL(IS_FREEBSD6, false)
-+	AM_CONDITIONAL(IS_FREEBSD7, false)
- 
- 	;;
- 
-@@ -148,7 +172,9 @@
-         VG_PLATFORM="x86-freebsd"
- 	AM_CONDITIONAL(IS_LINUX, false)
- 	AM_CONDITIONAL(IS_FREEBSD4, true)
--
-+	AM_CONDITIONAL(IS_FREEBSD5, false)
-+	AM_CONDITIONAL(IS_FREEBSD6, false)
-+	AM_CONDITIONAL(IS_FREEBSD7, false)
- 	;;
- 
-      *) 
diff --git a/devel/valgrind/files/patch-coregrind-vg_proxylwp.c b/devel/valgrind/files/patch-coregrind-vg_proxylwp.c
deleted file mode 100644
index 18d6a8695aff..000000000000
--- a/devel/valgrind/files/patch-coregrind-vg_proxylwp.c
+++ /dev/null
@@ -1,54 +0,0 @@
---- coregrind/vg_proxylwp.c.orig	Sat Jul 17 13:48:25 2004
-+++ coregrind/vg_proxylwp.c	Mon Nov  7 20:06:46 2005
-@@ -30,6 +30,7 @@
- 
- 
- #include "vg_include.h"
-+#include "vg_unsafe.h"
- 
- #ifndef UMTX_CONTESTED
- # if __FreeBSD_version < 502120
-@@ -595,7 +596,7 @@
-    Int ret = 1000;
-    static const vki_kstack_t ss = { .ss_flags = VKI_SS_DISABLE };
- 
--#if __FreeBSD__ == 5
-+#if __FreeBSD__ >= 5
-    VG_(do_syscall)(__NR__umtx_lock, &px->mutex);
-    px->mutex.u_owner |= UMTX_CONTESTED;
-    VG_(do_syscall)(__NR_thr_self, &px->lwp);
-@@ -942,7 +943,7 @@
- 
-    px->exitcode = ret;
- 
--#if __FreeBSD__ == 5
-+#if __FreeBSD__ >= 5
-    ret = VG_(do_syscall)(__NR__umtx_unlock, &px->mutex);
-    if (use_rfork)
-       VG_(do_syscall)(__NR_exit, 0);
-@@ -1097,14 +1098,14 @@
-       extern Int VG_(rfork_thread)(Int, void*, void*, void*);
-       ret = VG_(rfork_thread)(VKI_RFPROC | VKI_RFMEM | VKI_RFSIGSHARE
- 			      | VKI_RFTHREAD
--#if __FreeBSD__ == 5
-+#if __FreeBSD__ >= 5
- 			      | VKI_RFNOWAIT
- #endif
- 			      ,
- 			      LWP_stack(proxy), proxylwp, proxy);
-       VG_(do_signal_routing) = True;
-    } else {
--#if __FreeBSD__ == 5
-+#if __FreeBSD__ >= 5
-       vki_ucontext_t ctx;
-       extern void makecontext(vki_ucontext_t*, ...);
- 
-@@ -1168,7 +1169,7 @@
-       }
-    }
- #endif
--#if __FreeBSD__ == 5
-+#if __FreeBSD__ >= 5
-    if (block) {
-        if(proxy->lwp != 0)
- 	   VG_(do_syscall)(__NR__umtx_lock, &proxy->mutex);
diff --git a/devel/valgrind/files/patch-coregrind_Makefile.am b/devel/valgrind/files/patch-coregrind_Makefile.am
deleted file mode 100644
index 008a9649a911..000000000000
--- a/devel/valgrind/files/patch-coregrind_Makefile.am
+++ /dev/null
@@ -1,54 +0,0 @@
---- coregrind/Makefile.am.orig	Sun Mar 14 13:52:47 2004
-+++ coregrind/Makefile.am	Tue Sep 20 12:00:42 2005
-@@ -162,11 +162,26 @@
- 	vg_unsafe.h
- 
- if !IS_LINUX
-+if IS_FREEBSD4
-+MANUAL_DEPS_EXTRA = $(inplacedir)/libc_r.so.4
-+endif
-+if IS_FREEBSD5
- MANUAL_DEPS_EXTRA = $(inplacedir)/libc_r.so.5 \
- 	$(inplacedir)/libkse.so.1 \
- 	$(inplacedir)/libthr.so.1 \
- 	$(inplacedir)/libpthread.so.1
- endif
-+if IS_FREEBSD6
-+MANUAL_DEPS_EXTRA = $(inplacedir)/libc_r.so.6 \
-+	$(inplacedir)/libthr.so.2 \
-+	$(inplacedir)/libpthread.so.2
-+endif
-+if IS_FREEBSD7
-+MANUAL_DEPS_EXTRA = $(inplacedir)/libc_r.so.6 \
-+	$(inplacedir)/libthr.so.2 \
-+	$(inplacedir)/libpthread.so.2
-+endif
-+endif
- 
- MANUAL_DEPS = $(noinst_HEADERS) $(include_HEADERS) $(inplacedir)/libpthread.so.0 ${MANUAL_DEPS_EXTRA}
- 
-@@ -180,9 +195,23 @@
- 		ln -sf $(top_srcdir)/$(subdir)/$$i $$to; \
- 	done
- if !IS_LINUX
--	ln -sf libpthread.so.0 $(inplacedir)/libc_r.so.5
-+if IS_FREEBSD4
- 	ln -sf libpthread.so.0 $(inplacedir)/libc_r.so.4
-+endif
-+if IS_FREEBSD5
-+	ln -sf libpthread.so.0 $(inplacedir)/libc_r.so.5
- 	ln -sf libpthread.so.0 $(inplacedir)/libkse.so.1
- 	ln -sf libpthread.so.0 $(inplacedir)/libthr.so.1
- 	ln -sf libpthread.so.0 $(inplacedir)/libpthread.so.1
-+endif
-+if IS_FREEBSD6
-+	ln -sf libpthread.so.0 $(inplacedir)/libc_r.so.6
-+	ln -sf libpthread.so.0 $(inplacedir)/libthr.so.2
-+	ln -sf libpthread.so.0 $(inplacedir)/libpthread.so.2
-+endif
-+if IS_FREEBSD7
-+	ln -sf libpthread.so.0 $(inplacedir)/libc_r.so.6
-+	ln -sf libpthread.so.0 $(inplacedir)/libthr.so.2
-+	ln -sf libpthread.so.0 $(inplacedir)/libpthread.so.2
-+endif
- endif
diff --git a/devel/valgrind/files/patch-coregrind_vg_signals.c b/devel/valgrind/files/patch-coregrind_vg_signals.c
deleted file mode 100644
index be277882e91a..000000000000
--- a/devel/valgrind/files/patch-coregrind_vg_signals.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- coregrind/vg_signals.c.orig	Mon Sep 19 21:16:07 2005
-+++ coregrind/vg_signals.c	Mon Sep 19 21:28:05 2005
-@@ -1488,6 +1488,15 @@
- 	 VG_(start_GDB)( tid );
-       }
- 
-+      if (core) {
-+         static struct vki_rlimit zero = { 0, 0 };
-+
-+         VG_(message) (Vg_UserMsg, "Core dumping not implemented. Please re-run valgrind after fixing the crash.");
-+
-+         /* make sure we don't get a confusing kernel-generated coredump */
-+         VG_(setrlimit)(VKI_RLIMIT_CORE, &zero);
-+      }
-+
-       if (VG_(fatal_signal_set)) {
- 	 VG_(fatal_sigNo) = sigNo;
- 	 __builtin_longjmp(VG_(fatal_signal_jmpbuf), 1);
diff --git a/devel/valgrind/files/patch-coregrind_vg_syscalls.c b/devel/valgrind/files/patch-coregrind_vg_syscalls.c
deleted file mode 100644
index bbcf910118f7..000000000000
--- a/devel/valgrind/files/patch-coregrind_vg_syscalls.c
+++ /dev/null
@@ -1,98 +0,0 @@
---- coregrind/vg_syscalls.c.orig	Fri Jul 16 10:22:32 2004
-+++ coregrind/vg_syscalls.c	Sun Jan  1 15:07:25 2006
-@@ -1284,6 +1284,38 @@
- 					 &tst->m_eflags,
- 					 arg1, arg2);
- 	break;
-+    case 7:
-+	SYSCALL_TRACK( pre_mem_write, tid,
-+		       "sysarch.get_fsbase(args)", arg2, sizeof(UInt));
-+	tst->m_eax = VG_(do_syscall_err)(__NR_sysarch,
-+					 tst->m_edx,
-+					 &tst->m_eflags,
-+					 arg1, arg2);
-+	break;
-+    case 8:
-+	SYSCALL_TRACK( pre_mem_read, tid,
-+		       "sysarch.set_fsbase(args)", arg2, sizeof(UInt));
-+	tst->m_eax = VG_(do_syscall_err)(__NR_sysarch,
-+					 tst->m_edx,
-+					 &tst->m_eflags,
-+					 arg1, arg2);
-+	break;
-+    case 9:
-+	SYSCALL_TRACK( pre_mem_read, tid,
-+		       "sysarch.get_gsbase(args)", arg2, sizeof(UInt));
-+	tst->m_eax = VG_(do_syscall_err)(__NR_sysarch,
-+					 tst->m_edx,
-+					 &tst->m_eflags,
-+					 arg1, arg2);
-+	break;
-+    case 10:
-+	SYSCALL_TRACK( pre_mem_read, tid,
-+		       "sysarch.set_gsbase(args)", arg2, sizeof(UInt));
-+	tst->m_eax = VG_(do_syscall_err)(__NR_sysarch,
-+					 tst->m_edx,
-+					 &tst->m_eflags,
-+					 arg1, arg2);
-+	break;
-     default:
- 	VG_(core_panic)("Unhandled sysarch call");
-     }
-@@ -1307,6 +1339,14 @@
- 	break;
-     case 6:			/* vm86 */
- 	break;
-+    case 7:			/* get_fsbase */
-+   	break;
-+    case 8:			/* set_fsbase */
-+   	break;
-+    case 9:			/* get_gsbase */
-+   	break;
-+    case 10:		/* set_gsbase */
-+   	break;
-     default:
- 	VG_(core_panic)("Unhandled sysarch call");
-     }
-@@ -1489,6 +1529,21 @@
-    VG_TRACK( post_mem_write, arg1, arg2 );
- }
- 
-+#if __FreeBSD__ >= 5
-+PRE(uuidgen)
-+{
-+   /* int uuidgen(struct uuid *store, int count); */
-+   MAYBE_PRINTF("uuidgen ( %p, %d )\n", arg1, arg2);
-+   SYSCALL_TRACK( pre_mem_write, tid, "uuidgen(store, count)", arg1, arg2);
-+}
-+
-+POST(uuidgen)
-+{
-+   VG_TRACK( post_mem_write, arg1, arg2 );
-+}
-+
-+#endif
-+
- #endif
- 
- PRE(setresgid)
-@@ -3249,8 +3304,7 @@
- 		     arg3, sizeof(struct shmid_ds) );
-       break;
-    case IPC_SET:
--   case IPC_RMID:
--      SYSCALL_TRACK( pre_mem_read, tid, "shmctl(IPC_SET or IPC_RMID,buf)",
-+      SYSCALL_TRACK( pre_mem_read, tid, "shmctl(IPC_SET,buf)",
- 		     arg3, sizeof(struct shmid_ds) );
-       break;
-    }
-@@ -6498,6 +6552,9 @@
-    SYSBA(kldstat,		False),
-    SYSB_(kldfirstmod,		False),
-    SYSBA(__getcwd,		False),
-+#if __FreeBSD__ >= 5
-+   SYSBA(uuidgen,		False),
-+#endif
- };
- #define MAX_SYS_INFO		(sizeof(sys_info)/sizeof(sys_info[0]))
- 
diff --git a/devel/valgrind/files/patch-coregrind_vg_unistd.h b/devel/valgrind/files/patch-coregrind_vg_unistd.h
deleted file mode 100644
index bbf36959de23..000000000000
--- a/devel/valgrind/files/patch-coregrind_vg_unistd.h
+++ /dev/null
@@ -1,29 +0,0 @@
---- coregrind/vg_unistd.h.orig	Mon Nov  7 20:07:03 2005
-+++ coregrind/vg_unistd.h	Mon Nov  7 20:07:28 2005
-@@ -630,7 +630,7 @@
- #define	__NR_uuidgen	392
- #define	__NR_sendfile	393
- #define	__NR_mac_syscall	394
--#if __FreeBSD__ == 5
-+#if __FreeBSD__ >= 5
- #define	__NR_getfsstat	395
- #define	__NR_statfs	396
- #define	__NR_fstatfs	397
-@@ -652,7 +652,7 @@
- #define	__NR_extattr_get_link	413
- #define	__NR_extattr_delete_link	414
- #define	__NR___mac_execve	415
--#if __FreeBSD__ == 5
-+#if __FreeBSD__ >= 5
- #define	__NR_sigaction	416
- #define	__NR_sigreturn	417
- #endif
-@@ -665,7 +665,7 @@
- #define	__NR___acl_delete_link	427
- #define	__NR___acl_aclcheck_link	428
- #define	__NR_sigwait	429
--#if __FreeBSD__ == 5
-+#if __FreeBSD__ >= 5
- #define	__NR_thr_create	430
- #define	__NR_thr_exit	431
- #define	__NR_thr_self	432
diff --git a/devel/valgrind/files/patch-coregrind_vg_unsafe.h b/devel/valgrind/files/patch-coregrind_vg_unsafe.h
deleted file mode 100644
index 69ad52ddcf41..000000000000
--- a/devel/valgrind/files/patch-coregrind_vg_unsafe.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- coregrind/vg_unsafe.h.orig	Sun Feb  4 20:04:39 2007
-+++ coregrind/vg_unsafe.h	Sun Feb  4 20:05:29 2007
-@@ -124,7 +124,7 @@
- #include <sys/times.h>
- #include <sys/timex.h>
- #include <sys/event.h>
--#include <posix4/sched.h>
-+#include <sched.h>
- #include <net/if.h>
- #include <net/route.h>
- #include <netinet/in.h>
diff --git a/devel/valgrind/files/patch-helgrind_hg_main.c b/devel/valgrind/files/patch-helgrind_hg_main.c
deleted file mode 100644
index cde946f513a4..000000000000
--- a/devel/valgrind/files/patch-helgrind_hg_main.c
+++ /dev/null
@@ -1,58 +0,0 @@
-===================================================================
-RCS file: /home2/webcvs/mirror/valgrind/helgrind/hg_main.c,v
-retrieving revision 1.60.2.3
-retrieving revision 1.60.2.4
-diff -u -p -r1.60.2.3 -r1.60.2.4
---- helgrind/hg_main.c	2003/12/01 13:11:15	1.60.2.3
-+++ helgrind/hg_main.c	2004/02/29 15:53:40	1.60.2.4
-@@ -3101,42 +3101,42 @@ static void eraser_mem_write(Addr a, UIn
- 
- #undef DEBUG_STATE
- 
--static void eraser_mem_help_read_1(Addr a)
-+REGPARM(1) static void eraser_mem_help_read_1(Addr a)
- {
-    eraser_mem_read(a, 1, VG_(get_current_tid)());
- }
- 
--static void eraser_mem_help_read_2(Addr a)
-+REGPARM(1) static void eraser_mem_help_read_2(Addr a)
- {
-    eraser_mem_read(a, 2, VG_(get_current_tid)());
- }
- 
--static void eraser_mem_help_read_4(Addr a)
-+REGPARM(1) static void eraser_mem_help_read_4(Addr a)
- {
-    eraser_mem_read(a, 4, VG_(get_current_tid)());
- }
- 
--static void eraser_mem_help_read_N(Addr a, UInt size)
-+REGPARM(2) static void eraser_mem_help_read_N(Addr a, UInt size)
- {
-    eraser_mem_read(a, size, VG_(get_current_tid)());
- }
- 
--static void eraser_mem_help_write_1(Addr a, UInt val)
-+REGPARM(2) static void eraser_mem_help_write_1(Addr a, UInt val)
- {
-    if (*(UChar *)a != val)
-       eraser_mem_write(a, 1, VG_(get_current_tid)());
- }
--static void eraser_mem_help_write_2(Addr a, UInt val)
-+REGPARM(2) static void eraser_mem_help_write_2(Addr a, UInt val)
- {
-    if (*(UShort *)a != val)
-       eraser_mem_write(a, 2, VG_(get_current_tid)());
- }
--static void eraser_mem_help_write_4(Addr a, UInt val)
-+REGPARM(2) static void eraser_mem_help_write_4(Addr a, UInt val)
- {
-    if (*(UInt *)a != val)
-       eraser_mem_write(a, 4, VG_(get_current_tid)());
- }
--static void eraser_mem_help_write_N(Addr a, UInt size)
-+REGPARM(2) static void eraser_mem_help_write_N(Addr a, UInt size)
- {
-    eraser_mem_write(a, size, VG_(get_current_tid)());
- }
diff --git a/devel/valgrind/files/patch-include_vg_kerneliface.h b/devel/valgrind/files/patch-include_vg_kerneliface.h
deleted file mode 100644
index 74a9c80a888a..000000000000
--- a/devel/valgrind/files/patch-include_vg_kerneliface.h
+++ /dev/null
@@ -1,22 +0,0 @@
---- include/vg_kerneliface.h.orig	Fri Jul 16 19:35:22 2004
-+++ include/vg_kerneliface.h	Wed Feb 15 18:24:26 2006
-@@ -177,6 +177,10 @@
- 
- #ifdef __FreeBSD__
- 
-+#ifdef si_band
-+#undef si_band
-+#endif
-+
- typedef
-    struct {
-       Int si_signo;
-@@ -975,6 +979,8 @@
- 	unsigned long long rlim_max;
- } vki_rlimit;
- 
-+#define VKI_RLIMIT_DATA   2
-+#define VKI_RLIMIT_CORE   4
- #define VKI_RLIMIT_NOFILE 8
- #endif
- 
diff --git a/devel/valgrind/files/patch-memcheck_mc_include.h b/devel/valgrind/files/patch-memcheck_mc_include.h
deleted file mode 100644
index c61315a5dc03..000000000000
--- a/devel/valgrind/files/patch-memcheck_mc_include.h
+++ /dev/null
@@ -1,32 +0,0 @@
-===================================================================
-RCS file: /home2/webcvs/mirror/valgrind/memcheck/mc_include.h,v
-retrieving revision 1.16
-retrieving revision 1.16.2.1
-diff -u -p -r1.16 -r1.16.2.1
---- memcheck/mc_include.h	2003/07/24 08:45:32	1.16
-+++ memcheck/mc_include.h	2004/02/29 15:53:40	1.16.2.1
-@@ -121,16 +121,16 @@ extern void MC_(helper_value_check0_fail
- 
- 
- /* Functions defined in mc_main.c */
--extern void MC_(helperc_STOREV4) ( Addr, UInt );
--extern void MC_(helperc_STOREV2) ( Addr, UInt );
--extern void MC_(helperc_STOREV1) ( Addr, UInt );
-+extern __attribute__ ((regparm(2))) void MC_(helperc_STOREV4) ( Addr, UInt );
-+extern __attribute__ ((regparm(2))) void MC_(helperc_STOREV2) ( Addr, UInt );
-+extern __attribute__ ((regparm(2))) void MC_(helperc_STOREV1) ( Addr, UInt );
-    
--extern UInt MC_(helperc_LOADV1) ( Addr );
--extern UInt MC_(helperc_LOADV2) ( Addr );
--extern UInt MC_(helperc_LOADV4) ( Addr );
-+extern __attribute__ ((regparm(1))) UInt MC_(helperc_LOADV1) ( Addr );
-+extern __attribute__ ((regparm(1))) UInt MC_(helperc_LOADV2) ( Addr );
-+extern __attribute__ ((regparm(1))) UInt MC_(helperc_LOADV4) ( Addr );
- 
--extern void MC_(fpu_write_check) ( Addr addr, Int size );
--extern void MC_(fpu_read_check)  ( Addr addr, Int size );
-+extern __attribute__ ((regparm(2))) void MC_(fpu_write_check) ( Addr addr, Int size );
-+extern __attribute__ ((regparm(2))) void MC_(fpu_read_check)  ( Addr addr, Int size );
- 
- 
- /* For client requests */
diff --git a/devel/valgrind/pkg-descr b/devel/valgrind/pkg-descr
index dc6b4069c111..b02ac661bc93 100644
--- a/devel/valgrind/pkg-descr
+++ b/devel/valgrind/pkg-descr
@@ -8,6 +8,6 @@ The Valgrind distribution includes five tools: two memory error detectors, a
 thread error detector, a cache profiler and a heap profiler. Several other
 tools have been built with Valgrind.
 
-Valgrind was ported to FreeBSD by Doug Rabson (http://www.rabson.org/).
+Valgrind was initially ported to FreeBSD by Doug Rabson (http://www.rabson.org/).
 
 WWW: http://valgrind.kde.org/
diff --git a/devel/valgrind/pkg-message b/devel/valgrind/pkg-message
index d5609b69eb34..8de46436baac 100644
--- a/devel/valgrind/pkg-message
+++ b/devel/valgrind/pkg-message
@@ -1,19 +1,15 @@
-Note: This version of valgrind does not support some older processors, 
-      e.g. AMD K6-III, some (?) Pentium II.
+==========================================================================
 
-      If valgrind crashes immediately after it was started with the error
-      message "Illegal hardware instruction", your processor is affected by
-      this problem.
+	Known problems:
+	1) DRD valgrind tool does not work.
+	2) Helgrind tool gives excessive false-positivies for the
+	   internals of pthreads library.  This is now under
+	   investigation.
+	3) 32 bit binaries under amd64 are not supported currently.
+	   Work is being done to get it working.
 
-      As a workaround you can use the devel/valgrind-snapshot port, which is
-      based on a more recent snapshot.
+	If you'll encounter any problems when using Valgrind do not
+	hesitate to contact the maintainer with the description of
+	these problems.
 
-Note 2: A sample suppression file might have been installed to \
-      %%PREFIX%%/etc/freebsd-default.supp. It makes Valgrind hide warnings
-      caused by flawed code sequences - if any - in your system libraries,
-      so that you can concentrate on the warnings issued for your own code.
-
-      To use these suppressions, either pass
-      --suppressions=%%PREFIX%%/etc/freebsd-default.supp
-      to Valgrind on the commandline, or add that line to your
-      ~/.valgrindrc file, which is the recommended way.
+==========================================================================
diff --git a/devel/valgrind/pkg-plist b/devel/valgrind/pkg-plist
index c43e8d12ee69..5fc0128cb4e2 100644
--- a/devel/valgrind/pkg-plist
+++ b/devel/valgrind/pkg-plist
@@ -1,55 +1,120 @@
+bin/callgrind_annotate
+bin/callgrind_control
 bin/cg_annotate
+bin/cg_merge
+bin/ms_print
+bin/no_op_client_for_valgrind
 bin/valgrind
 bin/valgrind-listener
+include/valgrind/callgrind.h
+include/valgrind/drd.h
 include/valgrind/helgrind.h
+include/valgrind/libvex.h
+include/valgrind/libvex_basictypes.h
+include/valgrind/libvex_emwarn.h
+include/valgrind/libvex_guest_amd64.h
+include/valgrind/libvex_guest_arm.h
+include/valgrind/libvex_guest_offsets.h
+include/valgrind/libvex_guest_ppc32.h
+include/valgrind/libvex_guest_ppc64.h
+include/valgrind/libvex_guest_x86.h
+include/valgrind/libvex_ir.h
+include/valgrind/libvex_trc_values.h
 include/valgrind/memcheck.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_cpuid.h
+include/valgrind/pub_tool_debuginfo.h
+include/valgrind/pub_tool_errormgr.h
+include/valgrind/pub_tool_execontext.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_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_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_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/valgrind.h
-include/valgrind/vg_constants_skin.h
-include/valgrind/vg_kerneliface.h
-include/valgrind/vg_skin.h
-include/valgrind/vg_unistd.h
-lib/valgrind/default.supp
-lib/valgrind/glibc-2.1.supp
-lib/valgrind/glibc-2.2.supp
-lib/valgrind/glibc-2.3.supp
-%%RELENG_6%%lib/valgrind/libc_r.so.6
-%%RELENG_6%%lib/valgrind/libpthread.so.2
-%%RELENG_6%%lib/valgrind/libthr.so.2
-%%RELENG_7%%lib/valgrind/libc_r.so.6
-%%RELENG_7%%lib/valgrind/libpthread.so.2
-%%RELENG_7%%lib/valgrind/libthr.so.2
-lib/valgrind/libpthread.so
-lib/valgrind/stage2
-lib/valgrind/valgrind
-lib/valgrind/vg_inject.so
-lib/valgrind/vg_symtabd
-lib/valgrind/vgpreload_addrcheck.so
-lib/valgrind/vgpreload_helgrind.so
-lib/valgrind/vgpreload_memcheck.so
-lib/valgrind/vgskin_addrcheck.so
-lib/valgrind/vgskin_cachegrind.so
-lib/valgrind/vgskin_corecheck.so
-lib/valgrind/vgskin_helgrind.so
-lib/valgrind/vgskin_lackey.so
-lib/valgrind/vgskin_memcheck.so
-lib/valgrind/vgskin_none.so
-lib/valgrind/xfree-3.supp
-lib/valgrind/xfree-4.supp
+include/valgrind/vki/vki-amd64-freebsd.h
+include/valgrind/vki/vki-amd64-linux.h
+include/valgrind/vki/vki-darwin.h
+include/valgrind/vki/vki-freebsd.h
+include/valgrind/vki/vki-linux.h
+include/valgrind/vki/vki-posixtypes-amd64-linux.h
+include/valgrind/vki/vki-posixtypes-ppc32-linux.h
+include/valgrind/vki/vki-posixtypes-ppc64-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-scnums-amd64-linux.h
+include/valgrind/vki/vki-scnums-darwin.h
+include/valgrind/vki/vki-scnums-freebsd.h
+include/valgrind/vki/vki-scnums-ppc32-linux.h
+include/valgrind/vki/vki-scnums-ppc64-linux.h
+include/valgrind/vki/vki-scnums-x86-linux.h
+include/valgrind/vki/vki-x86-freebsd.h
+include/valgrind/vki/vki-x86-linux.h
 libdata/pkgconfig/valgrind.pc
-%%VALGRIND_SUPPFILE%%etc/freebsd-default.supp
-%%PORTDOCS%%%%DOCSDIR%%/ac_main.html
-%%PORTDOCS%%%%DOCSDIR%%/cc_main.html
-%%PORTDOCS%%%%DOCSDIR%%/cg_main.html
-%%PORTDOCS%%%%DOCSDIR%%/cg_techdocs.html
-%%PORTDOCS%%%%DOCSDIR%%/coregrind_core.html
-%%PORTDOCS%%%%DOCSDIR%%/coregrind_intro.html
-%%PORTDOCS%%%%DOCSDIR%%/coregrind_tools.html
-%%PORTDOCS%%%%DOCSDIR%%/hg_main.html
-%%PORTDOCS%%%%DOCSDIR%%/lk_main.html
-%%PORTDOCS%%%%DOCSDIR%%/manual.html
-%%PORTDOCS%%%%DOCSDIR%%/mc_main.html
-%%PORTDOCS%%%%DOCSDIR%%/mc_techdocs.html
-%%PORTDOCS%%%%DOCSDIR%%/nl_main.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%AMD64%%lib/valgrind/cachegrind-amd64-freebsd
+lib/valgrind/cachegrind-x86-freebsd
+%%AMD64%%lib/valgrind/callgrind-amd64-freebsd
+lib/valgrind/callgrind-x86-freebsd
+lib/valgrind/default.supp
+%%AMD64%%lib/valgrind/drd-amd64-freebsd
+lib/valgrind/drd-x86-freebsd
+%%AMD64%%lib/valgrind/exp-bbv-amd64-freebsd
+lib/valgrind/exp-bbv-x86-freebsd
+%%AMD64%%lib/valgrind/exp-ptrcheck-amd64-freebsd
+lib/valgrind/exp-ptrcheck-x86-freebsd
+%%AMD64%%lib/valgrind/helgrind-amd64-freebsd
+lib/valgrind/helgrind-x86-freebsd
+%%AMD64%%lib/valgrind/lackey-amd64-freebsd
+lib/valgrind/lackey-x86-freebsd
+%%AMD64%%lib/valgrind/libcoregrind-amd64-freebsd.a
+lib/valgrind/libcoregrind-x86-freebsd.a
+%%AMD64%%lib/valgrind/libreplacemalloc_toolpreload-amd64-freebsd.a
+lib/valgrind/libreplacemalloc_toolpreload-x86-freebsd.a
+%%AMD64%%lib/valgrind/libvex-amd64-freebsd.a
+lib/valgrind/libvex-x86-freebsd.a
+%%AMD64%%lib/valgrind/massif-amd64-freebsd
+lib/valgrind/massif-x86-freebsd
+%%AMD64%%lib/valgrind/memcheck-amd64-freebsd
+lib/valgrind/memcheck-x86-freebsd
+%%AMD64%%lib/valgrind/none-amd64-freebsd
+lib/valgrind/none-x86-freebsd
+%%AMD64%%lib/valgrind/vgpreload_core-amd64-freebsd.so
+lib/valgrind/vgpreload_core-x86-freebsd.so
+%%AMD64%%lib/valgrind/vgpreload_drd-amd64-freebsd.so
+lib/valgrind/vgpreload_drd-x86-freebsd.so
+%%AMD64%%lib/valgrind/vgpreload_exp-ptrcheck-amd64-freebsd.so
+lib/valgrind/vgpreload_exp-ptrcheck-x86-freebsd.so
+%%AMD64%%lib/valgrind/vgpreload_helgrind-amd64-freebsd.so
+lib/valgrind/vgpreload_helgrind-x86-freebsd.so
+%%AMD64%%lib/valgrind/vgpreload_massif-amd64-freebsd.so
+lib/valgrind/vgpreload_massif-x86-freebsd.so
+%%AMD64%%lib/valgrind/vgpreload_memcheck-amd64-freebsd.so
+lib/valgrind/vgpreload_memcheck-x86-freebsd.so
 @dirrm lib/valgrind
+@dirrm include/valgrind/vki
 @dirrm include/valgrind