geography/shapelib: Update to 1.5.0

Upstream NEWS since 1.2.10:

  * Minor improvements (see ChangeLog for details)

  * contrib/shpgeo.h/.c: Remove PROJ.4 dependency and functionality,
    causing removal of SHPProject(), SHPSetProjection() and SHPFreeProjection()
  * contrib/shpproj.c: removed

  * bump shlib version

  * convert to autoconf/automake

4 files changed, 20 insertions, 79 deletions

diff --git a/geography/shapelib/Makefile b/geography/shapelib/Makefile
index 5ebd2f609f5..7e1a29d1940 100644
--- a/geography/shapelib/Makefile
+++ b/geography/shapelib/Makefile
@@ -1,22 +1,27 @@
-# $NetBSD: Makefile,v 1.8 2022/05/06 00:08:04 gdt Exp $
+# $NetBSD: Makefile,v 1.9 2022/05/06 00:30:33 gdt Exp $
 #
 
-DISTNAME=		shapelib-1.2.10
-PKGREVISION=		1
+DISTNAME=		shapelib-1.5.0
 CATEGORIES=		geography
-MASTER_SITES=		http://shapelib.maptools.org/dl/
+MASTER_SITES=		https://download.osgeo.org/shapelib/
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://shapelib.maptools.org/
 COMMENT=		Library for reading, writing and updating (limited) ESRI Shapefiles
 LICENSE=		gnu-lgpl-v2 OR mit
 
+USE_LANGUAGES=		c99 c++
+
+GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 
-NO_CONFIGURE=		YES
+MAKE_JOBS_SAFE=		no
+
+CHECK_PORTABILITY_SKIP+=	tests/test1.sh
 
-BUILD_TARGET=		lib
-INSTALL_TARGET=		lib_install
-INSTALLATION_DIRS=	lib
+# \todo Explain why we don't install what shapelib installs.
+# \todo Perhaps file a bug upstream that the bin programs are not namespaced.
+BUILD_TARGET=		libshp.la
+INSTALL_TARGET=		install-libLTLIBRARIES install-libshp_la_includeHEADERS install-pkgconfigDATA
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/geography/shapelib/PLIST b/geography/shapelib/PLIST
index b7c575b8576..02b51bd8e3a 100644
--- a/geography/shapelib/PLIST
+++ b/geography/shapelib/PLIST
@@ -1,3 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:57:16 joerg Exp $
-include/libshp/shapefil.h
+@comment $NetBSD: PLIST,v 1.3 2022/05/06 00:30:33 gdt Exp $
+include/shapefil.h
 lib/libshp.la
+lib/pkgconfig/shapelib.pc
diff --git a/geography/shapelib/distinfo b/geography/shapelib/distinfo
index 7d6d52d33af..57d8237c0b8 100644
--- a/geography/shapelib/distinfo
+++ b/geography/shapelib/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.6 2021/10/26 10:45:16 nia Exp $
+$NetBSD: distinfo,v 1.7 2022/05/06 00:30:33 gdt Exp $
 
-BLAKE2s (shapelib-1.2.10.tar.gz) = 2cc33ad10230d31d21ca007951e5adba41058a58edd422c8bfc8a825e86d89b8
-SHA512 (shapelib-1.2.10.tar.gz) = c72cb637aaa2e09037f334edb9638b7af673fa965435b8e0d9beaa3391e9db958d0b16f59d98a5d6933136562556fb8c607fb89f3dd6d3c1696774bb11554cf6
-Size (shapelib-1.2.10.tar.gz) = 167219 bytes
-SHA1 (patch-aa) = 141901a52b09443245954a62663cf25fad229831
+BLAKE2s (shapelib-1.5.0.tar.gz) = e2332b021384d1bac8a16a1783f53a73d7e05503112c0af23476ffa5eeae5380
+SHA512 (shapelib-1.5.0.tar.gz) = 6dbd5fc7929ca403e65017ef58211f351608d9ad08221bf68bde047ceecfd27013ce731f9ae4edcfd040bc3db7fe9054b5d96e46128d2968788bef19532b1721
+Size (shapelib-1.5.0.tar.gz) = 547686 bytes
diff --git a/geography/shapelib/patches/patch-aa b/geography/shapelib/patches/patch-aa
deleted file mode 100644
index 5ce74890bd0..00000000000
--- a/geography/shapelib/patches/patch-aa
+++ /dev/null
@@ -1,64 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2009/11/26 00:42:19 joerg Exp $
-
---- Makefile.orig	2003-04-07 15:03:22.000000000 +0200
-+++ Makefile
-@@ -91,52 +91,16 @@ test3:
- 	fi
- 
- 
--# -----------------------------------------------------------------------------
--# The following is contributed by Jan-Oliver Wagner, and should allow for
--# creating shared libraries on most platforms with gcc, and libtool installed.
--
- SHPLIB_VERSION=1.2.9
- LIBSHP_VERSION=1.0.1 # still once to be changed manually (see for 1:1:0), sorry
- 
- lib:
--	/bin/sh ./libtool --mode=compile gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1  -I. -I. -I/usr/local/include    -g -O2 -c shpopen.c
--	gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c  -fPIC -DPIC shpopen.c -o .libs/shpopen.lo
--	gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c shpopen.c -o shpopen.o >/dev/null 2>&1
--	mv -f .libs/shpopen.lo shpopen.lo
--	/bin/sh ./libtool --mode=compile gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1  -I. -I. -I/usr/local/include    -g -O2 -c shptree.c
--	rm -f .libs/shptree.lo
--	gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c  -fPIC -DPIC shptree.c -o .libs/shptree.lo
--	gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c shptree.c -o shptree.o >/dev/null 2>&1
--	mv -f .libs/shptree.lo shptree.lo
--	/bin/sh ./libtool --mode=compile gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1  -I. -I. -I/usr/local/include    -g -O2 -c dbfopen.c
--	rm -f .libs/dbfopen.lo
--	gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c  -fPIC -DPIC dbfopen.c -o .libs/dbfopen.lo
--	gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c dbfopen.c -o dbfopen.o >/dev/null 2>&1
--	mv -f .libs/dbfopen.lo dbfopen.lo
--	/bin/sh ./libtool --mode=link gcc  -g -O2  -o libshp.la -rpath /usr/local/lib -version-info 1:1:0 shpopen.lo shptree.lo dbfopen.lo  
--	rm -fr .libs/libshp.la .libs/libshp.* .libs/libshp.*
--	rm -fr .libs/libshp.lax
--	mkdir .libs/libshp.lax
--	/usr/bin/ld -G -h libshp.so.1 -o .libs/libshp.so.$(LIBSHP_VERSION)  shpopen.lo shptree.lo dbfopen.lo  -lc
--
--	(cd .libs && rm -f libshp.so.1 && ln -s libshp.so.$(LIBSHP_VERSION) libshp.so.1)
--	(cd .libs && rm -f libshp.so && ln -s libshp.so.$(LIBSHP_VERSION) libshp.so)
--	ar cru .libs/libshp.a  shpopen.o shptree.o dbfopen.o 
--	ranlib .libs/libshp.a
--	rm -fr .libs/libshp.lax
--	(cd .libs && rm -f libshp.la && ln -s ../libshp.la libshp.la)
-+	${LIBTOOL} --mode=compile ${CC} -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1  -I. -I. -I/usr/local/include ${CFLAGS} -c shpopen.c
-+	${LIBTOOL} --mode=compile ${CC} -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1  -I. -I. -I/usr/local/include ${CFLAGS} -c shptree.c
-+	${LIBTOOL} --mode=compile ${CC} -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1  -I. -I. -I/usr/local/include ${CFLAGS} -c dbfopen.c
-+	${LIBTOOL} --mode=link ${CC} ${CFLAGS}  -o libshp.la -rpath ${PREFIX}/lib -version-info 1:1:0 shpopen.lo shptree.lo dbfopen.lo
- 
- lib_install:
--	cp .libs/libshp.la .libs/libshp.lai
--	/bin/sh ./mkinstalldirs /usr/local/lib
--	/bin/sh ./libtool  --mode=install /usr/bin/install -c libshp.la /usr/local/lib/libshp.la
--	/usr/bin/install -c .libs/libshp.so.$(LIBSHP_VERSION) /usr/local/lib/libshp.so.$(LIBSHP_VERSION)
--	(cd /usr/local/lib && rm -f libshp.so.1 && ln -s libshp.so.$(LIBSHP_VERSION) libshp.so.1)
--	(cd /usr/local/lib && rm -f libshp.so && ln -s libshp.so.$(LIBSHP_VERSION) libshp.so)
--	chmod +x /usr/local/lib/libshp.so.$(LIBSHP_VERSION)
--	/usr/bin/install -c .libs/libshp.la /usr/local/lib/libshp.la
--	/usr/bin/install -c .libs/libshp.a /usr/local/lib/libshp.a
--	ranlib /usr/local/lib/libshp.a
--	chmod 644 /usr/local/lib/libshp.a
--	/bin/sh ./mkinstalldirs /usr/local/include/libshp
--	/usr/bin/install -c -m 644 shapefil.h /usr/local/include/libshp/shapefil.h
-+	${LIBTOOL}  --mode=install ${BSD_INSTALL_LIB} -c libshp.la ${DESTDIR}${PREFIX}/lib/libshp.la
-+	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/include/libshp
-+	${BSD_INSTALL_DATA} -c -m 644 shapefil.h ${DESTDIR}${PREFIX}/include/libshp/shapefil.h