Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 10 Oct 2024 16:23:51 GMT
From:      =?utf-8?Q?Lo=C3=AFc?= Bartoletti <lbartoletti@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: a9ac7292019b - main - databases/sfcgal: Update to 2.0.0
Message-ID:  <202410101623.49AGNpQQ097046@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by lbartoletti:

URL: https://cgit.FreeBSD.org/ports/commit/?id=a9ac7292019bbef057875c0548f5acd872450729

commit a9ac7292019bbef057875c0548f5acd872450729
Author:     Loïc Bartoletti <lbartoletti@FreeBSD.org>
AuthorDate: 2024-10-10 10:12:50 +0000
Commit:     Loïc Bartoletti <lbartoletti@FreeBSD.org>
CommitDate: 2024-10-10 16:23:40 +0000

    databases/sfcgal: Update to 2.0.0
---
 databases/postgis31/Makefile                       |  2 +-
 databases/postgis32/Makefile                       |  2 +-
 databases/postgis33/Makefile                       |  2 +-
 databases/postgis34/Makefile                       |  2 +-
 databases/postgis35/Makefile                       |  1 +
 databases/sfcgal/Makefile                          | 10 +++---
 databases/sfcgal/distinfo                          | 10 +++---
 .../patch-include_CGAL_boost_graph_iterator.h      | 38 ----------------------
 databases/sfcgal/pkg-plist                         |  7 ++++
 graphics/gdal/Makefile                             |  2 +-
 10 files changed, 23 insertions(+), 53 deletions(-)

diff --git a/databases/postgis31/Makefile b/databases/postgis31/Makefile
index bcb30f8a2d20..7f2b24a78e6a 100644
--- a/databases/postgis31/Makefile
+++ b/databases/postgis31/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	postgis
 PORTVERSION=	3.1.11
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	databases geography
 MASTER_SITES=	https://download.osgeo.org/postgis/source/
 PKGNAMESUFFIX=	31
diff --git a/databases/postgis32/Makefile b/databases/postgis32/Makefile
index f4397e338029..8be0c67de2df 100644
--- a/databases/postgis32/Makefile
+++ b/databases/postgis32/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	postgis
 DISTVERSION=	3.2.7
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	databases geography
 MASTER_SITES=	https://download.osgeo.org/postgis/source/
 PKGNAMESUFFIX=	32
diff --git a/databases/postgis33/Makefile b/databases/postgis33/Makefile
index 4629047402f7..d9f930b91385 100644
--- a/databases/postgis33/Makefile
+++ b/databases/postgis33/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	postgis
 DISTVERSION=	3.3.6
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	databases geography
 MASTER_SITES=	https://download.osgeo.org/postgis/source/
 PKGNAMESUFFIX=	33
diff --git a/databases/postgis34/Makefile b/databases/postgis34/Makefile
index 67fd269571a7..7735fc1cff73 100644
--- a/databases/postgis34/Makefile
+++ b/databases/postgis34/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	postgis
 DISTVERSION=	3.4.2
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	databases geography
 MASTER_SITES=	https://download.osgeo.org/postgis/source/
 PKGNAMESUFFIX=	34
diff --git a/databases/postgis35/Makefile b/databases/postgis35/Makefile
index 315054960b4a..22a629de717c 100644
--- a/databases/postgis35/Makefile
+++ b/databases/postgis35/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	postgis
 DISTVERSION=	3.5.0
+PORTREVISION=	1
 CATEGORIES=	databases geography
 MASTER_SITES=	https://download.osgeo.org/postgis/source/
 PKGNAMESUFFIX=	35
diff --git a/databases/sfcgal/Makefile b/databases/sfcgal/Makefile
index 8d3a95b507ca..a1ca6ea2efd4 100644
--- a/databases/sfcgal/Makefile
+++ b/databases/sfcgal/Makefile
@@ -1,11 +1,10 @@
 PORTNAME=	sfcgal
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.5.2
-PORTREVISION=	1
+DISTVERSION=	2.0.0
 CATEGORIES=	databases math graphics
 
-MASTER_SITES=	https://github.com/CGAL/cgal/releases/download/v5.6.1/:source1
-DISTFILES=	CGAL-5.6.1.tar.xz:source1
+MASTER_SITES=	https://github.com/CGAL/cgal/releases/download/v${CGAL_VERSION}/:source1
+DISTFILES=	CGAL-${CGAL_VERSION}.tar.xz:source1
 
 MAINTAINER=	lbartoletti@FreeBSD.org
 COMMENT=	Wrapper library around CGAL for PostGIS
@@ -25,7 +24,8 @@ GL_PROJECT=	SFCGAL
 USE_LDCONFIG=	yes
 
 PLIST_SUB=	SHL3=${PORTVERSION} SHL1=${PORTVERSION:R:R} DEBUG_SUFFIX=${WITH_DEBUG:Dd}
+CGAL_VERSION=	6.0
 
-CMAKE_ARGS+=	-DCGAL_DIR=${WRKDIR}/CGAL-5.6.1
+CMAKE_ARGS+=	-DCGAL_DIR=${WRKDIR}/CGAL-${CGAL_VERSION}
 
 .include <bsd.port.mk>
diff --git a/databases/sfcgal/distinfo b/databases/sfcgal/distinfo
index 996cb98a8e5a..9fe544ab9a65 100644
--- a/databases/sfcgal/distinfo
+++ b/databases/sfcgal/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1721922538
-SHA256 (CGAL-5.6.1.tar.xz) = cdb15e7ee31e0663589d3107a79988a37b7b1719df3d24f2058545d1bcdd5837
-SIZE (CGAL-5.6.1.tar.xz) = 24893904
-SHA256 (SFCGAL-v1.5.2.tar.bz2) = ed5baf4802eb44a07f098b2f0be8571f3e89079cef6f5c8f9a276aa96b9b5936
-SIZE (SFCGAL-v1.5.2.tar.bz2) = 2505610
+TIMESTAMP = 1728574335
+SHA256 (CGAL-6.0.tar.xz) = 6b0c9b47c7735a2462ff34a6c3c749d1ff4addc1454924b76263dc60ab119268
+SIZE (CGAL-6.0.tar.xz) = 25979696
+SHA256 (SFCGAL-v2.0.0.tar.bz2) = 6a78dca7b481e253a4f9dff4388f8b1778ff027ab331d919f630120ddd9abdb2
+SIZE (SFCGAL-v2.0.0.tar.bz2) = 2662718
diff --git a/databases/sfcgal/files/patch-include_CGAL_boost_graph_iterator.h b/databases/sfcgal/files/patch-include_CGAL_boost_graph_iterator.h
deleted file mode 100644
index b02e6b3a1723..000000000000
--- a/databases/sfcgal/files/patch-include_CGAL_boost_graph_iterator.h
+++ /dev/null
@@ -1,38 +0,0 @@
---- ../CGAL-5.6.1/include/CGAL/boost/graph/iterator.h	2024-02-24 21:04:12 UTC
-+++ ../CGAL-5.6.1/include/CGAL/boost/graph/iterator.h
-@@ -214,11 +214,6 @@ class Halfedge_around_source_iterator { (public)
- 
- #ifndef DOXYGEN_RUNNING
- 
--  explicit operator bool() const
--  {
--    return (! (this->base() == nullptr));
--  }
--
-   bool operator==( const Self& i) const {
-     CGAL_assertion( anchor == anchor);
-     return  ( g == i.g) && ( pos == i.pos) && ( winding == i.winding);
-@@ -308,11 +303,6 @@ class Halfedge_around_target_iterator { (public)
- 
- #ifndef DOXYGEN_RUNNING
- 
--  explicit operator bool() const
--  {
--    return (! (this->base() == nullptr));
--  }
--
-   bool operator==( const Self& i) const {
-     CGAL_assertion( anchor == anchor);
-     return  ( g == i.g) && ( pos == i.pos) && ( winding == i.winding);
-@@ -399,11 +389,6 @@ class Halfedge_around_face_iterator { (public)
-   const value_type& operator *  ( ) const { return  pos; }
-   pointer           operator -> ( )       { return &pos; }
-   const value_type* operator -> ( ) const { return &pos; }
--
--  explicit operator bool() const
--  {
--    return (! (this->base() == nullptr));
--  }
- 
-   bool operator==( const Self& i) const {
-     CGAL_assertion( anchor == anchor);
diff --git a/databases/sfcgal/pkg-plist b/databases/sfcgal/pkg-plist
index 2941fc708923..12587bf8805a 100644
--- a/databases/sfcgal/pkg-plist
+++ b/databases/sfcgal/pkg-plist
@@ -1,5 +1,6 @@
 bin/sfcgal-config
 include/SFCGAL/Coordinate.h
+include/SFCGAL/Cylinder.h
 include/SFCGAL/Envelope.h
 include/SFCGAL/Exception.h
 include/SFCGAL/Geometry.h
@@ -16,6 +17,7 @@ include/SFCGAL/Polygon.h
 include/SFCGAL/PolyhedralSurface.h
 include/SFCGAL/PreparedGeometry.h
 include/SFCGAL/Solid.h
+include/SFCGAL/Sphere.h
 include/SFCGAL/Surface.h
 include/SFCGAL/Transform.h
 include/SFCGAL/Triangle.h
@@ -25,6 +27,7 @@ include/SFCGAL/algorithm/BoundaryVisitor.h
 include/SFCGAL/algorithm/ConsistentOrientationBuilder.h
 include/SFCGAL/algorithm/alphaShapes.h
 include/SFCGAL/algorithm/area.h
+include/SFCGAL/algorithm/buffer3D.h
 include/SFCGAL/algorithm/collect.h
 include/SFCGAL/algorithm/collectionExtract.h
 include/SFCGAL/algorithm/collectionHomogenize.h
@@ -45,11 +48,14 @@ include/SFCGAL/algorithm/isValid.h
 include/SFCGAL/algorithm/length.h
 include/SFCGAL/algorithm/lineSubstring.h
 include/SFCGAL/algorithm/minkowskiSum.h
+include/SFCGAL/algorithm/minkowskiSum3D.h
 include/SFCGAL/algorithm/normal.h
 include/SFCGAL/algorithm/offset.h
 include/SFCGAL/algorithm/orientation.h
 include/SFCGAL/algorithm/partition_2.h
 include/SFCGAL/algorithm/plane.h
+include/SFCGAL/algorithm/rotate.h
+include/SFCGAL/algorithm/scale.h
 include/SFCGAL/algorithm/straightSkeleton.h
 include/SFCGAL/algorithm/tesselate.h
 include/SFCGAL/algorithm/translate.h
@@ -101,6 +107,7 @@ include/SFCGAL/detail/triangulate/triangulateInGeometrySet.h
 include/SFCGAL/detail/ublas.h
 include/SFCGAL/export.h
 include/SFCGAL/io/GeometryStreams.h
+include/SFCGAL/io/OBJ.h
 include/SFCGAL/io/ewkt.h
 include/SFCGAL/io/osg.h
 include/SFCGAL/io/vtk.h
diff --git a/graphics/gdal/Makefile b/graphics/gdal/Makefile
index 398ec03300f3..ff35fb590c0c 100644
--- a/graphics/gdal/Makefile
+++ b/graphics/gdal/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	gdal
 PORTVERSION=	3.9.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics geography
 MASTER_SITES=	https://download.osgeo.org/gdal/${PORTVERSION}/ \
 		LOCAL/sunpoet



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202410101623.49AGNpQQ097046>