7 files changed, 33 insertions, 79 deletions

diff --git a/net-mgmt/p0f/Makefile b/net-mgmt/p0f/Makefile
index aec15c8bf3de..ade24554083c 100644
--- a/net-mgmt/p0f/Makefile
+++ b/net-mgmt/p0f/Makefile
@@ -6,19 +6,18 @@
 #
 
 PORTNAME=	p0f
-PORTVERSION=	2.0.3
-PORTREVISION=	1
+PORTVERSION=	2.0.4
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://lcamtuf.coredump.cx/p0f/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	babak@farrokhi.net
 COMMENT=	Passive OS fingerprinting tool
 
 ALL_TARGET=	all p0fq tools
 DOCFILES=	COPYING CREDITS ChangeLog KNOWN_BUGS README TODO win-memleak.txt
 MAN1=		p0f.1
-PLIST=		${WRKDIR}/pkg-plist
+#PLIST=		${WRKDIR}/pkg-plist
 WRKSRC=		${WRKDIR}/p0f
 
 post-patch:
@@ -45,20 +44,4 @@ do-install:
 .endfor
 .endif
 
-pre-install:
-	@>${PLIST}
-.for ii in p0f p0frep p0fq sendack sendack2 sendsyn
-	${ECHO_CMD} bin/${ii} >> ${PLIST}
-.endfor
-.for ii in . a. r.
-	${ECHO_CMD} etc/p0f/p0f${ii}fp	>> ${PLIST}
-.endfor
-	${ECHO_CMD} "@dirrm etc/p0f" >> ${PLIST}
-.if !defined(NOPORTDOCS)
-.for i in ${DOCFILES}
-	${ECHO_CMD} share/doc/p0f/$i >> ${PLIST}
-.endfor
-	${ECHO_CMD} "@dirrm share/doc/p0f" >> ${PLIST}
-.endif
-
 .include <bsd.port.mk>
diff --git a/net-mgmt/p0f/distinfo b/net-mgmt/p0f/distinfo
index 6e0ac03bdae6..a650b3dfa75d 100644
--- a/net-mgmt/p0f/distinfo
+++ b/net-mgmt/p0f/distinfo
@@ -1,4 +1,3 @@
-$FreeBSD$
-MD5 (p0f-2.0.3.tgz) = 583688a4c5718eec0bb34102b3ac457b
-SIZE (p0f-2.0.3.tgz) = 119407
-SHA256 (p0f-2.0.3.tgz) = e2d58c71a5e014e8391789f48f787c493b1c81901001c55d5ce888aba5b84a41
+MD5 (p0f-2.0.4.tgz) = 7dc7a20c7678233381ed1dbc96d1f423
+SHA256 (p0f-2.0.4.tgz) = fc6827f3792a325e79c300d9d45e526eb2da3a8c759cfe3695710b5016f3cfd3
+SIZE (p0f-2.0.4.tgz) = 126886
diff --git a/net-mgmt/p0f/files/patch-FreeBSD b/net-mgmt/p0f/files/patch-FreeBSD
index 0de9b2359258..9a722f3afebd 100644
--- a/net-mgmt/p0f/files/patch-FreeBSD
+++ b/net-mgmt/p0f/files/patch-FreeBSD
@@ -1,16 +1,10 @@
-$FreeBSD$
-
---- mk/FreeBSD.orig	Sat Aug 30 15:41:17 2003
-+++ mk/FreeBSD	Mon Sep  8 03:58:17 2003
-@@ -7,10 +7,9 @@
- # (C) Copyright 2000-2003 by Michal Zalewski <lcamtuf@coredump.cx>
- #
- 
--CC      = gcc
-+CC?      = gcc
+--- mk/FreeBSD.orig	Sun Feb 12 01:48:12 2006
++++ mk/FreeBSD	Sun Feb 12 01:48:24 2006
+@@ -10,7 +10,6 @@
+ CC      = gcc
  LIBS	= -lpcap -I/usr/include/pcap -I/usr/local/include/pcap
  STRIP   = strip
 -CFLAGS  = -O3 -Wall -fomit-frame-pointer -funroll-loops
  FILE	= p0f
+ TOOLS   = test/sendack test/sendack2 test/sendsyn
  
- all: $(FILE) strip	
diff --git a/net-mgmt/p0f/files/patch-mtu.h b/net-mgmt/p0f/files/patch-mtu.h
deleted file mode 100644
index 116c1ae95371..000000000000
--- a/net-mgmt/p0f/files/patch-mtu.h
+++ /dev/null
@@ -1,14 +0,0 @@
-$FreeBSD$
-Add loopback support for FreeBSD.
-author:  Radim Kolar
-
---- mtu.h.orig	Fri Oct 10 20:56:39 2003
-+++ mtu.h	Tue Feb 17 21:10:49 2004
-@@ -58,6 +58,7 @@
-   {  4352, "FDDI" },
-   {  4500, "token ring (2)" },
-   {  9180, "FORE ATM" },
-+  { 16384, "loopback" },
-   { 16436, "sometimes loopback" },
-   { 18000, "token ring x4" },
- };
diff --git a/net-mgmt/p0f/files/patch-p0f.c b/net-mgmt/p0f/files/patch-p0f.c
index 449f830730e7..902098e03f2c 100644
--- a/net-mgmt/p0f/files/patch-p0f.c
+++ b/net-mgmt/p0f/files/patch-p0f.c
@@ -1,20 +1,6 @@
-$FreeBSD$
-Add loopback support for FreeBSD.
-author:  Radim Kolar
-
---- p0f.c.orig	Tue Feb 17 21:11:51 2004
-+++ p0f.c	Tue Feb 17 21:10:48 2004
-@@ -161,7 +161,8 @@
- 
-   switch(type) {
- 
--    case DLT_NULL:
-+    case DLT_NULL: header_len=4; break;
-+
-     case DLT_SLIP:
-     case DLT_RAW:  break;
- 
-@@ -1199,11 +1200,15 @@
+--- p0f.c.orig	Sun Jul 11 02:17:57 2004
++++ p0f.c	Sun Feb 12 01:44:36 2006
+@@ -1238,11 +1238,15 @@
    /* Whoops, IP header ends past end_ptr */
    if ((_u8*)(iph + 1) > end_ptr) return;
  
@@ -32,7 +18,7 @@ author:  Radim Kolar
    /* If the declared length is shorter than the snapshot (etherleak
       or such), truncate this bad boy. */
  
-@@ -1590,7 +1595,7 @@
+@@ -1632,7 +1636,7 @@
      if (!use_iface) use_iface=pcap_lookupdev(errbuf);
  #endif /* ^WIN32 */
  
diff --git a/net-mgmt/p0f/files/patch-test_p0fq.c b/net-mgmt/p0f/files/patch-test_p0fq.c
deleted file mode 100644
index eb1d0372afb1..000000000000
--- a/net-mgmt/p0f/files/patch-test_p0fq.c
+++ /dev/null
@@ -1,12 +0,0 @@
-$FreeBSD$
-
---- test/p0fq.c.orig	Fri Oct 10 14:51:08 2003
-+++ test/p0fq.c	Wed Dec 17 20:10:31 2003
-@@ -14,6 +14,7 @@
- 
-   */
- 
-+#include <sys/types.h>
- #include <sys/socket.h>
- #include <stdio.h>
- #include <stdlib.h>
diff --git a/net-mgmt/p0f/pkg-plist b/net-mgmt/p0f/pkg-plist
new file mode 100644
index 000000000000..78c66aabe06f
--- /dev/null
+++ b/net-mgmt/p0f/pkg-plist
@@ -0,0 +1,18 @@
+bin/p0f
+bin/p0frep
+bin/p0fq
+bin/sendack
+bin/sendack2
+bin/sendsyn
+etc/p0f/p0f.fp
+etc/p0f/p0fa.fp
+etc/p0f/p0fr.fp
+%%DOCSDIR%%/COPYING
+%%DOCSDIR%%/CREDITS
+%%DOCSDIR%%/ChangeLog
+%%DOCSDIR%%/KNOWN_BUGS
+%%DOCSDIR%%/README
+%%DOCSDIR%%/TODO
+%%DOCSDIR%%/win-memleak.txt
+@dirrm etc/p0f
+@dirrm %%DOCSDIR%%