5 files changed, 41 insertions, 27 deletions

diff --git a/security/nessus-libraries-devel/Makefile b/security/nessus-libraries-devel/Makefile
index 6cb7752ee494..85ea6762c022 100644
--- a/security/nessus-libraries-devel/Makefile
+++ b/security/nessus-libraries-devel/Makefile
@@ -1,27 +1,26 @@
-# Ports collection makefile for:	nessus-libraries
-# Date created:				07 November 1999
-# Whom:					Anders Nordby <anders@fix.no>
+# Ports collection makefile for:	nessus-libraries-devel
 #
 # $FreeBSD$
 #
 
-PORTNAME=	nessus-libraries
-PORTVERSION=	1.0.9
+PORTNAME=	nessus-libraries-devel
+PORTVERSION=	1.1.7
 CATEGORIES=	security
-MASTER_SITES=	ftp://ftp.cis.fed.gov/pub/nessus/nessus-${PORTVERSION}/src/ \
-		ftp://ftp.nessus.org/pub/nessus/nessus-${PORTVERSION}/src/ \
-		ftp://cvs.nessus.org/pub/nessus/nessus-${PORTVERSION}/src/ \
-		ftp://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${PORTVERSION}/src/ \
-		http://ftp.gwdg.de/pub/linux/misc/nessus/nessus-${PORTVERSION}/src/ \
-		ftp://ftp.esiea.fr/pub/mirrors/nessus/nessus-${PORTVERSION}/src/ \
-		ftp://sunsite.cnlab-switch.ch/mirror/nessus/nessus-${PORTVERSION}/src/ \
-		ftp://ftp.chg.ru/pub/security/nessus/nessus-${PORTVERSION}/src/ \
-		ftp://ftp.sekure.net/pub/nessus/nessus-${PORTVERSION}/src/
+MASTER_SITES=	ftp://ftp.cis.fed.gov/pub/nessus/unstable/nessus-${PORTVERSION}/src/ \
+		ftp://ftp.nessus.org/pub/nessus/unstable/nessus-${PORTVERSION}/src/ \
+		ftp://cvs.nessus.org/pub/nessus/unstable/nessus-${PORTVERSION}/src/ \
+		ftp://ftp.gwdg.de/pub/linux/misc/nessus/unstable/nessus-${PORTVERSION}/src/ \
+		http://ftp.gwdg.de/pub/linux/misc/nessus/unstable/nessus-${PORTVERSION}/src/ \
+		ftp://ftp.esiea.fr/pub/mirrors/nessus/unstable/nessus-${PORTVERSION}/src/ \
+		ftp://sunsite.cnlab-switch.ch/mirror/nessus/unstable/nessus-${PORTVERSION}/src/ \
+		ftp://ftp.chg.ru/pub/security/nessus/unstable/nessus-${PORTVERSION}/src/ \
+		ftp://ftp.sekure.net/pub/nessus/unstable/nessus-${PORTVERSION}/src/
 
-MAINTAINER=	olgeni@FreeBSD.org
+MAINTAINER=	udo.schweigert@siemens.com
 
 DIST_SUBDIR=	nessus
 WRKSRC=		${WRKDIR}/nessus-libraries
+DISTNAME=	nessus-libraries-${PORTVERSION}
 
 USE_LIBTOOL=	YES
 CONFIGURE_ARGS=	--enable-cipher
diff --git a/security/nessus-libraries-devel/distinfo b/security/nessus-libraries-devel/distinfo
index 66155b7c26f3..ea8d67c068ec 100644
--- a/security/nessus-libraries-devel/distinfo
+++ b/security/nessus-libraries-devel/distinfo
@@ -1 +1 @@
-MD5 (nessus/nessus-libraries-1.0.9.tar.gz) = 9de5bad530f193afd75ff843578dfefc
+MD5 (nessus/nessus-libraries-1.1.7.tar.gz) = df0713d3268fd635ca93e83251d2f27c
diff --git a/security/nessus-libraries-devel/files/patch-aa b/security/nessus-libraries-devel/files/patch-aa
new file mode 100644
index 000000000000..9d914ce75c0c
--- /dev/null
+++ b/security/nessus-libraries-devel/files/patch-aa
@@ -0,0 +1,10 @@
+--- Makefile.orig	Thu May 31 15:51:08 2001
++++ Makefile	Wed Oct 10 20:16:14 2001
+@@ -46,7 +46,6 @@
+ 	cd libhosts_gatherer && ${MAKE} install
+ 	cd libpcap-nessus && ${MAKE} install 
+ 
+-	$(INSTALL) -m 0444 include/includes.h ${includedir}/nessus
+ 	$(INSTALL) -m 0444 include/libnessus.h ${includedir}/nessus
+ 	$(INSTALL) -m 0444 include/harglists.h ${includedir}/nessus
+ 	$(INSTALL) -m 0444 include/libvers.h   ${includedir}/nessus
diff --git a/security/nessus-libraries-devel/files/patch-ab b/security/nessus-libraries-devel/files/patch-ab
new file mode 100644
index 000000000000..472a39e0f390
--- /dev/null
+++ b/security/nessus-libraries-devel/files/patch-ab
@@ -0,0 +1,12 @@
+--- configure.orig	Tue Oct 16 19:56:40 2001
++++ configure	Thu Oct 18 06:13:41 2001
+@@ -5074,7 +5074,8 @@
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+ 
+ # Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++# LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++LIBTOOL='$(PREFIX)/bin/libtool'
+ 
+ # Prevent multiple expansion
+ 
diff --git a/security/nessus-libraries-devel/pkg-plist b/security/nessus-libraries-devel/pkg-plist
index dc3368d53470..bdadbb007825 100644
--- a/security/nessus-libraries-devel/pkg-plist
+++ b/security/nessus-libraries-devel/pkg-plist
@@ -1,27 +1,20 @@
 bin/nessus-config
 include/nessus/getopt.h
 include/nessus/harglists.h
-include/nessus/includes.h
 include/nessus/libnessus.h
 include/nessus/libvers.h
 include/nessus/net/bpf.h
 include/nessus/pcap-namedb.h
 include/nessus/pcap.h
-include/peks/messages.h
-include/peks/peks.h
 lib/libhosts_gatherer.a
 lib/libhosts_gatherer.so
-lib/libhosts_gatherer.so.1
+lib/libhosts_gatherer.so.2
 lib/libnessus.a
 lib/libnessus.so
-lib/libnessus.so.1
+lib/libnessus.so.2
 lib/libpcap-nessus.a
 lib/libpcap-nessus.so
-lib/libpcap-nessus.so.1
-lib/libpeks.a
-lib/libpeks.la
-lib/libpeks.so
-lib/libpeks.so.8
+lib/libpcap-nessus.so.2
+sbin/uninstall-nessus
 @dirrm include/nessus/net
 @dirrm include/nessus
-@dirrm include/peks