diff options
| author | Maxim Sobolev <sobomax@FreeBSD.org> | 2007-04-26 00:11:37 +0000 |
|---|---|---|
| committer | Maxim Sobolev <sobomax@FreeBSD.org> | 2007-04-26 00:11:37 +0000 |
| commit | 559dc947292766686383f7a9e2364746b6be393d (patch) | |
| tree | 1957adcda77ca0f7c9b40ff6c559cba6fda227a5 /net/asterisk12/files/patch-channels::Makefile | |
| parent | FrostWire is an open-source peer-to-peer (P2P) file-sharing program. It uses (diff) | |
o Update zaptel to 1.4.1;
Submitted by: Oleksandr Tymoshenko <gonzo@pbxpress.com>
o update libpri to 1.4.0;
PR: 111555
Submitted by: "Phillip N." <pneumann@gmail.com>
o update asterisk12 to 1.2.7.
Sponsored by: Sippy Software, Inc. ( http://www.sippysoft.com/ )
The reason it all is going in together is that they are interdependent.
Notes
Notes:
svn path=/head/; revision=190886
Diffstat (limited to 'net/asterisk12/files/patch-channels::Makefile')
| -rw-r--r-- | net/asterisk12/files/patch-channels::Makefile | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/net/asterisk12/files/patch-channels::Makefile b/net/asterisk12/files/patch-channels::Makefile index 872026dfdca2..b80c1bfdf134 100644 --- a/net/asterisk12/files/patch-channels::Makefile +++ b/net/asterisk12/files/patch-channels::Makefile @@ -3,7 +3,7 @@ $FreeBSD$ --- channels/Makefile.orig +++ channels/Makefile -@@ -48,8 +48,8 @@ +@@ -50,8 +50,8 @@ endif ifeq (${OSARCH},FreeBSD) @@ -14,7 +14,7 @@ $FreeBSD$ CHANH323LIB=-pthread endif -@@ -73,11 +73,11 @@ +@@ -75,11 +75,11 @@ SOLINK+=-lrt endif @@ -28,7 +28,7 @@ $FreeBSD$ CHANNEL_LIBS+=chan_h323.so endif -@@ -91,12 +91,12 @@ +@@ -94,12 +94,12 @@ CHANNEL_LIBS+=chan_alsa.so endif @@ -43,12 +43,12 @@ $FreeBSD$ CFLAGS+=-DZAPATA_R2 ZAPR2=-lmfcr2 endif -@@ -109,12 +109,12 @@ +@@ -112,12 +112,12 @@ endif ifndef WITHOUT_ZAPTEL -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),) -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),) ++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/zaptel/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),) ifeq (${OSARCH},NetBSD) SOLINK+=-L$(CROSS_COMPILE_TARGET)/usr/pkg/lib endif @@ -58,7 +58,7 @@ $FreeBSD$ endif CFLAGS+=-DIAX_TRUNKING CHANNEL_LIBS+=chan_zap.so -@@ -229,8 +229,10 @@ +@@ -233,8 +233,10 @@ chan_h323.so: chan_h323.o h323/libchanh323.a h323/Makefile.ast $(CC) $(SOLINK) $(H323LDFLAGS) -o $@ $< h323/libchanh323.a $(H323LDLIBS) -lstdc++ else @@ -70,8 +70,8 @@ $FreeBSD$ + $(MAKE) -C h323 ast_h323.o endif - chan_misdn.so: chan_misdn.o chan_misdn_config.o misdn/chan_misdn_lib.a -@@ -244,8 +246,7 @@ + misdn/chan_misdn_lib.a: +@@ -253,8 +255,7 @@ # $(CC) -rdynamic -shared -Xlinker -x -o $@ $< install: all |