[pkgsrc/trunk]: pkgsrc/net/ethereal Don't use pcap_compile_nopcap()

[adam <adam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6e425391bbf5
branches:  trunk
changeset: 463273:6e425391bbf5
user:      adam <adam%pkgsrc.org@localhost>
date:      Tue Nov 04 14:14:01 2003 +0000

description:
Don't use pcap_compile_nopcap()

diffstat:

 net/ethereal/Makefile         |   3 ++-
 net/ethereal/distinfo         |   3 +--
 net/ethereal/patches/patch-aa |  13 -------------
 3 files changed, 3 insertions(+), 16 deletions(-)

diffs (44 lines):

diff -r e79d4b25c0c9 -r 6e425391bbf5 net/ethereal/Makefile
--- a/net/ethereal/Makefile     Tue Nov 04 12:51:29 2003 +0000
+++ b/net/ethereal/Makefile     Tue Nov 04 14:14:01 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.85 2003/11/04 12:49:25 adam Exp $
+# $NetBSD: Makefile,v 1.86 2003/11/04 14:14:01 adam Exp $
 #
 
 DISTNAME=              ethereal-0.9.16
@@ -33,6 +33,7 @@
 CONFIGURE_ARGS+=       --with-net-snmp=${BUILDLINK_PREFIX.net-snmp}
 CONFIGURE_ARGS+=       --with-pcap=${BUILDLINK_PREFIX.libpcap}
 CONFIGURE_ARGS+=       --with-zlib=${BUILDLINK_PREFIX.zlib}
+CONFIGURE_ENV+=                ac_cv_func_pcap_compile_nopcap=no
 
 PTHREAD_OPTS=          require
 
diff -r e79d4b25c0c9 -r 6e425391bbf5 net/ethereal/distinfo
--- a/net/ethereal/distinfo     Tue Nov 04 12:51:29 2003 +0000
+++ b/net/ethereal/distinfo     Tue Nov 04 14:14:01 2003 +0000
@@ -1,5 +1,4 @@
-$NetBSD: distinfo,v 1.23 2003/11/04 12:49:25 adam Exp $
+$NetBSD: distinfo,v 1.24 2003/11/04 14:14:01 adam Exp $
 
 SHA1 (ethereal-0.9.16.tar.bz2) = 65c9d7b6a9a677592e0420e607e9a0d7e7928d79
 Size (ethereal-0.9.16.tar.bz2) = 4288070 bytes
-SHA1 (patch-aa) = 411fa4498f4564db37ff890625ead2a8a2d1b259
diff -r e79d4b25c0c9 -r 6e425391bbf5 net/ethereal/patches/patch-aa
--- a/net/ethereal/patches/patch-aa     Tue Nov 04 12:51:29 2003 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.9 2003/11/04 12:49:25 adam Exp $
-
---- tethereal.c.orig   2003-11-04 13:30:48.000000000 +0100
-+++ tethereal.c
-@@ -1394,7 +1394,7 @@ main(int argc, char *argv[])
-       fprintf(stderr, "tethereal: %s\n", dfilter_error_msg);
-       epan_cleanup();
- #ifdef HAVE_PCAP_COMPILE_NOPCAP
--      if (pcap_compile_nopcap(DLT_EN10MB, 0, &fcode, rfilter, 0, 0) != -1) {
-+      if (pcap_compile_nopcap(DLT_EN10MB, 0, &fcode, rfilter, 0, 0, err_str) != -1) {
-         fprintf(stderr,
-           "  Note: This display filter code looks like a valid capture filter;\n"
-           "        maybe you mixed them up?\n");