diff options
| author | olgeni <olgeni@FreeBSD.org> | 2001-03-11 21:46:15 +0800 |
|---|---|---|
| committer | olgeni <olgeni@FreeBSD.org> | 2001-03-11 21:46:15 +0800 |
| commit | 65e35decfafa355cd0d4a0f4b3db284167f6d2a0 (patch) | |
| tree | 5937d2e28605c1efd1c2635ecf90882b9695f366 | |
| parent | 30b015e09cc2488d7eaa21bd718cf6bb0c90ce2b (diff) | |
| download | freebsd-ports-gnome-65e35decfafa355cd0d4a0f4b3db284167f6d2a0.tar.gz freebsd-ports-gnome-65e35decfafa355cd0d4a0f4b3db284167f6d2a0.tar.zst freebsd-ports-gnome-65e35decfafa355cd0d4a0f4b3db284167f6d2a0.zip | |
Use WANT_GTK and USE_GTK properly, so that the text-only nessus client can
be built automatically if gtk is not installed.
The WITHOUT_GTK option is still supported (by bsd.gnome.mk)
I also changed a couple of @dirrms to @unexecs in pkg-plist.
| -rw-r--r-- | security/nessus-devel/Makefile | 11 | ||||
| -rw-r--r-- | security/nessus-devel/pkg-plist | 4 | ||||
| -rw-r--r-- | security/nessus/Makefile | 11 | ||||
| -rw-r--r-- | security/nessus/pkg-plist | 4 |
4 files changed, 20 insertions, 10 deletions
diff --git a/security/nessus-devel/Makefile b/security/nessus-devel/Makefile index eefb87acf915..7af90b3c2491 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 24f36bda5e19..1af5f7ff233a 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 eefb87acf915..7af90b3c2491 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 24f36bda5e19..1af5f7ff233a 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 |