diff options
| -rw-r--r-- | devel/valgrind-snapshot/Makefile | 82 | ||||
| -rw-r--r-- | devel/valgrind-snapshot/distinfo | 6 | ||||
| -rw-r--r-- | devel/valgrind-snapshot/files/patch-Makefile.am | 52 | ||||
| -rw-r--r-- | devel/valgrind-snapshot/files/patch-configure.in | 65 | ||||
| -rw-r--r-- | devel/valgrind-snapshot/files/patch-coregrind-vg_proxylwp.c | 54 | ||||
| -rw-r--r-- | devel/valgrind-snapshot/files/patch-coregrind-vg_signals.c | 26 | ||||
| -rw-r--r-- | devel/valgrind-snapshot/files/patch-coregrind_Makefile.am | 54 | ||||
| -rw-r--r-- | devel/valgrind-snapshot/files/patch-coregrind_vg_main.c | 29 | ||||
| -rw-r--r-- | devel/valgrind-snapshot/files/patch-coregrind_vg_syscalls.c | 98 | ||||
| -rw-r--r-- | devel/valgrind-snapshot/files/patch-coregrind_vg_unistd.h | 29 | ||||
| -rw-r--r-- | devel/valgrind-snapshot/files/patch-coregrind_vg_unsafe.h | 11 | ||||
| -rw-r--r-- | devel/valgrind-snapshot/files/patch-includes_vg_kerneliface.h | 13 | ||||
| -rw-r--r-- | devel/valgrind-snapshot/pkg-message | 10 | ||||
| -rw-r--r-- | devel/valgrind-snapshot/pkg-plist | 162 |
14 files changed, 126 insertions, 565 deletions
diff --git a/devel/valgrind-snapshot/Makefile b/devel/valgrind-snapshot/Makefile index 6e01e74b31ab..7d15da879503 100644 --- a/devel/valgrind-snapshot/Makefile +++ b/devel/valgrind-snapshot/Makefile @@ -6,95 +6,37 @@ # PORTNAME= valgrind -PORTVERSION= 352 -PORTREVISION= 7 +PORTVERSION= 10776 +PORTREVISION= 0 CATEGORIES= devel -MASTER_SITES= http://www.rabson.org/ +MASTER_SITES= ftp://ftp.SpringDaemons.com/soft/ PKGNAMESUFFIX= -snapshot -DISTNAME= ${PORTNAME}-current-${PORTVERSION} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= stas@FreeBSD.org COMMENT= A (memory) debugging and profiling tool CONFLICTS= valgrind-[0-9]* LATEST_LINK= valgrind-snapshot -ONLY_FOR_ARCHS= i386 +ONLY_FOR_ARCHS= i386 amd64 +USE_BZIP2= yes USE_GMAKE= yes -USE_GNOME= pkgconfig -USE_PERL5_BUILD=yes +USE_GNOME= gnomehack pkgconfig GNU_CONFIGURE= yes -USE_AUTOTOOLS+= autoconf:262 aclocal:19 automake:19 -USE_GCC= 3.4 WRKSRC= ${WRKDIR}/${DISTNAME} .include <bsd.port.pre.mk> -.if ${OSVERSION} >= 800000 -IGNORE= FreeBSD 8.0 is supported yet -.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 -.endif -.endif - -pre-patch: -.ifdef(NOPORTDOCS) - ${FIND} ${WRKSRC} -name "Makefile.in" -exec \ - ${REINPLACE_CMD} -e "s/docs//g" {} \; -.endif - -post-install: - @${INSTALL_DATA} ${WRKSRC}/coregrind/vg_unistd.h \ - ${PREFIX}/include/valgrind - -# Generate suppression files -.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 +.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="" - @${ECHO} "" - @${ECHO} "" - @${CAT} ${PKGMESSAGE} | ${SED} -e 's,%%PREFIX%%,${PREFIX},g' - @${ECHO} "" +.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-snapshot/distinfo b/devel/valgrind-snapshot/distinfo index 9762b140e3cc..c035f822d78a 100644 --- a/devel/valgrind-snapshot/distinfo +++ b/devel/valgrind-snapshot/distinfo @@ -1,3 +1,3 @@ -MD5 (valgrind-current-352.tar.gz) = 4ed43827c2ee1d2ce2b629594b9aa910 -SHA256 (valgrind-current-352.tar.gz) = d6f4f881bab1bddcfb1a4e3224b2b57c17288fb903b772f56b5475bb21d6293c -SIZE (valgrind-current-352.tar.gz) = 1405656 +MD5 (valgrind-10776.tar.bz2) = 35d2e9bba343c1ea6a700067b776b219 +SHA256 (valgrind-10776.tar.bz2) = af9059adfdba63473f2073a1abd8f1c3446ce0884d6920f6e0807f0aa4f954d2 +SIZE (valgrind-10776.tar.bz2) = 5054309 diff --git a/devel/valgrind-snapshot/files/patch-Makefile.am b/devel/valgrind-snapshot/files/patch-Makefile.am deleted file mode 100644 index a1d24a03edb8..000000000000 --- a/devel/valgrind-snapshot/files/patch-Makefile.am +++ /dev/null @@ -1,52 +0,0 @@ ---- Makefile.am.orig Sun May 9 13:00:57 2004 -+++ Makefile.am Tue Sep 20 00:04:44 2005 -@@ -55,26 +55,44 @@ - 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 --if !IS_FREEBSD_LIBC_R - 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 -+ $(LN_S) libpthread.so $(DESTDIR)$(valdir)/libpthread.so.0 -+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 --if !IS_FREEBSD_LIBC_R - $(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-snapshot/files/patch-configure.in b/devel/valgrind-snapshot/files/patch-configure.in deleted file mode 100644 index 9a081e014d92..000000000000 --- a/devel/valgrind-snapshot/files/patch-configure.in +++ /dev/null @@ -1,65 +0,0 @@ ---- configure.in.orig Sun May 9 13:00:57 2004 -+++ configure.in Tue Sep 20 00:12:06 2005 -@@ -132,23 +132,40 @@ - ;; - esac - AM_CONDITIONAL(IS_FREEBSD4, false) -- AM_CONDITIONAL(IS_FREEBSD_LIBC_R, false) - - ;; - -+ *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) -+ AM_CONDITIONAL(IS_FREEBSD_LIBC_R, false) -+ -+ ;; -+ *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) -+ AM_CONDITIONAL(IS_FREEBSD_LIBC_R, false) -+ -+ ;; - *freebsd5*) - AC_MSG_RESULT([ok (${host_os})]) - VG_PLATFORM="x86-freebsd" - AM_CONDITIONAL(IS_LINUX, false) - AM_CONDITIONAL(IS_FREEBSD4, false) -- -- osreldate=`sysctl -n kern.osreldate` -- if test $osreldate -lt 502102; then -- AM_CONDITIONAL(IS_FREEBSD_LIBC_R, true) -- else -- AM_CONDITIONAL(IS_FREEBSD_LIBC_R, false) -- fi -- -+ AM_CONDITIONAL(IS_FREEBSD5, true) -+ AM_CONDITIONAL(IS_FREEBSD6, false) -+ AM_CONDITIONAL(IS_FREEBSD7, false) -+ AM_CONDITIONAL(IS_FREEBSD_LIBC_R, false) - ;; - - *freebsd4*) -@@ -156,8 +173,10 @@ - VG_PLATFORM="x86-freebsd" - AM_CONDITIONAL(IS_LINUX, false) - AM_CONDITIONAL(IS_FREEBSD4, true) -- AM_CONDITIONAL(IS_FREEBSD_LIBC_R, true) -- -+ AM_CONDITIONAL(IS_FREEBSD5, false) -+ AM_CONDITIONAL(IS_FREEBSD6, false) -+ AM_CONDITIONAL(IS_FREEBSD7, false) -+ AM_CONDITIONAL(IS_FREEBSD_LIBC_R, false) - ;; - - *) diff --git a/devel/valgrind-snapshot/files/patch-coregrind-vg_proxylwp.c b/devel/valgrind-snapshot/files/patch-coregrind-vg_proxylwp.c deleted file mode 100644 index 26164824e953..000000000000 --- a/devel/valgrind-snapshot/files/patch-coregrind-vg_proxylwp.c +++ /dev/null @@ -1,54 +0,0 @@ ---- coregrind/vg_proxylwp.c.orig Sat Jul 17 13:46:01 2004 -+++ coregrind/vg_proxylwp.c Mon Nov 7 19:33:19 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); -@@ -943,7 +944,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); -@@ -1098,14 +1099,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*, ...); - -@@ -1169,7 +1170,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-snapshot/files/patch-coregrind-vg_signals.c b/devel/valgrind-snapshot/files/patch-coregrind-vg_signals.c deleted file mode 100644 index 79d868695a22..000000000000 --- a/devel/valgrind-snapshot/files/patch-coregrind-vg_signals.c +++ /dev/null @@ -1,26 +0,0 @@ ---- coregrind/vg_signals.c.orig Sun May 9 13:00:57 2004 -+++ coregrind/vg_signals.c Mon Sep 19 18:18:07 2005 -@@ -1374,6 +1374,12 @@ - #define NT_PRXFPREG 0x46e62b7f /* copied from gdb5.1/include/elf/common.h */ - #endif /* NT_PRXFPREG */ - -+// FIXME: Needed for FreeBSD 4, same ugly hack as in coregrind/ume.c XXX -+#ifndef ELFMAG -+#define ELFMAG "\177ELF" -+#define SELFMAG 4 -+#endif -+ - /* If true, then this Segment may be mentioned in the core */ - static Bool may_dump(const Segment *seg) - { -@@ -1900,8 +1906,8 @@ - if (core) { - static struct vki_rlimit zero = { 0, 0 }; - -- make_coredump(tid, info, corelim.rlim_cur); -- -+ // make_coredump(tid, info, corelim.rlim_cur); -+ VG_(message) (Vg_UserMsg, "Core dumping is broken on FreeBSD. 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); - } diff --git a/devel/valgrind-snapshot/files/patch-coregrind_Makefile.am b/devel/valgrind-snapshot/files/patch-coregrind_Makefile.am deleted file mode 100644 index f0ad904ea698..000000000000 --- a/devel/valgrind-snapshot/files/patch-coregrind_Makefile.am +++ /dev/null @@ -1,54 +0,0 @@ ---- coregrind/Makefile.am.orig Sun May 9 13:00:57 2004 -+++ coregrind/Makefile.am Tue Sep 20 11:41:51 2005 -@@ -172,11 +172,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} - -@@ -190,9 +205,23 @@ - ln -sf $(top_builddir)/$(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-snapshot/files/patch-coregrind_vg_main.c b/devel/valgrind-snapshot/files/patch-coregrind_vg_main.c deleted file mode 100644 index 23d7d777be75..000000000000 --- a/devel/valgrind-snapshot/files/patch-coregrind_vg_main.c +++ /dev/null @@ -1,29 +0,0 @@ ---- coregrind/vg_main.c.orig Sun May 9 13:00:57 2004 -+++ coregrind/vg_main.c Thu Oct 20 13:05:13 2005 -@@ -1286,6 +1286,7 @@ - - static const char* find_executable(const char* exec) - { -+ int found=0; - vg_assert(NULL != exec); - if (strchr(exec, '/') == NULL) { - /* no '/' - we need to search the path */ -@@ -1304,12 +1305,18 @@ - if (access(buf, R_OK|X_OK) == 0) { - exec = strdup(buf); - vg_assert(NULL != exec); -+ found=1; - return 1; - } - return 0; - } - scan_colsep(path, match_exe); -+ } else if (access(exec, R_OK|X_OK) == 0) { -+ found = 1; - } -+ if (!found) -+ return 0; -+ - return exec; - } - diff --git a/devel/valgrind-snapshot/files/patch-coregrind_vg_syscalls.c b/devel/valgrind-snapshot/files/patch-coregrind_vg_syscalls.c deleted file mode 100644 index a3331ebb90de..000000000000 --- a/devel/valgrind-snapshot/files/patch-coregrind_vg_syscalls.c +++ /dev/null @@ -1,98 +0,0 @@ ---- coregrind/vg_syscalls.c.orig Fri Jul 16 19:21:08 2004 -+++ coregrind/vg_syscalls.c Mon Feb 20 13:57:37 2006 -@@ -1369,6 +1369,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"); - } -@@ -1392,6 +1424,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"); - } -@@ -1574,6 +1614,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) -@@ -3431,8 +3486,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; - } -@@ -6827,6 +6881,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-snapshot/files/patch-coregrind_vg_unistd.h b/devel/valgrind-snapshot/files/patch-coregrind_vg_unistd.h deleted file mode 100644 index 84c965d1c99a..000000000000 --- a/devel/valgrind-snapshot/files/patch-coregrind_vg_unistd.h +++ /dev/null @@ -1,29 +0,0 @@ ---- coregrind/vg_unistd.h.orig Mon Nov 7 19:31:31 2005 -+++ coregrind/vg_unistd.h Mon Nov 7 19:32:05 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-snapshot/files/patch-coregrind_vg_unsafe.h b/devel/valgrind-snapshot/files/patch-coregrind_vg_unsafe.h deleted file mode 100644 index 69ad52ddcf41..000000000000 --- a/devel/valgrind-snapshot/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-snapshot/files/patch-includes_vg_kerneliface.h b/devel/valgrind-snapshot/files/patch-includes_vg_kerneliface.h deleted file mode 100644 index cfaa5f144494..000000000000 --- a/devel/valgrind-snapshot/files/patch-includes_vg_kerneliface.h +++ /dev/null @@ -1,13 +0,0 @@ ---- include/vg_kerneliface.h.orig Wed Feb 15 18:39:37 2006 -+++ include/vg_kerneliface.h Wed Feb 15 18:39:03 2006 -@@ -177,6 +177,10 @@ - - #ifdef __FreeBSD__ - -+#ifdef si_band -+#undef si_band -+#endif -+ - typedef - struct { - Int si_signo; diff --git a/devel/valgrind-snapshot/pkg-message b/devel/valgrind-snapshot/pkg-message deleted file mode 100644 index e143fbadcc3c..000000000000 --- a/devel/valgrind-snapshot/pkg-message +++ /dev/null @@ -1,10 +0,0 @@ -Note : A sample suppression file was installed to \ - %%PREFIX%%/lib/valgrind/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%%/lib/valgrind/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-snapshot/pkg-plist b/devel/valgrind-snapshot/pkg-plist index c520283df928..5fc0128cb4e2 100644 --- a/devel/valgrind-snapshot/pkg-plist +++ b/devel/valgrind-snapshot/pkg-plist @@ -1,60 +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 -lib/valgrind/hp2ps -%%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_massif.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_massif.so -lib/valgrind/vgskin_memcheck.so -lib/valgrind/vgskin_none.so -lib/valgrind/xfree-3.supp -lib/valgrind/xfree-4.supp -%%VALGRIND_SUPPFILE%%lib/valgrind/freebsd-default.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 -%%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%%/date.gif -%%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%%/ms_main.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 |
