Rework NetBSD hack to not break Linux build

6 files changed, 106 insertions, 75 deletions

diff --git a/net/nmap/distinfo b/net/nmap/distinfo
index a9f9bab4bc6..e355bb69d8c 100644
--- a/net/nmap/distinfo
+++ b/net/nmap/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 11:23:25 wiz Exp $
+$NetBSD: distinfo,v 1.3 2001/08/24 11:05:35 abs Exp $
 
 SHA1 (nmap-2.53.tgz) = 208979028c8b02e882e452e94280f09bc617490f
 Size (nmap-2.53.tgz) = 584385 bytes
-SHA1 (patch-aa) = ddab339c4fc138600f937219f7245a2ec16922d7
-SHA1 (patch-ab) = 09dd8f73ff4b23e0e55a34371f798019e49762ca
-SHA1 (patch-ac) = 1c145363cf7f2392c27e3afce2186866be33bf41
-SHA1 (patch-ad) = be0efdf4b1ef174e857540b7532f933ea7465050
-SHA1 (patch-ae) = 1546c7b8769c84e77f6663764fd1193610245c2d
+SHA1 (patch-aa) = d18d2b2a146259cf331d78335ddfdb5c795aadff
+SHA1 (patch-ab) = abf6766dc77280f756a9ace38f2082a773b3c3eb
+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 421849f0a8d..5cb653a459e 100644
--- a/net/nmap/patches/patch-aa
+++ b/net/nmap/patches/patch-aa
@@ -1,21 +1,22 @@
-$NetBSD: patch-aa,v 1.5 2000/10/08 15:06:09 hubertf Exp $
---- Makefile.in.orig	Tue May  9 15:25:42 2000
-+++ Makefile.in	Sun Oct  8 23:18:41 2000
-@@ -14,4 +14,5 @@
- 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)\"
-@@ -38,3 +39,3 @@
+$NetBSD: patch-aa,v 1.6 2001/08/24 11:05:36 abs Exp $
+
+--- Makefile.in.orig	Tue May  9 07:25:42 2000
++++ Makefile.in
+@@ -36,7 +36,7 @@
+ 
+ DEPS = nmap.h error.h targets.h osscan.h tcpip.h utils.h global_structures.h charpool.h services.h rpc.h portlist.h
  
 -all: $(TARGET) nmapfe/nmapfe
 +all: $(TARGET)
  
-@@ -142,3 +143,3 @@
+ $(TARGET): $(DEPS) @PCAP_DEPENDS@ $(OBJS)
+ 	@echo Compiling nmap
+@@ -140,7 +140,7 @@
+ 	$(MAKEDEPEND) $(INCLS) -s "# DO NOT DELETE" -- $(DEFS) -- $(SRCS)
+ 
  install: $(TARGET)
 -	$(SHTOOL) mkdir -f -p -m 755 $(bindir) $(mandir)/man1 $(nmapdatadir) $(deskdir)
 +	$(SHTOOL) mkdir -f -p -m 755 $(bindir) $(mandir)/man1 $(nmapdatadir)
  	$(INSTALL) -c -m 755 nmap $(bindir)/nmap
+ 	@echo "If the next command fails -- you cannot use the X front end"
+ 	-test -f nmapfe/nmapfe && $(INSTALL) -c -m 755 nmapfe/nmapfe $(bindir)/nmapfe && $(SHTOOL) mkln -f -s $(bindir)/nmapfe $(bindir)/xnmap && $(INSTALL) -c -m 644 nmapfe.desktop $(deskdir)/nmapfe.desktop && $(INSTALL) -c -m 644 docs/nmapfe.1 $(mandir)/man1/nmapfe.1 && $(INSTALL) -c -m 644 docs/xnmap.1 $(mandir)/man1/xnmap.1
diff --git a/net/nmap/patches/patch-ab b/net/nmap/patches/patch-ab
index 17a63918fc5..8123882f641 100644
--- a/net/nmap/patches/patch-ab
+++ b/net/nmap/patches/patch-ab
@@ -1,22 +1,37 @@
-$NetBSD: patch-ab,v 1.3 2000/04/29 17:32:19 wiz Exp $
+$NetBSD: patch-ab,v 1.4 2001/08/24 11:05:36 abs Exp $
 
---- nmap-services.orig	Thu Apr 27 21:02:53 2000
-+++ nmap-services	Sat Apr 29 18:11:57 2000
-@@ -1724,7 +1724,7 @@
- dls-monitor       2048/udp   # 
- nfs               2049/tcp   # networked file system
- nfs               2049/udp   # networked file system
--distrib-netassholes 2064/tcp # A group of lamers working on a silly closed-source client for solving the RSA cryptographic challenge.  This is the keyblock proxy port.
-+distrib-net-kbproxy 2064/tcp # keyblock proxy port for distributed.net-clients
- dlsrpn            2065/tcp   # Data Link Switch Read Port Number
- dlsrpn            2065/udp   # Data Link Switch Read Port Number
- dlswpn            2067/tcp   # Data Link Switch Write Port Number
-@@ -1781,7 +1781,7 @@
- deslogind         3006/tcp   # 
- cfs               3049/tcp   # cryptographic file system (nfs) (proposed)
- cfs               3049/udp   # cryptographic file system (nfs)
--distrib-net-proxy 3064/tcp   # Stupid closed source distributed.net project proxy port
-+distrib-net-proxy 3064/tcp   # distributed.net project proxy port
- sj3               3086/tcp   # SJ3 (kanji input)
- squid-http        3128/tcp   #
- squid-ipc         3130/udp   #
+--- 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 @@
+ 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 63548b35979..5f84aa1987b 100644
--- a/net/nmap/patches/patch-ac
+++ b/net/nmap/patches/patch-ac
@@ -1,7 +1,13 @@
-$NetBSD: patch-ac,v 1.1 2000/10/08 15:06:09 hubertf Exp $
---- configure-	Sun Oct  8 23:15:09 2000
-+++ configure	Sun Oct  8 23:15:35 2000
-@@ -1509,2 +1509,3 @@
-   int major, minor;
-+  exit(0);	/*fool it*/
-   sscanf(pcap_version,"%d.%d", &major, &minor);
+$NetBSD: patch-ac,v 1.2 2001/08/24 11:05:36 abs Exp $
+
+--- libpcap-possiblymodified/bpf/net/bpf.h.orig	Wed Oct 14 22:27:16 1998
++++ libpcap-possiblymodified/bpf/net/bpf.h
+@@ -52,7 +52,7 @@
+  * Alignment macros.  BPF_WORDALIGN rounds up to the next 
+  * even multiple of BPF_ALIGNMENT. 
+  */
+-#define BPF_ALIGNMENT sizeof(bpf_int32)
++#define BPF_ALIGNMENT sizeof(long)
+ #define BPF_WORDALIGN(x) (((x)+(BPF_ALIGNMENT-1))&~(BPF_ALIGNMENT-1))
+ 
+ #define BPF_MAXINSNS 512
diff --git a/net/nmap/patches/patch-ad b/net/nmap/patches/patch-ad
index 3c293620cca..e421c8df78b 100644
--- a/net/nmap/patches/patch-ad
+++ b/net/nmap/patches/patch-ad
@@ -1,17 +1,22 @@
-$NetBSD: patch-ad,v 1.1 2000/10/08 15:06:09 hubertf Exp $
+$NetBSD: patch-ad,v 1.2 2001/08/24 11:05:36 abs Exp $
 
---- tcpip.c.orig	Sun Apr 30 02:12:24 2000
-+++ tcpip.c
-@@ -995,6 +995,12 @@
- #ifdef DLT_PPP_BSDOS
-  case DLT_PPP_BSDOS:
- #endif
-+#ifdef DLT_PPP_SERIAL
-+ case DLT_PPP_SERIAL:
-+#endif
-+#ifdef DLT_PPP_ETHER
-+ case DLT_PPP_ETHER:
-+#endif
- #if (FREEBSD || OPENBSD || NETBSD || BSDI)
-    offset = 4;
- #else
+--- nmap-services.orig	Tue May  9 07:21:44 2000
++++ nmap-services
+@@ -1725,7 +1725,7 @@
+ dls-monitor       2048/udp   # 
+ nfs               2049/tcp   # networked file system
+ nfs               2049/udp   # networked file system
+-distrib-netassholes 2064/tcp # A group of lamers working on a silly closed-source client for solving the RSA cryptographic challenge.  This is the keyblock proxy port.
++distrib-net-kbproxy 2064/tcp # keyblock proxy port for distributed.net-clients
+ dlsrpn            2065/tcp   # Data Link Switch Read Port Number
+ dlsrpn            2065/udp   # Data Link Switch Read Port Number
+ dlswpn            2067/tcp   # Data Link Switch Write Port Number
+@@ -1783,7 +1783,7 @@
+ deslogind         3006/tcp   # 
+ cfs               3049/tcp   # cryptographic file system (nfs) (proposed)
+ cfs               3049/udp   # cryptographic file system (nfs)
+-distrib-net-proxy 3064/tcp   # Stupid closed source distributed.net project proxy port
++distrib-net-proxy 3064/tcp   # distributed.net project proxy port
+ sj3               3086/tcp   # SJ3 (kanji input)
+ squid-http        3128/tcp   #
+ squid-ipc         3130/udp   #
diff --git a/net/nmap/patches/patch-ae b/net/nmap/patches/patch-ae
index d53a660edc7..cc455edefa8 100644
--- a/net/nmap/patches/patch-ae
+++ b/net/nmap/patches/patch-ae
@@ -1,13 +1,17 @@
-$NetBSD: patch-ae,v 1.1 2000/11/12 12:43:46 he Exp $
+$NetBSD: patch-ae,v 1.2 2001/08/24 11:05:36 abs Exp $
 
---- libpcap-possiblymodified/bpf/net/bpf.h.orig	Sun Nov 12 13:28:39 2000
-+++ libpcap-possiblymodified/bpf/net/bpf.h	Sun Nov 12 13:25:20 2000
-@@ -52,7 +52,7 @@
-  * Alignment macros.  BPF_WORDALIGN rounds up to the next 
-  * even multiple of BPF_ALIGNMENT. 
-  */
--#define BPF_ALIGNMENT sizeof(bpf_int32)
-+#define BPF_ALIGNMENT sizeof(long)
- #define BPF_WORDALIGN(x) (((x)+(BPF_ALIGNMENT-1))&~(BPF_ALIGNMENT-1))
- 
- #define BPF_MAXINSNS 512
+--- tcpip.c.orig	Sun Apr 30 01:12:24 2000
++++ tcpip.c
+@@ -995,6 +995,12 @@
+ #ifdef DLT_PPP_BSDOS
+  case DLT_PPP_BSDOS:
+ #endif
++#ifdef DLT_PPP_SERIAL
++ case DLT_PPP_SERIAL:
++#endif
++#ifdef DLT_PPP_ETHER
++ case DLT_PPP_ETHER:
++#endif
+ #if (FREEBSD || OPENBSD || NETBSD || BSDI)
+    offset = 4;
+ #else