Index: head/lang/erlang-runtime20/Makefile
===================================================================
--- head/lang/erlang-runtime20/Makefile	(revision 475870)
+++ head/lang/erlang-runtime20/Makefile	(revision 475871)
@@ -1,149 +1,150 @@
 # Created by: ruslan@shevchenko.kiev.ua
 # $FreeBSD$
 
 PORTNAME=	erlang
 PORTVERSION=	20.3.8.3
+PORTREVISION=	1
 CATEGORIES=	lang parallel java
 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
 PKGNAMESUFFIX=	-runtime20
 DISTNAME=	otp_src_${ERLANG_REL}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:erlangorg		\
 		preloaded-${PORTVERSION}${EXTRACT_SUFX}:local
 DIST_SUBDIR=	erlang
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 PATCH_SITES=	http://olgeni.olgeni.com/~olgeni/distfiles/ \
 		LOCAL/olgeni
 PATCHFILES=	patch-otp-20.3.1 patch-otp-20.3.2 patch-otp-20.3.3 \
 		patch-otp-20.3.4 patch-otp-20.3.5 patch-otp-20.3.6 \
 		patch-otp-20.3.7 patch-otp-20.3.8 patch-otp-20.3.8.1 \
 		patch-otp-20.3.8.2 patch-otp-20.3.8.3
 
 MAINTAINER=	erlang@FreeBSD.org
 COMMENT=	Functional programming language from Ericsson
 
 LICENSE=	APACHE20
 
 BROKEN_sparc64=	Fails to build: error: fp_except undeclared
 
 WRKSRC=		${WRKDIR}/otp_src_${ERLANG_REL}
 
 ERLANG_LIB=	${PORTNAME}${PORTVERSION:C/\..*//}
 ERLANG_REL=	20.3
 
 OPTIONS_SUB=	yes
 SUB_FILES=	pkg-message
 SUB_LIST=	ERLANG_LIB=${ERLANG_LIB}
 
 MAKE_JOBS_UNSAFE=yes
 
 OPTIONS_DEFINE=	DIRTY DTRACE GS HIPE JAVA KQUEUE NATIVE ODBC OPENSSL SCTP THREADS WX
 OPTIONS_DEFAULT=DIRTY DTRACE HIPE KQUEUE OPENSSL SCTP THREADS
 
 DIRTY_DESC=	Enable Dirty schedulers
 GS_DESC=	Enable GS application (deprecated)
 HIPE_DESC=	Build native HiPE compiler
 KQUEUE_DESC=	Enable Kernel Poll (kqueue) support
 NATIVE_DESC=	Enable native libraries
 SCTP_DESC=	Enable SCTP support
 WX_DESC=	Enable WX application
 
 NATIVE_IMPLIES=	HIPE
 
 .if !exists(/usr/sbin/dtrace)
 OPTIONS_EXCLUDE+=	DTRACE
 .endif
 
 # If you run Erlang and get a message resembling "WARNING: number of
 # probes fixed does not match the number of defined probes (54 != 132,
 # respectively)" you probably misconfigured DTrace in some way.
 
 OPTIONS_EXCLUDE_DragonFly=	HIPE NATIVE SCTP
 OPTIONS_EXCLUDE_FreeBSD_10=	DTRACE
 # 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
 
 OPENSSL_VARS=	BROKEN_SSL=openssl-devel
 
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
 USES=		gmake ncurses perl5
 USE_PERL5=	build
 CONFIGURE_ENABLE=	smp-support
 
 DIRTY_CONFIGURE_ENABLE=	dirty-schedulers
 DTRACE_CFLAGS=		-fno-omit-frame-pointer
 DTRACE_CONFIGURE_WITH=	dynamic-trace=dtrace
 DTRACE_VARS=		STRIP=""
 GS_USES=		tk:run
 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_VARS=		USE_WX=2.8+ WX_COMPS="wx contrib" USE_GL="gl glu"
 
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} == FreeBSD && ${OSVERSION} > 1100000
 CFLAGS+=	-DMAP_NORESERVE=0
 .endif
 
 .if ${ARCH} == i386
 MAKE_ARGS+=	ARCH=x86
 .endif
 
 .if ${ARCH} == armv6 || ${ARCH} == armv7
 MAKE_ARGS+=	ARCH=arm
 .endif
 
 pre-configure:
 	cd ${WRKSRC} && ${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/preloaded-${PORTVERSION}${EXTRACT_SUFX}
 
 pre-configure-MX-off:
 	echo "disabled by port options" > ${WRKSRC}/lib/wx/SKIP
 
 post-configure-ODBC-on:
 	${RM} ${WRKSRC}/lib/odbc/SKIP
 
 pre-build-NATIVE-on:
 	@cd ${WRKSRC} && ${MAKE_CMD} clean
 
 post-install-GS-off:
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/gs-*
 
 post-install-JAVA-off:
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/jinterface-*
 
 post-install-ODBC-off:
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/odbc-*
 
 post-install-OPENSSL-off:
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/crypto-*
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/ssh-*
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/ssl-*
 
 post-install-WX-off:
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/wx-*
 
 post-stage:
 	${FIND} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/* -type d -empty -delete
 	@cd ${STAGEDIR}${PREFIX}; ${FIND} lib/${ERLANG_LIB}/* -type f -o -type l \
 		| ${SORT} >> ${TMPPLIST}
 
 .include <bsd.port.mk>
Index: head/lang/erlang-runtime20/files/patch-erts_emulator_beam_erl__alloc.c
===================================================================
--- head/lang/erlang-runtime20/files/patch-erts_emulator_beam_erl__alloc.c	(nonexistent)
+++ head/lang/erlang-runtime20/files/patch-erts_emulator_beam_erl__alloc.c	(revision 475871)
@@ -0,0 +1,11 @@
+--- erts/emulator/beam/erl_alloc.c.orig	2018-03-13 20:11:05 UTC
++++ erts/emulator/beam/erl_alloc.c
+@@ -122,7 +122,7 @@ typedef union {
+     char align_afa[ERTS_ALC_CACHE_LINE_ALIGN_SIZE(sizeof(AFAllctr_t))];
+     AOFFAllctr_t aoffa;
+     char align_aoffa[ERTS_ALC_CACHE_LINE_ALIGN_SIZE(sizeof(AOFFAllctr_t))];
+-} ErtsAllocatorState_t;
++} ErtsAllocatorState_t erts_align_attribute(ERTS_CACHE_LINE_SIZE);
+ 
+ static ErtsAllocatorState_t std_alloc_state;
+ static ErtsAllocatorState_t ll_alloc_state;

Property changes on: head/lang/erlang-runtime20/files/patch-erts_emulator_beam_erl__alloc.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/lang/erlang-runtime21/Makefile
===================================================================
--- head/lang/erlang-runtime21/Makefile	(revision 475870)
+++ head/lang/erlang-runtime21/Makefile	(revision 475871)
@@ -1,147 +1,148 @@
 # Created by: ruslan@shevchenko.kiev.ua
 # $FreeBSD$
 
 PORTNAME=	erlang
 PORTVERSION=	21.0.4
+PORTREVISION=	1
 CATEGORIES=	lang parallel java
 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
 PKGNAMESUFFIX=	-runtime21
 DISTNAME=	otp_src_${ERLANG_REL}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:erlangorg		\
 		preloaded-${PORTVERSION}${EXTRACT_SUFX}:local
 DIST_SUBDIR=	erlang
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 PATCH_SITES=	http://olgeni.olgeni.com/~olgeni/distfiles/ \
 		LOCAL/olgeni
 PATCHFILES=	patch-otp-21.0.1 patch-otp-21.0.2 patch-otp-21.0.3 \
 		patch-otp-21.0.4
 
 MAINTAINER=	erlang@FreeBSD.org
 COMMENT=	Functional programming language from Ericsson
 
 LICENSE=	APACHE20
 
 BROKEN_sparc64=	Fails to build: error: fp_except undeclared
 
 WRKSRC=		${WRKDIR}/otp_src_${ERLANG_REL}
 
 ERLANG_LIB=	${PORTNAME}${PORTVERSION:C/\..*//}
 ERLANG_REL=	21.0
 
 OPTIONS_SUB=	yes
 SUB_FILES=	pkg-message
 SUB_LIST=	ERLANG_LIB=${ERLANG_LIB}
 
 MAKE_JOBS_UNSAFE=yes
 
 OPTIONS_DEFINE=	DIRTY DTRACE GS HIPE JAVA KQUEUE NATIVE ODBC OPENSSL SCTP THREADS WX
 OPTIONS_DEFAULT=DIRTY DTRACE HIPE KQUEUE OPENSSL SCTP THREADS
 
 DIRTY_DESC=	Enable Dirty schedulers
 GS_DESC=	Enable GS application (deprecated)
 HIPE_DESC=	Build native HiPE compiler
 KQUEUE_DESC=	Enable Kernel Poll (kqueue) support
 NATIVE_DESC=	Enable native libraries
 SCTP_DESC=	Enable SCTP support
 WX_DESC=	Enable WX application
 
 NATIVE_IMPLIES=	HIPE
 
 .if !exists(/usr/sbin/dtrace)
 OPTIONS_EXCLUDE+=	DTRACE
 .endif
 
 # If you run Erlang and get a message resembling "WARNING: number of
 # probes fixed does not match the number of defined probes (54 != 132,
 # respectively)" you probably misconfigured DTrace in some way.
 
 OPTIONS_EXCLUDE_DragonFly=	HIPE NATIVE SCTP
 OPTIONS_EXCLUDE_FreeBSD_10=	DTRACE
 # 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
 
 OPENSSL_VARS=	BROKEN_SSL=openssl-devel
 
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
 USES=		gmake ncurses perl5
 USE_PERL5=	build
 CONFIGURE_ENABLE=	smp-support
 
 DIRTY_CONFIGURE_ENABLE=	dirty-schedulers
 DTRACE_CFLAGS=		-fno-omit-frame-pointer
 DTRACE_CONFIGURE_WITH=	dynamic-trace=dtrace
 DTRACE_VARS=		STRIP=""
 GS_USES=		tk:run
 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_VARS=		USE_WX=2.8+ WX_COMPS="wx contrib" USE_GL="gl glu"
 
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} == FreeBSD && ${OSVERSION} > 1100000
 CFLAGS+=	-DMAP_NORESERVE=0
 .endif
 
 .if ${ARCH} == i386
 MAKE_ARGS+=	ARCH=x86
 .endif
 
 .if ${ARCH} == armv6 || ${ARCH} == armv7
 MAKE_ARGS+=	ARCH=arm
 .endif
 
 pre-configure:
 	cd ${WRKSRC} && ${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/preloaded-${PORTVERSION}${EXTRACT_SUFX}
 
 pre-configure-MX-off:
 	echo "disabled by port options" > ${WRKSRC}/lib/wx/SKIP
 
 post-configure-ODBC-on:
 	${RM} ${WRKSRC}/lib/odbc/SKIP
 
 pre-build-NATIVE-on:
 	@cd ${WRKSRC} && ${MAKE_CMD} clean
 
 post-install-GS-off:
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/gs-*
 
 post-install-JAVA-off:
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/jinterface-*
 
 post-install-ODBC-off:
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/odbc-*
 
 post-install-OPENSSL-off:
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/crypto-*
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/ssh-*
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/ssl-*
 
 post-install-WX-off:
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/wx-*
 
 post-stage:
 	${FIND} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/* -type d -empty -delete
 	@cd ${STAGEDIR}${PREFIX}; ${FIND} lib/${ERLANG_LIB}/* -type f -o -type l \
 		| ${SORT} >> ${TMPPLIST}
 
 .include <bsd.port.mk>
Index: head/lang/erlang-runtime21/files/patch-erts_emulator_beam_erl__alloc.c
===================================================================
--- head/lang/erlang-runtime21/files/patch-erts_emulator_beam_erl__alloc.c	(nonexistent)
+++ head/lang/erlang-runtime21/files/patch-erts_emulator_beam_erl__alloc.c	(revision 475871)
@@ -0,0 +1,11 @@
+--- erts/emulator/beam/erl_alloc.c.orig	2018-06-19 07:07:55 UTC
++++ erts/emulator/beam/erl_alloc.c
+@@ -114,7 +114,7 @@ typedef union {
+     char align_afa[ERTS_ALC_CACHE_LINE_ALIGN_SIZE(sizeof(AFAllctr_t))];
+     AOFFAllctr_t aoffa;
+     char align_aoffa[ERTS_ALC_CACHE_LINE_ALIGN_SIZE(sizeof(AOFFAllctr_t))];
+-} ErtsAllocatorState_t;
++} ErtsAllocatorState_t erts_align_attribute(ERTS_CACHE_LINE_SIZE);
+ 
+ static ErtsAllocatorState_t std_alloc_state;
+ static ErtsAllocatorState_t ll_alloc_state;

Property changes on: head/lang/erlang-runtime21/files/patch-erts_emulator_beam_erl__alloc.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property