6 files changed, 57 insertions, 75 deletions

diff --git a/audio/sphinxbase/Makefile b/audio/sphinxbase/Makefile
index 1828081f8526..6c4aca5076e0 100644
--- a/audio/sphinxbase/Makefile
+++ b/audio/sphinxbase/Makefile
@@ -6,24 +6,52 @@
 #
 
 PORTNAME=	sphinxbase
-PORTVERSION=	0.3
-PORTREVISION=	1
+PORTVERSION=	0.7
 CATEGORIES=	audio accessibility
 MASTER_SITES=	SF/cmusphinx/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	r.neese@gmail.com
-COMMENT=	CMU SPhinx Speech recognition system base
+COMMENT=	CMU Sphinx Speech recognition system base
+
+BUILD_DEPENDS=	bison:${PORTSDIR}/devel/bison 
 
 USE_LDCONFIG=	yes
-PKGMESSAGE=	${WRKDIR}/pkg-message
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack
 USE_AUTOTOOLS=	libtool
 
+CONFIGURE_ARGS+=	--without-python --without-lapack
+CONFIGURE_ENV+=	HAVE_DOXYGEN=no
+
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAKE_ENV=	MKDIR="${MKDIR}" \
 		OSVERSION=${OSVERSION}
 
+OPTIONS_DEFINE=	SNDFILE THREADS
+OPTIONS_DEFAULT=	THREADS
+
+SNDFILE_DESC=	libsndfile support
+THREADS_DESC=	Build with thread safety support
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MSNDFILE}
+USE_PKGCONFIG=	build
+LIB_DEPENDS+=	sndfile:${PORTSDIR}/audio/libsndfile
+.else
+CONFIGURE_ENV+=	HAVE_PKGCONFIG=no
+.endif
+
+.if ${PORT_OPTIONS:MTHREADS}
+CPPFLAGS+=	${PTHREAD_CFLAGS}
+LDFLAGS+=	${PTHREAD_LIBS}
+CONFIGURE_ARGS+=	--enable-threads
+.else
+CONFIGURE_ARGS+=	--disable-threads
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|$$(prefix)/libdata/pkgconfig|g' ${WRKSRC}/Makefile.in
+
 .include <bsd.port.mk>
diff --git a/audio/sphinxbase/distinfo b/audio/sphinxbase/distinfo
index 86678421db05..87fceba80fff 100644
--- a/audio/sphinxbase/distinfo
+++ b/audio/sphinxbase/distinfo
@@ -1,2 +1,2 @@
-SHA256 (sphinxbase-0.3.tar.gz) = 0497a39d926fb0faa5fab28391821743225cd332e7b582419c60b0db7e6fbaa2
-SIZE (sphinxbase-0.3.tar.gz) = 1841919
+SHA256 (sphinxbase-0.7.tar.gz) = 389cb99a545f7d615a2b3bc3f7362a490ca45fc4dc440140ae1d2a41f87773ec
+SIZE (sphinxbase-0.7.tar.gz) = 3291922
diff --git a/audio/sphinxbase/files/patch-configure b/audio/sphinxbase/files/patch-configure
deleted file mode 100644
index f536d39e1773..000000000000
--- a/audio/sphinxbase/files/patch-configure
+++ /dev/null
@@ -1,30 +0,0 @@
---- configure.orig	2009-07-13 10:53:01.000000000 -0500
-+++ configure	2009-07-13 10:54:06.000000000 -0500
-@@ -7166,7 +7166,8 @@
- 
- if test "x$ad_files" = "x"; then
-         case $host in
--                *-*-linux*|*-*-uclinux*)
-+                *-*-linux*|*-*-uclinux*| \
-+                *-*-freebsd*|*-*-netbsd*|*-*-openbsd*)
-                         ad_files="ad_oss.lo"
-                         ad_backend="AD_BACKEND_OSS"
- 
-@@ -7175,17 +7176,6 @@
- _ACEOF
- 
-                         ;;
--                # FIXME: isn't this the same OSS as on Linux?
--                *-*-freebsd*|*-*-netbsd*|*-*-openbsd*)
--                        ad_files="ad_oss_bsd.lo mulaw_base.lo"
--                        ad_libs="-lossaudio"
--                        ad_backend="AD_BACKEND_OSS_BSD"
--
--cat >>confdefs.h <<\_ACEOF
--#define AD_BACKEND_OSS_BSD
--_ACEOF
--
--                        ;;
-                 *-*-osf*)
-                         ad_files="ad_osf.lo mulaw_base.lo"
-                         ad_backend="AD_BACKEND_OSF"
diff --git a/audio/sphinxbase/files/patch-src-libsphinxad_ad_oss_bsd.c b/audio/sphinxbase/files/patch-src-libsphinxad_ad_oss_bsd.c
deleted file mode 100644
index eccde07507ab..000000000000
--- a/audio/sphinxbase/files/patch-src-libsphinxad_ad_oss_bsd.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/libsphinxad/ad_oss_bsd.c        (revision 7548)
-+++ src/libsphinxad/ad_oss_bsd.c        (working copy)
-@@ -65,11 +65,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <sys/ioctl.h>
--#if defined(SYS_SOUNDCARD_H)
- #include <sys/soundcard.h>
--#else
--#include <soundcard.h>
--#endif
- #include <errno.h>
- #include <config.h>
-
diff --git a/audio/sphinxbase/files/patch-test-unit-test_case_ucase3.test b/audio/sphinxbase/files/patch-test-unit-test_case_ucase3.test
deleted file mode 100644
index f9a26e3ecbf9..000000000000
--- a/audio/sphinxbase/files/patch-test-unit-test_case_ucase3.test
+++ /dev/null
@@ -1,9 +0,0 @@
---- test/unit/test_case/_ucase3.test    (revision 7548)
-+++ test/unit/test_case/_ucase3.test    (working copy)
-@@ -1,2 +1,2 @@
--#!/bin/bash
--./chgCase ucase
-\ No newline at end of file
-+#!/bin/sh
-+./chgCase ucase
-
diff --git a/audio/sphinxbase/pkg-plist b/audio/sphinxbase/pkg-plist
index 393c0a78eb90..d7289545bc9f 100644
--- a/audio/sphinxbase/pkg-plist
+++ b/audio/sphinxbase/pkg-plist
@@ -1,5 +1,12 @@
 bin/sphinx_cepview
+bin/sphinx_cont_adseg
+bin/sphinx_cont_fileseg
 bin/sphinx_fe
+bin/sphinx_jsgf2fsg
+bin/sphinx_lm_convert
+bin/sphinx_lm_eval
+bin/sphinx_lm_sort
+bin/sphinx_pitch
 include/sphinxbase/ad.h
 include/sphinxbase/agc.h
 include/sphinxbase/bio.h
@@ -17,38 +24,38 @@ include/sphinxbase/fe.h
 include/sphinxbase/feat.h
 include/sphinxbase/filename.h
 include/sphinxbase/fixpoint.h
+include/sphinxbase/fsg_model.h
 include/sphinxbase/genrand.h
 include/sphinxbase/glist.h
 include/sphinxbase/hash_table.h
 include/sphinxbase/heap.h
+include/sphinxbase/huff_code.h
 include/sphinxbase/info.h
+include/sphinxbase/jsgf.h
 include/sphinxbase/libutil.h
-include/sphinxbase/linklist.h
+include/sphinxbase/listelem_alloc.h
+include/sphinxbase/logmath.h
 include/sphinxbase/matrix.h
+include/sphinxbase/mmio.h
 include/sphinxbase/mulaw.h
+include/sphinxbase/ngram_model.h
 include/sphinxbase/pio.h
 include/sphinxbase/prim_type.h
 include/sphinxbase/profile.h
-include/sphinxbase/s3_arraylist.h
+include/sphinxbase/sbthread.h
 include/sphinxbase/sphinx_config.h
-include/sphinxbase/sphinx_types.h
+include/sphinxbase/sphinxbase.pxd
+include/sphinxbase/sphinxbase_export.h
 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/libsphinxfe.a
-lib/libsphinxfe.la
-lib/libsphinxfe.so
-lib/libsphinxfe.so.0
-lib/libsphinxfeat.a
-lib/libsphinxfeat.la
-lib/libsphinxfeat.so
-lib/libsphinxfeat.so.0
-lib/libsphinxutil.a
-lib/libsphinxutil.la
-lib/libsphinxutil.so
-lib/libsphinxutil.so.0
+lib/libsphinxbase.a
+lib/libsphinxbase.la
+lib/libsphinxbase.so
+lib/libsphinxbase.so.2
 libdata/pkgconfig/sphinxbase.pc
 @dirrm include/sphinxbase