5 files changed, 30 insertions, 98 deletions

diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile
index 3e44f6a64615..3de7c83e9406 100644
--- a/lang/erlang/Makefile
+++ b/lang/erlang/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	erlang
-PORTVERSION=	17.5.6
-PORTREVISION=	1
+PORTVERSION=	18.0
 PORTEPOCH=	3
 CATEGORIES=	lang parallel java
 MASTER_SITES=	http://www.erlang.org/download/:erlangorg		\
@@ -21,12 +20,13 @@ 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
+PATCHFILES=
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Functional programming language from Ericsson
 
+LICENSE=	APACHE20
+
 WRKSRC=		${WRKDIR}/otp_src_${ERL_RELEASE}
 
 ERLANG_LIB=	${PORTNAME}
@@ -39,30 +39,30 @@ MAKE_JOBS_UNSAFE=yes
 
 OPTIONS_DEFINE=	DOCS DTRACE GCC GS HIPE JAVA KQUEUE ODBC OPENSSL SCTP SMP THREADS WX DIRTY
 
+DIRTY_DESC=	Enable Dirty schedulers (experimental)
+DTRACE_DESC=	Enable DTrace support
 GCC_DESC=	Use current GCC
+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
-GS_DESC=	Enable GS application (deprecated)
-DTRACE_DESC=	Enable DTrace support
-DIRTY_DESC=	Enable Dirty schedulers (experimental)
 
-OPTIONS_DEFAULT=KQUEUE OPENSSL SCTP SMP THREADS
+OPTIONS_DEFAULT=HIPE KQUEUE OPENSSL SCTP SMP THREADS
 OPTIONS_EXCLUDE_DragonFly=	SCTP
 
-ERL_RELEASE=	17.5
+ERL_RELEASE=	18.0
 
-USES=		autoreconf gmake perl5
+USES=		gmake perl5
 USE_PERL5=	build
 USE_RC_SUBR=	epmd
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-EI_VSN=		3.7.20
-SNMP_VSN=	5.1.2
-TOOLS_VSN=	2.7.2
+EI_VSN=		3.8
+SNMP_VSN=	5.2
+TOOLS_VSN=	2.8
 
 .include <bsd.port.options.mk>
 
@@ -217,43 +217,9 @@ post-install:
 			"man/man$${SECTION}/*.$${SECTION}" || ${TRUE}; \
 	done
 	${RM} -rf ${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}
-
-	${MV} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/erts-6.4/* \
-		${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/erts-6.4.1
-	${RMDIR} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/erts-6.4
-
-	${MV} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/inets-5.10.6/* \
-		${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/inets-5.10.9
-	${RMDIR} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/inets-5.10.6
-
-	${MV} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/ssh-3.2/* \
-		${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/ssh-3.2.4
-	${RMDIR} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/ssh-3.2
-
-	${MV} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/common_test-1.10/* \
-		${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/common_test-1.10.1
-	${RMDIR} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/common_test-1.10
-
-	${MV} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/diameter-1.9/* \
-		${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/diameter-1.9.2
-	${RMDIR} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/diameter-1.9
-
-	${MV} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/snmp-5.1.1/* \
-		${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/snmp-5.1.2
-	${RMDIR} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/snmp-5.1.1
-
-	${MV} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/test_server-3.8/* \
-		${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/test_server-3.8.1
-	${RMDIR} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/test_server-3.8
-
-	${MV} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/ssl-6.0/* \
-		${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/ssl-6.0.1
-	${RMDIR} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/ssl-6.0
-
 	${INSTALL_DATA} ${WRKSRC}/lib/dialyzer/doc/*.txt \
 		${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/dialyzer-*/doc/
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/lang/erlang/distinfo b/lang/erlang/distinfo
index 2c7edeb69c9d..4dd66a2052ba 100644
--- a/lang/erlang/distinfo
+++ b/lang/erlang/distinfo
@@ -1,9 +1,9 @@
-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/otp_src_18.0.tar.gz) = a0b69da34b4f218eb7d63d9e96fc120aa7257bb6c37a0f40fb388e188b4111aa
+SIZE (erlang/otp_src_18.0.tar.gz) = 68124710
+SHA256 (erlang/otp_doc_man_18.0.tar.gz) = e44f0ec36ee0683867bc2aa9cc7fbb020d9dfd57338f37b98dcd0771f5b95673
+SIZE (erlang/otp_doc_man_18.0.tar.gz) = 1389178
+SHA256 (erlang/otp_doc_html_18.0.tar.gz) = e5a766f68406f5025f921ec32e8959937189ed1245e24b03a74156a8898b03b2
+SIZE (erlang/otp_doc_html_18.0.tar.gz) = 33857396
 SHA256 (erlang/armstrong_thesis_2003.pdf) = da585b914eb07350e2d6f727db5eb0fb1551f49fc1270f7d4dc079f2c8c1ab7a
 SIZE (erlang/armstrong_thesis_2003.pdf) = 859249
 SHA256 (erlang/bjarnelic.pdf) = 9544d4af5cea324e5c9cf77e670d9561ad61ddc240cdb5c2afecebc0a3d7429b
@@ -16,15 +16,3 @@ SHA256 (erlang/mnesia_overview.pdf) = f07f9edd4ba865a1c50647dd6fa4a8f49277f8f3be
 SIZE (erlang/mnesia_overview.pdf) = 150266
 SHA256 (erlang/programming_rules.pdf) = b95f8851004832b044e064c12976a422613ece897e98308a27ee8b66738b4502
 SIZE (erlang/programming_rules.pdf) = 77025
-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
diff --git a/lang/erlang/files/patch-erts_emulator_drivers_common_efile__drv.c b/lang/erlang/files/patch-erts_emulator_drivers_common_efile__drv.c
deleted file mode 100644
index a6447f81c7d2..000000000000
--- a/lang/erlang/files/patch-erts_emulator_drivers_common_efile__drv.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- erts/emulator/drivers/common/efile_drv.c.orig	2015-03-31 12:32:52 UTC
-+++ erts/emulator/drivers/common/efile_drv.c
-@@ -1938,6 +1938,8 @@ static void invoke_sendfile(void *data)
- 	d->result_ok = 1;
- 	if (d->c.sendfile.nbytes != 0)
- 	  d->c.sendfile.nbytes -= nbytes;
-+      } else if (nbytes == 0 && d->c.sendfile.nbytes == 0) {
-+	d->result_ok = 1;
-       } else
- 	d->result_ok = 0;
-     } else {
diff --git a/lang/erlang/files/patch-lib_hipe_llvm_hipe__llvm__main.erl b/lang/erlang/files/patch-lib_hipe_llvm_hipe__llvm__main.erl
new file mode 100644
index 000000000000..633d84504d99
--- /dev/null
+++ b/lang/erlang/files/patch-lib_hipe_llvm_hipe__llvm__main.erl
@@ -0,0 +1,11 @@
+--- lib/hipe/llvm/hipe_llvm_main.erl.orig	2015-06-27 20:52:09 UTC
++++ lib/hipe/llvm/hipe_llvm_main.erl
+@@ -474,7 +474,7 @@ unique_folder(FunName, Arity, Options) -
+       true ->  %% Store folder in current directory
+         DirName;
+       false -> %% Temporarily store folder in tempfs (/dev/shm/)
+-        "/dev/shm/" ++ DirName
++        "/tmp/" ++ DirName
+     end,
+   %% Make sure it does not exist
+   case dir_exists(Dir) of
diff --git a/lang/erlang/files/patch-lib_ssl_src_ssl__cipher.erl b/lang/erlang/files/patch-lib_ssl_src_ssl__cipher.erl
deleted file mode 100644
index efa6734a3e19..000000000000
--- a/lang/erlang/files/patch-lib_ssl_src_ssl__cipher.erl
+++ /dev/null
@@ -1,22 +0,0 @@
---- lib/ssl/src/ssl_cipher.erl.orig	2015-03-31 12:32:52 UTC
-+++ lib/ssl/src/ssl_cipher.erl
-@@ -1209,7 +1209,8 @@ hash_algorithm(?SHA) -> sha;
- hash_algorithm(?SHA224) -> sha224;
- hash_algorithm(?SHA256) -> sha256;
- hash_algorithm(?SHA384) -> sha384;
--hash_algorithm(?SHA512) -> sha512.
-+hash_algorithm(?SHA512) -> sha512;
-+hash_algorithm(Other) when is_integer(Other) andalso ((Other >= 224) and (Other =< 255)) -> Other.
- 
- sign_algorithm(anon)  -> ?ANON;
- sign_algorithm(rsa)   -> ?RSA;
-@@ -1218,7 +1219,8 @@ sign_algorithm(ecdsa) -> ?ECDSA;
- sign_algorithm(?ANON) -> anon;
- sign_algorithm(?RSA) -> rsa;
- sign_algorithm(?DSA) -> dsa;
--sign_algorithm(?ECDSA) -> ecdsa.
-+sign_algorithm(?ECDSA) -> ecdsa;
-+sign_algorithm(Other) when is_integer(Other) andalso ((Other >= 224) and (Other =< 255)) -> Other.
- 
- hash_size(null) ->
-     0;