<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/37a1934aa4b28b91fa8c5e3c4dfbe7e54ba2ee21">https://github.com/macports/macports-ports/commit/37a1934aa4b28b91fa8c5e3c4dfbe7e54ba2ee21</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 37a1934aa4b tinyows: update to version 1.2.0
</span>37a1934aa4b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 37a1934aa4b28b91fa8c5e3c4dfbe7e54ba2ee21
</span>Author: nilason <n_larsson@yahoo.com>
AuthorDate: Fri Jun 2 20:56:21 2023 +0200
<span style='display:block; white-space:pre;color:#404040;'> tinyows: update to version 1.2.0
</span>---
gis/tinyows/Portfile | 48 ++++++++++++-----------
gis/tinyows/files/patch-Makefile_in.diff | 64 +++----------------------------
gis/tinyows/files/patch-ows_define_h.diff | 10 ++---
3 files changed, 37 insertions(+), 85 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/tinyows/Portfile b/gis/tinyows/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6db1bc3d332..8ed267cd184 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/tinyows/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/tinyows/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,47 +3,51 @@
</span> PortSystem 1.0
name tinyows
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.2.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> maintainers nomaintainer
categories gis
license GPL-2+
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span>
description TinyOWS is a small footprint WFS server
long_description TinyOWS is a WFS server part of MapServer that can be installed in a\
standalone configuration using FastCGI.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://mapserver.osgeo.org/tinyows
</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:#ffe0e0;'>-extract.suffix .tar.bz2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://mapserver.osgeo.org/tinyows
</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 9a929be2bb1856be7a38b0d80bb9650cc2799bff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 c9b6bec5c8c0302bd9c89c3d55df7b11efd194f1fd3d40ec50edbe3b9c24ab77
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 e9ee918d07791e596fbccf5f06f22966b93e489e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 96e40afc7543e9bf31f266f600788acb62e617c1fa26c446cb0205a4ec74b563 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1278980
</span>
patchfiles patch-Makefile_in.diff \
patch-ows_define_h.diff
depends_lib port:libxml2 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:postgresql10 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:postgis2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:postgresql15 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:postgis3 \
</span> port:fcgi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:flex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build port:autoconf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:flex
</span>
configure.args --with-xml2-config=${prefix}/bin/xml2-config \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-pg_config=${prefix}/lib/postgresql10/bin/pg_config \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-shp2pgsql=${prefix}/lib/postgresql10/bin/pg_config \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-fastcgi=${prefix}/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Insert ${prefix} in configuration file
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -E "s|PREFIX|${prefix}|" ${worksrcpath}/src/ows_define.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-pg_config=${prefix}/lib/postgresql15/bin/pg_config \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-shp2pgsql=${prefix}/lib/postgresql15/bin/pg_config \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-fastcgi=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+pre-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "mv ${worksrcpath}/configure.in ${worksrcpath}/configure.ac"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "cd ${worksrcpath} && autoupdate"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "cd ${worksrcpath} && ./autogen.sh"
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-notes "A demo configuration file has been copied into ${prefix}/etc\n" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "Edit it according to your needs.\n" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "Copy or link tinyows from ${prefix}/bin to your Fast CGI directory."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+notes "A demo configuration file has been copied into '${prefix}/etc/tinyows.xml'." \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "Edit it, and/or copy to location of your choise, according to your needs." \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "Set its path to environment variable TINYOWS_CONFIG_FILE" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "(see https://mapserver.org/tinyows/configfile.html)." \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "Copy or link '${prefix}/bin/tinyows' to your Fast CGI directory."
</span>
livecheck.type regex
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url http://download.osgeo.org/mapserver
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex tinyows-1(\[0-9.\]+)${extract.suffix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.url https://download.osgeo.org/mapserver
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex tinyows-(\[0-9.\]+)${extract.suffix}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/tinyows/files/patch-Makefile_in.diff b/gis/tinyows/files/patch-Makefile_in.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 6a3252e9254..e0ca180e472 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/tinyows/files/patch-Makefile_in.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/tinyows/files/patch-Makefile_in.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,69 +1,17 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.in.orig 2017-10-09 15:11:34.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile.in 2017-10-09 15:13:50.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -28,61 +28,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(CC) -o tinyows $(SRC) $(XMLFLAGS) $(CFLAGS) $(PGFLAGS) $(FCGIFLAGS) $(GIT_FLAGS) -lfl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @rm -rf tinyows.dSYM
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--flex:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- lex -i -osrc/mapfile/mapfile.c src/mapfile/mapfile.l
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--svn-clean: clean doc-clean
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- @find . -name '*~' -exec rm {} \;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- @rm -f configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--clean:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- @rm -f tinyows Makefile src/ows_define.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- @rm -rf tinyows.dSYM
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- @rm -f demo/tinyows.xml demo/install.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- @rm -f test/tinyows.xml test/install.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.in.orig 2021-06-11 17:17:18.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile.in 2023-06-02 19:44:57.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -44,9 +44,11 @@
</span> install:
@echo "-----"
@echo "TinyOWS Schema install dir in $(PREFIX)/share/tinyows/schema"
- mkdir -p $(PREFIX)/share/tinyows
- rm -rf $(PREFIX)/share/tinyows/schema
- cp -rf schema $(PREFIX)/share/tinyows/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- @echo "-----"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- @echo "Now:"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- @echo " 1) copy 'tinyows' binary to cgi-bin directory"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- @echo " 2) - put a workable tinyows.xml file in /etc dir"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- @echo " - OR launch 'make install-demo' as a superuser"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--install-demo:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- @chmod +x demo/install.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- @demo/install.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cp -i demo/tinyows.xml /etc/tinyows.xml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--install-test100:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- @chmod +x test/wfs_100/install_wfs_100.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- @test/wfs_100/install_wfs_100.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cp -i test/wfs_100/config_wfs_100.xml /etc/tinyows.xml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--install-test110:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- @chmod +x test/wfs_110/install_wfs_110.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- @test/wfs_110/install_wfs_110.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cp -i test/wfs_110/config_wfs_110.xml /etc/tinyows.xml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--doc-clean:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- @rm -rf doc/doxygen
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--doxygen: doc-clean
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- @(which doxygen 2> /dev/null > /dev/null \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- && mkdir -p doc/doxygen \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- && doxygen doc/Doxyfile \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ) || echo "doxygen seems not installed"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--test-valgrind110:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- @test/unit_test test/wfs_110/cite 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--test-valgrind100:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- @test/unit_test test/wfs_100/cite 1
</span> + mkdir -p $(DESTDIR)$(PREFIX)/bin
+ cp tinyows $(DESTDIR)$(PREFIX)/bin
+ mkdir -p $(DESTDIR)$(PREFIX)/share/tinyows
+ cp -rf schema $(DESTDIR)$(PREFIX)/share/tinyows/
+ cp -i demo/tinyows.xml $(DESTDIR)$(PREFIX)/etc/tinyows.xml
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--astyle:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- astyle --style=k/r --indent=spaces=2 -c --lineend=linux -S $(SRC) src/*.h*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- rm -f src/*.orig src/*/*.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @echo "-----"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @echo "Now:"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @echo " 1) copy 'tinyows' binary to cgi-bin directory"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/tinyows/files/patch-ows_define_h.diff b/gis/tinyows/files/patch-ows_define_h.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index e60a13df21c..02a6d74ed3d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/tinyows/files/patch-ows_define_h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/tinyows/files/patch-ows_define_h.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/ows_define.h.in.orig 2017-10-09 14:48:35.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/ows_define.h.in 2017-10-09 14:48:54.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/ows_define.h.in.orig 2021-06-11 17:17:18.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/ows_define.h.in 2023-06-02 20:32:34.000000000 +0200
</span> @@ -31,7 +31,7 @@
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #define TINYOWS_VERSION "1.1.0"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define TINYOWS_FCGI @FAST_CGI@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define TINYOWS_VERSION "1.2.0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define TINYOWS_FCGI @USE_FCGI@
</span>
-#define OWS_CONFIG_FILE_PATH "/etc/tinyows.xml"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define OWS_CONFIG_FILE_PATH "PREFIX/etc/tinyows.xml"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define OWS_CONFIG_FILE_PATH "@prefix@/etc/tinyows.xml"
</span>
#define WFS_SCHEMA_100 "wfs/1.0.0/WFS-transaction.xsd"
#define WFS_SCHEMA_110 "wfs/1.1.0/wfs.xsd"
</pre><pre style='margin:0'>
</pre>