- Switch to USES=libtool

6 files changed, 27 insertions, 18 deletions

diff --git a/audio/pocketsphinx/Makefile b/audio/pocketsphinx/Makefile
index 2ddaacd72c31..9df5051af18b 100644
--- a/audio/pocketsphinx/Makefile
+++ b/audio/pocketsphinx/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	pocketsphinx
 PORTVERSION=	0.8
+PORTREVISION=	1
 CATEGORIES=	audio accessibility
 MASTER_SITES=	SF/cmusphinx/${PORTNAME}/${PORTVERSION}
 
@@ -11,12 +12,11 @@ COMMENT=	Speech recognition system
 
 LIB_DEPENDS=	libsphinxad.so:${PORTSDIR}/audio/sphinxbase
 
-USES=		gmake pathfix pkgconfig
-USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	libtool
-
-CONFIGURE_ARGS+=	--without-python
+USES=		gmake pathfix pkgconfig libtool
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+=--without-python
 CONFIGURE_ENV+=	HAVE_DOXYGEN=no
+USE_LDCONFIG=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -29,4 +29,7 @@ post-patch:
 		-e '/[[:space:]]+gst-plugin$$/D;' \
 		${WRKSRC}/src/Makefile.in
 
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpocketsphinx.so
+
 .include <bsd.port.mk>
diff --git a/audio/pocketsphinx/pkg-plist b/audio/pocketsphinx/pkg-plist
index caca8bf988b5..f5918702ac53 100644
--- a/audio/pocketsphinx/pkg-plist
+++ b/audio/pocketsphinx/pkg-plist
@@ -9,9 +9,9 @@ include/pocketsphinx/pocketsphinx_export.h
 include/pocketsphinx/ps_lattice.h
 include/pocketsphinx/ps_mllr.h
 lib/libpocketsphinx.a
-lib/libpocketsphinx.la
 lib/libpocketsphinx.so
-lib/libpocketsphinx.so.2
+lib/libpocketsphinx.so.1
+lib/libpocketsphinx.so.1.1.0
 libdata/pkgconfig/pocketsphinx.pc
 man/man1/pocketsphinx_batch.1.gz
 man/man1/pocketsphinx_continuous.1.gz
diff --git a/audio/sphinx3/Makefile b/audio/sphinx3/Makefile
index daa6d9325c0e..b84a75e27e8b 100644
--- a/audio/sphinx3/Makefile
+++ b/audio/sphinx3/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	sphinx3
 PORTVERSION=	0.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio accessibility
 MASTER_SITES=	SF/cmusphinx/${PORTNAME}/${PORTVERSION}
 
@@ -12,11 +12,11 @@ COMMENT=	Speech recognition system
 
 LIB_DEPENDS=	libsphinxbase.so:${PORTSDIR}/audio/sphinxbase
 
+USES=		gmake pathfix libtool
+GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	libtool
 USE_CSTD=	gnu99
 MAKE_JOBS_UNSAFE=	yes
-USES=		gmake pathfix
 
 CFLAGS+=	-I${LOCALBASE}/include #-I${LOCALBASE}/include/sphinxbase
 CXXFLAGS+=	-I${LOCALBASE}/include #-I${LOCALBASE}/include/sphinxbase
@@ -25,4 +25,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_ENV=	MKDIR="${MKDIR}" \
 		OSVERSION=${OSVERSION}
 
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libs3decoder.so
+
 .include <bsd.port.mk>
diff --git a/audio/sphinx3/pkg-plist b/audio/sphinx3/pkg-plist
index 4163782ccaad..d422eceb08fc 100644
--- a/audio/sphinx3/pkg-plist
+++ b/audio/sphinx3/pkg-plist
@@ -86,9 +86,9 @@ include/sphinx3/word_fsg.h
 include/sphinx3/word_graph.h
 include/sphinx3/word_ugprob.h
 lib/libs3decoder.a
-lib/libs3decoder.la
 lib/libs3decoder.so
 lib/libs3decoder.so.0
+lib/libs3decoder.so.0.0.6
 libdata/pkgconfig/sphinx3.pc
 %%DATADIR%%/doc/BN_AM_HUB96-97.doc
 %%DATADIR%%/doc/BN_AM_HUB96-97.htm
diff --git a/audio/sphinxbase/Makefile b/audio/sphinxbase/Makefile
index 6ab6b39ae3ce..31de0e8104a8 100644
--- a/audio/sphinxbase/Makefile
+++ b/audio/sphinxbase/Makefile
@@ -3,18 +3,18 @@
 
 PORTNAME=	sphinxbase
 PORTVERSION=	0.8
+PORTREVISION= 	1
 CATEGORIES=	audio accessibility
 MASTER_SITES=	SF/cmusphinx/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	CMU Sphinx Speech recognition system base
 
-USE_LDCONFIG=	yes
-USES=		bison gmake pathfix
-USE_AUTOTOOLS=	libtool
-
+USES=		bison gmake pathfix libtool
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--without-python --without-lapack
 CONFIGURE_ENV+=	HAVE_DOXYGEN=no
+USE_LDCONFIG=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -45,4 +45,7 @@ CONFIGURE_ARGS+=	--enable-threads
 CONFIGURE_ARGS+=	--disable-threads
 .endif
 
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libsphinx*.so
+
 .include <bsd.port.mk>
diff --git a/audio/sphinxbase/pkg-plist b/audio/sphinxbase/pkg-plist
index 025931dd9aa5..2686dbd95376 100644
--- a/audio/sphinxbase/pkg-plist
+++ b/audio/sphinxbase/pkg-plist
@@ -49,12 +49,12 @@ include/sphinxbase/strfuncs.h
 include/sphinxbase/unlimit.h
 include/sphinxbase/yin.h
 lib/libsphinxad.a
-lib/libsphinxad.la
 lib/libsphinxad.so
 lib/libsphinxad.so.0
+lib/libsphinxad.so.0.0.1
 lib/libsphinxbase.a
-lib/libsphinxbase.la
 lib/libsphinxbase.so
-lib/libsphinxbase.so.2
+lib/libsphinxbase.so.1
+lib/libsphinxbase.so.1.1.1
 libdata/pkgconfig/sphinxbase.pc
 @dirrm include/sphinxbase