Upgrade to R18.

- HIPE is now enabled by default
- Add APACHE20 license
- Remove unnecessary autoreconf
- Sort option descriptions

Gotchas:

- The LLVM HiPE backend does not seem to work yet.

3 files changed, 22 insertions, 23 deletions

diff --git a/lang/erlang-java/Makefile b/lang/erlang-java/Makefile
index 48c4fd8c626a..cd1ae6760cc7 100644
--- a/lang/erlang-java/Makefile
+++ b/lang/erlang-java/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	erlang
-PORTVERSION=	17.5.6
+PORTVERSION=	18.0
 CATEGORIES=	lang parallel java
 MASTER_SITES=	http://www.erlang.org/download/:erlangorg		\
 		http://erlang.stacken.kth.se/download/:erlangorg	\
@@ -14,8 +14,7 @@ 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=	Erlang interface for Java
@@ -30,13 +29,13 @@ MAKE_JOBS_UNSAFE=yes
 
 OPTIONS_DEFINE=	DOCS
 
-ERL_RELEASE=	17.5
+ERL_RELEASE=	18.0
 
-USES=		autoreconf gmake
+USES=		gmake perl5
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-APP_VERSION=	1.5.12
+APP_VERSION=	1.6
 APP_DIR=	${PREFIX}/lib/erlang/lib/jinterface-${APP_VERSION}
 
 .include <bsd.port.options.mk>
diff --git a/lang/erlang-java/distinfo b/lang/erlang-java/distinfo
index e356cb540363..08a681fb7dd4 100644
--- a/lang/erlang-java/distinfo
+++ b/lang/erlang-java/distinfo
@@ -1,16 +1,4 @@
-SHA256 (erlang/otp_src_17.5.tar.gz) = 3c28820c981b30c50df8ac2a4a238e5813454fa3ed2ad530bc7948a282846474
-SIZE (erlang/otp_src_17.5.tar.gz) = 67242289
-SHA256 (erlang/otp_doc_html_17.5.tar.gz) = baba1d373c1faacf4a1a6ec1220d57d0cb2b977edb74f32cd58dc786361c6cf5
-SIZE (erlang/otp_doc_html_17.5.tar.gz) = 33510258
-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/otp_src_18.0.tar.gz) = a0b69da34b4f218eb7d63d9e96fc120aa7257bb6c37a0f40fb388e188b4111aa
+SIZE (erlang/otp_src_18.0.tar.gz) = 68124710
+SHA256 (erlang/otp_doc_html_18.0.tar.gz) = e5a766f68406f5025f921ec32e8959937189ed1245e24b03a74156a8898b03b2
+SIZE (erlang/otp_doc_html_18.0.tar.gz) = 33857396
diff --git a/lang/erlang-java/pkg-plist b/lang/erlang-java/pkg-plist
index 3fc44bbd387d..bc51f2e1da98 100644
--- a/lang/erlang-java/pkg-plist
+++ b/lang/erlang-java/pkg-plist
@@ -51,6 +51,12 @@
 %%PORTDOCS%%lib/erlang/lib/jinterface-%%APP_VERSION%%/doc/html/java/com/ericsson/otp/erlang/OtpPeer.html
 %%PORTDOCS%%lib/erlang/lib/jinterface-%%APP_VERSION%%/doc/html/java/com/ericsson/otp/erlang/OtpSelf.html
 %%PORTDOCS%%lib/erlang/lib/jinterface-%%APP_VERSION%%/doc/html/java/com/ericsson/otp/erlang/OtpServer.html
+%%PORTDOCS%%lib/erlang/lib/jinterface-%%APP_VERSION%%/doc/html/java/com/ericsson/otp/erlang/OtpServerSocketTransport.html
+%%PORTDOCS%%lib/erlang/lib/jinterface-%%APP_VERSION%%/doc/html/java/com/ericsson/otp/erlang/OtpServerTransport.html
+%%PORTDOCS%%lib/erlang/lib/jinterface-%%APP_VERSION%%/doc/html/java/com/ericsson/otp/erlang/OtpSocketTransport.html
+%%PORTDOCS%%lib/erlang/lib/jinterface-%%APP_VERSION%%/doc/html/java/com/ericsson/otp/erlang/OtpSocketTransportFactory.html
+%%PORTDOCS%%lib/erlang/lib/jinterface-%%APP_VERSION%%/doc/html/java/com/ericsson/otp/erlang/OtpTransport.html
+%%PORTDOCS%%lib/erlang/lib/jinterface-%%APP_VERSION%%/doc/html/java/com/ericsson/otp/erlang/OtpTransportFactory.html
 %%PORTDOCS%%lib/erlang/lib/jinterface-%%APP_VERSION%%/doc/html/java/com/ericsson/otp/erlang/package-frame.html
 %%PORTDOCS%%lib/erlang/lib/jinterface-%%APP_VERSION%%/doc/html/java/com/ericsson/otp/erlang/package-summary.html
 %%PORTDOCS%%lib/erlang/lib/jinterface-%%APP_VERSION%%/doc/html/java/com/ericsson/otp/erlang/package-tree.html
@@ -92,6 +98,7 @@
 %%PORTDOCS%%lib/erlang/lib/jinterface-%%APP_VERSION%%/doc/src/user_guide.gif
 lib/erlang/lib/jinterface-%%APP_VERSION%%/ebin/jinterface.app
 lib/erlang/lib/jinterface-%%APP_VERSION%%/ebin/jinterface.appup
+%%PORTDOCS%%lib/erlang/lib/jinterface-%%APP_VERSION%%/info
 lib/erlang/lib/jinterface-%%APP_VERSION%%/java_src/Makefile
 lib/erlang/lib/jinterface-%%APP_VERSION%%/java_src/com/ericsson/otp/erlang/AbstractConnection.java
 lib/erlang/lib/jinterface-%%APP_VERSION%%/java_src/com/ericsson/otp/erlang/AbstractNode.java
@@ -143,11 +150,16 @@ lib/erlang/lib/jinterface-%%APP_VERSION%%/java_src/com/ericsson/otp/erlang/OtpOu
 lib/erlang/lib/jinterface-%%APP_VERSION%%/java_src/com/ericsson/otp/erlang/OtpPeer.java
 lib/erlang/lib/jinterface-%%APP_VERSION%%/java_src/com/ericsson/otp/erlang/OtpSelf.java
 lib/erlang/lib/jinterface-%%APP_VERSION%%/java_src/com/ericsson/otp/erlang/OtpServer.java
+lib/erlang/lib/jinterface-%%APP_VERSION%%/java_src/com/ericsson/otp/erlang/OtpServerSocketTransport.java
+lib/erlang/lib/jinterface-%%APP_VERSION%%/java_src/com/ericsson/otp/erlang/OtpServerTransport.java
+lib/erlang/lib/jinterface-%%APP_VERSION%%/java_src/com/ericsson/otp/erlang/OtpSocketTransport.java
+lib/erlang/lib/jinterface-%%APP_VERSION%%/java_src/com/ericsson/otp/erlang/OtpSocketTransportFactory.java
 lib/erlang/lib/jinterface-%%APP_VERSION%%/java_src/com/ericsson/otp/erlang/OtpSystem.java
+lib/erlang/lib/jinterface-%%APP_VERSION%%/java_src/com/ericsson/otp/erlang/OtpTransport.java
+lib/erlang/lib/jinterface-%%APP_VERSION%%/java_src/com/ericsson/otp/erlang/OtpTransportFactory.java
 lib/erlang/lib/jinterface-%%APP_VERSION%%/java_src/com/ericsson/otp/erlang/java_files
 lib/erlang/lib/jinterface-%%APP_VERSION%%/java_src/com/ericsson/otp/erlang/jinterface.app.src
 lib/erlang/lib/jinterface-%%APP_VERSION%%/java_src/com/ericsson/otp/erlang/jinterface.appup.src
 lib/erlang/lib/jinterface-%%APP_VERSION%%/java_src/com/ericsson/otp/erlang/package.html
 lib/erlang/lib/jinterface-%%APP_VERSION%%/java_src/pom.xml.src
-%%PORTDOCS%%lib/erlang/lib/jinterface-%%APP_VERSION%%/info
 lib/erlang/lib/jinterface-%%APP_VERSION%%/priv/OtpErlang.jar