Changes 2.0.12:

* Fixed a bug in ./configure which would sometimes assume that GTK is not
  installed whereas it actually is
* Fixed a race condition in nessus-adduser for users who do not configure
  their TMPDIR variable (thanks to Cyrille Barthelemy)
* Fixed a bug in nessus-update-plugins which would not update the plugins
  properly on all systems (thanks to Keith Butler)
* Fixed the installer to compile Nessus with GTK support if gtk-config OR
  pkg-config is installed.

5 files changed, 13 insertions, 15 deletions

diff --git a/security/nessus-core/MESSAGE b/security/nessus-core/MESSAGE
index a61095b469a..9db2c36932d 100644
--- a/security/nessus-core/MESSAGE
+++ b/security/nessus-core/MESSAGE
@@ -1,11 +1,11 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.5 2004/04/23 22:16:00 reed Exp $
+$NetBSD: MESSAGE,v 1.6 2004/07/22 15:00:50 adam Exp $
 
 Nessus may have placed some files in /var/nessus, ${PREFIX}/etc/nessus,
 ${PREFIX}/com/nessus and ${PREFIX}/lib/nessus/reports. If you do not need
 these files any more, be sure to remove them:
 
-	rm -fr /var/nessus
+	rm -fr ${VARBASE}/nessus
 	rm -fr ${PREFIX}/etc/nessus
 	rm -fr ${PREFIX}/lib/nessus/reports
 	rm -fr ${PREFIX}/com/nessus
diff --git a/security/nessus-core/Makefile b/security/nessus-core/Makefile
index 0fb29cb0885..b4cb3502043 100644
--- a/security/nessus-core/Makefile
+++ b/security/nessus-core/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/07/20 11:48:38 adam Exp $
+# $NetBSD: Makefile,v 1.14 2004/07/22 15:00:50 adam Exp $
 
 DISTNAME=	nessus-core-${VERS}
 .include 	"../nessus/Makefile.common"
@@ -17,6 +17,5 @@ CONFIGURE_ENV+=		ac_cv_path_GTKCONFIG="pkg-config gtk+-2.0" \
 RCD_SCRIPTS=	nessusd
 
 .include "../../security/libnasl/buildlink3.mk"
-.include "../../security/nessus-libraries/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/nessus-core/PLIST b/security/nessus-core/PLIST
index 0ba0cab1808..4b38131d4e1 100644
--- a/security/nessus-core/PLIST
+++ b/security/nessus-core/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2004/04/23 22:07:58 reed Exp $
+@comment $NetBSD: PLIST,v 1.11 2004/07/22 15:00:50 adam Exp $
 bin/nessus
 bin/nessus-mkcert-client
 bin/nessus-mkrand
@@ -27,5 +27,5 @@ sbin/nessusd
 @unexec ${RMDIR} %D/lib/nessus 2>/dev/null || ${TRUE}
 @exec ${MKDIR} %D/etc/nessus
 @unexec ${RMDIR} %D/etc/nessus 2>/dev/null || ${TRUE}
-@exec ${MKDIR} /var/nessus
-@unexec ${RMDIR} /var/nessus 2>/dev/null || ${TRUE}
+@exec ${MKDIR} ${VARBASE}/nessus
+@unexec ${RMDIR} ${VARBASE}/nessus 2>/dev/null || ${TRUE}
diff --git a/security/nessus-core/buildlink3.mk b/security/nessus-core/buildlink3.mk
index a10adc60316..c3f89ac2ec0 100644
--- a/security/nessus-core/buildlink3.mk
+++ b/security/nessus-core/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/05/03 05:52:55 snj Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/07/22 15:00:50 adam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 NESSUS_CORE_BUILDLINK3_MK:=	${NESSUS_CORE_BUILDLINK3_MK}+
@@ -11,13 +11,12 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nnessus-core}
 BUILDLINK_PACKAGES+=	nessus-core
 
 .if !empty(NESSUS_CORE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.nessus-core+=	nessus-core>=2.0.9
-BUILDLINK_RECOMMENDED.nessus-core?=	nessus-core>=2.0.9nb1
+BUILDLINK_DEPENDS.nessus-core+=	nessus-core>=2.0.12
+BUILDLINK_RECOMMENDED.nessus-core?=	nessus-core>=2.0.12
 BUILDLINK_PKGSRCDIR.nessus-core?=	../../security/nessus-core
 .endif	# NESSUS_CORE_BUILDLINK3_MK
 
 .include "../../security/libnasl/buildlink3.mk"
-.include "../../security/nessus-libraries/buildlink3.mk"
-.include "../../x11/gtk/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/security/nessus-core/distinfo b/security/nessus-core/distinfo
index 206ff4ca630..2fd351cc99a 100644
--- a/security/nessus-core/distinfo
+++ b/security/nessus-core/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.13 2004/07/20 11:48:38 adam Exp $
+$NetBSD: distinfo,v 1.14 2004/07/22 15:00:50 adam Exp $
 
-SHA1 (nessus-core-2.0.11.tar.gz) = 4e6dcfb87ba396d6def8ad5484cea4039c2e7efb
-Size (nessus-core-2.0.11.tar.gz) = 649252 bytes
+SHA1 (nessus-core-2.0.12.tar.gz) = 64481020b33ba65c64949970abdeab78ee083480
+Size (nessus-core-2.0.12.tar.gz) = 649412 bytes
 SHA1 (patch-aa) = 9de405b5786aedad69d10eae74b3b8fa7ba0ac84