diff options
| author | jperkin <jperkin@pkgsrc.org> | 2013-02-22 21:12:25 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2013-02-22 21:12:25 +0000 |
| commit | a69ce0142f7b67d09ff02ffa7a14b0d4aa71d5f1 (patch) | |
| tree | cb69e129025468d02dc3b4144aa2dd4d32bd658d /devel/libnet10 | |
| parent | 50a0db41a83d185cc865c7103f9eb67bbbe7a6a3 (diff) | |
| download | pkgsrc-a69ce0142f7b67d09ff02ffa7a14b0d4aa71d5f1.tar.gz | |
Look for dlpi interface before bpf, SunOS has both but this package assumes
that bpf means a BSD system and tries to then use sysctl etc.
Fixes build on SunOS.
Diffstat (limited to 'devel/libnet10')
| -rw-r--r-- | devel/libnet10/distinfo | 4 | ||||
| -rw-r--r-- | devel/libnet10/patches/patch-ac | 35 |
2 files changed, 31 insertions, 8 deletions
diff --git a/devel/libnet10/distinfo b/devel/libnet10/distinfo index 7fdb1c37bdf..8837bf9b4d3 100644 --- a/devel/libnet10/distinfo +++ b/devel/libnet10/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.3 2009/07/26 20:14:44 schmonz Exp $ +$NetBSD: distinfo,v 1.4 2013/02/22 21:12:25 jperkin Exp $ SHA1 (libnet-1.0.2a.tar.gz) = 804eaf43bb90f93e505d46a9668c914a112bf136 RMD160 (libnet-1.0.2a.tar.gz) = 43dd2edc31e56b42792727b88d81342dc26d3308 Size (libnet-1.0.2a.tar.gz) = 140191 bytes SHA1 (patch-aa) = fa71db191c421aa1b36d1107236645fdde0bc8f9 SHA1 (patch-ab) = 56a2cb8b214529fdaacdbc6154ec2fc88edfa1c8 -SHA1 (patch-ac) = 8a329e6f71fea449d6f7bf913c34627285452b66 +SHA1 (patch-ac) = 73c68c9e6ca1dfc751cf8d5b00444fa38ae87e70 SHA1 (patch-ad) = 44256848f62919540893913469d88f5a7177d742 SHA1 (patch-ae) = 12777de08a91b76d1b0194b39551215bab74222f diff --git a/devel/libnet10/patches/patch-ac b/devel/libnet10/patches/patch-ac index cf9b55b1413..f47b2464412 100644 --- a/devel/libnet10/patches/patch-ac +++ b/devel/libnet10/patches/patch-ac @@ -1,6 +1,9 @@ -$NetBSD: patch-ac,v 1.1.1.1 2007/02/18 18:36:21 adrianp Exp $ +$NetBSD: patch-ac,v 1.2 2013/02/22 21:12:25 jperkin Exp $ ---- configure.orig 2001-01-18 09:59:33.000000000 +1300 +Look for dlpi before bpf, SunOS has both but this package assumes +bpf is only on BSD systems and tries to use sysctl etc. + +--- configure.orig 2001-01-17 20:59:33.000000000 +0000 +++ configure @@ -506,7 +506,7 @@ fi @@ -29,16 +32,36 @@ $NetBSD: patch-ac,v 1.1.1.1 2007/02/18 18:36:21 adrianp Exp $ ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross -@@ -1284,7 +1284,7 @@ fi +@@ -1284,7 +1284,13 @@ fi echo $ac_n "checking low-level packet interface type""... $ac_c" 1>&6 echo "configure:1286: checking low-level packet interface type" >&5 -if test -r /dev/bpf0 ; then -+if test -r /dev/bpf0 -o -r /dev/bpf -o -r /usr/include/net/bpf.h ; then ++if test -r /usr/include/sys/dlpi.h ; then ++ LL_INT_TYPE=dlpi ++ echo "$ac_t""found dlpi" 1>&6 ++ cat >> confdefs.h <<\EOF ++#define HAVE_DLPI 1 ++EOF ++elif test -r /dev/bpf0 -o -r /dev/bpf -o -r /usr/include/net/bpf.h ; then LL_INT_TYPE=bpf echo "$ac_t""found bpf" 1>&6 elif test -r /usr/include/net/pfilt.h ; then -@@ -1416,7 +1416,7 @@ fi +@@ -1299,13 +1305,6 @@ elif test -r /usr/include/sys/net/nit.h + elif test -r /usr/include/net/raw.h ; then + LL_INT_TYPE=snoop + echo "$ac_t""found snoop" 1>&6 +-elif test -r /usr/include/sys/dlpi.h ; then +- LL_INT_TYPE=dlpi +- echo "$ac_t""found dlpi" 1>&6 +- cat >> confdefs.h <<\EOF +-#define HAVE_DLPI 1 +-EOF +- + elif test -r /usr/include/linux/socket.h ; then + LL_INT_TYPE=sockpacket + echo "$ac_t""found SOCK_PACKET" 1>&6 +@@ -1416,7 +1415,7 @@ fi fi @@ -47,7 +70,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2007/02/18 18:36:21 adrianp Exp $ LL_INT_TYPE=bpf echo "$ac_t""found bpf" 1>&6 elif test -c /dev/enet ; then # check again in case not readable -@@ -1577,7 +1577,7 @@ done +@@ -1577,7 +1576,7 @@ done BIN_PREFIX="$prefix/bin/" ;; |