From 88e23bcc0fe1fc629ca47e6f3456a2bfbece2764 Mon Sep 17 00:00:00 2001
From: autoantwort <41973254+autoantwort@users.noreply.github.com>
Date: Wed, 29 Sep 2021 17:34:53 +0200
Subject: [PATCH] [proj4] remove feature "database" (#20368)

* [proj4] remove database feature

* [mapnik] remove dependency an feature 'database' of proj4

* add version files
---
 ports/mapnik/vcpkg.json    |  8 ++------
 ports/proj4/portfile.cmake |  5 +----
 ports/proj4/vcpkg.json     | 22 ++++++++--------------
 versions/baseline.json     |  4 ++--
 versions/m-/mapnik.json    |  5 +++++
 versions/p-/proj4.json     |  5 +++++
 6 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/ports/mapnik/vcpkg.json b/ports/mapnik/vcpkg.json
index c6aebcc527..b9f2c7d4a1 100644
--- a/ports/mapnik/vcpkg.json
+++ b/ports/mapnik/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "mapnik",
   "version-date": "2021-09-15",
+  "port-version": 1,
   "description": "Mapnik is an open source toolkit for developing mapping applications.",
   "homepage": "https://github.com/mapnik/mapnik",
   "supports": "!(static & windows)",
@@ -152,12 +153,7 @@
     "proj": {
       "description": "PROJ Functionalities",
       "dependencies": [
-        {
-          "name": "proj4",
-          "features": [
-            "database"
-          ]
-        }
+        "proj4"
       ]
     },
     "svg-renderer": {
diff --git a/ports/proj4/portfile.cmake b/ports/proj4/portfile.cmake
index 34fb1fd028..73a458e84f 100644
--- a/ports/proj4/portfile.cmake
+++ b/ports/proj4/portfile.cmake
@@ -23,7 +23,6 @@ endif()
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     FEATURES
-        database BUILD_PROJ_DATABASE
         tools BUILD_CCT
         tools BUILD_CS2CS
         tools BUILD_GEOD
@@ -38,9 +37,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
   set(FEATURE_OPTIONS ${FEATURE_OPTIONS} -DENABLE_TIFF=OFF -DENABLE_CURL=OFF -DBUILD_PROJSYNC=OFF)
 endif()
 
-if ("database" IN_LIST FEATURES)
-    set(EXE_SQLITE3 ${CURRENT_HOST_INSTALLED_DIR}/tools/sqlite3${VCPKG_HOST_EXECUTABLE_SUFFIX})
-endif()
+set(EXE_SQLITE3 "${CURRENT_HOST_INSTALLED_DIR}/tools/sqlite3${VCPKG_HOST_EXECUTABLE_SUFFIX}")
 
 vcpkg_cmake_configure(
     SOURCE_PATH ${SOURCE_PATH}
diff --git a/ports/proj4/vcpkg.json b/ports/proj4/vcpkg.json
index b2d12fc001..2f49727632 100644
--- a/ports/proj4/vcpkg.json
+++ b/ports/proj4/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "proj4",
   "version-semver": "7.2.1",
-  "port-version": 5,
+  "port-version": 6,
   "description": "PROJ.4 library for cartographic projections",
   "homepage": "https://github.com/OSGeo/PROJ",
   "dependencies": [
@@ -9,6 +9,13 @@
       "name": "sqlite3",
       "default-features": false
     },
+    {
+      "name": "sqlite3",
+      "host": true,
+      "features": [
+        "tool"
+      ]
+    },
     {
       "name": "vcpkg-cmake",
       "host": true
@@ -19,22 +26,9 @@
     }
   ],
   "default-features": [
-    "database",
     "tiff"
   ],
   "features": {
-    "database": {
-      "description": "generate database",
-      "dependencies": [
-        {
-          "name": "sqlite3",
-          "host": true,
-          "features": [
-            "tool"
-          ]
-        }
-      ]
-    },
     "tiff": {
       "description": "Enable TIFF support to read some grids",
       "dependencies": [
diff --git a/versions/baseline.json b/versions/baseline.json
index 18fe25429c..cf5f47ecce 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4150,7 +4150,7 @@
     },
     "mapnik": {
       "baseline": "2021-09-15",
-      "port-version": 0
+      "port-version": 1
     },
     "marble": {
       "baseline": "19.08.2",
@@ -5262,7 +5262,7 @@
     },
     "proj4": {
       "baseline": "7.2.1",
-      "port-version": 5
+      "port-version": 6
     },
     "prometheus-cpp": {
       "baseline": "0.13.0",
diff --git a/versions/m-/mapnik.json b/versions/m-/mapnik.json
index 7924f1250b..1445956f5a 100644
--- a/versions/m-/mapnik.json
+++ b/versions/m-/mapnik.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "d75a684e7f654d0fc2485c4fa501a8821056c92b",
+      "version-date": "2021-09-15",
+      "port-version": 1
+    },
     {
       "git-tree": "794329d32e3af221bb8751cf747f354d087fceab",
       "version-date": "2021-09-15",
diff --git a/versions/p-/proj4.json b/versions/p-/proj4.json
index 1c72aae292..43d8f699e2 100644
--- a/versions/p-/proj4.json
+++ b/versions/p-/proj4.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a7d82e5f8d67636114f179f44b7277f818e3754c",
+      "version-semver": "7.2.1",
+      "port-version": 6
+    },
     {
       "git-tree": "aa22133ae2355b540a2676402896abc323f26aa9",
       "version-semver": "7.2.1",