From: Peter Avalos <pavalos@theshell.com>
Date: Sat, 4 Jul 2009 21:26:17 +0000 (-1000)
Subject: Merge branch 'vendor/LIBPCAP'
X-Git-Tag: v2.3.2~45^2~6
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/aa352feab907f86ed2ef95548f60c87e1059b33a

Merge branch 'vendor/LIBPCAP'
---

aa352feab907f86ed2ef95548f60c87e1059b33a
diff --cc contrib/libpcap/README.DELETED
index 2bb3acd0a0,0000000000..2bb3acd0a0
mode 100644,000000..100644
--- a/contrib/libpcap/README.DELETED
+++ b/contrib/libpcap/README.DELETED
diff --cc contrib/libpcap/README.DRAGONFLY
index 3884b7584b,0000000000..7c94c28940
mode 100644,000000..100644
--- a/contrib/libpcap/README.DRAGONFLY
+++ b/contrib/libpcap/README.DRAGONFLY
@@@ -1,9 -1,0 +1,6 @@@
 +Original source can be downloaded from:
 +http://www.tcpdump.org/release/
 +
- cvs import hint:
- cvs import src/contrib/libpcap-0.9 LIBPCAP v0_9_?
- 
 +A list of files and directories removed is in README.DELETED
 +
 +Remember to update lib/libpcap/config.h.
diff --cc lib/libpcap/Makefile
index 2139d30d1d,0000000000..a8ab51a23e
mode 100644,000000..100644
--- a/lib/libpcap/Makefile
+++ b/lib/libpcap/Makefile
@@@ -1,46 -1,0 +1,46 @@@
 +# Makefile for libpcap
 +# $FreeBSD: src/lib/libpcap/Makefile,v 1.24.2.4 2002/07/22 14:21:50 ru Exp $
 +# $DragonFly: src/lib/libpcap/Makefile,v 1.12 2007/10/11 01:07:29 pavalos Exp $
 +
- SRCDIR=	${.CURDIR}/../../contrib/libpcap-0.9
++SRCDIR=	${.CURDIR}/../../contrib/libpcap
 +
 +LIB=    pcap
 +SRCS=	grammar.y tokdefs.h pcap-bpf.c version.h \
 +	pcap.c inet.c fad-getad.c gencode.c optimize.c nametoaddr.c \
 +	etherent.c savefile.c bpf_filter.c bpf_image.c bpf_dump.c \
 +	scanner.l version.c
 +INCS=	pcap.h pcap-namedb.h pcap-int.h
 +MAN=	pcap.3
 +CLEANFILES=tokdefs.h version.c version.h
 +WARNS?=	2
 +
 +CFLAGS+=-DHAVE_CONFIG_H -Dyylval=pcap_lval -I${.CURDIR} -I.
 +CFLAGS+=-D_U_="__attribute__((unused))"
 +CFLAGS+=-DHAVE_STRUCT_ETHER_ADDR -DHAVE_NET_PFVAR_H
 +.if !defined(NOINET6)
 +CFLAGS+=-DINET6
 +.endif
 +
 +SHLIB_MAJOR=3
 +
 +#
 +# Magic to grab sources out of src/contrib
 +#
 +PCAP_DISTDIR?=${SRCDIR}
 +CFLAGS+=-I${PCAP_DISTDIR}
 +.PATH:	${PCAP_DISTDIR}
 +.PATH:	${PCAP_DISTDIR}/bpf/net
 +
 +version.c: ${PCAP_DISTDIR}/VERSION
 +	@rm -f $@
 +	sed 's/.*/char pcap_version[] = "&";/' ${PCAP_DISTDIR}/VERSION > $@
 +
 +version.h: ${PCAP_DISTDIR}/VERSION
 +	@rm -f $@
 +	sed 's/.*/static const char pcap_version_string[] = "libpcap version &";/' \
 +		${PCAP_DISTDIR}/VERSION > $@
 +
 +tokdefs.h: grammar.h
 +	${LN} -sf grammar.h tokdefs.h
 +
 +.include <bsd.lib.mk>