diff -ruN distcc.orig/Makefile distcc/Makefile --- distcc.orig/Makefile Mon Jun 16 13:01:09 2003 +++ distcc/Makefile Mon Jun 16 15:03:50 2003 @@ -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 @@ 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} ${WRKSRC}/man/${file} ${MANPREFIX}/man/man1 .endfor -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff -ruN distcc.orig/distinfo distcc/distinfo --- distcc.orig/distinfo Mon Jun 16 13:01:09 2003 +++ distcc/distinfo Mon Jun 16 13:02:20 2003 @@ -1 +1 @@ -MD5 (distcc-2.6.tar.bz2) = 022b0d968e2bdf51acca23258979ce58 +MD5 (distcc-2.7.tar.bz2) = 7f367102fb645b769368b901ec57e159 diff -ruN distcc.orig/files/patch-src::mon-gnome.c distcc/files/patch-src::mon-gnome.c --- distcc.orig/files/patch-src::mon-gnome.c Thu Jan 1 01:00:00 1970 +++ distcc/files/patch-src::mon-gnome.c Mon Jun 16 13:35:18 2003 @@ -0,0 +1,11 @@ +--- src/mon-gnome.c.orig Mon Jun 16 13:34:03 2003 ++++ src/mon-gnome.c Mon Jun 16 13:34:12 2003 +@@ -33,8 +33,6 @@ + + #include "config.h" + +-#include <stdint.h> +- + #include <stdio.h> + #include <stdlib.h> + #include <string.h> diff -ruN distcc.orig/pkg-descr distcc/pkg-descr --- distcc.orig/pkg-descr Mon Jun 16 13:01:09 2003 +++ distcc/pkg-descr Mon Jun 16 13:47:26 2003 @@ -14,6 +14,10 @@ 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 -ruN distcc.orig/pkg-plist distcc/pkg-plist --- distcc.orig/pkg-plist Mon Jun 16 13:01:09 2003 +++ distcc/pkg-plist Mon Jun 16 13:36:11 2003 @@ -1,5 +1,6 @@ bin/distcc bin/distccmon-text +%%WITH_GNOME%%bin/distccmon-gnome sbin/distccd %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/COPYING