Index: head/lang/erlang/Makefile
===================================================================
--- head/lang/erlang/Makefile	(revision 466966)
+++ head/lang/erlang/Makefile	(revision 466967)
@@ -1,294 +1,180 @@
 # Created by: ruslan@shevchenko.kiev.ua
 # $FreeBSD$
 
 PORTNAME=	erlang
 PORTVERSION=	19.3.6.8
+PORTREVISION=	1
 PORTEPOCH=	4
 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://www.erlang.se/doc/:erlangse			\
-		http://www.erlang.se/publications/:publications		\
-		http://www.sics.se/~joe/thesis/:joe			\
-		http://olgeni.olgeni.com/~olgeni/distfiles/:local	\
+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
-DISTNAME=	otp_src_${ERL_RELEASE}
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:erlangorg	\
-		${ERLANG_MAN}:erlangorg			\
+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-19.3.1 patch-otp-19.3.2 patch-otp-19.3.3 \
 		patch-otp-19.3.4 patch-otp-19.3.5 patch-otp-19.3.6 \
 		patch-otp-19.3.6.1 patch-otp-19.3.6.2 patch-otp-19.3.6.3 \
 		patch-otp-19.3.6.4 patch-otp-19.3.6.5 patch-otp-19.3.6.6 \
 		patch-otp-19.3.6.7 patch-otp-19.3.6.8
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Functional programming language from Ericsson
 
 LICENSE=	APACHE20
 
 BROKEN_sparc64=	Fails to build: error: fp_except undeclared
 
-WRKSRC=		${WRKDIR}/otp_src_${ERL_RELEASE}
+WRKSRC=		${WRKDIR}/otp_src_${ERLANG_REL}
 
 ERLANG_LIB=	${PORTNAME}
+ERLANG_REL=	19.3
 
+OPTIONS_SUB=	yes
 SUB_FILES=	pkg-message
 SUB_LIST=	TOOLS_VSN=${TOOLS_VSN}
-PLIST_SUB=	ERLANG_LIB=${ERLANG_LIB}
 
 MAKE_JOBS_UNSAFE=yes
 
-OPTIONS_DEFINE=	DIRTY DOCS DTRACE GS HIPE JAVA KQUEUE NATIVE ODBC OPENSSL SCTP SMP THREADS WX
+OPTIONS_DEFINE=	DIRTY DTRACE GS HIPE JAVA KQUEUE MANPAGES NATIVE ODBC OPENSSL SCTP SMP THREADS WX
+OPTIONS_DEFAULT=DTRACE HIPE KQUEUE MANPAGES OPENSSL SCTP SMP THREADS
 
 DIRTY_DESC=	Enable Dirty schedulers (experimental)
-DTRACE_DESC=	Enable DTrace support
 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
 SMP_DESC=	Enable SMP support
 WX_DESC=	Enable WX application
 
 NATIVE_IMPLIES=	HIPE
 
-OPTIONS_DEFAULT=HIPE KQUEUE OPENSSL SCTP SMP THREADS DTRACE
-
 .if !exists(/usr/sbin/dtrace)
 OPTIONS_EXCLUDE+=	DTRACE
 .endif
 
 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
 
-ERL_RELEASE=	19.3
-
+GNU_CONFIGURE=	yes
+LDFLAGS+=	-L${LOCALBASE}/lib
 USES=		gmake ncurses perl5
 USE_PERL5=	build
 USE_RC_SUBR=	epmd
-GNU_CONFIGURE=	yes
-LDFLAGS+=	-L${LOCALBASE}/lib
 
-APP_UPGRADE=	erts            8.3  8.3.5.4 \
-		lib/compiler  7.0.4  7.0.4.1 \
-		lib/crypto    3.7.3    3.7.4 \
-		lib/dialyzer    3.1    3.1.1 \
-		lib/inets     6.3.6    6.3.9 \
-		lib/kernel      5.2  5.2.0.1 \
-		lib/mnesia   4.14.3 4.14.3.1 \
-		lib/ssh       4.4.1  4.4.2.3 \
-		lib/ssl       8.1.1  8.1.3.1.1 \
-		lib/xmerl    1.3.13   1.3.14
+# 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.
+
+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
+SMP_CONFIGURE_ENABLE=	smp-support
+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"
+
 EI_VSN=		3.9.3
 SNMP_VSN=	5.2.5
 TOOLS_VSN=	2.9.1
 
-.include <bsd.port.options.mk>
+ERLANG_MAN=	otp_doc_man_${ERLANG_REL}.tar.gz
 
-.if ${PORT_OPTIONS:MDOCS}
-DISTFILES+=	${ERLANG_DOCS}:erlangorg		\
-		${DOC_DISTFILES}
-DOC_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
-.endif
+MANPAGES_DISTFILES=	${ERLANG_MAN}:erlangorg
 
-# 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.
+.include <bsd.port.options.mk>
 
 .if ${OPSYS} == FreeBSD && ${OSVERSION} > 1100000
 CFLAGS+=	-DMAP_NORESERVE=0
 .endif
 
-.if ${PORT_OPTIONS:MDTRACE}
-CONFIGURE_ARGS+=--with-dynamic-trace=dtrace
-CFLAGS+=	-fno-omit-frame-pointer
-STRIP=
-.else
-CONFIGURE_ARGS+=--without-dynamic-trace
-.endif
-
-.if ${PORT_OPTIONS:MOPENSSL}
-USES+=		ssl
-CONFIGURE_ARGS+=--with-ssl=${OPENSSLBASE}
-.else
-CONFIGURE_ARGS+=--without-ssl
-.endif
-
-.if ${PORT_OPTIONS:MJAVA}
-USE_JAVA=	yes
-CONFIGURE_ARGS+=--with-javac
-CONFIGURE_ENV+=	ac_cv_prog_JAVAC="${JAVAC}"
-.else
-CONFIGURE_ARGS+=--without-javac
-.endif
-
-.if ${PORT_OPTIONS:MHIPE}
-CONFIGURE_ARGS+=--enable-hipe
-.else
-CONFIGURE_ARGS+=--disable-hipe
-.endif
-
-.if ${PORT_OPTIONS:MNATIVE}
-CONFIGURE_ARGS+=--enable-native-libs
-.else
-CONFIGURE_ARGS+=--disable-native-libs
-.endif
-
-.if ${PORT_OPTIONS:MKQUEUE}
-CONFIGURE_ARGS+=--enable-kernel-poll
-.else
-CONFIGURE_ARGS+=--disable-kernel-poll
-.endif
-
-.if ${PORT_OPTIONS:MGS}
-USES+=		tk:run
-.endif
-
-.if ${PORT_OPTIONS:MWX}
-USE_WX=		2.8+
-WX_COMPS=	wx contrib
-CONFIGURE_ARGS+=--with-wx-config=${WX_CONFIG}
-USE_GL+=	gl glu
-.endif
-
-.if ${PORT_OPTIONS:MODBC}
-CONFIGURE_ARGS+=--with-odbc
-LIB_DEPENDS+=	libodbc.so:databases/unixODBC
-.else
-CONFIGURE_ARGS+=--without-odbc
-.endif
-
-ERLANG_MAN=	otp_doc_man_${ERL_RELEASE}.tar.gz
-ERLANG_DOCS=	otp_doc_html_${ERL_RELEASE}.tar.gz
-
-.if ${PORT_OPTIONS:MTHREADS}
-CONFIGURE_ARGS+=--enable-threads
-.else
-CONFIGURE_ARGS+=--disable-threads
-.endif
-
-.if ${PORT_OPTIONS:MSCTP}
-CONFIGURE_ARGS+=--enable-sctp
-.else
-CONFIGURE_ARGS+=--disable-sctp
-.endif
-
-# enabling --enable-smp-support crashes the OS when
-# net_kernel:start([node_name, shortnames]) invoked repeatedly
-# TODO verify if it still applies
-
-.if ${PORT_OPTIONS:MSMP}
-CONFIGURE_ARGS+=--enable-smp-support
-.else
-CONFIGURE_ARGS+=--disable-smp-support
-.endif
-
-.if ${PORT_OPTIONS:MDIRTY}
-CONFIGURE_ARGS+=--enable-dirty-schedulers
-.endif
-
 .if ${ARCH} == i386
 MAKE_ARGS+=	ARCH=x86
 .endif
 
 .if ${ARCH} == armv6 || ${ARCH} == armv7
 MAKE_ARGS+=	ARCH=arm
 .endif
 
-# The man-pages are put (in spite of FreeBSD's port convention) in a private
-# subdir. This is to avoid cluttering up the man page name space. Also the
-# Erlang man pages are more of internal documentation using the man format than
-# actual system man pages. (erl.1 and epmd.1 perhaps being the exception).
-
-# Install documentation. (HTML docs need to be in same dir as the
-# rest, not in share/doc/erlang as it should, because of relative
-# links in the documentation.
-
-post-patch:
-	@${ECHO_CMD} "MANPATH ${PREFIX}/lib/erlang/man" > ${WRKDIR}/erlang.conf
-
 pre-configure:
-.if ! ${PORT_OPTIONS:MWX}
-	echo "disabled by port options" > ${WRKSRC}/lib/wx/SKIP
-.endif
 	cd ${WRKSRC} && ${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/preloaded-${PORTVERSION}${EXTRACT_SUFX}
 
-post-configure:
-.if ${PORT_OPTIONS:MODBC}
+pre-configure-MX-off:
+	echo "disabled by port options" > ${WRKSRC}/lib/wx/SKIP
+
+post-configure-ODBC-on:
 	${RM} ${WRKSRC}/lib/odbc/SKIP
-.endif
 
-.if ${PORT_OPTIONS:MNATIVE}
-pre-build:
+pre-build-NATIVE-on:
 	@cd ${WRKSRC} && ${MAKE_CMD} clean
-.endif
 
 post-install:
-	${INSTALL_DATA} ${WRKDIR}/erlang.conf ${STAGEDIR}${PREFIX}/etc/man.d/erlang.conf
 	${LN} -sf ../lib/${ERLANG_LIB}/lib/erl_interface-${EI_VSN}/bin/erl_call ${STAGEDIR}${PREFIX}/bin/erl_call
+	${LN} -sf ../lib/${ERLANG_LIB}/lib/snmp-${SNMP_VSN}/bin/snmpc ${STAGEDIR}${PREFIX}/bin/snmpc
+
+# The man-pages are put (in spite of FreeBSD's port convention) in a private
+# subdir. This is to avoid cluttering up the man page name space. Also the
+# Erlang man pages are more of internal documentation using the man format than
+# actual system man pages. (erl.1 and epmd.1 perhaps being the exception).
+
+post-install-MANPAGES-on:
+	@${ECHO_CMD} "MANPATH ${PREFIX}/lib/erlang/man" > ${WRKDIR}/erlang.conf
+	${INSTALL_DATA} ${WRKDIR}/erlang.conf ${STAGEDIR}${PREFIX}/etc/man.d/erlang.conf
 	for SECTION in 1 3 4 6 7; do \
 		${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_MAN} \
 			-C ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB} \
 			"man/man$${SECTION}/*.$${SECTION}" || ${TRUE}; \
 	done
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/man/cat?
-.if ${PORT_OPTIONS:MDOCS}
-	${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_DOCS} \
-		-C ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}
-.for app v1 v2 in ${APP_UPGRADE}
-	${MV} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/${app}-${v1}/* \
-		${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/${app}-${v2}
-	${RMDIR} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/${app}-${v1}
-.endfor
-	${INSTALL_DATA} ${WRKSRC}/lib/dialyzer/doc/*.txt \
-		${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/dialyzer-*/doc/
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for FILE in ${DOC_DISTFILES}
-	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/$$(expr ${FILE} : '\([^:]*\)') ${STAGEDIR}/${DOCSDIR}
-.endfor
-.endif
-.if ! ${PORT_OPTIONS:MGS}
+
+post-install-GS-off:
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/gs-*
-.endif
-.if ! ${PORT_OPTIONS:MJAVA}
+
+post-install-JAVA-off:
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/jinterface-*
-.endif
-.if ! ${PORT_OPTIONS:MODBC}
+
+post-install-ODBC-off:
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/odbc-*
-.endif
-.if ! ${PORT_OPTIONS:MOPENSSL}
+
+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-*
-.endif
-.if ! ${PORT_OPTIONS:MWX}
+
+post-install-WX-off:
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/wx-*
-.endif
-	${FIND} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/* -type d -empty -delete
 
-	${LN} -s ../lib/erlang/lib/snmp-${SNMP_VSN}/bin/snmpc ${STAGEDIR}${PREFIX}/bin/snmpc
-
+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}
+		| ${SORT} >> ${TMPPLIST}
 
 .include <bsd.port.mk>
Index: head/lang/erlang/pkg-plist
===================================================================
--- head/lang/erlang/pkg-plist	(revision 466966)
+++ head/lang/erlang/pkg-plist	(revision 466967)
@@ -1,18 +1,12 @@
 bin/ct_run
 bin/dialyzer
 bin/epmd
 bin/erl
 bin/erl_call
 bin/erlc
 bin/escript
 bin/run_erl
 bin/snmpc
 bin/to_erl
 bin/typer
-etc/man.d/erlang.conf
-%%PORTDOCS%%%%DOCSDIR%%/armstrong_thesis_2003.pdf
-%%PORTDOCS%%%%DOCSDIR%%/bjarnelic.pdf
-%%PORTDOCS%%%%DOCSDIR%%/erlang-book-part1.pdf
-%%PORTDOCS%%%%DOCSDIR%%/master_thesis_patterns.pdf
-%%PORTDOCS%%%%DOCSDIR%%/mnesia_overview.pdf
-%%PORTDOCS%%%%DOCSDIR%%/programming_rules.pdf
+%%MANPAGES%%etc/man.d/erlang.conf
Index: head/lang/erlang-runtime15/Makefile
===================================================================
--- head/lang/erlang-runtime15/Makefile	(revision 466966)
+++ head/lang/erlang-runtime15/Makefile	(revision 466967)
@@ -1,206 +1,119 @@
 # Created by: ruslan@shevchenko.kiev.ua
 # $FreeBSD$
 
 PORTNAME=	erlang
 PORTVERSION=	15.b.03.1
-PORTREVISION=	12
+PORTREVISION=	13
 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
+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=	-runtime15
-DISTNAME=	otp_src_${ERL_RELEASE}
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:erlangorg	\
-		${ERLANG_MAN}:erlangorg
+DISTNAME=	otp_src_${ERLANG_REL}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:erlangorg
 DIST_SUBDIR=	erlang
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Functional programming language from Ericsson
 
 WRKSRC=		${WRKDIR}/otp_src_R15B03
 
 ERLANG_LIB=	${PORTNAME}${PORTVERSION:C/\..*//}
+ERLANG_REL=	R${PORTVERSION:S/.//g:tu:S/1$/-1/}
 
 SUB_FILES=	pkg-message
 SUB_LIST=	ERLANG_LIB=${ERLANG_LIB}
 
 MAKE_JOBS_UNSAFE=yes
 
-OPTIONS_DEFINE=	DOCS DTRACE GCC GS HIPE JAVA KQUEUE ODBC OPENSSL SCTP SMP THREADS WX
+OPTIONS_DEFINE=	DTRACE GS HIPE JAVA KQUEUE ODBC OPENSSL SCTP SMP THREADS WX
+OPTIONS_DEFAULT=KQUEUE OPENSSL SCTP SMP THREADS
 
-DTRACE_DESC=	Enable DTrace support
 GS_DESC=	Enable GS application (deprecated)
 HIPE_DESC=	Build native HiPE compiler
 KQUEUE_DESC=	Enable Kernel Poll (kqueue) support
 SCTP_DESC=	Enable SCTP support
 SMP_DESC=	Enable SMP support
 WX_DESC=	Enable WX application
 
-OPTIONS_DEFAULT=KQUEUE OPENSSL SCTP SMP THREADS
+.if !exists(/usr/sbin/dtrace)
+OPTIONS_EXCLUDE+=	DTRACE
+.endif
+
 OPTIONS_EXCLUDE_DragonFly=	HIPE SCTP
+OPTIONS_EXCLUDE_FreeBSD_10=	DTRACE
 
-ERL_RELEASE=	R${PORTVERSION:S/.//g:tu:S/1$/-1/}
-
-USES=		gmake ncurses perl5
-USE_PERL5=	build
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
+USES=		gmake ncurses perl5
+USE_PERL5=	build
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDOCS}
-DISTFILES+=	${ERLANG_DOCS}:erlangorg
-.endif
-
-# See http://wiki.freebsd.org/DTrace to learn how to enable DTrace
-# on your system. You will need to configure STRIP, WITH_CTF and
-# CFLAGS in your make.conf before building.
-
 # 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.
 
-.if ${PORT_OPTIONS:MGCC}
-USE_GCC?=	yes
-.endif
+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
+ODBC_CONFIGURE_WITH=	odbc
+ODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
+OPENSSL_CONFIGURE_WITH=	ssl=${OPENSSLBASE}
+OPENSSL_USES=		ssl
+SCTP_CONFIGURE_ENABLE=	sctp
+SMP_CONFIGURE_ENABLE=	smp-support
+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"
 
-.if ${PORT_OPTIONS:MDTRACE}
-CONFIGURE_ARGS+=--with-dynamic-trace=dtrace
-.else
-CONFIGURE_ARGS+=--without-dynamic-trace
-.endif
+.include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MOPENSSL}
-USES+=		ssl
-CONFIGURE_ARGS+=--with-ssl=${OPENSSLBASE}
-.else
-CONFIGURE_ARGS+=--without-ssl
+.if ${OPSYS} == FreeBSD && ${OSVERSION} > 1100000
+CFLAGS+=	-DMAP_NORESERVE=0
 .endif
 
-.if ${PORT_OPTIONS:MJAVA}
-USE_JAVA=	yes
-CONFIGURE_ARGS+=--with-javac
-CONFIGURE_ENV+=	ac_cv_prog_JAVAC="${JAVAC}"
-.else
-CONFIGURE_ARGS+=--without-javac
-.endif
-
-.if ${PORT_OPTIONS:MHIPE}
-CONFIGURE_ARGS+=--enable-hipe
-.else
-CONFIGURE_ARGS+=--disable-hipe
-.endif
-
-.if ${PORT_OPTIONS:MKQUEUE}
-CONFIGURE_ARGS+=--enable-kernel-poll
-.else
-CONFIGURE_ARGS+=--disable-kernel-poll
-.endif
-
-.if ${PORT_OPTIONS:MGS}
-USES+=		tk:run
-.endif
-
-.if ${PORT_OPTIONS:MWX}
-USE_WX=		2.8+
-WX_COMPS=	wx contrib
-CONFIGURE_ARGS+=--with-wx-config=${WX_CONFIG}
-.endif
-
-.if ${PORT_OPTIONS:MODBC}
-CONFIGURE_ARGS+=--with-odbc
-LIB_DEPENDS+=	libodbc.so:databases/unixODBC
-.else
-CONFIGURE_ARGS+=--without-odbc
-.endif
-
-ERLANG_MAN=	otp_doc_man_${ERL_RELEASE}.tar.gz
-ERLANG_DOCS=	otp_doc_html_${ERL_RELEASE}.tar.gz
-
-.if ${PORT_OPTIONS:MTHREADS}
-CONFIGURE_ARGS+=--enable-threads
-.else
-CONFIGURE_ARGS+=--disable-threads
-.endif
-
-.if ${PORT_OPTIONS:MSCTP}
-CONFIGURE_ARGS+=--enable-sctp
-.else
-CONFIGURE_ARGS+=--disable-sctp
-.endif
-
-# enabling --enable-smp-support crashes the OS when
-# net_kernel:start([node_name, shortnames]) invoked repeatedly
-# TODO verify if it still applies
-
-.if ${PORT_OPTIONS:MSMP}
-CONFIGURE_ARGS+=--enable-smp-support
-.else
-CONFIGURE_ARGS+=--disable-smp-support
-.endif
-
 .if ${ARCH} == i386
 MAKE_ARGS+=	ARCH=x86
 .endif
 
-# The man-pages are put (in spite of FreeBSD's port convention) in a private
-# subdir. This is to avoid cluttering up the man page name space. Also the
-# Erlang man pages are more of internal documentation using the man format than
-# actual system man pages. (erl.1 and epmd.1 perhaps being the exception).
-
-# Install documentation. (HTML docs need to be in same dir as the
-# rest, not in share/doc/erlang as it should, because of relative
-# links in the documentation.
-
-pre-configure:
-.if ${PORT_OPTIONS:MDTRACE}
-	@if ! /sbin/kldstat | ${GREP} dtraceall >/dev/null 2>&1; then \
-		${ECHO_CMD}; \
-		${ECHO_CMD} "DTRACE option requires kernel module \"dtraceall\" to be loaded."; \
-		${ECHO_CMD}; \
-		exit 1; \
-	fi
+.if ${ARCH} == armv6 || ${ARCH} == armv7
+MAKE_ARGS+=	ARCH=arm
 .endif
-.if ! ${PORT_OPTIONS:MWX}
+
+pre-configure-MX-off:
 	echo "disabled by port options" > ${WRKSRC}/lib/wx/SKIP
-.endif
 
-post-install:
-	for SECTION in 1 3 4 6; do \
-		${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_MAN} \
-			-C ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB} \
-			"man/man$${SECTION}/*.$${SECTION}" || ${TRUE}; \
-	done
-	${RM} -r ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/man/cat?
-.if ${PORT_OPTIONS:MDOCS}
-	${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_DOCS} \
-		-C ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}
+post-configure-ODBC-on:
+	${RM} ${WRKSRC}/lib/odbc/SKIP
 
-	${INSTALL_DATA} ${WRKSRC}/lib/dialyzer/doc/*.txt \
-		${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/dialyzer-*/doc/
-.endif
-.if ! ${PORT_OPTIONS:MGS}
+post-install-GS-off:
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/gs-*
-.endif
-.if ! ${PORT_OPTIONS:MJAVA}
+
+post-install-JAVA-off:
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/jinterface-*
-.endif
-.if ! ${PORT_OPTIONS:MODBC}
+
+post-install-ODBC-off:
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/odbc-*
-.endif
-.if ! ${PORT_OPTIONS:MOPENSSL}
+
+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-*
-.endif
-.if ! ${PORT_OPTIONS:MWX}
+
+post-install-WX-off:
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/wx-*
-.endif
-	${FIND} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/* -type d -empty -delete
 
+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}
+		| ${SORT} >> ${TMPPLIST}
 
 .include <bsd.port.mk>
Index: head/lang/erlang-runtime15/distinfo
===================================================================
--- head/lang/erlang-runtime15/distinfo	(revision 466966)
+++ head/lang/erlang-runtime15/distinfo	(revision 466967)
@@ -1,18 +1,3 @@
+TIMESTAMP = 1523228884
 SHA256 (erlang/otp_src_R15B03-1.tar.gz) = 4bccac86dd76aec050252e44276a0283a0df9218e6470cf042a9b9f9dfc9476c
 SIZE (erlang/otp_src_R15B03-1.tar.gz) = 76123810
-SHA256 (erlang/otp_doc_man_R15B03-1.tar.gz) = 07980d8014c7cf8194b7078c137353f5083992add4663ced3dcba2ff91f228d8
-SIZE (erlang/otp_doc_man_R15B03-1.tar.gz) = 1305001
-SHA256 (erlang/otp_doc_html_R15B03-1.tar.gz) = d06f580f11d1303217a5c1cf8d68a98d7e01c535be934dcd430ecdc254f7572e
-SIZE (erlang/otp_doc_html_R15B03-1.tar.gz) = 30436303
-SHA256 (erlang/armstrong_thesis_2003.pdf) = da585b914eb07350e2d6f727db5eb0fb1551f49fc1270f7d4dc079f2c8c1ab7a
-SIZE (erlang/armstrong_thesis_2003.pdf) = 859249
-SHA256 (erlang/bjarnelic.pdf) = 9544d4af5cea324e5c9cf77e670d9561ad61ddc240cdb5c2afecebc0a3d7429b
-SIZE (erlang/bjarnelic.pdf) = 488043
-SHA256 (erlang/erlang-book-part1.pdf) = ef2fb9d15d35f3b1b602c8578e48618597477f9cfab2d103dc2e22372c46ca0a
-SIZE (erlang/erlang-book-part1.pdf) = 883639
-SHA256 (erlang/master_thesis_patterns.pdf) = b390fd59060fb944c78bceed781c7ad3795d4f9fbe86d391bccc479828552b43
-SIZE (erlang/master_thesis_patterns.pdf) = 422457
-SHA256 (erlang/mnesia_overview.pdf) = f07f9edd4ba865a1c50647dd6fa4a8f49277f8f3bef4d521c06fd90293717032
-SIZE (erlang/mnesia_overview.pdf) = 150266
-SHA256 (erlang/programming_rules.pdf) = b95f8851004832b044e064c12976a422613ece897e98308a27ee8b66738b4502
-SIZE (erlang/programming_rules.pdf) = 77025
Index: head/lang/erlang-runtime16/Makefile
===================================================================
--- head/lang/erlang-runtime16/Makefile	(revision 466966)
+++ head/lang/erlang-runtime16/Makefile	(revision 466967)
@@ -1,211 +1,119 @@
 # Created by: ruslan@shevchenko.kiev.ua
 # $FreeBSD$
 
 PORTNAME=	erlang
 PORTVERSION=	16.b.03.1
-PORTREVISION=	12
+PORTREVISION=	13
 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
+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=	-runtime16
-DISTNAME=	otp_src_${ERL_RELEASE}
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:erlangorg	\
-		${ERLANG_MAN}:erlangorg
+DISTNAME=	otp_src_${ERLANG_REL}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:erlangorg
 DIST_SUBDIR=	erlang
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Functional programming language from Ericsson
 
-WRKSRC=		${WRKDIR}/otp_src_${ERL_RELEASE}
+WRKSRC=		${WRKDIR}/otp_src_${ERLANG_REL}
 
 ERLANG_LIB=	${PORTNAME}${PORTVERSION:C/\..*//}
+ERLANG_REL=	R${PORTVERSION:S/.//g:tu:S/1$/-1/}
 
 SUB_FILES=	pkg-message
 SUB_LIST=	ERLANG_LIB=${ERLANG_LIB}
 
 MAKE_JOBS_UNSAFE=yes
 
-OPTIONS_DEFINE=	DOCS DTRACE GCC GS HIPE JAVA KQUEUE ODBC OPENSSL SCTP SMP THREADS WX
+OPTIONS_DEFINE=	DTRACE GS HIPE JAVA KQUEUE ODBC OPENSSL SCTP SMP THREADS WX
+OPTIONS_DEFAULT=KQUEUE OPENSSL SCTP SMP THREADS
 
-DTRACE_DESC=	Enable DTrace support
 GS_DESC=	Enable GS application (deprecated)
 HIPE_DESC=	Build native HiPE compiler
 KQUEUE_DESC=	Enable Kernel Poll (kqueue) support
 SCTP_DESC=	Enable SCTP support
 SMP_DESC=	Enable SMP support
 WX_DESC=	Enable WX application
 
-OPTIONS_DEFAULT=KQUEUE OPENSSL SCTP SMP THREADS
+.if !exists(/usr/sbin/dtrace)
+OPTIONS_EXCLUDE+=	DTRACE
+.endif
+
 OPTIONS_EXCLUDE_DragonFly=	HIPE SCTP
+OPTIONS_EXCLUDE_FreeBSD_10=	DTRACE
 
-ERL_RELEASE=	R${PORTVERSION:S/.//g:tu:S/1$/-1/}
-
-USES=		gmake ncurses perl5
-USE_PERL5=	build
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
+USES=		gmake ncurses perl5
+USE_PERL5=	build
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDOCS}
-DISTFILES+=	${ERLANG_DOCS}:erlangorg
-.endif
-
-# See http://wiki.freebsd.org/DTrace to learn how to enable DTrace
-# on your system. You will need to configure STRIP, WITH_CTF and
-# CFLAGS in your make.conf before building.
-
 # 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.
 
-.if ${PORT_OPTIONS:MGCC}
-USE_GCC?=	yes
-.endif
+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
+ODBC_CONFIGURE_WITH=	odbc
+ODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
+OPENSSL_CONFIGURE_WITH=	ssl=${OPENSSLBASE}
+OPENSSL_USES=		ssl
+SCTP_CONFIGURE_ENABLE=	sctp
+SMP_CONFIGURE_ENABLE=	smp-support
+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"
 
-.if ${PORT_OPTIONS:MDTRACE}
-CONFIGURE_ARGS+=--with-dynamic-trace=dtrace
-.else
-CONFIGURE_ARGS+=--without-dynamic-trace
-.endif
+.include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MOPENSSL}
-USES+=		ssl
-CONFIGURE_ARGS+=--with-ssl=${OPENSSLBASE}
-.else
-CONFIGURE_ARGS+=--without-ssl
+.if ${OPSYS} == FreeBSD && ${OSVERSION} > 1100000
+CFLAGS+=	-DMAP_NORESERVE=0
 .endif
 
-.if ${PORT_OPTIONS:MJAVA}
-USE_JAVA=	yes
-CONFIGURE_ARGS+=--with-javac
-CONFIGURE_ENV+=	ac_cv_prog_JAVAC="${JAVAC}"
-.else
-CONFIGURE_ARGS+=--without-javac
-.endif
-
-.if ${PORT_OPTIONS:MHIPE}
-CONFIGURE_ARGS+=--enable-hipe
-.else
-CONFIGURE_ARGS+=--disable-hipe
-.endif
-
-.if ${PORT_OPTIONS:MKQUEUE}
-CONFIGURE_ARGS+=--enable-kernel-poll
-.else
-CONFIGURE_ARGS+=--disable-kernel-poll
-.endif
-
-.if ${PORT_OPTIONS:MGS}
-USES+=		tk:run
-.endif
-
-.if ${PORT_OPTIONS:MWX}
-USE_WX=		2.8+
-WX_COMPS=	wx contrib
-CONFIGURE_ARGS+=--with-wx-config=${WX_CONFIG}
-.endif
-
-.if ${PORT_OPTIONS:MODBC}
-CONFIGURE_ARGS+=--with-odbc
-LIB_DEPENDS+=	libodbc.so:databases/unixODBC
-.else
-CONFIGURE_ARGS+=--without-odbc
-.endif
-
-ERLANG_MAN=	otp_doc_man_${ERL_RELEASE}.tar.gz
-ERLANG_DOCS=	otp_doc_html_${ERL_RELEASE}.tar.gz
-
-.if ${PORT_OPTIONS:MTHREADS}
-CONFIGURE_ARGS+=--enable-threads
-.else
-CONFIGURE_ARGS+=--disable-threads
-.endif
-
-.if ${PORT_OPTIONS:MSCTP}
-CONFIGURE_ARGS+=--enable-sctp
-.else
-CONFIGURE_ARGS+=--disable-sctp
-.endif
-
-# enabling --enable-smp-support crashes the OS when
-# net_kernel:start([node_name, shortnames]) invoked repeatedly
-# TODO verify if it still applies
-
-.if ${PORT_OPTIONS:MSMP}
-CONFIGURE_ARGS+=--enable-smp-support
-.else
-CONFIGURE_ARGS+=--disable-smp-support
-.endif
-
 .if ${ARCH} == i386
 MAKE_ARGS+=	ARCH=x86
 .endif
 
-# The man-pages are put (in spite of FreeBSD's port convention) in a private
-# subdir. This is to avoid cluttering up the man page name space. Also the
-# Erlang man pages are more of internal documentation using the man format than
-# actual system man pages. (erl.1 and epmd.1 perhaps being the exception).
-
-# Install documentation. (HTML docs need to be in same dir as the
-# rest, not in share/doc/erlang as it should, because of relative
-# links in the documentation.
-
-pre-configure:
-.if ${PORT_OPTIONS:MDTRACE}
-	@if ! /sbin/kldstat | ${GREP} dtraceall >/dev/null 2>&1; then \
-		${ECHO_CMD}; \
-		${ECHO_CMD} "DTRACE option requires kernel module \"dtraceall\" to be loaded."; \
-		${ECHO_CMD}; \
-		exit 1; \
-	fi
+.if ${ARCH} == armv6 || ${ARCH} == armv7
+MAKE_ARGS+=	ARCH=arm
 .endif
-.if ! ${PORT_OPTIONS:MWX}
+
+pre-configure-MX-off:
 	echo "disabled by port options" > ${WRKSRC}/lib/wx/SKIP
-.endif
 
-post-configure:
-.if ${PORT_OPTIONS:MODBC}
+post-configure-ODBC-on:
 	${RM} ${WRKSRC}/lib/odbc/SKIP
-.endif
 
-post-install:
-	for SECTION in 1 3 4 6 7; do \
-		${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_MAN} \
-			-C ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB} \
-			"man/man$${SECTION}/*.$${SECTION}" || ${TRUE}; \
-	done
-	${RM} -r ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/man/cat?
-.if ${PORT_OPTIONS:MDOCS}
-	${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_DOCS} \
-		-C ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}
-
-	${INSTALL_DATA} ${WRKSRC}/lib/dialyzer/doc/*.txt \
-		${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/dialyzer-*/doc/
-.endif
-.if ! ${PORT_OPTIONS:MGS}
+post-install-GS-off:
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/gs-*
-.endif
-.if ! ${PORT_OPTIONS:MJAVA}
+
+post-install-JAVA-off:
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/jinterface-*
-.endif
-.if ! ${PORT_OPTIONS:MODBC}
+
+post-install-ODBC-off:
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/odbc-*
-.endif
-.if ! ${PORT_OPTIONS:MOPENSSL}
+
+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-*
-.endif
-.if ! ${PORT_OPTIONS:MWX}
+
+post-install-WX-off:
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/wx-*
-.endif
-	${FIND} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/* -type d -empty -delete
 
+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}
+		| ${SORT} >> ${TMPPLIST}
 
 .include <bsd.port.mk>
Index: head/lang/erlang-runtime16/distinfo
===================================================================
--- head/lang/erlang-runtime16/distinfo	(revision 466966)
+++ head/lang/erlang-runtime16/distinfo	(revision 466967)
@@ -1,6 +1,3 @@
+TIMESTAMP = 1523227942
 SHA256 (erlang/otp_src_R16B03-1.tar.gz) = 17ce53459bc5ceb34fc2da412e15ac8c23835a15fbd84e62c8d1852704747ee7
 SIZE (erlang/otp_src_R16B03-1.tar.gz) = 66253556
-SHA256 (erlang/otp_doc_man_R16B03-1.tar.gz) = 0f31bc7d7215aa4b6834b1a565cd7d6e3173e3b392fb870254bae5136499c39d
-SIZE (erlang/otp_doc_man_R16B03-1.tar.gz) = 1322516
-SHA256 (erlang/otp_doc_html_R16B03-1.tar.gz) = 5381d4ffe654e3e943f004e2b91870bd83f0e46e261bb405c1cdf7de81bc0507
-SIZE (erlang/otp_doc_html_R16B03-1.tar.gz) = 33294165

Property changes on: head/lang/erlang-runtime16/distinfo
___________________________________________________________________
Modified: fbsd:nokeywords
## -1 +1 ##
-1
\ No newline at end of property
+yes
\ No newline at end of property
Index: head/lang/erlang-runtime17/Makefile
===================================================================
--- head/lang/erlang-runtime17/Makefile	(revision 466966)
+++ head/lang/erlang-runtime17/Makefile	(revision 466967)
@@ -1,244 +1,148 @@
 # Created by: ruslan@shevchenko.kiev.ua
 # $FreeBSD$
 
 PORTNAME=	erlang
 PORTVERSION=	17.5.6.9
-PORTREVISION=	7
+PORTREVISION=	8
 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
+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=	-runtime17
-DISTNAME=	otp_src_${ERL_RELEASE}
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:erlangorg	\
-		${ERLANG_MAN}:erlangorg
+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-17.5.1 patch-otp-17.5.2 patch-otp-17.5.3 \
 		patch-otp-17.5.4 patch-otp-17.5.5 patch-otp-17.5.6 \
 		patch-otp-17.5.6.1 patch-otp-17.5.6.2 patch-otp-17.5.6.3 \
 		patch-otp-17.5.6.4 patch-otp-17.5.6.5 patch-otp-17.5.6.6 \
 		patch-otp-17.5.6.7 patch-otp-17.5.6.8 patch-otp-17.5.6.9
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Functional programming language from Ericsson
 
-WRKSRC=		${WRKDIR}/otp_src_${ERL_RELEASE}
+WRKSRC=		${WRKDIR}/otp_src_${ERLANG_REL}
 
 ERLANG_LIB=	${PORTNAME}${PORTVERSION:C/\..*//}
+ERLANG_REL=	17.5
 
+OPTIONS_SUB=	yes
 SUB_FILES=	pkg-message
 SUB_LIST=	ERLANG_LIB=${ERLANG_LIB}
 
 MAKE_JOBS_UNSAFE=yes
 
-OPTIONS_DEFINE=	DOCS DTRACE GCC GS HIPE JAVA KQUEUE ODBC OPENSSL SCTP SMP THREADS WX DIRTY
+OPTIONS_DEFINE=	DIRTY DTRACE GS HIPE JAVA KQUEUE NATIVE ODBC OPENSSL SCTP SMP THREADS WX
+OPTIONS_DEFAULT=DTRACE HIPE KQUEUE OPENSSL SCTP SMP THREADS
 
 DIRTY_DESC=	Enable Dirty schedulers (experimental)
-DTRACE_DESC=	Enable DTrace support
 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
 SMP_DESC=	Enable SMP support
 WX_DESC=	Enable WX application
 
-OPTIONS_DEFAULT=KQUEUE OPENSSL SCTP SMP THREADS
-OPTIONS_EXCLUDE_DragonFly=	HIPE SCTP
+NATIVE_IMPLIES=	HIPE
 
-ERL_RELEASE=	17.5
+.if !exists(/usr/sbin/dtrace)
+OPTIONS_EXCLUDE+=	DTRACE
+.endif
 
-USES=		gmake ncurses perl5
-USE_PERL5=	build
+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
 
-APP_UPGRADE=	erts                 6.4  6.4.1.6 \
-		lib/common_test     1.10   1.10.1 \
-		lib/debugger       4.0.3  4.0.3.1 \
-		lib/diameter         1.9  1.9.2.4 \
-		lib/inets         5.10.6   5.10.9 \
-		lib/kernel           3.2  3.2.0.1 \
-		lib/runtime_tools 1.8.16 1.8.16.1 \
-		lib/snmp           5.1.1    5.1.2 \
-		lib/ssh              3.2    3.2.4 \
-		lib/ssl              6.0  6.0.1.2 \
-		lib/test_server      3.8    3.8.1
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDOCS}
-DISTFILES+=	${ERLANG_DOCS}:erlangorg
-.endif
-
-# See http://wiki.freebsd.org/DTrace to learn how to enable DTrace
-# on your system. You will need to configure STRIP, WITH_CTF and
-# CFLAGS in your make.conf before building.
-
 # 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.
 
-.if ${PORT_OPTIONS:MGCC}
-USE_GCC?=	yes
-.endif
+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
+SMP_CONFIGURE_ENABLE=	smp-support
+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"
 
-.if ${PORT_OPTIONS:MDTRACE}
-CONFIGURE_ARGS+=--with-dynamic-trace=dtrace
-.else
-CONFIGURE_ARGS+=--without-dynamic-trace
-.endif
+.include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MOPENSSL}
-USES+=		ssl
-CONFIGURE_ARGS+=--with-ssl=${OPENSSLBASE}
-.else
-CONFIGURE_ARGS+=--without-ssl
+.if ${OPSYS} == FreeBSD && ${OSVERSION} > 1100000
+CFLAGS+=	-DMAP_NORESERVE=0
 .endif
 
-.if ${PORT_OPTIONS:MJAVA}
-USE_JAVA=	yes
-CONFIGURE_ARGS+=--with-javac
-CONFIGURE_ENV+=	ac_cv_prog_JAVAC="${JAVAC}"
-.else
-CONFIGURE_ARGS+=--without-javac
-.endif
-
-.if ${PORT_OPTIONS:MHIPE}
-CONFIGURE_ARGS+=--enable-hipe
-.else
-CONFIGURE_ARGS+=--disable-hipe
-.endif
-
-.if ${PORT_OPTIONS:MKQUEUE}
-CONFIGURE_ARGS+=--enable-kernel-poll
-.else
-CONFIGURE_ARGS+=--disable-kernel-poll
-.endif
-
-.if ${PORT_OPTIONS:MGS}
-USES+=		tk:run
-.endif
-
-.if ${PORT_OPTIONS:MWX}
-USE_WX=		2.8+
-WX_COMPS=	wx contrib
-CONFIGURE_ARGS+=--with-wx-config=${WX_CONFIG}
-.endif
-
-.if ${PORT_OPTIONS:MODBC}
-CONFIGURE_ARGS+=--with-odbc
-LIB_DEPENDS+=	libodbc.so:databases/unixODBC
-.else
-CONFIGURE_ARGS+=--without-odbc
-.endif
-
-ERLANG_MAN=	otp_doc_man_${ERL_RELEASE}.tar.gz
-ERLANG_DOCS=	otp_doc_html_${ERL_RELEASE}.tar.gz
-
-.if ${PORT_OPTIONS:MTHREADS}
-CONFIGURE_ARGS+=--enable-threads
-.else
-CONFIGURE_ARGS+=--disable-threads
-.endif
-
-.if ${PORT_OPTIONS:MSCTP}
-CONFIGURE_ARGS+=--enable-sctp
-.else
-CONFIGURE_ARGS+=--disable-sctp
-.endif
-
-# enabling --enable-smp-support crashes the OS when
-# net_kernel:start([node_name, shortnames]) invoked repeatedly
-# TODO verify if it still applies
-
-.if ${PORT_OPTIONS:MSMP}
-CONFIGURE_ARGS+=--enable-smp-support
-.else
-CONFIGURE_ARGS+=--disable-smp-support
-.endif
-
-.if ${PORT_OPTIONS:MDIRTY}
-CONFIGURE_ARGS+=--enable-dirty-schedulers
-.endif
-
 .if ${ARCH} == i386
 MAKE_ARGS+=	ARCH=x86
 .endif
 
 .if ${ARCH} == armv6 || ${ARCH} == armv7
 MAKE_ARGS+=	ARCH=arm
 .endif
 
-# The man-pages are put (in spite of FreeBSD's port convention) in a private
-# subdir. This is to avoid cluttering up the man page name space. Also the
-# Erlang man pages are more of internal documentation using the man format than
-# actual system man pages. (erl.1 and epmd.1 perhaps being the exception).
-
-# Install documentation. (HTML docs need to be in same dir as the
-# rest, not in share/doc/erlang as it should, because of relative
-# links in the documentation.
-
 pre-configure:
-.if ${PORT_OPTIONS:MDTRACE}
-	@if ! /sbin/kldstat | ${GREP} dtraceall >/dev/null 2>&1; then \
-		${ECHO_CMD}; \
-		${ECHO_CMD} "DTRACE option requires kernel module \"dtraceall\" to be loaded."; \
-		${ECHO_CMD}; \
-		exit 1; \
-	fi
-.endif
-.if ! ${PORT_OPTIONS:MWX}
+	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
-.endif
 
-post-configure:
-.if ${PORT_OPTIONS:MODBC}
+post-configure-ODBC-on:
 	${RM} ${WRKSRC}/lib/odbc/SKIP
-.endif
 
-post-install:
-	for SECTION in 1 3 4 6 7; do \
-		${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_MAN} \
-			-C ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB} \
-			"man/man$${SECTION}/*.$${SECTION}" || ${TRUE}; \
-	done
-	${RM} -r ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/man/cat?
-.if ${PORT_OPTIONS:MDOCS}
-	${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_DOCS} \
-		-C ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}
-.for app v1 v2 in ${APP_UPGRADE}
-	${MV} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/${app}-${v1}/* \
-		${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/${app}-${v2}
-	${RMDIR} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/${app}-${v1}
-.endfor
-	${INSTALL_DATA} ${WRKSRC}/lib/dialyzer/doc/*.txt \
-		${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/dialyzer-*/doc/
-.endif
-.if ! ${PORT_OPTIONS:MGS}
+pre-build-NATIVE-on:
+	@cd ${WRKSRC} && ${MAKE_CMD} clean
+
+post-install-GS-off:
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/gs-*
-.endif
-.if ! ${PORT_OPTIONS:MJAVA}
+
+post-install-JAVA-off:
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/jinterface-*
-.endif
-.if ! ${PORT_OPTIONS:MODBC}
+
+post-install-ODBC-off:
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/odbc-*
-.endif
-.if ! ${PORT_OPTIONS:MOPENSSL}
+
+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-*
-.endif
-.if ! ${PORT_OPTIONS:MWX}
+
+post-install-WX-off:
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/wx-*
-.endif
-	${FIND} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/* -type d -empty -delete
 
+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}
+		| ${SORT} >> ${TMPPLIST}
 
 .include <bsd.port.mk>
Index: head/lang/erlang-runtime17/distinfo
===================================================================
--- head/lang/erlang-runtime17/distinfo	(revision 466966)
+++ head/lang/erlang-runtime17/distinfo	(revision 466967)
@@ -1,36 +1,35 @@
+TIMESTAMP = 1523196156
 SHA256 (erlang/otp_src_17.5.tar.gz) = 3c28820c981b30c50df8ac2a4a238e5813454fa3ed2ad530bc7948a282846474
 SIZE (erlang/otp_src_17.5.tar.gz) = 67242289
-SHA256 (erlang/otp_doc_man_17.5.tar.gz) = 85b1b2a1011fc01af550f1fe9e5a599a4c5f2a35d264d2804af1d05590a857c3
-SIZE (erlang/otp_doc_man_17.5.tar.gz) = 1363320
-SHA256 (erlang/otp_doc_html_17.5.tar.gz) = baba1d373c1faacf4a1a6ec1220d57d0cb2b977edb74f32cd58dc786361c6cf5
-SIZE (erlang/otp_doc_html_17.5.tar.gz) = 33510258
+SHA256 (erlang/preloaded-17.5.6.9.tar.gz) = 7997454f61ddbc3c090403899b2848519018b69f2c4853035149aece1a3f8937
+SIZE (erlang/preloaded-17.5.6.9.tar.gz) = 297377
 SHA256 (erlang/patch-otp-17.5.1) = e95b17b539b84b2408cbdd8af68ea96ad239a1b38117243d21ebb809ab3ca1c3
 SIZE (erlang/patch-otp-17.5.1) = 36012
 SHA256 (erlang/patch-otp-17.5.2) = 9c70e90c3b040ab1e136738f355f0925f64afd5a4b28f1c9a6f4035f2bf03b1b
 SIZE (erlang/patch-otp-17.5.2) = 17821
 SHA256 (erlang/patch-otp-17.5.3) = fd2879176733c34c002123da9d9b96ac3cf1857c7422a061711be818aecc9e13
 SIZE (erlang/patch-otp-17.5.3) = 135959
 SHA256 (erlang/patch-otp-17.5.4) = dce1130adfabe4fdecd1e5e700bea70a5e9ba7886b51c81a7a2371e204d725ca
 SIZE (erlang/patch-otp-17.5.4) = 14618
 SHA256 (erlang/patch-otp-17.5.5) = 78f81dc17c52b73d45819de50fc11df3a19ff0593a6d5c6d105b5875c1e654f6
 SIZE (erlang/patch-otp-17.5.5) = 44523
 SHA256 (erlang/patch-otp-17.5.6) = 25461538cf79af56ee64019cfb76764bc5c2ac7cc9d3f9061ef01dd93d46ef36
 SIZE (erlang/patch-otp-17.5.6) = 57264
 SHA256 (erlang/patch-otp-17.5.6.1) = 695bea19a372d58fc94ca79e84054524e7895516aab3a1d03905dd5971779ed7
 SIZE (erlang/patch-otp-17.5.6.1) = 9062
 SHA256 (erlang/patch-otp-17.5.6.2) = 47fc4468fdc75249f30a4ba120ed39db03dfb5ebc5c2b1c7e94eb43d8c221002
 SIZE (erlang/patch-otp-17.5.6.2) = 14293
 SHA256 (erlang/patch-otp-17.5.6.3) = 75e91ad34a910353452cc1cf26ffb6936e9df3f0d1144793eb83ac7ab3074486
 SIZE (erlang/patch-otp-17.5.6.3) = 63652
 SHA256 (erlang/patch-otp-17.5.6.4) = 9156ea7d173b8fef62ee1eb2483b943cfdbeca80b74177f51aa131a688db8ed5
 SIZE (erlang/patch-otp-17.5.6.4) = 11945
 SHA256 (erlang/patch-otp-17.5.6.5) = 270501a8ab836456aeddf2601996601b3b7f040dc360a438319434b21c26e1b0
 SIZE (erlang/patch-otp-17.5.6.5) = 16967
 SHA256 (erlang/patch-otp-17.5.6.6) = 53125e68a9a8530e1eaa6451a0849b8b458d40b6611ded9c1cae2936166f65bf
 SIZE (erlang/patch-otp-17.5.6.6) = 5252
 SHA256 (erlang/patch-otp-17.5.6.7) = cd40675b3d75b0a92617c4ebdc361af420a3eb9af00b851a47bd36a223af0f0a
 SIZE (erlang/patch-otp-17.5.6.7) = 25609
 SHA256 (erlang/patch-otp-17.5.6.8) = a5f4b28ecea04a6ba9c5c042963a7d2258f2bc50dc0a4c4d8e42198c7f225c89
 SIZE (erlang/patch-otp-17.5.6.8) = 39537
 SHA256 (erlang/patch-otp-17.5.6.9) = 4380bea95d906eea5c2caaeac4ae830347bd502332c3656d85e0f7642fc52397
 SIZE (erlang/patch-otp-17.5.6.9) = 16067
Index: head/lang/erlang-runtime18/Makefile
===================================================================
--- head/lang/erlang-runtime18/Makefile	(revision 466966)
+++ head/lang/erlang-runtime18/Makefile	(revision 466967)
@@ -1,240 +1,149 @@
 # Created by: ruslan@shevchenko.kiev.ua
 # $FreeBSD$
 
 PORTNAME=	erlang
 PORTVERSION=	18.3.4.8
+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
+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=	-runtime18
-DISTNAME=	otp_src_${ERL_RELEASE}
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:erlangorg	\
-		${ERLANG_MAN}:erlangorg
+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-18.3.1 patch-otp-18.3.2 patch-otp-18.3.3 \
 		patch-otp-18.3.4 patch-otp-18.3.4.1 patch-otp-18.3.4.2 \
 		patch-otp-18.3.4.3 patch-otp-18.3.4.4 patch-otp-18.3.4.5 \
 		patch-otp-18.3.4.6 patch-otp-18.3.4.7 patch-otp-18.3.4.8
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Functional programming language from Ericsson
 
 LICENSE=	APACHE20
 
-WRKSRC=		${WRKDIR}/otp_src_${ERL_RELEASE}
+WRKSRC=		${WRKDIR}/otp_src_${ERLANG_REL}
 
 ERLANG_LIB=	${PORTNAME}${PORTVERSION:C/\..*//}
+ERLANG_REL=	18.3
 
+OPTIONS_SUB=	yes
 SUB_FILES=	pkg-message
 SUB_LIST=	ERLANG_LIB=${ERLANG_LIB}
 
 MAKE_JOBS_UNSAFE=yes
 
-OPTIONS_DEFINE=	DOCS DTRACE GCC GS HIPE JAVA KQUEUE ODBC OPENSSL SCTP SMP THREADS WX DIRTY
+OPTIONS_DEFINE=	DIRTY DTRACE GS HIPE JAVA KQUEUE NATIVE ODBC OPENSSL SCTP SMP THREADS WX
+OPTIONS_DEFAULT=DTRACE HIPE KQUEUE OPENSSL SCTP SMP THREADS
 
 DIRTY_DESC=	Enable Dirty schedulers (experimental)
-DTRACE_DESC=	Enable DTrace support
 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
 SMP_DESC=	Enable SMP support
 WX_DESC=	Enable WX application
 
-OPTIONS_DEFAULT=HIPE KQUEUE OPENSSL SCTP SMP THREADS
-OPTIONS_EXCLUDE_DragonFly=	HIPE SCTP
+NATIVE_IMPLIES=	HIPE
 
-ERL_RELEASE=	18.3
+.if !exists(/usr/sbin/dtrace)
+OPTIONS_EXCLUDE+=	DTRACE
+.endif
 
-USES=		gmake ncurses perl5
-USE_PERL5=	build
+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
 
-APP_UPGRADE=	erts               7.3  7.3.1.4 \
-		lib/common_test   1.12 1.12.1.1 \
-		lib/compiler     6.0.3  6.0.3.1 \
-		lib/crypto       3.6.3  3.6.3.1 \
-		lib/eldap        1.2.1  1.2.1.1 \
-		lib/inets          6.2  6.2.4.1 \
-		lib/mnesia      4.13.3   4.13.4 \
-		lib/ssh          4.2.2  4.2.2.5 \
-		lib/ssl            7.3  7.3.3.2
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDOCS}
-DISTFILES+=	${ERLANG_DOCS}:erlangorg
-.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.
 
-.if ${PORT_OPTIONS:MGCC}
-USE_GCC?=	yes
-.endif
+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
+SMP_CONFIGURE_ENABLE=	smp-support
+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"
 
-.if ${PORT_OPTIONS:MDTRACE}
-CONFIGURE_ARGS+=--with-dynamic-trace=dtrace
-CFLAGS+=	-fno-omit-frame-pointer
-STRIP=
-.else
-CONFIGURE_ARGS+=--without-dynamic-trace
-.endif
+.include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MOPENSSL}
-USES+=		ssl
-CONFIGURE_ARGS+=--with-ssl=${OPENSSLBASE}
-.else
-CONFIGURE_ARGS+=--without-ssl
+.if ${OPSYS} == FreeBSD && ${OSVERSION} > 1100000
+CFLAGS+=	-DMAP_NORESERVE=0
 .endif
 
-.if ${PORT_OPTIONS:MJAVA}
-USE_JAVA=	yes
-CONFIGURE_ARGS+=--with-javac
-CONFIGURE_ENV+=	ac_cv_prog_JAVAC="${JAVAC}"
-.else
-CONFIGURE_ARGS+=--without-javac
-.endif
-
-.if ${PORT_OPTIONS:MHIPE}
-CONFIGURE_ARGS+=--enable-hipe
-.else
-CONFIGURE_ARGS+=--disable-hipe
-.endif
-
-.if ${PORT_OPTIONS:MKQUEUE}
-CONFIGURE_ARGS+=--enable-kernel-poll
-.else
-CONFIGURE_ARGS+=--disable-kernel-poll
-.endif
-
-.if ${PORT_OPTIONS:MGS}
-USES+=		tk:run
-.endif
-
-.if ${PORT_OPTIONS:MWX}
-USE_WX=		2.8+
-WX_COMPS=	wx contrib
-CONFIGURE_ARGS+=--with-wx-config=${WX_CONFIG}
-.endif
-
-.if ${PORT_OPTIONS:MODBC}
-CONFIGURE_ARGS+=--with-odbc
-LIB_DEPENDS+=	libodbc.so:databases/unixODBC
-.else
-CONFIGURE_ARGS+=--without-odbc
-.endif
-
-ERLANG_MAN=	otp_doc_man_${ERL_RELEASE}.tar.gz
-ERLANG_DOCS=	otp_doc_html_${ERL_RELEASE}.tar.gz
-
-.if ${PORT_OPTIONS:MTHREADS}
-CONFIGURE_ARGS+=--enable-threads
-.else
-CONFIGURE_ARGS+=--disable-threads
-.endif
-
-.if ${PORT_OPTIONS:MSCTP}
-CONFIGURE_ARGS+=--enable-sctp
-.else
-CONFIGURE_ARGS+=--disable-sctp
-.endif
-
-# enabling --enable-smp-support crashes the OS when
-# net_kernel:start([node_name, shortnames]) invoked repeatedly
-# TODO verify if it still applies
-
-.if ${PORT_OPTIONS:MSMP}
-CONFIGURE_ARGS+=--enable-smp-support
-.else
-CONFIGURE_ARGS+=--disable-smp-support
-.endif
-
-.if ${PORT_OPTIONS:MDIRTY}
-CONFIGURE_ARGS+=--enable-dirty-schedulers
-.endif
-
 .if ${ARCH} == i386
 MAKE_ARGS+=	ARCH=x86
 .endif
 
 .if ${ARCH} == armv6 || ${ARCH} == armv7
 MAKE_ARGS+=	ARCH=arm
 .endif
 
-# The man-pages are put (in spite of FreeBSD's port convention) in a private
-# subdir. This is to avoid cluttering up the man page name space. Also the
-# Erlang man pages are more of internal documentation using the man format than
-# actual system man pages. (erl.1 and epmd.1 perhaps being the exception).
-
-# Install documentation. (HTML docs need to be in same dir as the
-# rest, not in share/doc/erlang as it should, because of relative
-# links in the documentation.
-
 pre-configure:
-.if ${PORT_OPTIONS:MDTRACE}
-	@if ! /sbin/kldstat | ${GREP} dtraceall >/dev/null 2>&1; then \
-		${ECHO_CMD}; \
-		${ECHO_CMD} "DTRACE option requires kernel module \"dtraceall\" to be loaded."; \
-		${ECHO_CMD}; \
-		exit 1; \
-	fi
-.endif
-.if ! ${PORT_OPTIONS:MWX}
+	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
-.endif
 
-post-configure:
-.if ${PORT_OPTIONS:MODBC}
+post-configure-ODBC-on:
 	${RM} ${WRKSRC}/lib/odbc/SKIP
-.endif
 
-post-install:
-	for SECTION in 1 3 4 6 7; do \
-		${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_MAN} \
-			-C ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB} \
-			"man/man$${SECTION}/*.$${SECTION}" || ${TRUE}; \
-	done
-	${RM} -r ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/man/cat?
-.if ${PORT_OPTIONS:MDOCS}
-	${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_DOCS} \
-		-C ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}
-.for app v1 v2 in ${APP_UPGRADE}
-	${MV} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/${app}-${v1}/* \
-		${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/${app}-${v2}
-	${RMDIR} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/${app}-${v1}
-.endfor
-	${INSTALL_DATA} ${WRKSRC}/lib/dialyzer/doc/*.txt \
-		${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/dialyzer-*/doc/
-.endif
-.if ! ${PORT_OPTIONS:MGS}
+pre-build-NATIVE-on:
+	@cd ${WRKSRC} && ${MAKE_CMD} clean
+
+post-install-GS-off:
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/gs-*
-.endif
-.if ! ${PORT_OPTIONS:MJAVA}
+
+post-install-JAVA-off:
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/jinterface-*
-.endif
-.if ! ${PORT_OPTIONS:MODBC}
+
+post-install-ODBC-off:
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/odbc-*
-.endif
-.if ! ${PORT_OPTIONS:MOPENSSL}
+
+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-*
-.endif
-.if ! ${PORT_OPTIONS:MWX}
+
+post-install-WX-off:
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/wx-*
-.endif
-	${FIND} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/* -type d -empty -delete
 
+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}
+		| ${SORT} >> ${TMPPLIST}
 
 .include <bsd.port.mk>
Index: head/lang/erlang-runtime18/distinfo
===================================================================
--- head/lang/erlang-runtime18/distinfo	(revision 466966)
+++ head/lang/erlang-runtime18/distinfo	(revision 466967)
@@ -1,31 +1,29 @@
-TIMESTAMP = 1521388410
+TIMESTAMP = 1523192133
 SHA256 (erlang/otp_src_18.3.tar.gz) = fdab8129a1cb935db09f1832e3a7d511a4aeb2b9bb3602ca6a7ccb9730d5c9c3
 SIZE (erlang/otp_src_18.3.tar.gz) = 68292101
-SHA256 (erlang/otp_doc_man_18.3.tar.gz) = 978be100e9016874921b3ad1a65ee46b7b6a1e597b8db2ec4b5ef436d4c9ecc2
-SIZE (erlang/otp_doc_man_18.3.tar.gz) = 1395166
-SHA256 (erlang/otp_doc_html_18.3.tar.gz) = 8fd6980fd05367735779a487df107ace7c53733f52fbe56de7ca7844a355676f
-SIZE (erlang/otp_doc_html_18.3.tar.gz) = 34285271
+SHA256 (erlang/preloaded-18.3.4.8.tar.gz) = 5fa802756d9099b9460c5530b20d2d7bddb462db204dec476bd95c1008c2a6d5
+SIZE (erlang/preloaded-18.3.4.8.tar.gz) = 305268
 SHA256 (erlang/patch-otp-18.3.1) = 19a45ed599f4348dd83540c4c3a60bfe20dac5f83643cff1dd71d1b5af1e9bae
 SIZE (erlang/patch-otp-18.3.1) = 20435
 SHA256 (erlang/patch-otp-18.3.2) = 064065ebeadc26a76fcd1b291bc884039117ee8699fe5015809a025dc63a0f35
 SIZE (erlang/patch-otp-18.3.2) = 70255
 SHA256 (erlang/patch-otp-18.3.3) = 5a55b18ee8ec15c8cfe9ffd4687588c0a6f71216538575ae3bbbf67eb5a0485a
 SIZE (erlang/patch-otp-18.3.3) = 87238
 SHA256 (erlang/patch-otp-18.3.4) = 33ceea8b53d7d2a67b78085d7bc80c8b04f5cac792aee49410c86ac45895151a
 SIZE (erlang/patch-otp-18.3.4) = 31596
 SHA256 (erlang/patch-otp-18.3.4.1) = 5998c9578b92cbc4e12d47ae7001f52150d3a065e8101569977e2caa62674456
 SIZE (erlang/patch-otp-18.3.4.1) = 23095
 SHA256 (erlang/patch-otp-18.3.4.2) = 4bce5c1965d4924463c6a243e014cdf5120cd8e75b903e0d00b8557fc00b7bad
 SIZE (erlang/patch-otp-18.3.4.2) = 23520
 SHA256 (erlang/patch-otp-18.3.4.3) = 594be3196ea5a87bebcbc414b189efced68a6de0ddee12bcab7089d5de51f85f
 SIZE (erlang/patch-otp-18.3.4.3) = 5893
 SHA256 (erlang/patch-otp-18.3.4.4) = a2cfac97e2ecb09ec53ebe7fcba953382e4b01b567219ad4abdd63652da9dc91
 SIZE (erlang/patch-otp-18.3.4.4) = 6547
 SHA256 (erlang/patch-otp-18.3.4.5) = d539ac9b72adbda634adfc0fe391e32c0a82c7b4a8807dc606f98bf816397821
 SIZE (erlang/patch-otp-18.3.4.5) = 34006
 SHA256 (erlang/patch-otp-18.3.4.6) = dc3682fb9c2f456cd9b4eb9ab8d00c09f6012a2123e416e2fee8e17ce69ac4ef
 SIZE (erlang/patch-otp-18.3.4.6) = 37943
 SHA256 (erlang/patch-otp-18.3.4.7) = 8b79ab844e465e790eb4ef016d49b917444371190fead05cee2675b435d8a029
 SIZE (erlang/patch-otp-18.3.4.7) = 10475
 SHA256 (erlang/patch-otp-18.3.4.8) = bcac3fe782e7a4b78f36d9d5c928b1d7a2e67aff20ac7bf8f82e5eaab33a60a1
 SIZE (erlang/patch-otp-18.3.4.8) = 19206
Index: head/lang/erlang-runtime19/Makefile
===================================================================
--- head/lang/erlang-runtime19/Makefile	(revision 466966)
+++ head/lang/erlang-runtime19/Makefile	(revision 466967)
@@ -1,268 +1,152 @@
 # Created by: ruslan@shevchenko.kiev.ua
 # $FreeBSD$
 
 PORTNAME=	erlang
 PORTVERSION=	19.3.6.8
+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	\
+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=	-runtime19
-DISTNAME=	otp_src_${ERL_RELEASE}
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:erlangorg	\
-		${ERLANG_MAN}:erlangorg			\
+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-19.3.1 patch-otp-19.3.2 patch-otp-19.3.3 \
 		patch-otp-19.3.4 patch-otp-19.3.5 patch-otp-19.3.6 \
 		patch-otp-19.3.6.1 patch-otp-19.3.6.2 patch-otp-19.3.6.3 \
 		patch-otp-19.3.6.4 patch-otp-19.3.6.5 patch-otp-19.3.6.6 \
 		patch-otp-19.3.6.7 patch-otp-19.3.6.8
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Functional programming language from Ericsson
 
 LICENSE=	APACHE20
 
 BROKEN_sparc64=	Fails to build: error: fp_except undeclared
 
-WRKSRC=		${WRKDIR}/otp_src_${ERL_RELEASE}
+WRKSRC=		${WRKDIR}/otp_src_${ERLANG_REL}
 
 ERLANG_LIB=	${PORTNAME}${PORTVERSION:C/\..*//}
+ERLANG_REL=	19.3
 
+OPTIONS_SUB=	yes
 SUB_FILES=	pkg-message
 SUB_LIST=	ERLANG_LIB=${ERLANG_LIB}
 
 MAKE_JOBS_UNSAFE=yes
 
-OPTIONS_DEFINE=	DIRTY DOCS DTRACE GS HIPE JAVA KQUEUE NATIVE ODBC OPENSSL SCTP SMP THREADS WX
+OPTIONS_DEFINE=	DIRTY DTRACE GS HIPE JAVA KQUEUE NATIVE ODBC OPENSSL SCTP SMP THREADS WX
+OPTIONS_DEFAULT=DTRACE HIPE KQUEUE OPENSSL SCTP SMP THREADS
 
 DIRTY_DESC=	Enable Dirty schedulers (experimental)
-DTRACE_DESC=	Enable DTrace support
 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
 SMP_DESC=	Enable SMP support
 WX_DESC=	Enable WX application
 
 NATIVE_IMPLIES=	HIPE
 
-OPTIONS_DEFAULT=HIPE KQUEUE OPENSSL SCTP SMP THREADS DTRACE
-
 .if !exists(/usr/sbin/dtrace)
 OPTIONS_EXCLUDE+=	DTRACE
 .endif
 
 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
 
-ERL_RELEASE=	19.3
-
-USES=		gmake ncurses perl5
-USE_PERL5=	build
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
+USES=		gmake ncurses perl5
+USE_PERL5=	build
 
-APP_UPGRADE=	erts            8.3  8.3.5.4 \
-		lib/compiler  7.0.4  7.0.4.1 \
-		lib/crypto    3.7.3    3.7.4 \
-		lib/dialyzer    3.1    3.1.1 \
-		lib/inets     6.3.6    6.3.9 \
-		lib/kernel      5.2  5.2.0.1 \
-		lib/mnesia   4.14.3 4.14.3.1 \
-		lib/ssh       4.4.1  4.4.2.3 \
-		lib/ssl       8.1.1  8.1.3.1.1 \
-		lib/xmerl    1.3.13   1.3.14
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDOCS}
-DISTFILES+=	${ERLANG_DOCS}:erlangorg
-.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.
 
+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
+SMP_CONFIGURE_ENABLE=	smp-support
+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 ${PORT_OPTIONS:MDTRACE}
-CONFIGURE_ARGS+=--with-dynamic-trace=dtrace
-CFLAGS+=	-fno-omit-frame-pointer
-STRIP=
-.else
-CONFIGURE_ARGS+=--without-dynamic-trace
-.endif
-
-.if ${PORT_OPTIONS:MOPENSSL}
-USES+=		ssl
-CONFIGURE_ARGS+=--with-ssl=${OPENSSLBASE}
-.else
-CONFIGURE_ARGS+=--without-ssl
-.endif
-
-.if ${PORT_OPTIONS:MJAVA}
-USE_JAVA=	yes
-CONFIGURE_ARGS+=--with-javac
-CONFIGURE_ENV+=	ac_cv_prog_JAVAC="${JAVAC}"
-.else
-CONFIGURE_ARGS+=--without-javac
-.endif
-
-.if ${PORT_OPTIONS:MHIPE}
-CONFIGURE_ARGS+=--enable-hipe
-.else
-CONFIGURE_ARGS+=--disable-hipe
-.endif
-
-.if ${PORT_OPTIONS:MNATIVE}
-CONFIGURE_ARGS+=--enable-native-libs
-.else
-CONFIGURE_ARGS+=--disable-native-libs
-.endif
-
-.if ${PORT_OPTIONS:MKQUEUE}
-CONFIGURE_ARGS+=--enable-kernel-poll
-.else
-CONFIGURE_ARGS+=--disable-kernel-poll
-.endif
-
-.if ${PORT_OPTIONS:MGS}
-USES+=		tk:run
-.endif
-
-.if ${PORT_OPTIONS:MWX}
-USE_WX=		2.8+
-WX_COMPS=	wx contrib
-CONFIGURE_ARGS+=--with-wx-config=${WX_CONFIG}
-USE_GL+=	gl glu
-.endif
-
-.if ${PORT_OPTIONS:MODBC}
-CONFIGURE_ARGS+=--with-odbc
-LIB_DEPENDS+=	libodbc.so:databases/unixODBC
-.else
-CONFIGURE_ARGS+=--without-odbc
-.endif
-
-ERLANG_MAN=	otp_doc_man_${ERL_RELEASE}.tar.gz
-ERLANG_DOCS=	otp_doc_html_${ERL_RELEASE}.tar.gz
-
-.if ${PORT_OPTIONS:MTHREADS}
-CONFIGURE_ARGS+=--enable-threads
-.else
-CONFIGURE_ARGS+=--disable-threads
-.endif
-
-.if ${PORT_OPTIONS:MSCTP}
-CONFIGURE_ARGS+=--enable-sctp
-.else
-CONFIGURE_ARGS+=--disable-sctp
-.endif
-
-# enabling --enable-smp-support crashes the OS when
-# net_kernel:start([node_name, shortnames]) invoked repeatedly
-# TODO verify if it still applies
-
-.if ${PORT_OPTIONS:MSMP}
-CONFIGURE_ARGS+=--enable-smp-support
-.else
-CONFIGURE_ARGS+=--disable-smp-support
-.endif
-
-.if ${PORT_OPTIONS:MDIRTY}
-CONFIGURE_ARGS+=--enable-dirty-schedulers
-.endif
-
 .if ${ARCH} == i386
 MAKE_ARGS+=	ARCH=x86
 .endif
 
 .if ${ARCH} == armv6 || ${ARCH} == armv7
 MAKE_ARGS+=	ARCH=arm
 .endif
 
-# The man-pages are put (in spite of FreeBSD's port convention) in a private
-# subdir. This is to avoid cluttering up the man page name space. Also the
-# Erlang man pages are more of internal documentation using the man format than
-# actual system man pages. (erl.1 and epmd.1 perhaps being the exception).
-
-# Install documentation. (HTML docs need to be in same dir as the
-# rest, not in share/doc/erlang as it should, because of relative
-# links in the documentation.
-
 pre-configure:
-.if ! ${PORT_OPTIONS:MWX}
-	echo "disabled by port options" > ${WRKSRC}/lib/wx/SKIP
-.endif
 	cd ${WRKSRC} && ${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/preloaded-${PORTVERSION}${EXTRACT_SUFX}
 
-post-configure:
-.if ${PORT_OPTIONS:MODBC}
+pre-configure-MX-off:
+	echo "disabled by port options" > ${WRKSRC}/lib/wx/SKIP
+
+post-configure-ODBC-on:
 	${RM} ${WRKSRC}/lib/odbc/SKIP
-.endif
 
-.if ${PORT_OPTIONS:MNATIVE}
-pre-build:
+pre-build-NATIVE-on:
 	@cd ${WRKSRC} && ${MAKE_CMD} clean
-.endif
 
-post-install:
-	for SECTION in 1 3 4 6 7; do \
-		${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_MAN} \
-			-C ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB} \
-			"man/man$${SECTION}/*.$${SECTION}" || ${TRUE}; \
-	done
-	${RM} -r ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/man/cat?
-.if ${PORT_OPTIONS:MDOCS}
-	${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_DOCS} \
-		-C ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}
-.for app v1 v2 in ${APP_UPGRADE}
-	${MV} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/${app}-${v1}/* \
-		${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/${app}-${v2}
-	${RMDIR} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/${app}-${v1}
-.endfor
-	${INSTALL_DATA} ${WRKSRC}/lib/dialyzer/doc/*.txt \
-		${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/dialyzer-*/doc/
-.endif
-.if ! ${PORT_OPTIONS:MGS}
+post-install-GS-off:
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/gs-*
-.endif
-.if ! ${PORT_OPTIONS:MJAVA}
+
+post-install-JAVA-off:
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/jinterface-*
-.endif
-.if ! ${PORT_OPTIONS:MODBC}
+
+post-install-ODBC-off:
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/odbc-*
-.endif
-.if ! ${PORT_OPTIONS:MOPENSSL}
+
+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-*
-.endif
-.if ! ${PORT_OPTIONS:MWX}
+
+post-install-WX-off:
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/wx-*
-.endif
-	${FIND} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/* -type d -empty -delete
 
+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}
+		| ${SORT} >> ${TMPPLIST}
 
 .include <bsd.port.mk>
Index: head/lang/erlang-runtime19/distinfo
===================================================================
--- head/lang/erlang-runtime19/distinfo	(revision 466966)
+++ head/lang/erlang-runtime19/distinfo	(revision 466967)
@@ -1,37 +1,33 @@
-TIMESTAMP = 1523039056
+TIMESTAMP = 1523191136
 SHA256 (erlang/otp_src_19.3.tar.gz) = fe4a00651db39b8542b04530a48d24b2f2e7e0b77cbe93d728c9f05325bdfe83
 SIZE (erlang/otp_src_19.3.tar.gz) = 68510871
-SHA256 (erlang/otp_doc_man_19.3.tar.gz) = f8192ffdd7367083c055695eeddf198155da43dcc221aed1d870d1e3871dd95c
-SIZE (erlang/otp_doc_man_19.3.tar.gz) = 1410781
 SHA256 (erlang/preloaded-19.3.6.8.tar.gz) = 149f667933b13bab7499b16d196e9b7f0962acfe2e95beb9eda664311b2073d5
 SIZE (erlang/preloaded-19.3.6.8.tar.gz) = 330074
-SHA256 (erlang/otp_doc_html_19.3.tar.gz) = dc3e3a82d1aba7f0deac1ddb81b7d6f8dee9a75e1d42b90c677a2b645f19a00c
-SIZE (erlang/otp_doc_html_19.3.tar.gz) = 35818689
 SHA256 (erlang/patch-otp-19.3.1) = 2373f890516b58ae006812ba5f15e4af1f8820be98230011b8cd8b345f51dedd
 SIZE (erlang/patch-otp-19.3.1) = 30225
 SHA256 (erlang/patch-otp-19.3.2) = 21c56ac188177985c9db11c7066dcee0f7370760da3e15a0d03c235bd2a2cb2a
 SIZE (erlang/patch-otp-19.3.2) = 6290
 SHA256 (erlang/patch-otp-19.3.3) = dbe1cab750a3339c3755db27b800e53232519c84a304bd562263ffb060afab55
 SIZE (erlang/patch-otp-19.3.3) = 12525
 SHA256 (erlang/patch-otp-19.3.4) = 02437ac753932f913209102e8cb249a264b774833bfda8c1532b338af60ff8af
 SIZE (erlang/patch-otp-19.3.4) = 13504
 SHA256 (erlang/patch-otp-19.3.5) = 5755da205004ae7e724390958db9ecc737d99ec14e0d14abcec8b8603ea6ece5
 SIZE (erlang/patch-otp-19.3.5) = 44563
 SHA256 (erlang/patch-otp-19.3.6) = ee1b5f0fd64db3322031c38722aee96a8ee35aaac454f430c829446a198f6534
 SIZE (erlang/patch-otp-19.3.6) = 13073
 SHA256 (erlang/patch-otp-19.3.6.1) = 65a6de8533ccaeec81bebcee1d6dde08713533e411a123d5ac27141967581600
 SIZE (erlang/patch-otp-19.3.6.1) = 28956
 SHA256 (erlang/patch-otp-19.3.6.2) = 3d12059e02ef31ae6e5dd97820b0d51c4ab0e7304cbaeddeb856fb2097da87fc
 SIZE (erlang/patch-otp-19.3.6.2) = 14653
 SHA256 (erlang/patch-otp-19.3.6.3) = 77faeedb827c6793b183b33d161e5b3c4467c3ec9053840442d7fd187cfbfa78
 SIZE (erlang/patch-otp-19.3.6.3) = 24500
 SHA256 (erlang/patch-otp-19.3.6.4) = 662dab96ceed33b4b29c835d82bf6b4f8feaa8f75287f43f3ae7e64badb16255
 SIZE (erlang/patch-otp-19.3.6.4) = 10622
 SHA256 (erlang/patch-otp-19.3.6.5) = f830bd6328f2a9e8cb70750bb7e91a8db045b5fc13fe854710fdffce158788d1
 SIZE (erlang/patch-otp-19.3.6.5) = 13254
 SHA256 (erlang/patch-otp-19.3.6.6) = 6bb2da20ad241e86f847ba351dce23ecf5a82f0e6df8eceb83fe2ed4b05d8d2f
 SIZE (erlang/patch-otp-19.3.6.6) = 12542
 SHA256 (erlang/patch-otp-19.3.6.7) = 34bed4599ff19c2bed944dff83e9b640fbf18b6b3a21b42d92c3697e4c50d810
 SIZE (erlang/patch-otp-19.3.6.7) = 11631
 SHA256 (erlang/patch-otp-19.3.6.8) = c3ea86434fe1a4d7baabe17d2e7134065bb19fef7d384a6e289e55a2288a6b61
 SIZE (erlang/patch-otp-19.3.6.8) = 4936
Index: head/lang/erlang-runtime20/Makefile
===================================================================
--- head/lang/erlang-runtime20/Makefile	(revision 466966)
+++ head/lang/erlang-runtime20/Makefile	(revision 466967)
@@ -1,255 +1,147 @@
 # Created by: ruslan@shevchenko.kiev.ua
 # $FreeBSD$
 
 PORTNAME=	erlang
 PORTVERSION=	20.3.2
+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	\
+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_${ERL_RELEASE}
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:erlangorg	\
-		${ERLANG_MAN}:erlangorg			\
+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
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Functional programming language from Ericsson
 
 LICENSE=	APACHE20
 
 BROKEN_sparc64=	Fails to build: error: fp_except undeclared
 
-WRKSRC=		${WRKDIR}/otp_src_${ERL_RELEASE}
+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 DOCS DTRACE GS HIPE JAVA KQUEUE NATIVE ODBC OPENSSL SCTP SMP THREADS WX
+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 (experimental)
-DTRACE_DESC=	Enable DTrace support
+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
-SMP_DESC=	Enable SMP support
 WX_DESC=	Enable WX application
 
 NATIVE_IMPLIES=	HIPE
 
-OPTIONS_DEFAULT=HIPE KQUEUE OPENSSL SCTP SMP THREADS DTRACE
-
 .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
 
-ERL_RELEASE=	20.3
+OPENSSL_VARS=	BROKEN_SSL=openssl-devel
 
-USES=		gmake ncurses perl5
-USE_PERL5=	build
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
+USES=		gmake ncurses perl5
+USE_PERL5=	build
+CONFIGURE_ENABLE=	smp-support
 
-APP_UPGRADE=	lib/ssh    4.6.6 4.6.7 \
-		lib/ssl    8.2.4 8.2.5 \
-		lib/stdlib 3.4.4 3.4.5
+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 ${PORT_OPTIONS:MDOCS}
-DISTFILES+=	${ERLANG_DOCS}:erlangorg
-.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.
-
 .if ${OPSYS} == FreeBSD && ${OSVERSION} > 1100000
 CFLAGS+=	-DMAP_NORESERVE=0
 .endif
 
-.if ${PORT_OPTIONS:MDTRACE}
-CONFIGURE_ARGS+=--with-dynamic-trace=dtrace
-CFLAGS+=	-fno-omit-frame-pointer
-STRIP=
-.else
-CONFIGURE_ARGS+=--without-dynamic-trace
-.endif
-
-.if ${PORT_OPTIONS:MOPENSSL}
-USES+=		ssl
-CONFIGURE_ARGS+=--with-ssl=${OPENSSLBASE}
-.else
-CONFIGURE_ARGS+=--without-ssl
-.endif
-
-.if ${PORT_OPTIONS:MJAVA}
-USE_JAVA=	yes
-CONFIGURE_ARGS+=--with-javac
-CONFIGURE_ENV+=	ac_cv_prog_JAVAC="${JAVAC}"
-.else
-CONFIGURE_ARGS+=--without-javac
-.endif
-
-.if ${PORT_OPTIONS:MHIPE}
-CONFIGURE_ARGS+=--enable-hipe
-.else
-CONFIGURE_ARGS+=--disable-hipe
-.endif
-
-.if ${PORT_OPTIONS:MNATIVE}
-CONFIGURE_ARGS+=--enable-native-libs
-.else
-CONFIGURE_ARGS+=--disable-native-libs
-.endif
-
-.if ${PORT_OPTIONS:MKQUEUE}
-CONFIGURE_ARGS+=--enable-kernel-poll
-.else
-CONFIGURE_ARGS+=--disable-kernel-poll
-.endif
-
-.if ${PORT_OPTIONS:MGS}
-USES+=		tk:run
-.endif
-
-.if ${PORT_OPTIONS:MWX}
-USE_WX=		2.8+
-WX_COMPS=	wx contrib
-CONFIGURE_ARGS+=--with-wx-config=${WX_CONFIG}
-USE_GL+=	gl glu
-.endif
-
-.if ${PORT_OPTIONS:MODBC}
-CONFIGURE_ARGS+=--with-odbc
-LIB_DEPENDS+=	libodbc.so:databases/unixODBC
-.else
-CONFIGURE_ARGS+=--without-odbc
-.endif
-
-ERLANG_MAN=	otp_doc_man_${ERL_RELEASE}.tar.gz
-ERLANG_DOCS=	otp_doc_html_${ERL_RELEASE}.tar.gz
-
-.if ${PORT_OPTIONS:MTHREADS}
-CONFIGURE_ARGS+=--enable-threads
-.else
-CONFIGURE_ARGS+=--disable-threads
-.endif
-
-.if ${PORT_OPTIONS:MSCTP}
-CONFIGURE_ARGS+=--enable-sctp
-.else
-CONFIGURE_ARGS+=--disable-sctp
-.endif
-
-# enabling --enable-smp-support crashes the OS when
-# net_kernel:start([node_name, shortnames]) invoked repeatedly
-# TODO verify if it still applies
-
-.if ${PORT_OPTIONS:MSMP}
-CONFIGURE_ARGS+=--enable-smp-support
-.else
-CONFIGURE_ARGS+=--disable-smp-support
-.endif
-
-.if ${PORT_OPTIONS:MDIRTY}
-CONFIGURE_ARGS+=--enable-dirty-schedulers
-.endif
-
 .if ${ARCH} == i386
 MAKE_ARGS+=	ARCH=x86
 .endif
 
 .if ${ARCH} == armv6 || ${ARCH} == armv7
 MAKE_ARGS+=	ARCH=arm
 .endif
 
-# The man-pages are put (in spite of FreeBSD's port convention) in a private
-# subdir. This is to avoid cluttering up the man page name space. Also the
-# Erlang man pages are more of internal documentation using the man format than
-# actual system man pages. (erl.1 and epmd.1 perhaps being the exception).
-
-# Install documentation. (HTML docs need to be in same dir as the
-# rest, not in share/doc/erlang as it should, because of relative
-# links in the documentation.
-
 pre-configure:
-.if ! ${PORT_OPTIONS:MWX}
-	echo "disabled by port options" > ${WRKSRC}/lib/wx/SKIP
-.endif
 	cd ${WRKSRC} && ${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/preloaded-${PORTVERSION}${EXTRACT_SUFX}
 
-post-configure:
-.if ${PORT_OPTIONS:MODBC}
+pre-configure-MX-off:
+	echo "disabled by port options" > ${WRKSRC}/lib/wx/SKIP
+
+post-configure-ODBC-on:
 	${RM} ${WRKSRC}/lib/odbc/SKIP
-.endif
 
-.if ${PORT_OPTIONS:MNATIVE}
-pre-build:
+pre-build-NATIVE-on:
 	@cd ${WRKSRC} && ${MAKE_CMD} clean
-.endif
 
-post-install:
-	for SECTION in 1 3 4 6 7; do \
-		${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_MAN} \
-			-C ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB} \
-			"man/man$${SECTION}/*.$${SECTION}" || ${TRUE}; \
-	done
-	${RM} -r ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/man/cat?
-.if ${PORT_OPTIONS:MDOCS}
-	${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_DOCS} \
-		-C ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}
-.for app v1 v2 in ${APP_UPGRADE}
-	${MV} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/${app}-${v1}/* \
-		${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/${app}-${v2}
-	${RMDIR} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/${app}-${v1}
-.endfor
-	${INSTALL_DATA} ${WRKSRC}/lib/dialyzer/doc/*.txt \
-		${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/dialyzer-*/doc/
-.endif
-.if ! ${PORT_OPTIONS:MGS}
+post-install-GS-off:
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/gs-*
-.endif
-.if ! ${PORT_OPTIONS:MJAVA}
+
+post-install-JAVA-off:
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/jinterface-*
-.endif
-.if ! ${PORT_OPTIONS:MODBC}
+
+post-install-ODBC-off:
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/odbc-*
-.endif
-.if ! ${PORT_OPTIONS:MOPENSSL}
+
+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-*
-.endif
-.if ! ${PORT_OPTIONS:MWX}
+
+post-install-WX-off:
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/wx-*
-.endif
-	${FIND} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/* -type d -empty -delete
 
+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}
+		| ${SORT} >> ${TMPPLIST}
 
 .include <bsd.port.mk>
Index: head/lang/erlang-runtime20/distinfo
===================================================================
--- head/lang/erlang-runtime20/distinfo	(revision 466966)
+++ head/lang/erlang-runtime20/distinfo	(revision 466967)
@@ -1,13 +1,9 @@
-TIMESTAMP = 1521710900
+TIMESTAMP = 1523203104
 SHA256 (erlang/otp_src_20.3.tar.gz) = 4e19e6c403d5255531c0b870f19511c8b8e3b080618e4f9efcb44d905935b2a1
 SIZE (erlang/otp_src_20.3.tar.gz) = 88170904
-SHA256 (erlang/otp_doc_man_20.3.tar.gz) = 17e0b2f94f11576a12526614a906ecad629b8804c25e6c18523f7c4346607112
-SIZE (erlang/otp_doc_man_20.3.tar.gz) = 1339710
 SHA256 (erlang/preloaded-20.3.2.tar.gz) = 19997a8ef67d3d0a57482107ca43ef1813e85f17e5e0e8fa80fb318bc4ec3a47
 SIZE (erlang/preloaded-20.3.2.tar.gz) = 334970
-SHA256 (erlang/otp_doc_html_20.3.tar.gz) = 8099b62e9fa24b3f90eaeda151fa23ae729c8297e7d3fd8adaca865b35a3125d
-SIZE (erlang/otp_doc_html_20.3.tar.gz) = 33594990
 SHA256 (erlang/patch-otp-20.3.1) = 3d43c6ecb867c64318466eb7adeb8953669cb092bb4b43bbe1b51cfb8d640ee8
 SIZE (erlang/patch-otp-20.3.1) = 5316
 SHA256 (erlang/patch-otp-20.3.2) = b4fa80bab29f1382510ad5b3fc66fd5d1aba35bb48ce390763eb05c88a3e44b1
 SIZE (erlang/patch-otp-20.3.2) = 8201