[pkgsrc/trunk]: pkgsrc/geography/gdal-lib gdal-lib: remove the sqlite option ...

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/98b8692e2026
branches:  trunk
changeset: 424884:98b8692e2026
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Sun Mar 15 21:47:43 2020 +0000

description:
gdal-lib: remove the sqlite option and enable it always

Because gdal-lib depends unconditionally on geograpy/proj, which depends
unconditionally on sqlite3, it doesn't make sense dependency-wise to
conditionally omit sqlite3 support here.

diffstat:

 geography/gdal-lib/Makefile      |   6 ++++--
 geography/gdal-lib/buildlink3.mk |   3 ++-
 geography/gdal-lib/options.mk    |  11 ++---------
 3 files changed, 8 insertions(+), 12 deletions(-)

diffs (71 lines):

diff -r e7b85206c132 -r 98b8692e2026 geography/gdal-lib/Makefile
--- a/geography/gdal-lib/Makefile       Sun Mar 15 21:41:27 2020 +0000
+++ b/geography/gdal-lib/Makefile       Sun Mar 15 21:47:43 2020 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.122 2020/03/11 12:55:36 gdt Exp $
+# $NetBSD: Makefile,v 1.123 2020/03/15 21:47:43 tnn Exp $
 
-PKGREVISION= 4
+PKGREVISION= 5
 .include "../../geography/gdal-lib/Makefile.common"
 PKGNAME=       ${DISTNAME:S/gdal/gdal-lib/}
 
@@ -18,6 +18,7 @@
 CONFIGURE_ARGS+=       --without-python
 
 CONFIGURE_ARGS+=       --with-proj
+CONFIGURE_ARGS+=       --with-sqlite3=${BUILDLINK_PREFIX.sqlite3}
 
 MAKE_FILE=             GNUmakefile
 
@@ -30,6 +31,7 @@
 # jasper uses SIZE_MAX and friends in its headers.
 CPPFLAGS+=     -D__STDC_LIMIT_MACROS
 
+.include "../../databases/sqlite3/buildlink3.mk"
 .include "../../devel/netcdf/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
diff -r e7b85206c132 -r 98b8692e2026 geography/gdal-lib/buildlink3.mk
--- a/geography/gdal-lib/buildlink3.mk  Sun Mar 15 21:41:27 2020 +0000
+++ b/geography/gdal-lib/buildlink3.mk  Sun Mar 15 21:47:43 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.58 2020/03/08 16:47:44 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.59 2020/03/15 21:47:43 tnn Exp $
 
 BUILDLINK_TREE+=       gdal-lib
 
@@ -20,6 +20,7 @@
 .include "../../mk/mysql.buildlink3.mk"
 .endif
 
+.include "../../databases/sqlite3/buildlink3.mk"
 .include "../../devel/netcdf/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
diff -r e7b85206c132 -r 98b8692e2026 geography/gdal-lib/options.mk
--- a/geography/gdal-lib/options.mk     Sun Mar 15 21:41:27 2020 +0000
+++ b/geography/gdal-lib/options.mk     Sun Mar 15 21:47:43 2020 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: options.mk,v 1.4 2019/11/03 19:30:33 rillig Exp $
+# $NetBSD: options.mk,v 1.5 2020/03/15 21:47:43 tnn Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.gdal-lib
 
 # Note that these are not a mutually-exclusive group.
-PKG_SUPPORTED_OPTIONS= pgsql mysql sqlite
+PKG_SUPPORTED_OPTIONS= pgsql mysql
 # By default, omit database support, because there isn't an
 # articulated use case and dependency management becomes very painful.
 # For example, depending on pgsql fixes a version, but doesn't put it
@@ -26,10 +26,3 @@
 .else
 CONFIGURE_ARGS+=       --without-mysql
 .endif
-
-.if !empty(PKG_OPTIONS:Msqlite)
-.  include "../../databases/sqlite3/buildlink3.mk"
-CONFIGURE_ARGS+=       --with-sqlite3=${BUILDLINK_PREFIX.sqlite3}
-.else
-CONFIGURE_ARGS+=       --without-sqlite3
-.endif