<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a95edeaff7ce0c7c264a67e2893b90d986860c4e">https://github.com/macports/macports-ports/commit/a95edeaff7ce0c7c264a67e2893b90d986860c4e</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 a95edeaff7c tup: Update to 0.7.10
</span>a95edeaff7c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a95edeaff7ce0c7c264a67e2893b90d986860c4e
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Sun Nov 15 19:12:15 2020 -0600
<span style='display:block; white-space:pre;color:#404040;'> tup: Update to 0.7.10
</span>---
devel/tup/Portfile | 14 ++++----------
devel/tup/files/dont-force-clang.patch | 6 +++---
devel/tup/files/fix-version.patch | 16 ----------------
devel/tup/files/no-git-version.patch | 13 -------------
4 files changed, 7 insertions(+), 42 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/tup/Portfile b/devel/tup/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8b4c1a5b1e3..23edeb6ac42 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/tup/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/tup/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,11 +3,11 @@
</span> PortSystem 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup gittup tup 0.7.9 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup gittup tup 0.7.10 v
</span> revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 234a430d9a96ebe9599b1f8c7fab58317bfa7120 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 9b0951afaa749186eb55d88860405b2f6b3d88632d1b5df1ec4a0bf973d8d326 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 4645291
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 b7968f939f27ce5872aebd9bb59efe2a397b44fb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c80946bc772ae4a5170855e907c866dae5040620e81ee1a590223bdbdf65f0f8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 4651047
</span>
categories devel
platforms macosx
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,12 +33,6 @@ depends_lib port:osxfuse \
</span> port:libiconv
patchfiles-append dont-force-clang.patch
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append fix-version.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append no-git-version.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace s|@VERSION@|${version}|g ${worksrcpath}/src/tup/link.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
use_configure no
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/tup/files/dont-force-clang.patch b/devel/tup/files/dont-force-clang.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index e7f61bed529..d44b21432fd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/tup/files/dont-force-clang.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/tup/files/dont-force-clang.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> Don't force the use of clang. Instead, use the compiler MacPorts specified.
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- build.sh.orig 2020-06-08 18:11:53.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ build.sh 2020-06-14 17:26:47.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -34,7 +34,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- build.sh.orig 2020-10-11 14:23:10.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ build.sh 2020-11-15 19:09:48.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -45,7 +45,6 @@
</span> plat_files="$plat_files ../src/compat/dummy.c"
plat_files="$plat_files ../src/compat/clearenv.c "
plat_cflags="$plat_cflags -include ../src/compat/macosx.h"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/tup/files/fix-version.patch b/devel/tup/files/fix-version.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 9604718fd8f..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/tup/files/fix-version.patch
</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;'>-Fix version string.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/gittup/tup/issues/384
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/gittup/tup/commit/f9000d1ac10ec014cd3e6d9f6d665bd2bbdc2666
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- build.sh.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ build.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -77,8 +77,8 @@ echo " bootstrap CC $CFLAGS ../src/sqlite3/sqlite3.c"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $CC $CFLAGS -c ../src/sqlite3/sqlite3.c -DSQLITE_TEMP_STORE=2 -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION $plat_cflags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo " bootstrap LD tup $LDFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--echo "const char *tup_version(void) {return \"$label\";}" | $CC -x c -c - -o tup_version.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--$CC *.o -o tup -lpthread $plat_ldflags $LDFLAGS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+objs="$(echo *.o)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+../src/tup/link.sh "$CC" "$CFLAGS -I../src" "-lpthread $plat_ldflags $LDFLAGS" "tup" "$objs"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ "$server" = "ldpreload" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mkdir ldpreload
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/tup/files/no-git-version.patch b/devel/tup/files/no-git-version.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 60be3a66725..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/tup/files/no-git-version.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fix build to work when not in a git clone.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/gittup/tup/issues/398
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/tup/link.sh.orig 2020-06-08 18:11:53.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/tup/link.sh 2020-06-14 17:45:04.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4,7 +4,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # linking, so that the version is updated whenever we change anything that
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # affects the tup binary. This used to live in the Tupfile, but to support
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Windows local builds we need to make it an explicit shell script.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--version=`git describe`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+version=@VERSION@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CC=$1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS=$2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS=$3
</span></pre><pre style='margin:0'>
</pre>