4 files changed, 32 insertions, 36 deletions

diff --git a/net/p0f/Makefile b/net/p0f/Makefile
index bd0093a6f8f2..a73d653bf6f0 100644
--- a/net/p0f/Makefile
+++ b/net/p0f/Makefile
@@ -6,30 +6,35 @@
 #
 
 PORTNAME=		p0f
-PORTVERSION=		1.8.2
-PORTREVISION=		1
+PORTVERSION=		2.0.1
 CATEGORIES=		net
-MASTER_SITES=		http://www.stearns.org/p0f/
+MASTER_SITES=		http://lcamtuf.coredump.cx/p0f/
 EXTRACT_SUFX=		.tgz
 
 MAINTAINER=		trevor@FreeBSD.org
 COMMENT=		Passive OS fingerprinting tool
 
-USE_REINPLACE=		yes
-DOCFILES=		COPYING CREDITS ChangeLog README
-MAN1=			p0f.1
+DOCFILES=		COPYING CREDITS KNOWN_BUGS README TODO winxp-memleak.txt
 PLIST=			${WRKDIR}/pkg-plist
+WRKSRC=			${WRKDIR}/p0f
 
 post-patch:
-	${REINPLACE_CMD} -e "s=/etc=${PREFIX}/etc=g" \
-		${WRKSRC}/README \
-		${WRKSRC}/p0f.c
+.for ii in config.h doc/README
+	${MV} ${WRKSRC}/${ii} ${WRKSRC}/${ii}.orig
+	${SED} -e "s=/etc=${PREFIX}/etc=g" < ${WRKSRC}/${ii}.orig > \
+		${WRKSRC}/${ii}
+.endfor
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/p0f ${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/p0frep ${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/p0f.fp ${PREFIX}/etc
-	${INSTALL_MAN} ${WRKSRC}/${MAN1} ${MANPREFIX}/man/man1
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+.for ii in ${DOCFILES}
+	${INSTALL_DATA} ${WRKSRC}/doc/${ii} ${DOCSDIR}
+.endfor
+.endif
 
 pre-install:
 	${ECHO_CMD} bin/p0f	> ${PLIST}
@@ -42,12 +47,4 @@ pre-install:
 	${ECHO_CMD} "@dirrm share/doc/p0f" >> ${PLIST}
 .endif
 
-post-install:
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-.for i in ${DOCFILES}
-	${INSTALL_DATA} ${WRKSRC}/$i ${PREFIX}/share/doc/p0f
-.endfor
-.endif
-
 .include <bsd.port.mk>
diff --git a/net/p0f/distinfo b/net/p0f/distinfo
index 4c647bbcc520..e17337abd3e2 100644
--- a/net/p0f/distinfo
+++ b/net/p0f/distinfo
@@ -1 +1 @@
-MD5 (p0f-1.8.2.tgz) = fdc811dda8e0d261a5564d1f3ad5c24c
+MD5 (p0f-2.0.1.tgz) = 50a8f485a13843f2cd20e40c9f3cb6ad
diff --git a/net/p0f/files/patch-FreeBSD b/net/p0f/files/patch-FreeBSD
new file mode 100644
index 000000000000..0de9b2359258
--- /dev/null
+++ b/net/p0f/files/patch-FreeBSD
@@ -0,0 +1,16 @@
+$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
+ LIBS	= -lpcap -I/usr/include/pcap -I/usr/local/include/pcap
+ STRIP   = strip
+-CFLAGS  = -O3 -Wall -fomit-frame-pointer -funroll-loops
+ FILE	= p0f
+ 
+ all: $(FILE) strip	
diff --git a/net/p0f/files/patch-Makefile b/net/p0f/files/patch-Makefile
deleted file mode 100644
index a5ba44cb2520..000000000000
--- a/net/p0f/files/patch-Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
---- Makefile.orig	Sat Sep  2 17:41:34 2000
-+++ Makefile	Sat Sep  2 17:41:48 2000
-@@ -3,11 +3,12 @@
- # (c) <lcamtuf@tpi.pl>
- #
- 
--CC      = gcc
-+CC      ?= gcc
- CLIBS	= -lpcap
- SUNLIBS	= -lsocket -lnsl -D_SUN_=1
- STRIP	= strip
--CFLAGS  = -O3 -Wall
-+CFLAGS  ?= -O3
-+CFLAGS	+= -Wall
- FILE	= p0f
- VERSION = 1.7
-