svn commit: r366312 - in head/math: clasp/files gringo/files

[Vsevolod Stakhov]

Author: vsevolod
Date: Wed Aug 27 12:09:49 2014
New Revision: 366312
URL: http://svnweb.freebsd.org/changeset/ports/366312
QAT: https://qat.redports.org/buildarchive/r366312/

Log:
  Fix build on 8 and 9 where there is no std::strtoull.
  
  Do not bump revision since package content is unchanged.

Added:
  head/math/clasp/files/
  head/math/clasp/files/patch-libprogram_opts__src__string_convert.cpp   (contents, props changed)
Modified:
  head/math/gringo/files/patch-libprogram_opts__src__string_convert.cpp

Added: head/math/clasp/files/patch-libprogram_opts__src__string_convert.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/math/clasp/files/patch-libprogram_opts__src__string_convert.cpp	Wed Aug 27 12:09:49 2014	(r366312)
@@ -0,0 +1,20 @@
+--- ./libprogram_opts/src/string_convert.cpp.orig	2014-08-12 18:47:21.000000000 +0300
++++ ./libprogram_opts/src/string_convert.cpp	2014-08-27 14:59:59.000000000 +0300
+@@ -94,7 +94,7 @@
+ 		err = (char*)x+2;
+ 	}
+ 	else if (*x != '-') {
+-		out = std::strtoul(x, &err, detectBase(x));
++		out = strtoul(x, &err, detectBase(x));
+ 		if (out == ULONG_MAX && errno == ERANGE) { err = (char*)x; }
+ 	}
+ 	else { err = (char*)x; }
+@@ -191,7 +191,7 @@
+ 	if (t) { out = temp; return t; }
+ 	if (empty(x, errPos) || *x == '-') { return 0; }
+ 	char* err;
+-	out = std::strtoull(x, &err, detectBase(x));
++	out = strtoull(x, &err, detectBase(x));
+ 	return parsed(err != x, err, errPos);
+ }
+ std::string& xconvert(std::string& out, long long x) {

Modified: head/math/gringo/files/patch-libprogram_opts__src__string_convert.cpp
==============================================================================
--- head/math/gringo/files/patch-libprogram_opts__src__string_convert.cpp	Wed Aug 27 11:52:06 2014	(r366311)
+++ head/math/gringo/files/patch-libprogram_opts__src__string_convert.cpp	Wed Aug 27 12:09:49 2014	(r366312)
@@ -1,12 +1,20 @@
---- ./libprogram_opts/src/string_convert.cpp.orig	2014-08-12 17:47:21.000000000 +0200
-+++ ./libprogram_opts/src/string_convert.cpp	2014-08-21 22:39:08.000000000 +0200
-@@ -28,6 +28,9 @@
+--- ./libprogram_opts/src/string_convert.cpp.orig	2014-08-12 18:47:21.000000000 +0300
++++ ./libprogram_opts/src/string_convert.cpp	2014-08-27 14:59:59.000000000 +0300
+@@ -94,7 +94,7 @@
+ 		err = (char*)x+2;
+ 	}
+ 	else if (*x != '-') {
+-		out = std::strtoul(x, &err, detectBase(x));
++		out = strtoul(x, &err, detectBase(x));
+ 		if (out == ULONG_MAX && errno == ERANGE) { err = (char*)x; }
+ 	}
+ 	else { err = (char*)x; }
+@@ -191,7 +191,7 @@
+ 	if (t) { out = temp; return t; }
+ 	if (empty(x, errPos) || *x == '-') { return 0; }
+ 	char* err;
+-	out = std::strtoull(x, &err, detectBase(x));
++	out = strtoull(x, &err, detectBase(x));
+ 	return parsed(err != x, err, errPos);
  }
- #endif
- #endif
-+namespace std {
-+	using ::strtoull;
-+}
- namespace bk_lib { 
- 
- static int detectBase(const char* x) {
+ std::string& xconvert(std::string& out, long long x) {