Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 28 Mar 2016 00:46:12 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r412024 - in head/x11-fm/xdiskusage: . files
Message-ID:  <201603280046.u2S0kCVj045480@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Mon Mar 28 00:46:11 2016
New Revision: 412024
URL: https://svnweb.freebsd.org/changeset/ports/412024

Log:
  - 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

Added:
  head/x11-fm/xdiskusage/files/
  head/x11-fm/xdiskusage/files/patch-xdiskusage.C   (contents, props changed)
Modified:
  head/x11-fm/xdiskusage/Makefile
  head/x11-fm/xdiskusage/pkg-descr

Modified: head/x11-fm/xdiskusage/Makefile
==============================================================================
--- head/x11-fm/xdiskusage/Makefile	Mon Mar 28 00:35:00 2016	(r412023)
+++ head/x11-fm/xdiskusage/Makefile	Mon Mar 28 00:46:11 2016	(r412024)
@@ -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:

Added: head/x11-fm/xdiskusage/files/patch-xdiskusage.C
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11-fm/xdiskusage/files/patch-xdiskusage.C	Mon Mar 28 00:46:11 2016	(r412024)
@@ -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"

Modified: head/x11-fm/xdiskusage/pkg-descr
==============================================================================
--- head/x11-fm/xdiskusage/pkg-descr	Mon Mar 28 00:35:00 2016	(r412023)
+++ head/x11-fm/xdiskusage/pkg-descr	Mon Mar 28 00:46:11 2016	(r412024)
@@ -5,5 +5,3 @@ tree, or back out, by clicking on the gr
 a file, xdiskusage can analyze that too.  PostScript output is available.
 
 WWW: http://xdiskusage.sourceforge.net/
-
-Trevor Johnson



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603280046.u2S0kCVj045480>