ok?

Index: 16/Makefile
===================================================================
RCS file: /cvs/ports/lang/erlang/16/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- 16/Makefile 10 Apr 2017 11:46:22 -0000      1.15
+++ 16/Makefile 19 Apr 2017 12:04:26 -0000
@@ -13,7 +13,7 @@ DISTNAME=     otp_src_${V}
 PKGNAME-main=  erlang-16b.03
 PKGNAME-wx=    erlang-wx-16b.03
 
-REVISION-main= 10
+REVISION-main= 11
 REVISION-wx=   1
 
 VERSION_SPEC=  >=16v0,<17v0
Index: 16/patches/patch-lib_wx_c_src_wxe_impl_cpp
===================================================================
RCS file: 16/patches/patch-lib_wx_c_src_wxe_impl_cpp
diff -N 16/patches/patch-lib_wx_c_src_wxe_impl_cpp
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ 16/patches/patch-lib_wx_c_src_wxe_impl_cpp  19 Apr 2017 12:04:26 -0000
@@ -0,0 +1,24 @@
+$OpenBSD$
+
+clang: ordered comparison between pointer and zero ('void *' and 'long')
+
+--- lib/wx/c_src/wxe_impl.cpp.orig     Wed Apr 19 11:19:11 2017
++++ lib/wx/c_src/wxe_impl.cpp  Wed Apr 19 11:19:16 2017
+@@ -757,7 +757,7 @@ void * WxeApp::getPtr(char * bp, wxeMemEnv *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)))
+     return temp;
+   else {
+     throw wxe_badarg(index);
+@@ -769,7 +769,7 @@ void WxeApp::registerPid(char * bp, ErlDrvTermData pid
+   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()) {
Index: 17/Makefile
===================================================================
RCS file: /cvs/ports/lang/erlang/17/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- 17/Makefile 10 Apr 2017 11:46:22 -0000      1.15
+++ 17/Makefile 19 Apr 2017 12:04:26 -0000
@@ -13,7 +13,7 @@ DISTNAME=     otp_src_$V
 PKGNAME-main=  erlang-$V
 PKGNAME-wx=    erlang-wx-$V
 
-REVISION-main= 6
+REVISION-main= 7
 REVISION-wx=   1
 
 VERSION_SPEC=  >=17v0,<18v0
Index: 17/patches/patch-lib_wx_c_src_wxe_impl_cpp
===================================================================
RCS file: 17/patches/patch-lib_wx_c_src_wxe_impl_cpp
diff -N 17/patches/patch-lib_wx_c_src_wxe_impl_cpp
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ 17/patches/patch-lib_wx_c_src_wxe_impl_cpp  19 Apr 2017 12:04:26 -0000
@@ -0,0 +1,24 @@
+$OpenBSD$
+
+clang: ordered comparison between pointer and zero ('void *' and 'long')
+
+--- lib/wx/c_src/wxe_impl.cpp.orig     Wed Apr 19 11:19:23 2017
++++ lib/wx/c_src/wxe_impl.cpp  Wed Apr 19 11:19:30 2017
+@@ -677,7 +677,7 @@ void * WxeApp::getPtr(char * bp, wxeMemEnv *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)))
+     return temp;
+   else {
+     throw wxe_badarg(index);
+@@ -689,7 +689,7 @@ void WxeApp::registerPid(char * bp, ErlDrvTermData pid
+   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()) {
Index: 18/Makefile
===================================================================
RCS file: /cvs/ports/lang/erlang/18/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- 18/Makefile 10 Apr 2017 11:46:22 -0000      1.11
+++ 18/Makefile 19 Apr 2017 12:04:26 -0000
@@ -13,7 +13,7 @@ DISTNAME=     otp_src_$V
 PKGNAME-main=  erlang-$V
 PKGNAME-wx=    erlang-wx-$V
 
-REVISION-main= 1
+REVISION-main= 2
 REVISION-wx=   1
 
 VERSION_SPEC=  >=18v0,<19v0
Index: 18/patches/patch-lib_wx_c_src_wxe_impl_cpp
===================================================================
RCS file: 18/patches/patch-lib_wx_c_src_wxe_impl_cpp
diff -N 18/patches/patch-lib_wx_c_src_wxe_impl_cpp
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ 18/patches/patch-lib_wx_c_src_wxe_impl_cpp  19 Apr 2017 12:04:26 -0000
@@ -0,0 +1,24 @@
+$OpenBSD$
+
+clang: ordered comparison between pointer and zero ('void *' and 'long')
+
+--- lib/wx/c_src/wxe_impl.cpp.orig     Wed Apr 19 11:19:36 2017
++++ lib/wx/c_src/wxe_impl.cpp  Wed Apr 19 11:19:40 2017
+@@ -703,7 +703,7 @@ void * WxeApp::getPtr(char * bp, wxeMemEnv *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)))
+     return temp;
+   else {
+     throw wxe_badarg(index);
+@@ -715,7 +715,7 @@ void WxeApp::registerPid(char * bp, ErlDrvTermData pid
+   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()) {
Index: 19/Makefile
===================================================================
RCS file: /cvs/ports/lang/erlang/19/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- 19/Makefile 10 Apr 2017 11:46:22 -0000      1.5
+++ 19/Makefile 19 Apr 2017 12:04:26 -0000
@@ -13,6 +13,8 @@ DISTNAME=     otp_src_$V
 PKGNAME-main=  erlang-$V
 PKGNAME-wx=    erlang-wx-$V
 
+REVISION-main= 0
+
 VERSION_SPEC=  >=19v0,<20v0
 PKGSPEC-main=  erlang-${VERSION_SPEC}
 PKGSPEC-wx=    erlang-wx-${VERSION_SPEC}
Index: 19/patches/patch-lib_wx_c_src_wxe_impl_cpp
===================================================================
RCS file: 19/patches/patch-lib_wx_c_src_wxe_impl_cpp
diff -N 19/patches/patch-lib_wx_c_src_wxe_impl_cpp
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ 19/patches/patch-lib_wx_c_src_wxe_impl_cpp  19 Apr 2017 12:04:26 -0000
@@ -0,0 +1,24 @@
+$OpenBSD$
+
+clang: ordered comparison between pointer and zero ('void *' and 'long')
+
+--- lib/wx/c_src/wxe_impl.cpp.orig     Wed Apr 19 12:01:40 2017
++++ lib/wx/c_src/wxe_impl.cpp  Wed Apr 19 12:01:45 2017
+@@ -666,7 +666,7 @@ void * WxeApp::getPtr(char * bp, wxeMemEnv *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)))
+     return temp;
+   else {
+     throw wxe_badarg(index);
+@@ -678,7 +678,7 @@ void WxeApp::registerPid(char * bp, ErlDrvTermData pid
+   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()) {

Reply via email to