4 files changed, 35 insertions, 21 deletions

diff --git a/net-mgmt/bpft/Makefile b/net-mgmt/bpft/Makefile
index 3815c9788e7b..eb9b181295f2 100644
--- a/net-mgmt/bpft/Makefile
+++ b/net-mgmt/bpft/Makefile
@@ -5,19 +5,17 @@
 # $FreeBSD$
 
 PORTNAME=	bpft
-PORTVERSION=	4.20031028
+PORTVERSION=	4.20040414
 CATEGORIES=	net-mgmt
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		ftp://rusunix.org/pub/FreeBSD/distfiles/
 MASTER_SITE_SUBDIR=bpft4
-DISTNAME=	bpft4-latest
+DISTNAME=	bpft4-2004-04-14
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	aquatique-ports@rambler.ru
 COMMENT=	The BPF Traffic collector
 
-BROKEN=		"Changes permissions of system directories"
-
 CONFLICTS=	trafd-3.0.*
 
 WRKSRC=		${WRKDIR}/bpft
@@ -26,18 +24,9 @@ MAN8=		trafstatd.8 trafd.8
 MANCOMPRESSED=	yes
 USE_REINPLACE=	yes
 
-pre-everything::
-	@${ECHO_MSG}
-	@${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-	@${ECHO_MSG} "!!!                         WARNING                           !!!"
-	@${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-	@${ECHO_MSG}
-	@${ECHO_MSG} "This port uses original trafd binaries layout"
-	@${ECHO_MSG} "Original trafd and bpft binaries layout are mutually exclusive"
-	@${ECHO_MSG}
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g' ${WRKSRC}/include/pathnames.h
+	@${REINPLACE_CMD} -e 's|/usr/local/|${PREFIX}/|g' ${WRKSRC}/Makefile
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/net-mgmt/bpft/distinfo b/net-mgmt/bpft/distinfo
index 473dcd498e9e..896faf55f899 100644
--- a/net-mgmt/bpft/distinfo
+++ b/net-mgmt/bpft/distinfo
@@ -1,2 +1,2 @@
-MD5 (bpft4-latest.tgz) = 7607793dd686426976cb0aa99a3ae384
-SIZE (bpft4-latest.tgz) = 62476
+MD5 (bpft4-2004-04-14.tgz) = 6c8b60d245a94a89944dd02005b07254
+SIZE (bpft4-2004-04-14.tgz) = 74673
diff --git a/net-mgmt/bpft/files/patch-Makefile b/net-mgmt/bpft/files/patch-Makefile
index 0989d9f70e9d..7404ede441db 100644
--- a/net-mgmt/bpft/files/patch-Makefile
+++ b/net-mgmt/bpft/files/patch-Makefile
@@ -1,11 +1,36 @@
---- Makefile.orig	Sun Mar 30 17:45:30 2003
-+++ Makefile	Sun Mar 30 17:46:23 2003
+--- 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=${PREFIX}/var/trafd/
-+PATH_TOSAVE=${PREFIX}/var/bpft/
+-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 a39e75b53b62..d91739088830 100644
--- a/net-mgmt/bpft/pkg-plist
+++ b/net-mgmt/bpft/pkg-plist
@@ -10,6 +10,6 @@ etc/rc.d/trafd.sh
 etc/traflog.format
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/WhatsNew
-@dirrm var/bpft
+@unexec rmdir %D/var/bpft 2>/dev/null || true
 @unexec rmdir %D/var 2>/dev/null || true
 %%PORTDOCS%%@dirrm %%DOCSDIR%%