4 files changed, 25 insertions, 17 deletions

diff --git a/net-mgmt/p0f2/Makefile b/net-mgmt/p0f2/Makefile
index f497525e43c3..28cfeee9bc7c 100644
--- a/net-mgmt/p0f2/Makefile
+++ b/net-mgmt/p0f2/Makefile
@@ -14,19 +14,14 @@ COMMENT=	Passive OS fingerprinting tool
 
 CONFLICTS=	p0f-3.*
 
+USES=		gmake
 USE_RC_SUBR=	p0f2
-USE_GMAKE=	yes
 ALL_TARGET=	all p0fq tools
 PORTDOCS=	COPYING CREDITS ChangeLog KNOWN_BUGS README TODO win-memleak.txt
-MAN1=		p0f.1
 WRKSRC=		${WRKDIR}/p0f
 
-NO_STAGE=	yes
-
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 post-patch:
 .for f in config.h doc/README
 	@${REINPLACE_CMD} -e 's|/etc|${PREFIX}/etc|g' ${WRKSRC}/${f}
@@ -34,20 +29,17 @@ post-patch:
 
 do-install:
 .for ii in p0f test/p0fq test/sendack test/sendack2 test/sendsyn
-	${INSTALL_PROGRAM} ${WRKSRC}/${ii} ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/${ii} ${STAGEDIR}${PREFIX}/bin
 .endfor
-	${INSTALL_SCRIPT} ${WRKSRC}/p0frep ${PREFIX}/bin
-	${MKDIR} ${PREFIX}/etc/p0f
+	${INSTALL_SCRIPT} ${WRKSRC}/p0frep ${STAGEDIR}${PREFIX}/bin
+	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/p0f
 .for ii in . a. o. r.
-	${INSTALL_DATA} ${WRKSRC}/p0f${ii}fp ${PREFIX}/etc/p0f
+	${INSTALL_DATA} ${WRKSRC}/p0f${ii}fp ${STAGEDIR}${PREFIX}/etc/p0f
 .endfor
-	${INSTALL_MAN} ${WRKSRC}/${MAN1} ${MANPREFIX}/man/man1
-
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/p0f.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for ii in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/doc/${ii} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/${ii} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/p0f2/files/patch-mk__FreeBSD b/net-mgmt/p0f2/files/patch-mk__FreeBSD
new file mode 100644
index 000000000000..01c1d4af865a
--- /dev/null
+++ b/net-mgmt/p0f2/files/patch-mk__FreeBSD
@@ -0,0 +1,15 @@
+--- ./mk/FreeBSD.orig	2014-02-28 09:14:15.972688127 +0100
++++ ./mk/FreeBSD	2014-02-28 09:15:04.890685340 +0100
+@@ -7,10 +7,10 @@
+ # (C) Copyright 2000-2006 by Michal Zalewski <lcamtuf@coredump.cx>
+ #
+ 
+-CC      = gcc
++CC      ?= gcc
+ LIBS	= -lpcap
+ STRIP   = strip
+-CFLAGS  = -O3 -Wall -fomit-frame-pointer -funroll-loops \
++CFLAGS  += -Wall \
+           -DUSE_BPF=\"${USE_BPF}\" \
+ 	  -I/usr/include/pcap -I/usr/local/include/pcap -I/usr/local/include
+ FILE	= p0f
diff --git a/net-mgmt/p0f2/pkg-descr b/net-mgmt/p0f2/pkg-descr
index 536d72a9a835..0b8f6b8719cf 100644
--- a/net-mgmt/p0f2/pkg-descr
+++ b/net-mgmt/p0f2/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://lcamtuf.coredump.cx/p0f.shtml
+WWW: http://lcamtuf.coredump.cx/p0f.shtml
diff --git a/net-mgmt/p0f2/pkg-plist b/net-mgmt/p0f2/pkg-plist
index 15a574a0cb1d..cab5ec684af2 100644
--- a/net-mgmt/p0f2/pkg-plist
+++ b/net-mgmt/p0f2/pkg-plist
@@ -8,4 +8,5 @@ etc/p0f/p0f.fp
 etc/p0f/p0fa.fp
 etc/p0f/p0fo.fp
 etc/p0f/p0fr.fp
+man/man1/p0f.1.gz
 @dirrmtry etc/p0f