From igla@batterybackups.net  Mon Nov 10 09:52:52 2003
Return-Path: <igla@batterybackups.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id A0D0416A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 10 Nov 2003 09:52:52 -0800 (PST)
Received: from Repulse.batterybackups.net (adsl-63-197-143-124.dsl.scrm01.pacbell.net [63.197.143.124])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 1DF9B43FDD
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 10 Nov 2003 09:52:51 -0800 (PST)
	(envelope-from igla@batterybackups.net)
Received: from ArkRoyal.batterybackups.net (ArkRoyal.batterybackups.net [10.0.0.9])
	by Repulse.batterybackups.net (Postfix) with SMTP id 554C33116
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 10 Nov 2003 09:52:54 -0800 (PST)
Received: (nullmailer pid 1651 invoked by uid 1000);
	Mon, 10 Nov 2003 17:52:49 -0000
Message-Id: <1068486769.206726.1650.nullmailer@ArkRoyal.batterybackups.net>
Date: Mon, 10 Nov 2003 09:52:49 -0800
From: igla@batterybackups.net
To: FreeBSD-gnats-submit@freebsd.org
Subject: update net/bpft to 4.20031028
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         59143
>Category:       ports
>Synopsis:       update net/bpft to 4.20031028
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Nov 10 10:00:35 PST 2003
>Closed-Date:    Tue Nov 11 01:02:34 PST 2003
>Last-Modified:  Tue Nov 11 01:02:34 PST 2003
>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@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
-@unexec rmdir %%PREFIX%%/var 2>/dev/null || true
+@unexec rmdir %D/var 2>/dev/null || true
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
>Release-Note:
>Audit-Trail:

From: "Evgueni V. Gavrilov" <aquatique@rusunix.org>
To: freebsd-gnats-submit@FreeBSD.org, igla@batterybackups.net
Cc:  
Subject: Re: ports/59143: update net/bpft to 4.20031028
Date: Tue, 11 Nov 2003 08:47:02 +0600

 This is a cryptographically signed message in MIME format.
 
 --------------ms080403070001050909010902
 Content-Type: text/plain; charset=us-ascii; format=flowed
 Content-Transfer-Encoding: 7bit
 
 PR approved
 thanx
 
 --------------ms080403070001050909010902
 Content-Type: application/x-pkcs7-signature; name="smime.p7s"
 Content-Transfer-Encoding: base64
 Content-Disposition: attachment; filename="smime.p7s"
 Content-Description: S/MIME Cryptographic Signature
 
 MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAQAAoIILHDCC
 BYowggPyoAMCAQICARAwDQYJKoZIhvcNAQEEBQAwgYExCzAJBgNVBAYTAlJVMQ8wDQYDVQQI
 EwZSdXNzaWExEDAOBgNVBAoTB1J1c1VuaXgxEjAQBgNVBAsTCVN5c2FkbWluczETMBEGA1UE
 AxMKRWwgVmFtcGlybzEmMCQGCSqGSIb3DQEJARYXdmFtcGlyb0B0aGUucnVzdW5peC5vcmcw
 HhcNMDMwMjEwMTEyNTM2WhcNMDgwMjE5MTEyNTM2WjB+MQswCQYDVQQGEwJSVTEPMA0GA1UE
 CBMGUnVzc2lhMRAwDgYDVQQKEwdSdXNVbml4MRIwEAYDVQQLEwlTeXNhZG1pbnMxEjAQBgNV
 BAMTCUFxdWF0aXF1ZTEkMCIGCSqGSIb3DQEJARYVYXF1YXRpcXVlQHJ1c3VuaXgub3JnMIIB
 ojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAwX3u2a7TGnO+QuMzrnUC66t/JdcINpMR
 HxDgql4TeaY6xRgoD++EfL1Isqq24qoJBNvvyQmUwklxrbajRUSwB1INroAFPQSfos3qPs7r
 E4jF09j+PGgIRXl4fvKvsDyX4voSD/ZSZgUxo4XwtTADQXfx2IJ7gdsphNYNbMMdCMW/hp8G
 EA0LLQgYBx4QHznJFDCcfugQatM9SzlYl5703SPBjkj/mF0UbUxKPp6rmB3364oxZ5UNVpik
 HfmNsoT1MksGVBiAziq5PFVFVDqFOuJDm1ll7Hi3bd7tT4oJ6WUUQfhXq2+g8MmT98C7EiUB
 V55SjbjDZBRgGndGxKqE1ebwzq3rQgm9LLJwbPLjX09gnL9Pg8xjbFEKU8F3bNGku83sZEvW
 PRm5LAI5XNGRdtiqce5kS78Ai7GQCZpGMZ7HxVSsc+LV3qbGn/VFUqY/V8LJHGxD76t+ZW0y
 ZaRaCpSvuv7mK9euabLOXS9SJJ1VKQbLuNHyHXUqV4E3EjEzAgMBAAGjggENMIIBCTAJBgNV
 HRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAd
 BgNVHQ4EFgQUi7Vq7fYab0oWVCLca4LN7KTsgogwga4GA1UdIwSBpjCBo4AU7/MTSFfmV8VP
 8RGwjqfo8zkB1FWhgYekgYQwgYExCzAJBgNVBAYTAlJVMQ8wDQYDVQQIEwZSdXNzaWExEDAO
 BgNVBAoTB1J1c1VuaXgxEjAQBgNVBAsTCVN5c2FkbWluczETMBEGA1UEAxMKRWwgVmFtcGly
 bzEmMCQGCSqGSIb3DQEJARYXdmFtcGlyb0B0aGUucnVzdW5peC5vcmeCAQAwDQYJKoZIhvcN
 AQEEBQADggGBABxs15tIBcD3YH9/94i6ZpCRGQuJ+xolz4bgDOm/QgM+CG3bLvRgg84VkQUz
 aGXZiGtepd9soFL9FCjJC2lKDBJkSrwU9bW75ildxKAo3D6ILHPIZsIadAgORQDzV+PeUO+Y
 7P8Rmu0PbYRdWVfMg6JjHqpb54QQNBqkODtpJi++i4sPaUa3kf1EfK8TpCBcVyb6euAY/CpE
 2kjyXmnYOFcqJwnxFvES39uGx6AtUunr5Dghz/dnIera2lC5oidaVMNnGYTPXDLLkmj9jPou
 B2eBGtQWTmT8qi/1tf8KehLRF+UKWKuieuGyHANVWm0uRwxGGYHwoIrgZKtTwqmF9avihknb
 Tb1ylPat7obpHIymfTdzzMHGFV3Zs/UprHwp5bUJY1tScN9oYeTjrHdtGEp/ipc/35NHhKrM
 BGYi7IT9K2a0sB24jowZryQ54Ol+4m/MgfCXp3H65W1LGXfBk74c8vRrpKnJwz+fGRmQPN0f
 T+Kd3UoyWWlA6iSodnt9hzCCBYowggPyoAMCAQICARAwDQYJKoZIhvcNAQEEBQAwgYExCzAJ
 BgNVBAYTAlJVMQ8wDQYDVQQIEwZSdXNzaWExEDAOBgNVBAoTB1J1c1VuaXgxEjAQBgNVBAsT
 CVN5c2FkbWluczETMBEGA1UEAxMKRWwgVmFtcGlybzEmMCQGCSqGSIb3DQEJARYXdmFtcGly
 b0B0aGUucnVzdW5peC5vcmcwHhcNMDMwMjEwMTEyNTM2WhcNMDgwMjE5MTEyNTM2WjB+MQsw
 CQYDVQQGEwJSVTEPMA0GA1UECBMGUnVzc2lhMRAwDgYDVQQKEwdSdXNVbml4MRIwEAYDVQQL
 EwlTeXNhZG1pbnMxEjAQBgNVBAMTCUFxdWF0aXF1ZTEkMCIGCSqGSIb3DQEJARYVYXF1YXRp
 cXVlQHJ1c3VuaXgub3JnMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAwX3u2a7T
 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
 NPNHA4s51qjYAwAAAAAAAA==
 --------------ms080403070001050909010902--
 
State-Changed-From-To: open->closed 
State-Changed-By: krion 
State-Changed-When: Tue Nov 11 01:02:29 PST 2003 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=59143 
>Unformatted:
