diff options
| author | Maxim Sobolev <sobomax@FreeBSD.org> | 2008-08-21 07:32:48 +0000 |
|---|---|---|
| committer | Maxim Sobolev <sobomax@FreeBSD.org> | 2008-08-21 07:32:48 +0000 |
| commit | c322f0f836ccfc4e0df5301e58b010cdf6d85eee (patch) | |
| tree | 8698aa6d2cb058a9873c0659a1376cad33821691 /net/asterisk14 | |
| parent | Update to 0.703 (diff) | |
Properly link H323 module with ptlib and oh323 libraries. Otherwise
H323 channel fails to load. Bump PORTREVISION.
Reported by: Rodrigo Graeff
Notes
Notes:
svn path=/head/; revision=218944
Diffstat (limited to 'net/asterisk14')
| -rw-r--r-- | net/asterisk14/Makefile | 2 | ||||
| -rw-r--r-- | net/asterisk14/files/patch-channels::Makefile | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/net/asterisk14/Makefile b/net/asterisk14/Makefile index a1dd5821caec..81836339e412 100644 --- a/net/asterisk14/Makefile +++ b/net/asterisk14/Makefile @@ -7,7 +7,7 @@ PORTNAME= asterisk PORTVERSION= 1.4.21.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net MASTER_SITES= http://ftp.digium.com/pub/asterisk/ \ http://ftp.digium.com/pub/asterisk/old-releases/ diff --git a/net/asterisk14/files/patch-channels::Makefile b/net/asterisk14/files/patch-channels::Makefile index 833abdac1569..fa5a90a988fa 100644 --- a/net/asterisk14/files/patch-channels::Makefile +++ b/net/asterisk14/files/patch-channels::Makefile @@ -3,7 +3,7 @@ $FreeBSD$ --- channels/Makefile.orig +++ channels/Makefile -@@ -32,8 +32,8 @@ +@@ -32,9 +32,10 @@ endif ifeq ($(OSARCH),FreeBSD) @@ -12,9 +12,11 @@ $FreeBSD$ + PTLIB=-lpt_r + H323LIB=-lh323_r CHANH323LIB=-pthread ++ H323LDLIBS=$(PTLIB) $(H323LIB) $(CHANH323LIB) endif -@@ -78,12 +78,13 @@ + ifeq ($(OSARCH),NetBSD) +@@ -78,12 +79,13 @@ h323/libchanh323.a h323/Makefile.ast: $(CMD_PREFIX) $(MAKE) -C h323 $(CMD_PREFIX) rm -f ../main/asterisk @@ -34,12 +36,12 @@ $FreeBSD$ endif dist-clean:: -@@ -113,8 +114,12 @@ +@@ -113,8 +115,12 @@ else chan_h323.so: chan_h323.o h323/libchanh323.a $(ECHO_PREFIX) echo " [LD] $^ -> $@" +ifeq ($(OSARCH),FreeBSD) -+ $(CMD_PREFIX) $(CXX) $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK) $(H323LDFLAGS) -o $@ $< h323/libchanh323.a $(H323LDLIBS) ++ $(CMD_PREFIX) $(CXX) $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK) $(H323LDFLAGS) -o $@ $< h323/libchanh323.a $(H323LDLIBS) $(CHANH323LIB) +else $(CMD_PREFIX) $(CXX) $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK) -o $@ $< h323/libchanh323.a $(CHANH323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -L$(OPENH323DIR)/lib $(H323LIB) -L/usr/lib -lcrypto -lssl -lexpat endif |