From owner-svn-ports-head@FreeBSD.ORG Thu Oct 9 12:53:43 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 94CD86E3; Thu, 9 Oct 2014 12:53:43 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 806BE9E3; Thu, 9 Oct 2014 12:53:43 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s99CrhPs067869; Thu, 9 Oct 2014 12:53:43 GMT (envelope-from olgeni@FreeBSD.org) Received: (from olgeni@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s99CrhMZ067867; Thu, 9 Oct 2014 12:53:43 GMT (envelope-from olgeni@FreeBSD.org) Message-Id: <201410091253.s99CrhMZ067867@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: olgeni set sender to olgeni@FreeBSD.org using -f From: Jimmy Olgeni Date: Thu, 9 Oct 2014 12:53:43 +0000 (UTC) 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 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Oct 2014 12:53:43 -0000 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