<pre style='margin:0'>
ra1nb0w (ra1nb0w) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a9717e8524e336831d87ff0df601c21fc2fc61b2">https://github.com/macports/macports-ports/commit/a9717e8524e336831d87ff0df601c21fc2fc61b2</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit a9717e8524e336831d87ff0df601c21fc2fc61b2
</span>Author: Davide Gerhard <ra1nb0w@macports.org>
AuthorDate: Sun Dec 5 14:41:49 2021 +0100
<span style='display:block; white-space:pre;color:#404040;'> xastir: update version to 2.1.8
</span>---
science/xastir/Portfile | 39 ++++++++++++++--------------
science/xastir/files/patch-bootstrap.sh.diff | 9 -------
science/xastir/files/patch-configure.ac.diff | 16 +++++++-----
3 files changed, 28 insertions(+), 36 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/xastir/Portfile b/science/xastir/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4e54d7d7f4a..45af0ee2340 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/xastir/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/xastir/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,24 +1,23 @@
</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 github 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup app 1.0
</span>
name xastir
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.0.8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 7
</span> categories science
license GPL-2+
platforms darwin
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> description Amateur Radio APRS tracking software
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> long_description ${description}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> homepage http://www.xastir.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites sourceforge:project/xastir/xastir-stable/xastir-${version}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 2024eaaf1812113c088b601c996da0e768c531fe \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 775db0e3c4355051a9030b8398a1d995d48b3b721fa1c9bce5e3010300c1ebb6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup Xastir Xastir 2.1.8 Release-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 8e32480f5bd43d262d3ca2153fb69c492273ad25 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 8b010e0ae665c1dd5f83c609940b6b8b56ad0f777bac0f637f599311111bf973 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2222069
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span>
depends_build port:autoconf \
port:automake \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,26 +32,26 @@ depends_lib port:xorg-libXp \
</span> port:ImageMagick \
port:gdal \
port:pcre \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:db46 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:db48 \
</span> port:tiff \
port:proj4 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:shapelib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:shapelib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:curl
</span>
patchfiles patch-acinclude.m4.diff \
patch-bootstrap.sh.diff \
patch-configure.ac.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/bootstrap.sh
</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;'>-pre-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath} "sh ./bootstrap.sh"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_autoconf yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+autoconf.cmd ./bootstrap.sh
</span>
configure.args --without-graphicsmagick
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cppflags-append -I${prefix}/include/db46
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.ldflags-append -L${prefix}/lib/db46
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cppflags-append -I${prefix}/include/db48
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.ldflags-append -L${prefix}/lib/db48
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex /${name}-(\[0-9.\]+)/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+app.create yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+app.name Xastir
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+app.executable xastir
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+app.icon symbols/icon.png
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+app.retina yes
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/xastir/files/patch-bootstrap.sh.diff b/science/xastir/files/patch-bootstrap.sh.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index c1270d1faf2..8c63214b758 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/xastir/files/patch-bootstrap.sh.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/xastir/files/patch-bootstrap.sh.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +1,5 @@
</span> --- bootstrap.sh.orig 2010-01-30 20:12:23.000000000 -0600
+++ bootstrap.sh 2011-09-29 01:26:04.000000000 -0500
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -34,7 +34,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo " 2) Checking for 'mkinstalldirs'... Not Found"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo " Attempting to copy it from system directories'"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (cp /usr/local/share/automake*/mkinstalldirs . 2>/dev/null)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (cp @PREFIX@/share/automake*/mkinstalldirs . 2>/dev/null)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Did we succeed?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ $? ]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- then
</span> @@ -52,15 +52,15 @@
fi
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/xastir/files/patch-configure.ac.diff b/science/xastir/files/patch-configure.ac.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 5df8ac133bc..fbb3d69c01a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/xastir/files/patch-configure.ac.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/xastir/files/patch-configure.ac.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.ac.orig 2010-10-25 22:02:22.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.ac 2011-09-29 01:56:47.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -673,19 +673,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git configure.ac configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 687bbe91..2aba2da7 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -669,19 +669,6 @@ fi
</span> #
LIBS=" -lXm -lXt -lX11 $LIBS"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,12 +22,12 @@
</span>
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -926,7 +913,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -900,7 +887,7 @@ echo
</span> echo RECOMMENDED OPTIONS:
<span style='display:block; white-space:pre;background:#ffe0e0;'>--echo -n " GraphicsMagick/ImageMagick (Raster maps) : "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+printf " GraphicsMagick/ImageMagick (Raster maps) : "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo " Xpm / Snapshots ........................... : $use_xpm"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-echo -n " GraphicsMagick/ImageMagick (Raster maps) .. : "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++printf " GraphicsMagick/ImageMagick (Raster maps) .. : "
</span> if test "${use_graphicsmagick}" = "yes"; then
echo "yes (GraphicsMagick)"
else
</pre><pre style='margin:0'>
</pre>