Date: Thu, 9 Oct 2014 12:53:43 +0000 (UTC) From: Jimmy Olgeni <olgeni@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r370522 - in head/lang: erlang-runtime15 erlang-runtime16 Message-ID: <201410091253.s99CrhMZ067867@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: olgeni Date: Thu Oct 9 12:53:42 2014 New Revision: 370522 URL: https://svnweb.freebsd.org/changeset/ports/370522 QAT: https://qat.redports.org/buildarchive/r370522/ Log: Reduce diff with the main Erlang port and unmute install commands. Modified: head/lang/erlang-runtime15/Makefile head/lang/erlang-runtime16/Makefile Modified: head/lang/erlang-runtime15/Makefile ============================================================================== --- head/lang/erlang-runtime15/Makefile Thu Oct 9 12:50:54 2014 (r370521) +++ head/lang/erlang-runtime15/Makefile Thu Oct 9 12:53:42 2014 (r370522) @@ -38,13 +38,14 @@ SCTP_DESC= Enable SCTP support SMP_DESC= Enable SMP support WX_DESC= Enable WX application GS_DESC= Enable GS application (deprecated) -DTRACE_DESC= Enable DTrace support (experimental) +DTRACE_DESC= Enable DTrace support OPTIONS_DEFAULT=SMP OPENSSL THREADS SCTP KQUEUE ERL_RELEASE= R${PORTVERSION:S/.//g:tu:S/1$/-1/} USES= gmake perl5 +USE_AUTOTOOLS= autoconf:env GNU_CONFIGURE= yes LDFLAGS+= -L${LOCALBASE}/lib @@ -62,9 +63,11 @@ DISTFILES+= ${ERLANG_DOCS}:erlangorg # probes fixed does not match the number of defined probes (54 != 132, # respectively)" you probably misconfigured DTrace in some way. +.if ${OSVERSION} < 1000000 .if ${ARCH} == "amd64" && ${PORT_OPTIONS:MDTRACE} && ! ${PORT_OPTIONS:MGCC} IGNORE= DTRACE support on amd64 requires GCC option .endif +.endif .if ${PORT_OPTIONS:MGCC} USE_GCC?= yes @@ -160,17 +163,17 @@ MAKE_ARGS+= ARCH=x86 # links in the documentation. post-install: - @for SECTION in 1 3 4 6; do \ + for SECTION in 1 3 4 6; do \ ${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_MAN} \ -C ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB} \ "man/man$${SECTION}/*.$${SECTION}" || ${TRUE}; \ done - @${RM} -rf ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/man/cat? + ${RM} -rf ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/man/cat? .if ${PORT_OPTIONS:MDOCS} - @${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_DOCS} \ + ${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_DOCS} \ -C ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB} - @${INSTALL_DATA} ${WRKSRC}/lib/dialyzer/doc/*.txt \ + ${INSTALL_DATA} ${WRKSRC}/lib/dialyzer/doc/*.txt \ ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/dialyzer-*/doc/ .endif Modified: head/lang/erlang-runtime16/Makefile ============================================================================== --- head/lang/erlang-runtime16/Makefile Thu Oct 9 12:50:54 2014 (r370521) +++ head/lang/erlang-runtime16/Makefile Thu Oct 9 12:53:42 2014 (r370522) @@ -38,13 +38,14 @@ SCTP_DESC= Enable SCTP support SMP_DESC= Enable SMP support WX_DESC= Enable WX application GS_DESC= Enable GS application (deprecated) -DTRACE_DESC= Enable DTrace support (experimental) +DTRACE_DESC= Enable DTrace support OPTIONS_DEFAULT=SMP OPENSSL THREADS SCTP KQUEUE ERL_RELEASE= R${PORTVERSION:S/.//g:tu:S/1$/-1/} USES= gmake perl5 +USE_AUTOTOOLS= autoconf:env GNU_CONFIGURE= yes LDFLAGS+= -L${LOCALBASE}/lib @@ -62,9 +63,11 @@ DISTFILES+= ${ERLANG_DOCS}:erlangorg # probes fixed does not match the number of defined probes (54 != 132, # respectively)" you probably misconfigured DTrace in some way. +.if ${OSVERSION} < 1000000 .if ${ARCH} == "amd64" && ${PORT_OPTIONS:MDTRACE} && ! ${PORT_OPTIONS:MGCC} IGNORE= DTRACE support on amd64 requires GCC option .endif +.endif .if ${PORT_OPTIONS:MGCC} USE_GCC?= yes @@ -165,12 +168,12 @@ post-install: -C ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB} \ "man/man$${SECTION}/*.$${SECTION}" || ${TRUE}; \ done - @${RM} -rf ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/man/cat? + ${RM} -rf ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/man/cat? .if ${PORT_OPTIONS:MDOCS} - @${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_DOCS} \ + ${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_DOCS} \ -C ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB} - @${INSTALL_DATA} ${WRKSRC}/lib/dialyzer/doc/*.txt \ + ${INSTALL_DATA} ${WRKSRC}/lib/dialyzer/doc/*.txt \ ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/dialyzer-*/doc/ .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410091253.s99CrhMZ067867>