From owner-svn-src-all@freebsd.org  Thu Oct  5 17:02:22 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id CD131E3D70C;
 Thu,  5 Oct 2017 17:02:22 +0000 (UTC)
 (envelope-from gordon@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 98F707DD12;
 Thu,  5 Oct 2017 17:02:22 +0000 (UTC)
 (envelope-from gordon@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v95H2LBH057701;
 Thu, 5 Oct 2017 17:02:21 GMT (envelope-from gordon@FreeBSD.org)
Received: (from gordon@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v95H2LJW057700;
 Thu, 5 Oct 2017 17:02:21 GMT (envelope-from gordon@FreeBSD.org)
Message-Id: <201710051702.v95H2LJW057700@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gordon set sender to
 gordon@FreeBSD.org using -f
From: Gordon Tetlow <gordon@FreeBSD.org>
Date: Thu, 5 Oct 2017 17:02:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r324322 - stable/11/usr.sbin/tcpdump/tcpdump
X-SVN-Group: stable-11
X-SVN-Commit-Author: gordon
X-SVN-Commit-Paths: stable/11/usr.sbin/tcpdump/tcpdump
X-SVN-Commit-Revision: 324322
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 05 Oct 2017 17:02:22 -0000

Author: gordon
Date: Thu Oct  5 17:02:21 2017
New Revision: 324322
URL: https://svnweb.freebsd.org/changeset/base/324322

Log:
  MFC r323709:
  Revert tcpdump to using the source manpage instead of having a copy here.
  
  This helps future maintainability of tcpdump so we don't forget to update
  the manpage (like we have previously).

Deleted:
  stable/11/usr.sbin/tcpdump/tcpdump/tcpdump.1
Modified:
  stable/11/usr.sbin/tcpdump/tcpdump/Makefile
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/usr.sbin/tcpdump/tcpdump/Makefile
==============================================================================
--- stable/11/usr.sbin/tcpdump/tcpdump/Makefile	Thu Oct  5 16:48:05 2017	(r324321)
+++ stable/11/usr.sbin/tcpdump/tcpdump/Makefile	Thu Oct  5 17:02:21 2017	(r324322)
@@ -173,7 +173,7 @@ SRCS=	addrtoname.c \
 	tcpdump.c \
 	util-print.c \
 	version.c
-CLEANFILES+=	version.c
+CLEANFILES+=	version.c ${MAN}
 
 CFLAGS+= -I${.CURDIR} -I${TCPDUMP_DISTDIR}
 CFLAGS+= -DHAVE_CONFIG_H
@@ -210,3 +210,9 @@ version.c: ${TCPDUMP_DISTDIR}/VERSION
 		> version.c
 
 .include <bsd.prog.mk>
+
+.for mp in ${MAN}
+${mp}: ${mp}.in
+	sed -e 's/@MAN_MISC_INFO@/7/g' -e 's/@MAN_FILE_FORMATS@/5/g' \
+		${.ALLSRC} > ${.TARGET}
+.endfor