CVS commit: pkgsrc/geography/gdal-lib

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

Module Name:    pkgsrc
Committed By:   gdt
Date:           Thu Jun 11 18:01:39 UTC 2026

Modified Files:
        pkgsrc/geography/gdal-lib: Makefile

Log Message:
gdal-lib: Use external json-c

The situation is messy, but cmake reports it is found and it shows up
in the installed shlib.


To generate a diff of this commit:
cvs rdiff -u -r1.204 -r1.205 pkgsrc/geography/gdal-lib/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/gdal-lib/Makefile
diff -u pkgsrc/geography/gdal-lib/Makefile:1.204 pkgsrc/geography/gdal-lib/Makefile:1.205
--- pkgsrc/geography/gdal-lib/Makefile:1.204    Thu Jun 11 17:41:16 2026
+++ pkgsrc/geography/gdal-lib/Makefile  Thu Jun 11 18:01:39 2026
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.204 2026/06/11 17:41:16 gdt Exp $
+# $NetBSD: Makefile,v 1.205 2026/06/11 18:01:39 gdt Exp $
 
 .include "../../geography/gdal-lib/Makefile.common"
 PKGNAME=       ${DISTNAME:S/gdal/gdal-lib/}
-PKGREVISION=   2
+PKGREVISION=   3
 #PKGREVISION=  0
 
 COMMENT=       Translator library for raster geospatial data formats
@@ -29,10 +29,6 @@ cmake-options:
 
 .include "../../devel/cmake/build.mk"
 
-# \todo Justify or change to bl3 on json-c
-CMAKE_CONFIGURE_ARGS+= -DGDAL_USE_JSONC_INTERNAL=ON
-CMAKE_CONFIGURE_ARGS+= -DGDAL_USE_JSONC=OFF
-
 # Disable things that cmake finds that we didn't bl3.
 # \todo For each, consider if we should intead add a bl3.
 CMAKE_CONFIGURE_ARGS+= -DGDAL_USE_ARROW=OFF
@@ -145,8 +141,7 @@ CMAKE_CONFIGURE_ARGS+=      -DGDAL_USE_PODOFO
 .include "../../graphics/openjpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
-# \todo See USE_JSONC_INTERNAL in Makefile.common.
-# .include "../../textproc/json-c/buildlink3.mk"
+.include "../../textproc/json-c/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/xerces-c/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"