Date: Wed, 1 Jun 2005 15:46:29 +0800 (CST) From: Yen-Ming Lee <leeym@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: bms@FreeBSD.org Subject: ports/81751: [PATCH] net/tcpdump: fix build and unbreak Message-ID: <20050601074629.981FB3E9B23@utopia.leeym.com> Resent-Message-ID: <200506010750.j517o3tm021808@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 81751
>Category: ports
>Synopsis: [PATCH] net/tcpdump: fix build and unbreak
>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: Wed Jun 01 07:50:03 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Yen-Ming Lee
>Release: FreeBSD 5.4-STABLE i386
>Organization:
FreeBSD Taiwan
>Environment:
System: FreeBSD utopia.leeym.com 5.4-STABLE FreeBSD 5.4-STABLE #0: Mon May 16 15:20:54 CST 2005
>Description:
- change default behavior to not depend on net/libpcap
- fix build and unbreak this port
Port maintainer (bms@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:
--- tcpdump-3.8.3_1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/net/tcpdump/Makefile,v
retrieving revision 1.12
diff -u -u -r1.12 Makefile
--- Makefile 26 Mar 2005 22:07:43 -0000 1.12
+++ Makefile 1 Jun 2005 07:44:43 -0000
@@ -18,7 +18,7 @@
# TODO: Add strict sanity check that we're compiling against a
# version of libpcap with which this tcpdump release is compatible.
#
-.if defined(TCPDUMP_OVERWRITE_BASE) || !defined(WITH_LIBPCAP_BASE)
+.if defined(TCPDUMP_OVERWRITE_BASE) || defined(WITH_LIBPCAP_PORT)
LIB_DEPENDS= pcap.2:${PORTSDIR}/net/libpcap
.endif
@@ -50,7 +50,7 @@
# User-definable switches:
# WITHOUT_CRYPTO Build without IPSEC or TCPMD5 decryption.
# WITHOUT_IPV6 Build without IPV6 support.
-# WITH_LIBPCAP_BASE Use libpcap from the base system instead of ports.
+# WITH_LIBPCAP_PORT Use libpcap from the ports instead of base system.
# WITH_RADIOTAP Build with support for BSD 802.11 Radiotap headers.
# WITH_TCPMD5 Build with support for TCP-MD5 digest verification.
#
@@ -95,7 +95,7 @@
# port to look for libpcap in ${LOCALPCAPBASE} first, for both
# the configure and build steps.
#
-.if defined(TCPDUMP_OVERWRITE_BASE) || !defined(WITH_LIBPCAP_BASE)
+.if defined(TCPDUMP_OVERWRITE_BASE) || defined(WITH_LIBPCAP_PORT)
LOCALPCAPBASE= ${LOCALBASE}
CONFIGURE_ENV+= CFLAGS="-L${LOCALPCAPBASE}/lib"
.else
@@ -106,12 +106,6 @@
lib/libpcap.a
WRKPCAPDIR= ${WRKDIR}/libpcap-0.8.3
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 503000
-BROKEN= "Broken dependency"
-.endif
-
# When building tcpdump against a particular pcap version, it expects to
# find a built, untarred source tree in the parent of the work tree.
# Build a symlink farm which points to the installed versions of the
@@ -129,4 +123,4 @@
${CAT} ${PKGMESSAGE}
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- tcpdump-3.8.3_1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050601074629.981FB3E9B23>