ports/58144: [maintainer patch] devel/distcc: really get rid of auto detection

[Clement Laforet]

>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:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Oct 16 14:20:17 PDT 2003
>Closed-Date:
>Last-Modified:
>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 at 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 at 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:
>Unformatted: