devel/shapelib: Update to 1.6.0

- Add GitHub to MASTER_SITES
- Remove my LOCAL from MASTER_SITES
- Update WWW
- Update LICENSE
- Bump PORTREVISION of dependent ports for shlib change

Changes:	https://github.com/OSGeo/shapelib/releases
		http://shapelib.maptools.org/release.html
Security:	CVE-2022-0699

13 files changed, 35 insertions, 34 deletions

diff --git a/comms/xastir/Makefile b/comms/xastir/Makefile
index 5b509f5448b7..3ae01fd4b16f 100644
--- a/comms/xastir/Makefile
+++ b/comms/xastir/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	xastir
 DISTVERSIONPREFIX=	Release-
 DISTVERSION=	2.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	comms hamradio
 
 MAINTAINER=	carl@stagecraft.cx
diff --git a/devel/shapelib/Makefile b/devel/shapelib/Makefile
index 1feb901c7037..c6231cb895fe 100644
--- a/devel/shapelib/Makefile
+++ b/devel/shapelib/Makefile
@@ -1,18 +1,18 @@
 PORTNAME=	shapelib
-PORTVERSION=	1.5.0
+PORTVERSION=	1.6.0
 CATEGORIES=	devel geography
 MASTER_SITES=	https://download.osgeo.org/shapelib/ \
-		LOCAL/sunpoet
+		https://github.com/OSGeo/shapelib/releases/download/v${PORTVERSION}/
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	C API for reading and writing ArcView Shapefiles
-WWW=		http://shapelib.maptools.org/
+WWW=		http://shapelib.maptools.org/ \
+		https://github.com/OSGeo/shapelib
 
-LICENSE=	LGPL20
-LICENSE_FILE=	${WRKSRC}/COPYING
-
-OPTIONS_DEFINE=	DOCS
-OPTIONS_SUB=	yes
+LICENSE=	LGPL20+ MIT
+LICENSE_COMB=	dual
+LICENSE_FILE_LGPL20+ =	${WRKSRC}/LICENSE-LGPL
+LICENSE_FILE_MIT=	${WRKSRC}/LICENSE-MIT
 
 USES=		libtool localbase pathfix
 
@@ -21,13 +21,10 @@ GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
+# bin/dbfdump
 CONFLICTS_INSTALL=	p5-DBD-XBase
 
 post-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/.libs/shptest ${STAGEDIR}${PREFIX}/bin/
 
-post-install-DOCS-on:
-	${MKDIR} ${STAGEDIR}${DOCSDIR}/
-	${INSTALL_DATA} ${WRKSRC}/web/* ${STAGEDIR}${DOCSDIR}/
-
 .include <bsd.port.mk>
diff --git a/devel/shapelib/distinfo b/devel/shapelib/distinfo
index 1bd7757ab2bb..0183be183247 100644
--- a/devel/shapelib/distinfo
+++ b/devel/shapelib/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1551437743
-SHA256 (shapelib-1.5.0.tar.gz) = 1fc0a480982caef9e7b9423070b47750ba34cd0ba82668f2e638fab1d07adae1
-SIZE (shapelib-1.5.0.tar.gz) = 547686
+TIMESTAMP = 1703495787
+SHA256 (shapelib-1.6.0.tar.gz) = 19528b24377241705637320c367943031ad5088665d1fb0e1eaa52a71264a6c4
+SIZE (shapelib-1.6.0.tar.gz) = 528882
diff --git a/devel/shapelib/files/patch-Makefile.in b/devel/shapelib/files/patch-Makefile.in
new file mode 100644
index 000000000000..445b6fa4642c
--- /dev/null
+++ b/devel/shapelib/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	2023-12-20 18:05:21 UTC
++++ Makefile.in
+@@ -817,7 +817,7 @@ clean-libLTLIBRARIES:
+ 	  rm -f $${locs}; \
+ 	}
+ 
+-libshp.la: $(libshp_la_OBJECTS) $(libshp_la_DEPENDENCIES) $(EXTRA_libshp_la_DEPENDENCIES) 
++$(top_builddir)/libshp.la: $(libshp_la_OBJECTS) $(libshp_la_DEPENDENCIES) $(EXTRA_libshp_la_DEPENDENCIES) 
+ 	$(AM_V_CCLD)$(libshp_la_LINK) -rpath $(libdir) $(libshp_la_OBJECTS) $(libshp_la_LIBADD) $(LIBS)
+ 
+ dbfadd$(EXEEXT): $(dbfadd_OBJECTS) $(dbfadd_DEPENDENCIES) $(EXTRA_dbfadd_DEPENDENCIES) 
diff --git a/devel/shapelib/pkg-plist b/devel/shapelib/pkg-plist
index 335cc7079f39..01db8febd261 100644
--- a/devel/shapelib/pkg-plist
+++ b/devel/shapelib/pkg-plist
@@ -1,4 +1,5 @@
 bin/Shape_PointInPoly
+bin/csv2shp
 bin/dbfadd
 bin/dbfcat
 bin/dbfcreate
@@ -22,15 +23,6 @@ bin/shpwkb
 include/shapefil.h
 lib/libshp.a
 lib/libshp.so
-lib/libshp.so.2
-lib/libshp.so.2.1.0
+lib/libshp.so.4
+lib/libshp.so.4.0.0
 libdata/pkgconfig/shapelib.pc
-%%PORTDOCS%%%%DOCSDIR%%/codepage.html
-%%PORTDOCS%%%%DOCSDIR%%/dbf_api.html
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/license.html
-%%PORTDOCS%%%%DOCSDIR%%/manifest.html
-%%PORTDOCS%%%%DOCSDIR%%/maptools.css
-%%PORTDOCS%%%%DOCSDIR%%/release.html
-%%PORTDOCS%%%%DOCSDIR%%/shapelib-tools.html
-%%PORTDOCS%%%%DOCSDIR%%/shp_api.html
diff --git a/graphics/cloudcompare/Makefile b/graphics/cloudcompare/Makefile
index ce31bb585362..ba3507436efb 100644
--- a/graphics/cloudcompare/Makefile
+++ b/graphics/cloudcompare/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	cloudcompare
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.12.4
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	graphics
 
 MAINTAINER=	nc@FreeBSD.org
diff --git a/graphics/gpsmanshp/Makefile b/graphics/gpsmanshp/Makefile
index 591e109c566e..11d986183635 100644
--- a/graphics/gpsmanshp/Makefile
+++ b/graphics/gpsmanshp/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	gpsmanshp
 PORTVERSION=	1.2.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics tcl geography
 MASTER_SITES=	SF/${PORTNAME}/distr
 DISTNAME=	${PORTNAME}_${PORTVERSION}
diff --git a/mail/cyrus-imapd30/Makefile b/mail/cyrus-imapd30/Makefile
index a896cb26ca6f..a5c0917b4ca9 100644
--- a/mail/cyrus-imapd30/Makefile
+++ b/mail/cyrus-imapd30/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	cyrus-imapd
 PORTVERSION=	3.0.18
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	https://github.com/cyrusimap/cyrus-imapd/releases/download/${PORTNAME}-${PORTVERSION}/
 PKGNAMESUFFIX=	30
diff --git a/mail/cyrus-imapd32/Makefile b/mail/cyrus-imapd32/Makefile
index bc0a4ead2245..0fbdc554944c 100644
--- a/mail/cyrus-imapd32/Makefile
+++ b/mail/cyrus-imapd32/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	cyrus-imapd
 PORTVERSION=	3.2.11
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	https://github.com/cyrusimap/cyrus-imapd/releases/download/${PORTNAME}-${PORTVERSION}/
 PKGNAMESUFFIX=	32
diff --git a/mail/cyrus-imapd34/Makefile b/mail/cyrus-imapd34/Makefile
index e1d619fda416..f55fcd9355b2 100644
--- a/mail/cyrus-imapd34/Makefile
+++ b/mail/cyrus-imapd34/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	cyrus-imapd
 PORTVERSION=	3.4.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	https://github.com/cyrusimap/cyrus-imapd/releases/download/${PORTNAME}-${PORTVERSION}/
 PKGNAMESUFFIX=	${CYRUS_IMAPD_VER}
diff --git a/mail/cyrus-imapd36/Makefile b/mail/cyrus-imapd36/Makefile
index 023889024429..e0a34659f2eb 100644
--- a/mail/cyrus-imapd36/Makefile
+++ b/mail/cyrus-imapd36/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	cyrus-imapd
 PORTVERSION=	3.6.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	https://github.com/cyrusimap/cyrus-imapd/releases/download/${PORTNAME}-${DISTVERSION}/
 PKGNAMESUFFIX=	${CYRUS_IMAPD_VER}
diff --git a/mail/cyrus-imapd38/Makefile b/mail/cyrus-imapd38/Makefile
index 4e4b78f63459..c2ba0f78775f 100644
--- a/mail/cyrus-imapd38/Makefile
+++ b/mail/cyrus-imapd38/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	cyrus-imapd
 PORTVERSION=	3.8.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	https://github.com/cyrusimap/cyrus-imapd/releases/download/${PORTNAME}-${DISTVERSION}/
 PKGNAMESUFFIX=	${CYRUS_IMAPD_VER}
diff --git a/science/gnudatalanguage/Makefile b/science/gnudatalanguage/Makefile
index 0a5f9ea405bb..b596d6885bcd 100644
--- a/science/gnudatalanguage/Makefile
+++ b/science/gnudatalanguage/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	gnudatalanguage
 PORTVERSION=	1.0.4
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	science lang
 .if defined(BUILD_PYTHON_MODULE)