Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 23 Jan 2016 06:42:45 +0000 (UTC)
From:      Antoine Brodin <antoine@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r406960 - head/Mk/Uses
Message-ID:  <201601230642.u0N6gjf4097290@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601230642.u0N6gjf4097290>