diff options
| author | vsevolod <vsevolod@FreeBSD.org> | 2015-08-17 12:43:35 +0000 |
|---|---|---|
| committer | vsevolod <vsevolod@FreeBSD.org> | 2015-08-17 12:43:35 +0000 |
| commit | 33dc9f9eb6d910ebf767ea9ddf31fa42dc119efe (patch) | |
| tree | 511bf2463d4a705ffda9390c778c8d44e81cc27b | |
| parent | 31f93a8cd3c1f142c3ce9964bc8c36f94820b33f (diff) | |
| download | FreeBSD-ports-33dc9f9eb6d910ebf767ea9ddf31fa42dc119efe.zip FreeBSD-ports-33dc9f9eb6d910ebf767ea9ddf31fa42dc119efe.tar.gz | |
- Update to 4.5.2
| -rw-r--r-- | math/gringo/Makefile | 9 | ||||
| -rw-r--r-- | math/gringo/distinfo | 4 | ||||
| -rw-r--r-- | math/gringo/files/patch-SConscript | 11 | ||||
| -rw-r--r-- | math/gringo/files/patch-libprogram_opts__src__string_convert.cpp | 20 |
4 files changed, 18 insertions, 26 deletions
diff --git a/math/gringo/Makefile b/math/gringo/Makefile index 5395da7..f6d8fa3 100644 --- a/math/gringo/Makefile +++ b/math/gringo/Makefile @@ -2,9 +2,8 @@ # $FreeBSD$ PORTNAME= gringo -PORTVERSION= 4.4.0 +PORTVERSION= 4.5.2 DISTVERSIONSUFFIX= -source -PORTREVISION= 1 CATEGORIES= math devel MASTER_SITES= SOURCEFORGE/potassco/${PORTNAME}/${PORTVERSION} @@ -19,8 +18,9 @@ USES= scons bison compiler:c++11-lang MAKE_ARGS+= ${MAKE_ENV} CXXFLAGS+= -std=c++11 +MAKE_ENV+= WITH_LUA=no -PLIST_FILES= bin/${PORTNAME} +PLIST_FILES= bin/${PORTNAME} bin/clingo .include <bsd.port.pre.mk> @@ -29,6 +29,7 @@ USE_GCC= yes .endif do-install: - ${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/build/release/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} + ${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/build/debug/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} + ${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/build/debug/clingo ${STAGEDIR}${PREFIX}/bin/clingo .include <bsd.port.post.mk> diff --git a/math/gringo/distinfo b/math/gringo/distinfo index 75d4abb..ea91f34 100644 --- a/math/gringo/distinfo +++ b/math/gringo/distinfo @@ -1,2 +1,2 @@ -SHA256 (gringo-4.4.0-source.tar.gz) = 49b2ddc78f568a12530c780a29bb7f57b656556f0840c5e9ada4f207913dde5e -SIZE (gringo-4.4.0-source.tar.gz) = 1482711 +SHA256 (gringo-4.5.2-source.tar.gz) = 36d86321c54499cabf498dac0923b39e43c7a248919224a11c2d15e4ecec9d65 +SIZE (gringo-4.5.2-source.tar.gz) = 1674048 diff --git a/math/gringo/files/patch-SConscript b/math/gringo/files/patch-SConscript new file mode 100644 index 0000000..ca548bd --- /dev/null +++ b/math/gringo/files/patch-SConscript @@ -0,0 +1,11 @@ +--- SConscript.orig 2015-08-17 12:39:49 UTC ++++ SConscript +@@ -202,7 +202,7 @@ if env['WITH_LUA'] == "auto": + if conf.CheckWithPkgConfig("lua", ["lua", "lua5.1", "lua-5.1", "lua5.2", "lua-5.2", "lua5.3", "lua-5.3"]): + with_lua = True + DEFS["WITH_LUA"] = 1 +-elif env['WITH_LUA']: ++elif env['WITH_LUA'] != "no": + if not conf.CheckLibs("lua", env['WITH_LUA'], "lua.hpp"): + failure = True + else: diff --git a/math/gringo/files/patch-libprogram_opts__src__string_convert.cpp b/math/gringo/files/patch-libprogram_opts__src__string_convert.cpp deleted file mode 100644 index d2a7830..0000000 --- a/math/gringo/files/patch-libprogram_opts__src__string_convert.cpp +++ /dev/null @@ -1,20 +0,0 @@ ---- ./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) { |
