Skip site navigation (1)Skip section navigation (2) 
Date:      Wed, 1 Feb 2017 21:47:48 +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: r433110 - in head/lang/erlang-runtime19: . files
Message-ID:  <201702012147.v11LlmZc005170@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: olgeni
Date: Wed Feb  1 21:47:47 2017
New Revision: 433110
URL: https://svnweb.freebsd.org/changeset/ports/433110

Log:
  Update lang/erlang-runtime19 to 19.2.2 and fix build with clang 4.0[1].
  
  PR:		216615 [1]
  Submitted by:	Jan Beich

Added:
  head/lang/erlang-runtime19/files/patch-lib_wx_c__src_wxe__impl.cpp   (contents, props changed)
Modified:
  head/lang/erlang-runtime19/Makefile
  head/lang/erlang-runtime19/distinfo

Modified: head/lang/erlang-runtime19/Makefile
==============================================================================
--- head/lang/erlang-runtime19/Makefile	Wed Feb  1 21:47:03 2017	(r433109)
+++ head/lang/erlang-runtime19/Makefile	Wed Feb  1 21:47:47 2017	(r433110)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	erlang
-PORTVERSION=	19.2.1
+PORTVERSION=	19.2.2
 CATEGORIES=	lang parallel java
 MASTER_SITES=	http://www.erlang.org/download/:erlangorg		\
 		http://erlang.stacken.kth.se/download/:erlangorg	\
@@ -16,7 +16,7 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 PATCH_SITES=	http://olgeni.olgeni.com/~olgeni/distfiles/ \
 		LOCAL/olgeni
-PATCHFILES=	patch-otp-19.2.1
+PATCHFILES=	patch-otp-19.2.1 patch-otp-19.2.2
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Functional programming language from Ericsson
@@ -217,6 +217,10 @@ post-install:
 		${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/erts-8.2.1
 	${RMDIR} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/erts-8.2
 
+	${MV} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/mnesia-4.14.2/* \
+		${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/mnesia-4.14.3
+	${RMDIR} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/mnesia-4.14.2
+
 	${INSTALL_DATA} ${WRKSRC}/lib/dialyzer/doc/*.txt \
 		${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/dialyzer-*/doc/
 .endif

Modified: head/lang/erlang-runtime19/distinfo
==============================================================================
--- head/lang/erlang-runtime19/distinfo	Wed Feb  1 21:47:03 2017	(r433109)
+++ head/lang/erlang-runtime19/distinfo	Wed Feb  1 21:47:47 2017	(r433110)
@@ -1,4 +1,4 @@
-TIMESTAMP = 1484642442
+TIMESTAMP = 1485948940
 SHA256 (erlang/otp_src_19.2.tar.gz) = a016b3ef5dac1e532972617b2715ef187ecb616f7cd7ddcfe0f1d502f5d24870
 SIZE (erlang/otp_src_19.2.tar.gz) = 68395949
 SHA256 (erlang/otp_doc_man_19.2.tar.gz) = 8a76ff3bb40a6d6a1552fa5a4204c8a3c7d99d2ea6f12684f02d038b23ad25cb
@@ -7,3 +7,5 @@ SHA256 (erlang/otp_doc_html_19.2.tar.gz)
 SIZE (erlang/otp_doc_html_19.2.tar.gz) = 34761971
 SHA256 (erlang/patch-otp-19.2.1) = 5fe07da09c914e1145c3e15e2f459fdb7cceedec0213a289ad238dada9645d2c
 SIZE (erlang/patch-otp-19.2.1) = 9287
+SHA256 (erlang/patch-otp-19.2.2) = a64cac32675fe57cb749461eba9458bbc4d7abddf58996c897e2528a41f2e33c
+SIZE (erlang/patch-otp-19.2.2) = 9412

Added: head/lang/erlang-runtime19/files/patch-lib_wx_c__src_wxe__impl.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lang/erlang-runtime19/files/patch-lib_wx_c__src_wxe__impl.cpp	Wed Feb  1 21:47:47 2017	(r433110)
@@ -0,0 +1,20 @@
+--- lib/wx/c_src/wxe_impl.cpp.orig	2017-01-30 23:13:25 UTC
++++ lib/wx/c_src/wxe_impl.cpp
+@@ -666,7 +666,7 @@ void * WxeApp::getPtr(char * bp, wxeMemE
+     throw wxe_badarg(index);
+   }
+   void * temp = memenv->ref2ptr[index];
+-  if((index < memenv->next) && ((index == 0) || (temp > NULL)))
++  if((index < memenv->next) && ((index == 0) || (temp != NULL)))
+     return temp;
+   else {
+     throw wxe_badarg(index);
+@@ -678,7 +678,7 @@ void WxeApp::registerPid(char * bp, ErlD
+   if(!memenv)
+     throw wxe_badarg(index);
+   void * temp = memenv->ref2ptr[index];
+-  if((index < memenv->next) && ((index == 0) || (temp > NULL))) {
++  if((index < memenv->next) && ((index == 0) || (temp != NULL))) {
+     ptrMap::iterator it;
+     it = ptr2ref.find(temp);
+     if(it != ptr2ref.end()) {

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