Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 4 Dec 2012 21:47:25 +0000 (UTC)
From:      Bryan Drewery <bdrewery@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r308280 - head/devel/valgrind-snapshot
Message-ID:  <201212042147.qB4LlPsD064962@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bdrewery
Date: Tue Dec  4 21:47:25 2012
New Revision: 308280
URL: http://svnweb.freebsd.org/changeset/ports/308280

Log:
  - Update to 3.8.0
  - Sync Makefile/pkg-descr with main valgrind port
   * Add manpages
   * Add LICENSE
   * Add MPI OPTION
   * Unbreak on 9.0+
   * Unbreak with clang
  
  Feature safe:	yes

Modified:
  head/devel/valgrind-snapshot/Makefile
  head/devel/valgrind-snapshot/distinfo
  head/devel/valgrind-snapshot/pkg-descr
  head/devel/valgrind-snapshot/pkg-plist

Modified: head/devel/valgrind-snapshot/Makefile
==============================================================================
--- head/devel/valgrind-snapshot/Makefile	Tue Dec  4 21:46:06 2012	(r308279)
+++ head/devel/valgrind-snapshot/Makefile	Tue Dec  4 21:47:25 2012	(r308280)
@@ -2,37 +2,75 @@
 # $FreeBSD$
 
 PORTNAME=	valgrind
-PORTVERSION=	10776
-PORTREVISION=	0
+PORTVERSION=	3.8.0
+PORTEPOCH=	1
 CATEGORIES=	devel
-MASTER_SITES=	ftp://ftp.SpringDaemons.com/soft/
+MASTER_SITES=	http://cdn.bitbucket.org/stass/valgrind-freebsd/downloads/:dist \
+		http://mirror.shatow.net/freebsd/${PORTNAME}/:dist \
+		http://mirror.shatow.net/freebsd/${PORTNAME}/:manpages
 PKGNAMESUFFIX=	-snapshot
+DISTNAME=	${PORTNAME}-freebsd-${PORTVERSION}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:dist \
+		${DISTNAME}-manpages${EXTRACT_SUFX}:manpages
 
 MAINTAINER=	bdrewery@FreeBSD.org
-COMMENT=	A (memory) debugging and profiling tool
+COMMENT=	Memory debugging and profiling tool
+
+LICENSE=	GPLv2
 
 CONFLICTS=	valgrind-[0-9]*
 LATEST_LINK=	valgrind-snapshot
 
 ONLY_FOR_ARCHS=	i386 amd64
 
+MAN1=		callgrind_control.1 \
+		callgrind_annotate.1 \
+		valgrind.1 \
+		ms_print.1 \
+		cg_annotate.1
+
+OPTIONS_DEFINE=	MPI
+MPI_DESC=	Enable build of MPI wrappers
+
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack
-USE_PKGCONFIG=	yes
+USE_PERL5_BUILD=yes
 GNU_CONFIGURE=	yes
+USE_LDCONFIG=	yes
+USE_PKGCONFIG=	yes
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MMPI}
+LIB_DEPENDS+=	mpich:${PORTSDIR}/net/mpich2
+PLIST_SUB+=	MPI=""
+.else
+PLIST_SUB+=	MPI="@comment "
+.endif
+
+post-install:
+	(cd ${WRKDIR}/valgrind-manpages/ && ${COPYTREE_SHARE} \* ${MANPREFIX}/man/man1)
+
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 700104 || ${OSVERSION} >= 900000
+.if ${OSVERSION} < 700104
 IGNORE=	your FreeBSD version is not supported
 .endif
 
 .if ${ARCH} == "amd64"
-PLIST_SUB+=	AMD64=""
+PLIST_SUB+=	AMD64="" ARCH=amd64
+. if !exists(/usr/lib32)
+CONFIGURE_ARGS+=	--enable-only64bit
+PLIST_SUB+=	X86="@comment "
+. else
+PLIST_SUB+=	X86=""
+. else
+. endif
 .else
+PLIST_SUB+=	X86="" ARCH=x86
 PLIST_SUB+=	AMD64="@comment "
 .endif
 

Modified: head/devel/valgrind-snapshot/distinfo
==============================================================================
--- head/devel/valgrind-snapshot/distinfo	Tue Dec  4 21:46:06 2012	(r308279)
+++ head/devel/valgrind-snapshot/distinfo	Tue Dec  4 21:47:25 2012	(r308280)
@@ -1,2 +1,4 @@
-SHA256 (valgrind-10776.tar.bz2) = af9059adfdba63473f2073a1abd8f1c3446ce0884d6920f6e0807f0aa4f954d2
-SIZE (valgrind-10776.tar.bz2) = 5054309
+SHA256 (valgrind-freebsd-3.8.0.tar.bz2) = 0edf104f87f97712af0adab032c91c525c8d6e9e7b5f824f88f06a3f28249756
+SIZE (valgrind-freebsd-3.8.0.tar.bz2) = 7238044
+SHA256 (valgrind-freebsd-3.8.0-manpages.tar.bz2) = aeb586be19bafd583dd9faf5d616e574ee3ef13263ef886e4a3978d5542faf58
+SIZE (valgrind-freebsd-3.8.0-manpages.tar.bz2) = 23899

Modified: head/devel/valgrind-snapshot/pkg-descr
==============================================================================
--- head/devel/valgrind-snapshot/pkg-descr	Tue Dec  4 21:46:06 2012	(r308279)
+++ head/devel/valgrind-snapshot/pkg-descr	Tue Dec  4 21:47:25 2012	(r308280)
@@ -8,6 +8,8 @@ The Valgrind distribution includes five 
 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: https://bitbucket.org/stass/valgrind-freebsd/overview
 WWW: http://www.valgrind.org/

Modified: head/devel/valgrind-snapshot/pkg-plist
==============================================================================
--- head/devel/valgrind-snapshot/pkg-plist	Tue Dec  4 21:46:06 2012	(r308279)
+++ head/devel/valgrind-snapshot/pkg-plist	Tue Dec  4 21:47:25 2012	(r308280)
@@ -1,12 +1,14 @@
 bin/callgrind_annotate
 bin/callgrind_control
 bin/cg_annotate
+bin/cg_diff
 bin/cg_merge
 bin/ms_print
-bin/no_op_client_for_valgrind
 bin/valgrind
 bin/valgrind-listener
+bin/vgdb
 include/valgrind/callgrind.h
+include/valgrind/config.h
 include/valgrind/drd.h
 include/valgrind/helgrind.h
 include/valgrind/libvex.h
@@ -14,11 +16,14 @@ 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_mips32.h
 include/valgrind/libvex_guest_offsets.h
 include/valgrind/libvex_guest_ppc32.h
 include/valgrind/libvex_guest_ppc64.h
+include/valgrind/libvex_guest_s390x.h
 include/valgrind/libvex_guest_x86.h
 include/valgrind/libvex_ir.h
+include/valgrind/libvex_s390x_common.h
 include/valgrind/libvex_trc_values.h
 include/valgrind/memcheck.h
 include/valgrind/pub_tool_aspacehl.h
@@ -31,17 +36,21 @@ 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_gdbserver.h
 include/valgrind/pub_tool_hashtable.h
+include/valgrind/pub_tool_inner.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_libcsetjmp.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_poolalloc.h
 include/valgrind/pub_tool_redir.h
 include/valgrind/pub_tool_replacemalloc.h
 include/valgrind/pub_tool_seqmatch.h
@@ -58,63 +67,161 @@ include/valgrind/pub_tool_xarray.h
 include/valgrind/valgrind.h
 include/valgrind/vki/vki-amd64-freebsd.h
 include/valgrind/vki/vki-amd64-linux.h
+include/valgrind/vki/vki-arm-linux.h
 include/valgrind/vki/vki-darwin.h
 include/valgrind/vki/vki-freebsd.h
 include/valgrind/vki/vki-linux.h
+include/valgrind/vki/vki-mips32-linux.h
 include/valgrind/vki/vki-posixtypes-amd64-linux.h
+include/valgrind/vki/vki-posixtypes-arm-linux.h
+include/valgrind/vki/vki-posixtypes-mips32-linux.h
 include/valgrind/vki/vki-posixtypes-ppc32-linux.h
 include/valgrind/vki/vki-posixtypes-ppc64-linux.h
+include/valgrind/vki/vki-posixtypes-s390x-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-s390x-linux.h
 include/valgrind/vki/vki-scnums-amd64-linux.h
+include/valgrind/vki/vki-scnums-arm-linux.h
 include/valgrind/vki/vki-scnums-darwin.h
 include/valgrind/vki/vki-scnums-freebsd.h
+include/valgrind/vki/vki-scnums-mips32-linux.h
 include/valgrind/vki/vki-scnums-ppc32-linux.h
 include/valgrind/vki/vki-scnums-ppc64-linux.h
+include/valgrind/vki/vki-scnums-s390x-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
+lib/valgrind/32bit-core-valgrind-s1.xml
+lib/valgrind/32bit-core-valgrind-s2.xml
+lib/valgrind/32bit-core.xml
+lib/valgrind/32bit-linux-valgrind-s1.xml
+lib/valgrind/32bit-linux-valgrind-s2.xml
+lib/valgrind/32bit-linux.xml
+lib/valgrind/32bit-sse-valgrind-s1.xml
+lib/valgrind/32bit-sse-valgrind-s2.xml
+lib/valgrind/32bit-sse.xml
+lib/valgrind/64bit-avx-valgrind-s1.xml
+lib/valgrind/64bit-avx-valgrind-s2.xml
+lib/valgrind/64bit-avx.xml
+lib/valgrind/64bit-core-valgrind-s1.xml
+lib/valgrind/64bit-core-valgrind-s2.xml
+lib/valgrind/64bit-core.xml
+lib/valgrind/64bit-linux-valgrind-s1.xml
+lib/valgrind/64bit-linux-valgrind-s2.xml
+lib/valgrind/64bit-linux.xml
+lib/valgrind/64bit-sse-valgrind-s1.xml
+lib/valgrind/64bit-sse-valgrind-s2.xml
+lib/valgrind/64bit-sse.xml
+lib/valgrind/amd64-avx-coresse-valgrind.xml
+lib/valgrind/amd64-avx-coresse.xml
+lib/valgrind/amd64-avx-linux-valgrind.xml
+lib/valgrind/amd64-avx-linux.xml
+lib/valgrind/amd64-coresse-valgrind.xml
+lib/valgrind/amd64-linux-valgrind.xml
+lib/valgrind/arm-core-valgrind-s1.xml
+lib/valgrind/arm-core-valgrind-s2.xml
+lib/valgrind/arm-core.xml
+lib/valgrind/arm-vfpv3-valgrind-s1.xml
+lib/valgrind/arm-vfpv3-valgrind-s2.xml
+lib/valgrind/arm-vfpv3.xml
+lib/valgrind/arm-with-vfpv3-valgrind.xml
+lib/valgrind/arm-with-vfpv3.xml
+lib/valgrind/mips-cp0-valgrind-s1.xml
+lib/valgrind/mips-cp0-valgrind-s2.xml
+lib/valgrind/mips-cp0.xml
+lib/valgrind/mips-cpu-valgrind-s1.xml
+lib/valgrind/mips-cpu-valgrind-s2.xml
+lib/valgrind/mips-cpu.xml
+lib/valgrind/mips-fpu-valgrind-s1.xml
+lib/valgrind/mips-fpu-valgrind-s2.xml
+lib/valgrind/mips-fpu.xml
+lib/valgrind/mips-linux-valgrind.xml
+lib/valgrind/mips-linux.xml
+lib/valgrind/power-core-valgrind-s1.xml
+lib/valgrind/power-core-valgrind-s2.xml
+lib/valgrind/s390-acr-valgrind-s1.xml
+lib/valgrind/s390-acr-valgrind-s2.xml
+lib/valgrind/s390-acr.xml
+lib/valgrind/s390-fpr-valgrind-s1.xml
+lib/valgrind/s390-fpr-valgrind-s2.xml
+lib/valgrind/s390-fpr.xml
+lib/valgrind/s390x-core64-valgrind-s1.xml
+lib/valgrind/s390x-core64-valgrind-s2.xml
+lib/valgrind/s390x-core64.xml
+lib/valgrind/s390x-generic-valgrind.xml
+lib/valgrind/s390x-generic.xml
+lib/valgrind/s390x-linux64-valgrind-s1.xml
+lib/valgrind/s390x-linux64-valgrind-s2.xml
+lib/valgrind/s390x-linux64.xml
 %%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
-%%AMD64%%lib/valgrind/exp-ptrcheck-amd64-freebsd
-lib/valgrind/exp-ptrcheck-x86-freebsd
+%%X86%%lib/valgrind/exp-bbv-x86-freebsd
+%%AMD64%%lib/valgrind/exp-dhat-amd64-freebsd
+%%X86%%lib/valgrind/exp-dhat-x86-freebsd
+%%AMD64%%lib/valgrind/exp-sgcheck-amd64-freebsd
+%%X86%%lib/valgrind/exp-sgcheck-x86-freebsd
 %%AMD64%%lib/valgrind/helgrind-amd64-freebsd
-lib/valgrind/helgrind-x86-freebsd
+%%X86%%lib/valgrind/helgrind-x86-freebsd
+lib/valgrind/i386-coresse-valgrind.xml
+lib/valgrind/i386-linux-valgrind.xml
 %%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
+lib/valgrind/power-altivec-valgrind-s1.xml
+lib/valgrind/power-altivec-valgrind-s2.xml
+lib/valgrind/power-altivec.xml
+lib/valgrind/power-core.xml
+lib/valgrind/power-fpu-valgrind-s1.xml
+lib/valgrind/power-fpu-valgrind-s2.xml
+lib/valgrind/power-fpu.xml
+lib/valgrind/power-linux-valgrind-s1.xml
+lib/valgrind/power-linux-valgrind-s2.xml
+lib/valgrind/power-linux.xml
+lib/valgrind/power64-core-valgrind-s1.xml
+lib/valgrind/power64-core-valgrind-s2.xml
+lib/valgrind/power64-core.xml
+lib/valgrind/power64-linux-valgrind-s1.xml
+lib/valgrind/power64-linux-valgrind-s2.xml
+lib/valgrind/power64-linux.xml
+lib/valgrind/powerpc-altivec32l-valgrind.xml
+lib/valgrind/powerpc-altivec32l.xml
+lib/valgrind/powerpc-altivec64l-valgrind.xml
+lib/valgrind/powerpc-altivec64l.xml
 %%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
-%%AMD64%%lib/valgrind/vgpreload_exp-ptrcheck-amd64-freebsd.so
-lib/valgrind/vgpreload_exp-ptrcheck-x86-freebsd.so
+%%X86%%lib/valgrind/vgpreload_drd-x86-freebsd.so
+%%AMD64%%lib/valgrind/vgpreload_exp-dhat-amd64-freebsd.so
+%%X86%%lib/valgrind/vgpreload_exp-dhat-x86-freebsd.so
+%%AMD64%%lib/valgrind/vgpreload_exp-sgcheck-amd64-freebsd.so
+%%X86%%lib/valgrind/vgpreload_exp-sgcheck-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
+%%MPI%%lib/valgrind/libmpiwrap-%%ARCH%%-freebsd.so
+libdata/pkgconfig/valgrind.pc
 @dirrm lib/valgrind
 @dirrm include/valgrind/vki
 @dirrm include/valgrind



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212042147.qB4LlPsD064962>