Update port: net/xprobe 0.2 -> 0.2.1

	New release. Most of the patches updated in vendor code.
	Now based at sf.net.

PR:		ports/75669
Submitted by:	Yonatan <onatan@gmail.com>

8 files changed, 10 insertions, 65 deletions

diff --git a/net/xprobe/Makefile b/net/xprobe/Makefile
index 37e1686edb61..004e8b78ac97 100644
--- a/net/xprobe/Makefile
+++ b/net/xprobe/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	xprobe2
-PORTVERSION=	0.2
+PORTVERSION=	0.2.1
 CATEGORIES=	net
-MASTER_SITES=	http://www.sys-security.com/archive/tools/xprobe2/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	xprobe
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	ICMP active OS fingerprint scanner
diff --git a/net/xprobe/distinfo b/net/xprobe/distinfo
index 2a8ae1e0ea95..644fa5c448f1 100644
--- a/net/xprobe/distinfo
+++ b/net/xprobe/distinfo
@@ -1,3 +1,2 @@
-MD5 (xprobe2-0.2.tar.gz) = ca723a7e4c8c5001191efdb43e63bbee
-SIZE (xprobe2-0.2.tar.gz) = 474216
-SIZE (xprobe-0.0.2.tar.gz) = 52117
+MD5 (xprobe2-0.2.1.tar.gz) = aaddb4bf793ef573b7fb43ee91bb2224
+SIZE (xprobe2-0.2.1.tar.gz) = 481766
diff --git a/net/xprobe/files/patch-USI++:src:Makefile.in b/net/xprobe/files/patch-USI++:src:Makefile.in
deleted file mode 100644
index 78ddaa92ce6d..000000000000
--- a/net/xprobe/files/patch-USI++:src:Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- libs-external/USI++/src/Makefile.in.orig	Sun Feb  8 21:56:52 2004
-+++ libs-external/USI++/src/Makefile.in	Sun Feb  8 22:02:00 2004
-@@ -2,7 +2,7 @@
- #
- 
- LIBS=@LIBS@
--CFLAGS=@CFLAGS@ -I/usr/include/pcap -I. -Wall
-+CFLAGS=@CFLAGS@ -I/usr/include -I. -Wall
- CXX=@CXX@
- INSTALL=@INSTALL@
- RANLIB=@RANLIB@
diff --git a/net/xprobe/files/patch-USI++:src:datalink.cc b/net/xprobe/files/patch-USI++:src:datalink.cc
deleted file mode 100644
index f171430ed9b9..000000000000
--- a/net/xprobe/files/patch-USI++:src:datalink.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- libs-external/USI++/src/datalink.cc.orig	Fri Sep 26 13:40:23 2003
-+++ libs-external/USI++/src/datalink.cc	Mon Mar 22 17:26:18 2004
-@@ -249,7 +249,7 @@
- 
- 	// loopback
- 	case DLT_NULL:
--		d_framelen = 0;
-+		d_framelen = 4;
- 		break;
- #ifdef DLT_LINUX_SLL
-     case DLT_LINUX_SLL:
-@@ -349,6 +349,8 @@
-                 break;
- 	case DLT_RAW:
- 		break;
-+	case DLT_NULL:
-+		break;	
- #ifdef DLT_LINUX_SLL
-     case DLT_LINUX_SLL:
-         break;          
diff --git a/net/xprobe/files/patch-docs:xprobe2.1 b/net/xprobe/files/patch-docs:xprobe2.1
index 1df460011671..900c8976aeba 100644
--- a/net/xprobe/files/patch-docs:xprobe2.1
+++ b/net/xprobe/files/patch-docs:xprobe2.1
@@ -1,11 +1,11 @@
---- docs/xprobe2.1.orig	Sun Feb  8 21:35:27 2004
-+++ docs/xprobe2.1	Sun Feb  8 21:24:29 2004
+--- docs/xprobe2.1.orig	Mon Dec 20 13:17:24 2004
++++ docs/xprobe2.1	Thu Dec 30 20:33:00 2004
 @@ -21,7 +21,7 @@
  
  .\" Generate man page: groff -man -Tascii xprobe.1 
  
--.TH XPROBE2  "$Id: xprobe2.1,v 1.9 2003/09/23 13:13:48 mederchik Exp $"
-+.TH XPROBE2 1 "$Id: xprobe2.1,v 1.9 2003/09/23 13:13:48 mederchik Exp $"
+-.TH XPROBE2  "$Id: xprobe2.1,v 1.13 2004/12/15 18:17:39 mederchik Exp $"
++.TH XPROBE2 1 "$Id: xprobe2.1,v 1.13 2004/12/15 18:17:39 mederchik Exp $"
  .SH NAME
  xprobe2 \- A Remote active operating system fingerprinting tool.
  .SH SYNOPSIS
diff --git a/net/xprobe/files/patch-src:config_set.cc b/net/xprobe/files/patch-src:config_set.cc
deleted file mode 100644
index ca3c53130261..000000000000
--- a/net/xprobe/files/patch-src:config_set.cc
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/config_set.cc.orig	Fri Sep 26 13:40:23 2003
-+++ src/config_set.cc	Thu Feb 26 00:32:04 2004
-@@ -158,8 +158,7 @@
- 
-             case XP_CONFIG_TK_SECEND:
-                 if (get_state() != XP_CONFIG_TK_SECBEGIN) {
--                    ui->error("[x] Multiple close sections on line:
--                    %i\n", cf->get_linenum());
-+                    ui->error("[x] Multiple close sections on line: %i\n", cf->get_linenum());
-                     return FAIL;
-                 }
-                 set_state(0);
diff --git a/net/xprobe/files/patch-src:os_matrix.cc b/net/xprobe/files/patch-src:os_matrix.cc
deleted file mode 100644
index 72affbdc7bc2..000000000000
--- a/net/xprobe/files/patch-src:os_matrix.cc
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/os_matrix.cc.orig	Fri Sep 26 13:40:23 2003
-+++ src/os_matrix.cc	Thu Feb 26 00:33:20 2004
-@@ -84,8 +84,7 @@
-     xprobe_mdebug(XPROBE_DEBUG_OSMATRIX,"Following systems are recognizable\n");
-     for (osid_i = osid_name.begin();
-          osid_i != osid_name.end(); osid_i++) {
--        xprobe_debug(XPROBE_DEBUG_OSMATRIX,"Id: %i\tOS:
--        %s\n",(*osid_i).first, (*osid_i).second.c_str());
-+        xprobe_debug(XPROBE_DEBUG_OSMATRIX,"Id: %i\tOS: %s\n",(*osid_i).first, (*osid_i).second.c_str());
-     }
- }
- 
diff --git a/net/xprobe/pkg-descr b/net/xprobe/pkg-descr
index 8c1e81ae1843..a4a5c3274f4d 100644
--- a/net/xprobe/pkg-descr
+++ b/net/xprobe/pkg-descr
@@ -4,4 +4,4 @@ X is a logic developed from the various Active Operating System
 Fingerprinting methods discovered during the "ICMP Usage In 
 Scanning" research project.
 
-WWW: http://www.sys-security.com/html/projects/X.html
+WWW: http://xprobe.sourceforge.net