Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 29 Mar 2016 15:05:54 +0000 (UTC)
From:      Jimmy Olgeni <olgeni@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r412118 - in head/lang: erlang erlang-java erlang-wx
Message-ID:  <201603291505.u2TF5sgt048201@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: olgeni
Date: Tue Mar 29 15:05:54 2016
New Revision: 412118
URL: https://svnweb.freebsd.org/changeset/ports/412118

Log:
  Upgrade Erlang 18 ports to version 18.3.
  
  Also, make sure that ODBC is actually built (PR 207622).
  
  PR:		207622
  Submitted by:	Mathieu Kerjouan

Modified:
  head/lang/erlang-java/Makefile
  head/lang/erlang-java/distinfo
  head/lang/erlang-wx/Makefile
  head/lang/erlang-wx/distinfo
  head/lang/erlang/Makefile
  head/lang/erlang/distinfo

Modified: head/lang/erlang-java/Makefile
==============================================================================
--- head/lang/erlang-java/Makefile	Tue Mar 29 14:53:13 2016	(r412117)
+++ head/lang/erlang-java/Makefile	Tue Mar 29 15:05:54 2016	(r412118)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	erlang
-PORTVERSION=	18.2.4
+PORTVERSION=	18.3
 CATEGORIES=	lang parallel java
 MASTER_SITES=	http://www.erlang.org/download/:erlangorg		\
 		http://erlang.stacken.kth.se/download/:erlangorg	\
@@ -14,7 +14,7 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 PATCH_SITES=	http://olgeni.olgeni.com/~olgeni/distfiles/ \
 		LOCAL/olgeni
-PATCHFILES=	patch-otp-18.2.2 patch-otp-18.2.3 patch-otp-18.2.4
+PATCHFILES=
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Erlang interface for Java
@@ -30,7 +30,7 @@ MAKE_JOBS_UNSAFE=yes
 
 OPTIONS_DEFINE=	DOCS
 
-ERL_RELEASE=	18.2.1
+ERL_RELEASE=	18.3
 
 USES=		gmake ncurses perl5
 USE_PERL5=	build

Modified: head/lang/erlang-java/distinfo
==============================================================================
--- head/lang/erlang-java/distinfo	Tue Mar 29 14:53:13 2016	(r412117)
+++ head/lang/erlang-java/distinfo	Tue Mar 29 15:05:54 2016	(r412118)
@@ -1,10 +1,4 @@
-SHA256 (erlang/otp_src_18.2.1.tar.gz) = 82d76ebfeeda5db64ea5b0f1a04aa0e9ac63380b278722e0e6052249bd3fe39a
-SIZE (erlang/otp_src_18.2.1.tar.gz) = 68110840
-SHA256 (erlang/otp_doc_html_18.2.1.tar.gz) = 3576c567b30400fec2b456897d54ba79933ee0f83f6ec57816417b5417ea9723
-SIZE (erlang/otp_doc_html_18.2.1.tar.gz) = 34204320
-SHA256 (erlang/patch-otp-18.2.2) = 2a223e838a5b018535905f813eb95830dcced30b39dce3fdac02919c98823353
-SIZE (erlang/patch-otp-18.2.2) = 9587
-SHA256 (erlang/patch-otp-18.2.3) = 9294879b4b3f1fc9eb005003b1e930458b184e543a898f21d7cab921e36a0862
-SIZE (erlang/patch-otp-18.2.3) = 55919
-SHA256 (erlang/patch-otp-18.2.4) = ea07166fcfd6cab6fcf21945cf7b630473d3a5828a6e101b60e845f42dbbd002
-SIZE (erlang/patch-otp-18.2.4) = 17847
+SHA256 (erlang/otp_src_18.3.tar.gz) = fdab8129a1cb935db09f1832e3a7d511a4aeb2b9bb3602ca6a7ccb9730d5c9c3
+SIZE (erlang/otp_src_18.3.tar.gz) = 68292101
+SHA256 (erlang/otp_doc_html_18.3.tar.gz) = 8fd6980fd05367735779a487df107ace7c53733f52fbe56de7ca7844a355676f
+SIZE (erlang/otp_doc_html_18.3.tar.gz) = 34285271

Modified: head/lang/erlang-wx/Makefile
==============================================================================
--- head/lang/erlang-wx/Makefile	Tue Mar 29 14:53:13 2016	(r412117)
+++ head/lang/erlang-wx/Makefile	Tue Mar 29 15:05:54 2016	(r412118)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	erlang
-PORTVERSION=	18.2.4
+PORTVERSION=	18.3
 CATEGORIES=	lang parallel
 MASTER_SITES=	http://www.erlang.org/download/:erlangorg		\
 		http://erlang.stacken.kth.se/download/:erlangorg	\
@@ -14,7 +14,7 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 PATCH_SITES=	http://olgeni.olgeni.com/~olgeni/distfiles/ \
 		LOCAL/olgeni
-PATCHFILES=	patch-otp-18.2.2 patch-otp-18.2.3 patch-otp-18.2.4
+PATCHFILES=
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Erlang bindings for wxWindows
@@ -32,13 +32,13 @@ MAKE_JOBS_UNSAFE=yes
 
 OPTIONS_DEFINE=	DOCS
 
-ERL_RELEASE=	18.2.1
+ERL_RELEASE=	18.3
 
 USES=		gmake
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-APP_VERSION=	1.6
+APP_VERSION=	1.6.1
 APP_DIR=	${PREFIX}/lib/erlang/lib/wx-${APP_VERSION}
 
 .include <bsd.port.options.mk>

Modified: head/lang/erlang-wx/distinfo
==============================================================================
--- head/lang/erlang-wx/distinfo	Tue Mar 29 14:53:13 2016	(r412117)
+++ head/lang/erlang-wx/distinfo	Tue Mar 29 15:05:54 2016	(r412118)
@@ -1,7 +1,7 @@
-SHA256 (erlang/otp_src_18.2.1.tar.gz) = 82d76ebfeeda5db64ea5b0f1a04aa0e9ac63380b278722e0e6052249bd3fe39a
-SIZE (erlang/otp_src_18.2.1.tar.gz) = 68110840
-SHA256 (erlang/otp_doc_html_18.2.1.tar.gz) = 3576c567b30400fec2b456897d54ba79933ee0f83f6ec57816417b5417ea9723
-SIZE (erlang/otp_doc_html_18.2.1.tar.gz) = 34204320
+SHA256 (erlang/otp_src_18.3.tar.gz) = fdab8129a1cb935db09f1832e3a7d511a4aeb2b9bb3602ca6a7ccb9730d5c9c3
+SIZE (erlang/otp_src_18.3.tar.gz) = 68292101
+SHA256 (erlang/otp_doc_html_18.3.tar.gz) = 8fd6980fd05367735779a487df107ace7c53733f52fbe56de7ca7844a355676f
+SIZE (erlang/otp_doc_html_18.3.tar.gz) = 34285271
 SHA256 (erlang/patch-otp-18.2.2) = 2a223e838a5b018535905f813eb95830dcced30b39dce3fdac02919c98823353
 SIZE (erlang/patch-otp-18.2.2) = 9587
 SHA256 (erlang/patch-otp-18.2.3) = 9294879b4b3f1fc9eb005003b1e930458b184e543a898f21d7cab921e36a0862

Modified: head/lang/erlang/Makefile
==============================================================================
--- head/lang/erlang/Makefile	Tue Mar 29 14:53:13 2016	(r412117)
+++ head/lang/erlang/Makefile	Tue Mar 29 15:05:54 2016	(r412118)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	erlang
-PORTVERSION=	18.2.4
+PORTVERSION=	18.3
 PORTEPOCH=	3
 CATEGORIES=	lang parallel java
 MASTER_SITES=	http://www.erlang.org/download/:erlangorg		\
@@ -20,7 +20,7 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 PATCH_SITES=	http://olgeni.olgeni.com/~olgeni/distfiles/ \
 		LOCAL/olgeni
-PATCHFILES=	patch-otp-18.2.2 patch-otp-18.2.3 patch-otp-18.2.4
+PATCHFILES=
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Functional programming language from Ericsson
@@ -51,7 +51,7 @@ WX_DESC=	Enable WX application
 OPTIONS_DEFAULT=HIPE KQUEUE OPENSSL SCTP SMP THREADS
 OPTIONS_EXCLUDE_DragonFly=	HIPE SCTP
 
-ERL_RELEASE=	18.2.1
+ERL_RELEASE=	18.3
 
 USES=		gmake ncurses perl5
 USE_PERL5=	build
@@ -59,9 +59,9 @@ USE_RC_SUBR=	epmd
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-EI_VSN=		3.8.1
-SNMP_VSN=	5.2.1
-TOOLS_VSN=	2.8.2
+EI_VSN=		3.8.2
+SNMP_VSN=	5.2.2
+TOOLS_VSN=	2.8.3
 
 .include <bsd.port.options.mk>
 
@@ -205,6 +205,11 @@ pre-configure:
 	echo "disabled by port options" > ${WRKSRC}/lib/wx/SKIP
 .endif
 
+post-configure:
+.if ${PORT_OPTIONS:MODBC}
+	${RM} ${WRKSRC}/lib/odbc/SKIP
+.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
@@ -217,19 +222,6 @@ post-install:
 .if ${PORT_OPTIONS:MDOCS}
 	${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_DOCS} \
 		-C ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}
-
-	${MV} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/common_test-1.11.1/* \
-		${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/common_test-1.11.2
-	${RMDIR} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/common_test-1.11.1
-
-	${MV} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/inets-6.1/* \
-		${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/inets-6.1.1
-	${RMDIR} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/inets-6.1
-
-	${MV} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/ssh-4.2/* \
-		${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/ssh-4.2.1
-	${RMDIR} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/ssh-4.2
-
 	${INSTALL_DATA} ${WRKSRC}/lib/dialyzer/doc/*.txt \
 		${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/dialyzer-*/doc/
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}

Modified: head/lang/erlang/distinfo
==============================================================================
--- head/lang/erlang/distinfo	Tue Mar 29 14:53:13 2016	(r412117)
+++ head/lang/erlang/distinfo	Tue Mar 29 15:05:54 2016	(r412118)
@@ -1,9 +1,9 @@
-SHA256 (erlang/otp_src_18.2.1.tar.gz) = 82d76ebfeeda5db64ea5b0f1a04aa0e9ac63380b278722e0e6052249bd3fe39a
-SIZE (erlang/otp_src_18.2.1.tar.gz) = 68110840
-SHA256 (erlang/otp_doc_man_18.2.1.tar.gz) = a58005ccd64853e8c79631a3c4c057dd6f92f581d97d00845a0aea817c33afa0
-SIZE (erlang/otp_doc_man_18.2.1.tar.gz) = 1390940
-SHA256 (erlang/otp_doc_html_18.2.1.tar.gz) = 3576c567b30400fec2b456897d54ba79933ee0f83f6ec57816417b5417ea9723
-SIZE (erlang/otp_doc_html_18.2.1.tar.gz) = 34204320
+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/armstrong_thesis_2003.pdf) = da585b914eb07350e2d6f727db5eb0fb1551f49fc1270f7d4dc079f2c8c1ab7a
 SIZE (erlang/armstrong_thesis_2003.pdf) = 859249
 SHA256 (erlang/bjarnelic.pdf) = 9544d4af5cea324e5c9cf77e670d9561ad61ddc240cdb5c2afecebc0a3d7429b
@@ -16,9 +16,3 @@ SHA256 (erlang/mnesia_overview.pdf) = f0
 SIZE (erlang/mnesia_overview.pdf) = 150266
 SHA256 (erlang/programming_rules.pdf) = b95f8851004832b044e064c12976a422613ece897e98308a27ee8b66738b4502
 SIZE (erlang/programming_rules.pdf) = 77025
-SHA256 (erlang/patch-otp-18.2.2) = 2a223e838a5b018535905f813eb95830dcced30b39dce3fdac02919c98823353
-SIZE (erlang/patch-otp-18.2.2) = 9587
-SHA256 (erlang/patch-otp-18.2.3) = 9294879b4b3f1fc9eb005003b1e930458b184e543a898f21d7cab921e36a0862
-SIZE (erlang/patch-otp-18.2.3) = 55919
-SHA256 (erlang/patch-otp-18.2.4) = ea07166fcfd6cab6fcf21945cf7b630473d3a5828a6e101b60e845f42dbbd002
-SIZE (erlang/patch-otp-18.2.4) = 17847



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603291505.u2TF5sgt048201>