Index: branches/2020Q1/devel/valgrind/Makefile =================================================================== --- branches/2020Q1/devel/valgrind/Makefile (revision 526718) +++ branches/2020Q1/devel/valgrind/Makefile (revision 526719) @@ -1,98 +1,98 @@ # Created by: Simon Barner # $FreeBSD$ PORTNAME= valgrind PORTVERSION= 3.10.1.20160113 DISTVERSIONPREFIX= freebsd- -PORTREVISION= 7 +PORTREVISION= 8 PORTEPOCH= 1 CATEGORIES= devel MASTER_SITES= https://bitbucket.org/${BB_ACCOUNT}/${BB_PROJECT}/get/${BB_COMMIT}.tar.gz?dummy=/ \ http://mirror.shatow.net/freebsd/${PORTNAME}/ MAINTAINER= zeising@FreeBSD.org COMMENT= Memory debugging and profiling tool BB_COMMIT= ce1acb28953f BB_ACCOUNT= stass BB_PROJECT= valgrind-freebsd LICENSE= GPLv2 CONFLICTS= valgrind-devel-[0-9]* ONLY_FOR_ARCHS= i386 amd64 LIB32_PATH?= ${DESTDIR}/usr/lib32/libc.so OPTIONS_DEFINE= DOCS MANPAGES MPI OPTIONS_DEFINE_amd64= 32BIT OPTIONS_DEFAULT= MANPAGES .if exists(${LIB32_PATH}) OPTIONS_DEFAULT_amd64= 32BIT .endif 32BIT_DESC= Enable debugging of 32-bit programs (requires lib32) MPI_DESC= Enable build of MPI wrappers DOCS_BUILD_DEPENDS= docbook-xsl>=0:textproc/docbook-xsl \ xsltproc:textproc/libxslt MANPAGES_BUILD_DEPENDS= docbook-xsl>=0:textproc/docbook-xsl \ xsltproc:textproc/libxslt MPI_LIB_DEPENDS= libmpich.so:net/mpich OPTIONS_SUB= yes USES= pathfix pkgconfig gmake perl5 shebangfix autoreconf USE_PERL5= build GNU_CONFIGURE= yes USE_LDCONFIG= yes SHEBANG_FILES= callgrind/callgrind_annotate.in callgrind/callgrind_control.in EXTRA_PATCHES= \ ${FILESDIR}/accept4_syscall.patch:-p1 \ ${FILESDIR}/jail_syscalls.patch:-p1 \ ${FILESDIR}/kldload_syscalls.patch:-p1 \ ${FILESDIR}/missing_fcntls.patch:-p1 PORTDOCS= html WRKSRC= ${WRKDIR}/${BB_ACCOUNT}-${BB_PROJECT}-${BB_COMMIT} CONFIGURE_ENV+= ac_cv_path_PERL=${PERL} .include .if ${OSVERSION} > 1200030 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-ino64:-p1 .endif .if ${ARCH} == "amd64" PLIST_SUB+= AMD64="" ARCH=amd64 . if !${PORT_OPTIONS:M32BIT} CONFIGURE_ARGS+= --enable-only64bit PLIST_SUB+= X86="@comment " . else . if !exists(${LIB32_PATH}) IGNORE=The lib32 distribution was not found. Please install the lib32\ distribution or run 'make config' and uncheck 32BIT option . endif PLIST_SUB+= X86="" . endif .else PLIST_SUB+= X86="" ARCH=x86 PLIST_SUB+= AMD64="@comment " .endif .if !${PORT_OPTIONS:MDOCS} post-patch: @${RM} -r ${WRKSRC}/docs/html .endif post-build: .if ${PORT_OPTIONS:MMANPAGES} cd ${WRKSRC}/docs && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} man-pages .endif .if ${PORT_OPTIONS:MDOCS} cd ${WRKSRC}/docs && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} html-docs .endif .include Index: branches/2020Q1/devel/valgrind/files/patch-VEX_auxprogs_genoffsets.c =================================================================== --- branches/2020Q1/devel/valgrind/files/patch-VEX_auxprogs_genoffsets.c (nonexistent) +++ branches/2020Q1/devel/valgrind/files/patch-VEX_auxprogs_genoffsets.c (revision 526719) @@ -0,0 +1,11 @@ +--- VEX/auxprogs/genoffsets.c 2016-01-13 19:20:20 UTC ++++ VEX/auxprogs/genoffsets.c +@@ -59,7 +59,7 @@ + #define VG_STRINGIFZ(__str) #__str + #define VG_STRINGIFY(__str) VG_STRINGIFZ(__str) + +-#define my_offsetof(__type,__field) (&((__type*)0)->__field) ++#define my_offsetof(__type,__field) offsetof(__type,__field) + + /* This forces gcc to evaluate the my_offsetof call at compile time, + and then emits it in the assembly, along with the nonsense string Property changes on: branches/2020Q1/devel/valgrind/files/patch-VEX_auxprogs_genoffsets.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2020Q1/devel/valgrind/files/patch-configure.ac =================================================================== --- branches/2020Q1/devel/valgrind/files/patch-configure.ac (revision 526718) +++ branches/2020Q1/devel/valgrind/files/patch-configure.ac (revision 526719) @@ -1,23 +1,21 @@ --- configure.ac.orig 2016-01-13 19:20:20 UTC +++ configure.ac -@@ -145,7 +145,19 @@ - notclang-5.*) +@@ -136,16 +136,10 @@ + AM_CONDITIONAL(COMPILER_IS_CLANG, test $is_clang = clang) + + case "${is_clang}-${gcc_version}" in +- notclang-3.*) ++ notclang-[[3-9]].*|notclang-[[1-9]][[0-9]]*) AC_MSG_RESULT([ok (${gcc_version})]) ;; +- notclang-4.*) +- AC_MSG_RESULT([ok (${gcc_version})]) +- ;; +- notclang-5.*) +- AC_MSG_RESULT([ok (${gcc_version})]) +- ;; - clang-2.9|clang-3.*|clang-4.*) -+ notclang-6.*) -+ AC_MSG_RESULT([ok (${gcc_version})]) -+ ;; -+ notclang-7.*) -+ AC_MSG_RESULT([ok (${gcc_version})]) -+ ;; -+ notclang-8.*) -+ AC_MSG_RESULT([ok (${gcc_version})]) -+ ;; -+ notclang-9.*) -+ AC_MSG_RESULT([ok (${gcc_version})]) -+ ;; -+ clang-2.9|clang-[[3-9]].*) ++ clang-2.9|clang-[[3-9]].*|clang-[[1-9]][[0-9]]*) AC_MSG_RESULT([ok (clang-${gcc_version})]) ;; *) Index: branches/2020Q1/devel/valgrind-devel/Makefile =================================================================== --- branches/2020Q1/devel/valgrind-devel/Makefile (revision 526718) +++ branches/2020Q1/devel/valgrind-devel/Makefile (revision 526719) @@ -1,99 +1,99 @@ # Created by: Simon Barner # $FreeBSD$ PORTNAME= valgrind PORTVERSION= 3.10.1.20160113 DISTVERSIONPREFIX= freebsd- -PORTREVISION= 6 +PORTREVISION= 7 PORTEPOCH= 1 CATEGORIES= devel MASTER_SITES= https://bitbucket.org/${BB_ACCOUNT}/${BB_PROJECT}/get/${BB_COMMIT}.tar.gz?dummy=/ \ http://mirror.shatow.net/freebsd/${PORTNAME}/ PKGNAMESUFFIX= -devel MAINTAINER= zeising@FreeBSD.org COMMENT= Memory debugging and profiling tool BB_COMMIT= ce1acb28953f BB_ACCOUNT= stass BB_PROJECT= valgrind-freebsd LICENSE= GPLv2 CONFLICTS= valgrind-[0-9]* ONLY_FOR_ARCHS= i386 amd64 LIB32_PATH?= ${DESTDIR}/usr/lib32/libc.so OPTIONS_DEFINE= DOCS MANPAGES MPI OPTIONS_DEFINE_amd64= 32BIT OPTIONS_DEFAULT= MANPAGES .if exists(${LIB32_PATH}) OPTIONS_DEFAULT_amd64= 32BIT .endif 32BIT_DESC= Enable debugging of 32-bit programs (requires lib32) MPI_DESC= Enable build of MPI wrappers DOCS_BUILD_DEPENDS= docbook-xsl>=0:textproc/docbook-xsl \ xsltproc:textproc/libxslt MANPAGES_BUILD_DEPENDS= docbook-xsl>=0:textproc/docbook-xsl \ xsltproc:textproc/libxslt MPI_LIB_DEPENDS= libmpich.so:net/mpich OPTIONS_SUB= yes USES= pathfix pkgconfig gmake perl5 shebangfix autoreconf USE_PERL5= build GNU_CONFIGURE= yes USE_LDCONFIG= yes SHEBANG_FILES= callgrind/callgrind_annotate.in callgrind/callgrind_control.in EXTRA_PATCHES= \ ${FILESDIR}/accept4_syscall.patch:-p1 \ ${FILESDIR}/jail_syscalls.patch:-p1 \ ${FILESDIR}/kldload_syscalls.patch:-p1 \ ${FILESDIR}/missing_fcntls.patch:-p1 PORTDOCS= html WRKSRC= ${WRKDIR}/${BB_ACCOUNT}-${BB_PROJECT}-${BB_COMMIT} CONFIGURE_ENV+= ac_cv_path_PERL=${PERL} .include .if ${OSVERSION} > 1200030 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-ino64:-p1 .endif .if ${ARCH} == "amd64" PLIST_SUB+= AMD64="" ARCH=amd64 . if !${PORT_OPTIONS:M32BIT} CONFIGURE_ARGS+= --enable-only64bit PLIST_SUB+= X86="@comment " . else . if !exists(${LIB32_PATH}) IGNORE=The lib32 distribution was not found. Please install the lib32\ distribution or run 'make config' and uncheck 32BIT option . endif PLIST_SUB+= X86="" . endif .else PLIST_SUB+= X86="" ARCH=x86 PLIST_SUB+= AMD64="@comment " .endif .if !${PORT_OPTIONS:MDOCS} post-patch: @${RM} -r ${WRKSRC}/docs/html .endif post-build: .if ${PORT_OPTIONS:MMANPAGES} cd ${WRKSRC}/docs && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} man-pages .endif .if ${PORT_OPTIONS:MDOCS} cd ${WRKSRC}/docs && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} html-docs .endif .include Index: branches/2020Q1/devel/valgrind-devel/files/patch-VEX_auxprogs_genoffsets.c =================================================================== --- branches/2020Q1/devel/valgrind-devel/files/patch-VEX_auxprogs_genoffsets.c (nonexistent) +++ branches/2020Q1/devel/valgrind-devel/files/patch-VEX_auxprogs_genoffsets.c (revision 526719) @@ -0,0 +1,11 @@ +--- VEX/auxprogs/genoffsets.c 2016-01-13 19:20:20 UTC ++++ VEX/auxprogs/genoffsets.c +@@ -59,7 +59,7 @@ + #define VG_STRINGIFZ(__str) #__str + #define VG_STRINGIFY(__str) VG_STRINGIFZ(__str) + +-#define my_offsetof(__type,__field) (&((__type*)0)->__field) ++#define my_offsetof(__type,__field) offsetof(__type,__field) + + /* This forces gcc to evaluate the my_offsetof call at compile time, + and then emits it in the assembly, along with the nonsense string Property changes on: branches/2020Q1/devel/valgrind-devel/files/patch-VEX_auxprogs_genoffsets.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2020Q1/devel/valgrind-devel/files/patch-configure.ac =================================================================== --- branches/2020Q1/devel/valgrind-devel/files/patch-configure.ac (revision 526718) +++ branches/2020Q1/devel/valgrind-devel/files/patch-configure.ac (revision 526719) @@ -1,23 +1,21 @@ --- configure.ac.orig 2016-01-13 19:20:20 UTC +++ configure.ac -@@ -145,7 +145,19 @@ - notclang-5.*) +@@ -136,16 +136,10 @@ + AM_CONDITIONAL(COMPILER_IS_CLANG, test $is_clang = clang) + + case "${is_clang}-${gcc_version}" in +- notclang-3.*) ++ notclang-[[3-9]].*|notclang-[[1-9]][[0-9]]*) AC_MSG_RESULT([ok (${gcc_version})]) ;; +- notclang-4.*) +- AC_MSG_RESULT([ok (${gcc_version})]) +- ;; +- notclang-5.*) +- AC_MSG_RESULT([ok (${gcc_version})]) +- ;; - clang-2.9|clang-3.*|clang-4.*) -+ notclang-6.*) -+ AC_MSG_RESULT([ok (${gcc_version})]) -+ ;; -+ notclang-7.*) -+ AC_MSG_RESULT([ok (${gcc_version})]) -+ ;; -+ notclang-8.*) -+ AC_MSG_RESULT([ok (${gcc_version})]) -+ ;; -+ notclang-9.*) -+ AC_MSG_RESULT([ok (${gcc_version})]) -+ ;; -+ clang-2.9|clang-[[3-9]].*) ++ clang-2.9|clang-[[3-9]].*|clang-[[1-9]][[0-9]]*) AC_MSG_RESULT([ok (clang-${gcc_version})]) ;; *) Index: branches/2020Q1 =================================================================== --- branches/2020Q1 (revision 526718) +++ branches/2020Q1 (revision 526719) Property changes on: branches/2020Q1 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r526608