cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to geos 3.7.0.

Browse Source 
Now requires c++11 per https://trac.osgeo.org/geos/wiki/RFC5 so set
COMPILER accordingly.

Built the following consumers on amd64: mapserver, mapcache, qgis, gdal,
libosmium, postgis, and gdal on i386. No fallout.
This commit is contained in:
landry 2018-09-16 16:46:28 +00:00
parent b649d81240
commit 27c61e21a3
4 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
geo/geos/Makefile
View File

@ -1,12 +1,12 @@
# $OpenBSD: Makefile,v 1.25 2017/12/14 05:57:44 jca Exp $
# $OpenBSD: Makefile,v 1.26 2018/09/16 16:46:28 landry Exp $
BROKEN-hppa = undefined reference to 'std::auto_ptr<geos::geom::Envelope>::~auto_ptr()'
COMMENT= 2d geometry and topology engine
DISTNAME= geos-3.6.2
DISTNAME= geos-3.7.0
CATEGORIES= geo
SHARED_LIBS= geos 11.0 \
geos_c 4.2
SHARED_LIBS= geos 12.0 \
geos_c 4.3
# LGPLv2.1
PERMIT_PACKAGE_CDROM= Yes
@ -20,13 +20,15 @@ WANTLIB= m ${COMPILER_LIBCXX}
USE_GMAKE= Yes
# uses C++11, cf https://trac.osgeo.org/geos/wiki/RFC5
COMPILER = base-clang ports-gcc
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= --with-pic
# Strip UTF-8 BOM, base gcc fails with:
# CGAlgorithms.cpp:1: error: stray '\357' in program
post-extract:
find ${WRKSRC} -type f '(' -name '*.c*' -o -name '*.h' ')' \
-exec perl -pi -e 's/^\xef\xbb\xbf//;' {} +
#post-extract:
# find ${WRKSRC} -type f '(' -name '*.c*' -o -name '*.h' ')' \
# -exec perl -pi -e 's/^\xef\xbb\xbf//;' {} +
.include <bsd.port.mk>

4
geo/geos/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (geos-3.6.2.tar.bz2) = BFoT34TWBahmYC9gIPxsv4v0xC+1DeI3oIkm4dfXZSo=
SIZE (geos-3.6.2.tar.bz2) = 2030705
SHA256 (geos-3.7.0.tar.bz2) = T79Bp5L9dCk6tZ4KmA6GVM1BGp1FQW1m6qEtU9E5P9c=
SIZE (geos-3.7.0.tar.bz2) = 2028814

15
geo/geos/patches/patch-src_Makefile_in
View File

@ -1,11 +1,12 @@
$OpenBSD: patch-src_Makefile_in,v 1.4 2017/02/06 09:56:49 landry Exp $
--- src/Makefile.in.orig Sat Dec 24 16:54:05 2016
+++ src/Makefile.in Tue Jan 24 21:47:47 2017
@@ -455,8 +455,7 @@ lib_LTLIBRARIES = libgeos.la
# effort to determine this because depending programs should not be
# using the C++ library.
$OpenBSD: patch-src_Makefile_in,v 1.5 2018/09/16 16:46:28 landry Exp $
Index: src/Makefile.in
--- src/Makefile.in.orig
+++ src/Makefile.in
@@ -462,8 +462,7 @@ lib_LTLIBRARIES = libgeos.la
# has changed between releases; the project chooses not to expend the
# effort to determine this because GEOS does not promise ABI stability.
libgeos_la_LDFLAGS = \
- -release @VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@ \
- -release @VERSION_RELEASE@ \
- -no-undefined
+ -no-undefined -lstdc++ -lm

5
geo/geos/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.14 2017/02/06 09:56:49 landry Exp $
@comment $OpenBSD: PLIST,v 1.15 2018/09/16 16:46:28 landry Exp $
bin/geos-config
include/geos/
include/geos.h
@ -28,6 +28,7 @@ include/geos/algorithm/RobustDeterminant.h
include/geos/algorithm/SIRtreePointInRing.h
include/geos/algorithm/SimplePointInRing.h
include/geos/algorithm/distance/
include/geos/algorithm/distance/DiscreteFrechetDistance.h
include/geos/algorithm/distance/DiscreteHausdorffDistance.h
include/geos/algorithm/distance/DistanceToPoint.h
include/geos/algorithm/distance/PointPairDistance.h
@ -59,7 +60,6 @@ include/geos/geom/GeometryComponentFilter.h
include/geos/geom/GeometryFactory.h
include/geos/geom/GeometryFactory.inl
include/geos/geom/GeometryFilter.h
include/geos/geom/GeometryList.h
include/geos/geom/IntersectionMatrix.h
include/geos/geom/LineSegment.h
include/geos/geom/LineSegment.inl
@ -290,6 +290,7 @@ include/geos/operation/distance/DistanceOp.h
include/geos/operation/distance/FacetSequence.h
include/geos/operation/distance/FacetSequenceTreeBuilder.h
include/geos/operation/distance/GeometryLocation.h
include/geos/operation/distance/IndexedFacetDistance.h
include/geos/operation/intersection/
include/geos/operation/intersection/Rectangle.h
include/geos/operation/intersection/RectangleIntersection.h