From sheepkiller@cultdeadsheep.org  Wed Oct  8 06:25:39 2003
Return-Path: <sheepkiller@cultdeadsheep.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id BEBE616A4BF
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  8 Oct 2003 06:25:38 -0700 (PDT)
Received: from cultdeadsheep.org (charon.cultdeadsheep.org [80.65.226.72])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 50F2043FE9
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  8 Oct 2003 06:25:36 -0700 (PDT)
	(envelope-from sheepkiller@cultdeadsheep.org)
Received: (qmail 50643 invoked by uid 85); 8 Oct 2003 15:25:34 +0200
Received: from sheepkiller@cultdeadsheep.org by goofy.cultdeadsheep.org by uid 82 with qmail-scanner-1.20rc2 
 ( Clear:RC:1:. 
 Processed in 0.043803 secs); 08 Oct 2003 13:25:34 -0000
Received: from lucifer.cultdeadsheep.org (192.168.0.2)
  by goofy.cultdeadsheep.org with SMTP; 8 Oct 2003 15:25:34 +0200
Received: by lucifer.cultdeadsheep.org (sSMTP sendmail emulation); Wed,  8 Oct 2003 15:25:47 +0200
Message-Id: <20031008132536.50F2043FE9@mx1.FreeBSD.org>
Date: Wed,  8 Oct 2003 15:25:47 +0200
From: Clement Laforet <sheepkiller@cultdeadsheep.org>
Reply-To: Clement Laforet <sheepkiller@cultdeadsheep.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: Clement Laforet <sheepkiller@cultdeadsheep.org>
Subject: [update] devel/distcc: Update to 2.11.1
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>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:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Oct 08 06:30:02 PDT 2003
>Closed-Date:    Wed Oct 08 07:28:52 PDT 2003
>Last-Modified:  Wed Oct 08 07:28:52 PDT 2003
>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@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:

From: Peter Pentchev <roam@ringlet.net>
To: Clement Laforet <sheepkiller@cultdeadsheep.org>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/57743: [update] devel/distcc: Update to 2.11.1
Date: Wed, 8 Oct 2003 16:41:25 +0300

 On Wed, Oct 08, 2003 at 03:25:47PM +0200, Clement Laforet wrote:
 > 
 > >Number:         57743
 > >Category:       ports
 > >Synopsis:       [update] devel/distcc: Update to 2.11.1
 [snip]
 > Index: distcc/Makefile
 > ===================================================================
 [snip]
 > Index: distcc/files/patch-src::state.h
 > ===================================================================
 
 Errr, shouldn't there have been a distinfo change, too?
 Can you confirm the following distinfo contents:
 
 MD5 (distcc-2.11.1.tar.bz2) = 7b096504d7ef4805d30b0638224c7f46
 
 G'luck,
 Peter
 
 -- 
 Peter Pentchev	roam@ringlet.net    roam@sbnd.net    roam@FreeBSD.org
 PGP key:	http://people.FreeBSD.org/~roam/roam.key.asc
 Key fingerprint	FDBA FD79 C26F 3C51 C95E  DF9E ED18 B68D 1619 4553
 I had to translate this sentence into English because I could not read the original Sanskrit.

From: Clement Laforet <sheepkiller@cultdeadsheep.org>
To: Peter Pentchev <roam@ringlet.net>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/57743: [update] devel/distcc: Update to 2.11.1
Date: Wed, 8 Oct 2003 15:47:01 +0200

 On Wed, 8 Oct 2003 16:41:25 +0300
 Peter Pentchev <roam@ringlet.net> wrote:
 
 > Errr, shouldn't there have been a distinfo change, too?
 oops... sorry...
 
 > Can you confirm the following distinfo contents:
 > MD5 (distcc-2.11.1.tar.bz2) = 7b096504d7ef4805d30b0638224c7f46
 
 I confirm :)
 
 Thanks Peter !
 
 regards,
 clem
State-Changed-From-To: open->closed 
State-Changed-By: roam 
State-Changed-When: Wed Oct 8 07:28:41 PDT 2003 
State-Changed-Why:  
Update committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=57743 
>Unformatted:
