- Update to 0.7 [1]

- Remove unnecessary shlib version in LIB_DEPENDS
- Use pkgconf to detect dependency files
- Add missing MAN1 pages
- Disable building of python module
- Disable building of GStreamer plugin

PR:		ports/169427 [1]
Submitted by:	Richard Neese <r.neese@gmail.com> (maintainer)
Approved by:	flo (mentor)

3 files changed, 65 insertions, 87 deletions

diff --git a/audio/pocketsphinx/Makefile b/audio/pocketsphinx/Makefile
index 60b9bbd91a71..08182abfd63b 100644
--- a/audio/pocketsphinx/Makefile
+++ b/audio/pocketsphinx/Makefile
@@ -6,26 +6,37 @@
 #
 
 PORTNAME=	pocketsphinx
-PORTVERSION=	0.4.1
+PORTVERSION=	0.7
 CATEGORIES=	audio accessibility
 MASTER_SITES=	SF/cmusphinx/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	r.neese@gmail.com
 COMMENT=	Speech recognition system
 
-LIB_DEPENDS=	sphinxfe.0:${PORTSDIR}/audio/sphinxbase
+LIB_DEPENDS=	sphinxad:${PORTSDIR}/audio/sphinxbase
 
 USE_LDCONFIG=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
+USE_PKGCONFIG=	build
 
-CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/sphinxbase
+CONFIGURE_ARGS+=	--without-python
+CONFIGURE_ENV+=	HAVE_DOXYGEN=no
+
+CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAKE_ENV=	MKDIR="${MKDIR}" \
 		OSVERSION=${OSVERSION}
 
+MAN1=	pocketsphinx_batch.1 \
+	pocketsphinx_continuous.1 \
+	pocketsphinx_mdef_convert.1
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|' ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -E -e 's|^([[:space:]]+programs )\\$$|\1|;' \
+		-e '/[[:space:]]+gst-plugin$$/D;' \
+		${WRKSRC}/src/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/audio/pocketsphinx/distinfo b/audio/pocketsphinx/distinfo
index 3efcbadd1ad7..bde2d972a993 100644
--- a/audio/pocketsphinx/distinfo
+++ b/audio/pocketsphinx/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pocketsphinx-0.4.1.tar.gz) = 4906abc5f1eaadb036d43de692d495387791fee72b63276f0bbca02d7ef1d0cb
-SIZE (pocketsphinx-0.4.1.tar.gz) = 8931969
+SHA256 (pocketsphinx-0.7.tar.gz) = ce0cace1ab153006e631d0a15680f2ec13f289cb2ddafa20c84fb5986fe92455
+SIZE (pocketsphinx-0.7.tar.gz) = 23701750
diff --git a/audio/pocketsphinx/pkg-plist b/audio/pocketsphinx/pkg-plist
index 463751ddce7d..a74891a2f8ea 100644
--- a/audio/pocketsphinx/pkg-plist
+++ b/audio/pocketsphinx/pkg-plist
@@ -1,94 +1,61 @@
 bin/pocketsphinx_batch
 bin/pocketsphinx_continuous
 bin/pocketsphinx_mdef_convert
-bin/pocketsphinx_ptt
-bin/pocketsphinx_swb
-bin/pocketsphinx_test
-bin/pocketsphinx_tidigits
-include/pocketsphinx/basic_types.h
-include/pocketsphinx/bin_mdef.h
-include/pocketsphinx/blkarray_list.h
-include/pocketsphinx/cache_lm.h
 include/pocketsphinx/cmdln_macro.h
-include/pocketsphinx/dict.h
-include/pocketsphinx/fbs.h
-include/pocketsphinx/fsg_history.h
-include/pocketsphinx/fsg_lextree.h
-include/pocketsphinx/fsg_psubtree.h
-include/pocketsphinx/fsg_search.h
-include/pocketsphinx/hmm.h
-include/pocketsphinx/kb.h
-include/pocketsphinx/kdtree.h
-include/pocketsphinx/lm.h
-include/pocketsphinx/lm_3g.h
-include/pocketsphinx/lmclass.h
-include/pocketsphinx/log.h
-include/pocketsphinx/magic.h
-include/pocketsphinx/mdef.h
-include/pocketsphinx/phone.h
-include/pocketsphinx/posixwin32.h
-include/pocketsphinx/s2_semi_mgau.h
-include/pocketsphinx/s2io.h
-include/pocketsphinx/s2params.h
-include/pocketsphinx/s2types.h
-include/pocketsphinx/search.h
-include/pocketsphinx/search_const.h
-include/pocketsphinx/senscr.h
-include/pocketsphinx/subvq_mgau.h
-include/pocketsphinx/tmat.h
-include/pocketsphinx/vector.h
-include/pocketsphinx/word_fsg.h
+include/pocketsphinx/fsg_set.h
+include/pocketsphinx/pocketsphinx.h
+include/pocketsphinx/pocketsphinx.pxd
+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.0
+lib/libpocketsphinx.so.2
 libdata/pkgconfig/pocketsphinx.pc
-%%DATADIR%%/model/hmm/an4/mdef
-%%DATADIR%%/model/hmm/an4/mixture_weights
-%%DATADIR%%/model/hmm/an4/subvq
-%%DATADIR%%/model/hmm/an4/transition_matrices
-%%DATADIR%%/model/hmm/tidigits/feat.params
-%%DATADIR%%/model/hmm/tidigits/mdef
-%%DATADIR%%/model/hmm/tidigits/means
-%%DATADIR%%/model/hmm/tidigits/sendump
-%%DATADIR%%/model/hmm/tidigits/transition_matrices
-%%DATADIR%%/model/hmm/tidigits/variances
-%%DATADIR%%/model/hmm/wsj1/feat.params
-%%DATADIR%%/model/hmm/wsj1/kdtrees
-%%DATADIR%%/model/hmm/wsj1/mdef
-%%DATADIR%%/model/hmm/wsj1/means
-%%DATADIR%%/model/hmm/wsj1/noisedict
-%%DATADIR%%/model/hmm/wsj1/sendump
-%%DATADIR%%/model/hmm/wsj1/transition_matrices
-%%DATADIR%%/model/hmm/wsj1/variances
-%%DATADIR%%/model/lm/swb/swb.dic
-%%DATADIR%%/model/lm/swb/swb.lm.DMP
-%%DATADIR%%/model/lm/tidigits/an4.dic
-%%DATADIR%%/model/lm/tidigits/an4.ug.lm
-%%DATADIR%%/model/lm/tidigits/an4.ug.lm.DMP
-%%DATADIR%%/model/lm/tidigits/test.digits.fsg
-%%DATADIR%%/model/lm/tidigits/tidigits.dic
-%%DATADIR%%/model/lm/tidigits/tidigits.lm
-%%DATADIR%%/model/lm/tidigits/tidigits.lm.DMP
-%%DATADIR%%/model/lm/turtle/README
-%%DATADIR%%/model/lm/turtle/goforward.16k
-%%DATADIR%%/model/lm/turtle/turtle.cor
-%%DATADIR%%/model/lm/turtle/turtle.corpus
-%%DATADIR%%/model/lm/turtle/turtle.ctl
-%%DATADIR%%/model/lm/turtle/turtle.dic
-%%DATADIR%%/model/lm/turtle/turtle.handdict
-%%DATADIR%%/model/lm/turtle/turtle.lm
-%%DATADIR%%/model/lm/turtle/turtle.lm.DMP
-%%DATADIR%%/model/lm/turtle/turtle.sent
-%%DATADIR%%/model/lm/turtle/turtle.token
-%%DATADIR%%/model/lm/turtle/turtle.vocab
-@dirrm %%DATADIR%%/model/lm/turtle
-@dirrm %%DATADIR%%/model/lm/tidigits
-@dirrm %%DATADIR%%/model/lm/swb
+%%DATADIR%%/model/hmm/en/tidigits/feat.params
+%%DATADIR%%/model/hmm/en/tidigits/mdef
+%%DATADIR%%/model/hmm/en/tidigits/means
+%%DATADIR%%/model/hmm/en/tidigits/sendump
+%%DATADIR%%/model/hmm/en/tidigits/transition_matrices
+%%DATADIR%%/model/hmm/en/tidigits/variances
+%%DATADIR%%/model/hmm/en_US/hub4wsj_sc_8k/feat.params
+%%DATADIR%%/model/hmm/en_US/hub4wsj_sc_8k/mdef
+%%DATADIR%%/model/hmm/en_US/hub4wsj_sc_8k/means
+%%DATADIR%%/model/hmm/en_US/hub4wsj_sc_8k/noisedict
+%%DATADIR%%/model/hmm/en_US/hub4wsj_sc_8k/sendump
+%%DATADIR%%/model/hmm/en_US/hub4wsj_sc_8k/transition_matrices
+%%DATADIR%%/model/hmm/en_US/hub4wsj_sc_8k/variances
+%%DATADIR%%/model/hmm/zh/tdt_sc_8k/feat.params
+%%DATADIR%%/model/hmm/zh/tdt_sc_8k/mdef
+%%DATADIR%%/model/hmm/zh/tdt_sc_8k/means
+%%DATADIR%%/model/hmm/zh/tdt_sc_8k/noisedict
+%%DATADIR%%/model/hmm/zh/tdt_sc_8k/sendump
+%%DATADIR%%/model/hmm/zh/tdt_sc_8k/transition_matrices
+%%DATADIR%%/model/hmm/zh/tdt_sc_8k/variances
+%%DATADIR%%/model/lm/en/tidigits.DMP
+%%DATADIR%%/model/lm/en/tidigits.dic
+%%DATADIR%%/model/lm/en/tidigits.fsg
+%%DATADIR%%/model/lm/en/turtle.DMP
+%%DATADIR%%/model/lm/en/turtle.dic
+%%DATADIR%%/model/lm/en_US/cmu07a.dic
+%%DATADIR%%/model/lm/en_US/hub4.5000.DMP
+%%DATADIR%%/model/lm/en_US/wsj0vp.5000.DMP
+%%DATADIR%%/model/lm/zh_CN/gigatdt.5000.DMP
+%%DATADIR%%/model/lm/zh_CN/mandarin_notone.dic
+%%DATADIR%%/model/lm/zh_TW/gigatdt.5000.DMP
+%%DATADIR%%/model/lm/zh_TW/mandarin_notone.dic
+@dirrm %%DATADIR%%/model/lm/zh_TW
+@dirrm %%DATADIR%%/model/lm/zh_CN
+@dirrm %%DATADIR%%/model/lm/en_US
+@dirrm %%DATADIR%%/model/lm/en
 @dirrm %%DATADIR%%/model/lm
-@dirrm %%DATADIR%%/model/hmm/wsj1
-@dirrm %%DATADIR%%/model/hmm/tidigits
-@dirrm %%DATADIR%%/model/hmm/an4
+@dirrm %%DATADIR%%/model/hmm/zh/tdt_sc_8k
+@dirrm %%DATADIR%%/model/hmm/zh
+@dirrm %%DATADIR%%/model/hmm/en_US/hub4wsj_sc_8k
+@dirrm %%DATADIR%%/model/hmm/en_US
+@dirrm %%DATADIR%%/model/hmm/en/tidigits
+@dirrm %%DATADIR%%/model/hmm/en
 @dirrm %%DATADIR%%/model/hmm
 @dirrm %%DATADIR%%/model
 @dirrm %%DATADIR%%