ports/61103: [patch] update net/tcpdump to latest version and introduce TCPDUMP_OVERWRITE_BASE
Edwin Groothuis
edwin at mavetju.org
Fri Jan 9 00:10:20 UTC 2004
>Number: 61103
>Category: ports
>Synopsis: [patch] update net/tcpdump to latest version and introduce TCPDUMP_OVERWRITE_BASE
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Thu Jan 08 16:10:17 PST 2004
>Closed-Date:
>Last-Modified:
>Originator: Edwin Groothuis
>Release: FreeBSD 4.8-RELEASE i386
>Organization:
-
>Environment:
System: FreeBSD k7.mavetju 4.8-RELEASE FreeBSD 4.8-RELEASE #1: Mon Jan 5 18:59:31 EST 2004 edwin at k7.mavetju:/usr/src/sys/compile/k7 i386
>Description:
- Chase up update of net/libpcap
- Introduce TCPDUMP_OVERWRITE_BASE, which installs tcpdump in /usr
instead of /usr/local/
See PR ports/61096 for net/libpcap
>How-To-Repeat:
>Fix:
diff -rNu /usr/ports/net/tcpdump/Makefile tcpdump/Makefile
--- /usr/ports/net/tcpdump/Makefile Fri Dec 12 01:03:35 2003
+++ tcpdump/Makefile Fri Jan 9 10:58:11 2004
@@ -7,14 +7,19 @@
PORTNAME= tcpdump
PORTVERSION= 3.8.1
+PORTREVISION= 351
CATEGORIES= net
MASTER_SITES= http://www.tcpdump.org/beta/
-DISTNAME= ${PORTNAME}-${PORTVERSION}-316
+DISTNAME= ${PORTNAME}-${PORTVERSION}-${PORTREVISION}
MAINTAINER= bms at FreeBSD.org
COMMENT= Ubiquitous network traffic analysis tool
+.if defined(TCPDUMP_OVERWRITE_BASE)
+LIB_DEPENDS= pcap.2:${PORTSDIR}/net/libpcap
+.else
BUILD_DEPENDS= ${LOCALBASE}/lib/libpcap.a:${PORTSDIR}/net/libpcap
+.endif
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
@@ -22,6 +27,19 @@
GNU_CONFIGURE= yes
+.if defined(TCPDUMP_OVERWRITE_BASE)
+PREFIX= /usr
+PKGNAMESUFFIX= -overwrite-base
+MANPREFIX= ${PREFIX}/share
+CONFIGURE_ARGS+=--mandir=${MANPREFIX}/man
+PLIST_SUB+= NOTBASE="@comment "
+PLIST_SUB+= BASE=""
+PKGMESSAGE= ${FILESDIR}/pkg-message-base
+.else
+PLIST_SUB+= BASE="@comment "
+PLIST_SUB+= NOTBASE=""
+.endif
+
.if !defined(WITHOUT_IPV6)
CONFIGURE_ARGS+= --enable-ipv6
.endif
@@ -54,5 +72,10 @@
.for i in ${LOCALPCAPFILES}
${LN} -s ${LOCALBASE}/$i ${LOCALPCAPDIR}
.endfor
+
+.if defined(TCPDUMP_OVERWRITE_BASE)
+post-install:
+ ${CAT} ${PKGMESSAGE}
+.endif
.include <bsd.port.mk>
diff -rNu /usr/ports/net/tcpdump/distinfo tcpdump/distinfo
--- /usr/ports/net/tcpdump/distinfo Thu Dec 11 06:14:20 2003
+++ tcpdump/distinfo Fri Jan 9 10:43:46 2004
@@ -1 +1 @@
-MD5 (tcpdump-3.8.1-316.tar.gz) = 7149aeee925a4b05ac9d07aed3beb546
+MD5 (tcpdump-3.8.1-351.tar.gz) = d4dad7a6e4728e23238fc01b18b2c866
diff -rNu /usr/ports/net/tcpdump/files/pkg-message-base tcpdump/files/pkg-message-base
--- /usr/ports/net/tcpdump/files/pkg-message-base Thu Jan 1 10:00:00 1970
+++ tcpdump/files/pkg-message-base Fri Jan 9 10:50:56 2004
@@ -0,0 +1,7 @@
+***************************************
+* You can always reinstall the older *
+* tcpdump via the source directory *
+* of the base system: *
+* $ cd /usr/src/usr.sbin/tcpdump *
+* $ make && make install *
+***************************************
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list