From udo.schweigert@siemens.com  Sat Aug 14 10:48:31 2004
Return-Path: <udo.schweigert@siemens.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id BBCB116A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 14 Aug 2004 10:48:31 +0000 (GMT)
Received: from goliath.siemens.de (goliath.siemens.de [192.35.17.28])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 051CA43D1F
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 14 Aug 2004 10:48:31 +0000 (GMT)
	(envelope-from udo.schweigert@siemens.com)
Received: from mail2.siemens.de (mail2.siemens.de [139.25.208.11])
	by goliath.siemens.de (8.12.6/8.12.6) with ESMTP id i7EAmT0T014221
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 14 Aug 2004 12:48:29 +0200
Received: from mars.cert.siemens.com (ust.mchp.siemens.de [139.23.201.17])
	by mail2.siemens.de (8.12.6/8.12.6) with ESMTP id i7EAmTsw016579
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 14 Aug 2004 12:48:29 +0200
Received: from alaska.cert.siemens.com (reims.mchp.siemens.de [139.23.202.134])
	by mars.cert.siemens.com (8.13.1/8.13.1/$SiemensCERT: mail/cert.mc.pre,v 1.61 2004/06/20 16:46:46 mailadm Exp $) with ESMTP id i7EAmT5o041688
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 14 Aug 2004 12:48:29 +0200 (CEST)
Received: from alaska.cert.siemens.com (alaska.cert.siemens.de [127.0.0.1])
	by alaska.cert.siemens.com (8.13.1/8.13.1/$Ust: hosts/alaska/mail/config.mc,v 1.17 2004/05/08 20:26:28 ust Exp $) with ESMTP id i7EAmTnv032723
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 14 Aug 2004 12:48:29 +0200 (CEST)
	(envelope-from ust@alaska.cert.siemens.com)
Received: (from ust@localhost)
	by alaska.cert.siemens.com (8.13.1/8.13.1/$Ust: hosts/alaska/mail/submit.mc,v 1.4 2002/12/31 15:32:17 ust Exp $) id i7EAmTcY020824;
	Sat, 14 Aug 2004 12:48:29 +0200 (CEST)
	(envelope-from ust)
Message-Id: <200408141048.i7EAmTcY020824@alaska.cert.siemens.com>
Date: Sat, 14 Aug 2004 12:48:29 +0200 (CEST)
From: Udo Schweigert <udo.schweigert@siemens.com>
Reply-To: Udo Schweigert <udo.schweigert@siemens.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: maintainer-update of security/nessus-*
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         70451
>Category:       ports
>Synopsis:       maintainer-update of security/nessus-*
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    sem
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Aug 14 10:50:17 GMT 2004
>Closed-Date:    Sat Aug 21 10:53:28 GMT 2004
>Last-Modified:  Sat Aug 21 10:53:28 GMT 2004
>Originator:     Udo Schweigert
>Release:        FreeBSD 4.9-STABLE i386
>Organization:
>Environment:


>Description:

Maintainer-update of the security/nessus-* ports:

	- Fix the WITHOUT_ knobs to be compliant with the GNOME framework

>How-To-Repeat:
>Fix:

diff -ru /usr/ports/security/nessus/Makefile nessus/Makefile
--- /usr/ports/security/nessus/Makefile	Sat Aug 14 06:07:43 2004
+++ nessus/Makefile	Sat Aug 14 12:37:32 2004
@@ -5,7 +5,9 @@
 # $FreeBSD: ports/security/nessus/Makefile,v 1.56 2004/08/13 13:36:01 vs Exp $
 #
 # If you want to only have the command-line client even if gtk is already
-# installed define:
+# installed define one of these:
+#  WITHOUT_GNOME
+#  WITHOUT_GTK
 #  WITHOUT_NESSUS_GTK
 
 PORTNAME=	nessus
@@ -33,15 +35,13 @@
 USE_LIBTOOL_VER=13
 USE_REINPLACE=	YES
 USE_RC_SUBR=	YES
-.if !defined(WITHOUT_NESSUS_GTK)
 WANT_GNOME=	yes
+.if defined(WITHOUT_NESSUS_GTK) || defined(WITHOUT_GTK)
+WITHOUT_GNOME=	yes
 .endif
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITHOUT_NESSUS_GTK)
-CONFIGURE_ARGS+=--disable-gtk
-.else
 .if ${HAVE_GNOME:Mgtk20}!=""
 USE_GNOME+=	gtk20
 PKGNAMESUFFIX=	-gtk2
@@ -50,7 +50,6 @@
 PKGNAMESUFFIX=	-gtk
 .else
 CONFIGURE_ARGS+=--disable-gtk
-.endif
 .endif
 
 MAN1=		nessus.1 nessus-mkrand.1 nessus-mkcert-client.1

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->sem 
Responsible-Changed-By: sem 
Responsible-Changed-When: Sat Aug 21 10:15:00 GMT 2004 
Responsible-Changed-Why:  
Take it 

http://www.freebsd.org/cgi/query-pr.cgi?pr=70451 
State-Changed-From-To: open->closed 
State-Changed-By: sem 
State-Changed-When: Sat Aug 21 10:53:17 GMT 2004 
State-Changed-Why:  
Committed, thanks! 

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