Index: head/devel/boehm-gc/Makefile =================================================================== --- head/devel/boehm-gc/Makefile (revision 458405) +++ head/devel/boehm-gc/Makefile (revision 458406) @@ -1,101 +1,105 @@ # Created by: Mike McGaughey # $FreeBSD$ PORTNAME= gc -PORTVERSION= 7.6.0 +PORTVERSION= 7.6.2 CATEGORIES= devel MASTER_SITES= http://www.hboehm.info/gc/gc_source/ PKGNAMEPREFIX= boehm- .ifdef GC_VARIANT PKGNAMESUFFIX= -${GC_VARIANT} .endif -MAINTAINER= cpm@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Garbage collection and memory leak detection for C and C++ LICENSE= BDWGC LICENSE_NAME= Boehm-Demers-Weiser Garbage Collector License LICENSE_TEXT= License can be found at http://www.hboehm.info/gc/license.txt LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept BUILD_DEPENDS= ${LOCALBASE}/lib/libatomic_ops.a:devel/libatomic_ops GNU_CONFIGURE= yes USES= cpe libtool pathfix pkgconfig CPE_VENDOR= boehm-demers-weiser CPE_PRODUCT= garbage_collector USE_LDCONFIG= yes INSTALL_TARGET= install-strip TEST_TARGET= check CONFIGURE_ARGS= --enable-cplusplus --disable-static MAKE_JOBS_UNSAFE= yes WRKSRC= ${WRKDIR}/${DISTNAME:C/[a-z]$//} OPTIONS_DEFINE= DEBUG .ifdef GC_VARIANT -INSTLIBS= cord gc gccpp +INSTLIBS= cord gccpp +GCLIBS= gc PLIST= ${NONEXISTENT} PLIST_FILES= ${INSTLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so,} \ ${INSTLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so.1,} \ - ${INSTLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so.1.0.3,} \ + ${INSTLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so.1.3.0,} \ + ${GCLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so,} \ + ${GCLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so.2,} \ + ${GCLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so.2.2.1,} \ libdata/pkgconfig/bdw-gc-${GC_VARIANT}.pc RUN_DEPENDS+= ${LOCALBASE}/include/gc/gc.h:devel/boehm-gc . if ${GC_VARIANT} == "redirect" CONFIGURE_ARGS+=--disable-threads --enable-redirect-malloc . endif . if ${GC_VARIANT} == "threaded" CONFIGURE_ARGS+=--enable-threads=posix --disable-redirect-malloc OPTIONS_DEFINE+=PARALLEL_MARK PARALLEL_MARK_DESC= Parallel-thread marking (faster for SMP) . endif .else CONFIGURE_ARGS+=--disable-threads --disable-redirect-malloc OPTIONS_DEFINE+=DOCS PORTDOCS= * .endif .include .if ${PORT_OPTIONS:MDEBUG} CONFIGURE_ARGS+=--enable-gc-debug PKGNAMESUFFIX:= ${PKGNAMESUFFIX}+fulldebug .endif .if defined(GC_VARIANT) && ${GC_VARIANT} == "threaded" . if ${PORT_OPTIONS:MPARALLEL_MARK} CONFIGURE_ARGS+=--enable-parallel-mark . endif .endif .ifdef GC_VARIANT post-patch: @${REINPLACE_CMD} -e \ 's,libgc\.la,libgc-${GC_VARIANT}.la,g ; \ s,libgccpp\.la,libgccpp-${GC_VARIANT}.la,g ; \ s,libcord\.la,libcord-${GC_VARIANT}.la,g' ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e \ 's,-lgc,-lgc-${GC_VARIANT},' ${WRKSRC}/bdw-gc.pc.in post-install: ${RM} -r ${STAGEDIR}${PREFIX}/include ${RM} -r ${STAGEDIR}${PREFIX}/share ${MV} ${STAGEDIR}${PREFIX}/libdata/pkgconfig/bdw-gc.pc \ ${STAGEDIR}${PREFIX}/libdata/pkgconfig/bdw-gc-${GC_VARIANT}.pc .else # ! GC_VARIANT post-patch: @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/doc/gc.man @${REINPLACE_CMD} \ -e "s|(datadir)/@PACKAGE@|(datadir)/doc/@PACKAGE@|" \ ${WRKSRC}/Makefile.in post-install: ${INSTALL_MAN} ${WRKSRC}/doc/gc.man ${STAGEDIR}${MAN3PREFIX}/man/man3/gc.3 @${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) .endif .include Index: head/devel/boehm-gc/distinfo =================================================================== --- head/devel/boehm-gc/distinfo (revision 458405) +++ head/devel/boehm-gc/distinfo (revision 458406) @@ -1,3 +1,3 @@ -TIMESTAMP = 1470671691 -SHA256 (gc-7.6.0.tar.gz) = a14a28b1129be90e55cd6f71127ffc5594e1091d5d54131528c24cd0c03b7d90 -SIZE (gc-7.6.0.tar.gz) = 1111751 +TIMESTAMP = 1514920665 +SHA256 (gc-7.6.2.tar.gz) = bd112005563d787675163b5afff02c364fc8deb13a99c03f4e80fdf6608ad41e +SIZE (gc-7.6.2.tar.gz) = 1119725 Index: head/devel/boehm-gc/files/patch-include_private_gc__priv.h =================================================================== --- head/devel/boehm-gc/files/patch-include_private_gc__priv.h (revision 458405) +++ head/devel/boehm-gc/files/patch-include_private_gc__priv.h (nonexistent) @@ -1,11 +0,0 @@ ---- include/private/gc_priv.h.orig 2016-08-08 20:30:31 UTC -+++ include/private/gc_priv.h -@@ -2500,6 +2500,8 @@ GC_INNER ptr_t GC_store_debug_info(ptr_t - # if !defined(PCR) - # define NEED_FIND_LIMIT - # endif -+ GC_INNER ptr_t GC_FreeBSDGetDataStart(size_t, ptr_t); -+# define DATASTART_IS_FUNC - #endif /* DATASTART_USES_BSDGETDATASTART */ - - #if (defined(NETBSD) || defined(OPENBSD)) && defined(__ELF__) \ Property changes on: head/devel/boehm-gc/files/patch-include_private_gc__priv.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/boehm-gc/files/patch-include_gc_pthread_redirects.h =================================================================== --- head/devel/boehm-gc/files/patch-include_gc_pthread_redirects.h (nonexistent) +++ head/devel/boehm-gc/files/patch-include_gc_pthread_redirects.h (revision 458406) @@ -0,0 +1,15 @@ +--- include/gc_pthread_redirects.h.orig 2018-01-04 15:41:42.535207000 +0100 ++++ include/gc_pthread_redirects.h 2018-01-04 15:42:01.806411000 +0100 +@@ -44,12 +44,8 @@ + + # ifndef GC_NO_PTHREAD_SIGMASK + # include /* needed anyway for proper redirection */ +-# if defined(GC_PTHREAD_SIGMASK_NEEDED) \ +- || defined(_BSD_SOURCE) || defined(_GNU_SOURCE) \ +- || (_POSIX_C_SOURCE >= 199506L) || (_XOPEN_SOURCE >= 500) + GC_API int GC_pthread_sigmask(int /* how */, const sigset_t *, + sigset_t * /* oset */); +-# endif + # endif /* !GC_NO_PTHREAD_SIGMASK */ + + # ifndef GC_PTHREAD_CREATE_CONST Property changes on: head/devel/boehm-gc/files/patch-include_gc_pthread_redirects.h ___________________________________________________________________ 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: head/devel/boehm-gc/files/patch-include_private_gcconfig.h =================================================================== --- head/devel/boehm-gc/files/patch-include_private_gcconfig.h (revision 458405) +++ head/devel/boehm-gc/files/patch-include_private_gcconfig.h (revision 458406) @@ -1,23 +1,11 @@ ---- include/private/gcconfig.h.orig 2016-08-02 19:36:14 UTC +--- include/private/gcconfig.h.orig 2017-12-23 08:46:29 UTC +++ include/private/gcconfig.h -@@ -176,7 +176,7 @@ +@@ -188,7 +188,7 @@ # define EWS4800 # endif # if !defined(LINUX) && !defined(EWS4800) && !defined(NETBSD) \ - && !defined(OPENBSD) + && !defined(OPENBSD) && !defined(FREEBSD) # if defined(ultrix) || defined(__ultrix) # define ULTRIX # else -@@ -2745,11 +2745,6 @@ - # define SUNOS5SIGS - #endif - --#ifdef DATASTART_USES_BSDGETDATASTART -- GC_INNER ptr_t GC_FreeBSDGetDataStart(size_t, ptr_t); --# define DATASTART_IS_FUNC --#endif -- - #if !defined(GC_EXPLICIT_SIGNALS_UNBLOCK) && defined(SUNOS5SIGS) \ - && !defined(GC_NO_PTHREAD_SIGMASK) - # define GC_EXPLICIT_SIGNALS_UNBLOCK Index: head/devel/boehm-gc/pkg-plist =================================================================== --- head/devel/boehm-gc/pkg-plist (revision 458405) +++ head/devel/boehm-gc/pkg-plist (revision 458406) @@ -1,32 +1,32 @@ include/gc.h include/gc/cord.h include/gc/cord_pos.h include/gc/ec.h include/gc/gc.h include/gc/gc_allocator.h include/gc/gc_backptr.h include/gc/gc_config_macros.h include/gc/gc_cpp.h include/gc/gc_disclaim.h include/gc/gc_gcj.h include/gc/gc_inline.h include/gc/gc_mark.h include/gc/gc_pthread_redirects.h include/gc/gc_tiny_fl.h include/gc/gc_typed.h include/gc/gc_version.h include/gc/javaxfc.h include/gc/leak_detector.h include/gc/weakpointer.h include/gc_cpp.h lib/libcord.so lib/libcord.so.1 -lib/libcord.so.1.0.3 +lib/libcord.so.1.3.0 lib/libgc.so -lib/libgc.so.1 -lib/libgc.so.1.0.3 +lib/libgc.so.2 +lib/libgc.so.2.2.1 lib/libgccpp.so lib/libgccpp.so.1 -lib/libgccpp.so.1.0.3 +lib/libgccpp.so.1.3.0 libdata/pkgconfig/bdw-gc.pc man/man3/gc.3.gz Index: head/devel/boehm-gc-redirect/Makefile =================================================================== --- head/devel/boehm-gc-redirect/Makefile (revision 458405) +++ head/devel/boehm-gc-redirect/Makefile (revision 458406) @@ -1,15 +1,13 @@ # Created by: stas # $FreeBSD$ -PORTREVISION= 1 - COMMENT= Garbage collection and memory leak detection for C and C++ with malloc redirection LICENSE= MIT MASTERDIR= ${.CURDIR}/../boehm-gc DESCR= ${.CURDIR}/pkg-descr GC_VARIANT= redirect .include "${MASTERDIR}/Makefile" Index: head/devel/boehm-gc-threaded/Makefile =================================================================== --- head/devel/boehm-gc-threaded/Makefile (revision 458405) +++ head/devel/boehm-gc-threaded/Makefile (revision 458406) @@ -1,15 +1,13 @@ # Created by: stas # $FreeBSD$ -PORTREVISION= 1 - COMMENT= Garbage collection and memory leak detection for C and C++ with threading support LICENSE= MIT MASTERDIR= ${.CURDIR}/../boehm-gc DESCR= ${.CURDIR}/pkg-descr GC_VARIANT= threaded .include "${MASTERDIR}/Makefile"