<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/a314cf13419efd539550e8f98a71b829ff56b0df">https://github.com/macports/macports-ports/commit/a314cf13419efd539550e8f98a71b829ff56b0df</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 a314cf13419 xdiskusage: Update to 1.52
</span>a314cf13419 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a314cf13419efd539550e8f98a71b829ff56b0df
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Fri Jun 26 07:58:40 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> xdiskusage: Update to 1.52
</span>---
x11/xdiskusage/Portfile | 15 ++++++--------
x11/xdiskusage/files/freebsd.patch | 19 ------------------
x11/xdiskusage/files/macos.patch | 19 ------------------
.../files/use-CXXFLAGS-and-LDFLAGS.patch | 23 ----------------------
4 files changed, 6 insertions(+), 70 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xdiskusage/Portfile b/x11/xdiskusage/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7af6a6ab8dd..2028e20144d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xdiskusage/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/xdiskusage/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,11 +4,11 @@ PortSystem 1.0
</span> PortGroup app 1.0
name xdiskusage
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.51
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.52
</span> revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 045053280ee51a35e7276add67ab30caa04e8686 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 6fb2447f311299f9cb949f6954b333371209f7d53dd6a58700a679a1001089c6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 54248
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 29d28f67be0cfc340978fc7f3d56a9e751b25f88 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 eb17f1177c933b8b764ad8b3cad0ec97501d69dde9117ce2a7c759eb60ecb2c7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 54458
</span>
categories x11
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,7 +16,7 @@ maintainers {ryandesign @ryandesign} openmaintainer
</span> license GPL-2+
description program to show you what is using up all your disk space
<span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description ${description}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description ${name} is a {*}${description}.
</span>
homepage http://xdiskusage.sourceforge.net/
master_sites ${homepage}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,10 +24,7 @@ extract.suffix .tgz
</span>
depends_lib path:lib/libfltk.dylib:fltk
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles dont-override-CFLAGS-and-CXXFLAGS.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- freebsd.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- macos.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- use-CXXFLAGS-and-LDFLAGS.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles dont-override-CFLAGS-and-CXXFLAGS.patch
</span>
# We patch configure.in so:
use_autoreconf yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xdiskusage/files/freebsd.patch b/x11/xdiskusage/files/freebsd.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index cd9856d2176..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xdiskusage/files/freebsd.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,19 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Use a different set of flags when invoking df on FreeBSD.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://sourceforge.net/p/xdiskusage/git/ci/275754ad0a24716d86da1aaaf452b0906211e859/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- xdiskusage.C.orig 2015-02-09 17:29:18.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ xdiskusage.C 2020-06-18 18:11:19.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -28,10 +28,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif defined(__bsdi__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # define DF_COMMAND "df"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # define DU_COMMAND "du -x"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#elif defined(__FreeBSD__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# define DF_COMMAND "df -k -t noprocfs,devfs,fdescfs"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# define DU_COMMAND "du -kx"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif defined(SVR4) || defined(__sun)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # define DF_COMMAND "/bin/df -k"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # define DU_COMMAND "/bin/du -kd"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#else // linux and irix
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else // linux
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # define DF_COMMAND "df -k -x usbfs -x tmpfs"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # define DU_COMMAND "du -kx"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xdiskusage/files/macos.patch b/x11/xdiskusage/files/macos.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 73131103f7e..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xdiskusage/files/macos.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,19 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Use the same df flags on macOS as on FreeBSD and add the -P flag to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-suppress printing the inode columns. In recent versions of macOS df
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-prints the inode columns by default but xdiskusage relies on the output
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-of df having a certain number of columns and does not expect the inode
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-columns to be present.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://sourceforge.net/p/xdiskusage/bugs/26/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- xdiskusage.C.orig 2020-06-18 18:15:39.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ xdiskusage.C 2020-06-18 18:16:00.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -28,8 +28,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif defined(__bsdi__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # define DF_COMMAND "df"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # define DU_COMMAND "du -x"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#elif defined(__FreeBSD__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# define DF_COMMAND "df -k -t noprocfs,devfs,fdescfs"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#elif defined(__FreeBSD__) || defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# define DF_COMMAND "df -P -k -t noprocfs,devfs,fdescfs"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # define DU_COMMAND "du -kx"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif defined(SVR4) || defined(__sun)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # define DF_COMMAND "/bin/df -k"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xdiskusage/files/use-CXXFLAGS-and-LDFLAGS.patch b/x11/xdiskusage/files/use-CXXFLAGS-and-LDFLAGS.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 2d2cfd6348f..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xdiskusage/files/use-CXXFLAGS-and-LDFLAGS.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,23 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Honor LDFLAGS, and use CXXFLAGS when linking so that the right C++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-standard library is used.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://sourceforge.net/p/xdiskusage/bugs/25/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.orig 2015-02-09 17:12:19.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile 2018-12-07 10:15:52.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -17,7 +17,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- all: $(PROGRAM)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(PROGRAM) : $(OBJECTS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(CXX) -o $(PROGRAM) $(OBJECTS) `fltk-config --ldflags`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(CXX) -o $(PROGRAM) $(OBJECTS) `fltk-config --ldflags` $(CXXFLAGS) $(LDFLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure: configure.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- autoconf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- makeinclude.in.orig 2014-11-20 15:20:11.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ makeinclude.in 2018-12-07 10:06:58.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -22,4 +22,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXXFLAGS_D =@CXXFLAGS_D@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # libraries to link with:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LDFLAGS =@LDFLAGS@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INSTALL =@INSTALL@
</span></pre><pre style='margin:0'>
</pre>