From: Rafael Sadowski <rafael@sizeofvoid.org>
Subject: Re: UPDATE: shapelib-1.6.0
To: Landry Breuil <landry@openbsd.org>
Cc: Rafael Sadowski <rafael@sizeofvoid.org>,  The OpenBSD ports mailing-list <ports@openbsd.org>
Date: Thu, 18 Apr 2024 19:41:10 +0200

On Thu Apr 18, 2024 at 07:30:34PM +0200, Landry Breuil wrote:
> Le Thu, Apr 18, 2024 at 05:08:00PM +0200, Rafael Sadowski a écrit :
> > I'm annoyed that shapelib failed with MAKE_JOBS. So here is an update
> > diff that switches to camke.
> > 
> > http://shapelib.maptools.org/release.html
> > 
> > I bumped shp:
> 
> that matches the relnotes at
> https://github.com/OSGeo/shapelib/releases/tag/v1.6.0

Oh nice, I switched from HTTP to HTTPS github.

> 
> i guess shputils has no point now that gdal does everything.
> 
> ok if the consumers build fine :)

Yes sure


diff --git a/devel/shapelib/Makefile b/devel/shapelib/Makefile
index 3481a889768..97c1d47a6f7 100644
--- a/devel/shapelib/Makefile
+++ b/devel/shapelib/Makefile
@@ -1,17 +1,21 @@
 COMMENT=	shapefile manipulation library
 
-DISTNAME=	shapelib-1.5.0
-SHARED_LIBS=	shp 2.0
-CATEGORIES=    	devel
+V =		1.6.0
+DISTNAME=	shapelib-${V}
+
+CATEGORIES=	devel
 
 HOMEPAGE=	http://shapelib.maptools.org/
 
+SHARED_LIBS +=  shp                       3.0 # 4.0
+
 # LGPL
 PERMIT_PACKAGE=	Yes
 
-SITES=		http://download.osgeo.org/shapelib/
+WANTLIB += ${COMPILER_LIBCXX} c m
+
+SITES=		https://github.com/OSGeo/shapelib/releases/download/v${V}/
 
-CONFIGURE_STYLE=gnu
-WANTLIB +=	${COMPILER_LIBCXX} c m
+MODULES =	devel/cmake
 
 .include <bsd.port.mk>
diff --git a/devel/shapelib/distinfo b/devel/shapelib/distinfo
index dcb60a39059..da65196bf5d 100644
--- a/devel/shapelib/distinfo
+++ b/devel/shapelib/distinfo
@@ -1,2 +1,2 @@
-SHA256 (shapelib-1.5.0.tar.gz) = H8CkgJgsrvnnuUIwcLR3ULo0zQuoJmjy5jj6sdB62uE=
-SIZE (shapelib-1.5.0.tar.gz) = 547686
+SHA256 (shapelib-1.6.0.tar.gz) = GVKLJDdyQXBWNzIMNnlDAxrVCIZl0fsOHqpSpxJkpsQ=
+SIZE (shapelib-1.6.0.tar.gz) = 528882
diff --git a/devel/shapelib/pkg/PLIST b/devel/shapelib/pkg/PLIST
index c058565f9c8..eafa06b0582 100644
--- a/devel/shapelib/pkg/PLIST
+++ b/devel/shapelib/pkg/PLIST
@@ -1,4 +1,5 @@
 @bin bin/Shape_PointInPoly
+@bin bin/csv2shp
 @bin bin/dbfadd
 @bin bin/dbfcat
 @bin bin/dbfcreate
@@ -16,10 +17,13 @@
 @bin bin/shprewind
 @bin bin/shpsort
 @bin bin/shptreedump
-@bin bin/shputils
 @bin bin/shpwkb
 include/shapefil.h
-lib/libshp.a
-lib/libshp.la
+include/shapelib/
+include/shapelib/shapefil.h
 @lib lib/libshp.so.${LIBshp_VERSION}
-lib/pkgconfig/shapelib.pc
+share/shapelib/
+share/shapelib/shapelib-config-version.cmake
+share/shapelib/shapelib-config.cmake
+share/shapelib/shapelib-targets${MODCMAKE_BUILD_SUFFIX}
+share/shapelib/shapelib-targets.cmake