1 files changed, 38 insertions, 30 deletions

diff --git a/net/asterisk14/files/patch-channels::Makefile b/net/asterisk14/files/patch-channels::Makefile
index fd855e7a2710..98caab3a33d6 100644
--- a/net/asterisk14/files/patch-channels::Makefile
+++ b/net/asterisk14/files/patch-channels::Makefile
@@ -1,53 +1,62 @@
 
 $FreeBSD$
 
---- channels/Makefile.orig	Thu Mar 25 11:43:36 2004
-+++ channels/Makefile	Thu Apr 29 14:36:36 2004
-@@ -33,12 +33,10 @@
- #
- #CHANNEL_LIBS+=chan_vofr
- 
--ifneq (${OSARCH},Darwin)
- CHANNEL_LIBS+=chan_oss.so
--endif
+--- channels/Makefile.orig	Tue Aug 31 19:33:00 2004
++++ channels/Makefile	Sun Oct 10 16:18:05 2004
+@@ -57,10 +57,10 @@
+ 
+ endif
+ ifeq (${OSARCH},FreeBSD)
+-PTLIB=-lpt_FreeBSD_x86_r
+-H323LIB=-lh323_FreeBSD_x86_r
+-CHANH323LIB=-pthread
+-SOLINK+=-L/usr/local/lib
++PTLIB=-lpt_FreeBSD_x86_r_s
++H323LIB=-lh323_FreeBSD_x86_r_s
++CHANH323LIB=
++SOLINK+=-L$(LOCALBASE)/lib
+ endif
+ ifeq (${OSARCH},NetBSD)
+ PTLIB=-lpt_NetBSD_x86_r
+@@ -72,8 +72,8 @@
+ endif
  
  CHANNEL_LIBS+=$(shell [ -f /usr/include/linux/ixjuser.h ] && echo chan_phone.so)
+-CHANNEL_LIBS+=$(shell [ -f /usr/local/include/ixjuser.h ] && echo chan_phone.so)
 -CHANNEL_LIBS+=$(shell [ -f h323/libchanh323.a ] && echo chan_h323.so)
++CHANNEL_LIBS+=$(shell [ -f $(LOCALBASE)/include/ixjuser.h ] && echo chan_phone.so)
 +CHANNEL_LIBS+=chan_h323.so
  
  CFLAGS+=-Wno-missing-prototypes -Wno-missing-declarations
  CFLAGS+=$(shell [ ! -f /usr/include/linux/if_wanpipe.h ] && echo " -DOLD_SANGOMA_API")
-@@ -48,7 +46,7 @@
- CFLAGS+=$(shell [ -f alsa-monitor.h ] && echo " -DALSA_MONITOR")
+@@ -84,7 +84,7 @@
  ZAPPRI=$(shell [ -f /usr/lib/libpri.so.1 ] && echo "-lpri")
  ZAPR2=$(shell [ -f /usr/lib/libmfcr2.so.1 ] && echo "-lmfcr2")
--CFLAGS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo "-DIAX_TRUNKING")
+ CFLAGS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo "-DIAX_TRUNKING")
+-CFLAGS+=$(shell [ -f /usr/local/include/zaptel.h ] && echo "-DIAX_TRUNKING")
 +CFLAGS+=$(shell [ -f $(LOCALBASE)/include/zaptel.h ] && echo "-DIAX_TRUNKING -I$(LOCALBASE)/include")
  CHANNEL_LIBS+=$(shell [ -f /usr/include/vpbapi.h ] && echo "chan_vpb.so" )
  CFLAGS+=$(shell [ -f /usr/include/vpbapi.h ] && echo " -DLINUX")
  
-@@ -69,7 +67,7 @@
- 
+@@ -107,7 +107,7 @@
  ZAPDIR=/usr/lib
  
--CHANNEL_LIBS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo "chan_zap.so")
+ CHANNEL_LIBS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo "chan_zap.so")
+-CHANNEL_LIBS+=$(shell [ -f /usr/local/include/zaptel.h ] && echo "chan_zap.so")
 +CHANNEL_LIBS+=$(shell [ -f $(LOCALBASE)/include/zaptel.h ] && echo "chan_zap.so")
  
  CHANNEL_LIBS+=$(shell [ -f /usr/include/nbs.h ] && echo "chan_nbs.so" )
  
-@@ -110,10 +108,8 @@
- 
- chan_oss.o: chan_oss.c  busy.h ringtone.h
- 
--ifeq (${OSARCH},OpenBSD)
+@@ -156,6 +156,8 @@
  chan_oss.so: chan_oss.o
--	$(CC) $(SOLINK) -o $@ chan_oss.o -lossaudio
--endif
+ 	$(CC) $(SOLINK) -o $@ chan_oss.o -lossaudio
+ endif
++chan_oss.so: chan_oss.o
 +	$(CC) $(SOLINK) -o $@ chan_oss.o
  
- chan_iax2.so: chan_iax2.o iax2-parser.o
+ chan_iax2.so: chan_iax2.o iax2-parser.o iax2-provision.o
  ifeq ($(USE_MYSQL_FRIENDS),1)
-@@ -133,7 +129,7 @@
+@@ -175,7 +177,7 @@
  	$(CC) -c $(CFLAGS) -o chan_zap.o chan_zap.c
  
  chan_zap.so: chan_zap.o
@@ -55,15 +64,15 @@ $FreeBSD$
 +	$(CC) $(SOLINK) -o $@ $<  $(ZAPPRI) $(ZAPR2) -L$(LOCALBASE)/lib -ltonezone
  
  chan_sip.so: chan_sip.o
- ifeq ($(USE_MYSQL_FRIENDS),1)
-@@ -157,16 +153,17 @@
+ ifeq ($(USE_SIP_MYSQL_FRIENDS),1)
+@@ -199,15 +201,17 @@
  chan_vpb.so: chan_vpb.o
  	 $(CXX) $(SOLINK) -o $@ $< -lvpb -lpthread -lm -ldl
  
 -chan_h323.so: chan_h323.o h323/libchanh323.a
--	$(CC) $(SOLINK) -o $@ $< h323/libchanh323.a -L$(PWLIBDIR)/lib  -lpt_linux_x86_r -L$(OPENH323DIR)/lib -lh323_linux_x86_r -L/usr/lib -lpthread -ldl -lcrypto -lssl -lexpat
+-	$(CC) $(SOLINK) -o $@ $< h323/libchanh323.a $(CHANH323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -L$(OPENH323DIR)/lib $(H323LIB) -L/usr/lib -lcrypto -lssl -lexpat
 +chan_h323.so: chan_h323.o h323/ast_h323.o
-+	$(CXX) $(SOLINK) -o $@ $< h323/ast_h323.o -L$(OPENH323DIR)/lib -lh323_FreeBSD_x86_r_s -L$(PWLIBDIR)/lib  -lpt_FreeBSD_x86_r_s -lcrypto -lssl -L$(LOCALBASE)/lib -lexpat -llber -lldap -lldap_r
++	$(CC) $(SOLINK) -o $@ $< h323/ast_h323.o -L$(OPENH323DIR)/lib $(H323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -lcrypto -lssl -L$(LOCALBASE)/lib -lexpat -llber -lldap -lldap_r
  
 +h323/ast_h323.o:
 +	$(MAKE) -C h323 ast_h323.o
@@ -73,8 +82,7 @@ $FreeBSD$
  
  install: all
 -	for x in $(CHANNEL_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
--	if ! [ -f chan_iax.so ]; then rm -f $(DESTDIR)$(MODULES_DIR)/chan_iax.so ; fi
 +	for x in $(CHANNEL_LIBS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done
+ 	if ! [ -f chan_iax.so ]; then rm -f $(DESTDIR)$(MODULES_DIR)/chan_iax.so ; fi
  
  depend: .depend
-