Update to version 1.0.1.

PR:		53098
Submitted by:	Ports Fury

10 files changed, 76 insertions, 22 deletions

diff --git a/audio/speex-devel/Makefile b/audio/speex-devel/Makefile
index e5c4bfce59ef..9a804b16a551 100644
--- a/audio/speex-devel/Makefile
+++ b/audio/speex-devel/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	speex
-PORTVERSION=	1.0
+PORTVERSION=	1.0.1
 PORTEPOCH=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://www.speex.org/download/
@@ -18,6 +18,7 @@ COMMENT=	An open-source patent-free voice codec
 
 LIB_DEPENDS=	ogg.4:${PORTSDIR}/audio/libogg
 
+USE_GETOPT_LONG=	yes
 USE_REINPLACE=	yes
 USE_LIBTOOL=	yes
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
@@ -30,16 +31,11 @@ MAN1=		speexdec.1 speexenc.1
 CPPFLAGS=	-I${LOCALBASE}/include
 LDFLAGS=	-L${LOCALBASE}/lib
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500041
-LIB_DEPENDS+=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
-LDFLAGS+=	-lgnugetopt
-.endif
-
 post-patch:
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|doc win32|win32|g ; \
 		 s|^mandir =.*$$|mandir = @mandir@|g' 
+	@${REINPLACE_CMD} -e 's| in -lgnugetopt||g ; \
+		 s|LIBS="-lgnugetopt|LIBS="|g' ${WRKSRC}/configure
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/speex-devel/distinfo b/audio/speex-devel/distinfo
index feef914cce23..68114301bce4 100644
--- a/audio/speex-devel/distinfo
+++ b/audio/speex-devel/distinfo
@@ -1 +1 @@
-MD5 (speex-1.0.tar.gz) = d4ea30440a57ce5a57e915c46a5b7163
+MD5 (speex-1.0.1.tar.gz) = 20515626d2c755ca9216701b60c97120
diff --git a/audio/speex-devel/files/patch-libspeex::stack_alloc.h b/audio/speex-devel/files/patch-libspeex::stack_alloc.h
new file mode 100644
index 000000000000..25883aab513f
--- /dev/null
+++ b/audio/speex-devel/files/patch-libspeex::stack_alloc.h
@@ -0,0 +1,14 @@
+
+$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/files/patch-src::speexdec.c b/audio/speex-devel/files/patch-src::speexdec.c
new file mode 100644
index 000000000000..96a7c2c22841
--- /dev/null
+++ b/audio/speex-devel/files/patch-src::speexdec.c
@@ -0,0 +1,17 @@
+--- 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-devel/pkg-plist b/audio/speex-devel/pkg-plist
index 4fb7dc533104..32b38b470ecd 100644
--- a/audio/speex-devel/pkg-plist
+++ b/audio/speex-devel/pkg-plist
@@ -8,4 +8,4 @@ include/speex_header.h
 include/speex_stereo.h
 lib/libspeex.a
 lib/libspeex.so
-lib/libspeex.so.1
+lib/libspeex.so.2
diff --git a/audio/speex/Makefile b/audio/speex/Makefile
index e5c4bfce59ef..9a804b16a551 100644
--- a/audio/speex/Makefile
+++ b/audio/speex/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	speex
-PORTVERSION=	1.0
+PORTVERSION=	1.0.1
 PORTEPOCH=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://www.speex.org/download/
@@ -18,6 +18,7 @@ COMMENT=	An open-source patent-free voice codec
 
 LIB_DEPENDS=	ogg.4:${PORTSDIR}/audio/libogg
 
+USE_GETOPT_LONG=	yes
 USE_REINPLACE=	yes
 USE_LIBTOOL=	yes
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
@@ -30,16 +31,11 @@ MAN1=		speexdec.1 speexenc.1
 CPPFLAGS=	-I${LOCALBASE}/include
 LDFLAGS=	-L${LOCALBASE}/lib
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500041
-LIB_DEPENDS+=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
-LDFLAGS+=	-lgnugetopt
-.endif
-
 post-patch:
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|doc win32|win32|g ; \
 		 s|^mandir =.*$$|mandir = @mandir@|g' 
+	@${REINPLACE_CMD} -e 's| in -lgnugetopt||g ; \
+		 s|LIBS="-lgnugetopt|LIBS="|g' ${WRKSRC}/configure
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/speex/distinfo b/audio/speex/distinfo
index feef914cce23..68114301bce4 100644
--- a/audio/speex/distinfo
+++ b/audio/speex/distinfo
@@ -1 +1 @@
-MD5 (speex-1.0.tar.gz) = d4ea30440a57ce5a57e915c46a5b7163
+MD5 (speex-1.0.1.tar.gz) = 20515626d2c755ca9216701b60c97120
diff --git a/audio/speex/files/patch-libspeex::stack_alloc.h b/audio/speex/files/patch-libspeex::stack_alloc.h
new file mode 100644
index 000000000000..25883aab513f
--- /dev/null
+++ b/audio/speex/files/patch-libspeex::stack_alloc.h
@@ -0,0 +1,14 @@
+
+$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
new file mode 100644
index 000000000000..96a7c2c22841
--- /dev/null
+++ b/audio/speex/files/patch-src::speexdec.c
@@ -0,0 +1,17 @@
+--- 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-plist b/audio/speex/pkg-plist
index 4fb7dc533104..32b38b470ecd 100644
--- a/audio/speex/pkg-plist
+++ b/audio/speex/pkg-plist
@@ -8,4 +8,4 @@ include/speex_header.h
 include/speex_stereo.h
 lib/libspeex.a
 lib/libspeex.so
-lib/libspeex.so.1
+lib/libspeex.so.2