[pkgsrc/trunk]: pkgsrc/net/nmap Make this configure correctly under Linux. T...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7d30e4aedff1
branches:  trunk
changeset: 462648:7d30e4aedff1
user:      reed <reed%pkgsrc.org@localhost>
date:      Tue Oct 07 17:50:37 2003 +0000

description:
Make this configure correctly under Linux.  The configure script
assumed incorrectly that if you are using Linux, that you want to
use the nmap-provided libpcap code; but the libpcap package works
fine.  (Okay'd by salo.)

diffstat:

 net/nmap/distinfo         |   4 ++--
 net/nmap/patches/patch-ab |  21 ++++++++++++++++-----
 2 files changed, 18 insertions(+), 7 deletions(-)

diffs (51 lines):

diff -r bfae50cda163 -r 7d30e4aedff1 net/nmap/distinfo
--- a/net/nmap/distinfo Tue Oct 07 13:49:58 2003 +0000
+++ b/net/nmap/distinfo Tue Oct 07 17:50:37 2003 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.13 2003/09/20 14:15:27 salo Exp $
+$NetBSD: distinfo,v 1.14 2003/10/07 17:50:37 reed Exp $
 
 SHA1 (nmap-3.45.tar.bz2) = f89fabaebabdaa548704bd0ea1f0a0aac028ebcc
 Size (nmap-3.45.tar.bz2) = 1221032 bytes
 SHA1 (patch-aa) = c2ef0b16ce8cda4e238f5d03a00fc08def78ab70
-SHA1 (patch-ab) = c0fd4e153fd0823407f2e6923d33412b88d77a78
+SHA1 (patch-ab) = 31cee0df5dd8d071f421fc8b9d467b34a6275472
 SHA1 (patch-ad) = 71c22d0d76a789cf417b9b17d356a6b5f933553c
 SHA1 (patch-ae) = 703872b2f822e48080b6158774d0adf75e652bff
 SHA1 (patch-af) = 21b03fc6658267c6c40d65f634f4fe20d06a2d77
diff -r bfae50cda163 -r 7d30e4aedff1 net/nmap/patches/patch-ab
--- a/net/nmap/patches/patch-ab Tue Oct 07 13:49:58 2003 +0000
+++ b/net/nmap/patches/patch-ab Tue Oct 07 17:50:37 2003 +0000
@@ -1,8 +1,19 @@
-$NetBSD: patch-ab,v 1.7 2003/09/20 14:15:28 salo Exp $
+$NetBSD: patch-ab,v 1.8 2003/10/07 17:50:37 reed Exp $
 
---- configure.orig     2003-09-13 07:40:51.000000000 +0200
-+++ configure  2003-09-20 14:41:26.000000000 +0200
-@@ -5208,6 +5208,7 @@
+--- configure.orig     2003-09-13 05:40:51.000000000 +0000
++++ configure  2003-10-07 16:22:16.000000000 +0000
+@@ -5173,10 +5173,6 @@
+ 
+ fi;
+ 
+-if test $linux = yes; then
+-  have_libpcap=no
+-fi
+-
+ if test $needs_cpp_precomp = yes; then
+   CXXFLAGS="-no-cpp-precomp $CXXFLAGS"
+ fi
+@@ -5208,6 +5204,7 @@
  extern char pcap_version[];
  int main() {
    int major, minor;
@@ -10,7 +21,7 @@
    sscanf(pcap_version,"%d.%d", &major, &minor);
    if (major > 0)
      exit(0);
-@@ -6983,7 +6984,6 @@
+@@ -6983,7 +6980,6 @@