diff options
| author | fhajny <fhajny> | 2012-03-12 09:46:06 +0000 |
|---|---|---|
| committer | fhajny <fhajny> | 2012-03-12 09:46:06 +0000 |
| commit | 2c01f86f177b35ff5a772a966e40ada928972873 (patch) | |
| tree | 0a84ae3a11db6bd912d17d3b2004d49eed1343b8 /geography | |
| parent | 70fb66b6e901fe65a88552adbfd92e5b209bdb05 (diff) | |
| download | pkgsrc-2c01f86f177b35ff5a772a966e40ada928972873.tar.gz | |
Fix broken patch file.
Diffstat (limited to 'geography')
| -rw-r--r-- | geography/geos/distinfo | 4 | ||||
| -rw-r--r-- | geography/geos/patches/patch-include-geos-platform.h.in | 19 |
2 files changed, 12 insertions, 11 deletions
diff --git a/geography/geos/distinfo b/geography/geos/distinfo index 2e049955a1f..22cf1077de6 100644 --- a/geography/geos/distinfo +++ b/geography/geos/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.15 2012/03/09 14:46:12 fhajny Exp $ +$NetBSD: distinfo,v 1.16 2012/03/12 09:46:06 fhajny Exp $ SHA1 (geos-3.3.2.tar.bz2) = 942b0bbc61a059bd5269fddd4c0b44a508670cb3 RMD160 (geos-3.3.2.tar.bz2) = 168e12e29c3d7a9408753f19397440f20d321715 Size (geos-3.3.2.tar.bz2) = 1852080 bytes SHA1 (patch-ae) = d568c8950a24b516c6fd58e401bbf19405a2d150 -SHA1 (patch-include-geos-platform.h.in) = a63ca499e2a8b63c6286523798e5934209c373c8 +SHA1 (patch-include-geos-platform.h.in) = 92bd5fc2421650ce4853dce85d8d2e6509aa64e9 diff --git a/geography/geos/patches/patch-include-geos-platform.h.in b/geography/geos/patches/patch-include-geos-platform.h.in index 413dc2e9339..9fb85d66142 100644 --- a/geography/geos/patches/patch-include-geos-platform.h.in +++ b/geography/geos/patches/patch-include-geos-platform.h.in @@ -1,19 +1,20 @@ -$NetBSD: patch-include-geos-platform.h.in,v 1.3 2012/03/09 14:46:12 fhajny Exp $ +$NetBSD: patch-include-geos-platform.h.in,v 1.4 2012/03/12 09:46:06 fhajny Exp $ ---- include/geos/platform.h.in.orig 2011-05-18 19:59:50.000000000 +0000 +Fix isnan definition on NetBSD, DragonFly and SunOS platforms. +--- include/geos/platform.h.in.orig 2011-09-17 15:42:58.000000000 +0000 +++ include/geos/platform.h.in -@@ -91,10 +91,13 @@ extern "C" +@@ -91,11 +91,12 @@ extern "C" # elif defined(__MINGW32__) // sandro furieri: sanitizing MinGW32 # define ISNAN(x) (std::isnan(x)) -# elif defined(__OSX__) || defined(__APPLE__) -+# elif defined(__OSX__) || defined(__APPLE__) || defined(__NetBSD__) || defined(__DragonFly__) ++# elif defined(__OSX__) || defined(__APPLE__) || defined(__NetBSD__) || defined(__DragonFly__) || \ ++ (defined(__sun) && defined(__GNUC__)) // Hack for OS/X <cmath> incorrectly re-defining isnan() into oblivion. // It does leave a version in std. # define ISNAN(x) (std::isnan(x)) -+# elif defined(__sun) -+# include <cmath> -+# define ISNAN(x) (std::isnan(x)) +-# elif defined(__sun) || defined(__sun__) ++# elif (defined(__sun) || defined(__sun__)) && defined(__SUNPRO_CC) + # include <math.h> + # define ISNAN(x) (::isnan(x)) # endif - #endif - |