From sheepkiller@cultdeadsheep.org  Thu Oct 16 14:17:21 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 2061116A4B3
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 16 Oct 2003 14:17:21 -0700 (PDT)
Received: from cultdeadsheep.org (charon.cultdeadsheep.org [80.65.226.72])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 655CA43F93
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 16 Oct 2003 14:17:19 -0700 (PDT)
	(envelope-from sheepkiller@cultdeadsheep.org)
Received: (qmail 57441 invoked by uid 85); 16 Oct 2003 23:17:18 +0200
Received: from sheepkiller@cultdeadsheep.org by goofy.cultdeadsheep.org by uid 82 with qmail-scanner-1.20rc2 
 ( Clear:RC:1:. 
 Processed in 0.039593 secs); 16 Oct 2003 21:17:18 -0000
Received: from lucifer.cultdeadsheep.org (192.168.0.2)
  by goofy.cultdeadsheep.org with SMTP; 16 Oct 2003 23:17:17 +0200
Received: by lucifer.cultdeadsheep.org (sSMTP sendmail emulation); Thu, 16 Oct 2003 23:16:48 +0200
Message-Id: <20031016211719.655CA43F93@mx1.FreeBSD.org>
Date: Thu, 16 Oct 2003 23:16:48 +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: [maintainer patch] devel/distcc: really get rid of auto detection
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         58144
>Category:       ports
>Synopsis:       [maintainer patch] devel/distcc: really get rid of auto detection
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Oct 16 14:20:17 PDT 2003
>Closed-Date:    Fri Oct 17 17:17:13 PDT 2003
>Last-Modified:  Fri Oct 17 17:17:13 PDT 2003
>Originator:     Clement Laforet
>Release:        FreeBSD 5.1-CURRENT i386
>Organization:
cotds.org
>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:
	In same cases (i.e. gnome 1.4 installed), if you don't want to have gnome monitor 
	install failed due to remaining auto detection stuff.
	Reported by: Andrew Heybey <ath@niksun.com>

>How-To-Repeat:
	Try to install distcc without GTK or GNOME and gnome installed.
>Fix:

	

--- distcc.diff begins here ---
Index: distcc/Makefile
===================================================================
RCS file: /WORK/REPO/ports/devel/distcc/Makefile,v
retrieving revision 1.31
diff -u -r1.31 Makefile
--- distcc/Makefile	8 Oct 2003 14:28:34 -0000	1.31
+++ distcc/Makefile	16 Oct 2003 20:45:15 -0000
@@ -17,7 +17,6 @@
 
 PLIST_SUB+=	DOCSDIR=${DOCSDIR:S,${PREFIX}/,,}
 
-WANT_GNOME=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
@@ -25,7 +24,7 @@
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_GNOME) 
+.if defined(WITH_GNOME)
 USE_GNOME=	libgnomeui
 CONFIGURE_ARGS+=	"--with-gnome"
 PKGNAMESUFFIX=	-gnome
@@ -55,7 +54,7 @@
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/distcc ${PREFIX}/bin
 	@${INSTALL_PROGRAM} ${WRKSRC}/distccmon-text ${PREFIX}/bin
-.if !defined(WITHOUT_GNOME) && ${HAVE_GNOME:Mlibgnomeui} != ""
+.if defined(WITH_GNOME) || defined(WITH_GTK)
 	@${INSTALL_PROGRAM} ${WRKSRC}/distccmon-gnome ${PREFIX}/bin
 .endif
 	@${INSTALL_PROGRAM} ${WRKSRC}/distccd ${PREFIX}/sbin
--- distcc.diff ends here ---


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: naddy 
State-Changed-When: Fri Oct 17 17:16:48 PDT 2003 
State-Changed-Why:  
Committed, thanks. 

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