git: f634fc8e1c03 - main - Apply portfmt to Erlang ports.

Jimmy Olgeni olgeni at FreeBSD.org
Sat Apr 10 19:26:00 UTC 2021


The branch main has been updated by olgeni:

URL: https://cgit.FreeBSD.org/ports/commit/?id=f634fc8e1c03d7c163e0b2e70566e8e19c2437e9

commit f634fc8e1c03d7c163e0b2e70566e8e19c2437e9
Author:     Jimmy Olgeni <olgeni at FreeBSD.org>
AuthorDate: 2021-04-08 07:58:18 +0000
Commit:     Jimmy Olgeni <olgeni at FreeBSD.org>
CommitDate: 2021-04-10 19:25:39 +0000

    Apply portfmt to Erlang ports.
---
 lang/erlang-doc/Makefile       | 29 ++++++++++----------
 lang/erlang-java/Makefile      |  9 ++++---
 lang/erlang-runtime20/Makefile | 51 ++++++++++++++++++-----------------
 lang/erlang-runtime21/Makefile | 53 +++++++++++++++++++-----------------
 lang/erlang-runtime22/Makefile | 53 +++++++++++++++++++-----------------
 lang/erlang-runtime23/Makefile | 53 +++++++++++++++++++-----------------
 lang/erlang-wx/Makefile        |  7 +++--
 lang/erlang/Makefile           | 61 +++++++++++++++++++++++-------------------
 8 files changed, 170 insertions(+), 146 deletions(-)

diff --git a/lang/erlang-doc/Makefile b/lang/erlang-doc/Makefile
index 48cc21044caf..54f90d58deeb 100644
--- a/lang/erlang-doc/Makefile
+++ b/lang/erlang-doc/Makefile
@@ -3,17 +3,18 @@
 PORTNAME=	erlang
 PORTVERSION=	21.3
 CATEGORIES=	lang parallel
-MASTER_SITES=	http://www.erlang.org/download/:erlangorg			\
-		http://erlang.stacken.kth.se/download/:erlangorg		\
-		http://www.csd.uu.se/ftp/mirror/erlang/download/:erlangorg	\
-		http://olgeni.olgeni.com/~olgeni/distfiles/:local		\
-		LOCAL/olgeni:local						\
-		http://www.erlang.se/doc/:erlangse				\
-		http://www.erlang.se/publications/:publications			\
+MASTER_SITES=	http://www.erlang.org/download/:erlangorg \
+		http://erlang.stacken.kth.se/download/:erlangorg \
+		http://www.csd.uu.se/ftp/mirror/erlang/download/:erlangorg \
+		http://olgeni.olgeni.com/~olgeni/distfiles/:local \
+		LOCAL/olgeni:local \
+		http://www.erlang.se/doc/:erlangse \
+		http://www.erlang.se/publications/:publications \
 		http://www.sics.se/~joe/thesis/:joe
-PKGNAMESUFFIX=  -doc
+PKGNAMESUFFIX=	-doc
 DISTNAME=	otp_doc_html_${PORTVERSION}
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:erlangorg ${BOOK_DISTFILES}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:erlangorg \
+		${BOOK_DISTFILES}
 DIST_SUBDIR=	erlang
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
@@ -27,11 +28,11 @@ NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}
 SUB_FILES=	pkg-message
 
-BOOK_DISTFILES=	armstrong_thesis_2003.pdf:local		\
-		bjarnelic.pdf:publications		\
-		erlang-book-part1.pdf:erlangorg		\
-		master_thesis_patterns.pdf:local	\
-		mnesia_overview.pdf:publications	\
+BOOK_DISTFILES=	armstrong_thesis_2003.pdf:local \
+		bjarnelic.pdf:publications \
+		erlang-book-part1.pdf:erlangorg \
+		master_thesis_patterns.pdf:local \
+		mnesia_overview.pdf:publications \
 		programming_rules.pdf:erlangse
 
 do-extract:
diff --git a/lang/erlang-java/Makefile b/lang/erlang-java/Makefile
index 7e20eac003c9..47d91b964822 100644
--- a/lang/erlang-java/Makefile
+++ b/lang/erlang-java/Makefile
@@ -20,15 +20,18 @@ USE_JAVA=	yes
 USE_PERL5=	build
 
 GNU_CONFIGURE=	yes
-MAKE_JOBS_UNSAFE=yes
+MAKE_JOBS_UNSAFE=	yes
 
 PLIST_SUB=	APP_VERSION=${APP_VERSION}
 
 APP_VERSION=	1.9.1
 APP_DIR=	${PREFIX}/lib/erlang/lib/jinterface-${APP_VERSION}
 
-CONFIGURE_ARGS+=--enable-threads --without-odbc --with-javac --without-wx
-CONFIGURE_ENV+=	ac_cv_prog_JAVAC="${JAVAC}"
+CONFIGURE_ARGS+=	--enable-threads \
+			--with-javac \
+			--without-odbc \
+			--without-wx
+CONFIGURE_ENV+=		ac_cv_prog_JAVAC="${JAVAC}"
 
 pre-configure:
 	@if [ ! $$(${CAT} ${WRKSRC}/lib/jinterface/vsn.mk | ${GREP} -E "JINTERFACE_VSN *=" | ${CUT} -w -f3) = ${APP_VERSION} ]; then \
diff --git a/lang/erlang-runtime20/Makefile b/lang/erlang-runtime20/Makefile
index 360727c0066d..3b43bc61c5c7 100644
--- a/lang/erlang-runtime20/Makefile
+++ b/lang/erlang-runtime20/Makefile
@@ -21,15 +21,16 @@ GH_PROJECT=	otp
 USE_PERL5=	build
 
 GNU_CONFIGURE=	yes
-MAKE_JOBS_UNSAFE=yes
+MAKE_JOBS_UNSAFE=	yes
 
 SUB_FILES=	pkg-message
 SUB_LIST=	ERLANG_LIB=${ERLANG_LIB}
 
 ERLANG_LIB=	${PORTNAME}${PORTVERSION:C/\..*//}
 
-OPTIONS_DEFINE=	DIRTY DTRACE HIPE JAVA KQUEUE NATIVE ODBC OPENSSL SCTP THREADS WX
-OPTIONS_DEFAULT=DIRTY DTRACE HIPE KQUEUE OPENSSL SCTP THREADS
+OPTIONS_DEFINE=		DIRTY DTRACE HIPE JAVA KQUEUE NATIVE ODBC OPENSSL SCTP \
+			THREADS WX
+OPTIONS_DEFAULT=	DIRTY DTRACE HIPE KQUEUE OPENSSL SCTP THREADS
 OPTIONS_EXCLUDE_powerpc64=	HIPE
 OPTIONS_EXCLUDE_riscv64=	DTRACE
 
@@ -49,9 +50,9 @@ OPTIONS_EXCLUDE+=	DTRACE
 OPTIONS_EXCLUDE_DragonFly=	HIPE NATIVE SCTP
 # ld(1) fails to link probes: missing __dtrace_erlang___* symbols
 OPTIONS_EXCLUDE_aarch64=	DTRACE
-OPTIONS_EXCLUDE_armv6=		DTRACE
-OPTIONS_EXCLUDE_armv7=		DTRACE
-OPTIONS_EXCLUDE_i386=		DTRACE NATIVE HIPE
+OPTIONS_EXCLUDE_armv6=	DTRACE
+OPTIONS_EXCLUDE_armv7=	DTRACE
+OPTIONS_EXCLUDE_i386=	DTRACE HIPE NATIVE
 
 OPENSSL_VARS=	BROKEN_SSL=openssl
 
@@ -61,25 +62,27 @@ OPENSSL_VARS=	BROKEN_SSL=openssl
 
 CONFIGURE_ENABLE=	smp-support
 
-DIRTY_CONFIGURE_ENABLE=	dirty-schedulers
-DTRACE_CFLAGS=		-fno-omit-frame-pointer
-DTRACE_CONFIGURE_WITH=	dynamic-trace=dtrace
-DTRACE_VARS=		STRIP=""
-HIPE_CONFIGURE_ENABLE=	hipe
-JAVA_CONFIGURE_ENV=	ac_cv_prog_JAVAC="${JAVAC}"
-JAVA_CONFIGURE_WITH=	javac
-JAVA_VARS=		USE_JAVA=yes
-KQUEUE_CONFIGURE_ENABLE=kernel-poll
-NATIVE_CONFIGURE_ENABLE=native-libs
-ODBC_CONFIGURE_WITH=	odbc
-ODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
-OPENSSL_CONFIGURE_WITH=	ssl=${OPENSSLBASE}
-OPENSSL_USES=		ssl
-SCTP_CONFIGURE_ENABLE=	sctp
+DIRTY_CONFIGURE_ENABLE=		dirty-schedulers
+DTRACE_CFLAGS=			-fno-omit-frame-pointer
+DTRACE_CONFIGURE_WITH=		dynamic-trace=dtrace
+DTRACE_VARS=			STRIP=""
+HIPE_CONFIGURE_ENABLE=		hipe
+JAVA_CONFIGURE_ENV=		ac_cv_prog_JAVAC="${JAVAC}"
+JAVA_CONFIGURE_WITH=		javac
+JAVA_VARS=			USE_JAVA=yes
+KQUEUE_CONFIGURE_ENABLE=	kernel-poll
+NATIVE_CONFIGURE_ENABLE=	native-libs
+ODBC_CONFIGURE_WITH=		odbc
+ODBC_LIB_DEPENDS=		libodbc.so:databases/unixODBC
+OPENSSL_CONFIGURE_WITH=		ssl=${OPENSSLBASE}
+OPENSSL_USES=			ssl
+SCTP_CONFIGURE_ENABLE=		sctp
 THREADS_CONFIGURE_ENABLE=	threads
-WX_CONFIGURE_WITH=	wx-config=${WX_CONFIG}
-WX_USES=		gl
-WX_VARS=		USE_WX=2.8+ WX_COMPS="wx contrib" USE_GL="gl glu"
+WX_CONFIGURE_WITH=		wx-config=${WX_CONFIG}
+WX_USES=			gl
+WX_VARS=			USE_GL="gl glu" \
+				USE_WX=2.8+ \
+				WX_COMPS="wx contrib"
 
 .include <bsd.port.pre.mk>
 
diff --git a/lang/erlang-runtime21/Makefile b/lang/erlang-runtime21/Makefile
index 79d3f1e2cb0d..31de70472ce3 100644
--- a/lang/erlang-runtime21/Makefile
+++ b/lang/erlang-runtime21/Makefile
@@ -23,19 +23,20 @@ GH_PROJECT=	otp:otp corba:corba
 GH_TAGNAME=	4.5.2:corba
 USE_PERL5=	build
 
-DATADIR=        ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
+DATADIR=	${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
 WRKSRC=		${WRKSRC_otp}
 
 GNU_CONFIGURE=	yes
-MAKE_JOBS_UNSAFE=yes
+MAKE_JOBS_UNSAFE=	yes
 
 SUB_FILES=	pkg-message
 SUB_LIST=	ERLANG_LIB=${ERLANG_LIB}
 
 ERLANG_LIB=	${PORTNAME}${PORTVERSION:C/\..*//}
 
-OPTIONS_DEFINE=	CORBA DIRTY DTRACE HIPE JAVA KQUEUE NATIVE ODBC OPENSSL SCTP THREADS WX
-OPTIONS_DEFAULT=CORBA DIRTY DTRACE HIPE KQUEUE OPENSSL SCTP THREADS
+OPTIONS_DEFINE=		CORBA DIRTY DTRACE HIPE JAVA KQUEUE NATIVE ODBC OPENSSL \
+			SCTP THREADS WX
+OPTIONS_DEFAULT=	CORBA DIRTY DTRACE HIPE KQUEUE OPENSSL SCTP THREADS
 OPTIONS_EXCLUDE_powerpc64=	HIPE
 OPTIONS_EXCLUDE_powerpc64le=	HIPE
 OPTIONS_EXCLUDE_riscv64=	DTRACE
@@ -57,9 +58,9 @@ OPTIONS_EXCLUDE+=	DTRACE
 OPTIONS_EXCLUDE_DragonFly=	HIPE NATIVE SCTP
 # ld(1) fails to link probes: missing __dtrace_erlang___* symbols
 OPTIONS_EXCLUDE_aarch64=	DTRACE
-OPTIONS_EXCLUDE_armv6=		DTRACE
-OPTIONS_EXCLUDE_armv7=		DTRACE
-OPTIONS_EXCLUDE_i386=		DTRACE NATIVE HIPE
+OPTIONS_EXCLUDE_armv6=	DTRACE
+OPTIONS_EXCLUDE_armv7=	DTRACE
+OPTIONS_EXCLUDE_i386=	DTRACE HIPE NATIVE
 
 # If you run Erlang and get a message resembling "WARNING: number of
 # probes fixed does not match the number of defined probes (54 != 132,
@@ -67,25 +68,27 @@ OPTIONS_EXCLUDE_i386=		DTRACE NATIVE HIPE
 
 CONFIGURE_ENABLE=	smp-support
 
-DIRTY_CONFIGURE_ENABLE=	dirty-schedulers
-DTRACE_CFLAGS=		-fno-omit-frame-pointer
-DTRACE_CONFIGURE_WITH=	dynamic-trace=dtrace
-DTRACE_VARS=		STRIP=""
-HIPE_CONFIGURE_ENABLE=	hipe
-JAVA_CONFIGURE_ENV=	ac_cv_prog_JAVAC="${JAVAC}"
-JAVA_CONFIGURE_WITH=	javac
-JAVA_VARS=		USE_JAVA=yes
-KQUEUE_CONFIGURE_ENABLE=kernel-poll
-NATIVE_CONFIGURE_ENABLE=native-libs
-ODBC_CONFIGURE_WITH=	odbc
-ODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
-OPENSSL_CONFIGURE_WITH=	ssl=${OPENSSLBASE}
-OPENSSL_USES=		ssl
-SCTP_CONFIGURE_ENABLE=	sctp
+DIRTY_CONFIGURE_ENABLE=		dirty-schedulers
+DTRACE_CFLAGS=			-fno-omit-frame-pointer
+DTRACE_CONFIGURE_WITH=		dynamic-trace=dtrace
+DTRACE_VARS=			STRIP=""
+HIPE_CONFIGURE_ENABLE=		hipe
+JAVA_CONFIGURE_ENV=		ac_cv_prog_JAVAC="${JAVAC}"
+JAVA_CONFIGURE_WITH=		javac
+JAVA_VARS=			USE_JAVA=yes
+KQUEUE_CONFIGURE_ENABLE=	kernel-poll
+NATIVE_CONFIGURE_ENABLE=	native-libs
+ODBC_CONFIGURE_WITH=		odbc
+ODBC_LIB_DEPENDS=		libodbc.so:databases/unixODBC
+OPENSSL_CONFIGURE_WITH=		ssl=${OPENSSLBASE}
+OPENSSL_USES=			ssl
+SCTP_CONFIGURE_ENABLE=		sctp
 THREADS_CONFIGURE_ENABLE=	threads
-WX_CONFIGURE_WITH=	wx-config=${WX_CONFIG}
-WX_USES=		gl
-WX_VARS=		USE_WX=2.8+ WX_COMPS="wx contrib" USE_GL="gl glu"
+WX_CONFIGURE_WITH=		wx-config=${WX_CONFIG}
+WX_USES=			gl
+WX_VARS=			USE_GL="gl glu" \
+				USE_WX=2.8+ \
+				WX_COMPS="wx contrib"
 
 .include <bsd.port.pre.mk>
 
diff --git a/lang/erlang-runtime22/Makefile b/lang/erlang-runtime22/Makefile
index 2b221dd7a44d..c8c9d4da162a 100644
--- a/lang/erlang-runtime22/Makefile
+++ b/lang/erlang-runtime22/Makefile
@@ -21,19 +21,20 @@ GH_PROJECT=	otp:otp corba:corba
 GH_TAGNAME=	4.5.2:corba
 USE_PERL5=	build
 
-DATADIR=        ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
+DATADIR=	${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
 WRKSRC=		${WRKSRC_otp}
 
 GNU_CONFIGURE=	yes
-MAKE_JOBS_UNSAFE=yes
+MAKE_JOBS_UNSAFE=	yes
 
 SUB_FILES=	pkg-message
 SUB_LIST=	ERLANG_LIB=${ERLANG_LIB}
 
 ERLANG_LIB=	${PORTNAME}${PORTVERSION:C/\..*//}
 
-OPTIONS_DEFINE=	CORBA DIRTY DTRACE HIPE JAVA KQUEUE NATIVE ODBC OPENSSL SCTP THREADS WX
-OPTIONS_DEFAULT=CORBA DIRTY DTRACE KQUEUE OPENSSL SCTP THREADS
+OPTIONS_DEFINE=		CORBA DIRTY DTRACE HIPE JAVA KQUEUE NATIVE ODBC OPENSSL \
+			SCTP THREADS WX
+OPTIONS_DEFAULT=	CORBA DIRTY DTRACE KQUEUE OPENSSL SCTP THREADS
 OPTIONS_EXCLUDE_powerpc64=	HIPE
 OPTIONS_EXCLUDE_riscv64=	DTRACE
 
@@ -54,9 +55,9 @@ OPTIONS_EXCLUDE+=	DTRACE
 OPTIONS_EXCLUDE_DragonFly=	HIPE NATIVE SCTP
 # ld(1) fails to link probes: missing __dtrace_erlang___* symbols
 OPTIONS_EXCLUDE_aarch64=	DTRACE
-OPTIONS_EXCLUDE_armv6=		DTRACE
-OPTIONS_EXCLUDE_armv7=		DTRACE
-OPTIONS_EXCLUDE_i386=		DTRACE NATIVE HIPE
+OPTIONS_EXCLUDE_armv6=	DTRACE
+OPTIONS_EXCLUDE_armv7=	DTRACE
+OPTIONS_EXCLUDE_i386=	DTRACE HIPE NATIVE
 
 # If you run Erlang and get a message resembling "WARNING: number of
 # probes fixed does not match the number of defined probes (54 != 132,
@@ -64,25 +65,27 @@ OPTIONS_EXCLUDE_i386=		DTRACE NATIVE HIPE
 
 CONFIGURE_ENABLE=	smp-support
 
-DIRTY_CONFIGURE_ENABLE=	dirty-schedulers
-DTRACE_CFLAGS=		-fno-omit-frame-pointer
-DTRACE_CONFIGURE_WITH=	dynamic-trace=dtrace
-DTRACE_VARS=		STRIP=""
-HIPE_CONFIGURE_ENABLE=	hipe
-JAVA_CONFIGURE_ENV=	ac_cv_prog_JAVAC="${JAVAC}"
-JAVA_CONFIGURE_WITH=	javac
-JAVA_VARS=		USE_JAVA=yes
-KQUEUE_CONFIGURE_ENABLE=kernel-poll
-NATIVE_CONFIGURE_ENABLE=native-libs
-ODBC_CONFIGURE_WITH=	odbc
-ODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
-OPENSSL_CONFIGURE_WITH=	ssl=${OPENSSLBASE}
-OPENSSL_USES=		ssl
-SCTP_CONFIGURE_ENABLE=	sctp
+DIRTY_CONFIGURE_ENABLE=		dirty-schedulers
+DTRACE_CFLAGS=			-fno-omit-frame-pointer
+DTRACE_CONFIGURE_WITH=		dynamic-trace=dtrace
+DTRACE_VARS=			STRIP=""
+HIPE_CONFIGURE_ENABLE=		hipe
+JAVA_CONFIGURE_ENV=		ac_cv_prog_JAVAC="${JAVAC}"
+JAVA_CONFIGURE_WITH=		javac
+JAVA_VARS=			USE_JAVA=yes
+KQUEUE_CONFIGURE_ENABLE=	kernel-poll
+NATIVE_CONFIGURE_ENABLE=	native-libs
+ODBC_CONFIGURE_WITH=		odbc
+ODBC_LIB_DEPENDS=		libodbc.so:databases/unixODBC
+OPENSSL_CONFIGURE_WITH=		ssl=${OPENSSLBASE}
+OPENSSL_USES=			ssl
+SCTP_CONFIGURE_ENABLE=		sctp
 THREADS_CONFIGURE_ENABLE=	threads
-WX_CONFIGURE_WITH=	wx-config=${WX_CONFIG}
-WX_USES=		gl
-WX_VARS=		USE_WX=2.8+ WX_COMPS="wx contrib" USE_GL="gl glu"
+WX_CONFIGURE_WITH=		wx-config=${WX_CONFIG}
+WX_USES=			gl
+WX_VARS=			USE_GL="gl glu" \
+				USE_WX=2.8+ \
+				WX_COMPS="wx contrib"
 
 .include <bsd.port.pre.mk>
 
diff --git a/lang/erlang-runtime23/Makefile b/lang/erlang-runtime23/Makefile
index 69cc4d3f105a..5b49cdd49ea8 100644
--- a/lang/erlang-runtime23/Makefile
+++ b/lang/erlang-runtime23/Makefile
@@ -21,19 +21,20 @@ GH_PROJECT=	otp:otp corba:corba
 GH_TAGNAME=	5.0:corba
 USE_PERL5=	build
 
-DATADIR=        ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
+DATADIR=	${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
 WRKSRC=		${WRKSRC_otp}
 
 GNU_CONFIGURE=	yes
-MAKE_JOBS_UNSAFE=yes
+MAKE_JOBS_UNSAFE=	yes
 
 SUB_FILES=	pkg-message
 SUB_LIST=	ERLANG_LIB=${ERLANG_LIB}
 
 ERLANG_LIB=	${PORTNAME}${PORTVERSION:C/\..*//}
 
-OPTIONS_DEFINE=	CORBA DIRTY DTRACE HIPE JAVA KQUEUE NATIVE ODBC OPENSSL SCTP THREADS WX
-OPTIONS_DEFAULT=CORBA DIRTY DTRACE KQUEUE OPENSSL SCTP THREADS
+OPTIONS_DEFINE=		CORBA DIRTY DTRACE HIPE JAVA KQUEUE NATIVE ODBC OPENSSL \
+			SCTP THREADS WX
+OPTIONS_DEFAULT=	CORBA DIRTY DTRACE KQUEUE OPENSSL SCTP THREADS
 OPTIONS_EXCLUDE_powerpc64=	HIPE
 OPTIONS_EXCLUDE_riscv64=	DTRACE
 
@@ -54,9 +55,9 @@ OPTIONS_EXCLUDE+=	DTRACE
 OPTIONS_EXCLUDE_DragonFly=	HIPE NATIVE SCTP
 # ld(1) fails to link probes: missing __dtrace_erlang___* symbols
 OPTIONS_EXCLUDE_aarch64=	DTRACE
-OPTIONS_EXCLUDE_armv6=		DTRACE
-OPTIONS_EXCLUDE_armv7=		DTRACE
-OPTIONS_EXCLUDE_i386=		DTRACE NATIVE HIPE
+OPTIONS_EXCLUDE_armv6=	DTRACE
+OPTIONS_EXCLUDE_armv7=	DTRACE
+OPTIONS_EXCLUDE_i386=	DTRACE HIPE NATIVE
 
 # If you run Erlang and get a message resembling "WARNING: number of
 # probes fixed does not match the number of defined probes (54 != 132,
@@ -64,25 +65,27 @@ OPTIONS_EXCLUDE_i386=		DTRACE NATIVE HIPE
 
 CONFIGURE_ENABLE=	smp-support
 
-DIRTY_CONFIGURE_ENABLE=	dirty-schedulers
-DTRACE_CFLAGS=		-fno-omit-frame-pointer
-DTRACE_CONFIGURE_WITH=	dynamic-trace=dtrace
-DTRACE_VARS=		STRIP=""
-HIPE_CONFIGURE_ENABLE=	hipe
-JAVA_CONFIGURE_ENV=	ac_cv_prog_JAVAC="${JAVAC}"
-JAVA_CONFIGURE_WITH=	javac
-JAVA_VARS=		USE_JAVA=yes
-KQUEUE_CONFIGURE_ENABLE=kernel-poll
-NATIVE_CONFIGURE_ENABLE=native-libs
-ODBC_CONFIGURE_WITH=	odbc
-ODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
-OPENSSL_CONFIGURE_WITH=	ssl=${OPENSSLBASE}
-OPENSSL_USES=		ssl
-SCTP_CONFIGURE_ENABLE=	sctp
+DIRTY_CONFIGURE_ENABLE=		dirty-schedulers
+DTRACE_CFLAGS=			-fno-omit-frame-pointer
+DTRACE_CONFIGURE_WITH=		dynamic-trace=dtrace
+DTRACE_VARS=			STRIP=""
+HIPE_CONFIGURE_ENABLE=		hipe
+JAVA_CONFIGURE_ENV=		ac_cv_prog_JAVAC="${JAVAC}"
+JAVA_CONFIGURE_WITH=		javac
+JAVA_VARS=			USE_JAVA=yes
+KQUEUE_CONFIGURE_ENABLE=	kernel-poll
+NATIVE_CONFIGURE_ENABLE=	native-libs
+ODBC_CONFIGURE_WITH=		odbc
+ODBC_LIB_DEPENDS=		libodbc.so:databases/unixODBC
+OPENSSL_CONFIGURE_WITH=		ssl=${OPENSSLBASE}
+OPENSSL_USES=			ssl
+SCTP_CONFIGURE_ENABLE=		sctp
 THREADS_CONFIGURE_ENABLE=	threads
-WX_CONFIGURE_WITH=	wx-config=${WX_CONFIG}
-WX_USES=		gl
-WX_VARS=		USE_WX=2.8+ WX_COMPS="wx contrib" USE_GL="gl glu"
+WX_CONFIGURE_WITH=		wx-config=${WX_CONFIG}
+WX_USES=			gl
+WX_VARS=			USE_GL="gl glu" \
+				USE_WX=2.8+ \
+				WX_COMPS="wx contrib"
 
 .include <bsd.port.pre.mk>
 
diff --git a/lang/erlang-wx/Makefile b/lang/erlang-wx/Makefile
index 1a0cffb14834..c2f2374feb78 100644
--- a/lang/erlang-wx/Makefile
+++ b/lang/erlang-wx/Makefile
@@ -25,11 +25,14 @@ USE_WX=		3.1+
 WX_COMPS=	wx
 
 GNU_CONFIGURE=	yes
-MAKE_JOBS_UNSAFE=yes
+MAKE_JOBS_UNSAFE=	yes
 
 WX_APPS=	wx debugger et observer
 
-CONFIGURE_ARGS+=--enable-threads --without-odbc --without-javac --with-wx-config=${WX_CONFIG}
+CONFIGURE_ARGS+=	--enable-threads \
+			--with-wx-config=${WX_CONFIG} \
+			--without-javac \
+			--without-odbc
 
 pre-configure:
 	@cd ${WRKSRC} && ./otp_build autoconf
diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile
index 51f9bdac0808..1a3acb117a41 100644
--- a/lang/erlang/Makefile
+++ b/lang/erlang/Makefile
@@ -26,7 +26,7 @@ USE_RC_SUBR=	epmd
 WRKSRC=		${WRKSRC_otp}
 
 GNU_CONFIGURE=	yes
-MAKE_JOBS_UNSAFE=yes
+MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS_SUB=	yes
 SUB_FILES=	pkg-message
@@ -42,9 +42,12 @@ TOOLS_VSN=	3.1.0.1
 # Remove HIPE from OPTIONS_DEFAULT if this is still the case when the port is
 # upgraded to such version.
 
-OPTIONS_DEFINE=	CORBA DIRTY DTRACE FOP HIPE JAVA KQUEUE MANPAGES NATIVE ODBC OPENSSL PDF SCTP THREADS WX
-OPTIONS_DEFAULT=CORBA DIRTY DTRACE HIPE KQUEUE MANPAGES OPENSSL SCTP THREADS
-OPTIONS_EXCLUDE_powerpc64=	HIPE ${OPTIONS_EXCLUDE_${ARCH}_${OSREL:R}}                  
+OPTIONS_DEFINE=			CORBA DIRTY DTRACE FOP HIPE JAVA KQUEUE \
+				MANPAGES NATIVE ODBC OPENSSL PDF SCTP THREADS \
+				WX
+OPTIONS_DEFAULT=		CORBA DIRTY DTRACE HIPE KQUEUE MANPAGES OPENSSL \
+				SCTP THREADS
+OPTIONS_EXCLUDE_powerpc64=	${OPTIONS_EXCLUDE_${ARCH}_${OSREL:R}} HIPE
 OPTIONS_EXCLUDE_powerpc64_11=	DTRACE
 OPTIONS_EXCLUDE_powerpc64_12=	DTRACE
 OPTIONS_EXCLUDE_powerpc64le=	HIPE
@@ -70,9 +73,9 @@ OPTIONS_EXCLUDE+=	DTRACE
 OPTIONS_EXCLUDE_DragonFly=	HIPE NATIVE SCTP
 # ld(1) fails to link probes: missing __dtrace_erlang___* symbols
 OPTIONS_EXCLUDE_aarch64=	DTRACE
-OPTIONS_EXCLUDE_armv6=		DTRACE
-OPTIONS_EXCLUDE_armv7=		DTRACE
-OPTIONS_EXCLUDE_i386=		DTRACE NATIVE HIPE
+OPTIONS_EXCLUDE_armv6=	DTRACE
+OPTIONS_EXCLUDE_armv7=	DTRACE
+OPTIONS_EXCLUDE_i386=	DTRACE HIPE NATIVE
 OPTIONS_EXCLUDE_riscv64=	DTRACE
 
 # If you run Erlang and get a message resembling "WARNING: number of
@@ -81,28 +84,30 @@ OPTIONS_EXCLUDE_riscv64=	DTRACE
 
 CONFIGURE_ENABLE=	smp-support
 
-DIRTY_CONFIGURE_ENABLE=	dirty-schedulers
-DTRACE_CFLAGS=		-fno-omit-frame-pointer
-DTRACE_CONFIGURE_WITH=	dynamic-trace=dtrace
-DTRACE_VARS=		STRIP=""
-FOP_BUILD_DEPENDS=	fop:textproc/fop \
-			xsltproc:textproc/libxslt
-HIPE_CONFIGURE_ENABLE=	hipe
-JAVA_CONFIGURE_ENV=	ac_cv_prog_JAVAC="${JAVAC}"
-JAVA_CONFIGURE_WITH=	javac
-JAVA_VARS=		USE_JAVA=yes
-KQUEUE_CONFIGURE_ENABLE=kernel-poll
-MANPAGES_RUN_DEPENDS=	${LOCALBASE}/etc/man.d/erlang.conf:lang/erlang-man
-NATIVE_CONFIGURE_ENABLE=native-libs
-ODBC_CONFIGURE_WITH=	odbc
-ODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
-OPENSSL_CONFIGURE_WITH=	ssl=${OPENSSLBASE}
-OPENSSL_USES=		ssl
-SCTP_CONFIGURE_ENABLE=	sctp
+DIRTY_CONFIGURE_ENABLE=		dirty-schedulers
+DTRACE_CFLAGS=			-fno-omit-frame-pointer
+DTRACE_CONFIGURE_WITH=		dynamic-trace=dtrace
+DTRACE_VARS=			STRIP=""
+FOP_BUILD_DEPENDS=		fop:textproc/fop \
+				xsltproc:textproc/libxslt
+HIPE_CONFIGURE_ENABLE=		hipe
+JAVA_CONFIGURE_ENV=		ac_cv_prog_JAVAC="${JAVAC}"
+JAVA_CONFIGURE_WITH=		javac
+JAVA_VARS=			USE_JAVA=yes
+KQUEUE_CONFIGURE_ENABLE=	kernel-poll
+MANPAGES_RUN_DEPENDS=		${LOCALBASE}/etc/man.d/erlang.conf:lang/erlang-man
+NATIVE_CONFIGURE_ENABLE=	native-libs
+ODBC_CONFIGURE_WITH=		odbc
+ODBC_LIB_DEPENDS=		libodbc.so:databases/unixODBC
+OPENSSL_CONFIGURE_WITH=		ssl=${OPENSSLBASE}
+OPENSSL_USES=			ssl
+SCTP_CONFIGURE_ENABLE=		sctp
 THREADS_CONFIGURE_ENABLE=	threads
-WX_CONFIGURE_WITH=	wx-config=${WX_CONFIG}
-WX_USES=		gl
-WX_VARS=		USE_WX=2.8+ WX_COMPS="wx contrib" USE_GL="gl glu"
+WX_CONFIGURE_WITH=		wx-config=${WX_CONFIG}
+WX_USES=			gl
+WX_VARS=			USE_GL="gl glu" \
+				USE_WX=2.8+ \
+				WX_COMPS="wx contrib"
 
 .include <bsd.port.pre.mk>
 


More information about the dev-commits-ports-all mailing list