4 files changed, 33 insertions, 3 deletions

diff --git a/devel/distcc/Makefile b/devel/distcc/Makefile
index 998b5e955a44..44bd56de9238 100644
--- a/devel/distcc/Makefile
+++ b/devel/distcc/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	distcc
-PORTVERSION=	2.6
+PORTVERSION=	2.7
 CATEGORIES=	devel
 MASTER_SITES=	http://distcc.samba.org/ftp/distcc/
 
@@ -16,20 +16,45 @@ COMMENT=	Distribute compilation of C(++) code acrosss machines on a network
 LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt
 
 PLIST_SUB+=	DOCSDIR=${DOCSDIR:S,${PREFIX}/,,}
+
+WANT_GNOME=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
 
+.include <bsd.port.pre.mk>
+
+.if ${HAVE_GNOME:Mlibgnomeui} != ""
+USE_GNOME=	libgnomeui
+CONFIGURE_ARGS+=	"--enable-gnome"
+PLIST_SUB+=	WITH_GNOME=""
+.else
+PLIST_SUB+=	WITH_GNOME="@comment "
+.endif
+
 MAN1=	distcc.1 distccd.1
 DOC_FILES=	AUTHORS COPYING COPYING.FDL DEPENDENCIES INSTALL NEWS README \
 		linuxdoc/distcc.sgml doc/protocol-1.txt doc/status-1.txt
 HTML_DOC_FILES=	distcc.html distcc-1.html distcc-2.html distcc-3.html \
 		distcc-4.html distcc-5.html
 
+pre-fetch:
+.if !defined(WITHOUT_GNOME)
+	@${ECHO_MSG} "Building with GNOME-based monitor. To disabled this, press"
+	@${ECHO_MSG} "Ctrl+C now and restart with 'make WITHOUT_GNOME=yes'."
+	@${ECHO_MSG} ""
+.else
+	@${ECHO_MSG} "Disabled GNOME-based monitor."
+	@${ECHO_MSG} ""
+.endif
+
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/distcc ${PREFIX}/bin
 	@${INSTALL_PROGRAM} ${WRKSRC}/distccmon-text ${PREFIX}/bin
+.if !defined(WITHOUT_GNOME)
+	@${INSTALL_PROGRAM} ${WRKSRC}/distccmon-gnome ${PREFIX}/bin
+.endif
 	@${INSTALL_PROGRAM} ${WRKSRC}/distccd ${PREFIX}/sbin
 
 post-install: install-doc install-html-doc install-man
@@ -56,4 +81,4 @@ install-man:
 	@${INSTALL_MAN} ${WRKSRC}/man/${file} ${MANPREFIX}/man/man1
 .endfor
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/devel/distcc/distinfo b/devel/distcc/distinfo
index 2de8fcb618b9..8bbaaf1c14b2 100644
--- a/devel/distcc/distinfo
+++ b/devel/distcc/distinfo
@@ -1 +1 @@
-MD5 (distcc-2.6.tar.bz2) = 022b0d968e2bdf51acca23258979ce58
+MD5 (distcc-2.7.tar.bz2) = 7f367102fb645b769368b901ec57e159
diff --git a/devel/distcc/pkg-descr b/devel/distcc/pkg-descr
index a2f87e3fc789..f38b8f5702c7 100644
--- a/devel/distcc/pkg-descr
+++ b/devel/distcc/pkg-descr
@@ -14,6 +14,10 @@ for each job, so all it requires of the volunteer machines is that
 they be running the distccd daemon, and that they have an appropriate
 compiler installed.
 
+This version also comes with a text-based as well as a GNOME-based monitor
+to inspect the load on the cluster, and how it is distributed among the
+various distcc nodes.
+
 WWW: http://distcc.samba.org/
 
 - Frerich Raabe frerich.raabe@gmx.de
diff --git a/devel/distcc/pkg-plist b/devel/distcc/pkg-plist
index beb3a24f0f30..cf79849dc380 100644
--- a/devel/distcc/pkg-plist
+++ b/devel/distcc/pkg-plist
@@ -1,5 +1,6 @@
 bin/distcc
 bin/distccmon-text
+%%WITH_GNOME%%bin/distccmon-gnome
 sbin/distccd
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING