- Update to 4.20040506

PR:		177918
Submitted by:	Ports Fury

4 files changed, 38 insertions, 61 deletions

diff --git a/net-mgmt/bpft/Makefile b/net-mgmt/bpft/Makefile
index 8e95ea2b265b..a91286588557 100644
--- a/net-mgmt/bpft/Makefile
+++ b/net-mgmt/bpft/Makefile
@@ -1,41 +1,51 @@
-# New ports collection makefile for:   bpft
-# Date created:			26 August 2002
-# Whom:				El Vampiro <vampiro@rootshell.ru>
-#
+# Created by: El Vampiro <vampiro@rootshell.ru>
 # $FreeBSD$
 
 PORTNAME=	bpft
-PORTVERSION=	4.20040414
+PORTVERSION=	4.20040506
 CATEGORIES=	net-mgmt
-MASTER_SITES=	SF/${PORTNAME}4/${PORTNAME}4/${PORTNAME}4-snapshot \
-		ftp://rusunix.org/pub/FreeBSD/distfiles/
-
-DISTNAME=	bpft4-2004-04-14
+MASTER_SITES=	SF/${PORTNAME}4/${PORTNAME}4/${PORTNAME}4-snapshot
+DISTNAME=	${PORTNAME}4-2004-05-06
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	The BPF Traffic collector
+COMMENT=	BPF Traffic collector
+
+LICENSE=	GPLv2 # (or later)
+
+OPTIONS_DEFINE=	DOCS
 
 CONFLICTS=	trafd-3.0.*
 
-WRKSRC=		${WRKDIR}/bpft
+WRKSRC=		${WRKDIR}/${PORTNAME}
+
+MAKE_JOBS_UNSAFE=	yes
+
+MANCOMPRESSED=	yes
 MAN1=		traflog.1 trafstat.1
 MAN8=		trafstatd.8 trafd.8
-PORTDOCS=	README WhatsNew
-MANCOMPRESSED=	yes
+
+.include <bsd.port.options.mk>
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g' ${WRKSRC}/include/pathnames.h
-	@${REINPLACE_CMD} -e 's|/usr/local/|${PREFIX}/|g' ${WRKSRC}/Makefile
-	@${REINPLACE_CMD} -e 's|<net/slip.h>|"../linux-include/net/slip.h"|' \
+	@${REINPLACE_CMD} -e \
+		's|/usr/local|${PREFIX}|g' ${WRKSRC}/include/pathnames.h
+	@${REINPLACE_CMD} -e \
+		'/^PATH_TOSAVE/s|=.*|= ${PREFIX}/var/bpft| ; \
+		 /^INSTALL_DIRECTORY/s|=.*|= ${MKDIR}|' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e \
+		's|<net/slip.h>|"../linux-include/net/slip.h"|' \
 		${WRKSRC}/lib/interfaces.c
 
 post-install:
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-. for file in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
-. endfor
+.for i in bin/traflog bin/trafstat sbin/trafd sbin/trafstatd
+	@${STRIP_CMD} ${PREFIX}/${i}
+.endfor
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${DOCSDIR}
+.for i in README WhatsNew
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${DOCSDIR})
+.endfor
 .endif
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/bpft/distinfo b/net-mgmt/bpft/distinfo
index f2ffc3eaede0..c416b504f3c3 100644
--- a/net-mgmt/bpft/distinfo
+++ b/net-mgmt/bpft/distinfo
@@ -1,2 +1,2 @@
-SHA256 (bpft4-2004-04-14.tgz) = f90c9e3a288546f920b2f5bac19c9144ac953587ec342696c85a34706677438c
-SIZE (bpft4-2004-04-14.tgz) = 74673
+SHA256 (bpft4-2004-05-06.tgz) = 68d16d9142928749b4b1afd3577d2701a0b61095805b45da086a2078d3b151ac
+SIZE (bpft4-2004-05-06.tgz) = 79568
diff --git a/net-mgmt/bpft/files/patch-Makefile b/net-mgmt/bpft/files/patch-Makefile
deleted file mode 100644
index 7404ede441db..000000000000
--- a/net-mgmt/bpft/files/patch-Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
---- Makefile.orig	Thu Apr  1 11:39:16 2004
-+++ Makefile	Wed Apr 21 14:49:31 2004
-@@ -31,7 +31,7 @@
- PATH_SBINDIR=${PREFIX}/sbin
- 
- # Trailing slash directory, summary traffic log files will be put there.
--PATH_TOSAVE=/var/trafd/
-+PATH_TOSAVE=/usr/local/var/bpft/
- 
- # Full pathname where locate trafstat program.
- PATH_TRAFSTAT=${PREFIX}/bin/trafstat
-@@ -92,14 +92,11 @@
- 
- 
- install: all
--	${INSTALL_DIRECTORY} ${PATH_BINDIR}
--	${INSTALL_DIRECTORY} ${PATH_SBINDIR}
- 	${INSTALL_PROGRAM} trafd/trafd ${PATH_SBINDIR}
- 	${INSTALL_SCRIPT} trafd/trafstart ${PATH_BINDIR}
- 	${INSTALL_SCRIPT} trafd/trafstop ${PATH_BINDIR}
- 	${INSTALL_SCRIPT} trafd/trafsave ${PATH_BINDIR}
- 	${INSTALL_SCRIPT} trafd/trafdump ${PATH_BINDIR}
--	${INSTALL_DIRECTORY} ${PATH_LOCAL_STARTUP_DIR}
- 	${INSTALL_SCRIPT} trafd/trafd.sh ${PATH_LOCAL_STARTUP_DIR}
- 	${INSTALL_PROGRAM} trafstat/trafstat ${PATH_BINDIR}
- 	${INSTALL_PROGRAM} trafstatd/trafstatd ${PATH_SBINDIR}
-@@ -107,9 +104,7 @@
- 	${INSTALL_FILE} traflog/traflog.format ${PATH_TRAFLOG_FMT}
- 	${INSTALL_DIRECTORY} ${PATH_TOSAVE}
- 	@echo Install man pages:
--	@${INSTALL_DIRECTORY} ${PREFIX_MANPAGES}1
- 	@-for iii in ${MANPAGES_1}; do echo ${PREFIX_MANPAGES}1/$${iii}.1 ; gzip <$${iii}/$${iii}.1 >$${iii}/$${iii}.1.gz ; ${INSTALL_FILE} $${iii}/$${iii}.1.gz ${PREFIX_MANPAGES}1 ; done
--	@${INSTALL_DIRECTORY} ${PREFIX_MANPAGES}8
- 	@-for iii in ${MANPAGES_8}; do echo ${PREFIX_MANPAGES}8/$${iii}.8 ; gzip <$${iii}/$${iii}.8 >$${iii}/$${iii}.8.gz ; ${INSTALL_FILE} $${iii}/$${iii}.8.gz ${PREFIX_MANPAGES}8 ; done
- 	@echo Done.
- 
diff --git a/net-mgmt/bpft/pkg-plist b/net-mgmt/bpft/pkg-plist
index 8c70e4012dc1..d655ae60e672 100644
--- a/net-mgmt/bpft/pkg-plist
+++ b/net-mgmt/bpft/pkg-plist
@@ -1,5 +1,3 @@
-sbin/trafd
-sbin/trafstatd
 bin/trafdump
 bin/traflog
 bin/trafsave
@@ -8,5 +6,10 @@ bin/trafstat
 bin/trafstop
 etc/rc.d/trafd.sh
 etc/traflog.format
+sbin/trafd
+sbin/trafstatd
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/WhatsNew
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrmtry var/bpft
 @dirrmtry var