spatialite-tools: Update to 5.0.0 and add +proj9 variant

databases/spatialite-tools/Portfile

@@ -3,8 +3,8 @@
 PortSystem 1.0
 
 name                    spatialite-tools
-version                 4.3.0
-revision                6
+version                 5.0.0
+revision                0
 categories              databases gis
 license                 GPL-3
 platforms               darwin
@@ -15,18 +15,17 @@ long_description        These CLI tools allow to interact with a SpatiaLite DB,\
                         prepare a virtual network for routing.
 
 homepage                https://www.gaia-gis.it/fossil/spatialite-tools/index
-master_sites            http://www.gaia-gis.it/gaia-sins/
+master_sites            https://www.gaia-gis.it/gaia-sins/
 distname                spatialite-tools-${version}
 
-checksums               rmd160  97314411fc2a93e376ddd1e1b219e226fb6f68b8 \
-                        sha256  f739859bc04f38735591be2f75009b98a2359033675ae310dffc3114a17ccf89 \
-                        size    540811
+checksums               rmd160  44abc50b98431b9ccad4f75ebac08d4c3ea89fef \
+                        sha256  ad092d90ccb2c480f372d1e24b1e6ad9aa8a4bb750e094efdcc6c37edb6b6d32 \
+                        size    591215
 
 depends_build           port:pkgconfig
 depends_lib             port:spatialite\
                         port:libiconv\
                         port:geos\
-                        port:proj\
                         port:expat \
                         port:readosm
 
@@ -34,14 +33,35 @@ depends_lib             port:spatialite\
 configure.args          --disable-readline
 configure.args-append   --disable-freexl
 
-configure.cppflags-append   -I${prefix}/lib/proj5/include
-configure.ldflags-append    -L${prefix}/lib/proj5/lib
-
 variant readline description {Uses readline for input} {
     configure.args-delete   --disable-readline
     configure.args-append   --enable-readline
 }
 
+# Set PROJ
+set proj_versions {6 7 8 9}
+set proj_variants {}
+foreach pjver ${proj_versions} {
+    lappend proj_variants proj${pjver}
+}
+foreach proj_ver ${proj_versions} {
+    set index [lsearch -exact ${proj_variants} proj${proj_ver}]
+    set cflcts [lreplace ${proj_variants} ${index} ${index}]
+
+    variant proj${proj_ver} description "Use Proj${proj_ver}" conflicts {*}${cflcts} "
+        depends_lib-append          port:proj${proj_ver}
+        configure.cppflags-append   -I${prefix}/lib/proj${proj_ver}/include
+        configure.ldflags-append    -L${prefix}/lib/proj${proj_ver}/lib
+    "
+}
+set projdf "if {"
+foreach pv ${proj_versions} {
+    set projdf "${projdf}!\[variant_isset proj${pv}\] && "
+}
+set projdf [string range ${projdf} 0 end-4]
+set projdf "${projdf}} { default_variants +proj${pv} }"
+eval ${projdf}
+
 default_variants        +readline
 
 post-configure {

databases/spatialite/Portfile

@@ -20,7 +20,7 @@ long_description    SpatiaLite is a library for geographic information \
                     projects.
 
 homepage            https://www.gaia-gis.it/fossil/libspatialite/index
-master_sites        http://www.gaia-gis.it/gaia-sins
+master_sites        https://www.gaia-gis.it/gaia-sins
 distname            libspatialite-${version}
 
 checksums           rmd160  b308c62df01a47286d7e2ff56c6992d537c5c8cd \