5 files changed, 9 insertions, 26 deletions

diff --git a/security/nessus/Makefile b/security/nessus/Makefile
index 2ba7cadedf0a..6a30a3ac4a14 100644
--- a/security/nessus/Makefile
+++ b/security/nessus/Makefile
@@ -11,7 +11,7 @@
 #  WITHOUT_NESSUS_GTK
 
 PORTNAME=	nessus
-PORTVERSION=	2.2.7
+PORTVERSION=	2.2.8
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.nessus.org/pub/nessus/nessus-${PORTVERSION}/src/ \
 		ftp://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${PORTVERSION}/src/ \
@@ -25,15 +25,13 @@ COMMENT=	A security scanner: looks for vulnerabilities in a given network
 
 LIB_DEPENDS=	nasl.4:${PORTSDIR}/security/nessus-libnasl
 
-CONFLICTS=	nessus-devel-[0-9]* nessus-devel-gtk-[0-9]* \
-		nessus-devel-gtk2-[0-9]*
-
 DIST_SUBDIR=	nessus
 WRKSRC=		${WRKDIR}/nessus-core
-PKGDEINSTALL=	${WRKDIR}/pkg-deinstall.sh
+SUB_FILES=	pkg-deinstall
+SUB_LIST=	PKGNAME=${PKGNAME}
 
 GNU_CONFIGURE=	yes
-USE_RC_SUBR=	YES
+USE_RC_SUBR=	nessusd.sh
 WANT_GNOME=	yes
 .if defined(WITHOUT_NESSUS_GTK) || defined(WITHOUT_GTK)
 WITHOUT_GNOME=	yes
@@ -54,21 +52,7 @@ CONFIGURE_ARGS+=--disable-gtk
 MAN1=		nessus.1 nessus-mkrand.1 nessus-mkcert-client.1 nessus-fetch.1
 MAN8=		nessusd.8 nessus-adduser.8 nessus-mkcert.8 nessus-rmuser.8
 
-RC_SCRIPTS_SUB=	PREFIX=${PREFIX} \
-		RC_SUBR=${RC_SUBR}
-
-SED_SCRIPT=	-e 's,%%PKGNAME%%,${PKGNAME},g' \
-		-e 's,%%PREFIX%%,${PREFIX},g'
-
-post-build:
-.for script in pkg-deinstall
-	@${SED} ${SED_SCRIPT} ${SCRIPTDIR}/${script} > ${WRKDIR}/${script}.sh
-.endfor
-
 post-install:
-	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		${FILESDIR}/nessusd.sh > ${PREFIX}/etc/rc.d/nessusd.sh
-	@${CHMOD} +x ${PREFIX}/etc/rc.d/nessusd.sh
 	@${SED} -e 's;\$${PREFIX};${PREFIX};' ${FILESDIR}/nessusd.conf \
 		> ${PREFIX}/etc/nessus/nessusd.conf.dist
 	@${SED} -e 's;\$${PREFIX};${PREFIX};' ${FILESDIR}/nessusd.rules \
diff --git a/security/nessus/distinfo b/security/nessus/distinfo
index caefd892b163..dc596fe09b8a 100644
--- a/security/nessus/distinfo
+++ b/security/nessus/distinfo
@@ -1,3 +1,3 @@
-MD5 (nessus/nessus-core-2.2.7.tar.gz) = 2dd8c116b435d3ec698d3caed0b48859
-SHA256 (nessus/nessus-core-2.2.7.tar.gz) = eb6d46cd6b4f872ec6f04b825eb40bbdb0b73bf1cbc1bbc7ebf004ac942a0eee
-SIZE (nessus/nessus-core-2.2.7.tar.gz) = 673852
+MD5 (nessus/nessus-core-2.2.8.tar.gz) = 7580ed539c38b6514d1a3cdf62cbe346
+SHA256 (nessus/nessus-core-2.2.8.tar.gz) = 4efa050d0a319fa8523af6284462c45a82ec0940ed5bc20db0cb693dca75314b
+SIZE (nessus/nessus-core-2.2.8.tar.gz) = 674132
diff --git a/security/nessus/files/nessusd.sh b/security/nessus/files/nessusd.sh.in
index f5785a6405cd..f5785a6405cd 100644
--- a/security/nessus/files/nessusd.sh
+++ b/security/nessus/files/nessusd.sh.in
diff --git a/security/nessus/scripts/pkg-deinstall b/security/nessus/files/pkg-deinstall.in
index 573b33a8ace9..0f43ca05b165 100644
--- a/security/nessus/scripts/pkg-deinstall
+++ b/security/nessus/files/pkg-deinstall.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/security/nessus/scripts/Attic/pkg-deinstall,v 1.2 2004-12-15 16:01:51 sem Exp $
+# $FreeBSD$
 #
 
 ECHO_CMD=echo
diff --git a/security/nessus/pkg-plist b/security/nessus/pkg-plist
index f1263b9acaa5..5773a23214b3 100644
--- a/security/nessus/pkg-plist
+++ b/security/nessus/pkg-plist
@@ -7,8 +7,7 @@ bin/nessus-mkrand
 etc/nessus/nessusd.conf.dist
 etc/nessus/nessusd.rules.dist
 @exec if [ ! -f %D/etc/nessus/nessusd.conf ]; then cp -p %D/etc/nessus/nessusd.conf.dist %D/etc/nessus/nessusd.conf; fi
-@exec if [ ! -f %D/etc/nessus/nessusd.rules ]; then cp -p %D/etc/nessus/nessusd.conf.dist %D/etc/nessus/nessusd.conf; fi
-etc/rc.d/nessusd.sh
+@exec if [ ! -f %D/etc/nessus/nessusd.rules ]; then cp -p %D/etc/nessus/nessusd.rules.dist %D/etc/nessus/nessusd.rules; fi
 include/nessus/config.h
 include/nessus/includes.h
 include/nessus/nessus-devel.h