summaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
Diffstat (limited to 'security')
-rw-r--r--security/nessus-devel/Makefile11
-rw-r--r--security/nessus-devel/pkg-plist4
-rw-r--r--security/nessus/Makefile11
-rw-r--r--security/nessus/pkg-plist4
4 files changed, 20 insertions, 10 deletions
diff --git a/security/nessus-devel/Makefile b/security/nessus-devel/Makefile
index eefb87a..7af90b3 100644
--- a/security/nessus-devel/Makefile
+++ b/security/nessus-devel/Makefile
@@ -26,9 +26,14 @@ LIB_DEPENDS= nasl.1:${PORTSDIR}/security/nessus-libnasl
DIST_SUBDIR= nessus
WRKSRC= ${WRKDIR}/nessus-core
-HAVE_GTK= yes
USE_LIBTOOL= yes
-.if defined(WITHOUT_GTK)
+WANT_GTK= yes
+
+.include <bsd.port.pre.mk>
+
+.if defined(HAVE_GTK) && !defined(WITHOUT_GTK)
+USE_GTK= yes
+.else
CONFIGURE_ARGS+= --disable-gtk
.endif
@@ -41,4 +46,4 @@ post-install:
@${ECHO} "collection."
@${ECHO} "================================================================================"
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/security/nessus-devel/pkg-plist b/security/nessus-devel/pkg-plist
index 24f36bd..1af5f7f 100644
--- a/security/nessus-devel/pkg-plist
+++ b/security/nessus-devel/pkg-plist
@@ -10,5 +10,5 @@ include/nessus/nessustcp.h
include/nessus/nessusudp.h
include/nessus/ntcompat.h
sbin/nessusd
-@dirrm var/nessus
-@dirrm etc/nessus
+@unexec rmdir %D/var/nessus 2>/dev/null || true
+@unexec rmdir %D/etc/nessus 2>/dev/null || true
diff --git a/security/nessus/Makefile b/security/nessus/Makefile
index eefb87a..7af90b3 100644
--- a/security/nessus/Makefile
+++ b/security/nessus/Makefile
@@ -26,9 +26,14 @@ LIB_DEPENDS= nasl.1:${PORTSDIR}/security/nessus-libnasl
DIST_SUBDIR= nessus
WRKSRC= ${WRKDIR}/nessus-core
-HAVE_GTK= yes
USE_LIBTOOL= yes
-.if defined(WITHOUT_GTK)
+WANT_GTK= yes
+
+.include <bsd.port.pre.mk>
+
+.if defined(HAVE_GTK) && !defined(WITHOUT_GTK)
+USE_GTK= yes
+.else
CONFIGURE_ARGS+= --disable-gtk
.endif
@@ -41,4 +46,4 @@ post-install:
@${ECHO} "collection."
@${ECHO} "================================================================================"
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/security/nessus/pkg-plist b/security/nessus/pkg-plist
index 24f36bd..1af5f7f 100644
--- a/security/nessus/pkg-plist
+++ b/security/nessus/pkg-plist
@@ -10,5 +10,5 @@ include/nessus/nessustcp.h
include/nessus/nessusudp.h
include/nessus/ntcompat.h
sbin/nessusd
-@dirrm var/nessus
-@dirrm etc/nessus
+@unexec rmdir %D/var/nessus 2>/dev/null || true
+@unexec rmdir %D/etc/nessus 2>/dev/null || true
OpenPOWER on IntegriCloud