Minix/pkgsrc-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Import of pkgsrc-2015Q3

Browse Source
This commit is contained in:
Lionel Sambuc
2015-10-03 03:37:01 -07:00
committed by Lionel Sambuc
parent f641581404
commit 9d819b6d54
7578 changed files with 228314 additions and 80018 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
geography/osm2pgsql/Makefile
View File

@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.1 2015/06/10 01:48:49 wiedi Exp $
# $NetBSD: Makefile,v 1.2 2015/08/28 21:38:32 wiedi Exp $
DISTNAME= osm2pgsql-0.87.3
DISTNAME= osm2pgsql-0.88.1
CATEGORIES= geography
MASTER_SITES= ${MASTER_SITE_GITHUB:=openstreetmap/}
GITHUB_TAG= ${PKGVERSION_NOREV}

9
geography/osm2pgsql/distinfo
View File

@@ -1,7 +1,6 @@
$NetBSD: distinfo,v 1.1 2015/06/10 01:48:49 wiedi Exp $
$NetBSD: distinfo,v 1.2 2015/08/28 21:38:32 wiedi Exp $
SHA1 (osm2pgsql-0.87.3.tar.gz) = 977f1c6591a7603240dafd31ca67a18f01537ab8
RMD160 (osm2pgsql-0.87.3.tar.gz) = bacfb31b95611cd9c02e005bbc50749f1ac1905b
Size (osm2pgsql-0.87.3.tar.gz) = 2141464 bytes
SHA1 (osm2pgsql-0.88.1.tar.gz) = 8dcdb563de23a641c94855b50bf020c799b6a869
RMD160 (osm2pgsql-0.88.1.tar.gz) = 8d8ce268e00a015112ec3385dd93b7160032da83
Size (osm2pgsql-0.88.1.tar.gz) = 2140606 bytes
SHA1 (patch-middle-pgsql.cpp) = 71146a00bdfd486ae0b7ed74566270b4671175b7
SHA1 (patch-node-persistent-cache.cpp) = db641099525c275af06f86377d30b7f67d1e273a

35
geography/osm2pgsql/patches/patch-node-persistent-cache.cpp
View File

@@ -1,35 +0,0 @@
$NetBSD: patch-node-persistent-cache.cpp,v 1.1 2015/06/10 01:48:49 wiedi Exp $
Use std namespace to find isnan
--- node-persistent-cache.cpp.orig 2015-04-30 04:15:07.000000000 +0000
+++ node-persistent-cache.cpp
@@ -450,7 +450,7 @@ int node_persistent_cache::set_append(os
block_id = load_block(block_offset);
#ifdef FIXED_POINT
- if (isnan(lat) && isnan(lon))
+ if (std::isnan(lat) && std::isnan(lon))
{
readNodeBlockCache[block_id].nodes[id & READ_NODE_BLOCK_MASK].lat =
INT_MIN;
@@ -512,8 +512,8 @@ int node_persistent_cache::get(struct os
return 0;
}
#else
- if ((isnan(readNodeBlockCache[block_id].nodes[id & READ_NODE_BLOCK_MASK].lat)) &&
- (isnan(readNodeBlockCache[block_id].nodes[id & READ_NODE_BLOCK_MASK].lon)))
+ if ((std::isnan(readNodeBlockCache[block_id].nodes[id & READ_NODE_BLOCK_MASK].lat)) &&
+ (std::isnan(readNodeBlockCache[block_id].nodes[id & READ_NODE_BLOCK_MASK].lon)))
{
return 1;
}
@@ -547,7 +547,7 @@ int node_persistent_cache::get_list(node
size_t wrtidx = 0;
for (size_t i = 0; i < nds.size(); i++) {
- if (isnan(out[i].lat) && isnan(out[i].lon)) {
+ if (std::isnan(out[i].lat) && std::isnan(out[i].lon)) {
if (get(&(out[wrtidx]), nds[i]) == 0)
wrtidx++;
} else {