Fri Feb 11 12:11:27 2011 UTC ()
Changes 1.1.1:
* Fix build on RHEL5.
* Fix shared library build on AIX.

Changes 1.1.0:
* Add SocketCAN capture support
* Add Myricom SNF API support
* Update Endace DAG and ERF support
* Add support for shared libraries on Solaris, HP-UX, and AIX
* Build, install, and un-install shared libraries by default;
  don't build/install shared libraries on platforms we don't support
* Fix building from a directory other than the source directory
* Fix compiler warnings and builds on some platforms
* Update config.guess and config.sub
* Support monitor mode on mac80211 devices on Linux
* Fix USB memory-mapped capturing on Linux; it requires a new DLT_
  value
* On Linux, scan /sys/class/net for devices if we have it; scan
  it, or /proc/net/dev if we don't have /sys/class/net, even if
  we have getifaddrs(), as it'll find interfaces with no
  addresses
* Add limited support for reading pcap-ng files
* Fix BPF driver-loading error handling on AIX
* Support getting the full-length interface description on FreeBSD
* In the lexical analyzer, free up any addrinfo structure we got back
  from getaddrinfo().
* Add support for BPF and libdlpi in OpenSolaris (and SXCE)
* Hyphenate "link-layer" everywhere
* Add /sys/kernel/debug/usb/usbmon to the list of usbmon locations
* In pcap_read_linux_mmap(), if there are no frames available, call
  poll() even if we're in non-blocking mode, so we pick up
  errors, and check for the errors in question.
* Note that poll() works on BPF devices is Snow Leopard
* If an ENXIO or ENETDOWN is received, it may mean the device has
  gone away.  Deal with it.
* For BPF, raise the default capture buffer size to from 32k to 512k
* Support ps_ifdrop on Linux
* Added a bunch of #ifdef directives to make wpcap.dll (WinPcap) compile
  under cygwin.
* Changes to Linux mmapped captures.
* Fix bug where create_ring would fail for particular snaplen and
  buffer size combinations
* Update pcap-config so that it handles libpcap requiring
  additional libraries
* Add workaround for threadsafeness on Windows
* Add missing mapping for DLT_ENC <-> LINKTYPE_ENC
* DLT: Add DLT_CAN_SOCKETCAN
* DLT: Add Solaris ipnet
* Don't check for DLT_IPNET if it's not defined
* Add link-layer types for Fibre Channel FC-2
* Add link-layer types for Wireless HART
* Add link-layer types for AOS
* Add link-layer types for DECT
* Autoconf fixes (AIX, HP-UX, OSF/1, Tru64 cleanups)
* Install headers unconditionally, and include vlan.h/bluetooth.h if
  enabled
* Autoconf fixes+cleanup


(adam)
diff -r1.46 -r1.47 pkgsrc/net/libpcap/Makefile
diff -r1.8 -r1.9 pkgsrc/net/libpcap/PLIST
diff -r1.21 -r1.22 pkgsrc/net/libpcap/buildlink3.mk
diff -r1.23 -r1.24 pkgsrc/net/libpcap/distinfo
diff -r1.6 -r1.7 pkgsrc/net/libpcap/patches/patch-aa
diff -r1.5 -r1.6 pkgsrc/net/libpcap/patches/patch-ac
diff -r1.3 -r0 pkgsrc/net/libpcap/patches/patch-ad
diff -r1.3 -r0 pkgsrc/net/libpcap/patches/patch-ae
cvs diff -r1.46 -r1.47 pkgsrc/net/libpcap/Makefile (expand / switch to unified diff)

--- pkgsrc/net/libpcap/Makefile 2008/11/16 15:10:10 1.46
+++ pkgsrc/net/libpcap/Makefile 2011/02/11 12:11:26 1.47
@@ -1,33 +1,33 @@ @@ -1,33 +1,33 @@
1# $NetBSD: Makefile,v 1.46 2008/11/16 15:10:10 adrianp Exp $ 1# $NetBSD: Makefile,v 1.47 2011/02/11 12:11:26 adam Exp $
2 2
3DISTNAME= libpcap-1.0.0 3DISTNAME= libpcap-1.1.1
4PKGREVISION= 2 
5SVR4_PKGNAME= lpcap 4SVR4_PKGNAME= lpcap
6CATEGORIES= net 5CATEGORIES= net
7MASTER_SITES= http://www.tcpdump.org/release/ 6MASTER_SITES= http://www.tcpdump.org/release/
8 7
9MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.tcpdump.org/ 9HOMEPAGE= http://www.tcpdump.org/
11COMMENT= System-independent interface for user-level packet capture 10COMMENT= System-independent interface for user-level packet capture
 11LICENSE= modified-bsd
12 12
13NOT_FOR_PLATFORM+= Interix-*-* # no raw interface access 13NOT_FOR_PLATFORM+= Interix-*-* # no raw interface access
14 14
15PKG_DESTDIR_SUPPORT= user-destdir 15PKG_DESTDIR_SUPPORT= user-destdir
16PKG_INSTALLATION_TYPES= overwrite pkgviews 16PKG_INSTALLATION_TYPES= overwrite pkgviews
17INSTALLATION_DIRS= bin 17INSTALLATION_DIRS= bin
18 18
19USE_TOOLS+= bison gm4 lex 
20USE_LIBTOOL= yes 19USE_LIBTOOL= yes
 20USE_TOOLS+= bison gm4 lex
21GNU_CONFIGURE= yes 21GNU_CONFIGURE= yes
22PLIST_VARS+= SunOS std 22PLIST_VARS+= SunOS std
23 23
24.include "../../mk/bsd.prefs.mk" 24.include "../../mk/bsd.prefs.mk"
25 25
26.if exists(/usr/include/netinet/ip6.h) 26.if exists(/usr/include/netinet/ip6.h)
27CONFIGURE_ARGS+= --enable-ipv6 27CONFIGURE_ARGS+= --enable-ipv6
28.endif 28.endif
29 29
30.if ${OPSYS} == "SunOS" 30.if ${OPSYS} == "SunOS"
31PLIST.SunOS= yes 31PLIST.SunOS= yes
32.else 32.else
33PLIST.std= yes 33PLIST.std= yes
cvs diff -r1.8 -r1.9 pkgsrc/net/libpcap/PLIST (expand / switch to unified diff)

--- pkgsrc/net/libpcap/PLIST 2009/06/14 18:09:33 1.8
+++ pkgsrc/net/libpcap/PLIST 2011/02/11 12:11:26 1.9
@@ -1,24 +1,27 @@ @@ -1,24 +1,27 @@
1@comment $NetBSD: PLIST,v 1.8 2009/06/14 18:09:33 joerg Exp $ 1@comment $NetBSD: PLIST,v 1.9 2011/02/11 12:11:26 adam 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/bpf.h 8include/pcap/bpf.h
 9include/pcap/ipnet.h
8include/pcap/namedb.h 10include/pcap/namedb.h
9include/pcap/pcap.h 11include/pcap/pcap.h
10include/pcap/sll.h 12include/pcap/sll.h
11include/pcap/usb.h 13include/pcap/usb.h
 14include/pcap/vlan.h
12lib/libpcap.la 15lib/libpcap.la
13man/man1/pcap-config.1 16man/man1/pcap-config.1
14man/man3/pcap.3 17man/man3/pcap.3
15man/man3/pcap_activate.3 18man/man3/pcap_activate.3
16man/man3/pcap_breakloop.3 19man/man3/pcap_breakloop.3
17man/man3/pcap_can_set_rfmon.3 20man/man3/pcap_can_set_rfmon.3
18man/man3/pcap_close.3 21man/man3/pcap_close.3
19man/man3/pcap_compile.3 22man/man3/pcap_compile.3
20man/man3/pcap_create.3 23man/man3/pcap_create.3
21man/man3/pcap_datalink.3 24man/man3/pcap_datalink.3
22man/man3/pcap_datalink_name_to_val.3 25man/man3/pcap_datalink_name_to_val.3
23man/man3/pcap_datalink_val_to_description.3 26man/man3/pcap_datalink_val_to_description.3
24man/man3/pcap_datalink_val_to_name.3 27man/man3/pcap_datalink_val_to_name.3
cvs diff -r1.21 -r1.22 pkgsrc/net/libpcap/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/net/libpcap/buildlink3.mk 2009/03/20 19:25:10 1.21
+++ pkgsrc/net/libpcap/buildlink3.mk 2011/02/11 12:11:26 1.22
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1# $NetBSD: buildlink3.mk,v 1.21 2009/03/20 19:25:10 joerg Exp $ 1# $NetBSD: buildlink3.mk,v 1.22 2011/02/11 12:11:26 adam Exp $
2 2
3.include "../../mk/bsd.fast.prefs.mk" 3.include "../../mk/bsd.fast.prefs.mk"
4 4
5BUILDLINK_TREE+= libpcap 5BUILDLINK_TREE+= libpcap
6 6
7.if !defined(LIBPCAP_BUILDLINK3_MK) 7.if !defined(LIBPCAP_BUILDLINK3_MK)
8LIBPCAP_BUILDLINK3_MK:= 8LIBPCAP_BUILDLINK3_MK:=
9 9
10# XXX? 10# XXX?
11BUILDLINK_API_DEPENDS.libpcap+= libpcap>=0.5.0 11BUILDLINK_API_DEPENDS.libpcap+= libpcap>=0.5.0
12BUILDLINK_PKGSRCDIR.libpcap?= ../../net/libpcap 12BUILDLINK_PKGSRCDIR.libpcap?= ../../net/libpcap
13 13
14# on Solaris, we always need libnsl and libsocket because libpcap.a 14# on Solaris, we always need libnsl and libsocket because libpcap.a
15# references symbols in them. 15# references symbols in them.
16. if ${OPSYS} == "SunOS" 16.if ${OPSYS} == "SunOS"
17BUILDLINK_LDADD.libpcap+= -lnsl -lsocket 17BUILDLINK_LDADD.libpcap+= -lnsl -lsocket
18BUILDLINK_LDFLAGS.libpcap?= ${BUILDLINK_LDADD.libpcap} 18BUILDLINK_LDFLAGS.libpcap?= ${BUILDLINK_LDADD.libpcap}
19. endif 19.endif
20.endif # LIBPCAP_BUILDLINK3_MK 20.endif # LIBPCAP_BUILDLINK3_MK
21 21
22BUILDLINK_TREE+= -libpcap 22BUILDLINK_TREE+= -libpcap
cvs diff -r1.23 -r1.24 pkgsrc/net/libpcap/distinfo (expand / switch to unified diff)

--- pkgsrc/net/libpcap/distinfo 2009/05/17 22:28:51 1.23
+++ pkgsrc/net/libpcap/distinfo 2011/02/11 12:11:26 1.24
@@ -1,9 +1,7 @@ @@ -1,9 +1,7 @@
1$NetBSD: distinfo,v 1.23 2009/05/17 22:28:51 dholland Exp $ 1$NetBSD: distinfo,v 1.24 2011/02/11 12:11:26 adam Exp $
2 2
3SHA1 (libpcap-1.0.0.tar.gz) = 9893654027ae11033d785045ff35583da43fe8fa 3SHA1 (libpcap-1.1.1.tar.gz) = 18581af5e78a40b7b2c9a6cd8ce40e7cb1cd9c63
4RMD160 (libpcap-1.0.0.tar.gz) = 20857fe6af5dc70fffb19da46e0fee908f55b3ea 4RMD160 (libpcap-1.1.1.tar.gz) = 760159c594cc995c9e05c0cd8637a02a3b2725e2
5Size (libpcap-1.0.0.tar.gz) = 524273 bytes 5Size (libpcap-1.1.1.tar.gz) = 581984 bytes
6SHA1 (patch-aa) = 2bf7bef9e114db7ee9e7d6e5facc8f314969f703 6SHA1 (patch-aa) = 2a797ffee404d1cfd38e7d739796e47c514ec5c3
7SHA1 (patch-ac) = 6066b492fc82ee149608b8ab3c28c6cef4752976 7SHA1 (patch-ac) = 5ef8c530b0fc49fff223ebfc7861868c0f1a1884
8SHA1 (patch-ad) = 3f9c535b522a13f74a1363f56332ef1a8db9c77a 
9SHA1 (patch-ae) = 862f292a91f9acc489fee5e7136df2cbaf386269 
cvs diff -r1.6 -r1.7 pkgsrc/net/libpcap/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/net/libpcap/patches/Attic/patch-aa 2008/10/30 08:12:52 1.6
+++ pkgsrc/net/libpcap/patches/Attic/patch-aa 2011/02/11 12:11:26 1.7
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1$NetBSD: patch-aa,v 1.6 2008/10/30 08:12:52 adam Exp $ 1$NetBSD: patch-aa,v 1.7 2011/02/11 12:11:26 adam Exp $
2 2
3--- pcap/pcap.h.orig 2008-10-29 15:08:55.000000000 +0100 3--- pcap/pcap.h.orig 2008-10-29 15:08:55.000000000 +0100
4+++ pcap/pcap.h 4+++ pcap/pcap.h
5@@ -336,10 +336,12 @@ void pcap_freealldevs(pcap_if_t *); 5@@ -349,10 +349,12 @@ void pcap_freealldevs(pcap_if_t *);
6 const char *pcap_lib_version(void); 6 const char *pcap_lib_version(void);
7  7
8 /* XXX this guy lives in the bpf tree */ 8 /* XXX this guy lives in the bpf tree */
9+#ifndef _NET_BPF_H_ 9+#ifndef _NET_BPF_H_
10 u_int bpf_filter(const struct bpf_insn *, const u_char *, u_int, u_int); 10 u_int bpf_filter(const struct bpf_insn *, const u_char *, u_int, u_int);
11 int bpf_validate(const struct bpf_insn *f, int len); 11 int bpf_validate(const struct bpf_insn *f, int len);
12 char *bpf_image(const struct bpf_insn *, int); 12 char *bpf_image(const struct bpf_insn *, int);
13 void bpf_dump(const struct bpf_program *, int); 13 void bpf_dump(const struct bpf_program *, int);
14+#endif 14+#endif
15  15
16 #if defined(WIN32) 16 #if defined(WIN32)
17  17
cvs diff -r1.5 -r1.6 pkgsrc/net/libpcap/patches/Attic/patch-ac (expand / switch to unified diff)

--- pkgsrc/net/libpcap/patches/Attic/patch-ac 2008/10/30 16:35:08 1.5
+++ pkgsrc/net/libpcap/patches/Attic/patch-ac 2011/02/11 12:11:26 1.6
@@ -1,175 +1,199 @@ @@ -1,175 +1,199 @@
1$NetBSD: patch-ac,v 1.5 2008/10/30 16:35:08 tron Exp $ 1$NetBSD: patch-ac,v 1.6 2011/02/11 12:11:26 adam Exp $
2 2
3--- Makefile.in.orig 2008-10-28 01:26:13.000000000 +0000 3--- Makefile.in.orig 2010-04-05 17:54:05.000000000 +0000
4+++ Makefile.in 2008-10-30 16:30:21.000000000 +0000 4+++ Makefile.in
5@@ -44,7 +44,7 @@ 5@@ -45,7 +45,7 @@ VPATH = @srcdir@
6 # You shouldn't need to edit anything below. 
7 # 6 #
8  7
 8 LD = /usr/bin/ld
9-CC = @CC@ 9-CC = @CC@
10+CC = ${LIBTOOL} --mode=compile @CC@ 10+CC = ${LIBTOOL} --mode=compile @CC@
11 CCOPT = @V_CCOPT@ 11 CCOPT = @V_CCOPT@
12 INCLS = -I. @V_INCLS@ 12 INCLS = -I. @V_INCLS@
13 DEFS = @DEFS@ @V_DEFS@ 13 DEFS = @DEFS@ @V_DEFS@
14@@ -73,7 +73,8 @@ 14@@ -76,7 +76,8 @@ YACC = @V_YACC@
15 # Explicitly define compilation rule since SunOS 4's make doesn't like gcc. 15 # 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 16 # 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. 17 # problem if you don't own the file but can write to the directory.
18-.c.o: 18-.c.o:
19+.SUFFIXES: .lo 19+.SUFFIXES: .lo
20+.c.lo: 20+.c.lo:
21 @rm -f $@ 21 @rm -f $@
22 $(CC) $(CFLAGS) -c $(srcdir)/$*.c 22 $(CC) $(CFLAGS) -c $(srcdir)/$*.c
23  23
24@@ -83,13 +84,13 @@ 24@@ -87,13 +88,13 @@ CSRC = pcap.c inet.c gencode.c optimize.
25 CSRC = pcap.c inet.c gencode.c optimize.c nametoaddr.c \ 25 savefile.c sf-pcap.c sf-pcap-ng.c pcap-common.c \
26 etherent.c savefile.c bpf_filter.c bpf_image.c bpf_dump.c 26 bpf_image.c bpf_dump.c
27 GENSRC = scanner.c grammar.c version.c 27 GENSRC = scanner.c grammar.c bpf_filter.c version.c
28-LIBOBJS = @LIBOBJS@ 28-LIBOBJS = @LIBOBJS@
29+LIBOBJS = @LTLIBOBJS@ 29+LIBOBJS = @LTLIBOBJS@
30  30
31 SRC = $(PSRC) $(FSRC) $(CSRC) $(SSRC) $(GENSRC) 31 SRC = $(PSRC) $(FSRC) $(CSRC) $(SSRC) $(GENSRC)
32  32
33 # We would like to say "OBJ = $(SRC:.c=.o)" but Ultrix's make cannot 33 # We would like to say "OBJ = $(SRC:.c=.o)" but Ultrix's make cannot
34 # hack the extra indirection 34 # hack the extra indirection
35-OBJ = $(PSRC:.c=.o) $(FSRC:.c=.o) $(CSRC:.c=.o) $(SSRC:.c=.o) $(GENSRC:.c=.o) $(LIBOBJS) 35-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) 36+OBJ = $(PSRC:.c=.lo) $(FSRC:.c=.lo) $(CSRC:.c=.lo) $(SSRC:.c=.lo) $(GENSRC:.c=.lo) $(LIBOBJS)
37 HDR = \ 37 PUBHDR = \
38 acconfig.h \ 38 pcap.h \
39 arcnet.h \ 39 pcap-bpf.h \
40@@ -311,12 +312,10 @@ 40@@ -324,12 +325,10 @@ EXTRA_DIST = \
41 Win32/Src/inet_net.c \ 41 Win32/Src/inet_net.c \
42 Win32/Src/inet_pton.c 42 Win32/Src/inet_pton.c
43  43
44-all: libpcap.a pcap-config 44-all: libpcap.a shared pcap-config
45+all: libpcap.la pcap-config 45+all: libpcap.la pcap-config
46  46
47-libpcap.a: $(OBJ) 47-libpcap.a: $(OBJ)
48- @rm -f $@ 48- @rm -f $@
49- $(AR) rc $@ $(OBJ) $(LIBS) 49- ar rc $@ $(OBJ) $(ADDLARCHIVEOBJS)
50- $(RANLIB) $@ 50- $(RANLIB) $@
51+libpcap.la: $(OBJ) 51+libpcap.la: $(OBJ)
52+ ${LIBTOOL} --mode=link @CC@ -rpath ${PREFIX}/lib ${LDFLAGS} $(OBJ) -o libpcap.la 52+ ${LIBTOOL} --mode=link @CC@ -rpath ${PREFIX}/lib ${LDFLAGS} $(OBJ) -o libpcap.la
53  53
54 shared: libpcap.$(DYEXT) 54 shared: libpcap.$(DYEXT)
55  55
56@@ -348,10 +347,10 @@ 56@@ -413,10 +412,10 @@ scanner.c: $(srcdir)/scanner.l
57 @rm -f $@ 57 @rm -f $@
58 ./runlex.sh $(LEX) -o$@ $< 58 $(srcdir)/runlex.sh $(LEX) -o$@ $<
59  59
60-scanner.o: scanner.c tokdefs.h 60-scanner.o: scanner.c tokdefs.h
61+scanner.lo: scanner.c tokdefs.h 61+scanner.lo: scanner.c tokdefs.h
62 $(CC) $(CFLAGS) -c scanner.c 62 $(CC) $(CFLAGS) -c scanner.c
63  63
64-pcap.o: version.h 64-pcap.o: version.h
65+pcap.lo: version.h 65+pcap.lo: version.h
66  66
67 tokdefs.h: grammar.c 67 tokdefs.h: grammar.c
68 grammar.c: $(srcdir)/grammar.y 68 grammar.c: $(srcdir)/grammar.y
69@@ -360,17 +359,17 @@ 69@@ -425,17 +424,17 @@ grammar.c: $(srcdir)/grammar.y
70 mv y.tab.c grammar.c 70 mv y.tab.c grammar.c
71 mv y.tab.h tokdefs.h 71 mv y.tab.h tokdefs.h
72  72
73-grammar.o: grammar.c 73-grammar.o: grammar.c
74+grammar.lo: grammar.c 74+grammar.lo: grammar.c
75 @rm -f $@ 75 @rm -f $@
76 $(CC) $(CFLAGS) -Dyylval=pcap_lval -c grammar.c 76 $(CC) $(CFLAGS) -Dyylval=pcap_lval -c grammar.c
77  77
78-version.o: version.c 78-version.o: version.c
79+version.lo: version.c 79+version.lo: version.c
80 $(CC) $(CFLAGS) -c version.c 80 $(CC) $(CFLAGS) -c version.c
81  81
82-snprintf.o: $(srcdir)/missing/snprintf.c 82-snprintf.o: $(srcdir)/missing/snprintf.c
83+snprintf.lo: $(srcdir)/missing/snprintf.c 83+snprintf.lo: $(srcdir)/missing/snprintf.c
84 $(CC) $(CFLAGS) -o $@ -c $(srcdir)/missing/snprintf.c 84 $(CC) $(CFLAGS) -o $@ -c $(srcdir)/missing/snprintf.c
85  85
86-version.c: $(srcdir)/VERSION 86-version.c: $(srcdir)/VERSION
87+version.c: #$(srcdir)/VERSION 87+version.c: #$(srcdir)/VERSION
88 @rm -f $@ 88 @rm -f $@
89 sed -e 's/.*/char pcap_version[] = "&";/' $(srcdir)/VERSION > $@ 89 if grep GIT ${srcdir}/VERSION >/dev/null; then \
90  90 read ver <${srcdir}/VERSION; \
91@@ -381,7 +380,7 @@ 91@@ -452,7 +451,7 @@ version.c: $(srcdir)/VERSION
92 # so we make the version string static and return it from 92 # so we make the version string static and return it from
93 # a function, which does work. 93 # a function, which does work.
94 # 94 #
95-version.h: $(srcdir)/VERSION 95-version.h: $(srcdir)/VERSION
96+version.h: #$(srcdir)/VERSION 96+version.h: #$(srcdir)/VERSION
97 @rm -f $@ 97 @rm -f $@
98 sed -e 's/.*/static const char pcap_version_string[] = "libpcap version &";/' $(srcdir)/VERSION > $@ 98 if grep GIT ${srcdir}/VERSION >/dev/null; then \
99  99 read ver <${srcdir}/VERSION; \
100@@ -389,7 +388,7 @@ 100@@ -466,7 +465,7 @@ bpf_filter.c: $(srcdir)/bpf/net/bpf_filt
101 rm -f bpf_filter.c 101 rm -f bpf_filter.c
102 ln -s $(srcdir)/bpf/net/bpf_filter.c bpf_filter.c 102 ln -s $(srcdir)/bpf/net/bpf_filter.c bpf_filter.c
103  103
104-bpf_filter.o: bpf_filter.c 104-bpf_filter.o: bpf_filter.c
105+bpf_filter.lo: bpf_filter.c 105+bpf_filter.lo: bpf_filter.c
106 $(CC) $(CFLAGS) -c bpf_filter.c 106 $(CC) $(CFLAGS) -c bpf_filter.c
107  107
108 # 108 #
109@@ -413,11 +412,10 @@ 109@@ -497,7 +496,7 @@ selpolltest: selpolltest.c libpcap.a
110 findalldevstest: findalldevstest.c libpcap.a 110 opentest: opentest.c libpcap.a
111 $(CC) $(CFLAGS) -I. -L. -o findalldevstest findalldevstest.c libpcap.a 111 $(CC) $(CFLAGS) -I. -L. -o opentest $(srcdir)/opentest.c libpcap.a $(LIBS)
112  112
113-install: libpcap.a pcap-config 113-install: install-shared install-archive pcap-config
114+install: libpcap.la pcap-config 114+install: libpcap.la pcap-config
115 [ -d $(DESTDIR)$(libdir) ] || \ 115 [ -d $(DESTDIR)$(libdir) ] || \
116 (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir)) 116 (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir))
117- $(INSTALL_DATA) libpcap.a $(DESTDIR)$(libdir)/libpcap.a 
118- $(RANLIB) $(DESTDIR)$(libdir)/libpcap.a 
119+ ${LIBTOOL} --mode=install $(INSTALL_DATA) libpcap.la $(DESTDIR)$(libdir) 
120 [ -d $(DESTDIR)$(includedir) ] || \ 117 [ -d $(DESTDIR)$(includedir) ] || \
121 (mkdir -p $(DESTDIR)$(includedir); chmod 755 $(DESTDIR)$(includedir)) 118@@ -512,48 +511,49 @@ install: install-shared install-archive
122 [ -d $(DESTDIR)$(includedir)/pcap ] || \ 119 (mkdir -p $(DESTDIR)$(mandir)/man@MAN_FILE_FORMATS@; chmod 755 $(DESTDIR)$(mandir)/man@MAN_FILE_FORMATS@)
123@@ -445,31 +443,31 @@ 120 [ -d $(DESTDIR)$(mandir)/man@MAN_MISC_INFO@ ] || \
124 $(DESTDIR)$(includedir)/pcap-bpf.h 121 (mkdir -p $(DESTDIR)$(mandir)/man@MAN_MISC_INFO@; chmod 755 $(DESTDIR)$(mandir)/man@MAN_MISC_INFO@)
125 $(INSTALL_DATA) $(srcdir)/pcap-namedb.h \ 122+ ${LIBTOOL} --mode=install $(INSTALL_DATA) libpcap.la $(DESTDIR)$(libdir)
126 $(DESTDIR)$(includedir)/pcap-namedb.h 123 for i in $(PUBHDR); do \
 124 $(INSTALL_DATA) $(srcdir)/$$i \
 125 $(DESTDIR)$(includedir)/$$i; done
 126 [ -d $(DESTDIR)$(bindir) ] || \
 127 (mkdir -p $(DESTDIR)$(bindir); chmod 755 $(DESTDIR)$(bindir))
127- $(INSTALL_PROGRAM) pcap-config $(DESTDIR)$(bindir)/pcap-config 128- $(INSTALL_PROGRAM) pcap-config $(DESTDIR)$(bindir)/pcap-config
128+ ${BSD_INSTALL_SCRIPT} pcap-config $(DESTDIR)$(bindir)/pcap-config 129+ ${BSD_INSTALL_SCRIPT} pcap-config $(DESTDIR)$(bindir)/pcap-config
129 for i in $(MAN1); do \ 130 for i in $(MAN1); do \
130 $(INSTALL_DATA) $(srcdir)/$$i \ 131 $(INSTALL_DATA) $(srcdir)/$$i \
131 $(DESTDIR)$(mandir)/man1/$$i; done 132 $(DESTDIR)$(mandir)/man1/$$i; done
132- for i in $(MAN3PCAP); do \ 133- for i in $(MAN3PCAP_NOEXPAND); do \
133- $(INSTALL_DATA) $(srcdir)/$$i \ 134- $(INSTALL_DATA) $(srcdir)/$$i \
134+ for i in $(MAN3PCAP:.3pcap=.3); do \ 135+ for i in $(MAN3PCAP_NOEXPAND:.3pcap=.3); do \
135+ $(INSTALL_DATA) $(srcdir)/$${i}pcap \ 136+ $(INSTALL_DATA) $(srcdir)/$${i}pcap \
136 $(DESTDIR)$(mandir)/man3/$$i; done 137 $(DESTDIR)$(mandir)/man3/$$i; done
 138- for i in $(MAN3PCAP_EXPAND:.in=); do \
 139- $(INSTALL_DATA) $$i \
 140+ for i in $(MAN3PCAP_EXPAND:.3pcap.in=.3); do \
 141+ $(INSTALL_DATA) $${i}pcap \
 142 $(DESTDIR)$(mandir)/man3/$$i; done
 143- rm -f $(DESTDIR)$(mandir)/man3/pcap_datalink_val_to_description.3pcap
137- ln $(DESTDIR)$(mandir)/man3/pcap_datalink_val_to_name.3pcap \ 144- ln $(DESTDIR)$(mandir)/man3/pcap_datalink_val_to_name.3pcap \
138- $(DESTDIR)$(mandir)/man3/pcap_datalink_val_to_description.3pcap 145- $(DESTDIR)$(mandir)/man3/pcap_datalink_val_to_description.3pcap
 146- rm -f $(DESTDIR)$(mandir)/man3/pcap_dump_fopen.3pcap
139- ln $(DESTDIR)$(mandir)/man3/pcap_dump_open.3pcap \ 147- ln $(DESTDIR)$(mandir)/man3/pcap_dump_open.3pcap \
140- $(DESTDIR)$(mandir)/man3/pcap_dump_fopen.3pcap 148- $(DESTDIR)$(mandir)/man3/pcap_dump_fopen.3pcap
 149- rm -f $(DESTDIR)$(mandir)/man3/pcap_perror.3pcap
141- ln $(DESTDIR)$(mandir)/man3/pcap_geterr.3pcap \ 150- ln $(DESTDIR)$(mandir)/man3/pcap_geterr.3pcap \
142- $(DESTDIR)$(mandir)/man3/pcap_perror.3pcap 151- $(DESTDIR)$(mandir)/man3/pcap_perror.3pcap
 152- rm -f $(DESTDIR)$(mandir)/man3/pcap_sendpacket.3pcap
143- ln $(DESTDIR)$(mandir)/man3/pcap_inject.3pcap \ 153- ln $(DESTDIR)$(mandir)/man3/pcap_inject.3pcap \
144- $(DESTDIR)$(mandir)/man3/pcap_sendpacket.3pcap 154- $(DESTDIR)$(mandir)/man3/pcap_sendpacket.3pcap
 155- rm -f $(DESTDIR)$(mandir)/man3/pcap_dispatch.3pcap
145- ln $(DESTDIR)$(mandir)/man3/pcap_loop.3pcap \ 156- ln $(DESTDIR)$(mandir)/man3/pcap_loop.3pcap \
146- $(DESTDIR)$(mandir)/man3/pcap_dispatch.3pcap 157- $(DESTDIR)$(mandir)/man3/pcap_dispatch.3pcap
 158- rm -f $(DESTDIR)$(mandir)/man3/pcap_minor_version.3pcap
147- ln $(DESTDIR)$(mandir)/man3/pcap_major_version.3pcap \ 159- ln $(DESTDIR)$(mandir)/man3/pcap_major_version.3pcap \
148- $(DESTDIR)$(mandir)/man3/pcap_minor_version.3pcap 160- $(DESTDIR)$(mandir)/man3/pcap_minor_version.3pcap
 161- rm -f $(DESTDIR)$(mandir)/man3/pcap_next.3pcap
149- ln $(DESTDIR)$(mandir)/man3/pcap_next_ex.3pcap \ 162- ln $(DESTDIR)$(mandir)/man3/pcap_next_ex.3pcap \
150- $(DESTDIR)$(mandir)/man3/pcap_next.3pcap 163- $(DESTDIR)$(mandir)/man3/pcap_next.3pcap
 164- rm -f $(DESTDIR)$(mandir)/man3/pcap_fopen_offline.3pcap
151- ln $(DESTDIR)$(mandir)/man3/pcap_open_offline.3pcap \ 165- ln $(DESTDIR)$(mandir)/man3/pcap_open_offline.3pcap \
152- $(DESTDIR)$(mandir)/man3/pcap_fopen_offline.3pcap 166- $(DESTDIR)$(mandir)/man3/pcap_fopen_offline.3pcap
 167- rm -f $(DESTDIR)$(mandir)/man3/pcap_getnonblock.3pcap
153- ln $(DESTDIR)$(mandir)/man3/pcap_setnonblock.3pcap \ 168- ln $(DESTDIR)$(mandir)/man3/pcap_setnonblock.3pcap \
154- $(DESTDIR)$(mandir)/man3/pcap_getnonblock.3pcap 169- $(DESTDIR)$(mandir)/man3/pcap_getnonblock.3pcap
 170+ rm -f $(DESTDIR)$(mandir)/man3/pcap_datalink_val_to_description.3
155+ ln $(DESTDIR)$(mandir)/man3/pcap_datalink_val_to_name.3 \ 171+ ln $(DESTDIR)$(mandir)/man3/pcap_datalink_val_to_name.3 \
156+ $(DESTDIR)$(mandir)/man3/pcap_datalink_val_to_description.3 172+ $(DESTDIR)$(mandir)/man3/pcap_datalink_val_to_description.3
 173+ rm -f $(DESTDIR)$(mandir)/man3/pcap_dump_fopen.3
157+ ln $(DESTDIR)$(mandir)/man3/pcap_dump_open.3 \ 174+ ln $(DESTDIR)$(mandir)/man3/pcap_dump_open.3 \
158+ $(DESTDIR)$(mandir)/man3/pcap_dump_fopen.3 175+ $(DESTDIR)$(mandir)/man3/pcap_dump_fopen.3
 176+ rm -f $(DESTDIR)$(mandir)/man3/pcap_perror.3
159+ ln $(DESTDIR)$(mandir)/man3/pcap_geterr.3 \ 177+ ln $(DESTDIR)$(mandir)/man3/pcap_geterr.3 \
160+ $(DESTDIR)$(mandir)/man3/pcap_perror.3 178+ $(DESTDIR)$(mandir)/man3/pcap_perror.3
 179+ rm -f $(DESTDIR)$(mandir)/man3/pcap_sendpacket.3
161+ ln $(DESTDIR)$(mandir)/man3/pcap_inject.3 \ 180+ ln $(DESTDIR)$(mandir)/man3/pcap_inject.3 \
162+ $(DESTDIR)$(mandir)/man3/pcap_sendpacket.3 181+ $(DESTDIR)$(mandir)/man3/pcap_sendpacket.3
 182+ rm -f $(DESTDIR)$(mandir)/man3/pcap_dispatch.3
163+ ln $(DESTDIR)$(mandir)/man3/pcap_loop.3 \ 183+ ln $(DESTDIR)$(mandir)/man3/pcap_loop.3 \
164+ $(DESTDIR)$(mandir)/man3/pcap_dispatch.3 184+ $(DESTDIR)$(mandir)/man3/pcap_dispatch.3
 185+ rm -f $(DESTDIR)$(mandir)/man3/pcap_minor_version.3
165+ ln $(DESTDIR)$(mandir)/man3/pcap_major_version.3 \ 186+ ln $(DESTDIR)$(mandir)/man3/pcap_major_version.3 \
166+ $(DESTDIR)$(mandir)/man3/pcap_minor_version.3 187+ $(DESTDIR)$(mandir)/man3/pcap_minor_version.3
 188+ rm -f $(DESTDIR)$(mandir)/man3/pcap_next.3
167+ ln $(DESTDIR)$(mandir)/man3/pcap_next_ex.3 \ 189+ ln $(DESTDIR)$(mandir)/man3/pcap_next_ex.3 \
168+ $(DESTDIR)$(mandir)/man3/pcap_next.3 190+ $(DESTDIR)$(mandir)/man3/pcap_next.3
 191+ rm -f $(DESTDIR)$(mandir)/man3/pcap_fopen_offline.3
169+ ln $(DESTDIR)$(mandir)/man3/pcap_open_offline.3 \ 192+ ln $(DESTDIR)$(mandir)/man3/pcap_open_offline.3 \
170+ $(DESTDIR)$(mandir)/man3/pcap_fopen_offline.3 193+ $(DESTDIR)$(mandir)/man3/pcap_fopen_offline.3
 194+ rm -f $(DESTDIR)$(mandir)/man3/pcap_getnonblock.3
171+ ln $(DESTDIR)$(mandir)/man3/pcap_setnonblock.3 \ 195+ ln $(DESTDIR)$(mandir)/man3/pcap_setnonblock.3 \
172+ $(DESTDIR)$(mandir)/man3/pcap_getnonblock.3 196+ $(DESTDIR)$(mandir)/man3/pcap_getnonblock.3
173 for i in $(MANFILE); do \ 197 for i in $(MANFILE); do \
174 $(INSTALL_DATA) $(srcdir)/`echo $$i | sed 's/.manfile.in/.manfile/'` \ 198 $(INSTALL_DATA) `echo $$i | sed 's/.manfile.in/.manfile/'` \
175 $(DESTDIR)$(mandir)/man@MAN_FILE_FORMATS@/`echo $$i | sed 's/.manfile.in/.@MAN_FILE_FORMATS@/'`; done 199 $(DESTDIR)$(mandir)/man@MAN_FILE_FORMATS@/`echo $$i | sed 's/.manfile.in/.@MAN_FILE_FORMATS@/'`; done
File Deleted: pkgsrc/net/libpcap/patches/Attic/patch-ad
File Deleted: pkgsrc/net/libpcap/patches/Attic/patch-ae