<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b465a3ad689df38ce467f4f5fc68103260548d9f">https://github.com/macports/macports-ports/commit/b465a3ad689df38ce467f4f5fc68103260548d9f</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new b465a3ad689 mapserver: update to 8.0.1 Closes: https://trac.macports.org/ticket/49485 Closes: https://trac.macports.org/ticket/64342
</span>b465a3ad689 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b465a3ad689df38ce467f4f5fc68103260548d9f
</span>Author: nilason <n_larsson@yahoo.com>
AuthorDate: Thu Jun 1 11:46:48 2023 +0200
<span style='display:block; white-space:pre;color:#404040;'> mapserver: update to 8.0.1
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/49485
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/64342
</span>---
gis/mapserver/Portfile | 222 ++++++++++++++++++++-----------
gis/mapserver/files/cmakelist.diff | 11 ++
gis/mapserver/files/patch-configure.diff | 16 ---
gis/mapserver/files/python.diff | 11 ++
4 files changed, 164 insertions(+), 96 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/mapserver/Portfile b/gis/mapserver/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index de48c72ac80..702a5ab83d3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/mapserver/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/mapserver/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,122 +1,174 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.1
</span>
name mapserver
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 6.2.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 8.0.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> maintainers hbaspecto.com:jea openmaintainer
categories gis
license permissive
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span>
description mapserver
<span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description MapServer is an Open Source development environment for \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- building spatially-enabled internet applications.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description MapServer is an Open Source platform for publishing spatial \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ data and interactive mapping applications to the web.
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://mapserver.org
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites http://download.osgeo.org/mapserver
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://mapserver.org
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites https://download.osgeo.org/mapserver
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 690374d43a1b733c3b7acd73c37099d95554c599 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 237d83f84042fef8a63c590256aaa3bc1400668a470b52252fae197d9689e41c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 e1601b6d872c9f2cc757ddeee6dad13523809d2c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 79d23595ef95d61d3d728ae5e60850a3dbfbf58a46953b4fdc8e6e0ffe5748ba \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2950164
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:gd2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append \
</span> path:include/turbojpeg.h:libjpeg-turbo \
port:libpng \
port:freetype \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:giflib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:fribidi \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gdal \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:giflib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/cairo.pc:cairo \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:geos \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/harfbuzz.pc:harfbuzz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/harfbuzz-icu.pc:harfbuzz-icu \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:curl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libxml2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libiconv \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:protobuf-c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append cmakelist.diff python.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Optional components
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_GIF=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_MYSQL=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_FRIBIDI=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_HARFBUZZ=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_CAIRO=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_SVGCAIRO=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_RSVG=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_CURL=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_PIXMAN=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_LIBXML2=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_POSTGIS=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_GEOS=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_FCGI=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_PROTOBUFC=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_ORACLESPATIAL=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_ORACLE_PLUGIN=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_MSSQL2008=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_EXEMPI=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Optional features
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_KML=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_SOS=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_WMS=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_WFS=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_WCS=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_CLIENT_WMS=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_CLIENT_WFS=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_OGCAPI=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_ICONV=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_THREAD_SAFETY=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_XMLMAPFILE=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Mapscripts
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_PYTHON=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_PYMAPSCRIPT_ANNOTATIONS=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_PHPNG=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_PERL=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_RUBY=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_JAVA=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_CSHARP=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_XMLMAPFILE=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_V8=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default_variants +fastcgi +postgis
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# fix gd version check
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-configure.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --with-gd=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-png=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-zlib=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-jpeg=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-gif=${prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-default_variants +wms +gdal +ogr +proj +cairo +wfs +proj \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- +geos +postgis +wmsclient +wfsclient \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- +wcs +sos +kml +fastcgi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[variant_isset postgis]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # check for most recent version of postgresql installed
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set HAVE_PGCONFIG [llength [glob -nocomplain -d ${prefix}/lib postgresql*/bin/pg_config]]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # if not found, intall the postgresql port
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$HAVE_PGCONFIG == 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:postgresql96
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant fastcgi description {FastCGI support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:fcgi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -DWITH_FCGI=OFF -DWITH_FCGI=ON
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant postgis description {Add support for postgis sources} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set PGSQL_DIR [lindex [lsort -dec [glob -nocomplain -d ${prefix}/lib postgresql*]] 0]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append "--with-postgis=${PGSQL_DIR}/bin/pg_config"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant wms requires proj description {Add WMS server support} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Set Python variants
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_suffixes {36 37 38 39 310 311}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_variants {}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant wfs requires proj ogr geos description {Add WFS server support} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:libxml2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-wfs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach pyver ${python_suffixes} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend python_variants python${pyver}
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant sos requires proj ogr description {Add SOS server support} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:libxml2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-sos
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach pyver ${python_suffixes} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set index [lsearch -exact ${python_variants} python${pyver}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set py_dot_ver [string index ${pyver} 0].[string range ${pyver} 1 end]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set conf [lreplace ${python_variants} ${index} ${index}]
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant wcs requires proj gdal description {Add WCS server support} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-wcs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant python${pyver} description "Add Python MapScript for python${pyver}" conflicts {*}${conf} "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:swig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DPython_ROOT_DIR=${frameworks_dir}/Python.framework/Versions/${py_dot_ver}/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -DWITH_PYTHON=OFF -DWITH_PYTHON=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_PYMAPSCRIPT_ANNOTATIONS=OFF -DWITH_PYMAPSCRIPT_ANNOTATIONS=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace \"s|@PYTHONFRW@|${frameworks_dir}/Python.framework/Versions/${py_dot_ver}|\" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mapscript/python/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant wmsclient requires proj gdal description {Add WMS client support} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:curl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-wmsclient
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant kml description {Add KML output support} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-kml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant wfsclient requires proj ogr geos description {Add WFS client support} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:libxml2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:curl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-wfsclient
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Set PostGIS (and PostgreSQL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[variant_isset postgis]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # check for most recent version of postgresql installed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set HAVE_PGCONFIG [llength [glob -nocomplain -d ${prefix}/lib postgresql*/bin/pg_config]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # if not found, install the postgresql port
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$HAVE_PGCONFIG == 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:postgresql15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant cairo description {Add SVG and PDF support through cairo} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append path:lib/pkgconfig/cairo.pc:cairo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-cairo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant postgis description {Add support for postgis sources} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set PGSQL_LIB_DIR [lindex [lsort -dec [glob -nocomplain -d ${prefix}/lib postgresql*]] 0]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set PGSQL_INC_DIR [lindex [lsort -dec [glob -nocomplain -d ${prefix}/include postgresql*]] 0]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -DWITH_POSTGIS=OFF -DWITH_POSTGIS=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DPostgreSQL_INCLUDE_DIR=${PGSQL_INC_DIR} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPostgreSQL_LIBRARY_DIR=${PGSQL_LIB_DIR} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPostgreSQL_ADDITIONAL_VERSIONS=15
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant gdal description {Add GDAL input format support} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:gdal
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-gdal
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Set PROJ
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set proj_versions {6 7 8 9}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set proj_variants {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach pjver ${proj_versions} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend proj_variants proj${pjver}
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach proj_ver ${proj_versions} {
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant ogr description {Add OGR input format support} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:gdal
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-ogr
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set index [lsearch -exact ${proj_variants} proj${proj_ver}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set cflcts [lreplace ${proj_variants} ${index} ${index}]
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant proj description {Proj.4 reprojection support} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:proj4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-proj=${prefix}/lib/proj49
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant proj${proj_ver} description "Use Proj${proj_ver}" conflicts {*}${cflcts} "
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant fastcgi description {FastCGI support} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:fcgi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-fastcgi=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:proj${proj_ver}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DPROJ_INCLUDE_DIR=${prefix}/lib/proj${proj_ver}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPROJ_LIBRARY=${prefix}/lib/proj${proj_ver}/lib/libproj.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant geos description {Add GEOS operations support} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:geos
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-geos
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set projdf "if {"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach pv ${proj_versions} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set projdf "${projdf}!\[variant_isset proj${pv}\] && "
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set projdf [string range ${projdf} 0 end-4]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set projdf "${projdf}} { default_variants +proj${pv} }"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+eval ${projdf}
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Set Apache
</span> variant apache2 conflicts apache_apple description {Use MacPorts Apache 2} {
depends_run-append port:apache2
global cgi_path
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -140,6 +192,16 @@ post-destroot {
</span> move ${destroot}${prefix}/bin/mapserv ${destroot}${cgi_path}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+notes "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Using the default Apple Apache variant (+apache_apple) the CGI binary file
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+'mapserv' is installed in '/Library/WebServer/CGI-Executables/', otherwise
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+it is installed in '${prefix}/www/apache2/cgi-bin/'.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+A MapServer configure sample file is available at
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+'${prefix}/etc/mapserver-sample.conf', which you may copy to a location of your
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+choice and set its new path to the environment variable MAPSERVER_CONFIG_FILE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+(see https://mapserver.org/mapfile/config.html#config).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> livecheck.type regex
livecheck.url [lindex ${master_sites} 0]
livecheck.regex ${name}-(\[0-9.\]+)${extract.suffix}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/mapserver/files/cmakelist.diff b/gis/mapserver/files/cmakelist.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..454db1b3b93
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/mapserver/files/cmakelist.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fixed upstream with https://github.com/MapServer/MapServer/pull/6881
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig 2023-04-17 19:26:04.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2023-05-25 15:49:47.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1107,5 +1107,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FILES ${PROJECT_SOURCE_DIR}/etc/mapserver-sample.conf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/mapserver/files/patch-configure.diff b/gis/mapserver/files/patch-configure.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 37761caa279..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/mapserver/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-gd version checking code is wrong
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/mapserver/mapserver/issues/4696
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2013-04-19 23:08:49.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2013-07-10 21:32:55.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -17134,8 +17107,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if test $GDMAJOR -lt 2 -o $GDMINOR -lt 0 -o $GDREV -lt 28 ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ GDVERSION_NUM=`expr $GDMAJOR \* 1000000 \+ $GDMINOR \* 1000 \+ $GDREV`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ GDVERSION_REQ=`expr 2 \* 1000000 \+ 0 \* 1000 \+ 28`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if test $GDVERSION_NUM -lt $GDVERSION_REQ ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- as_fn_error $? "GD version $GDVERSION too old. need at least 2.0.28" "$LINENO" 5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/mapserver/files/python.diff b/gis/mapserver/files/python.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..bc71e975654
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/mapserver/files/python.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mapscript/python/CMakeLists.txt.orig 2023-05-31 15:58:37.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mapscript/python/CMakeLists.txt 2023-06-01 10:59:57.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -126,7 +126,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(DEFINED CMAKE_INSTALL_PREFIX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SET(PYTHON_PREFIX \"--prefix=\${CMAKE_INSTALL_PREFIX}\")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SET(PYTHON_PREFIX \"--prefix=@PYTHONFRW@\")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ execute_process(
</span></pre><pre style='margin:0'>
</pre>