CVS commit: pkgsrc/geography/gdal-lib

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

Module Name:    pkgsrc
Committed By:   gdt
Date:           Tue May 21 12:42:28 UTC 2024

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

Log Message:
geography/gdal-lib: GC jasper references

configure says that --without-jasper is not (no longer) valid.


To generate a diff of this commit:
cvs rdiff -u -r1.162 -r1.163 pkgsrc/geography/gdal-lib/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/geography/gdal-lib/Makefile.common

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.162 pkgsrc/geography/gdal-lib/Makefile:1.163
--- pkgsrc/geography/gdal-lib/Makefile:1.162    Tue May 21 12:26:33 2024
+++ pkgsrc/geography/gdal-lib/Makefile  Tue May 21 12:42:28 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.162 2024/05/21 12:26:33 gdt Exp $
+# $NetBSD: Makefile,v 1.163 2024/05/21 12:42:28 gdt Exp $
 
 PKGREVISION= 10
 .include "../../geography/gdal-lib/Makefile.common"
@@ -29,9 +29,6 @@ CHECK_PORTABILITY_SKIP+=      mkbindist.sh
 
 INSTALLATION_DIRS=     bin include lib ${PKGMANDIR}/man1 share/gdal
 
-# jasper uses SIZE_MAX and friends in its headers.
-CPPFLAGS+=     -D__STDC_LIMIT_MACROS
-
 # \todo: Support geopdf by including poppler, PoDoFo, or PDFium.
 # https://gdal.org/drivers/raster/pdf.html
 

Index: pkgsrc/geography/gdal-lib/Makefile.common
diff -u pkgsrc/geography/gdal-lib/Makefile.common:1.23 pkgsrc/geography/gdal-lib/Makefile.common:1.24
--- pkgsrc/geography/gdal-lib/Makefile.common:1.23      Thu Dec 29 19:45:48 2022
+++ pkgsrc/geography/gdal-lib/Makefile.common   Tue May 21 12:42:28 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.23 2022/12/29 19:45:48 brook Exp $
+# $NetBSD: Makefile.common,v 1.24 2024/05/21 12:42:28 gdt Exp $
 #
 # used by geography/gdal-lib/Makefile
 # used by geography/py-gdal/Makefile
@@ -40,5 +40,4 @@ CONFIGURE_ARGS+=      --with-xerces-inc=${BUI
 CONFIGURE_ARGS+=       --with-xerces-lib=-L${BUILDLINK_PREFIX.xerces-c}/lib\ -lxerces-c
 
 # force OpenJPEG for JPEG 2000 support
-CONFIGURE_ARGS+=       --without-jasper
 CONFIGURE_ARGS+=       --with-openjpeg