From leeym@utopia.leeym.com  Wed Jun  1 07:46:36 2005
Return-Path: <leeym@utopia.leeym.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id E25FF16A41C;
	Wed,  1 Jun 2005 07:46:36 +0000 (GMT)
	(envelope-from leeym@utopia.leeym.com)
Received: from msr27.hinet.net (msr27.hinet.net [168.95.4.127])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0C6D543D1F;
	Wed,  1 Jun 2005 07:46:35 +0000 (GMT)
	(envelope-from leeym@utopia.leeym.com)
Received: from utopia.leeym.com (utopia.leeym.com [211.21.137.52])
	by msr27.hinet.net (8.9.3/8.9.3) with ESMTP id PAA08113;
	Wed, 1 Jun 2005 15:46:32 +0800 (CST)
Received: from localhost (localhost [127.0.0.1])
	by utopia.leeym.com (Postfix) with ESMTP id C60483EA13F;
	Wed,  1 Jun 2005 15:46:31 +0800 (CST)
Received: from utopia.leeym.com ([127.0.0.1])
 by localhost (utopia.leeym.com [127.0.0.1]) (amavisd-new, port 10024)
 with ESMTP id 39201-03; Wed,  1 Jun 2005 15:46:29 +0800 (CST)
Received: by utopia.leeym.com (Postfix, from userid 1000)
	id 981FB3E9B23; Wed,  1 Jun 2005 15:46:29 +0800 (CST)
Message-Id: <20050601074629.981FB3E9B23@utopia.leeym.com>
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: [PATCH] net/tcpdump: fix build and unbreak
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         81751
>Category:       ports
>Synopsis:       [PATCH] net/tcpdump: fix build and unbreak
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pav
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jun 01 07:50:03 GMT 2005
>Closed-Date:    Thu Sep 15 07:46:24 GMT 2005
>Last-Modified:  Thu Sep 15 07:46:37 GMT 2005
>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:
Responsible-Changed-From-To: freebsd-ports-bugs->bms 
Responsible-Changed-By: barner 
Responsible-Changed-When: Wed Jun 1 11:05:34 GMT 2005 
Responsible-Changed-Why:  
Over to maintainer. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=81751 
State-Changed-From-To: open->feedback 
State-Changed-By: pav 
State-Changed-When: Wed Sep 14 23:52:46 GMT 2005 
State-Changed-Why:  
This no longer applies, and I think is no longer relevant, at least partially - 
the broken tag is gone and IGNORE= with different message is now in place. 

Do you still want to apply the rest of the patch - the libpcap dep thing? 


Responsible-Changed-From-To: bms->pav 
Responsible-Changed-By: pav 
Responsible-Changed-When: Wed Sep 14 23:52:46 GMT 2005 
Responsible-Changed-Why:  
Helping bms with PRs 

http://www.freebsd.org/cgi/query-pr.cgi?pr=81751 

From: Yen-Ming Lee <leeym@FreeBSD.org>
Date: Thu, 15 Sep 2005 12:18:36 +0800  (06:18 CEST)

> Do you still want to apply the rest of the patch - the libpcap dep thing?

No. You can just close this PR.


State-Changed-From-To: feedback->closed 
State-Changed-By: pav 
State-Changed-When: Thu Sep 15 07:45:37 GMT 2005 
State-Changed-Why:  
Submitter indicates he no longer want to pursue this 

http://www.freebsd.org/cgi/query-pr.cgi?pr=81751 
>Unformatted:
