Update port: net/bpft

	Update port: net/bpft to current version 4.20030301

PR:		ports/50600
Submitted by:	?

10 files changed, 38 insertions, 60 deletions

diff --git a/net-mgmt/bpft/Makefile b/net-mgmt/bpft/Makefile
index dc93155..8def774 100644
--- a/net-mgmt/bpft/Makefile
+++ b/net-mgmt/bpft/Makefile
@@ -5,11 +5,13 @@
 # $FreeBSD$
 
 PORTNAME=	bpft
-PORTVERSION=	4.0
+PORTVERSION=	4.20030301
 CATEGORIES=	net
-MASTER_SITES=	http://bpft.by.ru/ \
-		ftp://vampiro.rootshell.ru/pub/FreeBSD/distfiles/
-EXTRACT_SUFX=	_29-07-2002.tgz
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
+		ftp://rusunix.org/pub/FreeBSD/distfiles/
+MASTER_SITE_SUBDIR=bpft4
+DISTNAME=	bpft4-latest
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	vampiro@rusunix.org
 COMMENT=	The BPF Traffic collector
@@ -33,9 +35,5 @@ post-install:
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/WhatsNew ${DOCSDIR}
-	${STRIP_CMD} ${PREFIX}/sbin/trafd
-	${STRIP_CMD} ${PREFIX}/sbin/trafstatd
-	${STRIP_CMD} ${PREFIX}/bin/trafstat
-	${STRIP_CMD} ${PREFIX}/bin/traflog
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/bpft/distinfo b/net-mgmt/bpft/distinfo
index fd8c0fb..6a855ea 100644
--- a/net-mgmt/bpft/distinfo
+++ b/net-mgmt/bpft/distinfo
@@ -1 +1 @@
-MD5 (bpft-4.0_29-07-2002.tgz) = 6e7c8f843b91fb9c771027bb8d9879c7
+MD5 (bpft4-latest.tgz) = 9bf42e8eabd2de2db1e28dc671651adb
diff --git a/net-mgmt/bpft/files/patch-Makefile b/net-mgmt/bpft/files/patch-Makefile
index c3710ba..0989d9f 100644
--- a/net-mgmt/bpft/files/patch-Makefile
+++ b/net-mgmt/bpft/files/patch-Makefile
@@ -1,15 +1,6 @@
---- Makefile.orig	Sun Dec  2 11:44:35 2001
-+++ Makefile	Wed Feb  5 04:24:20 2003
-@@ -43,8 +43,6 @@
- #
- 
- 
--PREFIX=/usr/local
--
- # Man pages prefix
- PREFIX_MANPAGES=${PREFIX}/man/man
- PREFIX_CATMANPAGES=${PREFIX}/man/cat
-@@ -59,7 +57,7 @@
+--- Makefile.orig	Sun Mar 30 17:45:30 2003
++++ Makefile	Sun Mar 30 17:46:23 2003
+@@ -31,7 +31,7 @@
  PATH_SBINDIR=${PREFIX}/sbin
  
  # Trailing slash directory, summary traffic log files will be put there.
diff --git a/net-mgmt/bpft/files/patch-pathnames b/net-mgmt/bpft/files/patch-pathnames
index 5c122d2..b6bc90e 100644
--- a/net-mgmt/bpft/files/patch-pathnames
+++ b/net-mgmt/bpft/files/patch-pathnames
@@ -1,6 +1,6 @@
---- include/pathnames.h.orig	Mon Aug 26 11:24:39 2002
-+++ include/pathnames.h	Mon Aug 26 11:25:09 2002
-@@ -49,12 +49,12 @@
+--- include/pathnames.h.orig	Fri Oct 18 10:28:27 2002
++++ include/pathnames.h	Sun Mar 30 17:48:50 2003
+@@ -33,12 +33,12 @@
  
  /* where unerased tmp directory */
  #ifndef	_PATH_VARTMP
diff --git a/net-mgmt/bpft/pkg-plist b/net-mgmt/bpft/pkg-plist
index 3843b57..6ebfc3a 100644
--- a/net-mgmt/bpft/pkg-plist
+++ b/net-mgmt/bpft/pkg-plist
@@ -1,15 +1,15 @@
 sbin/trafd
 sbin/trafstatd
-bin/trafstart
-bin/trafstop
-bin/trafsave
 bin/trafdump
-bin/trafstat
 bin/traflog
-etc/traflog.format
+bin/trafsave
+bin/trafstart
+bin/trafstat
+bin/trafstop
 etc/rc.d/trafd.sh
+etc/traflog.format
 share/doc/bpft/README
 share/doc/bpft/WhatsNew
 @dirrm var/bpft
-@dirrm var
+@unexec rmdir %%PREFIX%%/var 2>/dev/null || true
 @dirrm share/doc/bpft
diff --git a/net/bpft/Makefile b/net/bpft/Makefile
index dc93155..8def774 100644
--- a/net/bpft/Makefile
+++ b/net/bpft/Makefile
@@ -5,11 +5,13 @@
 # $FreeBSD$
 
 PORTNAME=	bpft
-PORTVERSION=	4.0
+PORTVERSION=	4.20030301
 CATEGORIES=	net
-MASTER_SITES=	http://bpft.by.ru/ \
-		ftp://vampiro.rootshell.ru/pub/FreeBSD/distfiles/
-EXTRACT_SUFX=	_29-07-2002.tgz
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
+		ftp://rusunix.org/pub/FreeBSD/distfiles/
+MASTER_SITE_SUBDIR=bpft4
+DISTNAME=	bpft4-latest
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	vampiro@rusunix.org
 COMMENT=	The BPF Traffic collector
@@ -33,9 +35,5 @@ post-install:
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/WhatsNew ${DOCSDIR}
-	${STRIP_CMD} ${PREFIX}/sbin/trafd
-	${STRIP_CMD} ${PREFIX}/sbin/trafstatd
-	${STRIP_CMD} ${PREFIX}/bin/trafstat
-	${STRIP_CMD} ${PREFIX}/bin/traflog
 
 .include <bsd.port.mk>
diff --git a/net/bpft/distinfo b/net/bpft/distinfo
index fd8c0fb..6a855ea 100644
--- a/net/bpft/distinfo
+++ b/net/bpft/distinfo
@@ -1 +1 @@
-MD5 (bpft-4.0_29-07-2002.tgz) = 6e7c8f843b91fb9c771027bb8d9879c7
+MD5 (bpft4-latest.tgz) = 9bf42e8eabd2de2db1e28dc671651adb
diff --git a/net/bpft/files/patch-Makefile b/net/bpft/files/patch-Makefile
index c3710ba..0989d9f 100644
--- a/net/bpft/files/patch-Makefile
+++ b/net/bpft/files/patch-Makefile
@@ -1,15 +1,6 @@
---- Makefile.orig	Sun Dec  2 11:44:35 2001
-+++ Makefile	Wed Feb  5 04:24:20 2003
-@@ -43,8 +43,6 @@
- #
- 
- 
--PREFIX=/usr/local
--
- # Man pages prefix
- PREFIX_MANPAGES=${PREFIX}/man/man
- PREFIX_CATMANPAGES=${PREFIX}/man/cat
-@@ -59,7 +57,7 @@
+--- Makefile.orig	Sun Mar 30 17:45:30 2003
++++ Makefile	Sun Mar 30 17:46:23 2003
+@@ -31,7 +31,7 @@
  PATH_SBINDIR=${PREFIX}/sbin
  
  # Trailing slash directory, summary traffic log files will be put there.
diff --git a/net/bpft/files/patch-pathnames b/net/bpft/files/patch-pathnames
index 5c122d2..b6bc90e 100644
--- a/net/bpft/files/patch-pathnames
+++ b/net/bpft/files/patch-pathnames
@@ -1,6 +1,6 @@
---- include/pathnames.h.orig	Mon Aug 26 11:24:39 2002
-+++ include/pathnames.h	Mon Aug 26 11:25:09 2002
-@@ -49,12 +49,12 @@
+--- include/pathnames.h.orig	Fri Oct 18 10:28:27 2002
++++ include/pathnames.h	Sun Mar 30 17:48:50 2003
+@@ -33,12 +33,12 @@
  
  /* where unerased tmp directory */
  #ifndef	_PATH_VARTMP
diff --git a/net/bpft/pkg-plist b/net/bpft/pkg-plist
index 3843b57..6ebfc3a 100644
--- a/net/bpft/pkg-plist
+++ b/net/bpft/pkg-plist
@@ -1,15 +1,15 @@
 sbin/trafd
 sbin/trafstatd
-bin/trafstart
-bin/trafstop
-bin/trafsave
 bin/trafdump
-bin/trafstat
 bin/traflog
-etc/traflog.format
+bin/trafsave
+bin/trafstart
+bin/trafstat
+bin/trafstop
 etc/rc.d/trafd.sh
+etc/traflog.format
 share/doc/bpft/README
 share/doc/bpft/WhatsNew
 @dirrm var/bpft
-@dirrm var
+@unexec rmdir %%PREFIX%%/var 2>/dev/null || true
 @dirrm share/doc/bpft