Wed Mar 11 21:05:09 2015 UTC ()
Thursday Feb. 12, 2015 guy@alum.mit.edu/mcr@sandelman.ca
  Summary for 1.7.2 libpcap release
	Support for filtering Geneve encapsulated packets.

Wednesday Nov. 12, 2014 guy@alum.mit.edu/mcr@sandelman.ca
  Summary for 1.7.0 libpcap release
	Fix handling of zones for BPF on Solaris
	new DLT for ZWAVE
	clarifications for read timeouts.
	added bpf_filter1() with extensions
	some fixes to compilation without stdint.h
	EBUSY can now be returned by SNFv3 code.

Monday Aug. 12, 2014 guy@alum.mit.edu
  Summary for 1.6.2 libpcap release
	Don't crash on filters testing a non-existent link-layer type
	    field.
	Fix sending in non-blocking mode on Linux with memory-mapped
	    capture.
	Fix timestamps when reading pcap-ng files on big-endian
	    machines.

Saturday  Jul. 19, 2014 mcr@sandelman.ca
  Summary for 1.6.1 libpcap release
	some fixes for the any device
	changes for how --enable-XXX (--enable-sniffing, --enable-can) works

Wednesday Jul. 2, 2014 mcr@sandelman.ca
  Summary for 1.6.0 libpcap release
        Don't support D-Bus sniffing on OS X
        fixes for byte order issues with NFLOG captures
        Handle using cooked mode for DLT_NETLINK in activate_new().
        on platforms where you can not capture on down interfaces, do not list them
        but: do list interfaces which are down, if you can capture on them!

Wednesday December 18, 2013 guy@alum.mit.edu
Summary for 1.5.3 libpcap release
	Don't let packets that don't match the current filter get to the
	    application when TPACKET_V3 is used. (GitHub issue #331)
	Fix handling of pcap_loop()/pcap_dispatch() with a packet count
	    of 0 on some platforms (including Linux with TPACKET_V3).
	    (GitHub issue #333)
	Work around TPACKET_V3 deficiency that causes packets to be lost
	    when a timeout of 0 is specified. (GitHub issue #335)
	Man page formatting fixes.

Wednesday December 4, 2013 guy@alum.mit.edu
Summary for 1.5.2 libpcap release
	Fix libpcap to work when compiled with TPACKET_V3 support and
	    running on a kernel without TPACKET_V3 support. (GitHub
	    issue #329)

Wednesday November 20, 2013 guy@alum.mit.edu
Summary for 1.5.1 libpcap release
	Report an error, rather than crashing, if an IPv6 address is
	    used for link-layer filtering.  (Wireshark bug 9376)

Wednesday October 30, 2013 guy@alum.mit.edu
Summary for 1.5.0 libpcap release
	TPACKET_V3 support added for Linux
	Point users to the the-tcpdump-group repository on GitHub rather
	    than the mcr repository
	Checks added for malloc()/realloc()/etc. failures
	Fixed build on Solaris 11
	Support filtering filtering E1 SS7 traffic on MTP2 layer Annex A
	Use "ln -s" to link man pages by default
        Add support for getting nanosecond-resolution time stamps when
	    capturing and reading capture files
        Many changes to autoconf to deal better with non-GCC compilers
        added many new DLT types


(tnn)
diff -r1.58 -r1.59 pkgsrc/net/libpcap/Makefile
diff -r1.11 -r1.12 pkgsrc/net/libpcap/PLIST
diff -r1.29 -r1.30 pkgsrc/net/libpcap/distinfo
diff -r1.8 -r1.9 pkgsrc/net/libpcap/patches/patch-ac
diff -r1.6 -r1.7 pkgsrc/net/libpcap/patches/patch-ad
diff -r1.3 -r1.4 pkgsrc/net/libpcap/patches/patch-configure
diff -r1.2 -r0 pkgsrc/net/libpcap/patches/patch-gencode.c
diff -r1.2 -r0 pkgsrc/net/libpcap/patches/patch-pcap-libdlpi.c
cvs diff -r1.58 -r1.59 pkgsrc/net/libpcap/Makefile (expand / switch to unified diff)

--- pkgsrc/net/libpcap/Makefile 2014/10/09 14:06:45 1.58
+++ pkgsrc/net/libpcap/Makefile 2015/03/11 21:05:09 1.59
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.58 2014/10/09 14:06:45 wiz Exp $ 1# $NetBSD: Makefile,v 1.59 2015/03/11 21:05:09 tnn Exp $
2 2
3DISTNAME= libpcap-1.4.0 3DISTNAME= libpcap-1.7.2
4PKGREVISION= 1 
5CATEGORIES= net 4CATEGORIES= net
6MASTER_SITES= http://www.tcpdump.org/release/ 5MASTER_SITES= http://www.tcpdump.org/release/
7 6
8MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.tcpdump.org/ 8HOMEPAGE= http://www.tcpdump.org/
10COMMENT= System-independent interface for user-level packet capture 9COMMENT= System-independent interface for user-level packet capture
11LICENSE= modified-bsd 10LICENSE= modified-bsd
12 11
13NOT_FOR_PLATFORM+= Interix-*-* # no raw interface access 12NOT_FOR_PLATFORM+= Interix-*-* # no raw interface access
14 13
15USE_LIBTOOL= yes 14USE_LIBTOOL= yes
16USE_TOOLS+= bison flex gm4 15USE_TOOLS+= bison flex gm4
17GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
cvs diff -r1.11 -r1.12 pkgsrc/net/libpcap/PLIST (expand / switch to unified diff)

--- pkgsrc/net/libpcap/PLIST 2013/06/15 21:01:22 1.11
+++ pkgsrc/net/libpcap/PLIST 2015/03/11 21:05:09 1.12
@@ -1,23 +1,24 @@ @@ -1,23 +1,24 @@
1@comment $NetBSD: PLIST,v 1.11 2013/06/15 21:01:22 adam Exp $ 1@comment $NetBSD: PLIST,v 1.12 2015/03/11 21:05:09 tnn Exp $
2bin/pcap-config 2bin/pcap-config
3include/pcap-bpf.h 3include/pcap-bpf.h
4include/pcap-int.h 4include/pcap-int.h
5include/pcap-namedb.h 5include/pcap-namedb.h
6include/pcap.h 6include/pcap.h
7include/pcap/bluetooth.h 7include/pcap/bluetooth.h
8include/pcap/bpf.h 8include/pcap/bpf.h
9include/pcap/ipnet.h 9include/pcap/ipnet.h
10include/pcap/namedb.h 10include/pcap/namedb.h
 11include/pcap/nflog.h
11include/pcap/pcap.h 12include/pcap/pcap.h
12include/pcap/sll.h 13include/pcap/sll.h
13include/pcap/usb.h 14include/pcap/usb.h
14include/pcap/vlan.h 15include/pcap/vlan.h
15lib/libpcap.la 16lib/libpcap.la
16man/man1/pcap-config.1 17man/man1/pcap-config.1
17man/man3/pcap.3 18man/man3/pcap.3
18man/man3/pcap_activate.3 19man/man3/pcap_activate.3
19man/man3/pcap_breakloop.3 20man/man3/pcap_breakloop.3
20man/man3/pcap_can_set_rfmon.3 21man/man3/pcap_can_set_rfmon.3
21man/man3/pcap_close.3 22man/man3/pcap_close.3
22man/man3/pcap_compile.3 23man/man3/pcap_compile.3
23man/man3/pcap_create.3 24man/man3/pcap_create.3
@@ -27,58 +28,65 @@ man/man3/pcap_datalink_val_to_descriptio @@ -27,58 +28,65 @@ man/man3/pcap_datalink_val_to_descriptio
27man/man3/pcap_datalink_val_to_name.3 28man/man3/pcap_datalink_val_to_name.3
28man/man3/pcap_dispatch.3 29man/man3/pcap_dispatch.3
29man/man3/pcap_dump.3 30man/man3/pcap_dump.3
30man/man3/pcap_dump_close.3 31man/man3/pcap_dump_close.3
31man/man3/pcap_dump_file.3 32man/man3/pcap_dump_file.3
32man/man3/pcap_dump_flush.3 33man/man3/pcap_dump_flush.3
33man/man3/pcap_dump_fopen.3 34man/man3/pcap_dump_fopen.3
34man/man3/pcap_dump_ftell.3 35man/man3/pcap_dump_ftell.3
35man/man3/pcap_dump_open.3 36man/man3/pcap_dump_open.3
36man/man3/pcap_file.3 37man/man3/pcap_file.3
37man/man3/pcap_fileno.3 38man/man3/pcap_fileno.3
38man/man3/pcap_findalldevs.3 39man/man3/pcap_findalldevs.3
39man/man3/pcap_fopen_offline.3 40man/man3/pcap_fopen_offline.3
 41man/man3/pcap_fopen_offline_with_tstamp_precision.3
40man/man3/pcap_free_datalinks.3 42man/man3/pcap_free_datalinks.3
41man/man3/pcap_free_tstamp_types.3 43man/man3/pcap_free_tstamp_types.3
42man/man3/pcap_freealldevs.3 44man/man3/pcap_freealldevs.3
43man/man3/pcap_freecode.3 45man/man3/pcap_freecode.3
44man/man3/pcap_get_selectable_fd.3 46man/man3/pcap_get_selectable_fd.3
 47man/man3/pcap_get_tstamp_precision.3
45man/man3/pcap_geterr.3 48man/man3/pcap_geterr.3
46man/man3/pcap_getnonblock.3 49man/man3/pcap_getnonblock.3
47man/man3/pcap_inject.3 50man/man3/pcap_inject.3
48man/man3/pcap_is_swapped.3 51man/man3/pcap_is_swapped.3
49man/man3/pcap_lib_version.3 52man/man3/pcap_lib_version.3
50man/man3/pcap_list_datalinks.3 53man/man3/pcap_list_datalinks.3
51man/man3/pcap_list_tstamp_types.3 54man/man3/pcap_list_tstamp_types.3
52man/man3/pcap_lookupdev.3 55man/man3/pcap_lookupdev.3
53man/man3/pcap_lookupnet.3 56man/man3/pcap_lookupnet.3
54man/man3/pcap_loop.3 57man/man3/pcap_loop.3
55man/man3/pcap_major_version.3 58man/man3/pcap_major_version.3
56man/man3/pcap_minor_version.3 59man/man3/pcap_minor_version.3
57man/man3/pcap_next.3 60man/man3/pcap_next.3
58man/man3/pcap_next_ex.3 61man/man3/pcap_next_ex.3
59man/man3/pcap_offline_filter.3 62man/man3/pcap_offline_filter.3
60man/man3/pcap_open_dead.3 63man/man3/pcap_open_dead.3
 64man/man3/pcap_open_dead_with_tstamp_precision.3
61man/man3/pcap_open_live.3 65man/man3/pcap_open_live.3
62man/man3/pcap_open_offline.3 66man/man3/pcap_open_offline.3
 67man/man3/pcap_open_offline_with_tstamp_precision.3
63man/man3/pcap_perror.3 68man/man3/pcap_perror.3
64man/man3/pcap_sendpacket.3 69man/man3/pcap_sendpacket.3
65man/man3/pcap_set_buffer_size.3 70man/man3/pcap_set_buffer_size.3
66man/man3/pcap_set_datalink.3 71man/man3/pcap_set_datalink.3
 72man/man3/pcap_set_immediate_mode.3
67man/man3/pcap_set_promisc.3 73man/man3/pcap_set_promisc.3
68man/man3/pcap_set_rfmon.3 74man/man3/pcap_set_rfmon.3
69man/man3/pcap_set_snaplen.3 75man/man3/pcap_set_snaplen.3
70man/man3/pcap_set_timeout.3 76man/man3/pcap_set_timeout.3
 77man/man3/pcap_set_tstamp_precision.3
71man/man3/pcap_set_tstamp_type.3 78man/man3/pcap_set_tstamp_type.3
72man/man3/pcap_setdirection.3 79man/man3/pcap_setdirection.3
73man/man3/pcap_setfilter.3 80man/man3/pcap_setfilter.3
74man/man3/pcap_setnonblock.3 81man/man3/pcap_setnonblock.3
75man/man3/pcap_snapshot.3 82man/man3/pcap_snapshot.3
76man/man3/pcap_stats.3 83man/man3/pcap_stats.3
77man/man3/pcap_statustostr.3 84man/man3/pcap_statustostr.3
78man/man3/pcap_strerror.3 85man/man3/pcap_strerror.3
79man/man3/pcap_tstamp_type_name_to_val.3 86man/man3/pcap_tstamp_type_name_to_val.3
 87man/man3/pcap_tstamp_type_val_to_description.3
80man/man3/pcap_tstamp_type_val_to_name.3 88man/man3/pcap_tstamp_type_val_to_name.3
81man/man5/pcap-savefile.5 89man/man5/pcap-savefile.5
82man/man7/pcap-filter.7 90man/man7/pcap-filter.7
83man/man7/pcap-linktype.7 91man/man7/pcap-linktype.7
84man/man7/pcap-tstamp.7 92man/man7/pcap-tstamp.7
cvs diff -r1.29 -r1.30 pkgsrc/net/libpcap/distinfo (expand / switch to unified diff)

--- pkgsrc/net/libpcap/distinfo 2013/06/21 13:35:06 1.29
+++ pkgsrc/net/libpcap/distinfo 2015/03/11 21:05:09 1.30
@@ -1,10 +1,8 @@ @@ -1,10 +1,8 @@
1$NetBSD: distinfo,v 1.29 2013/06/21 13:35:06 jperkin Exp $ 1$NetBSD: distinfo,v 1.30 2015/03/11 21:05:09 tnn Exp $
2 2
3SHA1 (libpcap-1.4.0.tar.gz) = 9c9710aab68be58ed1d41b5c36dc2599419a80e0 3SHA1 (libpcap-1.7.2.tar.gz) = 97aed0270bc201dfdeacccddc61179d27c68e42c
4RMD160 (libpcap-1.4.0.tar.gz) = 5c82a5b813b62fdd10c01c704e1c775ed74d0906 4RMD160 (libpcap-1.7.2.tar.gz) = ff94bfb4c81645dcf5f3a4252f4049e023f43946
5Size (libpcap-1.4.0.tar.gz) = 619045 bytes 5Size (libpcap-1.7.2.tar.gz) = 662162 bytes
6SHA1 (patch-ac) = 859fc7f91a2831030a3b685ef6448a0c26065b3e 6SHA1 (patch-ac) = baa9cadd0af714d0808189777750b506cf726657
7SHA1 (patch-ad) = 3eb306bbd997f83b55d08cdda1573cf2fdef54f1 7SHA1 (patch-ad) = ea818a5fb146488f909483d96d943941ea1873e4
8SHA1 (patch-configure) = a883a0028075cddadf198c50bef0a052e796804e 8SHA1 (patch-configure) = 361a6bbf5cadad40ea54ddaf8fcf6683d0e6a9c7
9SHA1 (patch-gencode.c) = e3791f1cd33826907e7d1986799b22333d96dc42 
10SHA1 (patch-pcap-libdlpi.c) = f5df74e9a747f1dddca18cee908a2f89eb5e6261 
cvs diff -r1.8 -r1.9 pkgsrc/net/libpcap/patches/Attic/patch-ac (expand / switch to unified diff)

--- pkgsrc/net/libpcap/patches/Attic/patch-ac 2013/02/06 18:07:04 1.8
+++ pkgsrc/net/libpcap/patches/Attic/patch-ac 2015/03/11 21:05:09 1.9
@@ -1,191 +1,193 @@ @@ -1,191 +1,193 @@
1$NetBSD: patch-ac,v 1.8 2013/02/06 18:07:04 jperkin Exp $ 1$NetBSD: patch-ac,v 1.9 2015/03/11 21:05:09 tnn Exp $
2 2
3--- Makefile.in.orig 2012-03-29 12:57:32.000000000 +0000 3Add libtoolization
 4Fix manpage installation
 5
 6--- Makefile.in.orig 2015-03-09 19:22:07.000000000 +0000
4+++ Makefile.in 7+++ Makefile.in
5@@ -45,7 +45,7 @@ VPATH = @srcdir@ 8@@ -43,7 +43,7 @@ VPATH = @srcdir@
6 # 9 #
7  10
8 LD = /usr/bin/ld 11 LD = /usr/bin/ld
9-CC = @CC@ 12-CC = @CC@
10+CC = ${LIBTOOL} --mode=compile @CC@ 13+CC = ${LIBTOOL} --mode=compile @CC@
11 AR = @AR@ 14 AR = @AR@
12 CCOPT = @V_CCOPT@ 15 LN_S = @LN_S@
13 INCLS = -I. @V_INCLS@ 16 MKDEP = @MKDEP@
14@@ -78,7 +78,8 @@ YACC = @V_YACC@ 17@@ -80,7 +80,8 @@ YACC = @V_YACC@
15 # Explicitly define compilation rule since SunOS 4's make doesn't like gcc. 18 # Explicitly define compilation rule since SunOS 4's make doesn't like gcc.
16 # Also, gcc does not remove the .o before forking 'as', which can be a 19 # Also, gcc does not remove the .o before forking 'as', which can be a
17 # problem if you don't own the file but can write to the directory. 20 # problem if you don't own the file but can write to the directory.
18-.c.o: 21-.c.o:
19+.SUFFIXES: .lo 22+.SUFFIXES: .lo
20+.c.lo: 23+.c.lo:
21 @rm -f $@ 24 @rm -f $@
22 $(CC) $(FULL_CFLAGS) -c $(srcdir)/$*.c 25 $(CC) $(FULL_CFLAGS) -c $(srcdir)/$*.c
23  26
24@@ -89,13 +90,13 @@ CSRC = pcap.c inet.c gencode.c optimize. 27@@ -91,13 +92,13 @@ CSRC = pcap.c inet.c gencode.c optimize.
25 savefile.c sf-pcap.c sf-pcap-ng.c pcap-common.c \ 28 savefile.c sf-pcap.c sf-pcap-ng.c pcap-common.c \
26 bpf_image.c bpf_dump.c 29 bpf_image.c bpf_dump.c
27 GENSRC = scanner.c grammar.c bpf_filter.c version.c 30 GENSRC = scanner.c grammar.c bpf_filter.c version.c
28-LIBOBJS = @LIBOBJS@ 31-LIBOBJS = @LIBOBJS@
29+LIBOBJS = @LTLIBOBJS@ 32+LIBOBJS = @LTLIBOBJS@
30  33
31 SRC = $(PSRC) $(FSRC) $(CSRC) $(SSRC) $(GENSRC) 34 SRC = $(PSRC) $(FSRC) $(CSRC) $(SSRC) $(GENSRC)
32  35
33 # We would like to say "OBJ = $(SRC:.c=.o)" but Ultrix's make cannot 36 # We would like to say "OBJ = $(SRC:.c=.o)" but Ultrix's make cannot
34 # hack the extra indirection 37 # hack the extra indirection
35-OBJ = $(PSRC:.c=.o) $(FSRC:.c=.o) $(CSRC:.c=.o) $(SSRC:.c=.o) $(GENSRC:.c=.o) $(LIBOBJS) 38-OBJ = $(PSRC:.c=.o) $(FSRC:.c=.o) $(CSRC:.c=.o) $(SSRC:.c=.o) $(GENSRC:.c=.o) $(LIBOBJS)
36+OBJ = $(PSRC:.c=.lo) $(FSRC:.c=.lo) $(CSRC:.c=.lo) $(SSRC:.c=.lo) $(GENSRC:.c=.lo) $(LIBOBJS) 39+OBJ = $(PSRC:.c=.lo) $(FSRC:.c=.lo) $(CSRC:.c=.lo) $(SSRC:.c=.lo) $(GENSRC:.c=.lo) $(LIBOBJS)
37 PUBHDR = \ 40 PUBHDR = \
38 pcap.h \ 41 pcap.h \
39 pcap-bpf.h \ 42 pcap-bpf.h \
40@@ -345,12 +346,10 @@ EXTRA_DIST = \ 43@@ -358,12 +359,10 @@ EXTRA_DIST = \
41 Win32/Src/inet_net.c \ 44 Win32/Src/inet_net.c \
42 Win32/Src/inet_pton.c 45 Win32/Src/inet_pton.c
43  46
44-all: libpcap.a shared pcap-config 47-all: libpcap.a shared pcap-config
45+all: libpcap.la pcap-config 48+all: libpcap.la pcap-config
46  49
47-libpcap.a: $(OBJ) 50-libpcap.a: $(OBJ)
48- @rm -f $@ 51- @rm -f $@
49- $(AR) rc $@ $(OBJ) $(ADDLARCHIVEOBJS) 52- $(AR) rc $@ $(OBJ) $(ADDLARCHIVEOBJS)
50- $(RANLIB) $@ 53- $(RANLIB) $@
51+libpcap.la: $(OBJ) 54+libpcap.la: $(OBJ)
52+ ${LIBTOOL} --mode=link @CC@ -rpath ${PREFIX}/lib ${LDFLAGS} $(OBJ) $(LIBS) -o libpcap.la 55+ ${LIBTOOL} --mode=link @CC@ -rpath ${PREFIX}/lib ${LDFLAGS} $(OBJ) $(LIBS) -o libpcap.la
53  56
54 shared: libpcap.$(DYEXT) 57 shared: libpcap.$(DYEXT)
55  58
56@@ -434,10 +433,10 @@ scanner.c: $(srcdir)/scanner.l 59@@ -450,10 +449,10 @@ scanner.c: $(srcdir)/scanner.l
57 @rm -f $@ 60 cat $@.top $@.bottom > $@
58 $(srcdir)/runlex.sh $(LEX) -o$@ $< 61 @rm $@.bottom
59  62
60-scanner.o: scanner.c tokdefs.h 63-scanner.o: scanner.c tokdefs.h
61+scanner.lo: scanner.c tokdefs.h 64+scanner.lo: scanner.c tokdefs.h
62 $(CC) $(FULL_CFLAGS) -c scanner.c 65 $(CC) $(FULL_CFLAGS) -c scanner.c
63  66
64-pcap.o: version.h 67-pcap.o: version.h
65+pcap.lo: version.h 68+pcap.lo: version.h
66  69
67 tokdefs.h: grammar.c 70 tokdefs.h: grammar.c
68 grammar.c: $(srcdir)/grammar.y 71 grammar.c: $(srcdir)/grammar.y
69@@ -446,17 +445,17 @@ grammar.c: $(srcdir)/grammar.y 72@@ -462,17 +461,17 @@ grammar.c: $(srcdir)/grammar.y
70 mv y.tab.c grammar.c 73 mv y.tab.c grammar.c
71 mv y.tab.h tokdefs.h 74 mv y.tab.h tokdefs.h
72  75
73-grammar.o: grammar.c 76-grammar.o: grammar.c
74+grammar.lo: grammar.c 77+grammar.lo: grammar.c
75 @rm -f $@ 78 @rm -f $@
76 $(CC) $(FULL_CFLAGS) -Dyylval=pcap_lval -c grammar.c 79 $(CC) $(FULL_CFLAGS) -Dyylval=pcap_lval -c grammar.c
77  80
78-version.o: version.c 81-version.o: version.c
79+version.lo: version.c 82+version.lo: version.c
80 $(CC) $(FULL_CFLAGS) -c version.c 83 $(CC) $(FULL_CFLAGS) -c version.c
81  84
82-snprintf.o: $(srcdir)/missing/snprintf.c 85-snprintf.o: $(srcdir)/missing/snprintf.c
83+snprintf.lo: $(srcdir)/missing/snprintf.c 86+snprintf.lo: $(srcdir)/missing/snprintf.c
84 $(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/snprintf.c 87 $(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/snprintf.c
85  88
86-version.c: $(srcdir)/VERSION 89-version.c: $(srcdir)/VERSION
87+version.c: #$(srcdir)/VERSION 90+version.c: #$(srcdir)/VERSION
88 @rm -f $@ 91 @rm -f $@
89 if grep GIT ${srcdir}/VERSION >/dev/null; then \ 92 if grep GIT ${srcdir}/VERSION >/dev/null; then \
90 read ver <${srcdir}/VERSION; \ 93 read ver <${srcdir}/VERSION; \
91@@ -473,7 +472,7 @@ version.c: $(srcdir)/VERSION 94@@ -489,7 +488,7 @@ version.c: $(srcdir)/VERSION
92 # so we make the version string static and return it from 95 # so we make the version string static and return it from
93 # a function, which does work. 96 # a function, which does work.
94 # 97 #
95-version.h: $(srcdir)/VERSION 98-version.h: $(srcdir)/VERSION
96+version.h: #$(srcdir)/VERSION 99+version.h: #$(srcdir)/VERSION
97 @rm -f $@ 100 @rm -f $@
98 if grep GIT ${srcdir}/VERSION >/dev/null; then \ 101 if grep GIT ${srcdir}/VERSION >/dev/null; then \
99 read ver <${srcdir}/VERSION; \ 102 read ver <${srcdir}/VERSION; \
100@@ -487,7 +486,7 @@ bpf_filter.c: $(srcdir)/bpf/net/bpf_filt 103@@ -503,7 +502,7 @@ bpf_filter.c: $(srcdir)/bpf/net/bpf_filt
101 rm -f bpf_filter.c 104 rm -f bpf_filter.c
102 ln -s $(srcdir)/bpf/net/bpf_filter.c bpf_filter.c 105 ln -s $(srcdir)/bpf/net/bpf_filter.c bpf_filter.c
103  106
104-bpf_filter.o: bpf_filter.c 107-bpf_filter.o: bpf_filter.c
105+bpf_filter.lo: bpf_filter.c 108+bpf_filter.lo: bpf_filter.c
106 $(CC) $(FULL_CFLAGS) -c bpf_filter.c 109 $(CC) $(FULL_CFLAGS) -c bpf_filter.c
107  110
108 # 111 #
109@@ -530,7 +529,7 @@ opentest: tests/opentest.c libpcap.a 112@@ -549,7 +548,7 @@ selpolltest: tests/selpolltest.c libpcap
110 selpolltest: tests/selpolltest.c libpcap.a 113 valgrindtest: tests/valgrindtest.c libpcap.a
111 $(CC) $(FULL_CFLAGS) -I. -L. -o selpolltest $(srcdir)/tests/selpolltest.c libpcap.a $(LIBS) 114 $(CC) $(FULL_CFLAGS) -I. -L. -o valgrindtest $(srcdir)/tests/valgrindtest.c libpcap.a $(LIBS)
112  115
113-install: install-shared install-archive pcap-config 116-install: install-shared install-archive pcap-config
114+install: libpcap.la pcap-config 117+install: libpcap.la pcap-config
115 [ -d $(DESTDIR)$(libdir) ] || \ 118 [ -d $(DESTDIR)$(libdir) ] || \
116 (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir)) 119 (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir))
117 [ -d $(DESTDIR)$(includedir) ] || \ 120 [ -d $(DESTDIR)$(includedir) ] || \
118@@ -545,57 +544,58 @@ install: install-shared install-archive  121@@ -564,56 +563,73 @@ install: install-shared install-archive
119 (mkdir -p $(DESTDIR)$(mandir)/man@MAN_FILE_FORMATS@; chmod 755 $(DESTDIR)$(mandir)/man@MAN_FILE_FORMATS@) 122 (mkdir -p $(DESTDIR)$(mandir)/man@MAN_FILE_FORMATS@; chmod 755 $(DESTDIR)$(mandir)/man@MAN_FILE_FORMATS@)
120 [ -d $(DESTDIR)$(mandir)/man@MAN_MISC_INFO@ ] || \ 123 [ -d $(DESTDIR)$(mandir)/man@MAN_MISC_INFO@ ] || \
121 (mkdir -p $(DESTDIR)$(mandir)/man@MAN_MISC_INFO@; chmod 755 $(DESTDIR)$(mandir)/man@MAN_MISC_INFO@) 124 (mkdir -p $(DESTDIR)$(mandir)/man@MAN_MISC_INFO@; chmod 755 $(DESTDIR)$(mandir)/man@MAN_MISC_INFO@)
122+ ${LIBTOOL} --mode=install $(INSTALL_DATA) libpcap.la $(DESTDIR)$(libdir) 125+ ${LIBTOOL} --mode=install $(INSTALL_DATA) libpcap.la $(DESTDIR)$(libdir)
123 for i in $(PUBHDR); do \ 126 for i in $(PUBHDR); do \
124 $(INSTALL_DATA) $(srcdir)/$$i \ 127 $(INSTALL_DATA) $(srcdir)/$$i \
125 $(DESTDIR)$(includedir)/$$i; done 128 $(DESTDIR)$(includedir)/$$i; done
126 [ -d $(DESTDIR)$(bindir) ] || \ 129 [ -d $(DESTDIR)$(bindir) ] || \
127 (mkdir -p $(DESTDIR)$(bindir); chmod 755 $(DESTDIR)$(bindir)) 130 (mkdir -p $(DESTDIR)$(bindir); chmod 755 $(DESTDIR)$(bindir))
128- $(INSTALL_PROGRAM) pcap-config $(DESTDIR)$(bindir)/pcap-config 131- $(INSTALL_PROGRAM) pcap-config $(DESTDIR)$(bindir)/pcap-config
129+ $(BSD_INSTALL_SCRIPT) pcap-config $(DESTDIR)$(bindir)/pcap-config 132+ $(BSD_INSTALL_SCRIPT) pcap-config $(DESTDIR)$(bindir)/pcap-config
130 for i in $(MAN1); do \ 133 for i in $(MAN1); do \
131 $(INSTALL_DATA) $(srcdir)/$$i \ 134 $(INSTALL_DATA) $(srcdir)/$$i \
132 $(DESTDIR)$(mandir)/man1/$$i; done 135 $(DESTDIR)$(mandir)/man1/$$i; done
133- for i in $(MAN3PCAP_NOEXPAND); do \ 136- for i in $(MAN3PCAP_NOEXPAND); do \
134- $(INSTALL_DATA) $(srcdir)/$$i \ 137- $(INSTALL_DATA) $(srcdir)/$$i \
135+ for i in $(MAN3PCAP_NOEXPAND:.3pcap=.3); do \ 138+ for i in $(MAN3PCAP_NOEXPAND:.3pcap=.3); do \
136+ $(INSTALL_DATA) $(srcdir)/$${i}pcap \ 139+ $(INSTALL_DATA) $(srcdir)/$${i}pcap \
137 $(DESTDIR)$(mandir)/man3/$$i; done 140 $(DESTDIR)$(mandir)/man3/$$i; done
138- for i in $(MAN3PCAP_EXPAND:.in=); do \ 141- for i in $(MAN3PCAP_EXPAND:.in=); do \
139- $(INSTALL_DATA) $$i \ 142- $(INSTALL_DATA) $$i \
140+ for i in $(MAN3PCAP_EXPAND:.3pcap.in=.3); do \ 143+ for i in $(MAN3PCAP_EXPAND:.3pcap.in=.3); do \
141+ $(INSTALL_DATA) $${i}pcap \ 144+ $(INSTALL_DATA) $${i}pcap \
142 $(DESTDIR)$(mandir)/man3/$$i; done 145 $(DESTDIR)$(mandir)/man3/$$i; done
143- rm -f $(DESTDIR)$(mandir)/man3/pcap_datalink_val_to_description.3pcap 146- (cd $(DESTDIR)$(mandir)/man3 && \
144- ln $(DESTDIR)$(mandir)/man3/pcap_datalink_val_to_name.3pcap \ 147- rm -f pcap_datalink_val_to_description.3pcap && \
145- $(DESTDIR)$(mandir)/man3/pcap_datalink_val_to_description.3pcap 148- $(LN_S) pcap_datalink_val_to_name.3pcap \
146- rm -f $(DESTDIR)$(mandir)/man3/pcap_dump_fopen.3pcap 149- pcap_datalink_val_to_description.3pcap && \
147- ln $(DESTDIR)$(mandir)/man3/pcap_dump_open.3pcap \ 150- rm -f pcap_dump_fopen.3pcap && \
148- $(DESTDIR)$(mandir)/man3/pcap_dump_fopen.3pcap 151- $(LN_S) pcap_dump_open.3pcap pcap_dump_fopen.3pcap && \
149- rm -f $(DESTDIR)$(mandir)/man3/pcap_freealldevs.3pcap 152- rm -f pcap_freealldevs.3pcap && \
150- ln $(DESTDIR)$(mandir)/man3/pcap_findalldevs.3pcap \ 153- $(LN_S) pcap_findalldevs.3pcap pcap_freealldevs.3pcap && \
151- $(DESTDIR)$(mandir)/man3/pcap_freealldevs.3pcap 154- rm -f pcap_perror.3pcap && \
152- rm -f $(DESTDIR)$(mandir)/man3/pcap_perror.3pcap 155- $(LN_S) pcap_geterr.3pcap pcap_perror.3pcap && \
153- ln $(DESTDIR)$(mandir)/man3/pcap_geterr.3pcap \ 156- rm -f pcap_sendpacket.3pcap && \
154- $(DESTDIR)$(mandir)/man3/pcap_perror.3pcap 157- $(LN_S) pcap_inject.3pcap pcap_sendpacket.3pcap && \
155- rm -f $(DESTDIR)$(mandir)/man3/pcap_sendpacket.3pcap 158- rm -f pcap_free_datalinks.3pcap && \
156- ln $(DESTDIR)$(mandir)/man3/pcap_inject.3pcap \ 159- $(LN_S) pcap_list_datalinks.3pcap pcap_free_datalinks.3pcap && \
157- $(DESTDIR)$(mandir)/man3/pcap_sendpacket.3pcap 160- rm -f pcap_free_tstamp_types.3pcap && \
158- rm -f $(DESTDIR)$(mandir)/man3/pcap_free_datalinks.3pcap 161- $(LN_S) pcap_list_tstamp_types.3pcap pcap_free_tstamp_types.3pcap && \
159- ln $(DESTDIR)$(mandir)/man3/pcap_list_datalinks.3pcap \ 162- rm -f pcap_dispatch.3pcap && \
160- $(DESTDIR)$(mandir)/man3/pcap_free_datalinks.3pcap 163- $(LN_S) pcap_loop.3pcap pcap_dispatch.3pcap && \
161- rm -f $(DESTDIR)$(mandir)/man3/pcap_free_tstamp_types.3pcap 164- rm -f pcap_minor_version.3pcap && \
162- ln $(DESTDIR)$(mandir)/man3/pcap_list_tstamp_types.3pcap \ 165- $(LN_S) pcap_major_version.3pcap pcap_minor_version.3pcap && \
163- $(DESTDIR)$(mandir)/man3/pcap_free_tstamp_types.3pcap 166- rm -f pcap_next.3pcap && \
164- rm -f $(DESTDIR)$(mandir)/man3/pcap_dispatch.3pcap 167- $(LN_S) pcap_next_ex.3pcap pcap_next.3pcap && \
165- ln $(DESTDIR)$(mandir)/man3/pcap_loop.3pcap \ 168- rm -f pcap_open_dead_with_tstamp_precision.3pcap && \
166- $(DESTDIR)$(mandir)/man3/pcap_dispatch.3pcap 169- $(LN_S) pcap_open_dead.3pcap \
167- rm -f $(DESTDIR)$(mandir)/man3/pcap_minor_version.3pcap 170- pcap_open_dead_with_tstamp_precision.3pcap && \
168- ln $(DESTDIR)$(mandir)/man3/pcap_major_version.3pcap \ 171- rm -f pcap_open_offline_with_tstamp_precision.3pcap && \
169- $(DESTDIR)$(mandir)/man3/pcap_minor_version.3pcap 172- $(LN_S) pcap_open_offline.3pcap pcap_open_offline_with_tstamp_precision.3pcap && \
170- rm -f $(DESTDIR)$(mandir)/man3/pcap_next.3pcap 173- rm -f pcap_fopen_offline.3pcap && \
171- ln $(DESTDIR)$(mandir)/man3/pcap_next_ex.3pcap \ 174- $(LN_S) pcap_open_offline.3pcap pcap_fopen_offline.3pcap && \
172- $(DESTDIR)$(mandir)/man3/pcap_next.3pcap 175- rm -f pcap_fopen_offline_with_tstamp_precision.3pcap && \
173- rm -f $(DESTDIR)$(mandir)/man3/pcap_fopen_offline.3pcap 176- $(LN_S) pcap_open_offline.3pcap pcap_fopen_offline_with_tstamp_precision.3pcap && \
174- ln $(DESTDIR)$(mandir)/man3/pcap_open_offline.3pcap \ 177- rm -f pcap_tstamp_type_val_to_description.3pcap && \
175- $(DESTDIR)$(mandir)/man3/pcap_fopen_offline.3pcap 178- $(LN_S) pcap_tstamp_type_val_to_name.3pcap pcap_tstamp_type_val_to_description.3pcap && \
176- rm -f $(DESTDIR)$(mandir)/man3/pcap_getnonblock.3pcap 179- rm -f pcap_getnonblock.3pcap && \
177- ln $(DESTDIR)$(mandir)/man3/pcap_setnonblock.3pcap \ 180- $(LN_S) pcap_setnonblock.3pcap pcap_getnonblock.3pcap)
178- $(DESTDIR)$(mandir)/man3/pcap_getnonblock.3pcap 
179+ rm -f $(DESTDIR)$(mandir)/man3/pcap_datalink_val_to_description.3 181+ rm -f $(DESTDIR)$(mandir)/man3/pcap_datalink_val_to_description.3
180+ ln $(DESTDIR)$(mandir)/man3/pcap_datalink_val_to_name.3 \ 182+ ln $(DESTDIR)$(mandir)/man3/pcap_datalink_val_to_name.3 \
181+ $(DESTDIR)$(mandir)/man3/pcap_datalink_val_to_description.3 183+ $(DESTDIR)$(mandir)/man3/pcap_datalink_val_to_description.3
182+ rm -f $(DESTDIR)$(mandir)/man3/pcap_dump_fopen.3 184+ rm -f $(DESTDIR)$(mandir)/man3/pcap_dump_fopen.3
183+ ln $(DESTDIR)$(mandir)/man3/pcap_dump_open.3 \ 185+ ln $(DESTDIR)$(mandir)/man3/pcap_dump_open.3 \
184+ $(DESTDIR)$(mandir)/man3/pcap_dump_fopen.3 186+ $(DESTDIR)$(mandir)/man3/pcap_dump_fopen.3
185+ rm -f $(DESTDIR)$(mandir)/man3/pcap_freealldevs.3 187+ rm -f $(DESTDIR)$(mandir)/man3/pcap_freealldevs.3
186+ ln $(DESTDIR)$(mandir)/man3/pcap_findalldevs.3 \ 188+ ln $(DESTDIR)$(mandir)/man3/pcap_findalldevs.3 \
187+ $(DESTDIR)$(mandir)/man3/pcap_freealldevs.3 189+ $(DESTDIR)$(mandir)/man3/pcap_freealldevs.3
188+ rm -f $(DESTDIR)$(mandir)/man3/pcap_perror.3 190+ rm -f $(DESTDIR)$(mandir)/man3/pcap_perror.3
189+ ln $(DESTDIR)$(mandir)/man3/pcap_geterr.3 \ 191+ ln $(DESTDIR)$(mandir)/man3/pcap_geterr.3 \
190+ $(DESTDIR)$(mandir)/man3/pcap_perror.3 192+ $(DESTDIR)$(mandir)/man3/pcap_perror.3
191+ rm -f $(DESTDIR)$(mandir)/man3/pcap_sendpacket.3 193+ rm -f $(DESTDIR)$(mandir)/man3/pcap_sendpacket.3
@@ -196,22 +198,37 @@ $NetBSD: patch-ac,v 1.8 2013/02/06 18:07 @@ -196,22 +198,37 @@ $NetBSD: patch-ac,v 1.8 2013/02/06 18:07
196+ $(DESTDIR)$(mandir)/man3/pcap_free_datalinks.3 198+ $(DESTDIR)$(mandir)/man3/pcap_free_datalinks.3
197+ rm -f $(DESTDIR)$(mandir)/man3/pcap_free_tstamp_types.3 199+ rm -f $(DESTDIR)$(mandir)/man3/pcap_free_tstamp_types.3
198+ ln $(DESTDIR)$(mandir)/man3/pcap_list_tstamp_types.3 \ 200+ ln $(DESTDIR)$(mandir)/man3/pcap_list_tstamp_types.3 \
199+ $(DESTDIR)$(mandir)/man3/pcap_free_tstamp_types.3 201+ $(DESTDIR)$(mandir)/man3/pcap_free_tstamp_types.3
200+ rm -f $(DESTDIR)$(mandir)/man3/pcap_dispatch.3 202+ rm -f $(DESTDIR)$(mandir)/man3/pcap_dispatch.3
201+ ln $(DESTDIR)$(mandir)/man3/pcap_loop.3 \ 203+ ln $(DESTDIR)$(mandir)/man3/pcap_loop.3 \
202+ $(DESTDIR)$(mandir)/man3/pcap_dispatch.3 204+ $(DESTDIR)$(mandir)/man3/pcap_dispatch.3
203+ rm -f $(DESTDIR)$(mandir)/man3/pcap_minor_version.3 205+ rm -f $(DESTDIR)$(mandir)/man3/pcap_minor_version.3
204+ ln $(DESTDIR)$(mandir)/man3/pcap_major_version.3 \ 206+ ln $(DESTDIR)$(mandir)/man3/pcap_major_version.3 \
205+ $(DESTDIR)$(mandir)/man3/pcap_minor_version.3 207+ $(DESTDIR)$(mandir)/man3/pcap_minor_version.3
206+ rm -f $(DESTDIR)$(mandir)/man3/pcap_next.3 208+ rm -f $(DESTDIR)$(mandir)/man3/pcap_next.3
207+ ln $(DESTDIR)$(mandir)/man3/pcap_next_ex.3 \ 209+ ln $(DESTDIR)$(mandir)/man3/pcap_next_ex.3 \
208+ $(DESTDIR)$(mandir)/man3/pcap_next.3 210+ $(DESTDIR)$(mandir)/man3/pcap_next.3
 211+ rm -f $(DESTDIR)$(mandir)/man3/pcap_open_dead_with_tstamp_precision.3
 212+ ln $(DESTDIR)$(mandir)/man3/pcap_open_dead.3 \
 213+ $(DESTDIR)$(mandir)/man3/pcap_open_dead_with_tstamp_precision.3
 214+ rm -f $(DESTDIR)$(mandir)/man3/pcap_open_offline_with_tstamp_precision.3
 215+ ln $(DESTDIR)$(mandir)/man3/pcap_open_offline.3 \
 216+ $(DESTDIR)$(mandir)/man3/pcap_open_offline_with_tstamp_precision.3
 217+ rm -f $(DESTDIR)$(mandir)/man3/pcap_fopen_offline.3
 218+ ln $(DESTDIR)$(mandir)/man3/pcap_open_offline.3 \
 219+ $(DESTDIR)$(mandir)/man3/pcap_fopen_offline.3
 220+ rm -f $(DESTDIR)$(mandir)/man3/pcap_fopen_offline_with_tstamp_precision.3
 221+ ln $(DESTDIR)$(mandir)/man3/pcap_fopen_offline.3 \
 222+ $(DESTDIR)$(mandir)/man3/pcap_fopen_offline_with_tstamp_precision.3
209+ rm -f $(DESTDIR)$(mandir)/man3/pcap_fopen_offline.3 223+ rm -f $(DESTDIR)$(mandir)/man3/pcap_fopen_offline.3
210+ ln $(DESTDIR)$(mandir)/man3/pcap_open_offline.3 \ 224+ ln $(DESTDIR)$(mandir)/man3/pcap_open_offline.3 \
211+ $(DESTDIR)$(mandir)/man3/pcap_fopen_offline.3 225+ $(DESTDIR)$(mandir)/man3/pcap_fopen_offline.3
 226+ rm -f $(DESTDIR)$(mandir)/man3/pcap_tstamp_type_val_to_description.3
 227+ ln $(DESTDIR)$(mandir)/man3/pcap_tstamp_type_val_to_name.3 \
 228+ $(DESTDIR)$(mandir)/man3/pcap_tstamp_type_val_to_description.3
212+ rm -f $(DESTDIR)$(mandir)/man3/pcap_getnonblock.3 229+ rm -f $(DESTDIR)$(mandir)/man3/pcap_getnonblock.3
213+ ln $(DESTDIR)$(mandir)/man3/pcap_setnonblock.3 \ 230+ ln $(DESTDIR)$(mandir)/man3/pcap_setnonblock.3 \
214+ $(DESTDIR)$(mandir)/man3/pcap_getnonblock.3 231+ $(DESTDIR)$(mandir)/man3/pcap_getnonblock.3
215 for i in $(MANFILE); do \ 232 for i in $(MANFILE); do \
216 $(INSTALL_DATA) `echo $$i | sed 's/.manfile.in/.manfile/'` \ 233 $(INSTALL_DATA) `echo $$i | sed 's/.manfile.in/.manfile/'` \
217 $(DESTDIR)$(mandir)/man@MAN_FILE_FORMATS@/`echo $$i | sed 's/.manfile.in/.@MAN_FILE_FORMATS@/'`; done 234 $(DESTDIR)$(mandir)/man@MAN_FILE_FORMATS@/`echo $$i | sed 's/.manfile.in/.@MAN_FILE_FORMATS@/'`; done
cvs diff -r1.6 -r1.7 pkgsrc/net/libpcap/patches/Attic/patch-ad (expand / switch to unified diff)

--- pkgsrc/net/libpcap/patches/Attic/patch-ad 2013/02/06 18:07:04 1.6
+++ pkgsrc/net/libpcap/patches/Attic/patch-ad 2015/03/11 21:05:09 1.7
@@ -1,32 +1,32 @@ @@ -1,32 +1,32 @@
1$NetBSD: patch-ad,v 1.6 2013/02/06 18:07:04 jperkin Exp $ 1$NetBSD: patch-ad,v 1.7 2015/03/11 21:05:09 tnn Exp $
2 2
3* Re-order includes to avoid bpf_program re-definition. 3* Re-order includes to avoid bpf_program re-definition.
4 4
5--- fad-getad.c.orig 2012-03-29 12:57:32.000000000 +0000 5--- fad-getad.c.orig 2014-11-13 08:58:52.000000000 +0000
6+++ fad-getad.c 6+++ fad-getad.c
7@@ -54,12 +54,6 @@ static const char rcsid[] _U_ = 7@@ -49,12 +49,6 @@
8 #include <string.h> 8 #include <string.h>
9 #include <ifaddrs.h> 9 #include <ifaddrs.h>
10  10
11-#include "pcap-int.h" 11-#include "pcap-int.h"
12- 12-
13-#ifdef HAVE_OS_PROTO_H 13-#ifdef HAVE_OS_PROTO_H
14-#include "os-proto.h" 14-#include "os-proto.h"
15-#endif 15-#endif
16- 16-
17 #ifdef AF_PACKET 17 /*
18 # ifdef HAVE_NETPACKET_PACKET_H 18 * We don't do this on Solaris 11 and later, as it appears there aren't
19 /* Solaris 11 and later, Linux distributions with newer glibc */ 19 * any AF_PACKET addresses on interfaces, so we don't need this, and
20@@ -77,6 +71,12 @@ static const char rcsid[] _U_ = 20@@ -78,6 +72,12 @@
21 # endif /* HAVE_NETPACKET_PACKET_H */ 21 # endif /* HAVE_NETPACKET_PACKET_H */
22 #endif /* AF_PACKET */ 22 #endif /* (defined(linux) || defined(__Lynx__)) && defined(AF_PACKET) */
23  23
24+#include "pcap-int.h" 24+#include "pcap-int.h"
25+ 25+
26+#ifdef HAVE_OS_PROTO_H 26+#ifdef HAVE_OS_PROTO_H
27+#include "os-proto.h" 27+#include "os-proto.h"
28+#endif 28+#endif
29+ 29+
30 /* 30 /*
31 * This is fun. 31 * This is fun.
32 * 32 *
cvs diff -r1.3 -r1.4 pkgsrc/net/libpcap/patches/patch-configure (expand / switch to unified diff)

--- pkgsrc/net/libpcap/patches/patch-configure 2013/06/21 13:35:06 1.3
+++ pkgsrc/net/libpcap/patches/patch-configure 2015/03/11 21:05:09 1.4
@@ -1,25 +1,34 @@ @@ -1,25 +1,34 @@
1$NetBSD: patch-configure,v 1.3 2013/06/21 13:35:06 jperkin Exp $ 1$NetBSD: patch-configure,v 1.4 2015/03/11 21:05:09 tnn Exp $
2 2
3Ensure consistent manual page locations. 3Ensure consistent manual page locations.
4 4
5--- configure.orig 2013-03-25 14:51:40.000000000 +0000 5--- configure.orig 2015-03-09 19:22:07.000000000 +0000
6+++ configure 6+++ configure
7@@ -9986,8 +9985,6 @@ fi 7@@ -6857,8 +6857,6 @@ fi
8 # Individual cases can override this. 8 # Individual cases can override this.
9 # 9 #
10 DYEXT="none" 10 DYEXT="none"
11-MAN_FILE_FORMATS=5 11-MAN_FILE_FORMATS=5
12-MAN_MISC_INFO=7 12-MAN_MISC_INFO=7
13 case "$host_os" in 13 case "$host_os" in
14  14
15 aix*) 15 aix*)
16@@ -10255,6 +10252,9 @@ fi 16@@ -7133,6 +7131,9 @@ fi
17  17
18 test "x$enable_shared" = "xno" && DYEXT="none" 18 test "x$enable_shared" = "xno" && DYEXT="none"
19  19
20+MAN_FILE_FORMATS=5 20+MAN_FILE_FORMATS=5
21+MAN_MISC_INFO=7 21+MAN_MISC_INFO=7
22+ 22+
23 if test -n "$ac_tool_prefix"; then 23 if test -n "$ac_tool_prefix"; then
24 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. 24 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
25 set dummy ${ac_tool_prefix}ranlib; ac_word=$2 25 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 26@@ -8125,7 +8126,7 @@ else
 27 fi
 28
 29
 30- if test "x$ac_lbl_bluetooth_available" == "xno" ; then
 31+ if test "x$ac_lbl_bluetooth_available" = "xno" ; then
 32 if test "x$enable_bluetooth" = "xyes" ; then
 33 as_fn_error $? "Bluetooth sniffing is not supported; install bluez-lib devel to enable it" "$LINENO" 5
 34 else
File Deleted: pkgsrc/net/libpcap/patches/Attic/patch-gencode.c
File Deleted: pkgsrc/net/libpcap/patches/Attic/patch-pcap-libdlpi.c