PR/44257 - Francois Tigeot -- build fixes for DragonFly BSD

Don't bother bumping the version since it didn't build on DFBSD
before there is no binary package that could have changed, and this
doesn't change the binary packages on other systems.

10 files changed, 144 insertions, 5 deletions

diff --git a/comms/asterisk18/distinfo b/comms/asterisk18/distinfo
index a84946c9eff..fba2ff425f8 100644
--- a/comms/asterisk18/distinfo
+++ b/comms/asterisk18/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2010/12/17 00:24:28 jnemeth Exp $
+$NetBSD: distinfo,v 1.3 2010/12/22 04:28:52 jnemeth Exp $
 
 SHA1 (asterisk-1.8.1.1/asterisk-1.8.1.1.tar.gz) = 8499778d83a8f35ce5abbfe4680de1701dc10f7c
 RMD160 (asterisk-1.8.1.1/asterisk-1.8.1.1.tar.gz) = a761369083f9b5789dd055ab7df678b1cce83287
@@ -24,7 +24,7 @@ SHA1 (patch-ao) = 0663a698469550b22bb97ee1b18980bc2bc67495
 SHA1 (patch-ap) = c36531be80784d47c2c772ccc386ef2b8f71c72f
 SHA1 (patch-aq) = 9e05e8d099b92f6c087ca083c5a6d89a0c345061
 SHA1 (patch-ar) = 5e117f173e6743703d5d83787877e7a9ce8500f3
-SHA1 (patch-as) = 0d2a04afe1f08df9eb27c5001271d3b75f8a6ad3
+SHA1 (patch-as) = 84b84acac731671944981a60124d0447a2cd322c
 SHA1 (patch-at) = ce094dc436cc4fd6aeafca3460a25c2db077eaf8
 SHA1 (patch-au) = 57100ee55338c5ab8be1f8d73d4126d26227786b
 SHA1 (patch-av) = 3424013b5bf22624aa664e972e2b495ab3296cbe
@@ -33,5 +33,12 @@ SHA1 (patch-ax) = 3b41e66a8c926e0afc4f73587e3557370e6c5f6e
 SHA1 (patch-ay) = 824fc560f4f2775ecf9272525025d26d8fee4361
 SHA1 (patch-az) = 64365b12cb47ec0fba358e4326eda172f96068cf
 SHA1 (patch-ba) = ffb20f4788f2f253e822fb48c68fec04c31b0619
-SHA1 (patch-bb) = 9a10f8892e29bd7ba67e133c98d2d756b470402f
+SHA1 (patch-bb) = bf1a2bb2ba1eb2ba44a9b26fa9ae0468510a1575
 SHA1 (patch-bc) = 0efc99595d1ef82a879361e8bf3b2ef7fd84af62
+SHA1 (patch-be) = a3d416c097c6aeb0e49dec67a9fc22027d936773
+SHA1 (patch-bf) = 67b506d235fabaa73f492d08858407dd9a85fd6e
+SHA1 (patch-bg) = 07df551999f8e33db7bb613f666626de8be3036c
+SHA1 (patch-bh) = 9203ea97daab8c64ea47f236b4961763e76eafe6
+SHA1 (patch-bi) = d71662f618a10c3ca4277feb7ad0d659935dee1e
+SHA1 (patch-bj) = a184452adf2c883695e3819c13c584a3db9608d7
+SHA1 (patch-bk) = 93679dfb04d26c99ac9c2822e0d74d869d16369f
diff --git a/comms/asterisk18/patches/patch-as b/comms/asterisk18/patches/patch-as
index 08b18f01392..9787ee1eddf 100644
--- a/comms/asterisk18/patches/patch-as
+++ b/comms/asterisk18/patches/patch-as
@@ -1,7 +1,16 @@
-$NetBSD: patch-as,v 1.1.1.1 2010/12/15 03:22:45 jnemeth Exp $
+$NetBSD: patch-as,v 1.2 2010/12/22 04:28:53 jnemeth Exp $
 
 --- include/asterisk/lock.h.orig	2010-07-03 02:36:31.000000000 +0000
 +++ include/asterisk/lock.h
+@@ -558,7 +558,7 @@ static void  __attribute__((destructor))
+ 
+ #define gethostbyname __gethostbyname__is__not__reentrant__use__ast_gethostbyname__instead__
+ 
+-#ifndef __linux__
++#if !defined(__linux__) && !defined(__DragonFly__)
+ #define pthread_create __use_ast_pthread_create_instead__
+ #endif
+ 
 @@ -580,6 +580,10 @@ int ast_atomic_fetchadd_int_slow(volatil
  #include "libkern/OSAtomic.h"
  #endif
diff --git a/comms/asterisk18/patches/patch-bb b/comms/asterisk18/patches/patch-bb
index 80aaea7f71e..0c57660fa69 100644
--- a/comms/asterisk18/patches/patch-bb
+++ b/comms/asterisk18/patches/patch-bb
@@ -1,7 +1,16 @@
-$NetBSD: patch-bb,v 1.1.1.1 2010/12/15 03:22:45 jnemeth Exp $
+$NetBSD: patch-bb,v 1.2 2010/12/22 04:28:53 jnemeth Exp $
 
 --- main/utils.c.orig	2010-08-06 18:57:10.000000000 +0000
 +++ main/utils.c
+@@ -445,7 +445,7 @@ const char *ast_inet_ntoa(struct in_addr
+ static int dev_urandom_fd;
+ #endif
+ 
+-#ifndef __linux__
++#if !defined(__linux__) && !defined(__DragonFly__)
+ #undef pthread_create /* For ast_pthread_create function only */
+ #endif /* !__linux__ */
+ 
 @@ -1353,13 +1353,13 @@ int ast_false(const char *s)
  static struct timeval tvfix(struct timeval a)
  {
diff --git a/comms/asterisk18/patches/patch-be b/comms/asterisk18/patches/patch-be
new file mode 100644
index 00000000000..f505103ef4d
--- /dev/null
+++ b/comms/asterisk18/patches/patch-be
@@ -0,0 +1,40 @@
+$NetBSD: patch-be,v 1.1 2010/12/22 04:28:53 jnemeth Exp $
+
+--- main/acl.c.orig	2010-10-14 15:15:12.000000000 +0000
++++ main/acl.c
+@@ -123,7 +123,7 @@ static int get_local_address(struct ast_
+ 	char *buf = NULL;
+ 	int bufsz, x;
+ #endif /* SOLARIS */
+-#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__linux__) || defined(__Darwin__)
++#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__linux__) || defined(__Darwin__) || defined(__DragonFly__)
+ 	struct ifaddrs *ifap, *ifaphead;
+ 	int rtnerr;
+ 	const struct sockaddr_in *sin;
+@@ -132,7 +132,7 @@ static int get_local_address(struct ast_
+ 	int best_score = -100;
+ 	memset(&best_addr, 0, sizeof(best_addr));
+ 
+-#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__linux__) || defined(__Darwin__)
++#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__linux__) || defined(__Darwin__) || defined(__DragonFly__)
+ 	rtnerr = getifaddrs(&ifaphead);
+ 	if (rtnerr) {
+ 		perror(NULL);
+@@ -143,7 +143,7 @@ static int get_local_address(struct ast_
+ 	s = socket(AF_INET, SOCK_STREAM, 0);
+ 
+ 	if (s > 0) {
+-#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__linux__) || defined(__Darwin__)
++#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__linux__) || defined(__Darwin__) || defined(__DragonFly__)
+ 		for (ifap = ifaphead; ifap; ifap = ifap->ifa_next) {
+ 
+ 			if (ifap->ifa_addr && ifap->ifa_addr->sa_family == AF_INET) {
+@@ -202,7 +202,7 @@ static int get_local_address(struct ast_
+ 
+ 		close(s);
+ 	}
+-#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__linux__) || defined(__Darwin__)
++#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__linux__) || defined(__Darwin__) || defined(__DragonFly__)
+ 	freeifaddrs(ifaphead);
+ #endif /* BSD_OR_LINUX */
+ 
diff --git a/comms/asterisk18/patches/patch-bf b/comms/asterisk18/patches/patch-bf
new file mode 100644
index 00000000000..f4b6b0a5261
--- /dev/null
+++ b/comms/asterisk18/patches/patch-bf
@@ -0,0 +1,9 @@
+$NetBSD: patch-bf,v 1.1 2010/12/22 04:28:53 jnemeth Exp $
+
+--- main/netsock.c.orig	2009-10-08 19:35:30.000000000 +0000
++++ main/netsock.c
+@@ -31,3 +31,3 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi
+ 
+-#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__Darwin__)
++#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__Darwin__) || (__DragonFly__)
+ #include <net/if_dl.h>
diff --git a/comms/asterisk18/patches/patch-bg b/comms/asterisk18/patches/patch-bg
new file mode 100644
index 00000000000..1fd0f5daa73
--- /dev/null
+++ b/comms/asterisk18/patches/patch-bg
@@ -0,0 +1,15 @@
+$NetBSD: patch-bg,v 1.1 2010/12/22 04:28:53 jnemeth Exp $
+
+--- main/Makefile.orig	2010-08-02 14:41:46.000000000 +0000
++++ main/Makefile
+@@ -83,6 +83,10 @@ ifeq ($(OSARCH),OpenBSD)
+   AST_LIBS+=-lcrypto -lpthread -lm $(EDITLINE_LIB)
+ endif
+ 
++ifeq ($(OSARCH),OpenBSD)
++  AST_LIBS+=-lpthread
++endif
++
+ ifeq ($(OSARCH),SunOS)
+   AST_LIBS+=-lpthread -ldl -lrt -lnsl -lsocket -lresolv -L/opt/ssl/lib -L/usr/local/ssl/lib
+   ASTLINK=
diff --git a/comms/asterisk18/patches/patch-bh b/comms/asterisk18/patches/patch-bh
new file mode 100644
index 00000000000..391677c8e42
--- /dev/null
+++ b/comms/asterisk18/patches/patch-bh
@@ -0,0 +1,13 @@
+$NetBSD: patch-bh,v 1.1 2010/12/22 04:28:53 jnemeth Exp $
+
+--- main/asterisk.c.orig	2010-11-11 19:42:06.000000000 +0000
++++ main/asterisk.c
+@@ -85,7 +85,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi
+ #include <sys/sysctl.h>
+ #if !defined(__OpenBSD__)
+ #include <sys/vmmeter.h>
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__DragonFly__)
+ #include <vm/vm_param.h>
+ #endif
+ #endif
diff --git a/comms/asterisk18/patches/patch-bi b/comms/asterisk18/patches/patch-bi
new file mode 100644
index 00000000000..53f8316759d
--- /dev/null
+++ b/comms/asterisk18/patches/patch-bi
@@ -0,0 +1,11 @@
+$NetBSD: patch-bi,v 1.1 2010/12/22 04:28:53 jnemeth Exp $
+
+--- codecs/codec_resample.c.orig	2008-10-17 21:35:23.000000000 +0000
++++ codecs/codec_resample.c
+@@ -37,5 +37,5 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi
+ 
+ /* These are for SHRT_MAX and FLT_MAX -- { */
+-#if defined(__Darwin__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__CYGWIN__)
++#if defined(__Darwin__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__CYGWIN__) || defined(__DragonFly__)
+ #include <float.h>
+ #else
diff --git a/comms/asterisk18/patches/patch-bj b/comms/asterisk18/patches/patch-bj
new file mode 100644
index 00000000000..9e2927e418a
--- /dev/null
+++ b/comms/asterisk18/patches/patch-bj
@@ -0,0 +1,13 @@
+$NetBSD: patch-bj,v 1.1 2010/12/22 04:28:53 jnemeth Exp $
+
+--- tests/test_locale.c.orig	2010-06-01 21:28:19.000000000 +0000
++++ tests/test_locale.c
+@@ -80,7 +80,7 @@ static char *handle_cli_test_locales(str
+ 
+ 	/* First we run a set of tests with the global locale, which isn't thread-safe. */
+ 	if (!(localedir = opendir(
+-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined( __NetBSD__ ) || defined(__APPLE__)
++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined( __NetBSD__ ) || defined(__APPLE__) || defined(__DragonFly__)
+ 		"/usr/share/locale"
+ #else /* Linux */
+ 		"/usr/lib/locale"
diff --git a/comms/asterisk18/patches/patch-bk b/comms/asterisk18/patches/patch-bk
new file mode 100644
index 00000000000..2812e1cb5f6
--- /dev/null
+++ b/comms/asterisk18/patches/patch-bk
@@ -0,0 +1,13 @@
+$NetBSD: patch-bk,v 1.1 2010/12/22 04:28:53 jnemeth Exp $
+
+--- main/db1-ast/include/db.h.orig	2006-08-21 02:11:39.000000000 +0000
++++ main/db1-ast/include/db.h
+@@ -55,7 +55,7 @@
+ 
+ #ifndef	__BIT_TYPES_DEFINED__
+ #define	__BIT_TYPES_DEFINED__
+-#if (!defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__APPLE__))
++#if (!defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__APPLE__) && !defined(__DragonFly__))
+ typedef	__signed char		   int8_t;
+ typedef	short			  int16_t;
+ typedef	int			  int32_t;