- Add missing MAN line

- Fix pkg-plist
- Update WWW: line

PR:		45422
Submitted by:	Ports Fury

6 files changed, 28 insertions, 10 deletions

diff --git a/audio/speex-devel/Makefile b/audio/speex-devel/Makefile
index 5345231..376ed41 100644
--- a/audio/speex-devel/Makefile
+++ b/audio/speex-devel/Makefile
@@ -8,20 +8,29 @@
 
 PORTNAME=	speex
 PORTVERSION=	1.0.b3
+PORTEPOCH=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://www.speex.org/download/
-DISTNAME=	speex-${PORTVERSION:S/.b/beta/}
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/.b/beta/}
 
 MAINTAINER=	ports@FreeBSD.org
 
 LIB_DEPENDS=	ogg.4:${PORTSDIR}/audio/libogg \
 		gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
 
+USE_REINPLACE=	yes
 USE_LIBTOOL=	yes
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -lgnugetopt"
 INSTALLS_SHLIB=	yes
 
+MAN1=		speexdec.1 speexenc.1
+
+post-patch:
+	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
+		's|doc win32|win32|g ; \
+		 s|^mandir =.*$$|mandir = @mandir@|g' 
+
 .include <bsd.port.mk>
diff --git a/audio/speex-devel/pkg-descr b/audio/speex-devel/pkg-descr
index 973b41e..4ad2193 100644
--- a/audio/speex-devel/pkg-descr
+++ b/audio/speex-devel/pkg-descr
@@ -4,4 +4,4 @@ designed for compressing voice at low bit-rates for applications such as
 voice over IP (VoIP). In some sense, it is meant to be complementary to
 the Ogg Vorbis codec.
 
-WWW: http://speex.sourceforge.net/
+WWW: http://www.speex.org/
diff --git a/audio/speex-devel/pkg-plist b/audio/speex-devel/pkg-plist
index e528504..027cd95 100644
--- a/audio/speex-devel/pkg-plist
+++ b/audio/speex-devel/pkg-plist
@@ -1,11 +1,11 @@
 @comment $FreeBSD$
 bin/speexdec
 bin/speexenc
-bin/testenc
-bin/testenc_wb
 include/speex.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.0
diff --git a/audio/speex/Makefile b/audio/speex/Makefile
index 5345231..376ed41 100644
--- a/audio/speex/Makefile
+++ b/audio/speex/Makefile
@@ -8,20 +8,29 @@
 
 PORTNAME=	speex
 PORTVERSION=	1.0.b3
+PORTEPOCH=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://www.speex.org/download/
-DISTNAME=	speex-${PORTVERSION:S/.b/beta/}
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/.b/beta/}
 
 MAINTAINER=	ports@FreeBSD.org
 
 LIB_DEPENDS=	ogg.4:${PORTSDIR}/audio/libogg \
 		gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
 
+USE_REINPLACE=	yes
 USE_LIBTOOL=	yes
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -lgnugetopt"
 INSTALLS_SHLIB=	yes
 
+MAN1=		speexdec.1 speexenc.1
+
+post-patch:
+	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
+		's|doc win32|win32|g ; \
+		 s|^mandir =.*$$|mandir = @mandir@|g' 
+
 .include <bsd.port.mk>
diff --git a/audio/speex/pkg-descr b/audio/speex/pkg-descr
index 973b41e..4ad2193 100644
--- a/audio/speex/pkg-descr
+++ b/audio/speex/pkg-descr
@@ -4,4 +4,4 @@ designed for compressing voice at low bit-rates for applications such as
 voice over IP (VoIP). In some sense, it is meant to be complementary to
 the Ogg Vorbis codec.
 
-WWW: http://speex.sourceforge.net/
+WWW: http://www.speex.org/
diff --git a/audio/speex/pkg-plist b/audio/speex/pkg-plist
index e528504..027cd95 100644
--- a/audio/speex/pkg-plist
+++ b/audio/speex/pkg-plist
@@ -1,11 +1,11 @@
 @comment $FreeBSD$
 bin/speexdec
 bin/speexenc
-bin/testenc
-bin/testenc_wb
 include/speex.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.0