* Upgrade to 1.0.3

* Change MASTER_SITES
* Install nstreams-services without ".samples" suffix
* Remove the advice about 0.99 version in pkg-descr
* Pass maintainership to submitter

PR:		ports/42752
Submitted by:	Nicolas Jombart <Nicolas.Jombart@hsc-labs.com>

10 files changed, 18 insertions, 74 deletions

diff --git a/net-mgmt/nstreams/Makefile b/net-mgmt/nstreams/Makefile
index be216ae9b680..1d8019381d55 100644
--- a/net-mgmt/nstreams/Makefile
+++ b/net-mgmt/nstreams/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	nstreams
-PORTVERSION=	1.0.0
-PORTREVISION=	1
+PORTVERSION=	1.0.3
 CATEGORIES=	net
-MASTER_SITES=	http://www.hsc.fr/ressources/outils/nstreams/download/
+MASTER_SITES=	ftp://ftp.nessus.org/pub/nstreams/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	Nicolas.Jombart@hsc-labs.com
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
@@ -22,8 +21,8 @@ MAN1=		nstreams.1
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/nstreams ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/docs/nstreams.1 ${MANPREFIX}/man/man1
-.for file in nstreams-networks nstreams-services
-	${INSTALL_DATA} ${WRKSRC}/docs/${file} ${PREFIX}/etc/${file}.sample
-.endfor
+	${INSTALL_DATA} ${WRKSRC}/docs/nstreams-networks \
+	${PREFIX}/etc/nstreams-networks.sample
+	${INSTALL_DATA} ${WRKSRC}/docs/nstreams-services ${PREFIX}/etc/nstreams-services
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/nstreams/distinfo b/net-mgmt/nstreams/distinfo
index 6449615d7bc3..f90b1d6d5b14 100644
--- a/net-mgmt/nstreams/distinfo
+++ b/net-mgmt/nstreams/distinfo
@@ -1 +1 @@
-MD5 (nstreams-1.0.0.tar.gz) = 2d4ed1be1938a1cc24fabade616f31d0
+MD5 (nstreams-1.0.3.tar.gz) = 5cf390aedd285b047b1d28c7ecb88d5a
diff --git a/net-mgmt/nstreams/files/patch-aa b/net-mgmt/nstreams/files/patch-aa
deleted file mode 100644
index 1180995d5d34..000000000000
--- a/net-mgmt/nstreams/files/patch-aa
+++ /dev/null
@@ -1,26 +0,0 @@
---- src/nstreams.c	Thu Nov 11 22:13:14 1999
-+++ src/nstreams.c	Fri Dec 29 07:04:41 2000
-@@ -179,6 +179,7 @@
-  char * output_name = NULL;
-  
- 
-+ bzero(cache, sizeof(struct cache));
- 
- 
-  parser = parse_tcpdump_line;
---- src/output.c	Thu Nov 11 22:13:15 1999
-+++ src/output.c	Fri Dec 29 07:20:51 2000
-@@ -122,11 +122,11 @@
-  else {
-  	ret->sports = malloc(10);
- 	sprintf(ret->sports, "%d", ret->sport);
--	realloc(ret->sports, strlen(ret->sports)+1);
-+	ret->sports = realloc(ret->sports, strlen(ret->sports)+1);
- 	
- 	ret->dports = malloc(10);
- 	sprintf(ret->dports, "%d", ret->dport);
--	realloc(ret->dports, strlen(ret->dports)+1);
-+	ret->dports = realloc(ret->dports, strlen(ret->dports)+1);
-        }
- 
-  ret->show_net = shownet;
diff --git a/net-mgmt/nstreams/pkg-descr b/net-mgmt/nstreams/pkg-descr
index d0710f77aaae..a9f4013d442e 100644
--- a/net-mgmt/nstreams/pkg-descr
+++ b/net-mgmt/nstreams/pkg-descr
@@ -6,8 +6,7 @@ is required for the users, and nothing more.
 
 Nstreams can parse the tcpdump output, or the files generated with the -w
 option of tcpdump. It can also directly sniff the data that occurs on the
-network (the use of tcpdump is however recommanded as long as nstreams is in
-version 0.99.x).
+network.
 
 This product was designed by HSC and coded by Renaud Deraison
 (deraison@cvs.nessus.org), author of the Nessus software (www.nessus.org). It
diff --git a/net-mgmt/nstreams/pkg-plist b/net-mgmt/nstreams/pkg-plist
index 529f8ba5af72..dd2665230d39 100644
--- a/net-mgmt/nstreams/pkg-plist
+++ b/net-mgmt/nstreams/pkg-plist
@@ -1,3 +1,3 @@
 bin/nstreams
 etc/nstreams-networks.sample
-etc/nstreams-services.sample
+etc/nstreams-services
diff --git a/net/nstreams/Makefile b/net/nstreams/Makefile
index be216ae9b680..1d8019381d55 100644
--- a/net/nstreams/Makefile
+++ b/net/nstreams/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	nstreams
-PORTVERSION=	1.0.0
-PORTREVISION=	1
+PORTVERSION=	1.0.3
 CATEGORIES=	net
-MASTER_SITES=	http://www.hsc.fr/ressources/outils/nstreams/download/
+MASTER_SITES=	ftp://ftp.nessus.org/pub/nstreams/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	Nicolas.Jombart@hsc-labs.com
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
@@ -22,8 +21,8 @@ MAN1=		nstreams.1
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/nstreams ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/docs/nstreams.1 ${MANPREFIX}/man/man1
-.for file in nstreams-networks nstreams-services
-	${INSTALL_DATA} ${WRKSRC}/docs/${file} ${PREFIX}/etc/${file}.sample
-.endfor
+	${INSTALL_DATA} ${WRKSRC}/docs/nstreams-networks \
+	${PREFIX}/etc/nstreams-networks.sample
+	${INSTALL_DATA} ${WRKSRC}/docs/nstreams-services ${PREFIX}/etc/nstreams-services
 
 .include <bsd.port.mk>
diff --git a/net/nstreams/distinfo b/net/nstreams/distinfo
index 6449615d7bc3..f90b1d6d5b14 100644
--- a/net/nstreams/distinfo
+++ b/net/nstreams/distinfo
@@ -1 +1 @@
-MD5 (nstreams-1.0.0.tar.gz) = 2d4ed1be1938a1cc24fabade616f31d0
+MD5 (nstreams-1.0.3.tar.gz) = 5cf390aedd285b047b1d28c7ecb88d5a
diff --git a/net/nstreams/files/patch-aa b/net/nstreams/files/patch-aa
deleted file mode 100644
index 1180995d5d34..000000000000
--- a/net/nstreams/files/patch-aa
+++ /dev/null
@@ -1,26 +0,0 @@
---- src/nstreams.c	Thu Nov 11 22:13:14 1999
-+++ src/nstreams.c	Fri Dec 29 07:04:41 2000
-@@ -179,6 +179,7 @@
-  char * output_name = NULL;
-  
- 
-+ bzero(cache, sizeof(struct cache));
- 
- 
-  parser = parse_tcpdump_line;
---- src/output.c	Thu Nov 11 22:13:15 1999
-+++ src/output.c	Fri Dec 29 07:20:51 2000
-@@ -122,11 +122,11 @@
-  else {
-  	ret->sports = malloc(10);
- 	sprintf(ret->sports, "%d", ret->sport);
--	realloc(ret->sports, strlen(ret->sports)+1);
-+	ret->sports = realloc(ret->sports, strlen(ret->sports)+1);
- 	
- 	ret->dports = malloc(10);
- 	sprintf(ret->dports, "%d", ret->dport);
--	realloc(ret->dports, strlen(ret->dports)+1);
-+	ret->dports = realloc(ret->dports, strlen(ret->dports)+1);
-        }
- 
-  ret->show_net = shownet;
diff --git a/net/nstreams/pkg-descr b/net/nstreams/pkg-descr
index d0710f77aaae..a9f4013d442e 100644
--- a/net/nstreams/pkg-descr
+++ b/net/nstreams/pkg-descr
@@ -6,8 +6,7 @@ is required for the users, and nothing more.
 
 Nstreams can parse the tcpdump output, or the files generated with the -w
 option of tcpdump. It can also directly sniff the data that occurs on the
-network (the use of tcpdump is however recommanded as long as nstreams is in
-version 0.99.x).
+network.
 
 This product was designed by HSC and coded by Renaud Deraison
 (deraison@cvs.nessus.org), author of the Nessus software (www.nessus.org). It
diff --git a/net/nstreams/pkg-plist b/net/nstreams/pkg-plist
index 529f8ba5af72..dd2665230d39 100644
--- a/net/nstreams/pkg-plist
+++ b/net/nstreams/pkg-plist
@@ -1,3 +1,3 @@
 bin/nstreams
 etc/nstreams-networks.sample
-etc/nstreams-services.sample
+etc/nstreams-services