Index: head/devel/boehm-gc/Makefile =================================================================== --- head/devel/boehm-gc/Makefile (revision 464064) +++ head/devel/boehm-gc/Makefile (revision 464065) @@ -1,106 +1,110 @@ # Created by: Mike McGaughey # $FreeBSD$ PORTNAME= gc -PORTVERSION= 7.6.2 +PORTVERSION= 7.6.4 CATEGORIES= devel MASTER_SITES= http://www.hboehm.info/gc/gc_source/ \ https://github.com/ivmai/bdwgc/releases/download/v${PORTVERSION}/ PKGNAMEPREFIX= boehm- .ifdef GC_VARIANT PKGNAMESUFFIX= -${GC_VARIANT} .endif 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 gccpp +CORDLIBS= cord GCLIBS= gc +GCCPPLIBS= gccpp 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.3.0,} \ +PLIST_FILES= ${CORDLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so,} \ + ${CORDLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so.1,} \ + ${CORDLIBS: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,} \ + ${GCLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so.1,} \ + ${GCLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so.1.3.2,} \ + ${GCCPPLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so,} \ + ${GCCPPLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so.1,} \ + ${GCCPPLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so.1.3.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 464064) +++ head/devel/boehm-gc/distinfo (revision 464065) @@ -1,3 +1,3 @@ -TIMESTAMP = 1514920665 -SHA256 (gc-7.6.2.tar.gz) = bd112005563d787675163b5afff02c364fc8deb13a99c03f4e80fdf6608ad41e -SIZE (gc-7.6.2.tar.gz) = 1119725 +TIMESTAMP = 1517313696 +SHA256 (gc-7.6.4.tar.gz) = b94c1f2535f98354811ee644dccab6e84a0cf73e477ca03fb5a3758fb1fecd1c +SIZE (gc-7.6.4.tar.gz) = 1120784 Index: head/devel/boehm-gc/files/patch-doc_gc.man =================================================================== --- head/devel/boehm-gc/files/patch-doc_gc.man (revision 464064) +++ head/devel/boehm-gc/files/patch-doc_gc.man (revision 464065) @@ -1,60 +1,51 @@ --- doc/gc.man.orig 2014-05-22 20:47:28 UTC +++ doc/gc.man -@@ -11,7 +11,7 @@ void GC_free(void *ptr); - void * GC_realloc(void *ptr, size_t size); - .br - .sp --cc ... gc.a -+cc ... -lgc - .LP - .SH DESCRIPTION - .I GC_malloc @@ -88,6 +88,48 @@ This may temporarily write protect pages .LP Other facilities not discussed here include limited facilities to support incremental collection on machines without appropriate VM support, provisions for providing more explicit object layout information to the garbage collector, more direct support for ``weak'' pointers, support for ``abortable'' garbage collections during idle time, etc. .LP +.SH "PORT INFORMATION" +.LP +In this (FreeBSD package) installation, +.I gc.h +and +.I gc_cpp.h +will probably be found in +.I %%PREFIX%%/include, +and the library in +.I %%PREFIX%%/lib. +.LP +This library has been compiled as drop-in replacements +for malloc and free (which is to say, all malloc +calls will allocate garbage-collectable data). +There is no need to include "gc.h" in your C files unless you want +access to the debugging (and other) functions defined there, +or unless you want to explicitly use +.I GC_malloc_uncollectable +for some allocations. +Just link against them whenever you want either garbage +collection or leak detection. +.LP +The C++ header file, "gc_cpp.h", +.I is +necessary for C++ programs, to obtain the appropriate +definitions of the +.I new +and +.I delete +operators. +The comments in both of these header files presently +provide far better documentation +for the package than this man page; +look there for more information. +.LP +This library is compiled without (explicit) support +for the experimental +.I gc +extension of +.I g++. +This may or may not make a difference. +.LP .SH "SEE ALSO" The README and gc.h files in the distribution. More detailed definitions of the functions exported by the collector are given there. (The above list is not complete.) .LP Index: head/devel/boehm-gc/files/patch-include_gc_pthread_redirects.h =================================================================== --- head/devel/boehm-gc/files/patch-include_gc_pthread_redirects.h (revision 464064) +++ head/devel/boehm-gc/files/patch-include_gc_pthread_redirects.h (revision 464065) @@ -1,15 +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 +--- include/gc_pthread_redirects.h.orig 2018-01-04 14:41:42 UTC ++++ include/gc_pthread_redirects.h @@ -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 Index: head/devel/boehm-gc/pkg-plist =================================================================== --- head/devel/boehm-gc/pkg-plist (revision 464064) +++ head/devel/boehm-gc/pkg-plist (revision 464065) @@ -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.3.0 lib/libgc.so -lib/libgc.so.2 -lib/libgc.so.2.2.1 +lib/libgc.so.1 +lib/libgc.so.1.3.2 lib/libgccpp.so lib/libgccpp.so.1 -lib/libgccpp.so.1.3.0 +lib/libgccpp.so.1.3.1 libdata/pkgconfig/bdw-gc.pc man/man3/gc.3.gz