From owner-svn-ports-head@freebsd.org Sat Jan 23 06:42:47 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 29FB4A8EFF7; Sat, 23 Jan 2016 06:42:47 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 EEBCE10AF; Sat, 23 Jan 2016 06:42:46 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0N6gkOU097291; Sat, 23 Jan 2016 06:42:46 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0N6gjf4097290; Sat, 23 Jan 2016 06:42:45 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201601230642.u0N6gjf4097290@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Sat, 23 Jan 2016 06:42:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r406960 - head/Mk/Uses 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.20 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: Sat, 23 Jan 2016 06:42:47 -0000 Author: antoine Date: Sat Jan 23 06:42:45 2016 New Revision: 406960 URL: https://svnweb.freebsd.org/changeset/ports/406960 Log: Revert r406955, it break INDEX with fmake With hat: portmgr Reported by: beefy1, beefy2 Modified: head/Mk/Uses/elixir.mk Modified: head/Mk/Uses/elixir.mk ============================================================================== --- head/Mk/Uses/elixir.mk Sat Jan 23 02:58:20 2016 (r406959) +++ head/Mk/Uses/elixir.mk Sat Jan 23 06:42:45 2016 (r406960) @@ -72,14 +72,7 @@ RUN_DEPENDS+= ${depend:T}>=0:${PORTSDIR} .if !target(do-build) do-build: .if ${MIX_REWRITE} != "" - @${REINPLACE_CMD} -i '' -E -e "s@{.*(only|optional): .*},?@@" ${WRKSRC}/mix.exs -.for depend in ${MIX_BUILD_DEPS} -.if ${depend:T} != ${depend:T:S/erlang-//} - @${REINPLACE_CMD} -i '' -E -e "s@{ *:(${depend:T:S/erlang-//}), *(github:|\").*} *,?@@" ${WRKSRC}/mix.exs -.else - @${REINPLACE_CMD} -i '' -E -e "s@{ *:(${depend:T:S/elixir-//}), *(github:|\").*}@{ :\1, path: \"${ELIXIR_LIB_ROOT}/\\1\", compile: false }@" ${WRKSRC}/mix.exs -.endif -.endfor + @${REINPLACE_CMD} -i '' -E -e "s@{.*(only|optional): .*},?@@; s@{ *:([a-zA-Z0-9_]+), *(github:|\").*}@{ :\1, path: \"${ELIXIR_LIB_ROOT}/\\1\", compile: false }@" ${WRKSRC}/mix.exs .endif @${RM} -f ${WRKSRC}/mix.lock @cd ${WRKSRC} && ${MIX_COMPILE}