diff --git a/srcpkgs/libpcap/libpcap-devel.template b/srcpkgs/libpcap/libpcap-devel.template index a85b0802591..13e32760ff7 100644 --- a/srcpkgs/libpcap/libpcap-devel.template +++ b/srcpkgs/libpcap/libpcap-devel.template @@ -1,13 +1,14 @@ # Template file for 'libpcap-devel'. # -depends="libnl-devel libpcap>=$version" -short_desc="${short_desc} (development files)" +depends="libnl3-devel libpcap>=$version" +short_desc="${short_desc} -- development files" long_desc="${long_desc} This package contains files for development, headers, static libs, etc." do_install() { - mkdir -p ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/{include,bin,share} ${DESTDIR}/usr - mv ${SRCPKGDESTDIR}/usr/lib/*.a ${DESTDIR}/usr/lib + vmove usr/include usr + vmove usr/bin usr + vmove usr/share/man usr/share + vmove "usr/lib/*.a" usr/lib } diff --git a/srcpkgs/libpcap/patches/libnl32.patch b/srcpkgs/libpcap/patches/libnl32.patch new file mode 100644 index 00000000000..b64aba37bc9 --- /dev/null +++ b/srcpkgs/libpcap/patches/libnl32.patch @@ -0,0 +1,18 @@ +--- 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]) + ], diff --git a/srcpkgs/libpcap/template b/srcpkgs/libpcap/template index ff17c8c766d..e1e0cc80026 100644 --- a/srcpkgs/libpcap/template +++ b/srcpkgs/libpcap/template @@ -1,10 +1,11 @@ # Template file for 'libpcap' pkgname=libpcap version=1.3.0 -revision=1 +revision=2 build_style=gnu-configure -configure_args="--enable-ipv6" -makedepends="flex libnl-devel" +configure_args="--enable-ipv6 --with-libnl --with-pcap=linux" +makedepends="automake pkg-config flex libnl3-devel" +crossmakedepends="libfl-devel libnl3-devel" subpackages="$pkgname-devel" short_desc="System-independent interface for user-level packet capture" maintainer="Juan RP " @@ -23,6 +24,10 @@ long_desc=" alleviate the need for several system-dependent packet capture modules in each application." +pre_configure() { + autoreconf -fi +} + post_install() { vinstall LICENSE 644 usr/share/licenses/$pkgname }