summaryrefslogtreecommitdiff
path: root/geography
diff options
context:
space:
mode:
authorgdt <gdt@pkgsrc.org>2012-01-08 18:37:33 +0000
committergdt <gdt@pkgsrc.org>2012-01-08 18:37:33 +0000
commit98db179385725b1c205b49de71361201c5bb229d (patch)
tree49375a84306835f8e2b42cfa7fba876478dc50f0 /geography
parent88da9d5d5f74fb7ffd1bcf5f4180b7ba42ec7272 (diff)
downloadpkgsrc-98db179385725b1c205b49de71361201c5bb229d.tar.gz
Update to 3.3.2 (bugfixes from 3.3.0, basically).
Changes in 3.3.2 2012-01-05 - Bug fixes / improvements - Fix CMAKE_CXX_FLAGS overriding -std=gnu++0x (#489) - Missing versions update in CMake configuration (#490) - Fix noding of self-intersecting lines through UnaryUnion (#482) - Fix handling of collapsed edges skipping in BufferOp (#494) - Print up to 18 digits of precision for TopologyException points - Fix noding with reduced precision in Buffer operation (#473) - Fix HotPixel original point invalidation (#498) - Fix CascadedPolygonUnion to discard non-polygonal components (#499) - Improve buffer robustness by reverting to non-snaprounding noder (#495) - Fix C++11 build by avoiding std::pair<auto_ptr> (#491) - Add --clibs to geos-config and GEOS_C_LIBS to geos.m4 (#497) - Apply shoelace formula for area calculation (#485) - Fix default initialization issue for clang (#500) - Improve overlay robustness by fixing areal validity on snapping (#488) Changes in 3.3.1 2011-09-27 - Bug fixes / improvements - Fix memory leak on invalid geometry in InteriorPointArea (#475) - ValidOp abort in presence of 2 touching holes forming an island (#449) - Enable prepared intersects operation for points - Fortify suspicious code found by static analisys tools - Fix for SOLARIS build (#461) - Fix EMPTY result from GEOSOffsetCurve with distance 0 (#454) - Fix Geometry::clone to copy SRID (#464) - Fix for clang builds (#463) - Fix out-of-place builds for python binding (#332) and regress testing - Fix OS X framework cmake build (#385)
Diffstat (limited to 'geography')
-rw-r--r--geography/geos/Makefile4
-rw-r--r--geography/geos/distinfo10
-rw-r--r--geography/geos/patches/patch-ae14
3 files changed, 18 insertions, 10 deletions
diff --git a/geography/geos/Makefile b/geography/geos/Makefile
index e9efe680445..af786c4b66a 100644
--- a/geography/geos/Makefile
+++ b/geography/geos/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.14 2011/06/16 09:24:05 adam Exp $
+# $NetBSD: Makefile,v 1.15 2012/01/08 18:37:33 gdt Exp $
-DISTNAME= geos-3.3.0
+DISTNAME= geos-3.3.2
CATEGORIES= geography
MASTER_SITES= http://download.osgeo.org/geos/
EXTRACT_SUFX= .tar.bz2
diff --git a/geography/geos/distinfo b/geography/geos/distinfo
index 3b05a5daab6..051b0901deb 100644
--- a/geography/geos/distinfo
+++ b/geography/geos/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.13 2011/12/01 19:13:05 marino Exp $
+$NetBSD: distinfo,v 1.14 2012/01/08 18:37:33 gdt Exp $
-SHA1 (geos-3.3.0.tar.bz2) = f6c6e3398d5c7bf389a0610a0d06896d76ad4480
-RMD160 (geos-3.3.0.tar.bz2) = 724f535739ec88607083b72452481b155297fd2b
-Size (geos-3.3.0.tar.bz2) = 1765056 bytes
-SHA1 (patch-ae) = b687857a95931a7f9a0dc5e1c2290db0e76f603e
+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) = 9a21765e0b2c40abda49d4316179d5e126169765
diff --git a/geography/geos/patches/patch-ae b/geography/geos/patches/patch-ae
index e9efbec5937..ad1172a782f 100644
--- a/geography/geos/patches/patch-ae
+++ b/geography/geos/patches/patch-ae
@@ -1,14 +1,22 @@
-$NetBSD: patch-ae,v 1.2 2006/11/10 21:00:23 gdt Exp $
+$NetBSD: patch-ae,v 1.3 2012/01/08 18:37:33 gdt Exp $
---- tools/geos-config.in.orig 2006-04-26 07:54:56.000000000 -0400
+TODO: explain what's in LDFLAGS.
+TODO: explain why --libs has -L in the first place (vs --ldflags).
+TODO: report upstream.
+
+--- tools/geos-config.in.orig 2011-12-12 09:57:21.000000000 +0000
+++ tools/geos-config.in
-@@ -37,10 +37,10 @@ case $1 in
+@@ -38,13 +38,13 @@ case $1 in
echo -I${prefix}/include
;;
--libs)
- echo -L${libdir} -lgeos
+ echo -L${libdir} @LDFLAGS@ -lgeos
;;
+ --clibs)
+- echo -L${libdir} -lgeos_c
++ echo -L${libdir} @LDFLAGS@ -lgeos_c
+ ;;
--ldflags)
- echo -L${libdir}
+ echo -L${libdir} @LDFLAGS@