[Asterisk-cvs] asterisk Makefile, 1.108, 1.109 aesopt.h, 1.6, 1.7 asterisk.c, 1.118, 1.119 md5.c, 1.7, 1.8 utils.c, 1.17, 1.18

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv31447

Modified Files:
	Makefile aesopt.h asterisk.c md5.c utils.c 
Log Message:
Merge NetBSD and Courtesty tone with modifications (bug #2329)


Index: Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/Makefile,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -d -r1.108 -r1.109
--- Makefile	31 Aug 2004 03:31:59 -0000	1.108
+++ Makefile	31 Aug 2004 13:32:11 -0000	1.109
@@ -137,6 +137,11 @@
 CFLAGS+=$(shell if [ -d /usr/local/include/spandsp ]; then echo "-I/usr/local/include/spandsp"; fi)
 endif # FreeBSD
 
+ifeq (${OSARCH},NetBSD)
+CFLAGS+=-pthread
+INCLUDE+=-I/usr/local/include
+endif
+
 ifeq (${OSARCH},OpenBSD)
 CFLAGS+=-pthread
 endif
@@ -184,6 +189,9 @@
 ifeq (${OSARCH},FreeBSD)
 LIBS+=-lcrypto
 endif
+ifeq (${OSARCH},NetBSD)
+LIBS+=-lpthread -lcrypto -lm -L/usr/local/lib -lncurses
+endif
 ifeq (${OSARCH},OpenBSD)
 LIBS=-lcrypto -lpthread -lm -lncurses
 endif
@@ -510,7 +518,6 @@
 	[ -f mpg123-0.59r.tar.gz ] || wget http://www.mpg123.de/mpg123/mpg123-0.59r.tar.gz
 	[ -d mpg123-0.59r ] || tar xfz mpg123-0.59r.tar.gz
 	make -C mpg123-0.59r linux
-	
 
 config:
 	if [ -d /etc/rc.d/init.d ]; then \

Index: aesopt.h
===================================================================
RCS file: /usr/cvsroot/asterisk/aesopt.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- aesopt.h	24 May 2004 20:09:05 -0000	1.6
+++ aesopt.h	31 Aug 2004 13:32:11 -0000	1.7
@@ -151,7 +151,7 @@
 #if defined( __OpenBSD__ )
 #  include <machine/types.h>
 #  include <sys/endian.h>
-#elif defined( __FreeBSD__ )
+#elif defined( __FreeBSD__ ) || defined( __NetBSD__ )
 #  include <sys/types.h>
 #  include <sys/endian.h>
 #elif defined( BSD ) && ( BSD >= 199103 ) || defined(__APPLE__)

Index: asterisk.c
===================================================================
RCS file: /usr/cvsroot/asterisk/asterisk.c,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -d -r1.118 -r1.119
--- asterisk.c	28 Aug 2004 17:12:01 -0000	1.118
+++ asterisk.c	31 Aug 2004 13:32:11 -0000	1.119
@@ -54,7 +54,7 @@
 #include <grp.h>
 #include <pwd.h>
 
-#if  defined(__FreeBSD__)
+#if  defined(__FreeBSD__) || defined( __NetBSD__ )
 #include <netdb.h>
 #endif
 

Index: md5.c
===================================================================
RCS file: /usr/cvsroot/asterisk/md5.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- md5.c	24 May 2004 20:09:05 -0000	1.7
+++ md5.c	31 Aug 2004 13:32:11 -0000	1.8
@@ -3,7 +3,7 @@
 #if defined( __OpenBSD__ )
 #  include <machine/types.h>
 #  include <sys/endian.h>
-#elif defined( __FreeBSD__ )
+#elif defined( __FreeBSD__ ) || defined( __NetBSD__ )
 #  include <sys/types.h>
 #  include <sys/endian.h>
 #elif defined( BSD ) && ( BSD >= 199103 ) || defined(__APPLE__)

Index: utils.c
===================================================================
RCS file: /usr/cvsroot/asterisk/utils.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- utils.c	27 Aug 2004 04:21:09 -0000	1.17
+++ utils.c	31 Aug 2004 13:32:11 -0000	1.18
@@ -28,7 +28,7 @@
 static char base64[64];
 static char b2a[256];
 
-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined( __NetBSD__ ) || defined(__APPLE__)
 
 /* duh? ERANGE value copied from web... */
 #define ERANGE 34