CVS commit: pkgsrc/geography/shapelib

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Wed Aug 14 11:30:45 UTC 2024

Modified Files:
        pkgsrc/geography/shapelib: Makefile PLIST distinfo

Log Message:
geography/shapelib: Update to 1.6.1

Take maintainership.
Modernize USE_LANGUAGES.
Install bin/{dbf,shp}* as upstream intends.
Patch out entire contrib dir, to avoid more programs that don't seem
formally part of the package.

Upstream changes: bugfixes and minor improvements


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/geography/shapelib/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/geography/shapelib/PLIST
cvs rdiff -u -r1.8 -r1.9 pkgsrc/geography/shapelib/distinfo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/geography/shapelib/Makefile
diff -u pkgsrc/geography/shapelib/Makefile:1.10 pkgsrc/geography/shapelib/Makefile:1.11
--- pkgsrc/geography/shapelib/Makefile:1.10     Sat Dec 30 10:49:33 2023
+++ pkgsrc/geography/shapelib/Makefile  Wed Aug 14 11:30:45 2024
@@ -1,26 +1,34 @@
-# $NetBSD: Makefile,v 1.10 2023/12/30 10:49:33 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2024/08/14 11:30:45 gdt Exp $
 
-DISTNAME=              shapelib-1.6.0
+VERSION=               1.6.1
+#VERSION_RC=           rc2
+DISTNAME=              shapelib-${VERSION}${VERSION_RC}
 CATEGORIES=            geography
 MASTER_SITES=          https://download.osgeo.org/shapelib/
 
-MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
+MAINTAINER=            gdt%NetBSD.org@localhost
 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++
+WRKSRC=                        ${WRKDIR}/shapelib-${VERSION}
+
+USE_LANGUAGES=         c c++
+USE_CC_FEATURES=       c99
 
 GNU_CONFIGURE=         YES
 USE_LIBTOOL=           YES
+# Upstream does not document that gmake is required, but building with
+# BSD make tries to build things that need shplib.la before it is built.
+USE_TOOLS+=            gmake
+
+# Earlier, we installed only some things, perhaps because there were a
+# lot of binaries with non-namespaced names.  Now, we patch out
+# contrib, and the set of installed binaries seems reasonable.
+# \todo Perhaps revisit this, if upstream addreses
+#   https://github.com/OSGeo/shapelib/issues/151
+#INSTALL_TARGET=               install-libLTLIBRARIES install-libshp_la_includeHEADERS install-pkgconfigDATA
 
-MAKE_JOBS_SAFE=                no
-
-CHECK_PORTABILITY_SKIP+=       tests/test1.sh
-
-# \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
+TEST_TARGET=           check
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/geography/shapelib/PLIST
diff -u pkgsrc/geography/shapelib/PLIST:1.3 pkgsrc/geography/shapelib/PLIST:1.4
--- pkgsrc/geography/shapelib/PLIST:1.3 Fri May  6 00:30:33 2022
+++ pkgsrc/geography/shapelib/PLIST     Wed Aug 14 11:30:45 2024
@@ -1,4 +1,13 @@
-@comment $NetBSD: PLIST,v 1.3 2022/05/06 00:30:33 gdt Exp $
+@comment $NetBSD: PLIST,v 1.4 2024/08/14 11:30:45 gdt Exp $
+bin/dbfadd
+bin/dbfcreate
+bin/dbfdump
+bin/shpadd
+bin/shpcreate
+bin/shpdump
+bin/shprewind
+bin/shptreedump
+bin/shputils
 include/shapefil.h
 lib/libshp.la
 lib/pkgconfig/shapelib.pc

Index: pkgsrc/geography/shapelib/distinfo
diff -u pkgsrc/geography/shapelib/distinfo:1.8 pkgsrc/geography/shapelib/distinfo:1.9
--- pkgsrc/geography/shapelib/distinfo:1.8      Sat Dec 30 10:49:33 2023
+++ pkgsrc/geography/shapelib/distinfo  Wed Aug 14 11:30:45 2024
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.8 2023/12/30 10:49:33 wiz Exp $
+$NetBSD: distinfo,v 1.9 2024/08/14 11:30:45 gdt Exp $
 
-BLAKE2s (shapelib-1.6.0.tar.gz) = 12e5c5196b4bad3b070f2383fde447c59795793746b3d169ed72357c1b66e3f2
-SHA512 (shapelib-1.6.0.tar.gz) = cc0b5841da5039c0467291994b9cd3aa99bebe70adf8db01719336a0eb2f0d7362395806f99228ba1f7ec68f0c5ecf9f7f5f1018093cf8dad9e06f0ae147c3fc
-Size (shapelib-1.6.0.tar.gz) = 528882 bytes
+BLAKE2s (shapelib-1.6.1.tar.gz) = e6e1255666bc816883af304b06e1c47284cd8ed02a7890c02dccc5d2aecd67cb
+SHA512 (shapelib-1.6.1.tar.gz) = 66823f67e7c46017b16683a28d5c5783a799756d220c8ed1aa6dd7f971b41ca73dfd8c5674f214a0a35339f885b095e12b2ac52263968a6247b6895d43136e3f
+Size (shapelib-1.6.1.tar.gz) = 1036372 bytes
+SHA1 (patch-Makefile.in) = 5077d62222e06184321b66e860d74a689f23b052