From 5f9308c91e8ad96dea3598d065914b2de4b65b66 Mon Sep 17 00:00:00 2001
From: adam <adam@pkgsrc.org>
Date: Fri, 8 Jul 2011 09:24:48 +0000
Subject: Fix configuring with Clang.

---
 net/nmap/Makefile                      |  4 ++--
 net/nmap/distinfo                      |  3 ++-
 net/nmap/patches/patch-nbase_configure | 24 ++++++++++++++++++++++++
 3 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 net/nmap/patches/patch-nbase_configure

(limited to 'net/nmap')

diff --git a/net/nmap/Makefile b/net/nmap/Makefile
index f4616f984fb..f59c2d10fb0 100644
--- a/net/nmap/Makefile
+++ b/net/nmap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.81 2011/06/05 23:10:12 pettai Exp $
+# $NetBSD: Makefile,v 1.82 2011/07/08 09:24:48 adam Exp $
 #
 
 DISTNAME=	nmap-5.51
@@ -17,7 +17,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 BUILDLINK_API_DEPENDS.libpcap=	libpcap>=1.0.0
 BUILDLINK_API_DEPENDS.libpcre=	libpcre>=7.6
-BUILDLINK_API_DEPENDS.openssl=  openssl>=0.9.8
+BUILDLINK_API_DEPENDS.openssl=	openssl>=0.9.8
 
 GNU_CONFIGURE=		yes
 
diff --git a/net/nmap/distinfo b/net/nmap/distinfo
index 0f0b03ad164..8614e200d58 100644
--- a/net/nmap/distinfo
+++ b/net/nmap/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.50 2011/06/05 23:10:12 pettai Exp $
+$NetBSD: distinfo,v 1.51 2011/07/08 09:24:48 adam Exp $
 
 SHA1 (nmap-5.51.tar.bz2) = 3415ad9a3915d7e162c9e91435cc35d9c73ac7f6
 RMD160 (nmap-5.51.tar.bz2) = d5ac8b245234e122936b40c80927a3c4afba53bd
@@ -7,3 +7,4 @@ SHA1 (patch-ab) = b709689e4bda3bc928ba120678f24a2e2321f612
 SHA1 (patch-ac) = c22e8f6411b1152a6e7582c90e5ec5bd4c6acaad
 SHA1 (patch-al) = c56396c28d96314c8d7e8b19a92bd5db7959e289
 SHA1 (patch-am) = 8d9515d1247ab5ad5855f7f7065e90cde5fb2b9f
+SHA1 (patch-nbase_configure) = 3db822d392defd92d531b71f466b61be82e525a1
diff --git a/net/nmap/patches/patch-nbase_configure b/net/nmap/patches/patch-nbase_configure
new file mode 100644
index 00000000000..97695d0e4ff
--- /dev/null
+++ b/net/nmap/patches/patch-nbase_configure
@@ -0,0 +1,24 @@
+$NetBSD: patch-nbase_configure,v 1.1 2011/07/08 09:24:48 adam Exp $
+
+Fix configuring with Clang.
+
+--- nbase/configure.orig	2011-01-21 21:00:04.000000000 +0000
++++ nbase/configure
+@@ -4509,7 +4509,7 @@ else
+ #include <sys/socket.h>
+ #endif
+ 
+-void main(void) {
++int main(void) {
+     struct addrinfo hints, *ai;
+     int error;
+ 
+@@ -4641,7 +4641,7 @@ else
+ #include <netinet/in.h>
+ #endif
+ 
+-void main(void) {
++int main(void) {
+     struct sockaddr_in sa;
+     char hbuf[256];
+     int error;
-- 
cgit v1.2.3