5 files changed, 10 insertions, 35 deletions

diff --git a/audio/speex-devel/Makefile b/audio/speex-devel/Makefile
index 2c1d373d7ef1..e180cbde3f20 100644
--- a/audio/speex-devel/Makefile
+++ b/audio/speex-devel/Makefile
@@ -7,21 +7,22 @@
 #
 
 PORTNAME=	speex
-PORTVERSION=	1.0.4
-PORTEPOCH=	1
+PORTVERSION=	1.1.6
 CATEGORIES=	audio
 MASTER_SITES=	http://www.speex.org/download/
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/rc/}
+PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	ahze@FreeBSD.org
 COMMENT=	An open-source patent-free voice codec
 
 LIB_DEPENDS=	ogg.5:${PORTSDIR}/audio/libogg
 
+CONFLICTS=	speex-1.0*
+
 USE_GNOME=	gnomehack
 USE_GETOPT_LONG=	yes
 USE_REINPLACE=	yes
-USE_INC_LIBTOOL_VER=	13
+USE_LIBTOOL_VER=	15
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/audio/speex-devel/distinfo b/audio/speex-devel/distinfo
index 38eb24350374..63b7f9328825 100644
--- a/audio/speex-devel/distinfo
+++ b/audio/speex-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (speex-1.0.4.tar.gz) = 15a0686b7e1f81d352a648044b350fcc
-SIZE (speex-1.0.4.tar.gz) = 546214
+MD5 (speex-1.1.6.tar.gz) = 111428b4c26c8be02de951a0d9a97e93
+SIZE (speex-1.1.6.tar.gz) = 588260
diff --git a/audio/speex-devel/files/patch-configure b/audio/speex-devel/files/patch-configure
deleted file mode 100644
index 868364574624..000000000000
--- a/audio/speex-devel/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig	Mon Jul 29 11:40:32 2002
-+++ configure	Wed Jul 31 03:49:39 2002
-@@ -5287,6 +5287,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/audio/speex-devel/files/patch-libspeex::stack_alloc.h b/audio/speex-devel/files/patch-libspeex::stack_alloc.h
deleted file mode 100644
index 25883aab513f..000000000000
--- a/audio/speex-devel/files/patch-libspeex::stack_alloc.h
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- libspeex/stack_alloc.h.orig	Wed Jun 11 17:10:53 2003
-+++ libspeex/stack_alloc.h	Wed Jun 11 17:11:12 2003
-@@ -48,7 +48,7 @@
- #else
- 
- /*Aligns the stack to a 'size' boundary */
--#define ALIGN(stack, size) ((stack) += ((size) - (int)(stack)) & ((size) - 1))
-+#define ALIGN(stack, size) ((stack) += ((size) - (long)(stack)) & ((size) - 1))
- 
- /* Allocates 'size' elements of type 'type' on the stack */
- #define PUSH(stack, size, type) (ALIGN((stack),sizeof(type)),(stack)+=((size)*sizeof(type)),(type*)((stack)-((size)*sizeof(type))))
diff --git a/audio/speex-devel/pkg-plist b/audio/speex-devel/pkg-plist
index 04a0ceb9f97c..948c36baa29c 100644
--- a/audio/speex-devel/pkg-plist
+++ b/audio/speex-devel/pkg-plist
@@ -1,15 +1,13 @@
 bin/speexdec
 bin/speexenc
-include/speex.h
 include/speex/speex.h
 include/speex/speex_bits.h
 include/speex/speex_callbacks.h
+include/speex/speex_echo.h
 include/speex/speex_header.h
+include/speex/speex_jitter.h
+include/speex/speex_preprocess.h
 include/speex/speex_stereo.h
-include/speex_bits.h
-include/speex_callbacks.h
-include/speex_header.h
-include/speex_stereo.h
 lib/libspeex.a
 lib/libspeex.so
 lib/libspeex.so.3