more BSD portability fixes (issue #5155)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6578 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/Makefile b/Makefile
index daffa8fc9459a353011b4c0a978568af244ec861..72e198fdee4d202e4650b749e8c412f7af8ed9c4 100755 (executable)
--- a/Makefile
+++ b/Makefile
@@ -235,7 +235,7 @@ ifeq (${OSARCH},FreeBSD)
   ASTCFLAGS+=$(shell if test ${BSDVERSION} -lt 500016 ; then echo "-D_THREAD_SAFE"; fi)
   LIBS+=$(shell if test  ${BSDVERSION} -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi)
   ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/spandsp),)
-    ASTCFLAGS+=" -I$(CROSS_COMPILE_TARGET)/usr/local/include/spandsp"
+    ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include/spandsp
   endif
   MPG123TARG=freebsd
 endif # FreeBSD
@@ -255,7 +255,7 @@ ifeq (${OSARCH},SunOS)
   INCLUDE+=-Iinclude/solaris-compat -I$(CROSS_COMPILE_TARGET)/usr/local/ssl/include
 endif
 
-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h),)
+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),)
   ASTCFLAGS+=-DZAPTEL_OPTIMIZATIONS
 endif
 

diff --git a/channels/Makefile b/channels/Makefile
index 2bfd2308af4b9a3d4562f8befa62e91cd0b6f143..7189416bd8d6cdd465e8670befacd1c928ddd87e 100755 (executable)
--- a/channels/Makefile
+++ b/channels/Makefile
@@ -92,7 +92,13 @@ ifneq ($(wildcard alsa-monitor.h),)
   ALSA_SRC+=alsa-monitor.h
 endif
 
-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h),)
+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),)
+  ifeq (${OSARCH},NetBSD)
+    SOLINK+=-L$(CROSS_COMPILE_TARGET)/usr/pkg/lib
+  endif
+  ifeq (${OSARCH},FreeBSD)
+    SOLINK+=-L$(CROSS_COMPILE_TARGET)/usr/local/lib
+  endif
   CFLAGS+=-DIAX_TRUNKING
   CHANNEL_LIBS+=chan_zap.so
 endif

diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index 44b3fe1e8c0a51d7929ca055b14875ccb780da84..d403bfbcc686f59280c3f5911e30b9662627372f 100755 (executable)
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -13,7 +13,12 @@
 
 #include <stdio.h>
 #include <string.h>
+#ifdef __NetBSD__
+#include <pthread.h>
+#include <signal.h>
+#else
 #include <sys/signal.h>
+#endif
 #include <errno.h>
 #include <stdlib.h>
 #if !defined(SOLARIS) && !defined(__FreeBSD__)

diff --git a/utils/streamplayer.c b/utils/streamplayer.c
index 5ab7f70ad073ad6db03651ee763dac01c60647bb..1a8309887fc9b7cf5b342cc598bbe1d53d2d1021 100755 (executable)
--- a/utils/streamplayer.c
+++ b/utils/streamplayer.c
@@ -20,7 +20,7 @@
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/socket.h>
-#if defined(__FreeBSD__) || defined(__OpenBSD__)
+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
 #include <netinet/in.h>
 #endif
 #include <sys/time.h>