pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

add new depency for fusionpbx, add flite-2.0.0-release



Module Name:	pkgsrc-wip
Committed By:	Kethzer Docteur <kethzer.dr%gmail.com@localhost>
Pushed By:	kethzer.dr
Date:		Wed Oct 5 14:28:09 2016 -0400
Changeset:	1d04471369bb38feaafd65fb58cf4d3afd0e217c

Modified Files:
	Makefile
	fusionpbx/Makefile
Added Files:
	flite2/.patches/patch-aa
	flite2/.patches/patch-ab
	flite2/.patches/patch-ac
	flite2/.patches/patch-ad
	flite2/.patches/patch-ae
	flite2/.patches/patch-config_common__make__rules
	flite2/DESCR
	flite2/Makefile
	flite2/PLIST
	flite2/buildlink3.mk
	flite2/distinfo
	flite2/patches/patch-config_all.lv
	flite2/patches/patch-config_common__make__rules
	flite2/patches/patch-doc_Makefile
	flite2/patches/patch-doc_flite.texi
	flite2/patches/patch-main_Makefile
	flite2/patches/patch-main_flite__time__main.c
	flite2/patches/patch-src_audio_au__sun.c
	flite2/patches/patch-tools_find__sts__main.c

Log Message:
add new depency for fusionpbx, add flite-2.0.0-release

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=1d04471369bb38feaafd65fb58cf4d3afd0e217c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 Makefile                                         |   1 +
 flite2/.patches/patch-aa                         |  35 ++++++++
 flite2/.patches/patch-ab                         |  13 +++
 flite2/.patches/patch-ac                         |  58 +++++++++++++
 flite2/.patches/patch-ad                         |  18 ++++
 flite2/.patches/patch-ae                         |  24 ++++++
 flite2/.patches/patch-config_common__make__rules |  27 ++++++
 flite2/DESCR                                     |   4 +
 flite2/Makefile                                  |  39 +++++++++
 flite2/PLIST                                     | 102 +++++++++++++++++++++++
 flite2/buildlink3.mk                             |  22 +++++
 flite2/distinfo                                  |  13 +++
 flite2/patches/patch-config_all.lv               |  14 ++++
 flite2/patches/patch-config_common__make__rules  |  13 +++
 flite2/patches/patch-doc_Makefile                |  13 +++
 flite2/patches/patch-doc_flite.texi              |  15 ++++
 flite2/patches/patch-main_Makefile               |  38 +++++++++
 flite2/patches/patch-main_flite__time__main.c    |  13 +++
 flite2/patches/patch-src_audio_au__sun.c         |  25 ++++++
 flite2/patches/patch-tools_find__sts__main.c     |  14 ++++
 fusionpbx/Makefile                               |   1 +
 21 files changed, 502 insertions(+)

diffs:
diff --git a/Makefile b/Makefile
index 54a1e1e..ec573ac 100644
--- a/Makefile
+++ b/Makefile
@@ -737,6 +737,7 @@ SUBDIR+=	flightgear
 SUBDIR+=	flightgear-data
 SUBDIR+=	flimp
 SUBDIR+=	flimsel
+SUBDIR+=	flite2
 SUBDIR+=	flpsed
 SUBDIR+=	fluxbox
 SUBDIR+=	fluxspace
diff --git a/flite2/.patches/patch-aa b/flite2/.patches/patch-aa
new file mode 100644
index 0000000..a8916a7
--- /dev/null
+++ b/flite2/.patches/patch-aa
@@ -0,0 +1,35 @@
+$NetBSD: patch-aa,v 1.3 2009/07/07 14:18:10 joerg Exp $
+
+--- Makefile.orig	2005-11-01 08:40:45.000000000 -0500
++++ Makefile
+@@ -48,6 +48,7 @@ CONFIG=configure configure.in config.sub
+ FILES = Makefile README ACKNOWLEDGEMENTS COPYING $(CONFIG)
+ DIST_CLEAN = config.cache config.log config.status \
+ 		config/config config/system.mak FileList
++DOCDIR=	$(PREFIX)/share/doc/flite
+ 
+ HOST_ONLY_DIRS = tools main
+ ALL = $(BUILD_DIRS)
+@@ -105,13 +106,15 @@ tags:
+ 
+ install:
+ 	@echo Installing 
+-	mkdir -p $(INSTALLBINDIR)
+-	mkdir -p $(INSTALLLIBDIR)
+-	mkdir -p $(INSTALLINCDIR)
+-	$(INSTALL) -m 644 include/*.h $(INSTALLINCDIR)
+-	@ $(MAKE) -C lib --no-print-directory install
+-	$(INSTALL) -m 755 bin/flite $(INSTALLBINDIR)
+-	$(INSTALL) -m 755 bin/flite_time $(INSTALLBINDIR)
++	$(BSD_INSTALL_PROGRAM_DIR) ${DESTDIR}$(INSTALLBINDIR)
++	$(BSD_INSTALL_DATA_DIR) ${DESTDIR}$(INSTALLLIBDIR)
++	$(BSD_INSTALL_DATA_DIR) ${DESTDIR}$(INSTALLINCDIR)
++	$(BSD_INSTALL_DATA_DIR) ${DESTDIR}$(DOCDIR)
++	$(BSD_INSTALL_DATA) include/*.h ${DESTDIR}$(INSTALLINCDIR)
++	$(BSD_INSTALL_DATA) $(LIBDIR)/libflite* ${DESTDIR}$(INSTALLLIBDIR)
++	$(BSD_INSTALL_PROGRAM) bin/flite ${DESTDIR}$(INSTALLBINDIR)
++	$(BSD_INSTALL_PROGRAM) bin/flite_time ${DESTDIR}$(INSTALLBINDIR)
++	$(BSD_INSTALL_DATA) README ${DESTDIR}$(DOCDIR)
+ 
+ time-stamp :
+ 	@ echo $(PROJECT_NAME) >.time-stamp
diff --git a/flite2/.patches/patch-ab b/flite2/.patches/patch-ab
new file mode 100644
index 0000000..395a56b
--- /dev/null
+++ b/flite2/.patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2006/10/08 21:35:13 rillig Exp $
+
+--- lang/cmulex/make_cmulex.orig	2005-07-11 00:28:52.000000000 +0200
++++ lang/cmulex/make_cmulex	2006-10-08 23:33:26.000000000 +0200
+@@ -36,7 +36,7 @@
+ ##                                                                       ##
+ ###########################################################################
+ 
+-if [ "x$FLITEDIR" == "x" ]
++if [ "x$FLITEDIR" = "x" ]
+ then
+    FLITEDIR=`pwd`/../..
+ fi
diff --git a/flite2/.patches/patch-ac b/flite2/.patches/patch-ac
new file mode 100644
index 0000000..4ce40f1
--- /dev/null
+++ b/flite2/.patches/patch-ac
@@ -0,0 +1,58 @@
+$NetBSD: patch-ac,v 1.1 2006/10/08 21:35:13 rillig Exp $
+
+--- tools/huff_table.orig	2005-01-20 18:01:53.000000000 +0100
++++ tools/huff_table	2006-10-08 23:34:05.000000000 +0200
+@@ -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/flite2/.patches/patch-ad b/flite2/.patches/patch-ad
new file mode 100644
index 0000000..42b6d00
--- /dev/null
+++ b/flite2/.patches/patch-ad
@@ -0,0 +1,18 @@
+$NetBSD: patch-ad,v 1.1 2007/01/21 04:39:14 rillig Exp $
+
+Tags: for-upstream
+
+The standard headers must be included before the behavior gets undefined
+by the following macro definition.
+
+--- tools/find_sts_main.c.orig	2005-01-01 15:04:43.000000000 +0100
++++ tools/find_sts_main.c	2007-01-21 04:36:17.750982588 +0100
+@@ -40,6 +40,8 @@
+ #include <stdio.h>
+ #include <math.h>
+ #include <string.h>
++#include <stdlib.h>
++#include <unistd.h>
+ 
+ /* To allow some normally const fields to manipulated during building */
+ #define const
diff --git a/flite2/.patches/patch-ae b/flite2/.patches/patch-ae
new file mode 100644
index 0000000..2863720
--- /dev/null
+++ b/flite2/.patches/patch-ae
@@ -0,0 +1,24 @@
+$NetBSD: patch-ae,v 1.1 2007/07/08 18:33:38 minskim Exp $
+
+--- src/audio/au_sun.c.orig	Mon Jan  7 18:25:52 2002
++++ src/audio/au_sun.c	Sun Apr 20 18:12:34 2003
+@@ -45,6 +45,7 @@
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ #include <errno.h>
++#include <sys/ioctl.h>
+ #include <sys/filio.h>
+ #include <sys/audioio.h>
+ #include "cst_string.h"
+@@ -76,7 +77,11 @@ cst_audiodev *audio_open_sun(int sps, in
+ 	    cst_error();
+ 	}
+     }
++#ifdef __OpenBSD__
++    AUDIO_INITINFO(&ainfo);
++#else
+     ioctl(fd,AUDIO_GETINFO,&ainfo);
++#endif
+ 
+     switch (fmt)
+     {
diff --git a/flite2/.patches/patch-config_common__make__rules b/flite2/.patches/patch-config_common__make__rules
new file mode 100644
index 0000000..1ce3458
--- /dev/null
+++ b/flite2/.patches/patch-config_common__make__rules
@@ -0,0 +1,27 @@
+$NetBSD: patch-config_common__make__rules,v 1.2 2013/11/18 02:22:30 dholland Exp $
+
+Work around PR 48385, a tmpfs bug that combined with this package's
+build system causes gmake 4.0 to loop forever making depend.
+
+The problem in tmpfs, which assigns file and directory timestamps
+lazily and therefore frequently out of order, gets tickled because the
+depend file depends on the directory containing it.
+
+It is, in any event, almost never a good idea to depend on directories
+in makefiles. The workaround is to not do that and explicitly run a
+sub-make to create the object directory.
+
+--- config/common_make_rules.orig	2004-12-19 22:20:43.000000000 +0000
++++ config/common_make_rules
+@@ -188,7 +188,10 @@ ifdef ALL_DIRS
+ 	done
+ endif
+ 
+-$(DEPEND): $(SRCS) $(OBJDIR)
++$(DEPEND): $(SRCS)
++	@ echo Doing implicit make depend.
++	@ touch $(DEPEND)
++	@ $(MAKE) $(OBJDIR)
+ 	@ rm -f $(DEPEND)
+ 	@ for i in $(SRCS) ; \
+ 	  do \
diff --git a/flite2/DESCR b/flite2/DESCR
new file mode 100644
index 0000000..91bde08
--- /dev/null
+++ b/flite2/DESCR
@@ -0,0 +1,4 @@
+Flite (festival-lite) is a small, fast run-time synthesis engine developed
+at CMU and primarily designed for small embedded machines and/or large
+servers. Flite is designed as an alternative synthesis engine to Festival
+for voices built using the FestVox suite of voice building tools.
diff --git a/flite2/Makefile b/flite2/Makefile
new file mode 100644
index 0000000..3874d91
--- /dev/null
+++ b/flite2/Makefile
@@ -0,0 +1,39 @@
+# $NetBSD: Makefile,v 1.9 2014/01/06 22:11:01 joerg Exp $
+#
+
+DISTNAME=	flite-2.0.0-release
+PKGNAME=	${DISTNAME:S/-release//}
+#PKGREVISION=	3
+CATEGORIES=	audio
+#MASTER_SITES=	http://www.speech.cs.cmu.edu/flite/packed/flite-1.3/
+MASTER_SITES=	http://festvox.org/flite/packed/flite-2.0/	
+EXTRACT_SUFX=	.tar.bz2
+
+MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=	http://www.speech.cs.cmu.edu/flite/
+COMMENT=	Small and fast run-time synthesis engine
+
+CONFLICTS+=     flite-1.3:../../audio/flite
+# Error opening output file '[...]/cmu_us_kal_diphone.o': No such file or directory
+MAKE_JOBS_SAFE=	no
+CFLAGS+=        -fPIC
+USE_PKGLOCALEDIR=	yes
+USE_TOOLS+=		gmake pkg-config
+GNU_CONFIGURE=		yes
+
+#CONFIGURE_ARGS+=	--includedir=${PREFIX}/include/flite
+#CONFIGURE_ARGS+=	--libdir=${PREFIX}/lib
+#CONFIGURE_ARGS+=	--libexecdir=${PREFIX}/libexec
+CONFIGURE_ARGS+=	--enable-shared
+CONFIGURE_ARGS+=	--enable-sockets
+CONFIGURE_ARGS+=	--with-audio=pulseaudio 
+CONFIGURE_ARGS+=	--with-lang 
+CONFIGURE_ARGS+=	--with-pic 
+CONFIGURE_ARGS+=	--with-vox 
+CONFIGURE_ARGS+=	--with-lex 
+CONFIGURE_ARGS+=	--with-langvox=default
+
+.include "../../audio/pulseaudio/buildlink3.mk"
+.include "../../audio/alsa-lib/buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/flite2/PLIST b/flite2/PLIST
new file mode 100644
index 0000000..faea5be
--- /dev/null
+++ b/flite2/PLIST
@@ -0,0 +1,102 @@
+@comment $NetBSD$
+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
+include/flite/cst_lexicon.h
+include/flite/cst_lts.h
+include/flite/cst_lts_rewrites.h
+include/flite/cst_math.h
+include/flite/cst_phoneset.h
+include/flite/cst_regex.h
+include/flite/cst_relation.h
+include/flite/cst_sigpr.h
+include/flite/cst_socket.h
+include/flite/cst_ss.h
+include/flite/cst_string.h
+include/flite/cst_sts.h
+include/flite/cst_synth.h
+include/flite/cst_tokenstream.h
+include/flite/cst_track.h
+include/flite/cst_units.h
+include/flite/cst_utterance.h
+include/flite/cst_utt_utils.h
+include/flite/cst_val_const.h
+include/flite/cst_val_defs.h
+include/flite/cst_val.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_cmu_grapheme_lang.a
+lib/libflite_cmu_grapheme_lang.so
+lib/libflite_cmu_grapheme_lang.so.1
+lib/libflite_cmu_grapheme_lang.so.${PKGVERSION}
+lib/libflite_cmu_grapheme_lex.a
+lib/libflite_cmu_grapheme_lex.so
+lib/libflite_cmu_grapheme_lex.so.1
+lib/libflite_cmu_grapheme_lex.so.${PKGVERSION}
+lib/libflite_cmu_indic_lang.a
+lib/libflite_cmu_indic_lang.so
+lib/libflite_cmu_indic_lang.so.1
+lib/libflite_cmu_indic_lang.so.${PKGVERSION}
+lib/libflite_cmu_indic_lex.a
+lib/libflite_cmu_indic_lex.so
+lib/libflite_cmu_indic_lex.so.1
+lib/libflite_cmu_indic_lex.so.${PKGVERSION}
+lib/libflite_cmulex.a
+lib/libflite_cmulex.so
+lib/libflite_cmulex.so.1
+lib/libflite_cmulex.so.${PKGVERSION}
+lib/libflite_cmu_time_awb.a
+lib/libflite_cmu_time_awb.so
+lib/libflite_cmu_time_awb.so.1
+lib/libflite_cmu_time_awb.so.${PKGVERSION}
+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.${PKGVERSION}
+lib/libflite_cmu_us_kal16.a
+lib/libflite_cmu_us_kal16.so
+lib/libflite_cmu_us_kal16.so.1
+lib/libflite_cmu_us_kal16.so.${PKGVERSION}
+lib/libflite_cmu_us_kal.a
+lib/libflite_cmu_us_kal.so
+lib/libflite_cmu_us_kal.so.1
+lib/libflite_cmu_us_kal.so.${PKGVERSION}
+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.${PKGVERSION}
+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.${PKGVERSION}
+lib/libflite.so
+lib/libflite.so.1
+lib/libflite.so.${PKGVERSION}
+lib/libflite_usenglish.a
+lib/libflite_usenglish.so
+lib/libflite_usenglish.so.1
+lib/libflite_usenglish.so.${PKGVERSION}
diff --git a/flite2/buildlink3.mk b/flite2/buildlink3.mk
new file mode 100644
index 0000000..93348a9
--- /dev/null
+++ b/flite2/buildlink3.mk
@@ -0,0 +1,22 @@
+# $NetBSD$
+# XXX
+# XXX This file was created automatically using createbuildlink-3.16.
+# XXX After this file has been verified as correct, the comment lines
+# XXX beginning with "XXX" should be removed.  Please do not commit
+# XXX unverified buildlink3.mk files.
+# XXX
+# XXX Packages that only install static libraries or headers should
+# XXX include the following line:
+# XXX
+# XXX	BUILDLINK_DEPMETHOD.flite?=	build
+
+BUILDLINK_TREE+=	flite
+
+.if !defined(FLITE_BUILDLINK3_MK)
+FLITE_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.flite+=	flite>=2.0.0
+BUILDLINK_PKGSRCDIR.flite?=	../../audio/flite
+.endif	# FLITE_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-flite
diff --git a/flite2/distinfo b/flite2/distinfo
new file mode 100644
index 0000000..a7d6101
--- /dev/null
+++ b/flite2/distinfo
@@ -0,0 +1,13 @@
+$NetBSD: distinfo,v 1.8 2013/11/18 02:22:30 dholland Exp $
+
+SHA1 (flite-2.0.0-release.tar.bz2) = aeb4d33de079004c0eb9f9e0fe5bba1e0def75f4
+RMD160 (flite-2.0.0-release.tar.bz2) = b815fe6d674cbba63780a74f4005612351aa260e
+Size (flite-2.0.0-release.tar.bz2) = 14761376 bytes
+#SHA1 (patch-config_all.lv) = 94576f13e07ec024b381e1b7b51bb86050cd3510
+SHA1 (patch-config_common__make__rules) = fbc5a6e7ba83ea181cc6d096110d59741c10cc1d
+SHA1 (patch-doc_Makefile) = a81e20d9dceaa7ac378220a984144e48cdd5f896
+SHA1 (patch-doc_flite.texi) = c262c5091372798684cd4cd6bf03a841ac126d0d
+SHA1 (patch-main_Makefile) = 6d220cac57371dd8004f246dd17d59c0f58a4ea5
+SHA1 (patch-main_flite__time__main.c) = 45d33127d45dc237135308de2254c5a173ef02da
+SHA1 (patch-src_audio_au__sun.c) = 5dab734c512038c12e084b55ac99545c8ab5e462
+SHA1 (patch-tools_find__sts__main.c) = bec9f3961e4eec995b6a58668f931d2bb0c30d3a
diff --git a/flite2/patches/patch-config_all.lv b/flite2/patches/patch-config_all.lv
new file mode 100644
index 0000000..da08071
--- /dev/null
+++ b/flite2/patches/patch-config_all.lv
@@ -0,0 +1,14 @@
+$NetBSD$
+
+--- config/all.lv.orig	2013-07-03 13:45:29.000000000 +0000
++++ config/all.lv
+@@ -1,7 +1,7 @@
+ #
+ #  all languages, lexicons and voices
+-LEXES = cmulex cmu_dari_lex cmu_pashto_lex cmu_iq_lex cmu_indic_lex
+-LANGS = usenglish cmu_dari_lang cmu_pashto_lang cmu_iq_lang cmu_indic_lang
++LEXES = cmulex cmu_indic_lex
++LANGS = usenglish cmu_indic_lang
+ VOXES = cmu_us_kal cmu_time_awb cmu_us_kal16 \
+         cmu_us_awb cmu_us_rms cmu_us_slt
+ EXTRABINS = $(BINDIR)/flite_time$(EXEEXT)
diff --git a/flite2/patches/patch-config_common__make__rules b/flite2/patches/patch-config_common__make__rules
new file mode 100644
index 0000000..c560799
--- /dev/null
+++ b/flite2/patches/patch-config_common__make__rules
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- config/common_make_rules.orig	2012-01-15 15:06:52.000000000 +0000
++++ config/common_make_rules
+@@ -123,7 +123,7 @@ $(LIBDIR)/%.so: $(LIBDIR)/%.shared.a
+ 	@ rm -rf shared_os && mkdir shared_os
+ 	@ rm -f $@ $@.${PROJECT_VERSION} $@.${PROJECT_SHLIB_VERSION} 
+ 	@ (cd shared_os && ar x ../$<)
+-	@ (cd shared_os && $(CC) -shared -Wl,-soname,`basename $@`.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os)
++	@ (cd shared_os && $(CC) -shared -Wl,-soname,`basename $@`.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os $(LDFLAGS))
+ 	@ (cd $(LIBDIR) && ln -s `basename $@.${PROJECT_VERSION}` `basename $@.${PROJECT_SHLIB_VERSION}` )
+ 	@ (cd $(LIBDIR) && ln -s `basename $@.${PROJECT_SHLIB_VERSION}` `basename $@` )
+ 	@ rm -rf shared_os
diff --git a/flite2/patches/patch-doc_Makefile b/flite2/patches/patch-doc_Makefile
new file mode 100644
index 0000000..9629f63
--- /dev/null
+++ b/flite2/patches/patch-doc_Makefile
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- doc/Makefile.orig	2009-04-08 13:18:42.000000000 +0000
++++ doc/Makefile
+@@ -50,7 +50,7 @@ doc: flite.html flite.pdf
+ flite.html: flite.texi
+ 	@ if [ ! -d html ] ; \
+           then mkdir -p html ; fi
+-	(cd html; texi2html -number -split_chapter ../flite.texi)
++	(cd html; texi2any --set-customization-variable TEXI2HTML=1 -split_chapter ../flite.texi)
+ 	@ if [ -d html/flite ] ; \
+ 	  then mv html/flite/*.html html ; \
+                rmdir html/flite; fi
diff --git a/flite2/patches/patch-doc_flite.texi b/flite2/patches/patch-doc_flite.texi
new file mode 100644
index 0000000..7c06dec
--- /dev/null
+++ b/flite2/patches/patch-doc_flite.texi
@@ -0,0 +1,15 @@
+$NetBSD$
+
+--- doc/flite.texi.orig	2014-11-18 18:56:18.000000000 +0000
++++ doc/flite.texi
+@@ -2,6 +2,10 @@
+ @c %**start of header
+ @setfilename flite.info
+ @settitle Flite: a small, fast speech synthesis engine
++@dircategory sound
++@direntry
++flite: (flite). a small, fast speech synthesis engine
++@end direntry
+ @finalout
+ @setchapternewpage odd
+ @c %**end of header
diff --git a/flite2/patches/patch-main_Makefile b/flite2/patches/patch-main_Makefile
new file mode 100644
index 0000000..e7105c7
--- /dev/null
+++ b/flite2/patches/patch-main_Makefile
@@ -0,0 +1,38 @@
+$NetBSD$
+
+--- main/Makefile.orig	2014-11-06 13:37:19.000000000 +0000
++++ main/Makefile
+@@ -53,7 +53,8 @@ ALL = shared_libs \
+ VOICES=$(VOXES)
+ VOICELIBS=$(VOICES:%=flite_%)
+ 
+-flite_LIBS = $(VOICELIBS) $(LANGS:%=flite_%) $(LEXES:%=flite_%) flite
++flite_MODS = $(VOICELIBS) $(LANGS:%=flite_%) $(LEXES:%=flite_%) 
++flite_LIBS = flite $(flite_MODS)
+ 
+ flite_LIBS_flags = -L$(LIBDIR) $(flite_LIBS:%=-l%)
+ flite_LIBS_deps = $(flite_LIBS:%=$(LIBDIR)/lib%.a)
+@@ -64,6 +65,9 @@ include $(TOP)/config/common_make_rules
+ # so make clean can remove them
+ SHAREDARLIBS= $(flite_LIBS:%=$(LIBDIR)/lib%.shared.a)
+ SHAREDLIBS = $(SHAREDARLIBS:%.shared.a=%.so)
++SHAREDMODS = $(flite_MODS:%=$(LIBDIR)/lib%.so)
++SHAREDusenMODS = $(LIBDIR)/libflite_cmu_time_awb.so $(LIBDIR)/libflite_cmu_us_awb.so $(LIBDIR)/libflite_cmu_us_kal16.so $(LIBDIR)/libflite_cmu_us_kal.so $(LIBDIR)/libflite_cmu_us_rms.so $(LIBDIR)/libflite_cmu_us_slt.so
++SHAREDcmulexMODS = $(LIBDIR)/libflite_cmu_time_awb.so $(LIBDIR)/libflite_cmu_us_awb.so $(LIBDIR)/libflite_cmu_us_kal16.so $(LIBDIR)/libflite_cmu_us_kal.so $(LIBDIR)/libflite_cmu_us_rms.so $(LIBDIR)/libflite_cmu_us_slt.so
+ VERSIONSHAREDLIBS = $(SHAREDLIBS:%=%.${PROJECT_VERSION}) \
+                     $(SHAREDLIBS:%=%.${PROJECT_SHLIB_VERSION})
+ 
+@@ -78,7 +82,12 @@ LOCAL_CLEAN = $(BINDIR)/flite$(EXEEXT) $
+               flite_voice_list.c
+ 
+ ifdef SHFLAGS
+-flite_LIBS_flags += -Wl,-rpath $(LIBDIR) 
++$(SHAREDMODS): $(LIBDIR)/libflite.so
++$(SHAREDMODS): LDFLAGS+=-L../$(LIBDIR) -lflite
++$(SHAREDusenMODS): $(LIBDIR)/libflite_usenglish.so
++$(SHAREDusenMODS): LDFLAGS+=-L../$(LIBDIR) -lflite_usenglish
++$(SHAREDcmulexMODS): $(LIBDIR)/libflite_cmulex.so
++$(SHAREDcmulexMODS): LDFLAGS+=-L../$(LIBDIR) -lflite_cmulex
+ shared_libs: $(SHAREDLIBS)
+ else
+ shared_libs: nothing
diff --git a/flite2/patches/patch-main_flite__time__main.c b/flite2/patches/patch-main_flite__time__main.c
new file mode 100644
index 0000000..3ec2a93
--- /dev/null
+++ b/flite2/patches/patch-main_flite__time__main.c
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- main/flite_time_main.c.orig	2009-04-08 13:18:42.000000000 +0000
++++ main/flite_time_main.c
+@@ -112,7 +112,7 @@ static const char *time_approx(int hour,
+ 
+     mm = minute % 5;
+ 
+-    if ((mm == 0) || (mm == 4))
++    if (mm == 0)
+ 	return "exactly";
+     else if (mm == 1)
+ 	return "just after";
diff --git a/flite2/patches/patch-src_audio_au__sun.c b/flite2/patches/patch-src_audio_au__sun.c
new file mode 100644
index 0000000..0c1c6f2
--- /dev/null
+++ b/flite2/patches/patch-src_audio_au__sun.c
@@ -0,0 +1,25 @@
+$NetBSD$
+
+--- src/audio/au_sun.c.orig	2009-04-08 13:18:42.000000000 +0000
++++ src/audio/au_sun.c
+@@ -45,6 +45,7 @@
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ #include <errno.h>
++#include <sys/ioctl.h>
+ #include <sys/filio.h>
+ #include <sys/audioio.h>
+ #include "cst_string.h"
+@@ -76,8 +77,11 @@ cst_audiodev *audio_open_sun(int sps, in
+ 	    cst_error();
+ 	}
+     }
++#ifdef __OpenBSD__
++    AUDIO_INITINFO(&ainfo);
++#else
+     ioctl(fd,AUDIO_GETINFO,&ainfo);
+-
++#endif
+     switch (fmt)
+     {
+     case CST_AUDIO_LINEAR16:
diff --git a/flite2/patches/patch-tools_find__sts__main.c b/flite2/patches/patch-tools_find__sts__main.c
new file mode 100644
index 0000000..e4661b6
--- /dev/null
+++ b/flite2/patches/patch-tools_find__sts__main.c
@@ -0,0 +1,14 @@
+$NetBSD$
+
+--- tools/find_sts_main.c.orig	2011-12-07 21:48:06.000000000 +0000
++++ tools/find_sts_main.c
+@@ -40,7 +40,8 @@
+ #include <stdio.h>
+ #include <math.h>
+ #include <string.h>
+-
++#include <stdlib.h>
++#include <unistd.h>
+ /* To allow some normally const fields to manipulated during building */
+ #define const
+ 
diff --git a/fusionpbx/Makefile b/fusionpbx/Makefile
index d39f6e2..77a8a63 100644
--- a/fusionpbx/Makefile
+++ b/fusionpbx/Makefile
@@ -51,4 +51,5 @@ do-install:
 .include "../../mk/pgsql.buildlink3.mk"
 .include "../../databases/php-pdo/buildlink3.mk"
 .include "../../lang/php/common.mk"
+.include "../../devel/libmemcached/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"


Home | Main Index | Thread Index | Old Index