5 files changed, 14 insertions, 33 deletions

diff --git a/net-mgmt/p0f/Makefile b/net-mgmt/p0f/Makefile
index ade24554083c..6a59a4c6308c 100644
--- a/net-mgmt/p0f/Makefile
+++ b/net-mgmt/p0f/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	p0f
-PORTVERSION=	2.0.4
+PORTVERSION=	2.0.5
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://lcamtuf.coredump.cx/p0f/
 EXTRACT_SUFX=	.tgz
@@ -15,16 +15,14 @@ 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
+PORTDOCS=	COPYING CREDITS ChangeLog KNOWN_BUGS README TODO win-memleak.txt
 MAN1=		p0f.1
-#PLIST=		${WRKDIR}/pkg-plist
-WRKSRC=		${WRKDIR}/p0f
+WRKSRC=		${WRKDIR}/${PORTNAME}
 
 post-patch:
-.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}
+	@${REINPLACE_CMD} -E '/^(CC|CFLAGS)/d' ${WRKSRC}/mk/FreeBSD
+.for f in config.h doc/README
+	@${REINPLACE_CMD} -e 's|/etc|${PREFIX}/etc|g' ${WRKSRC}/${f}
 .endfor
 
 do-install:
@@ -34,12 +32,13 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/p0frep ${PREFIX}/bin
 	${MKDIR} ${PREFIX}/etc/p0f
 .for ii in . a. r.
-	${INSTALL_DATA} ${WRKSRC}/p0f${ii}fp ${PREFIX}/etc/p0f/
+	${INSTALL_DATA} ${WRKSRC}/p0f${ii}fp ${PREFIX}/etc/p0f
 .endfor
-	${INSTALL_MAN} ${WRKSRC}/p0f.1 ${MANPREFIX}/man/man1/
+	${INSTALL_MAN} ${WRKSRC}/${MAN1} ${MANPREFIX}/man/man1
+
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-.for ii in ${DOCFILES}
+.for ii in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/doc/${ii} ${DOCSDIR}
 .endfor
 .endif
diff --git a/net-mgmt/p0f/distinfo b/net-mgmt/p0f/distinfo
index a650b3dfa75d..ed163e8a0c00 100644
--- a/net-mgmt/p0f/distinfo
+++ b/net-mgmt/p0f/distinfo
@@ -1,3 +1,3 @@
-MD5 (p0f-2.0.4.tgz) = 7dc7a20c7678233381ed1dbc96d1f423
-SHA256 (p0f-2.0.4.tgz) = fc6827f3792a325e79c300d9d45e526eb2da3a8c759cfe3695710b5016f3cfd3
-SIZE (p0f-2.0.4.tgz) = 126886
+MD5 (p0f-2.0.5.tgz) = 78235749e8ada6ad2b16b40fe15081f6
+SHA256 (p0f-2.0.5.tgz) = 563c62f63acfbef79e79659c3f483813816c7d032ef73e96e462a3b4f9a2fc7f
+SIZE (p0f-2.0.5.tgz) = 130002
diff --git a/net-mgmt/p0f/files/patch-FreeBSD b/net-mgmt/p0f/files/patch-FreeBSD
deleted file mode 100644
index 9a722f3afebd..000000000000
--- a/net-mgmt/p0f/files/patch-FreeBSD
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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
- 
diff --git a/net-mgmt/p0f/pkg-descr b/net-mgmt/p0f/pkg-descr
index def189dd1264..40218ee9f5b5 100644
--- a/net-mgmt/p0f/pkg-descr
+++ b/net-mgmt/p0f/pkg-descr
@@ -20,4 +20,4 @@ if you do not understand how this can be harmful.  Running p0f with
 no options will cause it to analyse packets intended for other
 hosts.
 
-WWW:  http://www.stearns.org/p0f/
+WWW:  http://lcamtuf.coredump.cx/p0f.shtml
diff --git a/net-mgmt/p0f/pkg-plist b/net-mgmt/p0f/pkg-plist
index 78c66aabe06f..d20aa1e9c8a7 100644
--- a/net-mgmt/p0f/pkg-plist
+++ b/net-mgmt/p0f/pkg-plist
@@ -7,12 +7,4 @@ 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%%