Date: Fri, 3 Oct 2014 12:52:35 +0000 (UTC) From: Tijl Coosemans <tijl@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r369894 - in head/devel: boehm-gc boehm-gc-redirect boehm-gc-threaded Message-ID: <201410031252.s93CqZGb055536@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tijl Date: Fri Oct 3 12:52:34 2014 New Revision: 369894 URL: https://svnweb.freebsd.org/changeset/ports/369894 QAT: https://qat.redports.org/buildarchive/r369894/ Log: - Complete USES=libtool conversion - Remove USE_AUTOTOOLS - Replace MAKE with MAKE_CMD Modified: head/devel/boehm-gc-redirect/Makefile head/devel/boehm-gc-threaded/Makefile head/devel/boehm-gc/Makefile Modified: head/devel/boehm-gc-redirect/Makefile ============================================================================== --- head/devel/boehm-gc-redirect/Makefile Fri Oct 3 12:42:42 2014 (r369893) +++ head/devel/boehm-gc-redirect/Makefile Fri Oct 3 12:52:34 2014 (r369894) @@ -1,7 +1,7 @@ # Created by: stas # $FreeBSD$ -PORTREVISION= 0 +PORTREVISION= 1 COMMENT= Garbage collection and memory leak detection for C and C++ with malloc redirection @@ -9,6 +9,7 @@ LICENSE= MIT MASTERDIR= ${.CURDIR}/../boehm-gc DESCR= ${.CURDIR}/pkg-descr + GC_VARIANT= redirect .include "${MASTERDIR}/Makefile" Modified: head/devel/boehm-gc-threaded/Makefile ============================================================================== --- head/devel/boehm-gc-threaded/Makefile Fri Oct 3 12:42:42 2014 (r369893) +++ head/devel/boehm-gc-threaded/Makefile Fri Oct 3 12:52:34 2014 (r369894) @@ -1,7 +1,7 @@ # Created by: stas # $FreeBSD$ -PORTREVISION= 0 +PORTREVISION= 1 COMMENT= Garbage collection and memory leak detection for C and C++ with threading support @@ -11,6 +11,5 @@ MASTERDIR= ${.CURDIR}/../boehm-gc DESCR= ${.CURDIR}/pkg-descr GC_VARIANT= threaded -SOVER= 1 .include "${MASTERDIR}/Makefile" Modified: head/devel/boehm-gc/Makefile ============================================================================== --- head/devel/boehm-gc/Makefile Fri Oct 3 12:42:42 2014 (r369893) +++ head/devel/boehm-gc/Makefile Fri Oct 3 12:52:34 2014 (r369894) @@ -23,7 +23,6 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libatomi GNU_CONFIGURE= yes USES= libtool pathfix pkgconfig -USE_AUTOTOOLS= aclocal autoconf libtoolize USE_LDCONFIG= yes INSTALL_TARGET= install-strip CONFIGURE_ARGS= --enable-cplusplus --disable-static @@ -36,11 +35,11 @@ OPTIONS_DEFINE= DEBUG .ifdef GC_VARIANT INSTLIBS= cord gc gccpp PLIST= ${NONEXISTENT} -PLIST_FILES= ${INSTLIBS:S,^,lib/lib,g:S,$,-${GC_VARIANT}.so.${SOVER},g} \ - ${INSTLIBS:S,^,lib/lib,g:S,$,-${GC_VARIANT}.so,g} \ +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,} \ libdata/pkgconfig/bdw-gc-${GC_VARIANT}.pc RUN_DEPENDS+= ${LOCALBASE}/include/gc/gc.h:${PORTSDIR}/devel/boehm-gc -SOVER= 1 . if ${GC_VARIANT} == "redirect" CONFIGURE_ARGS+=--disable-threads --enable-redirect-malloc . endif @@ -55,13 +54,9 @@ OPTIONS_DEFINE+=DOCS PORTDOCS= * .endif -.include <bsd.port.pre.mk> - NOT_FOR_ARCHS= ia64 -# no rule to get .lo from .S in subdirectory -pre-build: - ${LN} -sf ${WRKSRC}/src/sparc_mach_dep.S ${WRKSRC} +.include <bsd.port.options.mk> .if ${PORT_OPTIONS:MDEBUG} CONFIGURE_ARGS+=--enable-gc-debug @@ -83,15 +78,12 @@ post-patch: @${REINPLACE_CMD} -e \ 's,-lgc,-lgc-${GC_VARIANT},' ${WRKSRC}/bdw-gc.pc.in -do-install: -.for LIB in ${INSTLIBS} - ${INSTALL_DATA} ${WRKSRC}/.libs/lib${LIB}-${GC_VARIANT}.so.${SOVER} \ - ${STAGEDIR}${PREFIX}/lib/lib${LIB}-${GC_VARIANT}.so.${SOVER} - ${LN} -sf lib${LIB}-${GC_VARIANT}.so.${SOVER} \ - ${STAGEDIR}${PREFIX}/lib/lib${LIB}-${GC_VARIANT}.so -.endfor - ${INSTALL_DATA} ${WRKSRC}/bdw-gc.pc \ +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: @@ -107,13 +99,7 @@ post-install: .endif -# Get rid of .la and static library files -# -post-configure: - @${REINPLACE_CMD} -E -e \ - '/Install the pseudo-library/,/staticlibs=/s,^,#,' ${WRKSRC}/libtool - regression-test: build - cd ${WRKSRC} && ${MAKE} check + (cd ${WRKSRC} && ${MAKE_CMD} check) -.include <bsd.port.post.mk> +.include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410031252.s93CqZGb055536>