- Update to 1.4

- Remove MD5

PR:             ports/150438
Submitted by:   kwm
Approved by:    maintainer timeout (sobomax ; 104 days, kwm 83 days)

7 files changed, 57 insertions, 107 deletions

diff --git a/audio/flite/Makefile b/audio/flite/Makefile
index b699ef072349..fb86871abe78 100644
--- a/audio/flite/Makefile
+++ b/audio/flite/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	flite
-PORTVERSION=	1.3
+PORTVERSION=	1.4
 CATEGORIES=	audio
 MASTER_SITES=	http://www.speech.cs.cmu.edu/flite/packed/${PORTNAME}-${PORTVERSION}/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-release
@@ -15,18 +15,22 @@ MAINTAINER=	sobomax@FreeBSD.org
 COMMENT=	A small run-time speech synthesis engine
 
 USE_GMAKE=	yes
+USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared=yes
 USE_LDCONFIG=	yes
 
-.include <bsd.port.pre.mk>
+MAKE_JOBS_UNSAFE=	yes
 
 CFLAGS:=	${CFLAGS:N-O:N-O[0123456789]} -O0
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|-pd|-p|g' ${WRKSRC}/main/Makefile
+
 .ifndef NOPORTDOCS
 post-install:
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_MAN} ${WRKSRC}/README ${DOCSDIR}
+	@${MKDIR} ${DOCSDIR}/
+	${INSTALL_MAN} ${WRKSRC}/README ${DOCSDIR}/
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/flite/distinfo b/audio/flite/distinfo
index 323bd866efbf..007d795a0921 100644
--- a/audio/flite/distinfo
+++ b/audio/flite/distinfo
@@ -1,3 +1,3 @@
-MD5 (flite-1.3-release.tar.gz) = ae0aca1cb7b4801f4372f3a75a9e52b5
-SHA256 (flite-1.3-release.tar.gz) = 922225f7001e57a0fbace8833b0a48790a68f6c7b491f2d47c78ad537ab78a8b
-SIZE (flite-1.3-release.tar.gz) = 10663835
+MD5 (flite-1.4-release.tar.bz2) = b7c3523b3bbc6f29ce61e6650cd9a428
+SHA256 (flite-1.4-release.tar.bz2) = 45c662160aeca6560589f78daf42ab62c6111dd4d244afc28118c4e6f553cd0c
+SIZE (flite-1.4-release.tar.bz2) = 15163897
diff --git a/audio/flite/files/patch-Makefile b/audio/flite/files/patch-Makefile
index 1cb821de20d7..e69de29bb2d1 100644
--- a/audio/flite/files/patch-Makefile
+++ b/audio/flite/files/patch-Makefile
@@ -1,11 +0,0 @@
---- Makefile.orig	2009-04-06 21:13:03.211475165 +0300
-+++ Makefile	2009-04-06 21:15:03.930974602 +0300
-@@ -109,7 +109,7 @@
- 	mkdir -p $(INSTALLLIBDIR)
- 	mkdir -p $(INSTALLINCDIR)
- 	$(INSTALL) -m 644 include/*.h $(INSTALLINCDIR)
--	@ $(MAKE) -C lib --no-print-directory install
-+	$(INSTALL) -m 644 $(LIBDIR)/libflite* $(INSTALLLIBDIR)
- 	$(INSTALL) -m 755 bin/flite $(INSTALLBINDIR)
- 	$(INSTALL) -m 755 bin/flite_time $(INSTALLBINDIR)
- 
diff --git a/audio/flite/files/patch-config::common_make_rules b/audio/flite/files/patch-config::common_make_rules
deleted file mode 100644
index 71983bb949ca..000000000000
--- a/audio/flite/files/patch-config::common_make_rules
+++ /dev/null
@@ -1,15 +0,0 @@
-
-$FreeBSD$
-
---- config/common_make_rules
-+++ config/common_make_rules
-@@ -88,8 +88,7 @@
- 	@ rm -rf shared_os && mkdir shared_os
- 	@ rm -f $@ $(LIBDIR)/$@.${PROJECT_VERSION} $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION} 
- 	@ (cd shared_os && ar x ../$<)
--	@ (cd shared_os && $(CC) -shared -Wl,-soname,$@.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os)
--	@ ln -s $(LIBDIR)/$@.${PROJECT_VERSION} $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION}
-+	@ (cd shared_os && $(CC) -shared -Wl,-soname,$@.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_SHLIB_VERSION} *.os)
- 	@ ln -s $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION} $(LIBDIR)/$@
- 	@ rm -rf shared_os
- 
diff --git a/audio/flite/files/patch-configure b/audio/flite/files/patch-configure
index c7622a2a5756..1942103f7ac8 100644
--- a/audio/flite/files/patch-configure
+++ b/audio/flite/files/patch-configure
@@ -1,18 +1,18 @@
 
 $FreeBSD$
 
---- configure.orig
-+++ configure
-@@ -2772,7 +2772,7 @@
+--- configure.orig	2009-08-14 22:50:59.000000000 +0200
++++ configure	2010-09-09 15:07:27.000000000 +0200
+@@ -4079,7 +4079,7 @@
  OTHERLIBS=
  if test "$shared" = true; then
     case "$target_os" in
--	linux*)
-+	linux*|*bsd*)
+-	linux*|k*bsd*-gnu|gnu*)
++	linux*|k*bsd*-gnu|gnu*|*bsd*)
  		SHFLAGS="-fPIC"
          ;;
  	solaris*)
-@@ -3989,7 +3989,7 @@
+@@ -4893,7 +4893,7 @@
  	    AUDIODEFS=-DCST_AUDIO_ALSA
              AUDIOLIBS=-lasound
  	    ;;
@@ -21,5 +21,3 @@ $FreeBSD$
  	    AUDIODRIVER=oss
  	    AUDIODEFS=-DCST_AUDIO_FREEBSD
  	    ;;
-
-
diff --git a/audio/flite/files/patch-tools-huff_table b/audio/flite/files/patch-tools-huff_table
deleted file mode 100644
index 78a4cebdf711..000000000000
--- a/audio/flite/files/patch-tools-huff_table
+++ /dev/null
@@ -1,59 +0,0 @@
-
-$FreeBSD$
-
---- tools/huff_table.orig
-+++ tools/huff_table
-@@ -62,7 +62,7 @@ export LANG
- ## 0 is reserved, 1 is reserved too
- ALPHABET_SIZE=254
- 
--if [ $1 == "entries" ]
-+if [ $1 = "entries" ]
- then 
-    infile=$2
-    outfile=$3
-@@ -74,7 +74,7 @@ then 
-          printf("\n");}' >huff.tmp.corpus
- fi
- 
--if [ $1 == "phones" ]
-+if [ $1 = "phones" ]
- then 
-    infile=$2
-    outfile=$3
-@@ -83,7 +83,7 @@ then 
-    sed 's/\\/ /g' >huff.tmp.corpus
- fi
- 
--if [ $1 == "residual" ]
-+if [ $1 = "residual" ]
- then 
-    # This really doesn't work: just some tests to see what's worthwhile
-    infile=$2
-@@ -110,7 +110,7 @@ then 
-    sed 's/,//g;s/};//' >huff.tmp.corpus
- fi
- 
--if [ $1 == "other" ]
-+if [ $1 = "other" ]
- then
-    infile=$2
-    outfile=$3
-@@ -242,7 +242,7 @@ awk 'BEGIN {'"$maptable"'}
-         printf("\n");
-      }' > huff.tmp.corpus.uncompressed
- 
--if [ $1 == "phones" ]
-+if [ $1 = "phones" ]
- then
-    cat huff.tmp.corpus.best |
-    sed 's/+/\\/g' |
-@@ -259,7 +259,7 @@ then
-    mv huff.tmp.corpus.compressed huff.phones.compressed
- fi
- 
--if [ $1 == "entries" ]
-+if [ $1 = "entries" ]
- then
-    cat huff.tmp.corpus.best |
-    sed 's/+//g' |
diff --git a/audio/flite/pkg-plist b/audio/flite/pkg-plist
index 1413ed2b8d74..f5dfc900d394 100644
--- a/audio/flite/pkg-plist
+++ b/audio/flite/pkg-plist
@@ -1,14 +1,22 @@
 bin/flite
+bin/flite_cmu_time_awb
+bin/flite_cmu_us_awb
+bin/flite_cmu_us_kal
+bin/flite_cmu_us_kal16
+bin/flite_cmu_us_rms
+bin/flite_cmu_us_slt
 bin/flite_time
 include/flite/cst_alloc.h
 include/flite/cst_args.h
 include/flite/cst_audio.h
 include/flite/cst_cart.h
+include/flite/cst_cg.h
 include/flite/cst_clunits.h
 include/flite/cst_diphone.h
 include/flite/cst_endian.h
 include/flite/cst_error.h
 include/flite/cst_features.h
+include/flite/cst_ffeatures.h
 include/flite/cst_file.h
 include/flite/cst_hrg.h
 include/flite/cst_item.h
@@ -36,20 +44,45 @@ include/flite/cst_val_defs.h
 include/flite/cst_viterbi.h
 include/flite/cst_voice.h
 include/flite/cst_wave.h
+include/flite/cst_wchar.h
 include/flite/flite.h
 include/flite/flite_version.h
 lib/libflite.a
-lib/libflite.shared.a
+lib/libflite.so
+lib/libflite.so.1
+lib/libflite.so.1.4
 lib/libflite_cmu_time_awb.a
-lib/libflite_cmu_time_awb.shared.a
+lib/libflite_cmu_time_awb.so
+lib/libflite_cmu_time_awb.so.1
+lib/libflite_cmu_time_awb.so.1.4
+lib/libflite_cmu_us_awb.a
+lib/libflite_cmu_us_awb.so
+lib/libflite_cmu_us_awb.so.1
+lib/libflite_cmu_us_awb.so.1.4
 lib/libflite_cmu_us_kal.a
-lib/libflite_cmu_us_kal.shared.a
+lib/libflite_cmu_us_kal.so
+lib/libflite_cmu_us_kal.so.1
+lib/libflite_cmu_us_kal.so.1.4
 lib/libflite_cmu_us_kal16.a
-lib/libflite_cmu_us_kal16.shared.a
+lib/libflite_cmu_us_kal16.so
+lib/libflite_cmu_us_kal16.so.1
+lib/libflite_cmu_us_kal16.so.1.4
+lib/libflite_cmu_us_rms.a
+lib/libflite_cmu_us_rms.so
+lib/libflite_cmu_us_rms.so.1
+lib/libflite_cmu_us_rms.so.1.4
+lib/libflite_cmu_us_slt.a
+lib/libflite_cmu_us_slt.so
+lib/libflite_cmu_us_slt.so.1
+lib/libflite_cmu_us_slt.so.1.4
 lib/libflite_cmulex.a
-lib/libflite_cmulex.shared.a
+lib/libflite_cmulex.so
+lib/libflite_cmulex.so.1
+lib/libflite_cmulex.so.1.4
 lib/libflite_usenglish.a
-lib/libflite_usenglish.shared.a
+lib/libflite_usenglish.so
+lib/libflite_usenglish.so.1
+lib/libflite_usenglish.so.1.4
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm include/flite