summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorMaxim Sobolev <sobomax@FreeBSD.org>2003-10-18 19:11:30 +0000
committerMaxim Sobolev <sobomax@FreeBSD.org>2003-10-18 19:11:30 +0000
commit54858b623befc6707c498f9b6f94c55b778a3012 (patch)
treea8e41113b91129ccba870fb1c82945edeab43ede /net
parent- Fix build on -current (diff)
Fix if audio/speex is installed (actually make speex a required dependency).
Reported by: Tilghman Lesher <tilghman@mail.jeffandtilghman.com>
Notes
Notes: svn path=/head/; revision=91589
Diffstat (limited to 'net')
-rw-r--r--net/asterisk-bristuff/Makefile2
-rw-r--r--net/asterisk-bristuff/files/patch-codecs::Makefile25
-rw-r--r--net/asterisk-bristuff/pkg-plist1
-rw-r--r--net/asterisk-devel/Makefile2
-rw-r--r--net/asterisk-devel/files/patch-codecs::Makefile25
-rw-r--r--net/asterisk-devel/pkg-plist1
-rw-r--r--net/asterisk/Makefile2
-rw-r--r--net/asterisk/files/patch-codecs::Makefile25
-rw-r--r--net/asterisk/pkg-plist1
-rw-r--r--net/asterisk10/Makefile2
-rw-r--r--net/asterisk10/files/patch-codecs::Makefile25
-rw-r--r--net/asterisk10/pkg-plist1
-rw-r--r--net/asterisk12/Makefile2
-rw-r--r--net/asterisk12/files/patch-codecs::Makefile25
-rw-r--r--net/asterisk12/pkg-plist1
-rw-r--r--net/asterisk14/Makefile2
-rw-r--r--net/asterisk14/files/patch-codecs::Makefile25
-rw-r--r--net/asterisk14/pkg-plist1
-rw-r--r--net/asterisk16/Makefile2
-rw-r--r--net/asterisk16/files/patch-codecs::Makefile25
-rw-r--r--net/asterisk16/pkg-plist1
21 files changed, 182 insertions, 14 deletions
diff --git a/net/asterisk-bristuff/Makefile b/net/asterisk-bristuff/Makefile
index 870aaae229af..89b4dbc958c9 100644
--- a/net/asterisk-bristuff/Makefile
+++ b/net/asterisk-bristuff/Makefile
@@ -7,6 +7,7 @@
PORTNAME= asterisk
PORTVERSION= 0.5.0
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= ftp://ftp.asterisk.org/pub/telephony/asterisk/ \
ftp://ftp.asterisk.org/pub/telephony/asterisk/old-releases/
@@ -15,6 +16,7 @@ MAINTAINER= sobomax@FreeBSD.org
COMMENT= An Open Source PBX and telephony toolkit
BUILD_DEPENDS= ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client
+LIB_DEPENDS= speex.1:${PORTSDIR}/audio/speex
RUN_DEPENDS= ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client
GNU_CONFIGURE= yes
diff --git a/net/asterisk-bristuff/files/patch-codecs::Makefile b/net/asterisk-bristuff/files/patch-codecs::Makefile
index 1b2df457265c..5275ffaab105 100644
--- a/net/asterisk-bristuff/files/patch-codecs::Makefile
+++ b/net/asterisk-bristuff/files/patch-codecs::Makefile
@@ -1,8 +1,29 @@
$FreeBSD$
---- codecs/Makefile 2003/10/17 09:41:04 1.1
-+++ codecs/Makefile 2003/10/17 09:41:19
+--- codecs/Makefile.orig Tue May 6 03:00:20 2003
++++ codecs/Makefile Sat Oct 18 11:49:23 2003
+@@ -19,9 +19,9 @@
+ #MODG723=codec_g723_1.so codec_g723_1b.so
+ MODG723=$(shell [ -f g723.1/coder.c ] && echo "codec_g723_1.so")
+ MODG723+=$(shell [ -f g723.1b/coder2.c ] && echo "codec_g723_1b.so")
+-MODSPEEX=$(shell [ -f /usr/include/speex.h ] || [ -f /usr/local/include/speex.h ] && echo "codec_speex.so")
++MODSPEEX=codec_speex.so
+ MODILBC=$(shell [ -f ilbc/iLBC_decode.h ] && echo "codec_ilbc.so")
+-CFLAGS+=-fPIC
++CFLAGS+=-fPIC -I$(LOCALBASE)/include
+
+ LIBG723=g723.1/libg723.a
+ LIBG723B=g723.1b/libg723b.a
+@@ -30,7 +30,7 @@
+ LIBGSMT=$(shell if uname -m | grep -q 86; then echo gsm/lib/libgsm.a; fi)
+ LIBMP3=mp3/libmp3.a
+ LIBLPC10=lpc10/liblpc10.a
+-LIBSPEEX=-lspeex -lm
++LIBSPEEX=-L$(LOCALBASE)/lib -lspeex -lm
+ LIBILBC=ilbc/libilbc.a
+
+ CODECS+=$(MODG723) $(MODSPEEX) $(MODILBC) codec_gsm.so codec_mp3_d.so codec_lpc10.so \
@@ -95,7 +95,7 @@
include .depend
diff --git a/net/asterisk-bristuff/pkg-plist b/net/asterisk-bristuff/pkg-plist
index 3cb2deb678e0..6832731cf683 100644
--- a/net/asterisk-bristuff/pkg-plist
+++ b/net/asterisk-bristuff/pkg-plist
@@ -196,6 +196,7 @@ lib/asterisk/modules/codec_gsm.so
lib/asterisk/modules/codec_ilbc.so
lib/asterisk/modules/codec_lpc10.so
lib/asterisk/modules/codec_mp3_d.so
+lib/asterisk/modules/codec_speex.so
lib/asterisk/modules/codec_ulaw.so
lib/asterisk/modules/format_g729.so
lib/asterisk/modules/format_gsm.so
diff --git a/net/asterisk-devel/Makefile b/net/asterisk-devel/Makefile
index 870aaae229af..89b4dbc958c9 100644
--- a/net/asterisk-devel/Makefile
+++ b/net/asterisk-devel/Makefile
@@ -7,6 +7,7 @@
PORTNAME= asterisk
PORTVERSION= 0.5.0
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= ftp://ftp.asterisk.org/pub/telephony/asterisk/ \
ftp://ftp.asterisk.org/pub/telephony/asterisk/old-releases/
@@ -15,6 +16,7 @@ MAINTAINER= sobomax@FreeBSD.org
COMMENT= An Open Source PBX and telephony toolkit
BUILD_DEPENDS= ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client
+LIB_DEPENDS= speex.1:${PORTSDIR}/audio/speex
RUN_DEPENDS= ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client
GNU_CONFIGURE= yes
diff --git a/net/asterisk-devel/files/patch-codecs::Makefile b/net/asterisk-devel/files/patch-codecs::Makefile
index 1b2df457265c..5275ffaab105 100644
--- a/net/asterisk-devel/files/patch-codecs::Makefile
+++ b/net/asterisk-devel/files/patch-codecs::Makefile
@@ -1,8 +1,29 @@
$FreeBSD$
---- codecs/Makefile 2003/10/17 09:41:04 1.1
-+++ codecs/Makefile 2003/10/17 09:41:19
+--- codecs/Makefile.orig Tue May 6 03:00:20 2003
++++ codecs/Makefile Sat Oct 18 11:49:23 2003
+@@ -19,9 +19,9 @@
+ #MODG723=codec_g723_1.so codec_g723_1b.so
+ MODG723=$(shell [ -f g723.1/coder.c ] && echo "codec_g723_1.so")
+ MODG723+=$(shell [ -f g723.1b/coder2.c ] && echo "codec_g723_1b.so")
+-MODSPEEX=$(shell [ -f /usr/include/speex.h ] || [ -f /usr/local/include/speex.h ] && echo "codec_speex.so")
++MODSPEEX=codec_speex.so
+ MODILBC=$(shell [ -f ilbc/iLBC_decode.h ] && echo "codec_ilbc.so")
+-CFLAGS+=-fPIC
++CFLAGS+=-fPIC -I$(LOCALBASE)/include
+
+ LIBG723=g723.1/libg723.a
+ LIBG723B=g723.1b/libg723b.a
+@@ -30,7 +30,7 @@
+ LIBGSMT=$(shell if uname -m | grep -q 86; then echo gsm/lib/libgsm.a; fi)
+ LIBMP3=mp3/libmp3.a
+ LIBLPC10=lpc10/liblpc10.a
+-LIBSPEEX=-lspeex -lm
++LIBSPEEX=-L$(LOCALBASE)/lib -lspeex -lm
+ LIBILBC=ilbc/libilbc.a
+
+ CODECS+=$(MODG723) $(MODSPEEX) $(MODILBC) codec_gsm.so codec_mp3_d.so codec_lpc10.so \
@@ -95,7 +95,7 @@
include .depend
diff --git a/net/asterisk-devel/pkg-plist b/net/asterisk-devel/pkg-plist
index 3cb2deb678e0..6832731cf683 100644
--- a/net/asterisk-devel/pkg-plist
+++ b/net/asterisk-devel/pkg-plist
@@ -196,6 +196,7 @@ lib/asterisk/modules/codec_gsm.so
lib/asterisk/modules/codec_ilbc.so
lib/asterisk/modules/codec_lpc10.so
lib/asterisk/modules/codec_mp3_d.so
+lib/asterisk/modules/codec_speex.so
lib/asterisk/modules/codec_ulaw.so
lib/asterisk/modules/format_g729.so
lib/asterisk/modules/format_gsm.so
diff --git a/net/asterisk/Makefile b/net/asterisk/Makefile
index 870aaae229af..89b4dbc958c9 100644
--- a/net/asterisk/Makefile
+++ b/net/asterisk/Makefile
@@ -7,6 +7,7 @@
PORTNAME= asterisk
PORTVERSION= 0.5.0
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= ftp://ftp.asterisk.org/pub/telephony/asterisk/ \
ftp://ftp.asterisk.org/pub/telephony/asterisk/old-releases/
@@ -15,6 +16,7 @@ MAINTAINER= sobomax@FreeBSD.org
COMMENT= An Open Source PBX and telephony toolkit
BUILD_DEPENDS= ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client
+LIB_DEPENDS= speex.1:${PORTSDIR}/audio/speex
RUN_DEPENDS= ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client
GNU_CONFIGURE= yes
diff --git a/net/asterisk/files/patch-codecs::Makefile b/net/asterisk/files/patch-codecs::Makefile
index 1b2df457265c..5275ffaab105 100644
--- a/net/asterisk/files/patch-codecs::Makefile
+++ b/net/asterisk/files/patch-codecs::Makefile
@@ -1,8 +1,29 @@
$FreeBSD$
---- codecs/Makefile 2003/10/17 09:41:04 1.1
-+++ codecs/Makefile 2003/10/17 09:41:19
+--- codecs/Makefile.orig Tue May 6 03:00:20 2003
++++ codecs/Makefile Sat Oct 18 11:49:23 2003
+@@ -19,9 +19,9 @@
+ #MODG723=codec_g723_1.so codec_g723_1b.so
+ MODG723=$(shell [ -f g723.1/coder.c ] && echo "codec_g723_1.so")
+ MODG723+=$(shell [ -f g723.1b/coder2.c ] && echo "codec_g723_1b.so")
+-MODSPEEX=$(shell [ -f /usr/include/speex.h ] || [ -f /usr/local/include/speex.h ] && echo "codec_speex.so")
++MODSPEEX=codec_speex.so
+ MODILBC=$(shell [ -f ilbc/iLBC_decode.h ] && echo "codec_ilbc.so")
+-CFLAGS+=-fPIC
++CFLAGS+=-fPIC -I$(LOCALBASE)/include
+
+ LIBG723=g723.1/libg723.a
+ LIBG723B=g723.1b/libg723b.a
+@@ -30,7 +30,7 @@
+ LIBGSMT=$(shell if uname -m | grep -q 86; then echo gsm/lib/libgsm.a; fi)
+ LIBMP3=mp3/libmp3.a
+ LIBLPC10=lpc10/liblpc10.a
+-LIBSPEEX=-lspeex -lm
++LIBSPEEX=-L$(LOCALBASE)/lib -lspeex -lm
+ LIBILBC=ilbc/libilbc.a
+
+ CODECS+=$(MODG723) $(MODSPEEX) $(MODILBC) codec_gsm.so codec_mp3_d.so codec_lpc10.so \
@@ -95,7 +95,7 @@
include .depend
diff --git a/net/asterisk/pkg-plist b/net/asterisk/pkg-plist
index 3cb2deb678e0..6832731cf683 100644
--- a/net/asterisk/pkg-plist
+++ b/net/asterisk/pkg-plist
@@ -196,6 +196,7 @@ lib/asterisk/modules/codec_gsm.so
lib/asterisk/modules/codec_ilbc.so
lib/asterisk/modules/codec_lpc10.so
lib/asterisk/modules/codec_mp3_d.so
+lib/asterisk/modules/codec_speex.so
lib/asterisk/modules/codec_ulaw.so
lib/asterisk/modules/format_g729.so
lib/asterisk/modules/format_gsm.so
diff --git a/net/asterisk10/Makefile b/net/asterisk10/Makefile
index 870aaae229af..89b4dbc958c9 100644
--- a/net/asterisk10/Makefile
+++ b/net/asterisk10/Makefile
@@ -7,6 +7,7 @@
PORTNAME= asterisk
PORTVERSION= 0.5.0
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= ftp://ftp.asterisk.org/pub/telephony/asterisk/ \
ftp://ftp.asterisk.org/pub/telephony/asterisk/old-releases/
@@ -15,6 +16,7 @@ MAINTAINER= sobomax@FreeBSD.org
COMMENT= An Open Source PBX and telephony toolkit
BUILD_DEPENDS= ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client
+LIB_DEPENDS= speex.1:${PORTSDIR}/audio/speex
RUN_DEPENDS= ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client
GNU_CONFIGURE= yes
diff --git a/net/asterisk10/files/patch-codecs::Makefile b/net/asterisk10/files/patch-codecs::Makefile
index 1b2df457265c..5275ffaab105 100644
--- a/net/asterisk10/files/patch-codecs::Makefile
+++ b/net/asterisk10/files/patch-codecs::Makefile
@@ -1,8 +1,29 @@
$FreeBSD$
---- codecs/Makefile 2003/10/17 09:41:04 1.1
-+++ codecs/Makefile 2003/10/17 09:41:19
+--- codecs/Makefile.orig Tue May 6 03:00:20 2003
++++ codecs/Makefile Sat Oct 18 11:49:23 2003
+@@ -19,9 +19,9 @@
+ #MODG723=codec_g723_1.so codec_g723_1b.so
+ MODG723=$(shell [ -f g723.1/coder.c ] && echo "codec_g723_1.so")
+ MODG723+=$(shell [ -f g723.1b/coder2.c ] && echo "codec_g723_1b.so")
+-MODSPEEX=$(shell [ -f /usr/include/speex.h ] || [ -f /usr/local/include/speex.h ] && echo "codec_speex.so")
++MODSPEEX=codec_speex.so
+ MODILBC=$(shell [ -f ilbc/iLBC_decode.h ] && echo "codec_ilbc.so")
+-CFLAGS+=-fPIC
++CFLAGS+=-fPIC -I$(LOCALBASE)/include
+
+ LIBG723=g723.1/libg723.a
+ LIBG723B=g723.1b/libg723b.a
+@@ -30,7 +30,7 @@
+ LIBGSMT=$(shell if uname -m | grep -q 86; then echo gsm/lib/libgsm.a; fi)
+ LIBMP3=mp3/libmp3.a
+ LIBLPC10=lpc10/liblpc10.a
+-LIBSPEEX=-lspeex -lm
++LIBSPEEX=-L$(LOCALBASE)/lib -lspeex -lm
+ LIBILBC=ilbc/libilbc.a
+
+ CODECS+=$(MODG723) $(MODSPEEX) $(MODILBC) codec_gsm.so codec_mp3_d.so codec_lpc10.so \
@@ -95,7 +95,7 @@
include .depend
diff --git a/net/asterisk10/pkg-plist b/net/asterisk10/pkg-plist
index 3cb2deb678e0..6832731cf683 100644
--- a/net/asterisk10/pkg-plist
+++ b/net/asterisk10/pkg-plist
@@ -196,6 +196,7 @@ lib/asterisk/modules/codec_gsm.so
lib/asterisk/modules/codec_ilbc.so
lib/asterisk/modules/codec_lpc10.so
lib/asterisk/modules/codec_mp3_d.so
+lib/asterisk/modules/codec_speex.so
lib/asterisk/modules/codec_ulaw.so
lib/asterisk/modules/format_g729.so
lib/asterisk/modules/format_gsm.so
diff --git a/net/asterisk12/Makefile b/net/asterisk12/Makefile
index 870aaae229af..89b4dbc958c9 100644
--- a/net/asterisk12/Makefile
+++ b/net/asterisk12/Makefile
@@ -7,6 +7,7 @@
PORTNAME= asterisk
PORTVERSION= 0.5.0
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= ftp://ftp.asterisk.org/pub/telephony/asterisk/ \
ftp://ftp.asterisk.org/pub/telephony/asterisk/old-releases/
@@ -15,6 +16,7 @@ MAINTAINER= sobomax@FreeBSD.org
COMMENT= An Open Source PBX and telephony toolkit
BUILD_DEPENDS= ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client
+LIB_DEPENDS= speex.1:${PORTSDIR}/audio/speex
RUN_DEPENDS= ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client
GNU_CONFIGURE= yes
diff --git a/net/asterisk12/files/patch-codecs::Makefile b/net/asterisk12/files/patch-codecs::Makefile
index 1b2df457265c..5275ffaab105 100644
--- a/net/asterisk12/files/patch-codecs::Makefile
+++ b/net/asterisk12/files/patch-codecs::Makefile
@@ -1,8 +1,29 @@
$FreeBSD$
---- codecs/Makefile 2003/10/17 09:41:04 1.1
-+++ codecs/Makefile 2003/10/17 09:41:19
+--- codecs/Makefile.orig Tue May 6 03:00:20 2003
++++ codecs/Makefile Sat Oct 18 11:49:23 2003
+@@ -19,9 +19,9 @@
+ #MODG723=codec_g723_1.so codec_g723_1b.so
+ MODG723=$(shell [ -f g723.1/coder.c ] && echo "codec_g723_1.so")
+ MODG723+=$(shell [ -f g723.1b/coder2.c ] && echo "codec_g723_1b.so")
+-MODSPEEX=$(shell [ -f /usr/include/speex.h ] || [ -f /usr/local/include/speex.h ] && echo "codec_speex.so")
++MODSPEEX=codec_speex.so
+ MODILBC=$(shell [ -f ilbc/iLBC_decode.h ] && echo "codec_ilbc.so")
+-CFLAGS+=-fPIC
++CFLAGS+=-fPIC -I$(LOCALBASE)/include
+
+ LIBG723=g723.1/libg723.a
+ LIBG723B=g723.1b/libg723b.a
+@@ -30,7 +30,7 @@
+ LIBGSMT=$(shell if uname -m | grep -q 86; then echo gsm/lib/libgsm.a; fi)
+ LIBMP3=mp3/libmp3.a
+ LIBLPC10=lpc10/liblpc10.a
+-LIBSPEEX=-lspeex -lm
++LIBSPEEX=-L$(LOCALBASE)/lib -lspeex -lm
+ LIBILBC=ilbc/libilbc.a
+
+ CODECS+=$(MODG723) $(MODSPEEX) $(MODILBC) codec_gsm.so codec_mp3_d.so codec_lpc10.so \
@@ -95,7 +95,7 @@
include .depend
diff --git a/net/asterisk12/pkg-plist b/net/asterisk12/pkg-plist
index 3cb2deb678e0..6832731cf683 100644
--- a/net/asterisk12/pkg-plist
+++ b/net/asterisk12/pkg-plist
@@ -196,6 +196,7 @@ lib/asterisk/modules/codec_gsm.so
lib/asterisk/modules/codec_ilbc.so
lib/asterisk/modules/codec_lpc10.so
lib/asterisk/modules/codec_mp3_d.so
+lib/asterisk/modules/codec_speex.so
lib/asterisk/modules/codec_ulaw.so
lib/asterisk/modules/format_g729.so
lib/asterisk/modules/format_gsm.so
diff --git a/net/asterisk14/Makefile b/net/asterisk14/Makefile
index 870aaae229af..89b4dbc958c9 100644
--- a/net/asterisk14/Makefile
+++ b/net/asterisk14/Makefile
@@ -7,6 +7,7 @@
PORTNAME= asterisk
PORTVERSION= 0.5.0
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= ftp://ftp.asterisk.org/pub/telephony/asterisk/ \
ftp://ftp.asterisk.org/pub/telephony/asterisk/old-releases/
@@ -15,6 +16,7 @@ MAINTAINER= sobomax@FreeBSD.org
COMMENT= An Open Source PBX and telephony toolkit
BUILD_DEPENDS= ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client
+LIB_DEPENDS= speex.1:${PORTSDIR}/audio/speex
RUN_DEPENDS= ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client
GNU_CONFIGURE= yes
diff --git a/net/asterisk14/files/patch-codecs::Makefile b/net/asterisk14/files/patch-codecs::Makefile
index 1b2df457265c..5275ffaab105 100644
--- a/net/asterisk14/files/patch-codecs::Makefile
+++ b/net/asterisk14/files/patch-codecs::Makefile
@@ -1,8 +1,29 @@
$FreeBSD$
---- codecs/Makefile 2003/10/17 09:41:04 1.1
-+++ codecs/Makefile 2003/10/17 09:41:19
+--- codecs/Makefile.orig Tue May 6 03:00:20 2003
++++ codecs/Makefile Sat Oct 18 11:49:23 2003
+@@ -19,9 +19,9 @@
+ #MODG723=codec_g723_1.so codec_g723_1b.so
+ MODG723=$(shell [ -f g723.1/coder.c ] && echo "codec_g723_1.so")
+ MODG723+=$(shell [ -f g723.1b/coder2.c ] && echo "codec_g723_1b.so")
+-MODSPEEX=$(shell [ -f /usr/include/speex.h ] || [ -f /usr/local/include/speex.h ] && echo "codec_speex.so")
++MODSPEEX=codec_speex.so
+ MODILBC=$(shell [ -f ilbc/iLBC_decode.h ] && echo "codec_ilbc.so")
+-CFLAGS+=-fPIC
++CFLAGS+=-fPIC -I$(LOCALBASE)/include
+
+ LIBG723=g723.1/libg723.a
+ LIBG723B=g723.1b/libg723b.a
+@@ -30,7 +30,7 @@
+ LIBGSMT=$(shell if uname -m | grep -q 86; then echo gsm/lib/libgsm.a; fi)
+ LIBMP3=mp3/libmp3.a
+ LIBLPC10=lpc10/liblpc10.a
+-LIBSPEEX=-lspeex -lm
++LIBSPEEX=-L$(LOCALBASE)/lib -lspeex -lm
+ LIBILBC=ilbc/libilbc.a
+
+ CODECS+=$(MODG723) $(MODSPEEX) $(MODILBC) codec_gsm.so codec_mp3_d.so codec_lpc10.so \
@@ -95,7 +95,7 @@
include .depend
diff --git a/net/asterisk14/pkg-plist b/net/asterisk14/pkg-plist
index 3cb2deb678e0..6832731cf683 100644
--- a/net/asterisk14/pkg-plist
+++ b/net/asterisk14/pkg-plist
@@ -196,6 +196,7 @@ lib/asterisk/modules/codec_gsm.so
lib/asterisk/modules/codec_ilbc.so
lib/asterisk/modules/codec_lpc10.so
lib/asterisk/modules/codec_mp3_d.so
+lib/asterisk/modules/codec_speex.so
lib/asterisk/modules/codec_ulaw.so
lib/asterisk/modules/format_g729.so
lib/asterisk/modules/format_gsm.so
diff --git a/net/asterisk16/Makefile b/net/asterisk16/Makefile
index 870aaae229af..89b4dbc958c9 100644
--- a/net/asterisk16/Makefile
+++ b/net/asterisk16/Makefile
@@ -7,6 +7,7 @@
PORTNAME= asterisk
PORTVERSION= 0.5.0
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= ftp://ftp.asterisk.org/pub/telephony/asterisk/ \
ftp://ftp.asterisk.org/pub/telephony/asterisk/old-releases/
@@ -15,6 +16,7 @@ MAINTAINER= sobomax@FreeBSD.org
COMMENT= An Open Source PBX and telephony toolkit
BUILD_DEPENDS= ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client
+LIB_DEPENDS= speex.1:${PORTSDIR}/audio/speex
RUN_DEPENDS= ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client
GNU_CONFIGURE= yes
diff --git a/net/asterisk16/files/patch-codecs::Makefile b/net/asterisk16/files/patch-codecs::Makefile
index 1b2df457265c..5275ffaab105 100644
--- a/net/asterisk16/files/patch-codecs::Makefile
+++ b/net/asterisk16/files/patch-codecs::Makefile
@@ -1,8 +1,29 @@
$FreeBSD$
---- codecs/Makefile 2003/10/17 09:41:04 1.1
-+++ codecs/Makefile 2003/10/17 09:41:19
+--- codecs/Makefile.orig Tue May 6 03:00:20 2003
++++ codecs/Makefile Sat Oct 18 11:49:23 2003
+@@ -19,9 +19,9 @@
+ #MODG723=codec_g723_1.so codec_g723_1b.so
+ MODG723=$(shell [ -f g723.1/coder.c ] && echo "codec_g723_1.so")
+ MODG723+=$(shell [ -f g723.1b/coder2.c ] && echo "codec_g723_1b.so")
+-MODSPEEX=$(shell [ -f /usr/include/speex.h ] || [ -f /usr/local/include/speex.h ] && echo "codec_speex.so")
++MODSPEEX=codec_speex.so
+ MODILBC=$(shell [ -f ilbc/iLBC_decode.h ] && echo "codec_ilbc.so")
+-CFLAGS+=-fPIC
++CFLAGS+=-fPIC -I$(LOCALBASE)/include
+
+ LIBG723=g723.1/libg723.a
+ LIBG723B=g723.1b/libg723b.a
+@@ -30,7 +30,7 @@
+ LIBGSMT=$(shell if uname -m | grep -q 86; then echo gsm/lib/libgsm.a; fi)
+ LIBMP3=mp3/libmp3.a
+ LIBLPC10=lpc10/liblpc10.a
+-LIBSPEEX=-lspeex -lm
++LIBSPEEX=-L$(LOCALBASE)/lib -lspeex -lm
+ LIBILBC=ilbc/libilbc.a
+
+ CODECS+=$(MODG723) $(MODSPEEX) $(MODILBC) codec_gsm.so codec_mp3_d.so codec_lpc10.so \
@@ -95,7 +95,7 @@
include .depend
diff --git a/net/asterisk16/pkg-plist b/net/asterisk16/pkg-plist
index 3cb2deb678e0..6832731cf683 100644
--- a/net/asterisk16/pkg-plist
+++ b/net/asterisk16/pkg-plist
@@ -196,6 +196,7 @@ lib/asterisk/modules/codec_gsm.so
lib/asterisk/modules/codec_ilbc.so
lib/asterisk/modules/codec_lpc10.so
lib/asterisk/modules/codec_mp3_d.so
+lib/asterisk/modules/codec_speex.so
lib/asterisk/modules/codec_ulaw.so
lib/asterisk/modules/format_g729.so
lib/asterisk/modules/format_gsm.so