aboutsummaryrefslogtreecommitdiff
path: root/x11-fm
diff options
context:
space:
mode:
authorDmitry Marakasov <amdmi3@FreeBSD.org>2016-03-28 00:46:11 +0000
committerDmitry Marakasov <amdmi3@FreeBSD.org>2016-03-28 00:46:11 +0000
commitbba35900f7087a5dc76f1f8095788f645a385ca7 (patch)
tree400227a04dc9d24e4ebdbf1987499f0de3dcf507 /x11-fm
parent4fb428a895de300a5d7c8b4a03d9e21d5953a637 (diff)
downloadports-bba35900f7087a5dc76f1f8095788f645a385ca7.tar.gz
ports-bba35900f7087a5dc76f1f8095788f645a385ca7.zip
- 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
Notes
Notes: svn path=/head/; revision=412024
Diffstat (limited to 'x11-fm')
-rw-r--r--x11-fm/xdiskusage/Makefile5
-rw-r--r--x11-fm/xdiskusage/files/patch-xdiskusage.C12
-rw-r--r--x11-fm/xdiskusage/pkg-descr2
3 files changed, 15 insertions, 4 deletions
diff --git a/x11-fm/xdiskusage/Makefile b/x11-fm/xdiskusage/Makefile
index 9890437f5890..728ba2582a70 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 000000000000..f80eb725995e
--- /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 cf5b37abb140..fb3ebe96c6ba 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