22 files changed, 40 insertions, 23 deletions

diff --git a/lang/elixir/bsd.elixir.mk b/Mk/Uses/elixir.mk
index b4fd43d31a81..fed8ea3cf8be 100644
--- a/lang/elixir/bsd.elixir.mk
+++ b/Mk/Uses/elixir.mk
@@ -1,6 +1,12 @@
 # $FreeBSD$
 #
-# bsd.elixir.mk - Helper for Elixir applications
+# Handle Elixir related ports
+#
+# Feature:	elixir
+# Usage:	USES=elixir
+# Valid ARGS:	does not require args
+#
+# Additional variables:
 #
 # ELIXIR_APP_NAME	- Elixir app name as installed in Elixir's lib directory
 # ELIXIR_APP_ROOT	- Root directory for this Elixir app
@@ -9,7 +15,7 @@
 # MIX_CMD		- The "mix" command
 # MIX_COMPILE		- The "mix" command used to compile an Elixir app
 # MIX_BUILD_DEPS	- List of BUILD_DEPENDS in category/portname format
-# 			  (commonly referenced to as "deps" in Erlang and Elixir)
+# 			(commonly referenced to as "deps" in Erlang and Elixir)
 # MIX_RUN_DEPS		- List of RUN_DEPENDS in category/portname format
 # MIX_DOC_DIRS		- Extra doc directories to be installed in DOCSDIR
 # MIX_DOC_FILES		- Extra doc files to be installed in DOCSDIR (usually README.md)
@@ -18,6 +24,15 @@
 # MIX_EXTRA_APPS	- List of sub-applications to be built, if any
 # MIX_EXTRA_DIRS	- List of extra directories to be installed in ELIXIR_APP_ROOT
 # MIX_EXTRA_FILES	- List of extra files to be installed in ELIXIR_APP_ROOT
+#
+# MAINTAINER: olgeni@FreeBSD.org
+
+.if !defined(_INCLUDE_USES_ELIXIR_MK)
+_INCLUDE_USES_ELIXIR_MK=yes
+
+.if !empty(elixir_ARGS)
+IGNORE=	USES=elixir does not require args
+.endif
 
 ELIXIR_APP_NAME?=	${PORTNAME}
 ELIXIR_APP_ROOT?=	${PREFIX}/lib/elixir/lib/${ELIXIR_APP_NAME}
@@ -93,3 +108,5 @@ do-install-elixir:
 	${INSTALL_DATA} ${WRKSRC}/${app}/_build/${MIX_BUILD_NAME}/lib/*/ebin/* \
 		${STAGEDIR}${ELIXIR_APP_ROOT}/ebin
 .endfor
+
+.endif #!defined(_INCLUDE_USES_ELIXIR_MK)
diff --git a/databases/elixir-ecto/Makefile b/databases/elixir-ecto/Makefile
index 55e17608b1b3..11e00107676b 100644
--- a/databases/elixir-ecto/Makefile
+++ b/databases/elixir-ecto/Makefile
@@ -11,6 +11,7 @@ COMMENT=	Database wrapper and language integrated query for Elixir
 
 LICENSE=	APACHE20
 
+USES=		elixir
 USE_GITHUB=	yes
 GH_ACCOUNT=	elixir-lang
 
@@ -19,5 +20,4 @@ MIX_BUILD_DEPS=	devel/elixir-decimal \
 		devel/erlang-poolboy
 MIX_RUN_DEPS:=	${MIX_BUILD_DEPS}
 
-.include "${.CURDIR}/../../lang/elixir/bsd.elixir.mk"
 .include <bsd.port.mk>
diff --git a/databases/elixir-mariaex/Makefile b/databases/elixir-mariaex/Makefile
index ecba74ba7e64..b31a371c64aa 100644
--- a/databases/elixir-mariaex/Makefile
+++ b/databases/elixir-mariaex/Makefile
@@ -11,11 +11,11 @@ COMMENT=	Database driver for MariaDB and MySQL written in Elixir
 
 LICENSE=	APACHE20
 
+USES=		elixir
 USE_GITHUB=	yes
 GH_ACCOUNT=	xerions
 
 MIX_BUILD_DEPS=	devel/elixir-decimal
 MIX_RUN_DEPS:=	${MIX_BUILD_DEPS}
 
-.include "${.CURDIR}/../../lang/elixir/bsd.elixir.mk"
 .include <bsd.port.mk>
diff --git a/databases/elixir-postgrex/Makefile b/databases/elixir-postgrex/Makefile
index 51d6e95fca9d..87a3b8ea4a52 100644
--- a/databases/elixir-postgrex/Makefile
+++ b/databases/elixir-postgrex/Makefile
@@ -11,6 +11,7 @@ COMMENT=	Database driver for PostgreSQL written in Elixir
 
 LICENSE=	APACHE20
 
+USES=		elixir
 USE_GITHUB=	yes
 GH_ACCOUNT=	ericmj
 
@@ -18,5 +19,4 @@ MIX_BUILD_NAME=	shared
 MIX_BUILD_DEPS=	devel/elixir-decimal
 MIX_RUN_DEPS:=	${MIX_BUILD_DEPS}
 
-.include "${.CURDIR}/../../lang/elixir/bsd.elixir.mk"
 .include <bsd.port.mk>
diff --git a/devel/elixir-conform/Makefile b/devel/elixir-conform/Makefile
index 98577c4b3259..6d0dfd3f2da4 100644
--- a/devel/elixir-conform/Makefile
+++ b/devel/elixir-conform/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Easy release configuration for Elixir apps
 LICENSE=	APACHE20 MIT
 LICENSE_COMB=	multi
 
+USES=		elixir
 USE_GITHUB=	yes
 GH_ACCOUNT=	bitwalker
 
 MIX_BUILD_DEPS=	devel/erlang-neotoma
 MIX_RUN_DEPS:=	${MIX_BUILD_DEPS}
 
-.include "${.CURDIR}/../../lang/elixir/bsd.elixir.mk"
 .include <bsd.port.mk>
diff --git a/devel/elixir-decimal/Makefile b/devel/elixir-decimal/Makefile
index 2a897357ee8f..d3b0acece561 100644
--- a/devel/elixir-decimal/Makefile
+++ b/devel/elixir-decimal/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Arbitrary precision decimal arithmetic for Elixir
 
 LICENSE=	APACHE20
 
+USES=		elixir
 USE_GITHUB=	yes
 GH_ACCOUNT=	ericmj
 
-.include "${.CURDIR}/../../lang/elixir/bsd.elixir.mk"
 .include <bsd.port.mk>
diff --git a/devel/elixir-dialyze/Makefile b/devel/elixir-dialyze/Makefile
index adbad3cbef81..5c7cb647bb90 100644
--- a/devel/elixir-dialyze/Makefile
+++ b/devel/elixir-dialyze/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Mix dialyzer task
 
 LICENSE=	APACHE20
 
+USES=		elixir
 USE_GITHUB=	yes
 GH_ACCOUNT=	fishcakez
 
-.include "${.CURDIR}/../../lang/elixir/bsd.elixir.mk"
 .include <bsd.port.mk>
diff --git a/devel/elixir-exjsx/Makefile b/devel/elixir-exjsx/Makefile
index 12d216d411c2..0b169877e02e 100644
--- a/devel/elixir-exjsx/Makefile
+++ b/devel/elixir-exjsx/Makefile
@@ -11,11 +11,11 @@ COMMENT=	JSON library for Elixir
 
 LICENSE=	MIT
 
+USES=		elixir
 USE_GITHUB=	yes
 GH_ACCOUNT=	talentdeficit
 
 MIX_BUILD_DEPS=	devel/erlang-jsx
 MIX_RUN_DEPS:=	${MIX_BUILD_DEPS}
 
-.include "${.CURDIR}/../../lang/elixir/bsd.elixir.mk"
 .include <bsd.port.mk>
diff --git a/devel/elixir-exrm/Makefile b/devel/elixir-exrm/Makefile
index 0667f90b9356..f801c340006f 100644
--- a/devel/elixir-exrm/Makefile
+++ b/devel/elixir-exrm/Makefile
@@ -10,6 +10,7 @@ COMMENT=	Automatically generate releases for Elixir projects
 
 LICENSE=	MIT
 
+USES=		elixir
 USE_GITHUB=	yes
 GH_ACCOUNT=	bitwalker
 
@@ -17,5 +18,4 @@ MIX_BUILD_DEPS=	devel/relx \
 		devel/elixir-conform
 MIX_RUN_DEPS:=	${MIX_BUILD_DEPS}
 
-.include "${.CURDIR}/../../lang/elixir/bsd.elixir.mk"
 .include <bsd.port.mk>
diff --git a/devel/elixir-lager_logger/Makefile b/devel/elixir-lager_logger/Makefile
index f5869e70ffeb..bb6f43b868ee 100644
--- a/devel/elixir-lager_logger/Makefile
+++ b/devel/elixir-lager_logger/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Lager backend for Elixir's Logger
 
 LICENSE=	APACHE20
 
+USES=		elixir
 USE_GITHUB=	yes
 GH_ACCOUNT=	PSPDFKit-labs
 
-.include "${.CURDIR}/../../lang/elixir/bsd.elixir.mk"
 .include <bsd.port.mk>
diff --git a/devel/elixir-plug/Makefile b/devel/elixir-plug/Makefile
index 285ea7eb3b4b..2b34f71dc51a 100644
--- a/devel/elixir-plug/Makefile
+++ b/devel/elixir-plug/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Composable modules for Elixir web applications
 
 LICENSE=	APACHE20
 
+USES=		elixir
 USE_GITHUB=	yes
 GH_ACCOUNT=	elixir-lang
 
-.include "${.CURDIR}/../../lang/elixir/bsd.elixir.mk"
 .include <bsd.port.mk>
diff --git a/devel/elixir-poison/Makefile b/devel/elixir-poison/Makefile
index 939b7db9b89a..bb4a71c8cdf8 100644
--- a/devel/elixir-poison/Makefile
+++ b/devel/elixir-poison/Makefile
@@ -10,8 +10,8 @@ COMMENT=	Pure Elixir JSON library
 
 LICENSE=	ISCL
 
+USES=		elixir
 USE_GITHUB=	yes
 GH_ACCOUNT=	devinus
 
-.include "${.CURDIR}/../../lang/elixir/bsd.elixir.mk"
 .include <bsd.port.mk>
diff --git a/devel/elixir-timex-interval/Makefile b/devel/elixir-timex-interval/Makefile
index 7eca2195c82c..8cdd8da4053d 100644
--- a/devel/elixir-timex-interval/Makefile
+++ b/devel/elixir-timex-interval/Makefile
@@ -10,6 +10,7 @@ COMMENT=	Date/time interval library for Elixir
 
 LICENSE=	APACHE20
 
+USES=		elixir
 USE_GITHUB=	yes
 GH_ACCOUNT=	bitwalker
 
@@ -17,5 +18,4 @@ ELIXIR_APP_NAME=timex_interval
 MIX_BUILD_DEPS=	devel/elixir-timex
 MIX_RUN_DEPS:=	${MIX_BUILD_DEPS}
 
-.include "${.CURDIR}/../../lang/elixir/bsd.elixir.mk"
 .include <bsd.port.mk>
diff --git a/devel/elixir-timex/Makefile b/devel/elixir-timex/Makefile
index e8df0c92204c..5ba3d672c954 100644
--- a/devel/elixir-timex/Makefile
+++ b/devel/elixir-timex/Makefile
@@ -10,11 +10,11 @@ COMMENT=	Complete date/time library for Elixir
 
 LICENSE=	MIT
 
+USES=		elixir
 USE_GITHUB=	yes
 GH_ACCOUNT=	bitwalker
 
 MIX_BUILD_DEPS=	devel/elixir-tzdata
 MIX_RUN_DEPS:=	${MIX_BUILD_DEPS}
 
-.include "${.CURDIR}/../../lang/elixir/bsd.elixir.mk"
 .include <bsd.port.mk>
diff --git a/devel/elixir-tzdata/Makefile b/devel/elixir-tzdata/Makefile
index df8ed0cac9c5..70a3be18fdac 100644
--- a/devel/elixir-tzdata/Makefile
+++ b/devel/elixir-tzdata/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Time zone data for Elixir
 
 LICENSE=	MIT
 
+USES=		elixir
 USE_GITHUB=	yes
 GH_ACCOUNT=	lau
 
-.include "${.CURDIR}/../../lang/elixir/bsd.elixir.mk"
 .include <bsd.port.mk>
diff --git a/textproc/elixir-earmark/Makefile b/textproc/elixir-earmark/Makefile
index 9759206cb856..c9d1a95fac0c 100644
--- a/textproc/elixir-earmark/Makefile
+++ b/textproc/elixir-earmark/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Markdown parser for Elixir
 
 LICENSE=	APACHE20
 
+USES=		elixir
 USE_GITHUB=	yes
 GH_ACCOUNT=	pragdave
 GH_TAGNAME=	07914f5
 
-.include "${.CURDIR}/../../lang/elixir/bsd.elixir.mk"
 .include <bsd.port.mk>
diff --git a/textproc/elixir-ex_doc/Makefile b/textproc/elixir-ex_doc/Makefile
index c8468e967d2d..8033eb2e5bb2 100644
--- a/textproc/elixir-ex_doc/Makefile
+++ b/textproc/elixir-ex_doc/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Tool to generate documentation for Elixir projects
 LICENSE=	APACHE20 MIT
 LICENSE_COMB=	multi
 
+USES=		elixir
 USE_GITHUB=	yes
 GH_ACCOUNT=	elixir-lang
 
 MIX_BUILD_DEPS=	textproc/elixir-earmark
 MIX_RUN_DEPS:=	${MIX_BUILD_DEPS}
 
-.include "${.CURDIR}/../../lang/elixir/bsd.elixir.mk"
 .include <bsd.port.mk>
diff --git a/www/elixir-maru/Makefile b/www/elixir-maru/Makefile
index a0a07594b37f..81909a8296c2 100644
--- a/www/elixir-maru/Makefile
+++ b/www/elixir-maru/Makefile
@@ -11,6 +11,7 @@ COMMENT=	Elixir RESTful framework
 
 LICENSE=	BSD3CLAUSE
 
+USES=		elixir
 USE_GITHUB=	yes
 GH_ACCOUNT=	falood
 
@@ -20,5 +21,4 @@ MIX_BUILD_DEPS=	devel/elixir-plug \
 MIX_RUN_DEPS:=	${MIX_BUILD_DEPS}
 MIX_DOC_DIRS=	guide
 
-.include "${.CURDIR}/../../lang/elixir/bsd.elixir.mk"
 .include <bsd.port.mk>
diff --git a/www/elixir-phoenix/Makefile b/www/elixir-phoenix/Makefile
index 4fb3795551b7..4d7ef36c2661 100644
--- a/www/elixir-phoenix/Makefile
+++ b/www/elixir-phoenix/Makefile
@@ -12,6 +12,7 @@ COMMENT=	Web framework for Elixir
 
 LICENSE=	MIT
 
+USES=		elixir
 USE_GITHUB=	yes
 GH_ACCOUNT=	phoenixframework
 
@@ -29,5 +30,4 @@ MIX_RUN_DEPS:=	${MIX_BUILD_DEPS}
 MIX_EXTRA_APPS=	installer
 MIX_EXTRA_DIRS=	installer/lib installer/templates
 
-.include "${.CURDIR}/../../lang/elixir/bsd.elixir.mk"
 .include <bsd.port.mk>
diff --git a/www/elixir-phoenix_ecto/Makefile b/www/elixir-phoenix_ecto/Makefile
index cb4f1820594e..b8fe0b8de173 100644
--- a/www/elixir-phoenix_ecto/Makefile
+++ b/www/elixir-phoenix_ecto/Makefile
@@ -11,6 +11,7 @@ COMMENT=	Ecto integration for the Phoenix framework
 
 LICENSE=	MIT
 
+USES=		elixir
 USE_GITHUB=	yes
 GH_ACCOUNT=	phoenixframework
 
@@ -19,5 +20,4 @@ MIX_BUILD_DEPS=	databases/elixir-ecto \
 		devel/elixir-poison
 MIX_RUN_DEPS:=	${MIX_BUILD_DEPS}
 
-.include "${.CURDIR}/../../lang/elixir/bsd.elixir.mk"
 .include <bsd.port.mk>
diff --git a/www/elixir-phoenix_html/Makefile b/www/elixir-phoenix_html/Makefile
index f8fe34d94ae5..fa0fa93c7595 100644
--- a/www/elixir-phoenix_html/Makefile
+++ b/www/elixir-phoenix_html/Makefile
@@ -11,11 +11,11 @@ COMMENT=	Functions for working with HTML from Phoenix
 
 LICENSE=	MIT
 
+USES=		elixir
 USE_GITHUB=	yes
 GH_ACCOUNT=	phoenixframework
 
 MIX_BUILD_DEPS=	devel/elixir-plug
 MIX_RUN_DEPS:=	${MIX_BUILD_DEPS}
 
-.include "${.CURDIR}/../../lang/elixir/bsd.elixir.mk"
 .include <bsd.port.mk>
diff --git a/www/elixir-webassembly/Makefile b/www/elixir-webassembly/Makefile
index 2da5265a1830..53f96bf0a3b8 100644
--- a/www/elixir-webassembly/Makefile
+++ b/www/elixir-webassembly/Makefile
@@ -11,8 +11,8 @@ COMMENT=	DSL for creating HTML structure straight with Elixir blocks.
 
 LICENSE=	BSD2CLAUSE
 
+USES=		elixir
 USE_GITHUB=	yes
 GH_ACCOUNT=	herenowcoder
 
-.include "${.CURDIR}/../../lang/elixir/bsd.elixir.mk"
 .include <bsd.port.mk>