<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/7c04b33b19126aadd359729d1cdb0289e53f677b">https://github.com/macports/macports-ports/commit/7c04b33b19126aadd359729d1cdb0289e53f677b</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 7c04b33b191 fpm: update to 0.18.1
</span>7c04b33b191 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7c04b33b19126aadd359729d1cdb0289e53f677b
</span>Author: Sergey Fedorov <vital.had@gmail.com>
AuthorDate: Sat Apr 15 16:12:48 2023 +0800
<span style='display:block; white-space:pre;color:#404040;'> fpm: update to 0.18.1
</span>---
devel/fpm/Portfile | 13 +++++++------
devel/fpm/files/patch-filesystem_utilities.diff | 11 -----------
devel/fpm/files/patch-install.diff | 16 ++++++----------
3 files changed, 13 insertions(+), 27 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/fpm/Portfile b/devel/fpm/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b8b30430de9..8984b6f6ae8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/fpm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/fpm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup compiler_blacklist_versions 1.0
</span> PortGroup compilers 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup fortran-lang fpm 0.7.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup fortran-lang fpm 0.8.1 v
</span> revision 0
categories devel fortran
license MIT
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,9 +17,9 @@ long_description Fortran Package Manager (fpm) is a package manager and build
</span> run the executables, tests and examples, and distribute it as a dependency \
to other Fortran projects.
homepage https://fpm.fortran-lang.org
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 3c0cc8372231118277f4bd6d280f14c576dfe6ab \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 f8d6c469bfdbecb1fbed5c5f182dcd76bc052fe6a1c485e3e7e076515ab48f52 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 169451
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 9b35a73c5b93e2a7c3b151d51b39a424ca11ad67 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 e4fc06bc8200ed864cb20ce7a7f455f319cfad8540dbdce98977a3e953e69a0b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 194850
</span>
depends_build-append \
port:curl
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,13 +39,14 @@ platform darwin {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-install.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-filesystem_utilities.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-install.diff
</span>
post-patch {
reinplace "s,@FC@,${configure.fc}," ${worksrcpath}/install.sh
reinplace "s,@PREFIX@,${worksrcpath}${prefix}," ${worksrcpath}/install.sh
reinplace "s,@VERSION@,${version},g" ${worksrcpath}/install.sh
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file attributes ${worksrcpath}/install.sh -permissions +x
</span> }
# Xcode clang of 10.7 fails with error: invalid instruction mnemonic 'cvtsi2ssl'
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/fpm/files/patch-filesystem_utilities.diff b/devel/fpm/files/patch-filesystem_utilities.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 31457aad664..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/fpm/files/patch-filesystem_utilities.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/filesystem_utilities.c.orig 2022-10-26 23:35:59.000000000 +0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/filesystem_utilities.c 2023-01-07 02:27:18.000000000 +0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <sys/stat.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <dirent.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if defined(__APPLE__) && !defined(__aarch64__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(__APPLE__) && !defined(__aarch64__) && !defined(__POWERPC__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DIR * opendir$INODE64( const char * dirName );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct dirent * readdir$INODE64( DIR * dir );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define opendir opendir$INODE64
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/fpm/files/patch-install.diff b/devel/fpm/files/patch-install.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 0fbb8afa2f8..0341d113436 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/fpm/files/patch-install.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/fpm/files/patch-install.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- install.sh.orig 2022-10-26 23:35:59.000000000 +0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ install.sh 2023-01-07 05:26:38.000000000 +0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -18,7 +18,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- install.sh.orig 2023-04-12 21:20:20.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ install.sh 2023-04-15 16:46:33.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -40,7 +40,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sed -E 's/^v//' # Remove heading "v" if present
</span> }
-PREFIX="$HOME/.local"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,13 +9,9 @@
</span>
while [ "$1" != "" ]; do
PARAM=$(echo "$1" | awk -F= '{print $1}')
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -42,10 +42,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set -u # error on use of undefined variable
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--SOURCE_URL="https://github.com/fortran-lang/fpm/releases/download/v0.6.0/fpm-0.6.0.F90"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+SOURCE_URL="https://github.com/fortran-lang/fpm/releases/download/v@VERSION@/fpm-@VERSION@.F90"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -82,7 +82,7 @@
</span> BOOTSTRAP_DIR="build/bootstrap"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if [ -z ${FC+x} ]; then
- FC="gfortran"
+ FC=@FC@
</pre><pre style='margin:0'>
</pre>