From owner-svn-ports-all@FreeBSD.ORG Wed Aug 27 12:09:50 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 618EFE74; Wed, 27 Aug 2014 12:09:50 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 41CBE3866; Wed, 27 Aug 2014 12:09:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7RC9oEY032297; Wed, 27 Aug 2014 12:09:50 GMT (envelope-from vsevolod@FreeBSD.org) Received: (from vsevolod@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7RC9n0a032295; Wed, 27 Aug 2014 12:09:49 GMT (envelope-from vsevolod@FreeBSD.org) Message-Id: <201408271209.s7RC9n0a032295@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: vsevolod set sender to vsevolod@FreeBSD.org using -f From: Vsevolod Stakhov Date: Wed, 27 Aug 2014 12:09:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r366312 - in head/math: clasp/files gringo/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Aug 2014 12:09:50 -0000 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) {