ports/59143: update net/bpft to 4.20031028

[igla at batterybackups.net]

>Number:         59143
>Category:       ports
>Synopsis:       update net/bpft to 4.20031028
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Nov 10 10:00:35 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     
>Release:        FreeBSD 4.9-STABLE i386
>Organization:
none
>Environment:
System: FreeBSD ArkRoyal.batterybackups.net 4.9-STABLE FreeBSD 4.9-STABLE #2: Sun Nov 9 15:50:16 PST 2003 portsspam at batterybackups.net:/usr/obj/usr/src/sys/ArkRoyal i386

>Description:
* fix fetching by updating to 2003-10-28
* unbreak
* replace patch-pathnames with REINPLACE_CMD
* honor NOPORTDOCS
* make pkg-install honor PREFIX
* replace %%PREFIX%% with %D in packing list per portlint

approved by maintainer

>How-To-Repeat:
>Fix:

diff -r -u -N bpft.orig/Makefile bpft/Makefile
--- bpft.orig/Makefile	Wed Nov  5 10:18:32 2003
+++ bpft/Makefile	Fri Nov  7 16:15:33 2003
@@ -5,7 +5,7 @@
 # $FreeBSD: ports/net/bpft/Makefile,v 1.13 2003/11/03 03:56:38 kris Exp $
 
 PORTNAME=	bpft
-PORTVERSION=	4.20030925
+PORTVERSION=	4.20031028
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		ftp://rusunix.org/pub/FreeBSD/distfiles/
@@ -18,12 +18,11 @@
 
 CONFLICTS=	trafd-3.0.*
 
-BROKEN=		Does not fetch, will be removed after Feb 2
-
 WRKSRC=		${WRKDIR}/bpft
 MAN1=		traflog.1 trafstat.1
 MAN8=		trafstatd.8 trafd.8
 MANCOMPRESSED=	yes
+USE_REINPLACE=	yes
 
 pre-everything::
 	@${ECHO_MSG}
@@ -35,9 +34,14 @@
 	@${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
+
 post-install:
+.if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/WhatsNew ${DOCSDIR}
+.endif
 
 .include <bsd.port.mk>
diff -r -u -N bpft.orig/distinfo bpft/distinfo
--- bpft.orig/distinfo	Fri Sep 26 08:37:14 2003
+++ bpft/distinfo	Fri Nov  7 15:39:26 2003
@@ -1 +1 @@
-MD5 (bpft4-latest.tgz) = 3810114b068f438cc7e8e0b1af745953
+MD5 (bpft4-latest.tgz) = 7607793dd686426976cb0aa99a3ae384
diff -r -u -N bpft.orig/files/patch-pathnames bpft/files/patch-pathnames
--- bpft.orig/files/patch-pathnames	Wed Apr 16 14:48:24 2003
+++ bpft/files/patch-pathnames	Wed Dec 31 16:00:00 1969
@@ -1,17 +0,0 @@
---- 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
--#define	_PATH_VARTMP		"/usr/local/var/trafd/tmp/"
-+#define	_PATH_VARTMP		"/usr/local/var/bpft/tmp/"
- #endif
- 
- /* where backuped data */
- #ifndef	PATH_TOSAVE
--#define	PATH_TOSAVE		"/usr/local/var/trafd/"
-+#define	PATH_TOSAVE		"/usr/local/var/bpft/"
- #endif
- 
- /* where locate trafstat */
diff -r -u -N bpft.orig/pkg-install bpft/pkg-install
--- bpft.orig/pkg-install	Wed Feb  5 04:30:01 2003
+++ bpft/pkg-install	Fri Nov  7 15:54:29 2003
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-DBDIR=/usr/local/var/bpft
+DBDIR=${PREFIX}/var/bpft
 mkdir -p $DBDIR
diff -r -u -N bpft.orig/pkg-plist bpft/pkg-plist
--- bpft.orig/pkg-plist	Fri Sep 26 08:37:14 2003
+++ bpft/pkg-plist	Fri Nov  7 15:54:42 2003
@@ -11,5 +11,5 @@
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/WhatsNew
 @dirrm var/bpft
- at unexec rmdir %%PREFIX%%/var 2>/dev/null || true
+ at unexec rmdir %D/var 2>/dev/null || true
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
>Release-Note:
>Audit-Trail:
>Unformatted: