summaryrefslogtreecommitdiff
path: root/databases
diff options
context:
space:
mode:
authorDmitry Marakasov <amdmi3@FreeBSD.org>2015-08-27 09:01:50 +0000
committerDmitry Marakasov <amdmi3@FreeBSD.org>2015-08-27 09:01:50 +0000
commit69b49c55cfc4bfba7512a88eca081fedd858a95c (patch)
tree979a5342d2273063c20ae6ca669e344039e3ee58 /databases
parent- Update to 6.02 (diff)
- Update to 1.1.0
PR: 202597 Submitted by: coder@tuxfamily.org (maintainer)
Notes
Notes: svn path=/head/; revision=395405
Diffstat (limited to 'databases')
-rw-r--r--databases/sfcgal/Makefile4
-rw-r--r--databases/sfcgal/distinfo4
-rw-r--r--databases/sfcgal/files/patch-src-detail-GeometrySet.cpp15
-rw-r--r--databases/sfcgal/pkg-plist6
4 files changed, 22 insertions, 7 deletions
diff --git a/databases/sfcgal/Makefile b/databases/sfcgal/Makefile
index c3d275c6c1d1..0cfe58f94972 100644
--- a/databases/sfcgal/Makefile
+++ b/databases/sfcgal/Makefile
@@ -2,15 +2,15 @@
# $FreeBSD$
PORTNAME= sfcgal
-PORTVERSION= 1.0.5
+PORTVERSION= 1.1.0
DISTVERSIONPREFIX= v
-PORTREVISION= 1
CATEGORIES= databases math graphics
MAINTAINER= coder@tuxfamily.org
COMMENT= Wrapper library around CGAL for PostGIS
LICENSE= GPLv2
+LICENSE_FILE= ${WRKSRC}/LICENSE
LIB_DEPENDS= libCGAL.so:${PORTSDIR}/math/cgal \
libboost_system.so:${PORTSDIR}/devel/boost-libs \
diff --git a/databases/sfcgal/distinfo b/databases/sfcgal/distinfo
index 7d3df55d4f63..86d970a2b959 100644
--- a/databases/sfcgal/distinfo
+++ b/databases/sfcgal/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Oslandia-SFCGAL-v1.0.5_GH0.tar.gz) = a9cdaf7334bf28dc71c6338d090c1d1402041c5e320b6c2e3669f7758946a01c
-SIZE (Oslandia-SFCGAL-v1.0.5_GH0.tar.gz) = 2376514
+SHA256 (Oslandia-SFCGAL-v1.1.0_GH0.tar.gz) = 00e1bde3e1353592700bcc36d62cb31fec3b61c31c0fb93a0c74873bccf7b102
+SIZE (Oslandia-SFCGAL-v1.1.0_GH0.tar.gz) = 2393394
diff --git a/databases/sfcgal/files/patch-src-detail-GeometrySet.cpp b/databases/sfcgal/files/patch-src-detail-GeometrySet.cpp
new file mode 100644
index 000000000000..a9343b34c7ea
--- /dev/null
+++ b/databases/sfcgal/files/patch-src-detail-GeometrySet.cpp
@@ -0,0 +1,15 @@
+--- src/detail/GeometrySet.cpp.orig 2015-01-14 13:59:05 UTC
++++ src/detail/GeometrySet.cpp
+@@ -557,10 +557,10 @@ void recompose_points( const typename Ge
+
+ // compare less than
+ struct ComparePoints {
+- bool operator()( const CGAL::Point_2<Kernel>& lhs, const CGAL::Point_2<Kernel>& rhs ) {
++ bool operator()( const CGAL::Point_2<Kernel>& lhs, const CGAL::Point_2<Kernel>& rhs ) const {
+ return lhs.x() < rhs.x() || lhs.y() < rhs.y();
+ }
+- bool operator()( const CGAL::Point_3<Kernel>& lhs, const CGAL::Point_3<Kernel>& rhs ) {
++ bool operator()( const CGAL::Point_3<Kernel>& lhs, const CGAL::Point_3<Kernel>& rhs ) const {
+ return lhs.x() < rhs.x() || lhs.y() < rhs.y() || lhs.z() < rhs.z();
+ }
+ };
diff --git a/databases/sfcgal/pkg-plist b/databases/sfcgal/pkg-plist
index 77f3e1c94de8..a2170e560da3 100644
--- a/databases/sfcgal/pkg-plist
+++ b/databases/sfcgal/pkg-plist
@@ -33,6 +33,7 @@ include/SFCGAL/algorithm/connection.h
include/SFCGAL/algorithm/convexHull.h
include/SFCGAL/algorithm/covers.h
include/SFCGAL/algorithm/difference.h
+include/SFCGAL/algorithm/differencePrimitives.h
include/SFCGAL/algorithm/distance.h
include/SFCGAL/algorithm/distance3d.h
include/SFCGAL/algorithm/extrude.h
@@ -50,10 +51,10 @@ include/SFCGAL/algorithm/plane.h
include/SFCGAL/algorithm/straightSkeleton.h
include/SFCGAL/algorithm/tesselate.h
include/SFCGAL/algorithm/translate.h
+include/SFCGAL/algorithm/union.h
include/SFCGAL/algorithm/volume.h
include/SFCGAL/capi/sfcgal_c.h
include/SFCGAL/config.h
-include/SFCGAL/config.h.cmake
include/SFCGAL/detail/ComplexComparator.h
include/SFCGAL/detail/EnvelopeVisitor.h
include/SFCGAL/detail/GeometrySet.h
@@ -103,7 +104,6 @@ include/SFCGAL/numeric.h
include/SFCGAL/triangulate/triangulate2DZ.h
include/SFCGAL/triangulate/triangulatePolygon.h
include/SFCGAL/version.h
-include/SFCGAL/version.h.cmake
lib/libSFCGAL.so
lib/libSFCGAL.so.1
-lib/libSFCGAL.so.1.0.5
+lib/libSFCGAL.so.1.1.0