libpcap: update to 1.5.1; enable usb build option.

srcpkgs/libpcap/patches/libnl32.patch

@@ -1,18 +0,0 @@
---- configure.in	2012-01-02 01:47:37.000000000 +0100
-+++ configure.in	2012-02-09 19:29:29.405603749 +0100
-@@ -433,12 +433,13 @@
- 		#
- 		# Try libnl 2.x first.
- 		#
--		AC_CHECK_LIB(nl, nl_socket_alloc,
-+		AC_CHECK_LIB(nl-3, nl_socket_alloc,
- 		[
- 			#
- 			# Yes, we have libnl 2.x.
- 			#
--			LIBS="-lnl-genl -lnl $LIBS"
-+			LIBS="$(pkg-config --libs libnl-genl-3.0 libnl-3.0) $LIBS"
-+			V_INCLS="$V_INCLS $(pkg-config --cflags libnl-genl-3.0 libnl-3.0)"
- 			AC_DEFINE(HAVE_LIBNL,1,[if libnl exists])
- 			AC_DEFINE(HAVE_LIBNL_2_x,1,[if libnl exists and is version 2.x])
- 		],

srcpkgs/libpcap/template

@@ -1,17 +1,17 @@
 # Template file for 'libpcap'
 pkgname=libpcap
-version=1.4.0
+version=1.5.1
 revision=1
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-libnl --with-pcap=linux"
-hostmakedepends="automake pkg-config flex"
-makedepends="libnl3-devel"
+hostmakedepends="pkg-config flex"
+makedepends="libfl-devel libnl-devel dbus-devel"
 short_desc="System-independent interface for user-level packet capture"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.tcpdump.org/"
 license="BSD"
 distfiles="http://www.tcpdump.org/release/$pkgname-$version.tar.gz"
-checksum=7c6a2a4f71e8ab09804e6b4fb3aff998c5583108ac42c0e2967eee8e1dbc7406
+checksum=259db4fe1e9f0b6b9c43a057ec5916dec7d0a821b00d6d6c4dff7db2445fa7e4
 long_desc="
  This is libpcap, a system-independent interface for user-level packet
  capture. libpcap provides a portable framework for low-level network
@@ -23,20 +23,14 @@ long_desc="
  alleviate the need for several system-dependent packet capture modules
  in each application."
 
-if [ "$CROSS_BUILD" ]; then
-	makedepends+=" libfl-devel"
-fi
-
-pre_configure() {
-	autoreconf -fi
-}
-
 post_install() {
 	vinstall LICENSE 644 usr/share/licenses/$pkgname
 }
 
 # Package build options
 build_options="bluetooth usb"
+build_options_default="usb"
+
 desc_option_bluetooth="Enable support for bluetooth sniffing"
 desc_option_usb="Enable support for USB sniffing"
 
@@ -55,18 +49,19 @@ else
 fi
 
 libpcap-devel_package() {
-	depends="libnl3-devel libpcap>=$version"
+	depends="libnl-devel libpcap>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/bin
 		vmove usr/share/man
 		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
 	}
 }
 
 libpcap_package() {
 	pkg_install() {
-		vmove usr
+		vmove all
 	}
 }