From 8f43c50c6d95b0e6de909bd60407fde0faabe579 Mon Sep 17 00:00:00 2001
From: markd <markd>
Date: Sun, 30 Jan 2011 01:25:09 +0000
Subject: define __USE_BSD to get u_char etal to successfully detect libpcap on
 linux

---
 net/nmap/distinfo         |  5 +++--
 net/nmap/patches/patch-ab | 21 +++++++++++++++------
 net/nmap/patches/patch-al | 13 +++++++++++++
 3 files changed, 31 insertions(+), 8 deletions(-)
 create mode 100644 net/nmap/patches/patch-al

(limited to 'net/nmap')

diff --git a/net/nmap/distinfo b/net/nmap/distinfo
index 1a29b82c2c5..f4a76b2179c 100644
--- a/net/nmap/distinfo
+++ b/net/nmap/distinfo
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.44 2010/11/30 11:04:58 obache Exp $
+$NetBSD: distinfo,v 1.45 2011/01/30 01:25:09 markd Exp $
 
 SHA1 (nmap-5.35DC1.tar.bz2) = 5fd786d4bbe6b4fbc0ae625fbb6893b19fbde627
 RMD160 (nmap-5.35DC1.tar.bz2) = d0663a669824a38f05e89c14a2ad5fd9932eddcc
 Size (nmap-5.35DC1.tar.bz2) = 11302092 bytes
 SHA1 (patch-aa) = 61593e0479a79bcb4cce2e88b2e5753fa14bc429
-SHA1 (patch-ab) = 22c377e9a340a6e6d7b9a36b63e6ffc47a084b3b
+SHA1 (patch-ab) = d290652bef2ba345e7d95ffe8eb3fe3055c9b6d8
 SHA1 (patch-ac) = c22e8f6411b1152a6e7582c90e5ec5bd4c6acaad
 SHA1 (patch-aj) = 868440ce24a70c1a747af6d65eed24f20c4bb892
 SHA1 (patch-ak) = ffc530fb2987fadbb4990314947015e8cd26c2c9
+SHA1 (patch-al) = e7ea6235c964aa17bd03c2bef460eb99716fb932
diff --git a/net/nmap/patches/patch-ab b/net/nmap/patches/patch-ab
index 8c8428dd2ee..aed23d4ab60 100644
--- a/net/nmap/patches/patch-ab
+++ b/net/nmap/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.13 2010/03/21 21:58:23 pettai Exp $
+$NetBSD: patch-ab,v 1.14 2011/01/30 01:25:09 markd Exp $
 
---- configure.orig	2009-11-05 20:50:33.000000000 +0100
-+++ configure	2010-01-27 23:57:35.000000000 +0100
-@@ -5891,7 +5891,7 @@
+--- configure.orig	2010-07-16 00:43:59.000000000 +0000
++++ configure
+@@ -6212,7 +6212,7 @@ if test "${am_cv_pathless_PYTHON+set}" =
    $as_echo_n "(cached) " >&6
  else
  
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.13 2010/03/21 21:58:23 pettai Exp $
  	  test "$am_cv_pathless_PYTHON" = none && break
  	  prog="import sys
  # split strings by '.' and convert to numeric.  Append some zeros
-@@ -6145,7 +6145,7 @@
+@@ -6466,7 +6466,7 @@ if test "${am_cv_pathless_PYTHON+set}" =
    $as_echo_n "(cached) " >&6
  else
  
@@ -20,7 +20,7 @@ $NetBSD: patch-ab,v 1.13 2010/03/21 21:58:23 pettai Exp $
  	  test "$am_cv_pathless_PYTHON" = none && break
  	  prog="import sys
  # split strings by '.' and convert to numeric.  Append some zeros
-@@ -7161,6 +7161,7 @@
+@@ -7664,6 +7664,7 @@ cat >>conftest.$ac_ext <<_ACEOF
  extern char pcap_version[];
  int main() {
    int major, minor1, minor2;
@@ -28,3 +28,12 @@ $NetBSD: patch-ab,v 1.13 2010/03/21 21:58:23 pettai Exp $
    sscanf(pcap_version,"%d.%d.%d", &major, &minor1, &minor2);
    if (major > 0)
      exit(0);
+@@ -7714,6 +7715,8 @@ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
++#define  __USE_BSD
++#include <sys/types.h>
+ #include <stdio.h>
+ #ifdef HAVE_SYS_IOCCOM_H
+ #include <sys/ioccom.h>
diff --git a/net/nmap/patches/patch-al b/net/nmap/patches/patch-al
new file mode 100644
index 00000000000..23079910896
--- /dev/null
+++ b/net/nmap/patches/patch-al
@@ -0,0 +1,13 @@
+$NetBSD: patch-al,v 1.1 2011/01/30 01:25:09 markd Exp $
+
+--- nping/configure.orig	2011-01-26 10:07:02.311910853 +0000
++++ nping/configure
+@@ -5068,6 +5068,8 @@ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
++#define  __USE_BSD
++#include <sys/types.h>
+ #include <stdio.h>
+ #ifdef HAVE_SYS_IOCCOM_H
+ #include <sys/ioccom.h>
-- 
cgit v1.2.3