4 files changed, 24 insertions, 111 deletions
diff --git a/net/howl/patches/patch-aa b/net/howl/patches/patch-aa
index 7b76b32d355..fefbf802254 100644
--- a/net/howl/patches/patch-aa
+++ b/net/howl/patches/patch-aa
@@ -1,22 +1,30 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/06/05 19:03:12 nathanw Exp $
+$NetBSD: patch-aa,v 1.2 2004/11/20 14:43:32 mjl Exp $
 
---- src/lib/howl/socket.c.orig	2004-02-18 13:05:46.000000000 -0500
-+++ src/lib/howl/socket.c	2004-06-04 18:22:49.000000000 -0400
-@@ -363,7 +363,7 @@
+--- src/lib/howl/socket.c.orig	2004-11-20 14:57:33.000000000 +0100
++++ src/lib/howl/socket.c	2004-11-20 14:57:38.000000000 +0100
+@@ -261,7 +261,7 @@
+ 	err = sw_translate_error(self->m_desc != SW_INVALID_SOCKET, sw_socket_errno());
+ 	sw_check_okay_log(err, exit);
+ 
+-#if defined(__APPLE__) || defined(__VXWORKS__) || defined(__FreeBSD__)
++#if defined(__APPLE__) || defined(__VXWORKS__) || defined(__FreeBSD__) || defined(__NetBSD__)
+    res = setsockopt(self->m_desc, SOL_SOCKET, SO_REUSEPORT, (char*) &opt, sizeof(opt));
  #else
- 	sw_ulong						real_ttl				= ttl;
+ 	res = setsockopt(self->m_desc, SOL_SOCKET, SO_REUSEADDR, (char*) &opt, sizeof(opt));
+@@ -375,6 +375,7 @@
  #endif
--
-+	sw_uchar						mttl					= (sw_uchar) ttl;
+ 	int							res;
+ 	sw_result					err;
++ 	sw_uchar						mttl					= (sw_uchar) ttl;
+ 
     /*
        initialize the group membership
-    */
-@@ -422,7 +422,7 @@
- 		return sw_system_error();
- 	}
+@@ -425,7 +426,7 @@
+ 	err = sw_translate_error(res == 0, sw_socket_errno());
+ 	sw_check_okay_log(err, exit);
+ 
+-	res = setsockopt(self->m_desc, IPPROTO_IP, IP_MULTICAST_TTL, (char*) &real_ttl, sizeof(real_ttl));
++	res = setsockopt(self->m_desc, IPPROTO_IP, IP_MULTICAST_TTL, (char*) &mttl, sizeof(mttl));
+ 	err = sw_translate_error(res == 0, sw_socket_errno());
+ 	sw_check_okay_log(err, exit);
  
--	if (setsockopt(self->m_fd, IPPROTO_IP, IP_MULTICAST_TTL, (char*) &real_ttl, sizeof(real_ttl)) == -1)
-+	if (setsockopt(self->m_fd, IPPROTO_IP, IP_MULTICAST_TTL, (char*) &mttl, sizeof(mttl)) == -1)
- 	{
-       sw_log(SW_LOG_ERROR, "sw_socket_join_multicast_group", "setsockopt(IP_MULTICAST_TTL) failed: %d\n", sw_socket_error_code());
-       return sw_system_error();
diff --git a/net/howl/patches/patch-ab b/net/howl/patches/patch-ab
deleted file mode 100644
index f65f0b6668c..00000000000
--- a/net/howl/patches/patch-ab
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/06/05 19:03:12 nathanw Exp $
-
---- include/salt/vtypes.h.orig	2004-04-17 17:51:40.000000000 -0400
-+++ include/salt/vtypes.h	2004-06-04 18:14:53.000000000 -0400
-@@ -55,8 +55,13 @@
- typedef unsigned char		sw_uchar;				
- typedef short					sw_short;
- typedef unsigned short		sw_ushort;
-+#if defined(_LP64) || defined (__LP64__)
-+typedef int					sw_long;
-+typedef unsigned int		sw_ulong;
-+#else
- typedef long					sw_long;
- typedef unsigned long		sw_ulong;
-+#endif
- typedef unsigned char	*	sw_octets;
- typedef char				*	sw_string;
- #if !defined(__VXWORKS__) || defined(__cplusplus)
-@@ -137,7 +142,7 @@
- #		error "CPU unknown"
- #	endif
- 
--#elif defined(__FreeBSD__) || defined(__NetBSD__)
-+#elif defined(__FreeBSD__)
- 
- #	if defined(i386)
- #		define SW_ENDIAN		1
-@@ -149,6 +154,14 @@
- 
- #		define SW_ENDIAN		0
- 
-+#elif defined(__NetBSD__)
-+
-+#	if BYTE_ORDER == LITTLE_ENDIAN
-+#		define SW_ENDIAN		1
-+#	else
-+#		define SW_ENDIAN		0
-+#	endif
-+
- #else
- 
- #error	"CPU unknown"
diff --git a/net/howl/patches/patch-ac b/net/howl/patches/patch-ac
deleted file mode 100644
index 9bd26d841cf..00000000000
--- a/net/howl/patches/patch-ac
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2004/06/05 19:03:12 nathanw Exp $
-
---- src/lib/howl/NotOSX/DNSServices.h.orig	2004-06-04 16:21:47.000000000 -0400
-+++ src/lib/howl/NotOSX/DNSServices.h	2004-06-04 16:23:20.000000000 -0400
-@@ -244,7 +244,11 @@
- 	@abstract	32-bit unsigned data type.
- */
- 
-+#if defined(_LP64) || defined (__LP64__)
-+typedef unsigned int		DNSUInt32;
-+#else
- typedef unsigned long		DNSUInt32;
-+#endif
- 
- dns_check_compile_time( sizeof( DNSUInt32 ) == 4 );
- 
-@@ -254,7 +258,11 @@
- 	@abstract	32-bit signed data type.
- */
- 
-+#if defined(_LP64) || defined (__LP64__)
-+typedef signed int		DNSSInt32;
-+#else
- typedef signed long		DNSSInt32;
-+#endif
- 
- dns_check_compile_time( sizeof( DNSSInt32 ) == 4 );
- 
diff --git a/net/howl/patches/patch-ad b/net/howl/patches/patch-ad
deleted file mode 100644
index 2bb381ba355..00000000000
--- a/net/howl/patches/patch-ad
+++ /dev/null
@@ -1,25 +0,0 @@
-	$NetBSD: patch-ad,v 1.1 2004/06/10 10:20:28 lha Exp $
-
-NetBSD needs SO_REUSEPORT not SO_REUSEADDR, should use "int" not
-"long" otherwise it wont work on big-endian machines.
-
---- src/lib/howl/socket.c	2004-06-09 20:10:51.000000000 +0200
-+++ src/lib/howl/socket.c.new	2004-06-09 20:10:59.000000000 +0200
-@@ -242,7 +242,7 @@
- sw_multicast_socket_super_init(
-                sw_socket	self)
- {
--	sw_ulong	opt = 1;
-+	int	opt = 1;
-    
-    SW_TRY(sw_socket_init(self, SW_FALSE, &sw_socket_udp_connect, &sw_socket_udp_send, &sw_socket_udp_sendto, &sw_socket_udp_recv, &sw_socket_udp_recvfrom, &sw_socket_udp_close));
- 
-@@ -252,7 +252,7 @@
- 		return SW_E_FAIL;
-    }
- 
--#if defined(__APPLE__) || defined(__VXWORKS__)
-+#if defined(__APPLE__) || defined(__VXWORKS__) || defined(__NetBSD__)
-    if (setsockopt(self->m_fd, SOL_SOCKET, SO_REUSEPORT, (char*) &opt, sizeof(opt)) == -1)
- #else
- 	if (setsockopt(self->m_fd, SOL_SOCKET, SO_REUSEADDR, (char*) &opt, sizeof(opt)) == -1)