Update to 1.8.2. Remove patches to README and p0f.c because they

have been accepted upstream.  Install new CREDITS and ChangeLog
with documentation.  Install new p0frep script.  Use DOCSDIR macro.

5 files changed, 20 insertions, 35 deletions

diff --git a/net-mgmt/p0f/Makefile b/net-mgmt/p0f/Makefile
index a1b38dbd579..f60bb02bfce 100644
--- a/net-mgmt/p0f/Makefile
+++ b/net-mgmt/p0f/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=		p0f
-PORTVERSION=		1.8
+PORTVERSION=		1.8.2
 PORTREVISION=		1
 CATEGORIES=		net
 MASTER_SITES=		http://www.stearns.org/p0f/
@@ -14,7 +14,9 @@ EXTRACT_SUFX=		.tgz
 
 MAINTAINER=		trevor@FreeBSD.org
 
+DOCFILES=		COPYING CREDITS ChangeLog README
 MAN1=			p0f.1
+PLIST=			${WRKDIR}/pkg-plist
 
 post-patch:
 	${PERL} -pi -e "s=/etc=${PREFIX}/etc=g" \
@@ -23,13 +25,27 @@ post-patch:
 
 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
 
+pre-install:
+	${ECHO_CMD} bin/p0f	> ${PLIST}
+	${ECHO_CMD} bin/p0frep	>> ${PLIST}
+	${ECHO_CMD} etc/p0f.fp	>> ${PLIST}
+.if !defined(NOPORTDOCS)
+.for i in ${DOCFILES}
+	${ECHO_CMD} share/doc/p0f/$i >> ${PLIST}
+.endfor
+	${ECHO_CMD} "@dirrm share/doc/p0f" >> ${PLIST}
+.endif
+
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/p0f
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/p0f
+	${MKDIR} ${DOCSDIR}/p0f
+.for i in ${DOCFILES}
+	${INSTALL_DATA} ${WRKSRC}/$i ${PREFIX}/share/doc/p0f
+.endfor
 .endif
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/p0f/distinfo b/net-mgmt/p0f/distinfo
index 64553d9ff86..4c647bbcc52 100644
--- a/net-mgmt/p0f/distinfo
+++ b/net-mgmt/p0f/distinfo
@@ -1 +1 @@
-MD5 (p0f-1.8.tgz) = a800396508a9d4bd4e4204a76ea79c2e
+MD5 (p0f-1.8.2.tgz) = fdc811dda8e0d261a5564d1f3ad5c24c
diff --git a/net-mgmt/p0f/files/patch-README b/net-mgmt/p0f/files/patch-README
deleted file mode 100644
index 1e201f6ac13..00000000000
--- a/net-mgmt/p0f/files/patch-README
+++ /dev/null
@@ -1,11 +0,0 @@
---- README.old	Thu Jan 17 21:58:09 2002
-+++ README	Sun Jan 20 23:30:58 2002
-@@ -94,7 +94,7 @@
- 
-   In order to obtain information required for fingerprinting, you have to
-   receive at least one SYN packet initiating a TCP connection to your machine or
--  or network.  Note: you don't have to respond to this particular SYN.  Of course,
-+  network.  Note: you don't have to respond to this particular SYN.  Of course,
-   it's impossible to perform any kind of OS detection without receiving any
-   information.
- 
diff --git a/net-mgmt/p0f/files/patch-p0f.c b/net-mgmt/p0f/files/patch-p0f.c
deleted file mode 100644
index 5d5c61e2f1c..00000000000
--- a/net-mgmt/p0f/files/patch-p0f.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- p0f.c.orig	Thu Jan 17 21:05:58 2002
-+++ p0f.c	Mon Jan 21 00:22:56 2002
-@@ -348,10 +348,9 @@
-         T_tstamp = 1;
- 	break;
-       case 'o':
--        { FILE* x;
--          x=fopen(optarg,"a");
--          if (!x) { perror(optarg); exit(1); }
--          stdout=x;
-+        if (!freopen(optarg,"a",stdout)) {
-+          perror(optarg);
-+          exit(1);
-         }
- 	break;
-       default:
diff --git a/net-mgmt/p0f/pkg-plist b/net-mgmt/p0f/pkg-plist
deleted file mode 100644
index ac2c86b8a33..00000000000
--- a/net-mgmt/p0f/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-bin/p0f
-etc/p0f.fp
-share/doc/p0f/README
-@dirrm share/doc/p0f