From a98fa557476bc7e44552c8e07eb05313c48e9f29 Mon Sep 17 00:00:00 2001
From: sem <sem@FreeBSD.org>
Date: Sat, 21 Aug 2004 10:51:10 +0000
Subject: Fix the WITHOUT_ knobs to be compliant with the GNOME framework

PR:		ports/70451, ports/70452
Submitted by:	maintainer
---
 security/nessus-devel/Makefile | 11 +++++------
 security/nessus/Makefile       | 11 +++++------
 2 files changed, 10 insertions(+), 12 deletions(-)

(limited to 'security')

diff --git a/security/nessus-devel/Makefile b/security/nessus-devel/Makefile
index ccea38d3af10..bfaeec870a3d 100644
--- a/security/nessus-devel/Makefile
+++ b/security/nessus-devel/Makefile
@@ -3,7 +3,9 @@
 # $FreeBSD$
 #
 # 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-devel
@@ -30,15 +32,13 @@ WRKSRC=		${WRKDIR}/nessus-core
 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
@@ -48,7 +48,6 @@ PKGNAMESUFFIX=	-gtk
 .else
 CONFIGURE_ARGS+=--disable-gtk
 .endif
-.endif
 
 MAN1=		nessus.1 nessus-mkrand.1 nessus-mkcert-client.1
 MAN8=		nessusd.8 nessus-adduser.8 nessus-mkcert.8 nessus-rmuser.8
diff --git a/security/nessus/Makefile b/security/nessus/Makefile
index 5ffecadd7a6e..f21dc2a86873 100644
--- a/security/nessus/Makefile
+++ b/security/nessus/Makefile
@@ -5,7 +5,9 @@
 # $FreeBSD$
 #
 # 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 @@ WRKSRC=		${WRKDIR}/nessus-core
 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
@@ -51,7 +51,6 @@ PKGNAMESUFFIX=	-gtk
 .else
 CONFIGURE_ARGS+=--disable-gtk
 .endif
-.endif
 
 MAN1=		nessus.1 nessus-mkrand.1 nessus-mkcert-client.1
 MAN8=		nessusd.8 nessus-adduser.8 nessus-mkcert.8 nessus-rmuser.8
-- 
cgit