diff options
| author | amdmi3 <amdmi3@FreeBSD.org> | 2016-03-28 00:46:11 +0000 |
|---|---|---|
| committer | amdmi3 <amdmi3@FreeBSD.org> | 2016-03-28 00:46:11 +0000 |
| commit | 844efc21e423108e91f00c9c6e8ab153686f821b (patch) | |
| tree | 400227a04dc9d24e4ebdbf1987499f0de3dcf507 | |
| parent | 97fc4abe2cad2a621183aee00f8bad2b5c92288b (diff) | |
| download | FreeBSD-ports-844efc21e423108e91f00c9c6e8ab153686f821b.zip FreeBSD-ports-844efc21e423108e91f00c9c6e8ab153686f821b.tar.gz | |
- Fix incorrect df command invocation which makes the port unusable
- While here, silence patching and clean up pkg-descr
PR: 207190
Submitted by: kalten@gmx.at
| -rw-r--r-- | x11-fm/xdiskusage/Makefile | 5 | ||||
| -rw-r--r-- | x11-fm/xdiskusage/files/patch-xdiskusage.C | 12 | ||||
| -rw-r--r-- | x11-fm/xdiskusage/pkg-descr | 2 |
3 files changed, 15 insertions, 4 deletions
diff --git a/x11-fm/xdiskusage/Makefile b/x11-fm/xdiskusage/Makefile index 9890437..728ba25 100644 --- a/x11-fm/xdiskusage/Makefile +++ b/x11-fm/xdiskusage/Makefile @@ -3,6 +3,7 @@ PORTNAME= xdiskusage PORTVERSION= 1.51 +PORTREVISION= 1 CATEGORIES= x11-fm MASTER_SITES= http://xdiskusage.sourceforge.net/ \ http://www.gnu-darwin.org/distfiles/ @@ -20,9 +21,9 @@ LDFLAGS+= `fltk-config --ldflags` PLIST_FILES= bin/xdiskusage man/man1/xdiskusage.1.gz post-patch: - ${REINPLACE_CMD} -e '/^configure:/d; /autoconf/d' \ + @${REINPLACE_CMD} -e '/^configure:/d; /autoconf/d' \ ${WRKSRC}/Makefile - ${REINPLACE_CMD} -e '/@CXXFLAGS@/s|$$| ${CXXFLAGS}|' \ + @${REINPLACE_CMD} -e '/@CXXFLAGS@/s|$$| ${CXXFLAGS}|' \ ${WRKSRC}/makeinclude.in do-install: diff --git a/x11-fm/xdiskusage/files/patch-xdiskusage.C b/x11-fm/xdiskusage/files/patch-xdiskusage.C new file mode 100644 index 0000000..f80eb72 --- /dev/null +++ b/x11-fm/xdiskusage/files/patch-xdiskusage.C @@ -0,0 +1,12 @@ +--- xdiskusage.C.orig 2015-02-10 00:29:18.000000000 +0100 ++++ xdiskusage.C 2016-02-14 11:57:10.798244000 +0100 +@@ -28,6 +28,9 @@ + #elif defined(__bsdi__) + # define DF_COMMAND "df" + # define DU_COMMAND "du -x" ++#elif defined(__FreeBSD__) ++# define DF_COMMAND "df -k -t noprocfs,devfs,fdescfs" ++# define DU_COMMAND "du -kx" + #elif defined(SVR4) || defined(__sun) + # define DF_COMMAND "/bin/df -k" + # define DU_COMMAND "/bin/du -kd" diff --git a/x11-fm/xdiskusage/pkg-descr b/x11-fm/xdiskusage/pkg-descr index cf5b37a..fb3ebe9 100644 --- a/x11-fm/xdiskusage/pkg-descr +++ b/x11-fm/xdiskusage/pkg-descr @@ -5,5 +5,3 @@ tree, or back out, by clicking on the graph. If you save the output of "du" in a file, xdiskusage can analyze that too. PostScript output is available. WWW: http://xdiskusage.sourceforge.net/ - -Trevor Johnson |
