CVS commit: pkgsrc/geography/proj

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

Module Name:    pkgsrc
Committed By:   gdt
Date:           Sat May 23 14:01:31 UTC 2026

Modified Files:
        pkgsrc/geography/proj: Makefile

Log Message:
geography/proj: Force use of pkgsrc nlohmann-json

Upstream has a very outdated vendored copy.  Add a build define to ask
for it to be used as a dependency ("external" in upstream parlance).

Add a command to remove the vendored copy, to guard against accidental
use.  Leave it commented out because of upstream problems (with
links).

Rototill the comments surrounding build and test depends.

Despite the diff size, this change should have effect on the resulting
binary.


To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 pkgsrc/geography/proj/Makefile

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

Modified files:

Index: pkgsrc/geography/proj/Makefile
diff -u pkgsrc/geography/proj/Makefile:1.68 pkgsrc/geography/proj/Makefile:1.69
--- pkgsrc/geography/proj/Makefile:1.68 Thu May 14 16:41:07 2026
+++ pkgsrc/geography/proj/Makefile      Sat May 23 14:01:31 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.68 2026/05/14 16:41:07 ryoon Exp $
+# $NetBSD: Makefile,v 1.69 2026/05/23 14:01:31 gdt Exp $
 
 # Note that 9.8.0 caused problems with ETRF due to the EPSG database
 # adding an ensemble, and this release reverts the EPSG database
@@ -34,6 +34,13 @@ USE_TOOLS+=          gmake pkg-config
 
 TOOL_DEPENDS+=         sqlite3>=3.10.0:../../databases/sqlite3
 
+CMAKE_CONFIGURE_ARGS+= -DNLOHMANN_JSON_ORIGIN=EXTERNAL
+
+# This define does two unrelated things.  One is to not use the
+# network when running tests; that aligns with pkgsrc norms, but could
+# be useful to enable as proj's use of the network is part of intended
+# functionality.   The second is to avoid downloading code at build time.
+# \todo Address with upstream.
 CMAKE_CONFIGURE_ARGS+= -DRUN_NETWORK_DEPENDENT_TESTS=OFF
 # Probably default, but hang back until everyone else deals with the
 # difficulties.
@@ -41,12 +48,6 @@ CMAKE_CONFIGURE_ARGS+=       -DEMBED_RESOURCE_
 
 .include "../../devel/cmake/build.mk"
 
-# \todo GC this.  Not needed on
-#   9.7.0RC1   NetBSD 10 amd64
-#.if ${OPSYS} == "NetBSD"
-#CFLAGS+=              -DHAVE_C99_MATH=0
-#.endif
-
 # \todo Document, file upstream, and add uptream bug report URL.
 CXXFLAGS.SunOS+=       -fpermissive
 
@@ -62,26 +63,44 @@ CXXFLAGS.SunOS+=    -fpermissive
 CFLAGS+=               -ffloat-store
 .endif
 
+# Remove outdated vendored code to guard against use.
+# On hold pending upstream fixes to using outdated code when it should
+# not be used!
+#   https://github.com/OSGeo/PROJ/issues/4781
+#   https://github.com/OSGeo/PROJ/pull/4782
+pre-build-notyet:
+       ${RM} -f ${WRKSRC}/include/proj/internal/vendor/nlohmann/json.hpp
+
 PLIST_SUBST+=          VERSION=${VERSION_BASE}
 PRINT_PLIST_AWK+=      { gsub(/${VERSION_BASE}/, "$${VERSION}") }
 
+# Tests are enabled by default at build time.  They must be left on so
+# that running them later works.
+TEST_TARGET=           test
 # Tests fail on NetBSD 9 earmv7hf-el, but this is apparently a bug in
 # GNU ld < 2.33:
 #   https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=baf46cd78048e1b959462567556e1de1ef6b9039
 
-TEST_TARGET=           test
+# Dependencies are documented in docs/source/install.rst but do not appear in releases.
+#   https://github.com/OSGeo/PROJ/issues/4783
 
-# Dependencies documented by upstream
+# Build dependencies:
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
-
-# Dependencies not documented by upstream
-#  reported 20240527
-.include "../../devel/googletest/buildlink3.mk"
-#  reported 20240527
 .include "../../textproc/nlohmann-json/buildlink3.mk"
-#  not yet reported
+# Upstream does not require pthreads or document it, but spelunking
+# shows that there are hooks to make threaded sqlite3 work better if
+# proj is built threaded.  In 2026, pthreads are normal, so just use
+# them.
 .include "../../mk/pthread.buildlink3.mk"
 
+# Test dependencies:
+# Arugably these could be build deps only.
+.include "../../devel/googletest/buildlink3.mk"
+# \todo python >= 3.8 (we ignore 3.7 and importlib_metadata because
+# pkgsrc has only >= 3.10)
+# \todo py-yaml or py-ruamel
+# \todo py-test is looked for but is not documented
+
 .include "../../mk/bsd.pkg.mk"