6 files changed, 29 insertions, 57 deletions

diff --git a/audio/speex/Makefile b/audio/speex/Makefile
index 5e99ec7a90c5..7cb2596f4b87 100644
--- a/audio/speex/Makefile
+++ b/audio/speex/Makefile
@@ -1,4 +1,3 @@
-# ex:ts=8
 # Ports collection makefile for:	Speex
 # Date created:			Jul 30, 2002
 # Whom:				ijliao
@@ -7,14 +6,10 @@
 #
 
 PORTNAME=	speex
-PORTVERSION=	1.0.5
-PORTREVISION=	1
+DISTVERSION=	1.2beta1
 PORTEPOCH=	1
 CATEGORIES=	audio
-MASTER_SITES=	${MASTER_SITE_LOCAL} \
-		ftp://ftp.osuosl.org/.1/xiph/releases/speex/
-MASTER_SITE_SUBDIR=	ahze
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/rc/}
+MASTER_SITES=	http://downloads.us.xiph.org/releases/speex/
 
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	An open-source patent-free voice codec
@@ -23,25 +18,30 @@ LIB_DEPENDS=	ogg.5:${PORTSDIR}/audio/libogg
 
 CONFLICTS=	speex-devel-[0-9]*
 
+USE_GNOME=	gnomehack gnometarget ltverhack
+USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool:15
-USE_GNOME=	gnomehack
 USE_GETOPT_LONG=yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-ogg-dir=${LOCALBASE}
-INSTALLS_SHLIB=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 MAN1=		speexdec.1 speexenc.1
 
+.include <bsd.port.pre.mk>
+
+.if ${MACHINE_CPU:Msse}!=""
+CONFIGURE_ARGS+=	--enable-sse
+.endif
+
 post-patch:
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|doc win32|win32|g ; \
-		s|^mandir =.*$$|mandir = ${PREFIX}/man|g'
-	@${REINPLACE_CMD} -e 's|@SPEEX_VERSION@|${PORTVERSION}|' \
-		${WRKSRC}/speex.pc.in
+		s|^mandir =.*$$|mandir = @mandir@|g'
+	@${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|' \
+		${WRKSRC}/*/*.h
 	@${REINPLACE_CMD} -e 's| in -lgnugetopt||g ; \
-		 s|LIBS="-lgnugetopt|LIBS="|g; \
-		 s|SPEEX_LT_CURRENT=4|SPEEX_LT_CURRENT=3|' \
-			 ${WRKSRC}/configure
+		 s|LIBS="-lgnugetopt|LIBS="|g' ${WRKSRC}/configure
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/audio/speex/distinfo b/audio/speex/distinfo
index acad75e2f0d3..e26d00c20185 100644
--- a/audio/speex/distinfo
+++ b/audio/speex/distinfo
@@ -1,3 +1,3 @@
-MD5 (speex-1.0.5.tar.gz) = 01d6a2de0a88a861304bf517615dea79
-SHA256 (speex-1.0.5.tar.gz) = fce83e97a795d87db84118ec45cea42691474949264e6978bc5a25482ea983b5
-SIZE (speex-1.0.5.tar.gz) = 546872
+MD5 (speex-1.2beta1.tar.gz) = aac2e4ba42122b885c787ea280acb3d9
+SHA256 (speex-1.2beta1.tar.gz) = d8bef008b3be87b3b155128c091286b269fee32a38b0849bc8cacb3cd5f7f6a0
+SIZE (speex-1.2beta1.tar.gz) = 932798
diff --git a/audio/speex/files/patch-libspeex::stack_alloc.h b/audio/speex/files/patch-libspeex::stack_alloc.h
deleted file mode 100644
index 25883aab513f..000000000000
--- a/audio/speex/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/files/patch-src::speexdec.c b/audio/speex/files/patch-src::speexdec.c
deleted file mode 100644
index 96a7c2c22841..000000000000
--- a/audio/speex/files/patch-src::speexdec.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/speexdec.c.orig	Sun Jun  1 14:58:51 2003
-+++ src/speexdec.c	Wed Jun 11 02:07:49 2003
-@@ -72,6 +72,14 @@
-                            ((buf[base+1]<<8)&0xff00)| \
-   	           	    (buf[base]&0xff))
- 
-+#if !defined(AFMT_S16_NE)
-+#if defined(BYTE_ORDER) && (BYTE_ORDER == BIG_ENDIAN)
-+#define AFMT_S16_NE AFMT_S16_BE
-+#else
-+#define AFMT_S16_NE AFMT_S16_LE
-+#endif
-+#endif
-+
- static void print_comments(char *comments, int length)
- {
-    char *c=comments;
diff --git a/audio/speex/pkg-descr b/audio/speex/pkg-descr
index deda059aaa99..0243650844ba 100644
--- a/audio/speex/pkg-descr
+++ b/audio/speex/pkg-descr
@@ -5,4 +5,7 @@ applications include VoIP, internet audio streaming, archiving of
 speech data (e.g. voice mail), and audio books. In some sense, it is
 meant to be complementary to the Ogg Vorbis codec.
 
+This ports is for the development version of speex, but the file format
+is compatibile with the base (1.0 and 1.1) versions.
+
 WWW: http://www.speex.org/
diff --git a/audio/speex/pkg-plist b/audio/speex/pkg-plist
index 0bab16c4585a..132f73986d20 100644
--- a/audio/speex/pkg-plist
+++ b/audio/speex/pkg-plist
@@ -1,19 +1,19 @@
 bin/speexdec
 bin/speexenc
-include/speex.h
 include/speex/speex.h
 include/speex/speex_bits.h
 include/speex/speex_callbacks.h
+include/speex/speex_config_types.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
+include/speex/speex_types.h
 lib/libspeex.a
 lib/libspeex.la
 lib/libspeex.so
-lib/libspeex.so.3
+lib/libspeex.so.1
 libdata/pkgconfig/speex.pc
 share/aclocal/speex.m4
 @dirrm include/speex