Index: head/audio/espeak/Makefile
===================================================================
--- head/audio/espeak/Makefile	(revision 378731)
+++ head/audio/espeak/Makefile	(revision 378732)
@@ -1,71 +1,64 @@
 # Created by: Nicola Vitale <nivit@email.it>
 # $FreeBSD$
 
 PORTNAME=	espeak
-PORTVERSION=	1.47.11
+PORTVERSION=	1.48.04
 PORTREVISION=	0
 CATEGORIES=	audio
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}
 DISTNAME=	${PORTNAME}-${PORTVERSION}-source
 
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Software speech synthesizer
 
 LICENSE=	GPLv3
 
-# default is runtime audio detection
-LIB_DEPENDS=	${PORTAUDIOLIB} \
-		${PULSEAUDIOLIB}
-
 OPTIONS_DEFINE=	DOCS
 OPTIONS_DEFAULT=	PORTAUDIO
 OPTIONS_RADIO=	AUDIO_SYSTEM
 OPTIONS_RADIO_AUDIO_SYSTEM=	PORTAUDIO PULSEAUDIO RUNTIME
 RUNTIME_DESC=	Sound interface selected at runtime
 
 PORTAUDIOLIB=	libportaudio.so.0:${PORTSDIR}/audio/portaudio
 PULSEAUDIOLIB=	libpulse.so:${PORTSDIR}/audio/pulseaudio
 
+PORTAUDIO_LIB_DEPENDS=	${PORTAUDIOLIB}
+PULSEAUDIO_LIB_DEPENDS=	${PULSEAUDIOLIB}
+RUNTIME_LIB_DEPENDS=	${PORTAUDIOLIB} \
+			${PULSEAUDIOLIB}
+
+PULSEAUDIO_USES=	compiler:c++0x
+RUNTIME_USES=		compiler:c++0x
+
+PULSEAUDIO_MAKE_ENV=	AUDIO="pulseaudio"
+PORTAUDIO_MAKE_ENV=	AUDIO="portaudio"
+RUNTIME_MAKE_ENV=	AUDIO="runtime"
+
 CONFLICTS=	speak-1.[0-9]
 
 MAKE_ENV+=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}" \
-		AUDIO="${AUDIO}"
+		PTHREAD_LIBS="${PTHREAD_LIBS}"
 
 CXXFLAGS+=	-I${LOCALBASE}/include
 USES=		gmake zip
 USE_LDCONFIG=	yes
 
 WRKSRC=	${WRKDIR}/${DISTNAME}
 BUILD_WRKSRC=	${WRKSRC}/src
 INSTALL_WRKSRC=	${WRKSRC}/src
 
 REINPLACE_FILES=	Makefile speech.h
 REINPLACE_ARGS=	-i.bak -e "s|%%DATADIR%%|${DATADIR}|g"
 
 BROKEN_sparc64=	Does not compile on sparc64
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MRUNTIME}
-AUDIO=	"runtime"
-.endif
-.if ${PORT_OPTIONS:MPULSEAUDIO}
-AUDIO=	"pulseaudio"
-PORTAUDIOLIB=
-.endif
-.if ${PORT_OPTIONS:MPORTAUDIO}
-AUDIO=	"portaudio"
-PULSEAUDIOLIB=
-.endif
 
 post-patch:
 	cd ${BUILD_WRKSRC} && ${REINPLACE_CMD} ${REINPLACE_FILES}
 
 post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libespeak.so*
 
 .include <bsd.port.mk>
Index: head/audio/espeak/distinfo
===================================================================
--- head/audio/espeak/distinfo	(revision 378731)
+++ head/audio/espeak/distinfo	(revision 378732)
@@ -1,2 +1,2 @@
-SHA256 (espeak-1.47.11-source.zip) = 9bd4d0569af48a2cb13fa76704dec3124d27025a3f21c87598457976472b360c
-SIZE (espeak-1.47.11-source.zip) = 2813649
+SHA256 (espeak-1.48.04-source.zip) = bf9a17673adffcc28ff7ea18764f06136547e97bbd9edf2ec612f09b207f0659
+SIZE (espeak-1.48.04-source.zip) = 3019245
Index: head/audio/espeak/pkg-plist
===================================================================
--- head/audio/espeak/pkg-plist	(revision 378731)
+++ head/audio/espeak/pkg-plist	(revision 378732)
@@ -1,283 +1,296 @@
 bin/espeak
 include/espeak/speak_lib.h
 lib/libespeak.a
 lib/libespeak.so
 lib/libespeak.so.1
-lib/libespeak.so.1.1.47
+lib/libespeak.so.1.1.48
 %%PORTDOCS%%%%DOCSDIR%%/add_language.html
 %%PORTDOCS%%%%DOCSDIR%%/analyse.html
 %%PORTDOCS%%%%DOCSDIR%%/commands.html
 %%PORTDOCS%%%%DOCSDIR%%/dictionary.html
 %%PORTDOCS%%%%DOCSDIR%%/docindex.html
 %%PORTDOCS%%%%DOCSDIR%%/editor.html
 %%PORTDOCS%%%%DOCSDIR%%/editor_if.html
 %%PORTDOCS%%%%DOCSDIR%%/images/lips.png
 %%PORTDOCS%%%%DOCSDIR%%/images/sand-light.jpg
 %%PORTDOCS%%%%DOCSDIR%%/index.html
 %%PORTDOCS%%%%DOCSDIR%%/intonation.html
 %%PORTDOCS%%%%DOCSDIR%%/languages.html
 %%PORTDOCS%%%%DOCSDIR%%/mbrola.html
 %%PORTDOCS%%%%DOCSDIR%%/phonemes.html
 %%PORTDOCS%%%%DOCSDIR%%/phontab.html
 %%PORTDOCS%%%%DOCSDIR%%/speak_lib.h
 %%PORTDOCS%%%%DOCSDIR%%/ssml.html
 %%PORTDOCS%%%%DOCSDIR%%/voices.html
 %%DATADIR%%/espeak-data/af_dict
 %%DATADIR%%/espeak-data/am_dict
 %%DATADIR%%/espeak-data/an_dict
+%%DATADIR%%/espeak-data/as_dict
 %%DATADIR%%/espeak-data/az_dict
 %%DATADIR%%/espeak-data/bg_dict
 %%DATADIR%%/espeak-data/bn_dict
 %%DATADIR%%/espeak-data/ca_dict
 %%DATADIR%%/espeak-data/cs_dict
 %%DATADIR%%/espeak-data/cy_dict
 %%DATADIR%%/espeak-data/da_dict
 %%DATADIR%%/espeak-data/de_dict
 %%DATADIR%%/espeak-data/el_dict
 %%DATADIR%%/espeak-data/en_dict
 %%DATADIR%%/espeak-data/eo_dict
 %%DATADIR%%/espeak-data/es_dict
 %%DATADIR%%/espeak-data/et_dict
+%%DATADIR%%/espeak-data/eu_dict
 %%DATADIR%%/espeak-data/fa_dict
 %%DATADIR%%/espeak-data/fi_dict
 %%DATADIR%%/espeak-data/fr_dict
 %%DATADIR%%/espeak-data/ga_dict
+%%DATADIR%%/espeak-data/gd_dict
 %%DATADIR%%/espeak-data/grc_dict
+%%DATADIR%%/espeak-data/gu_dict
 %%DATADIR%%/espeak-data/hbs_dict
 %%DATADIR%%/espeak-data/hi_dict
 %%DATADIR%%/espeak-data/hu_dict
 %%DATADIR%%/espeak-data/hy_dict
 %%DATADIR%%/espeak-data/id_dict
 %%DATADIR%%/espeak-data/intonations
 %%DATADIR%%/espeak-data/is_dict
 %%DATADIR%%/espeak-data/it_dict
 %%DATADIR%%/espeak-data/jbo_dict
 %%DATADIR%%/espeak-data/ka_dict
 %%DATADIR%%/espeak-data/kl_dict
 %%DATADIR%%/espeak-data/kn_dict
 %%DATADIR%%/espeak-data/ko_dict
 %%DATADIR%%/espeak-data/ku_dict
 %%DATADIR%%/espeak-data/la_dict
+%%DATADIR%%/espeak-data/lfn_dict
 %%DATADIR%%/espeak-data/lt_dict
 %%DATADIR%%/espeak-data/lv_dict
 %%DATADIR%%/espeak-data/mbrola_ph/af1_phtrans
 %%DATADIR%%/espeak-data/mbrola_ph/ca1_phtrans
 %%DATADIR%%/espeak-data/mbrola_ph/cr1_phtrans
 %%DATADIR%%/espeak-data/mbrola_ph/cs_phtrans
 %%DATADIR%%/espeak-data/mbrola_ph/de2_phtrans
 %%DATADIR%%/espeak-data/mbrola_ph/de4_phtrans
 %%DATADIR%%/espeak-data/mbrola_ph/de6_phtrans
 %%DATADIR%%/espeak-data/mbrola_ph/ee1_phtrans
 %%DATADIR%%/espeak-data/mbrola_ph/en1_phtrans
 %%DATADIR%%/espeak-data/mbrola_ph/es_phtrans
 %%DATADIR%%/espeak-data/mbrola_ph/fr1_phtrans
 %%DATADIR%%/espeak-data/mbrola_ph/gr2_phtrans
 %%DATADIR%%/espeak-data/mbrola_ph/grc-de6_phtrans
 %%DATADIR%%/espeak-data/mbrola_ph/hn1_phtrans
 %%DATADIR%%/espeak-data/mbrola_ph/hu1_phtrans
 %%DATADIR%%/espeak-data/mbrola_ph/ic1_phtrans
 %%DATADIR%%/espeak-data/mbrola_ph/id1_phtrans
 %%DATADIR%%/espeak-data/mbrola_ph/in1_phtrans
 %%DATADIR%%/espeak-data/mbrola_ph/ir1_phtrans
 %%DATADIR%%/espeak-data/mbrola_ph/it3_phtrans
 %%DATADIR%%/espeak-data/mbrola_ph/la1_phtrans
 %%DATADIR%%/espeak-data/mbrola_ph/lt1_phtrans
 %%DATADIR%%/espeak-data/mbrola_ph/lt2_phtrans
 %%DATADIR%%/espeak-data/mbrola_ph/mx1_phtrans
 %%DATADIR%%/espeak-data/mbrola_ph/mx2_phtrans
 %%DATADIR%%/espeak-data/mbrola_ph/nl_phtrans
 %%DATADIR%%/espeak-data/mbrola_ph/pl1_phtrans
 %%DATADIR%%/espeak-data/mbrola_ph/pt1_phtrans
 %%DATADIR%%/espeak-data/mbrola_ph/pt_phtrans
 %%DATADIR%%/espeak-data/mbrola_ph/ptbr4_phtrans
 %%DATADIR%%/espeak-data/mbrola_ph/ptbr_phtrans
 %%DATADIR%%/espeak-data/mbrola_ph/ro1_phtrans
 %%DATADIR%%/espeak-data/mbrola_ph/sv2_phtrans
 %%DATADIR%%/espeak-data/mbrola_ph/sv_phtrans
 %%DATADIR%%/espeak-data/mbrola_ph/tr1_phtrans
 %%DATADIR%%/espeak-data/mbrola_ph/us3_phtrans
 %%DATADIR%%/espeak-data/mbrola_ph/us_phtrans
 %%DATADIR%%/espeak-data/mbrola_ph/vz_phtrans
 %%DATADIR%%/espeak-data/mk_dict
 %%DATADIR%%/espeak-data/ml_dict
 %%DATADIR%%/espeak-data/ms_dict
 %%DATADIR%%/espeak-data/nci_dict
 %%DATADIR%%/espeak-data/ne_dict
 %%DATADIR%%/espeak-data/nl_dict
 %%DATADIR%%/espeak-data/no_dict
+%%DATADIR%%/espeak-data/or_dict
 %%DATADIR%%/espeak-data/pa_dict
 %%DATADIR%%/espeak-data/pap_dict
 %%DATADIR%%/espeak-data/phondata
 %%DATADIR%%/espeak-data/phondata-manifest
 %%DATADIR%%/espeak-data/phonindex
 %%DATADIR%%/espeak-data/phontab
 %%DATADIR%%/espeak-data/pl_dict
 %%DATADIR%%/espeak-data/pt_dict
 %%DATADIR%%/espeak-data/ro_dict
 %%DATADIR%%/espeak-data/ru_dict
 %%DATADIR%%/espeak-data/si_dict
 %%DATADIR%%/espeak-data/sk_dict
 %%DATADIR%%/espeak-data/sl_dict
 %%DATADIR%%/espeak-data/sq_dict
 %%DATADIR%%/espeak-data/sv_dict
 %%DATADIR%%/espeak-data/sw_dict
 %%DATADIR%%/espeak-data/ta_dict
 %%DATADIR%%/espeak-data/te_dict
 %%DATADIR%%/espeak-data/tr_dict
 %%DATADIR%%/espeak-data/ur_dict
 %%DATADIR%%/espeak-data/vi_dict
 %%DATADIR%%/espeak-data/voices/!v/croak
 %%DATADIR%%/espeak-data/voices/!v/f1
 %%DATADIR%%/espeak-data/voices/!v/f2
 %%DATADIR%%/espeak-data/voices/!v/f3
 %%DATADIR%%/espeak-data/voices/!v/f4
 %%DATADIR%%/espeak-data/voices/!v/f5
 %%DATADIR%%/espeak-data/voices/!v/klatt
 %%DATADIR%%/espeak-data/voices/!v/klatt2
 %%DATADIR%%/espeak-data/voices/!v/klatt3
 %%DATADIR%%/espeak-data/voices/!v/klatt4
 %%DATADIR%%/espeak-data/voices/!v/m1
 %%DATADIR%%/espeak-data/voices/!v/m2
 %%DATADIR%%/espeak-data/voices/!v/m3
 %%DATADIR%%/espeak-data/voices/!v/m4
 %%DATADIR%%/espeak-data/voices/!v/m5
 %%DATADIR%%/espeak-data/voices/!v/m6
 %%DATADIR%%/espeak-data/voices/!v/m7
 %%DATADIR%%/espeak-data/voices/!v/whisper
 %%DATADIR%%/espeak-data/voices/!v/whisperf
 %%DATADIR%%/espeak-data/voices/asia/fa
 %%DATADIR%%/espeak-data/voices/asia/fa-pin
 %%DATADIR%%/espeak-data/voices/asia/hi
 %%DATADIR%%/espeak-data/voices/asia/hy
 %%DATADIR%%/espeak-data/voices/asia/hy-west
 %%DATADIR%%/espeak-data/voices/asia/id
 %%DATADIR%%/espeak-data/voices/asia/ka
 %%DATADIR%%/espeak-data/voices/asia/kn
 %%DATADIR%%/espeak-data/voices/asia/ku
 %%DATADIR%%/espeak-data/voices/asia/ml
 %%DATADIR%%/espeak-data/voices/asia/ms
 %%DATADIR%%/espeak-data/voices/asia/ne
 %%DATADIR%%/espeak-data/voices/asia/pa
 %%DATADIR%%/espeak-data/voices/asia/ta
 %%DATADIR%%/espeak-data/voices/asia/tr
 %%DATADIR%%/espeak-data/voices/asia/vi
 %%DATADIR%%/espeak-data/voices/asia/vi-hue
 %%DATADIR%%/espeak-data/voices/asia/vi-sgn
 %%DATADIR%%/espeak-data/voices/asia/zh
 %%DATADIR%%/espeak-data/voices/asia/zh-yue
 %%DATADIR%%/espeak-data/voices/de
 %%DATADIR%%/espeak-data/voices/default
 %%DATADIR%%/espeak-data/voices/en
 %%DATADIR%%/espeak-data/voices/en-us
 %%DATADIR%%/espeak-data/voices/es-la
 %%DATADIR%%/espeak-data/voices/europe/an
 %%DATADIR%%/espeak-data/voices/europe/bg
 %%DATADIR%%/espeak-data/voices/europe/bs
 %%DATADIR%%/espeak-data/voices/europe/ca
 %%DATADIR%%/espeak-data/voices/europe/cs
 %%DATADIR%%/espeak-data/voices/europe/cy
 %%DATADIR%%/espeak-data/voices/europe/da
 %%DATADIR%%/espeak-data/voices/europe/el
 %%DATADIR%%/espeak-data/voices/europe/es
 %%DATADIR%%/espeak-data/voices/europe/et
 %%DATADIR%%/espeak-data/voices/europe/fi
 %%DATADIR%%/espeak-data/voices/europe/fr-be
 %%DATADIR%%/espeak-data/voices/europe/ga
 %%DATADIR%%/espeak-data/voices/europe/hr
 %%DATADIR%%/espeak-data/voices/europe/hu
 %%DATADIR%%/espeak-data/voices/europe/is
 %%DATADIR%%/espeak-data/voices/europe/it
 %%DATADIR%%/espeak-data/voices/europe/lt
 %%DATADIR%%/espeak-data/voices/europe/lv
 %%DATADIR%%/espeak-data/voices/europe/mk
 %%DATADIR%%/espeak-data/voices/europe/nl
 %%DATADIR%%/espeak-data/voices/europe/no
 %%DATADIR%%/espeak-data/voices/europe/pl
 %%DATADIR%%/espeak-data/voices/europe/pt-pt
 %%DATADIR%%/espeak-data/voices/europe/ro
 %%DATADIR%%/espeak-data/voices/europe/ru
 %%DATADIR%%/espeak-data/voices/europe/sk
 %%DATADIR%%/espeak-data/voices/europe/sq
 %%DATADIR%%/espeak-data/voices/europe/sr
 %%DATADIR%%/espeak-data/voices/europe/sv
 %%DATADIR%%/espeak-data/voices/fr
 %%DATADIR%%/espeak-data/voices/mb/mb-af1
 %%DATADIR%%/espeak-data/voices/mb/mb-af1-en
 %%DATADIR%%/espeak-data/voices/mb/mb-br1
 %%DATADIR%%/espeak-data/voices/mb/mb-br3
 %%DATADIR%%/espeak-data/voices/mb/mb-br4
 %%DATADIR%%/espeak-data/voices/mb/mb-cr1
 %%DATADIR%%/espeak-data/voices/mb/mb-cz2
 %%DATADIR%%/espeak-data/voices/mb/mb-de2
 %%DATADIR%%/espeak-data/voices/mb/mb-de3
 %%DATADIR%%/espeak-data/voices/mb/mb-de4
 %%DATADIR%%/espeak-data/voices/mb/mb-de4-en
 %%DATADIR%%/espeak-data/voices/mb/mb-de5
 %%DATADIR%%/espeak-data/voices/mb/mb-de5-en
 %%DATADIR%%/espeak-data/voices/mb/mb-de6
 %%DATADIR%%/espeak-data/voices/mb/mb-de6-grc
 %%DATADIR%%/espeak-data/voices/mb/mb-de7
 %%DATADIR%%/espeak-data/voices/mb/mb-ee1
 %%DATADIR%%/espeak-data/voices/mb/mb-en1
 %%DATADIR%%/espeak-data/voices/mb/mb-es1
 %%DATADIR%%/espeak-data/voices/mb/mb-es2
 %%DATADIR%%/espeak-data/voices/mb/mb-fr1
 %%DATADIR%%/espeak-data/voices/mb/mb-fr1-en
 %%DATADIR%%/espeak-data/voices/mb/mb-fr4
 %%DATADIR%%/espeak-data/voices/mb/mb-fr4-en
 %%DATADIR%%/espeak-data/voices/mb/mb-gr2
 %%DATADIR%%/espeak-data/voices/mb/mb-gr2-en
 %%DATADIR%%/espeak-data/voices/mb/mb-hu1
 %%DATADIR%%/espeak-data/voices/mb/mb-hu1-en
 %%DATADIR%%/espeak-data/voices/mb/mb-ic1
 %%DATADIR%%/espeak-data/voices/mb/mb-id1
 %%DATADIR%%/espeak-data/voices/mb/mb-ir1
+%%DATADIR%%/espeak-data/voices/mb/mb-ir2
 %%DATADIR%%/espeak-data/voices/mb/mb-it3
 %%DATADIR%%/espeak-data/voices/mb/mb-it4
 %%DATADIR%%/espeak-data/voices/mb/mb-la1
 %%DATADIR%%/espeak-data/voices/mb/mb-mx1
 %%DATADIR%%/espeak-data/voices/mb/mb-mx2
 %%DATADIR%%/espeak-data/voices/mb/mb-nl2
 %%DATADIR%%/espeak-data/voices/mb/mb-nl2-en
 %%DATADIR%%/espeak-data/voices/mb/mb-pl1
 %%DATADIR%%/espeak-data/voices/mb/mb-pl1-en
 %%DATADIR%%/espeak-data/voices/mb/mb-pt1
 %%DATADIR%%/espeak-data/voices/mb/mb-ro1
 %%DATADIR%%/espeak-data/voices/mb/mb-ro1-en
 %%DATADIR%%/espeak-data/voices/mb/mb-sw1
 %%DATADIR%%/espeak-data/voices/mb/mb-sw1-en
 %%DATADIR%%/espeak-data/voices/mb/mb-sw2
 %%DATADIR%%/espeak-data/voices/mb/mb-sw2-en
 %%DATADIR%%/espeak-data/voices/mb/mb-tr1
 %%DATADIR%%/espeak-data/voices/mb/mb-tr2
 %%DATADIR%%/espeak-data/voices/mb/mb-us1
 %%DATADIR%%/espeak-data/voices/mb/mb-us2
 %%DATADIR%%/espeak-data/voices/mb/mb-us3
 %%DATADIR%%/espeak-data/voices/mb/mb-vz1
 %%DATADIR%%/espeak-data/voices/other/af
 %%DATADIR%%/espeak-data/voices/other/en-n
 %%DATADIR%%/espeak-data/voices/other/en-rp
 %%DATADIR%%/espeak-data/voices/other/en-sc
 %%DATADIR%%/espeak-data/voices/other/en-wi
 %%DATADIR%%/espeak-data/voices/other/en-wm
 %%DATADIR%%/espeak-data/voices/other/eo
 %%DATADIR%%/espeak-data/voices/other/grc
 %%DATADIR%%/espeak-data/voices/other/jbo
 %%DATADIR%%/espeak-data/voices/other/la
+%%DATADIR%%/espeak-data/voices/other/lfn
 %%DATADIR%%/espeak-data/voices/other/sw
 %%DATADIR%%/espeak-data/voices/pt
 %%DATADIR%%/espeak-data/voices/test/am
+%%DATADIR%%/espeak-data/voices/test/as
 %%DATADIR%%/espeak-data/voices/test/az
 %%DATADIR%%/espeak-data/voices/test/bn
+%%DATADIR%%/espeak-data/voices/test/eu
+%%DATADIR%%/espeak-data/voices/test/gd
+%%DATADIR%%/espeak-data/voices/test/gu
 %%DATADIR%%/espeak-data/voices/test/kl
 %%DATADIR%%/espeak-data/voices/test/ko
 %%DATADIR%%/espeak-data/voices/test/nci
+%%DATADIR%%/espeak-data/voices/test/or
 %%DATADIR%%/espeak-data/voices/test/pap
 %%DATADIR%%/espeak-data/voices/test/si
 %%DATADIR%%/espeak-data/voices/test/sl
 %%DATADIR%%/espeak-data/voices/test/te
 %%DATADIR%%/espeak-data/voices/test/ur
 %%DATADIR%%/espeak-data/zh_dict
 %%DATADIR%%/espeak-data/zhy_dict
 @dir %%DATADIR%%/espeak-data/mbrola
 @dir %%DATADIR%%/espeak-data/soundicons