ports/57743: [update] devel/distcc: Update to 2.11.1

[Clement Laforet]

>Number:         57743
>Category:       ports
>Synopsis:       [update] devel/distcc: Update to 2.11.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Oct 08 06:30:02 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Clement Laforet
>Release:        FreeBSD 5.1-CURRENT i386
>Organization:
>Environment:
System: FreeBSD lucifer.cultdeadsheep.org 5.1-CURRENT FreeBSD 5.1-CURRENT #0: Mon Sep 22 08:20:10 CEST 2003 clement at lucifer.cultdeadsheep.org:/usr/obj/usr/src/sys/LUCIFER i386


	
>Description:
	- Update distcc to 2.11.1
	- add WITH_GNOME and WITH_GTK and get rid of GNOME autodetection
	- use pre-everything::
	- removed file: 
		* files/patch-src::state.h

>How-To-Repeat:
	N/A
>Fix:

	

--- distcc.diff begins here ---
Index: distcc/Makefile
===================================================================
RCS file: /WORK/REPO/ports/devel/distcc/Makefile,v
retrieving revision 1.30
diff -u -r1.30 Makefile
--- distcc/Makefile	27 Sep 2003 15:56:26 -0000	1.30
+++ distcc/Makefile	8 Oct 2003 13:19:48 -0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	distcc
-PORTVERSION=	2.11
+PORTVERSION=	2.11.1
 CATEGORIES=	devel
 MASTER_SITES=	http://distcc.samba.org/ftp/distcc/
 
@@ -25,11 +25,16 @@
 
 .include <bsd.port.pre.mk>
 
-.if ${HAVE_GNOME:Mlibgnomeui} != ""
+.if defined(WITH_GNOME) 
 USE_GNOME=	libgnomeui
 CONFIGURE_ARGS+=	"--with-gnome"
 PKGNAMESUFFIX=	-gnome
 PLIST_SUB+=	WITH_GNOME=""
+.elif defined(WITH_GTK)
+USE_GNOME=	gtk20
+CONFIGURE_ARGS+=	"--with-gtk"
+PKGNAMESUFFIX=	-gtk
+PLIST_SUB+=	WITH_GNOME=""
 .else
 PLIST_SUB+=	WITH_GNOME="@comment "
 .endif
@@ -38,15 +43,10 @@
 DOC_FILES=	AUTHORS COPYING INSTALL NEWS README \
 		doc/protocol-1.txt doc/status-1.txt
 
-pre-fetch:
-.if !defined(WITHOUT_GNOME)
-	@${ECHO_MSG} "Building with GNOME-based monitor. To disable 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
+pre-everything::
+	@${ECHO_MSG} "Available knobs for ${PORTNAME}"
+	@${ECHO_MSG} "  - WITH_GNOME: Build GUI monitor based on GNOME"
+	@${ECHO_MSG} "  - WITH_GTK: Build GUI monitor based on GTK"
 
 pre-install:
 	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" \
Index: distcc/files/patch-src::state.h
===================================================================
RCS file: distcc/files/patch-src::state.h
diff -N distcc/files/patch-src::state.h
--- distcc/files/patch-src::state.h	28 Sep 2003 19:48:32 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-
-$FreeBSD: ports/devel/distcc/files/patch-src::state.h,v 1.1 2003/09/28 19:48:32 naddy Exp $
-
---- src/state.h.orig	Tue Sep 23 06:07:03 2003
-+++ src/state.h	Sun Sep 28 16:47:03 2003
-@@ -20,7 +20,9 @@
-  * USA
-  */
- 
--#include <stdint.h>
-+#ifdef HAVE_STDINT_H
-+#  include <stdint.h>
-+#endif
- 
- int dcc_get_state_dir (char **p);
- int dcc_open_state_file (int *p_fd);
--- distcc.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: