2 files changed, 10 insertions, 30 deletions
diff --git a/security/nmap/files/patch-output.cc b/security/nmap/files/patch-output.cc
index 40c4f4f5e275..a5a89f73c2df 100644
--- a/security/nmap/files/patch-output.cc
+++ b/security/nmap/files/patch-output.cc
@@ -1,21 +1,19 @@
---- output.cc.orig	2009-04-01 00:29:03.000000000 +0200
-+++ output.cc	2009-04-01 22:52:01.000000000 +0200
-@@ -108,6 +108,7 @@
- #include <math.h>
- 
- #include <set>
-+#include <sys/param.h>
+--- output.cc.orig	2009-12-20 04:22:19.000000000 +0100
++++ output.cc	2010-01-21 17:42:20.000000000 +0100
+@@ -111,6 +111,7 @@
  #include <string>
  #include <vector>
  #include <list>
-@@ -1030,8 +1031,8 @@
++#include <sys/param.h>
+ 
+ /* Workaround for lack of namespace std on HP-UX 11.00 */
+ namespace std {};
+@@ -1037,7 +1038,7 @@
    case LOG_MACHINE:
    case LOG_SKID:
    case LOG_XML:
 -#ifdef WIN32
--	  apcopy = ap;
 +#if defined(WIN32) || (defined(FREEBSD) && (__FreeBSD_version < 500000))
-+    apcopy = ap;
+     apcopy = ap;
  #else
-     va_copy(apcopy, ap); /* Needed in case we need to so a second vnsprintf */
- #endif
+     va_copy(apcopy, ap); /* Needed in case we need to do a second vsnprintf */
diff --git a/security/nmap/files/patch-tcpip.cc b/security/nmap/files/patch-tcpip.cc
index cd67b771bc2b..bfd32d785532 100644
--- a/security/nmap/files/patch-tcpip.cc
+++ b/security/nmap/files/patch-tcpip.cc
@@ -9,21 +9,3 @@
  extern NmapOps o;
  
  #ifdef WIN32
-@@ -1959,7 +1961,7 @@
- 
- // Returns whether the system supports pcap_get_selectable_fd() properly
- bool pcap_selectable_fd_valid() {
--#if defined(WIN32) || defined(MACOSX)
-+#if defined(WIN32) || defined(MACOSX) || (defined(FREEBSD) && (__FreeBSD_version < 500000))
-   return false;
- #endif
-   return true;
-@@ -1972,7 +1974,7 @@
-    results.  If you just want to test whether the function is supported,
-    use pcap_selectable_fd_valid() instead. */
- int my_pcap_get_selectable_fd(pcap_t *p) {
--#if defined(WIN32) || defined(MACOSX)
-+#if defined(WIN32) || defined(MACOSX) || (defined(FREEBSD) && (__FreeBSD_version < 500000))
-   return -1;
- #else
-   assert(pcap_selectable_fd_valid());