From owner-svn-ports-all@FreeBSD.ORG  Wed Apr 23 14:24:14 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id A53BCD53;
 Wed, 23 Apr 2014 14:24:14 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 91C351C74;
 Wed, 23 Apr 2014 14:24:14 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3NEOEdZ073932;
 Wed, 23 Apr 2014 14:24:14 GMT (envelope-from garga@svn.freebsd.org)
Received: (from garga@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3NEOEuH073930;
 Wed, 23 Apr 2014 14:24:14 GMT (envelope-from garga@svn.freebsd.org)
Message-Id: <201404231424.s3NEOEuH073930@svn.freebsd.org>
From: Renato Botelho <garga@FreeBSD.org>
Date: Wed, 23 Apr 2014 14:24:14 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r351948 - in head/security/dsniff: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 23 Apr 2014 14:24:14 -0000

Author: garga
Date: Wed Apr 23 14:24:13 2014
New Revision: 351948
URL: http://svnweb.freebsd.org/changeset/ports/351948
QAT: https://qat.redports.org/buildarchive/r351948/

Log:
  Fix build with clang:
    . Add direct dependency to net/bpf.h
    . Rename symbol csin to avoid conflict with complex.h
  
  Approved by:	portmgr (blanket)

Modified:
  head/security/dsniff/Makefile
  head/security/dsniff/files/patch-pcaputil.c

Modified: head/security/dsniff/Makefile
==============================================================================
--- head/security/dsniff/Makefile	Wed Apr 23 14:22:47 2014	(r351947)
+++ head/security/dsniff/Makefile	Wed Apr 23 14:24:13 2014	(r351948)
@@ -55,6 +55,9 @@ post-patch:
 		 s|(LNETINC=).*|\1${LIBNET_INC}|; \
 		 s|(LNETLIB=).*|\1${LIBNET_LIB}|' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
+	@${REINPLACE_CMD} -e 's,csin,_csin,g' \
+		${WRKSRC}/webmitm.c \
+		${WRKSRC}/sshmitm.c
 
 .if !empty(LIBNIDS_GLIB2)
 pre-configure:

Modified: head/security/dsniff/files/patch-pcaputil.c
==============================================================================
--- head/security/dsniff/files/patch-pcaputil.c	Wed Apr 23 14:22:47 2014	(r351947)
+++ head/security/dsniff/files/patch-pcaputil.c	Wed Apr 23 14:24:13 2014	(r351948)
@@ -1,10 +1,11 @@
 --- ./pcaputil.c.orig	Tue Nov 14 12:51:08 2000
 +++ ./pcaputil.c	Mon Sep 25 16:26:13 2006
-@@ -13,9 +13,9 @@
+@@ -13,9 +13,10 @@
  #include <stdlib.h>
  #include <string.h>
  #include <err.h>
 -#include <pcap.h>
++#include <net/bpf.h>
 +#include </usr/include/pcap.h>
  #ifdef BSD
 -#include <pcap-int.h>