Update to 1.2.1.

3 files changed, 77 insertions, 52 deletions

diff --git a/lang/lfe/Makefile b/lang/lfe/Makefile
index a2c0bfd3625e..1a3efe1b4c04 100644
--- a/lang/lfe/Makefile
+++ b/lang/lfe/Makefile
@@ -1,26 +1,35 @@
 # $FreeBSD$
 
 PORTNAME=	lfe
-PORTVERSION=	0.9.2
+PORTVERSION=	1.2.1
+DISTVERSIONPREFIX=	v
 CATEGORIES=	lang
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Lisp Flavored Erlang
 
 LICENSE=	APACHE20
 
+USES=		erlang gmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	rvirding
+ALL_TARGET=	compile
+PORTDOCS=	README.md
 
-USES=		erlang:rebar
+do-build:
+	cd ${BUILD_WRKSRC} && \
+	    ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET}
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${ERL_APP_ROOT}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/lfe ${STAGEDIR}${ERL_APP_ROOT}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/lfec ${STAGEDIR}${ERL_APP_ROOT}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/lfescript ${STAGEDIR}${ERL_APP_ROOT}/bin
-	${LN} -sf ${ERL_APP_ROOT}/bin/lfe ${STAGEDIR}${PREFIX}/bin
-	${LN} -sf ${ERL_APP_ROOT}/bin/lfec ${STAGEDIR}${PREFIX}/bin
-	${LN} -sf ${ERL_APP_ROOT}/bin/lfescript ${STAGEDIR}${PREFIX}/bin
+	${LN} -sf ${ERL_APP_ROOT:S,^${PREFIX}/,,:S,^,../,}/bin/lfe \
+	    ${STAGEDIR}${PREFIX}/bin
+	${LN} -sf ${ERL_APP_ROOT:S,^${PREFIX}/,,:S,^,../,}/bin/lfec \
+	    ${STAGEDIR}${PREFIX}/bin
+	${LN} -sf ${ERL_APP_ROOT:S,^${PREFIX}/,,:S,^,../,}/bin/lfescript \
+	    ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/lang/lfe/distinfo b/lang/lfe/distinfo
index bafb350ae3ff..ed1617c4681a 100644
--- a/lang/lfe/distinfo
+++ b/lang/lfe/distinfo
@@ -1,2 +1,3 @@
-SHA256 (rvirding-lfe-0.9.2_GH0.tar.gz) = 9ff9661d03432a5f111266e56dcc24f24ceb633541f560333c3ff1acafc20794
-SIZE (rvirding-lfe-0.9.2_GH0.tar.gz) = 216777
+TIMESTAMP = 1483226722
+SHA256 (rvirding-lfe-v1.2.1_GH0.tar.gz) = 1967c6d3f604ea3ba5013b021426d8a28f45eee47fd208109ef116af2e74ab23
+SIZE (rvirding-lfe-v1.2.1_GH0.tar.gz) = 312444
diff --git a/lang/lfe/pkg-plist b/lang/lfe/pkg-plist
index 6cc2e5ec7ad0..5f04a6958e2c 100644
--- a/lang/lfe/pkg-plist
+++ b/lang/lfe/pkg-plist
@@ -1,63 +1,78 @@
 bin/lfe
 bin/lfec
 bin/lfescript
-%%PORTDOCS%%%%DOCSDIR%%/README.md
-lib/erlang/lib/lfe-%%VERSION%%/priv/lfe_drv.so
-lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe_shell.beam
-lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe_qlc.beam
-lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe_io.beam
-lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe_macro_record.beam
-lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe_trans.beam
-lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe_io_format.beam
+lib/erlang/lib/lfe-%%VERSION%%/bin/lfe
+lib/erlang/lib/lfe-%%VERSION%%/bin/lfec
+lib/erlang/lib/lfe-%%VERSION%%/bin/lfescript
+lib/erlang/lib/lfe-%%VERSION%%/ebin/cl.beam
+lib/erlang/lib/lfe-%%VERSION%%/ebin/clj.beam
+lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe.app
+lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe.beam
+lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe_bits.beam
+lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe_codegen.beam
+lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe_comp.beam
+lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe_doc.beam
+lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe_edlin_expand.beam
+lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe_env.beam
+lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe_eval.beam
 lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe_gen.beam
-lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe_parse.beam
-lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe_pmod.beam
 lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe_init.beam
+lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe_io.beam
+lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe_io_format.beam
 lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe_io_pretty.beam
-lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe_bits.beam
+lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe_io_write.beam
 lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe_lib.beam
-lib/erlang/lib/lfe-%%VERSION%%/ebin/lfescript.beam
-lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe_macro.beam
 lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe_lint.beam
-lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe_eval.beam
-lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe_env.beam
-lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe.app
+lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe_macro.beam
+lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe_macro_export.beam
 lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe_macro_include.beam
-lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe_scan.beam
-lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe_comp.beam
-lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe_codegen.beam
+lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe_macro_record.beam
 lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe_ms.beam
+lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe_parse.beam
+lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe_pmod.beam
+lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe_qlc.beam
+lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe_scan.beam
+lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe_shell.beam
+lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe_trans.beam
+lib/erlang/lib/lfe-%%VERSION%%/ebin/lfescript.beam
+lib/erlang/lib/lfe-%%VERSION%%/include/cl.lfe
+lib/erlang/lib/lfe-%%VERSION%%/include/clj.lfe
 lib/erlang/lib/lfe-%%VERSION%%/include/match-spec.lfe
-lib/erlang/lib/lfe-%%VERSION%%/src/lfe_io_pretty.erl
+lib/erlang/lib/lfe-%%VERSION%%/src/ChangeLog
+lib/erlang/lib/lfe-%%VERSION%%/src/NOTES
+lib/erlang/lib/lfe-%%VERSION%%/src/cl.lfe
+lib/erlang/lib/lfe-%%VERSION%%/src/clj.lfe
+lib/erlang/lib/lfe-%%VERSION%%/src/lfe.app.src
+lib/erlang/lib/lfe-%%VERSION%%/src/lfe.erl
+lib/erlang/lib/lfe-%%VERSION%%/src/lfe.hrl
 lib/erlang/lib/lfe-%%VERSION%%/src/lfe_bits.erl
-lib/erlang/lib/lfe-%%VERSION%%/src/lfe_gen.erl
-lib/erlang/lib/lfe-%%VERSION%%/src/lfe_macro_record.erl
+lib/erlang/lib/lfe-%%VERSION%%/src/lfe_codegen.erl
+lib/erlang/lib/lfe-%%VERSION%%/src/lfe_comp.erl
+lib/erlang/lib/lfe-%%VERSION%%/src/lfe_comp.hrl
+lib/erlang/lib/lfe-%%VERSION%%/src/lfe_doc.erl
+lib/erlang/lib/lfe-%%VERSION%%/src/lfe_doc.hrl
+lib/erlang/lib/lfe-%%VERSION%%/src/lfe_edlin_expand.erl
 lib/erlang/lib/lfe-%%VERSION%%/src/lfe_env.erl
-lib/erlang/lib/lfe-%%VERSION%%/src/lfescript.erl
+lib/erlang/lib/lfe-%%VERSION%%/src/lfe_eval.erl
+lib/erlang/lib/lfe-%%VERSION%%/src/lfe_gen.erl
+lib/erlang/lib/lfe-%%VERSION%%/src/lfe_init.erl
+lib/erlang/lib/lfe-%%VERSION%%/src/lfe_io.erl
+lib/erlang/lib/lfe-%%VERSION%%/src/lfe_io_format.erl
+lib/erlang/lib/lfe-%%VERSION%%/src/lfe_io_pretty.erl
+lib/erlang/lib/lfe-%%VERSION%%/src/lfe_io_write.erl
+lib/erlang/lib/lfe-%%VERSION%%/src/lfe_lib.erl
 lib/erlang/lib/lfe-%%VERSION%%/src/lfe_lint.erl
+lib/erlang/lib/lfe-%%VERSION%%/src/lfe_macro.erl
 lib/erlang/lib/lfe-%%VERSION%%/src/lfe_macro.hrl
-lib/erlang/lib/lfe-%%VERSION%%/src/lfe_comp.hrl
-lib/erlang/lib/lfe-%%VERSION%%/src/ChangeLog
-lib/erlang/lib/lfe-%%VERSION%%/src/lfe_lib.erl
-lib/erlang/lib/lfe-%%VERSION%%/src/lfe.app.src
+lib/erlang/lib/lfe-%%VERSION%%/src/lfe_macro_export.erl
 lib/erlang/lib/lfe-%%VERSION%%/src/lfe_macro_include.erl
-lib/erlang/lib/lfe-%%VERSION%%/src/lfe_pmod.erl
-lib/erlang/lib/lfe-%%VERSION%%/src/lfe_init.erl
-lib/erlang/lib/lfe-%%VERSION%%/src/lfe_eval.erl
-lib/erlang/lib/lfe-%%VERSION%%/src/lfe_scan.xrl
-lib/erlang/lib/lfe-%%VERSION%%/src/lfe_io_format.erl
+lib/erlang/lib/lfe-%%VERSION%%/src/lfe_macro_record.erl
+lib/erlang/lib/lfe-%%VERSION%%/src/lfe_ms.erl
 lib/erlang/lib/lfe-%%VERSION%%/src/lfe_parse.erl
-lib/erlang/lib/lfe-%%VERSION%%/src/lfe_codegen.erl
-lib/erlang/lib/lfe-%%VERSION%%/src/NOTES
-lib/erlang/lib/lfe-%%VERSION%%/src/lfe_scan.erl
-lib/erlang/lib/lfe-%%VERSION%%/src/lfe_trans.erl
-lib/erlang/lib/lfe-%%VERSION%%/src/lfe_comp.erl
-lib/erlang/lib/lfe-%%VERSION%%/src/lfe.hrl
+lib/erlang/lib/lfe-%%VERSION%%/src/lfe_parse.spell1
+lib/erlang/lib/lfe-%%VERSION%%/src/lfe_pmod.erl
 lib/erlang/lib/lfe-%%VERSION%%/src/lfe_qlc.erl
+lib/erlang/lib/lfe-%%VERSION%%/src/lfe_scan.xrl
 lib/erlang/lib/lfe-%%VERSION%%/src/lfe_shell.erl
-lib/erlang/lib/lfe-%%VERSION%%/src/lfe_macro.erl
-lib/erlang/lib/lfe-%%VERSION%%/src/lfe_ms.erl
-lib/erlang/lib/lfe-%%VERSION%%/src/lfe_io.erl
-lib/erlang/lib/lfe-%%VERSION%%/bin/lfescript
-lib/erlang/lib/lfe-%%VERSION%%/bin/lfec
-lib/erlang/lib/lfe-%%VERSION%%/bin/lfe
+lib/erlang/lib/lfe-%%VERSION%%/src/lfe_trans.erl
+lib/erlang/lib/lfe-%%VERSION%%/src/lfescript.erl