Fix fo linux a different way - make more like NetBSD configuration and use

net/libpcap. Also fix DEPENDS for Solaris and Linux

7 files changed, 36 insertions, 39 deletions

diff --git a/net/nmap/Makefile b/net/nmap/Makefile
index b38fee337a0..10b2deb9dc6 100644
--- a/net/nmap/Makefile
+++ b/net/nmap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2001/02/17 18:19:17 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2001/08/24 11:23:16 abs Exp $
 #
 
 DISTNAME=	nmap-2.53
@@ -15,9 +15,9 @@ CONFIGURE_ENV+=	INSTALL=${INSTALL}
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "SunOS"
+.if ${OPSYS} == "SunOS" || ${OPSYS} == "Linux"
 MAKE_ENV+=	CPPFLAGS=""
-DEPENDS+=	libpcap-0.4:../../net/libpcap
+DEPENDS+=	libpcap>=0.4:../../net/libpcap
 CONFIGURE_ARGS+=--with-libpcap=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=--with-libpcap
diff --git a/net/nmap/distinfo b/net/nmap/distinfo
index e355bb69d8c..a555147f704 100644
--- a/net/nmap/distinfo
+++ b/net/nmap/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.3 2001/08/24 11:05:35 abs Exp $
+$NetBSD: distinfo,v 1.4 2001/08/24 11:23:16 abs Exp $
 
 SHA1 (nmap-2.53.tgz) = 208979028c8b02e882e452e94280f09bc617490f
 Size (nmap-2.53.tgz) = 584385 bytes
-SHA1 (patch-aa) = d18d2b2a146259cf331d78335ddfdb5c795aadff
-SHA1 (patch-ab) = abf6766dc77280f756a9ace38f2082a773b3c3eb
+SHA1 (patch-aa) = e669fe70e3d6102bcfad2328c7329733d6795b09
+SHA1 (patch-ab) = 691a4b1a226a93ae3d4f52ad96bebacaed9dd452
 SHA1 (patch-ac) = 59fbb788a76f53a99bc411ba44f514d694990852
 SHA1 (patch-ad) = 3f9d55ec44fa017f77d7e042185bdc3cfcc3fefa
 SHA1 (patch-ae) = 3f9d04156506a9df3b55bba0c7da4ff772478302
diff --git a/net/nmap/patches/patch-aa b/net/nmap/patches/patch-aa
index 5cb653a459e..f15d4f3244b 100644
--- a/net/nmap/patches/patch-aa
+++ b/net/nmap/patches/patch-aa
@@ -1,8 +1,20 @@
-$NetBSD: patch-aa,v 1.6 2001/08/24 11:05:36 abs Exp $
+$NetBSD: patch-aa,v 1.7 2001/08/24 11:23:16 abs Exp $
 
 --- Makefile.in.orig	Tue May  9 07:25:42 2000
 +++ Makefile.in
-@@ -36,7 +36,7 @@
+@@ -12,8 +12,9 @@
+ 
+ CC = @CC@
+ CCOPT = 
+-LIBPCAPDIR = @libpcapdir@
+-INCLS = -I. -I$(LIBPCAPDIR)
++#LIBPCAPDIR = @libpcapdir@
++INCLS = -I.
++#INCLS += -I$(LIBPCAPDIR)
+ DEFS = @DEFS@ -DNMAP_VERSION=\"$(NMAP_VERSION)\" -DNMAP_NAME=\"$(NMAP_NAME)\" -DNMAP_URL=\"$(NMAP_URL)\" -DNMAPDATADIR=\"$(nmapdatadir)\"
+ CFLAGS = @CFLAGS@ $(CCOPT) $(DEFS) $(INCLS)
+ # CFLAGS = -g -Wall $(DEFS) $(INCLS)
+@@ -36,15 +37,15 @@
  
  DEPS = nmap.h error.h targets.h osscan.h tcpip.h utils.h global_structures.h charpool.h services.h rpc.h portlist.h
  
@@ -11,7 +23,17 @@ $NetBSD: patch-aa,v 1.6 2001/08/24 11:05:36 abs Exp $
  
  $(TARGET): $(DEPS) @PCAP_DEPENDS@ $(OBJS)
  	@echo Compiling nmap
-@@ -140,7 +140,7 @@
+ 	rm -f $@
+ 	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
+ 
+-$(LIBPCAPDIR)/libpcap.a: $(LIBPCAPDIR)/Makefile
+-	@echo Compiling libpcap; cd $(LIBPCAPDIR); $(MAKE)
++#$(LIBPCAPDIR)/libpcap.a: $(LIBPCAPDIR)/Makefile
++#	@echo Compiling libpcap; cd $(LIBPCAPDIR); $(MAKE)
+ 
+ #$(LIBPCAPDIR)/Makefile:
+ #	@echo Configuring libpcap; cd $(LIBPCAPDIR); ./configure
+@@ -140,7 +141,7 @@
  	$(MAKEDEPEND) $(INCLS) -s "# DO NOT DELETE" -- $(DEFS) -- $(SRCS)
  
  install: $(TARGET)
diff --git a/net/nmap/patches/patch-ab b/net/nmap/patches/patch-ab
index 8123882f641..f9e8e23c486 100644
--- a/net/nmap/patches/patch-ab
+++ b/net/nmap/patches/patch-ab
@@ -1,37 +1,12 @@
-$NetBSD: patch-ab,v 1.4 2001/08/24 11:05:36 abs Exp $
+$NetBSD: patch-ab,v 1.5 2001/08/24 11:23:16 abs Exp $
 
 --- configure.orig	Tue May  9 07:27:48 2000
 +++ configure
-@@ -525,8 +525,9 @@
- 
- 
- libpcapdir=libpcap-possiblymodified
--
--
-+if [ `uname -s` = NetBSD ] ;then
-+  libpcapdir=.
-+fi
- 
- 
- # Extract the first word of "gcc", so it can be a program name with args.
-@@ -1507,6 +1508,9 @@
+@@ -1507,6 +1507,7 @@
  extern char pcap_version[];
  int main() {
    int major, minor;
-+#ifdef __NetBSD__
 +  exit(0);	/*fool it*/
-+#endif
    sscanf(pcap_version,"%d.%d", &major, &minor);
    if (major > 0) 
      exit(0);
-@@ -2793,6 +2797,10 @@
-   done
- 
-   for ac_config_dir in $libpcapdir nmapfe ; do
-+
-+  if [ `uname -s` = NetBSD -a $ac_config_dir = $libpcapdir ] ;then
-+    continue
-+  fi
- 
-     # Do not complain, so a configure script can configure whichever
-     # parts of a large source tree are present.
diff --git a/net/nmap/patches/patch-ac b/net/nmap/patches/patch-ac
index 5f84aa1987b..5860792e47c 100644
--- a/net/nmap/patches/patch-ac
+++ b/net/nmap/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.2 2001/08/24 11:05:36 abs Exp $
+$NetBSD: patch-ac,v 1.3 2001/08/24 11:23:16 abs Exp $
 
 --- libpcap-possiblymodified/bpf/net/bpf.h.orig	Wed Oct 14 22:27:16 1998
 +++ libpcap-possiblymodified/bpf/net/bpf.h
diff --git a/net/nmap/patches/patch-ad b/net/nmap/patches/patch-ad
index e421c8df78b..0eb391d5c5f 100644
--- a/net/nmap/patches/patch-ad
+++ b/net/nmap/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.2 2001/08/24 11:05:36 abs Exp $
+$NetBSD: patch-ad,v 1.3 2001/08/24 11:23:17 abs Exp $
 
 --- nmap-services.orig	Tue May  9 07:21:44 2000
 +++ nmap-services
diff --git a/net/nmap/patches/patch-ae b/net/nmap/patches/patch-ae
index cc455edefa8..d40ac734195 100644
--- a/net/nmap/patches/patch-ae
+++ b/net/nmap/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.2 2001/08/24 11:05:36 abs Exp $
+$NetBSD: patch-ae,v 1.3 2001/08/24 11:23:17 abs Exp $
 
 --- tcpip.c.orig	Sun Apr 30 01:12:24 2000
 +++ tcpip.c