Update tcpdump port to latest beta with fixes for security vulnerabilities

in tandem with vendor branch in src tree.
Add an option to overwrite the base system tcpdump.

PR:		ports/61103
Submitted by:	edwin

net/tcpdump/Makefile

@@ -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@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 @@ MAN1=		tcpdump.1
 
 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
@@ -55,4 +73,9 @@ pre-configure:
 	${LN} -s ${LOCALBASE}/$i ${LOCALPCAPDIR}
 .endfor
 
+.if defined(TCPDUMP_OVERWRITE_BASE)
+post-install:
+	${CAT} ${PKGMESSAGE}
+.endif
+
 .include <bsd.port.mk>

net/tcpdump/distinfo

@@ -1 +1 @@
-MD5 (tcpdump-3.8.1-316.tar.gz) = 7149aeee925a4b05ac9d07aed3beb546
+MD5 (tcpdump-3.8.1-351.tar.gz) = d4dad7a6e4728e23238fc01b18b2c866

net/tcpdump/files/pkg-message-base

@@ -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              *
+***************************************