Update to thcrut 1.2.5

Submitted by:	Peter Hoskin <peterh@criten.org> (based on)

5 files changed, 74 insertions, 13 deletions

diff --git a/net/thcrut/Makefile b/net/thcrut/Makefile
index 6d5b9bfb3fe9..9a86a725269d 100644
--- a/net/thcrut/Makefile
+++ b/net/thcrut/Makefile
@@ -6,15 +6,13 @@
 #
 
 PORTNAME=	thcrut
-PORTVERSION=	0.1
+PORTVERSION=	1.2.5
 CATEGORIES=	net
-MASTER_SITES=	http://www.thehackerschoice.com/releases/
+MASTER_SITES=	http://www.thc.org/releases/
 
 MAINTAINER=	kris@FreeBSD.org
 COMMENT=	Local network discovery tool
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libnet.a:${PORTSDIR}/net/libnet
-
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS+= --with-libnet=${LOCALBASE} \
diff --git a/net/thcrut/distinfo b/net/thcrut/distinfo
index 8ef604ecdb1b..423e5a24c293 100644
--- a/net/thcrut/distinfo
+++ b/net/thcrut/distinfo
@@ -1 +1 @@
-MD5 (thcrut-0.1.tar.gz) = 223b9aaf55206f6c981b40ab30ac1b50
+MD5 (thcrut-1.2.5.tar.gz) = 190f08ce6839aecb0fa0ce8d5ddd09ee
diff --git a/net/thcrut/files/patch-aa b/net/thcrut/files/patch-aa
index f28bfa4eac12..45a2dcb12f9f 100644
--- a/net/thcrut/files/patch-aa
+++ b/net/thcrut/files/patch-aa
@@ -1,14 +1,42 @@
---- configure.orig	Thu Aug 23 05:43:58 2001
-+++ configure	Thu Aug 23 05:44:08 2001
-@@ -1154,11 +1154,6 @@
+--- configure.orig	Sun May 25 12:57:05 2003
++++ configure	Sat Jul 12 02:36:17 2003
+@@ -1088,18 +1088,6 @@
+ echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
+ if test "$ac_test_CFLAGS" = set; then
+   CFLAGS="$ac_save_CFLAGS"
+-elif test $ac_cv_prog_cc_g = yes; then
+-  if test "$GCC" = yes; then
+-    CFLAGS="-g -O2"
+-  else
+-    CFLAGS="-g"
+-  fi
+-else
+-  if test "$GCC" = yes; then
+-    CFLAGS="-O2"
+-  else
+-    CFLAGS=
+-  fi
+ fi
+ 
+ # Find a good install program.  We prefer a C program (faster),
+@@ -1271,10 +1259,6 @@
  
  fi
  
 -if test $ac_cv_prog_gcc = yes; then
--  CCOPTS='-O3 -Wall'
+-  CCOPTS='-O2 -Wall'
 -  CFLAGS="$CCOPTS"
 -fi
--
- # Extract the first word of "md5sum", so it can be a program name with args.
- set dummy md5sum; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+ test "x$prefix" != "xNONE" || prefix="/usr/local"
+ test "x$exec_prefix" != "xNONE" || exec_prefix="${prefix}"
+ trydir_i="${prefix}/include"
+@@ -1325,9 +1309,7 @@
+ 	echo "### Some FreeBSDs' have a broken SELECT-BPF"
+ 	echo "### implementation (see tcpdump mailinglist)."
+ 	echo "### THC RUT might not work at all on such a platform."
+-	echo "### continueing in 10 seconds. Good luck!"
+ 	echo "############################################################"
+-	sleep 10
+ 		;;
+ esac
+ 
diff --git a/net/thcrut/files/patch-ab b/net/thcrut/files/patch-ab
new file mode 100644
index 000000000000..8d49a34a5a92
--- /dev/null
+++ b/net/thcrut/files/patch-ab
@@ -0,0 +1,33 @@
+--- Libnet-1.0.2a/configure.orig	Sun May 25 12:57:05 2003
++++ Libnet-1.0.2a/configure	Sat Jul 12 02:35:43 2003
+@@ -1281,18 +1281,6 @@
+ echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
+ if test "$ac_test_CFLAGS" = set; then
+   CFLAGS="$ac_save_CFLAGS"
+-elif test $ac_cv_prog_cc_g = yes; then
+-  if test "$GCC" = yes; then
+-    CFLAGS="-g -O2"
+-  else
+-    CFLAGS="-g"
+-  fi
+-else
+-  if test "$GCC" = yes; then
+-    CFLAGS="-O2"
+-  else
+-    CFLAGS=
+-  fi
+ fi
+ 
+ 
+@@ -5352,11 +5340,6 @@
+ fi
+ 
+ 
+-
+-if test $ac_cv_prog_gcc = yes; then
+-    CCOPTS='-O2 -funroll-loops -fomit-frame-pointer -Wall'
+-    CFLAGS="$CCOPTS"
+-fi
+ 
+ # Check whether --with-pf_packet or --without-pf_packet was given.
+ if test "${with_pf_packet+set}" = set; then
diff --git a/net/thcrut/pkg-plist b/net/thcrut/pkg-plist
index 793a94745ffc..8e76c9f682fe 100644
--- a/net/thcrut/pkg-plist
+++ b/net/thcrut/pkg-plist
@@ -1,4 +1,6 @@
 @comment $OpenBSD: PLIST,v 1.1.1.1 2001/07/18 20:30:43 dugsong Exp $
 bin/thcrut
 share/thcrut/manuf
+share/thcrut/nmap-os-fingerprints
+share/thcrut/thcrut-os-fingerprints
 @dirrm share/thcrut