ports/70451: maintainer-update of security/nessus-*

[Udo Schweigert]

>Number:         70451
>Category:       ports
>Synopsis:       maintainer-update of security/nessus-*
>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:   Sat Aug 14 10:50:17 GMT 2004
>Closed-Date:
>Last-Modified:
>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:
>Unformatted: