Merge branch 'vendor/LIBPCAP'
authorPeter Avalos <pavalos@theshell.com>
Sat, 4 Jul 2009 21:26:17 +0000 (11:26 -1000)
committerPeter Avalos <pavalos@theshell.com>
Sat, 4 Jul 2009 21:26:17 +0000 (11:26 -1000)
1  2 
contrib/libpcap/README.DELETED
contrib/libpcap/README.DRAGONFLY
contrib/libpcap/bpf/net/bpf_filter.c
contrib/libpcap/gencode.c
contrib/libpcap/gencode.h
contrib/libpcap/grammar.y
contrib/libpcap/pcap.h
contrib/libpcap/scanner.l
lib/libpcap/Makefile

index 2bb3acd,0000000..2bb3acd
mode 100644,000000..100644
--- /dev/null
index 3884b75,0000000..7c94c28
mode 100644,000000..100644
--- /dev/null
@@@ -1,9 -1,0 +1,6 @@@
- cvs import hint:
- cvs import src/contrib/libpcap-0.9 LIBPCAP v0_9_?
 +Original source can be downloaded from:
 +http://www.tcpdump.org/release/
 +
 +A list of files and directories removed is in README.DELETED
 +
 +Remember to update lib/libpcap/config.h.
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 2139d30,0000000..a8ab51a
mode 100644,000000..100644
--- /dev/null
@@@ -1,46 -1,0 +1,46 @@@
- SRCDIR=       ${.CURDIR}/../../contrib/libpcap-0.9
 +# 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
 +
 +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>