Use <stdlib.h> instead of deprecated <malloc.h>.

Update to sphinx2-0.4.

3 files changed, 63 insertions, 22 deletions

diff --git a/audio/sphinx/Makefile b/audio/sphinx/Makefile
index bffbe62496f7..75e06b21544f 100644
--- a/audio/sphinx/Makefile
+++ b/audio/sphinx/Makefile
@@ -6,21 +6,33 @@
 #
 
 PORTNAME=	sphinx
-PORTVERSION=	2.0.2
+PORTVERSION=	2.0.4
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	cmusphinx
-DISTNAME=	sphinx2-0.2
+DISTNAME=	sphinx2-0.4
 
 MAINTAINER=	trevor@FreeBSD.org
 
-BROKEN=		"seems broken for newpcm"
-
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
+PKGMESSAGE=	${WRKDIR}/pkg-message
 USE_GMAKE=	yes
 
 # contains i386 sound code
 ONLY_FOR_ARCHS=	i386
 
+post-patch:
+	${FIND} ${WRKSRC} -type f -exec ${PERL} -pi -e \
+		"s:<malloc.h>:<stdlib.h>:g" {} \;
+
+post-build:
+	${ECHO_CMD} "*** WARNING ***"				 > ${PKGMESSAGE}
+	${ECHO_CMD} "The sphinx 2 port/package has not had"	>> ${PKGMESSAGE}
+	${ECHO_CMD} "proper testing or source review by the"	>> ${PKGMESSAGE}
+	${ECHO_CMD} "FreeBSD maintainer."			>> ${PKGMESSAGE}
+
+pre-install:
+	${CAT} ${PKGMESSAGE}
+
 .include <bsd.port.mk>
diff --git a/audio/sphinx/distinfo b/audio/sphinx/distinfo
index 6a242ceae317..b0d061ae446b 100644
--- a/audio/sphinx/distinfo
+++ b/audio/sphinx/distinfo
@@ -1 +1 @@
-MD5 (sphinx2-0.2.tar.gz) = ec324c6ce3381454189b85ade727f60c
+MD5 (sphinx2-0.4.tar.gz) = e6e3b382613e7b253ef9cea726840a5a
diff --git a/audio/sphinx/pkg-plist b/audio/sphinx/pkg-plist
index 947a91ebdaa8..ea753d3c0246 100644
--- a/audio/sphinx/pkg-plist
+++ b/audio/sphinx/pkg-plist
@@ -1,11 +1,9 @@
 bin/adpow
 bin/adrec
-bin/allphone-test.csh
-bin/attila-sphinx2.pl
-bin/batch.csh
 bin/cont_adseg
 bin/cont_fileseg
-bin/poe-sphinx-server-demo
+bin/lm3g2dmp
+bin/raw2cep
 bin/sphinx2-align
 bin/sphinx2-allphone
 bin/sphinx2-batch
@@ -17,14 +15,45 @@ bin/sphinx2-ptt
 bin/sphinx2-server
 bin/sphinx2-simple
 bin/sphinx2-test
-bin/stress2sphinx
+include/sphinx2/CM_macros.h
+include/sphinx2/ad.h
+include/sphinx2/cdcn.h
+include/sphinx2/cont_ad.h
+include/sphinx2/dict.h
+include/sphinx2/err.h
+include/sphinx2/fbs.h
+include/sphinx2/fe.h
+include/sphinx2/hash.h
+include/sphinx2/list.h
+include/sphinx2/lm_3g.h
+include/sphinx2/lmclass.h
+include/sphinx2/log.h
+include/sphinx2/log_add.h
+include/sphinx2/mulaw.h
+include/sphinx2/posixsock.h
+include/sphinx2/posixwin32.h
+include/sphinx2/s2params.h
+include/sphinx2/s2types.h
+include/sphinx2/sphinxp.h
+include/sphinx2/win32sock.h
 lib/libsphinx2.a
 lib/libsphinx2.so
-lib/libsphinx2.so.1
+lib/libsphinx2.so.0
+lib/libsphinx2ad.a
+lib/libsphinx2ad.so
+lib/libsphinx2ad.so.0
+lib/libsphinx2fe.a
+lib/libsphinx2fe.so
+lib/libsphinx2fe.so.0
 share/sphinx2/doc/README.bin
 share/sphinx2/doc/README.lib
+share/sphinx2/doc/README.win32
 share/sphinx2/doc/SCHMM_format
+share/sphinx2/doc/filler.dict
 share/sphinx2/doc/phoneset
+share/sphinx2/doc/phoneset-old
+share/sphinx2/doc/phoneset_s2.html
+share/sphinx2/doc/sphinx2.html
 share/sphinx2/model/hmm/6k/+BREATH+.chmm
 share/sphinx2/model/hmm/6k/+COUGH+.chmm
 share/sphinx2/model/hmm/6k/+LAUGH+.chmm
@@ -90,18 +119,18 @@ share/sphinx2/model/hmm/6k/sendump
 share/sphinx2/model/hmm/6k/xcep.256.var
 share/sphinx2/model/hmm/6k/xcep.256.vec
 share/sphinx2/model/lm/turtle/README
-share/sphinx2/model/lm/turtle/demo.cor
-share/sphinx2/model/lm/turtle/demo.corpus
-share/sphinx2/model/lm/turtle/demo.dic
-share/sphinx2/model/lm/turtle/demo.handdict
-share/sphinx2/model/lm/turtle/demo.hdict
-share/sphinx2/model/lm/turtle/demo.lm
-share/sphinx2/model/lm/turtle/demo.sent
-share/sphinx2/model/lm/turtle/demo.sent.arpabo
-share/sphinx2/model/lm/turtle/demo.token
-share/sphinx2/model/lm/turtle/demo.vocab
 share/sphinx2/model/lm/turtle/goforward.16k
-share/sphinx2/model/lm/turtle/test.ctl
+share/sphinx2/model/lm/turtle/turtle.cor
+share/sphinx2/model/lm/turtle/turtle.corpus
+share/sphinx2/model/lm/turtle/turtle.ctl
+share/sphinx2/model/lm/turtle/turtle.dic
+share/sphinx2/model/lm/turtle/turtle.handdict
+share/sphinx2/model/lm/turtle/turtle.hdict
+share/sphinx2/model/lm/turtle/turtle.lm
+share/sphinx2/model/lm/turtle/turtle.sent
+share/sphinx2/model/lm/turtle/turtle.sent.arpabo
+share/sphinx2/model/lm/turtle/turtle.token
+share/sphinx2/model/lm/turtle/turtle.vocab
 @dirrm share/sphinx2/model/lm/turtle
 @dirrm share/sphinx2/model/lm
 @dirrm share/sphinx2/model/hmm/6k