Support files for new libpcap 1.0.0.

Includes a shlib bump.

1 files changed, 82 insertions, 50 deletions

diff --git a/lib/libpcap/Makefile b/lib/libpcap/Makefile
index 4f43279..5db0ea8 100644
--- a/lib/libpcap/Makefile
+++ b/lib/libpcap/Makefile
@@ -11,56 +11,72 @@ SRCS=	grammar.y tokdefs.h version.h pcap-bpf.c \
 	etherent.c savefile.c bpf_filter.c bpf_image.c bpf_dump.c \
 	scanner.l version.c
 INCS=	pcap.h pcap-int.h pcap-namedb.h pcap-bpf.h
-MAN=	pcap.3
-MLINKS=	pcap.3 pcap_open_live.3 \
-	pcap.3 pcap_open_dead.3 \
-	pcap.3 pcap_open_offline.3 \
-	pcap.3 pcap_fopen_offline.3 \
-	pcap.3 pcap_dump_open.3 \
-	pcap.3 pcap_dump_fopen.3 \
-	pcap.3 pcap_setnonblock.3 \
-	pcap.3 pcap_getnonblock.3 \
-	pcap.3 pcap_findalldevs.3 \
-	pcap.3 pcap_freealldevs.3 \
-	pcap.3 pcap_lookupdev.3 \
-	pcap.3 pcap_lookupnet.3 \
-	pcap.3 pcap_dispatch.3 \
-	pcap.3 pcap_loop.3 \
-	pcap.3 pcap_dump.3 \
-	pcap.3 pcap_compile.3 \
-	pcap.3 pcap_setfilter.3 \
-	pcap.3 pcap_freecode.3 \
-	pcap.3 pcap_setdirection.3 \
-	pcap.3 pcap_next.3 \
-	pcap.3 pcap_next_ex.3 \
-	pcap.3 pcap_breakloop.3 \
-	pcap.3 pcap_inject.3 \
-	pcap.3 pcap_sendpacket.3 \
-	pcap.3 pcap_datalink.3 \
-	pcap.3 pcap_list_datalinks.3 \
-	pcap.3 pcap_set_datalink.3 \
-	pcap.3 pcap_datalink_name_to_val.3 \
-	pcap.3 pcap_datalink_val_to_name.3 \
-	pcap.3 pcap_datalink_val_to_description.3 \
-	pcap.3 pcap_snapshot.3 \
-	pcap.3 pcap_is_swapped.3 \
-	pcap.3 pcap_major_version.3 \
-	pcap.3 pcap_minor_version.3 \
-	pcap.3 pcap_stats.3 \
-	pcap.3 pcap_file.3 \
-	pcap.3 pcap_fileno.3 \
-	pcap.3 pcap_get_selectable_fd.3 \
-	pcap.3 pcap_perror.3 \
-	pcap.3 pcap_geterr.3 \
-	pcap.3 pcap_strerror.3 \
-	pcap.3 pcap_lib_version.3 \
-	pcap.3 pcap_close.3 \
-	pcap.3 pcap_dump_flush.3 \
-	pcap.3 pcap_dump_ftell.3 \
-	pcap.3 pcap_dump_file.3 \
-	pcap.3 pcap_dump_close.3
+MAN=	pcap.3 \
+	pcap_activate.3 \
+	pcap_breakloop.3 \
+	pcap_can_set_rfmon.3 \
+	pcap_close.3 \
+	pcap_compile.3 \
+	pcap_create.3 \
+	pcap_datalink.3 \
+	pcap_datalink_name_to_val.3 \
+	pcap_datalink_val_to_name.3 \
+	pcap_dump.3 \
+	pcap_dump_close.3 \
+	pcap_dump_file.3 \
+	pcap_dump_flush.3 \
+	pcap_dump_ftell.3 \
+	pcap_dump_open.3 \
+	pcap_file.3 \
+	pcap_fileno.3 \
+	pcap_findalldevs.3 \
+	pcap_free_datalinks.3 \
+	pcap_freealldevs.3 \
+	pcap_freecode.3 \
+	pcap_get_selectable_fd.3 \
+	pcap_geterr.3 \
+	pcap_inject.3 \
+	pcap_is_swapped.3 \
+	pcap_lib_version.3 \
+	pcap_list_datalinks.3 \
+	pcap_lookupdev.3 \
+	pcap_lookupnet.3 \
+	pcap_loop.3 \
+	pcap_major_version.3 \
+	pcap_next_ex.3 \
+	pcap_offline_filter.3 \
+	pcap_open_dead.3 \
+	pcap_open_live.3 \
+	pcap_open_offline.3 \
+	pcap_set_buffer_size.3 \
+	pcap_set_datalink.3 \
+	pcap_set_promisc.3 \
+	pcap_set_rfmon.3 \
+	pcap_set_snaplen.3 \
+	pcap_set_timeout.3 \
+	pcap_setdirection.3 \
+	pcap_setfilter.3 \
+	pcap_setnonblock.3 \
+	pcap_snapshot.3 \
+	pcap_stats.3 \
+	pcap_statustostr.3 \
+	pcap_strerror.3 \
+	pcap-savefile.5 \
+	pcap-filter.7 \
+	pcap-linktype.7
+MLINKS=	pcap_datalink_val_to_name.3 pcap_datalink_val_to_description.3 \
+	pcap_dump_open.3 pcap_dump_fopen.3 \
+	pcap_geterr.3 pcap_perror.3 \
+	pcap_inject.3 pcap_sendpacket.3 \
+	pcap_loop.3 pcap_dispatch.3 \
+	pcap_major_version.3 pcap_minor_version.3 \
+	pcap_next_ex.3 pcap_next.3 \
+	pcap_open_offline.3 pcap_fopen_offline.3 \
+	pcap_setnonblock.3 pcap_getnonblock.3
 
-CLEANFILES=tokdefs.h version.h version.c
+# Our man pages are a special copy from the distdir. See bellow.
+CLEANFILES+=${MAN}
+CLEANFILES+=tokdefs.h version.h version.c
 
 YFLAGS+=-p pcapyy
 LFLAGS+=-Ppcapyy
@@ -74,7 +90,7 @@ CFLAGS+=-DINET6
 CFLAGS+=-DHAVE_NET_PFVAR_H
 .endif
 
-SHLIB_MAJOR=5
+SHLIB_MAJOR=6
 
 #
 # Magic to grab sources out of src/contrib
@@ -95,4 +111,20 @@ version.h: ${PCAP_DISTDIR}/VERSION
 tokdefs.h: grammar.h
 	ln -sf grammar.h tokdefs.h
 
+
+#
+# Magic to convert the man pages to something non Solarish
+#
+.for _page in ${MAN}
+${_page}:
+	if [ -f ${PCAP_DISTDIR}/${_page:S/3$/3pcap/} ]; then		\
+		F=${_page:S/3$/3pcap/}; 				\
+	elif [ -f ${PCAP_DISTDIR}/${_page:S/5$/manfile/} ]; then	\
+		F=${_page:S/5$/manfile/};				\
+	else								\
+		F=${_page:S/7$/manmisc/};				\
+	fi;								\
+	sed -e 's/3PCAP/3/g' ${PCAP_DISTDIR}/$$F > ${_page}
+.endfor
+
 .include <bsd.lib.mk>