summaryrefslogtreecommitdiff
path: root/net-mgmt/bpft
diff options
context:
space:
mode:
authorKirill Ponomarev <krion@FreeBSD.org>2003-11-11 09:02:24 +0000
committerKirill Ponomarev <krion@FreeBSD.org>2003-11-11 09:02:24 +0000
commitd70ee1ace1411cad46d58e3b74bf4d1d46037dce (patch)
treefcd27a35fcab93921968c1b9daa69d0f9cdd94a9 /net-mgmt/bpft
parentBunch 'o fixes for the BSD games, many from NetBSD. (diff)
* 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 PR: 59143 Submitted by: igla@batterybackups.net Approved by: maintainer
Notes
Notes: svn path=/head/; revision=93726
Diffstat (limited to 'net-mgmt/bpft')
-rw-r--r--net-mgmt/bpft/Makefile10
-rw-r--r--net-mgmt/bpft/distinfo2
-rw-r--r--net-mgmt/bpft/files/patch-pathnames17
-rw-r--r--net-mgmt/bpft/pkg-install2
-rw-r--r--net-mgmt/bpft/pkg-plist2
5 files changed, 10 insertions, 23 deletions
diff --git a/net-mgmt/bpft/Makefile b/net-mgmt/bpft/Makefile
index 06d61f29c8e2..0b9e80f5ee29 100644
--- a/net-mgmt/bpft/Makefile
+++ b/net-mgmt/bpft/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
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 @@ COMMENT= The BPF Traffic collector
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 @@ pre-everything::
@${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 --git a/net-mgmt/bpft/distinfo b/net-mgmt/bpft/distinfo
index 5b9c5f2c92a6..ecba538d0686 100644
--- a/net-mgmt/bpft/distinfo
+++ b/net-mgmt/bpft/distinfo
@@ -1 +1 @@
-MD5 (bpft4-latest.tgz) = 3810114b068f438cc7e8e0b1af745953
+MD5 (bpft4-latest.tgz) = 7607793dd686426976cb0aa99a3ae384
diff --git a/net-mgmt/bpft/files/patch-pathnames b/net-mgmt/bpft/files/patch-pathnames
deleted file mode 100644
index b6bc90e43456..000000000000
--- a/net-mgmt/bpft/files/patch-pathnames
+++ /dev/null
@@ -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 --git a/net-mgmt/bpft/pkg-install b/net-mgmt/bpft/pkg-install
index deeadea00ab4..706e7e660786 100644
--- a/net-mgmt/bpft/pkg-install
+++ b/net-mgmt/bpft/pkg-install
@@ -1,4 +1,4 @@
#!/bin/sh
-DBDIR=/usr/local/var/bpft
+DBDIR=${PREFIX}/var/bpft
mkdir -p $DBDIR
diff --git a/net-mgmt/bpft/pkg-plist b/net-mgmt/bpft/pkg-plist
index f872117be805..a39e75b53b62 100644
--- a/net-mgmt/bpft/pkg-plist
+++ b/net-mgmt/bpft/pkg-plist
@@ -11,5 +11,5 @@ etc/traflog.format
%%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%%