12 files changed, 484 insertions, 396 deletions

diff --git a/net/freeswitch-core/Makefile b/net/freeswitch-core/Makefile
index b5dbb1560b6e..8ee4c582ac33 100644
--- a/net/freeswitch-core/Makefile
+++ b/net/freeswitch-core/Makefile
@@ -1,29 +1,30 @@
-# Ports collection makefile for: freeswitch-core
-# Date created: May 11, 2010
-# Whom: Richard Neese<r.neese@gmail.com>
+# Ports collection makefile for:	freeswitch-core
+# Date created:				May 11, 2010
+# Whom:					Richard Neese <r.neese@gmail.com>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	freeswitch-core
-PORTVERSION=	201044
-PORTREVISION=	5
+PORTVERSION=	1.0.7
+PORTEPOCH=	1
 CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.secure-computing.net/pub/freeswitch/ \
-		ftp://ftp2.secure-computing.net/pub/freeswitch/ \
-		http://files.freeswitch.org/downloads/libs/:2
+MASTER_SITES=	http://dl.dropbox.com/u/152504/ \
+		http://files.freeswitch.org/downloads/libs/:2 \
+		http://download.zeromq.org/historic/:3
 DISTFILES=	${BASE_PORTNAME}-${PORTVERSION}.tar.gz \
-		celt-0.7.1.tar.gz:2 \
+		opus-0.9.0.tar.gz:2 \
+		celt-0.10.0.tar.gz:2 \
 		flite-1.3.99-latest.tar.gz:2 \
 		json-c-0.9.tar.gz:2 \
-		lame-3.97.tar.gz:2 \
+		lame-3.98.4.tar.gz:2 \
 		libmemcached-0.32.tar.gz:2 \
 		libshout-2.2.2.tar.gz:2 \
-		mpg123.tar.gz:2 \
+		mpg123-1.13.2.tar.gz:2 \
 		openldap-2.4.11.tar.gz:2 \
-		pocketsphinx-0.5.99-20091212.tar.gz:2 \
-		soundtouch-1.3.1.tar.gz:2 \
-		sphinxbase-0.4.99-20091212.tar.gz:2 \
+		pocketsphinx-0.7.tar.gz:2 \
+		soundtouch-1.5.0.tar.gz:2 \
+		sphinxbase-0.7.tar.gz:2 \
 		communicator_semi_6000_20080321.tar.gz:2
 DIST_SUBDIR=	${BASE_PORTNAME}
 EXTRACT_ONLY=	${BASE_PORTNAME}-${PORTVERSION}.tar.gz
@@ -33,112 +34,130 @@ COMMENT=	FreeSwitch SoftSwitch Port
 
 BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkg-config
 LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl \
-		gnutls:${PORTSDIR}/security/gnutls \
+		jpeg:${PORTSDIR}/graphics/jpeg \
+		tiff:${PORTSDIR}/graphics/tiff \
 		odbc:${PORTSDIR}/databases/unixODBC
 
 WRKSRC=		${WRKDIR}/${BASE_PORTNAME}-${PORTVERSION}
 
-ONLY_FOR_ARCHS=	i386 amd64
-
 USE_AUTOTOOLS=	autoconf:env automake:env libtool:env
 
 USE_PERL5_BUILD=yes
-
+USE_BISON=	both
 USE_GMAKE=	yes
 SUB_FILES=	pkg-install pkg-message
 USE_RC_SUBR=	freeswitch
 HAS_CONFIGURE=	yes
-VARBASE?=	/var
-CONFIGURE_ARGS=	--prefix=${PREFIX} \
+USE_LDCONFIG=	yes
+LDFLAGS+=	-L${LOCALBASE}/lib
+INCLUDES+=	-I${LOCALBASE}/include
+CONFIGURE_ARGS+=--prefix=${PREFIX} \
 		--bindir=${PREFIX}/bin \
 		--sysconfdir=${PREFIX}/etc/${BASE_PORTNAME}/conf \
 		--includedir=${PREFIX}/include/${BASE_PORTNAME} \
 		--libdir=${PREFIX}/lib/${BASE_PORTNAME}/lib \
 		--localstatedir="${VARBASE}" \
 		--with-modinstdir=${PREFIX}/lib/${BASE_PORTNAME}/mod \
+		--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig \
 		--with-libgnutls-prefix=${LOCALBASE} \
 		--with-ogg=${LOCALBASE} \
 		--with-ogg-libraries=${LOCALBASE}/lib \
 		--with-ogg-includes=${LOCALBASE}/include
 
-CPPFLAGS+=	${CXXFLAGS} -I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-USE_LDCONFIG=	yes
-CPPFLAGS+=	-I${PREFIX}/include
+CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}" \
+		INCLUDES="${INCLUDES}" \
+		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
+		PTHREAD_LIBS="${PTHREAD_LIBS}"
+
+FREESWITCH_USER?=	freeswitch
+FREESWITCH_GROUP?=	${FREESWITCH_USER}
+FREESWITCH_UID?=	610
+FREESWITCH_GID?=	${FREESWITCH_UID}
 
-FREESWITCH_USER=	freeswitch
-FREESWITCH_GROUP=	${FREESWITCH_USER}
+USERS=	${FREESWITCH_USER}
+GROUPS=	${FREESWITCH_GROUP}
 
 SUB_LIST=	FREESWITCH_USER=${FREESWITCH_USER} FREESWITCH_GROUP=${FREESWITCH_GROUP}
 
 BASE_PORTNAME=	${FREESWITCH_USER}
 
+VARBASE?=	/var
+
 OPTIONS=	MODSHOUT        "Enable mod_shout (streaming audio/mp3)" on \
 		MODFLITE	"Enable mod_flite (Text to Speech)" on \
 		MODUNIMRCP	"Enable mod_unimrcp tts" off \
-		MODTTSCMDLINE	"Enable mod_tts_commandline" off \
+		MODTTSCMDLINE	"Enable mod_tts_commandline" on \
 		MODPOCKETSPHINX	"Enable mod_pockectsphinx (voice control)" on \
-		MODCIDLOOKUP	"Enable mod_cidlookup" on \
-		MODDPDIRECTORY	"Enable mod_dialplan_directory" off \
-		MODDIRECTORY	"Enable mod_directory" on \
+		MODCIDLOOKUP	"Enable mod_cidlookup()" on \
+		MODDPDIRECTORY	"Enable mod_dialplan_directory()" off \
+		MODDIRECTORY	"Enable mod_directory(dial name directory)" on \
  		MODDINGALING	"Enable mod_dingaling(google talk)" on \
 		MODEASYROUTE	"Enable mod_easyroute(routing tool)" on \
 		MODERLANGEVENT  "Enable mod_erlang_event (Call Center Dist)" off \
-		MODFAX		"Enable mod_fax" on \
 		MODLCR		"Enable mod_lcr (least cost routing)" on \
-		MODSOUNDTOUCH	"Enable mod_soundtouch" on \
+		MODSOUNDTOUCH	"Enable mod_soundtouch(Audio Effects)" off \
 		MODRSS		"Enable mod_rss (rss feed reader)" on \
-		MODSNOM		"Enable mod_snom (snom control)" off \
+		MODSNOM		"Enable mod_snom (snom control)" on \
 		MODAVMD		"Enable mod_avmd (Adavced v-mail detection)" on \
-		MODVMD		"Enable mod_vmd (voice mail detection)" on \
-		MODSPY		"Enable mod_spy" on \
+		MODVMD		"Enable mod_vmd (voice mail detection)" off \
+		MODSPY		"Enable mod_spy(listen/breaking on calls)" on \
 		MODAMRWB	"Enable mod_amrwb (amrwb codec)" on \
 		MODCELT		"Enable mod_celt (celt 48k  codec)" on \
-		MODSILK		"Enable mod_silk (New Silk Codec)" on \
-		MODCODEC2	"Enable mod_codec2 (new codec)" on \
-		MODFREETDM	"Enable mod_freetdm dahdi support (Testing)" off \
-		MODSKINNY	"Enable mod_skinny Skinny Support" on \
-		MODMEMCACHE	"Enable mod_memcache" on \
-		MODMULTICAST	"Enable mod_event_multicast" on \
+		MODSILK		"Enable mod_silk (Silk Codec)" on \
+		MODCODEC2	"Enable mod_codec2 (Codec2 codec)" on \
+		MODOPUS		"Enable mod_opus codec (Opus codec)" on \
+		MODFREETDM	"Enable mod_freetdm (TDM Cards )" off \
+		MODSKINNY	"Enable mod_skinny (Skinny Support)" on \
+		MODMEMCACHE	"Enable mod_memcache ()" on \
+		MODMULTICAST	"Enable mod_event_multicast()" on \
 		MODNIBBLEBILL   "Enable mod_nibblebill (billing)" on \
-		MODPORTAUDIO    "Enable mod_portaudio" on \
+		MODPORTAUDIO    "Enable mod_portaudio(souncard portaudio)" on \
 		MODPASTREAM	"Enable mod_portaudio_stream (new)" on \
 		MODSHELLSTREAM	"Enable mod_shell_stream (new)" on \
 		MODPERL		"Enable mod_perl (perl support)" off \
-		MODPYTHON	"Enable mod_python (python)" off \
-		MODCURL		"Enable mod_curl" off \
-		MODXMLCURL	"Enable mod_xml_curl" off \
-		MODDISTRIBUTOR	"Enable mod_distributor " off \
+		MODPYTHON	"Enable mod_python (python support)" off \
+		MODCURL		"Enable mod_curl" on \
+		MODXMLCURL	"Enable mod_xml_curl" on \
+		MODDISTRIBUTOR	"Enable mod_distributor(c\# .net api)" off \
 		MODSNAPSHOT	"Enable mod_snapshot (testing)" off \
 		MODSAYDE	"Enable mod_say_de (German support)" off \
 		MODSAYES	"Enable mod_say_se (Spanish support)" off \
 		MODSAYEN	"Enable mod_say_en (English support)" on \
+		MODSAYHE	"Enable mod_say_he (Hebrew support)" off \
 		MODSAYHU	"Enable mod_say_hu (Hungarian support)" off \
 		MODSAYFR	"Enable mod_say_fr (French support)" off \
 		MODSAYIT	"Enable mod_say_it (Italian support)" off \
 		MODSAYNL	"Enable mod_say_nl (Dutch support)" off \
-		MODSAYRU	"Enable mod_say_ru (Russian support)" on \
+		MODSAYRU	"Enable mod_say_ru (Russian support)" off \
 		MODSAYTH	"Enable mod_say_th (Thi support)" off \
 		MODSAYZH	"Enable mod_say_zh (Chinese support)" off \
 		EXTENSIONS	"Include Default User Extensions" off \
-		MODCALLCENTER	"Enable mod_callcenter (new)" on \
-		ZRTP		"ENABLE ZRTP (VOIP ENCRYPTION)(NEW)(TEST)" off
+		MODCALLCENTER	"Enable mod_callcenter (callcenter que)" on \
+		MODFSK		"Enablle mod_fsck (caller_id related)" on \
+		MODCDRPGCSV	"Enable mod_cdr_pg_csv( broken on 9.x )" off \
+		MODSNMP		"Enable mod_snmp (network monitoring)" on \
+		MODLADSPA	"Enable mod_ladspa(voice changer)(new)" on \
+		MODRTMP		"Enable mod_rtmp(realtime media protocol)" on \
+		MODDPASTERISK	"Enable mod_dialplan_asterisk(* dialplan)" off \
+		MODBLACKLIST	"Enable mod_blacklist(Black list numbers)" on \
+		MODHTTPCACHE	"Enable mod_http_cache(new)" on \
+		SAMPLECONFIGS	"Enable Sample Configurations" on
 
 .include <bsd.port.options.mk>
 
-.if ${OSVERSION} < 700000
-BROKEN=	Does not compile on FreeBSD < 7.0
-.endif
-
 .if ${ARCH} == "amd64"
 CFLAGS+=	-fPIC
+. if defined(WITH_MODSOUNDTOUCH)
+IGNORE=		MODSOUNDTOUCH is broken on amd64, run make config and deselect
+. endif
 .endif
 
-.for i in MODFLITE MODPOCKETSPHINX MODCIDLOOKUP MODDPDIRECTORY MODEASYROUTE MODLCR MODSOUNDTOUCH \
-	MODRSS MODSNOM MODAVMD MODVMD MODSPY MODAMRWB MODCELT MODMULTICAST MODPORTAUDIO MODCURL MODXMLCURL \
-	MODSAYDE MODSAYEN MODSAYES MODSAYFR MODSAYHU MODSAYIT MODSAYNL MODSAYRU MODSAYTH MODSAYZH \
-	MODNIBBLEBILL MODDINGALING MODDIRECTORY MODMEMCACHE MODPASTREAM MODSHELLSTREAM \
-	MODSILK MODUNIMRCP MODTTSCMDLINE MODDISTRIBUTOR MODSNAPSHOT MODSKINNY EXTENSIONS MODCALLCENTER MODCODEC2
+.for i in MODFLITE MODPOCKETSPHINX MODCIDLOOKUP MODDPDIRECTORY MODEASYROUTE MODLCR MODSOUNDTOUCH MODRSS \
+	MODSNOM MODAVMD MODVMD MODSPY MODAMRWB MODCELT MODMULTICAST MODPORTAUDIO MODCURL MODXMLCURL \
+	MODSAYDE MODSAYEN MODSAYES MODSAYFR MODSAYHE MODSAYHU MODSAYIT MODSAYNL MODSAYRU MODSAYTH MODSAYZH \
+	MODNIBBLEBILL MODDINGALING MODDIRECTORY MODMEMCACHE MODPASTREAM MODSHELLSTREAM 	MODSILK MODUNIMRCP \
+	MODTTSCMDLINE MODDISTRIBUTOR MODSNAPSHOT MODSKINNY EXTENSIONS MODCALLCENTER MODCODEC2 MODFSK MODOPUS \
+	MODDPASTERISK MODRTMP SAMPLECONFIGS MODBLACKLIST MODHTTPCACHE
 .if !defined(WITH_${i})
 PLIST_SUB+=	WITH_${i}="@comment "
 .else
@@ -153,11 +172,12 @@ PLIST_SUB+=	 WITH_MODFREETDM="@comment "
 IGNORE=	sorry you can not use mod_freetdm on this version of freebsd ( dahdi support broken ) please update
 .endif
 PLIST_SUB+=	WITH_MODFREETDM=""
-CONFIGURE_ARGS+=	--with-libpri
+CONFIGURE_ARGS+=	--with-libpri=${LOCALBASE}
 BUILD_DEPENDS+=	libpri>=1.2.0:${PORTSDIR}/misc/libpri \
 		${LOCALBASE}/include/dahdi/wctdm_user.h:${PORTSDIR}/misc/dahdi
 LIB_DEPENDS+=	pri:${PORTSDIR}/misc/libpri
-RUN_DEPENDS+=	${LOCALBASE}/include/dahdi/wctdm_user.h:${PORTSDIR}/misc/dahdi
+RUN_DEPENDS+=	${LOCALBASE}/include/dahdi/wctdm_user.h:${PORTSDIR}/misc/dahdi \
+		${LOCALBASE}/lib/dahdi/dahdi.ko:${PORTSDIR}/misc/dahdi-kmod
 .endif
 
 .if !defined(WITH_MODSHOUT)
@@ -175,13 +195,6 @@ LIB_DEPENDS+=	gdbm:${PORTSDIR}/databases/gdbm \
 		db:${PORTSDIR}/databases/db42
 .endif
 
-.if !defined(WITH_MODFAX)
-PLIST_SUB+=	WITH_MODFAX="@comment "
-.else
-PLIST_SUB+=	WITH_MODFAX=""
-LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg
-.endif
-
 .if !defined(WITH_MODERLANGEVENT)
 PLIST_SUB+=	WITH_MODERLANGEVENT="@comment "
 .else
@@ -189,15 +202,6 @@ PLIST_SUB+=	WITH_MODERLANGEVENT=""
 BUILD_DEPENDS+=	${LOCALBASE}/lib/erlang/usr/include/erl_driver.h:${PORTSDIR}/lang/erlang-lite
 .endif
 
-.if !defined(WITH_ZRTP)
-PLIST_SUB+=	WITH_ZRTP="@comment "
-.else
-PLIST_SUB+=	WITH_ZRTP=""
-CONFIGURE_ARGS+=	--enable-zrtp
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libzrtp.a:${PORTSDIR}/devel/libzrtp
-RUN_DEPENDS+=	${LOCALBASE}/lib/libzrtp.a:${PORTSDIR}/devel/libzrtp
-.endif
-
 .if !defined(WITH_MODPYTHON)
 PLIST_SUB+=	WITH_MODPYTHON="@comment "
 .else
@@ -205,12 +209,53 @@ PLIST_SUB+=	WITH_MODPYTHON=""
 USE_PYTHON=	yes
 .endif
 
+.if !defined(WITH_MODCDRPGCSV)
+PLIST_SUB+=	WITH_MODCDRPGCSV="@comment "
+.else
+PLIST_SUB+=	WITH_MODCDRPGCSV=""
+USE_PGSQL=	yes
+#WITH_PGSQL_VER=	90
+.endif
+
+.if !defined(WITH_MODSNMP)
+PLIST_SUB+=	WITH_MODSNMP="@comment "
+.else
+PLIST_SUB+=	WITH_MODSNMP=""
+BUILD_DEPENDS+=	${LOCALBASE}/include/net-snmp/definitions.h:${PORTSDIR}/net-mgmt/net-snmp
+RUN_DEPENDS+=	${LOCALBASE}/include/net-snmp/definitions.h:${PORTSDIR}/net-mgmt/net-snmp
+.endif
+
+.if !defined(WITH_MODLADSPA)
+PLIST_SUB+=	WITH_MODLADSPA="@comment "
+.else
+PLIST_SUB+=	WITH_MODLADSPA=""
+BUILD_DEPENDS+=	${LOCALBASE}/lib/ladspa/amp.so:${PORTSDIR}/audio/ladspa \
+		${LOCALBASE}/lib/ladspa/tap_autopan.so:${PORTSDIR}/audio/tap-plugins \
+		${LOCALBASE}/lib/ladspa/cmt.so:${PORTSDIR}/audio/cmt \
+		${LOCALBASE}/lib/ladspa/alias_1407.so:${PORTSDIR}/audio/swhplugins \
+		${LOCALBASE}/lib/ladspa/autotalent.so:${PORTSDIR}/audio/autotalent
+RUN_DEPENDS+=	${LOCALBASE}/lib/ladspa/amp.so:${PORTSDIR}/audio/ladspa \
+		${LOCALBASE}/lib/ladspa/tap_autopan.so:${PORTSDIR}/audio/tap-plugins \
+		${LOCALBASE}/lib/ladspa/cmt.so:${PORTSDIR}/audio/cmt \
+		${LOCALBASE}/lib/ladspa/alias_1407.so:${PORTSDIR}/audio/swhplugins \
+		${LOCALBASE}/lib/ladspa/autotalent.so:${PORTSDIR}/audio/autotalent
+.endif
+
+# FreeBSD 7 doesn't have lrintl, but lrint will do the trick just fine
+# It's quite cryptic as to why the reinplace doesn't work; there's no mention
+# of lrintl anywhere in any source....
+.if ${OSVERSION} < 800012
+#	${REINPLACE_CMD} -e 's/lrintl/lrint/' \
+#	    ${WRKSRC}/libs/spandsp/src/spandsp/saturated.h
+BROKEN=	Requires lrintl, which is not present on FreeBSD 7
+.endif
+
 pre-configure:
-	@${REINPLACE_CMD} -e 's|pkgconfigdir = $$(libdir)/pkgconfig|pkgconfigdir = ${PREFIX}/libdata/pkgconfig|g' ${WRKSRC}/libs/*/Makefile.am
-	@${REINPLACE_CMD} -e 's|pkgconfigdir   = $$(libdir)/pkgconfig|pkgconfigdir = ${PREFIX}/libdata/pkgconfig|g' ${WRKSRC}/libs/*/Makefile.am
-	@${REINPLACE_CMD} -e 's|pkgconfigdir = $$(libdir)/pkgconfig|pkgconfigdir = ${PREFIX}/libdata/pkgconfig|g' ${WRKSRC}/Makefile.am
 	@${REINPLACE_CMD} -e 's|base=http://files.freeswitch.org/downloads/libs/|base=file://${DISTDIR}/${DIST_SUBDIR}/|g' ${WRKSRC}/build/getlib.sh.in
-	cd ${WRKSRC} && ./rebootstrap.sh
+.if !defined(WITH_SAMPLECONFIGS)
+	@${REINPLACE_CMD} -e 's|$$(MAKE) samples-conf|##$$(MAKE) samples-conf|g' ${WRKSRC}/Makefile.am
+.endif
+	cd ${WRKSRC} && ./bootstrap.sh
 
 post-configure:
 .for i in mod_unimrcp mod_flite mod_pocketsphinx
@@ -221,14 +266,14 @@ post-configure:
 .if defined(WITH_MODTTSCMDLINE)
 	@${REINPLACE_CMD} -e 's|#asr_tts/mod_tts_commandline|asr_tts/mod_tts_commandline|g' ${WRKSRC}/modules.conf
 .endif
-.for i in mod_cidlookup mod_easyroute mod_fax mod_lcr mod_soundtouch mod_rss mod_snom \
+.for i in mod_cidlookup mod_easyroute mod_lcr mod_soundtouch mod_rss mod_snom \
 	mod_vmd mod_avmd mod_spy mod_curl mod_nibblebill mod_memcache mod_directory mod_distributor \
-	mod_snapshot mod_callcenter
+	mod_snapshot mod_callcenter mod_fsk mod_ladspa mod_blacklist mod_http_cache
 .if defined(WITH_${i:C/_//g:U})
 	@${REINPLACE_CMD} -e 's|#\(applications/${i}\)|\1|g' ${WRKSRC}/modules.conf
 .endif
 .endfor
-.for i in mod_amrwb mod_celt mod_silk mod_codec2
+.for i in mod_amrwb mod_celt mod_silk mod_codec2 mod_opus
 .if defined(WITH_${i:C/_//g:U})
 	@${REINPLACE_CMD} -e 's|#\(codecs/${i}\)|\1|g' ${WRKSRC}/modules.conf
 .endif
@@ -241,7 +286,7 @@ post-configure:
 .if defined(WITH_MODPASTREAM)
 	@${REINPLACE_CMD} -e 's|#formats/mod_portaudio_stream|formats/mod_portaudio_stream|g' ${WRKSRC}/modules.conf
 .endif
-.for i in mod_say_de mod_say_es mod_say_en mod_say_fr mod_say_hu mod_say_it mod_say_nl mod_say_ru mod_say_th mod_say_zh
+.for i in mod_say_de mod_say_es mod_say_en mod_say_fr mod_say_he mod_say_hu mod_say_it mod_say_nl mod_say_ru mod_say_th mod_say_zh
 .if defined(WITH_${i:C/_//g:U})
 	@${REINPLACE_CMD} -e 's|#\(say/${i}\)|\1|g' ${WRKSRC}/modules.conf
 .endif
@@ -251,7 +296,7 @@ post-configure:
 	@${REINPLACE_CMD} -e 's|#\(languages/${i}\)|\1|g' ${WRKSRC}/modules.conf
 .endif
 .endfor
-.for i in mod_skinny mod_portaudio mod_dingaling
+.for i in mod_skinny mod_portaudio mod_dingaling mod_rtmp
 .if defined(WITH_${i:C/_//g:U})
 	@${REINPLACE_CMD} -e 's|#\(endpoints/${i}\)|\1|g' ${WRKSRC}/modules.conf
 .endif
@@ -268,37 +313,76 @@ post-configure:
 .if defined(WITH_MODERLANGEVENT)
 	@${REINPLACE_CMD} -e 's|#event_handlers/mod_erlang_event|event_handlers/mod_erlang_event|g' ${WRKSRC}/modules.conf
 .endif
+.if defined(WITH_MODCDRPGCSV)
+	@${REINPLACE_CMD} -e 's|#event_handlers/mod_cdr_pg_csv|event_handlers/mod_cdr_pg_csv|g' ${WRKSRC}/modules.conf
+.endif
+.if defined(WITH_MODSNMP)
+	@${REINPLACE_CMD} -e 's|#event_handlers/mod_snmp|event_handlers/mod_snmp|g' ${WRKSRC}/modules.conf
+.endif
 .if defined(WITH_MODXMLCURL)
 	@${REINPLACE_CMD} -e 's|#xml_int/mod_xml_curl|xml_int/mod_xml_curl|g' ${WRKSRC}/modules.conf
 .endif
+.if !defined(WITH_MODDPASTERISK)
+	@${REINPLACE_CMD} -e 's|dialplans/mod_dialplan_asterisk|#dialplans/mod_dialplan_asterisk|g' ${WRKSRC}/modules.conf
+.endif
 
 pre-install:
-	@${SH} ${PKGINSTALL} ${BASE_PORTNAME} PRE-INSTALL
-
+	@${CHMOD} 664 ${WRKSRC}/libs/freetdm/conf/*
 .if !defined(WITH_EXTENSIONS)
 	@${FIND} ${WRKSRC}/conf/directory/default -type f -name '*.xml' -delete
 .endif
 
 post-install:
+	@${SETENV} PKG_PREFIX=${PREFIX} \
+	    ${SH} ${PKGINSTALL} ${BASE_PORTNAME} POST-INSTALL
+.if !defined(WITH_SAMPLECONFIGS)
+	@${MKDIR} ${PREFIX}/etc/${BASE_PORTNAME}/conf
+	@${MKDIR} ${PREFIX}/etc/${BASE_PORTNAME}/conf/skinny_profiles
+	@${MKDIR} ${PREFIX}/etc/${BASE_PORTNAME}/conf/sip_profiles/internal
+	@${MKDIR} ${PREFIX}/etc/${BASE_PORTNAME}/conf/sip_profiles/external
+	@${MKDIR} ${PREFIX}/etc/${BASE_PORTNAME}/conf/sip_profiles
+	@${MKDIR} ${PREFIX}/etc/${BASE_PORTNAME}/conf/mrcp_profiles
+	@${MKDIR} ${PREFIX}/etc/${BASE_PORTNAME}/conf/lang/ru/vm
+	@${MKDIR} ${PREFIX}/etc/${BASE_PORTNAME}/conf/lang/ru/dir
+	@${MKDIR} ${PREFIX}/etc/${BASE_PORTNAME}/conf/lang/ru/demo
+	@${MKDIR} ${PREFIX}/etc/${BASE_PORTNAME}/conf/lang/ru
+	@${MKDIR} ${PREFIX}/etc/${BASE_PORTNAME}/conf/lang/he/vm
+	@${MKDIR} ${PREFIX}/etc/${BASE_PORTNAME}/conf/lang/he/dir
+	@${MKDIR} ${PREFIX}/etc/${BASE_PORTNAME}/conf/lang/he/demo
+	@${MKDIR} ${PREFIX}/etc/${BASE_PORTNAME}/conf/lang/he
+	@${MKDIR} ${PREFIX}/etc/${BASE_PORTNAME}/conf/lang/fr/vm
+	@${MKDIR} ${PREFIX}/etc/${BASE_PORTNAME}/conf/lang/fr/dir
+	@${MKDIR} ${PREFIX}/etc/${BASE_PORTNAME}/conf/lang/fr/demo
+	@${MKDIR} ${PREFIX}/etc/${BASE_PORTNAME}/conf/lang/fr
+	@${MKDIR} ${PREFIX}/etc/${BASE_PORTNAME}/conf/lang/en/vm
+	@${MKDIR} ${PREFIX}/etc/${BASE_PORTNAME}/conf/lang/en/ivr
+	@${MKDIR} ${PREFIX}/etc/${BASE_PORTNAME}/conf/lang/en/dir
+	@${MKDIR} ${PREFIX}/etc/${BASE_PORTNAME}/conf/lang/en/demo
+	@${MKDIR} ${PREFIX}/etc/${BASE_PORTNAME}/conf/lang/en
+	@${MKDIR} ${PREFIX}/etc/${BASE_PORTNAME}/conf/lang/de/vm
+	@${MKDIR} ${PREFIX}/etc/${BASE_PORTNAME}/conf/lang/de/demo
+	@${MKDIR} ${PREFIX}/etc/${BASE_PORTNAME}/conf/lang/de
+	@${MKDIR} ${PREFIX}/etc/${BASE_PORTNAME}/conf/lang
+	@${MKDIR} ${PREFIX}/etc/${BASE_PORTNAME}/conf/jingle_profiles
+	@${MKDIR} ${PREFIX}/etc/${BASE_PORTNAME}/conf/ivr_menus
+	@${MKDIR} ${PREFIX}/etc/${BASE_PORTNAME}/conf/directory/default
+	@${MKDIR} ${PREFIX}/etc/${BASE_PORTNAME}/conf/directory
+	@${MKDIR} ${PREFIX}/etc/${BASE_PORTNAME}/conf/dialplan/skinny-patterns
+	@${MKDIR} ${PREFIX}/etc/${BASE_PORTNAME}/conf/dialplan/public
+	@${MKDIR} ${PREFIX}/etc/${BASE_PORTNAME}/conf/dialplan/default
+	@${MKDIR} ${PREFIX}/etc/${BASE_PORTNAME}/conf/dialplan
+	@${MKDIR} ${PREFIX}/etc/${BASE_PORTNAME}/conf/autoload_configs
+.endif
 .if !defined(WITH_EXTENSIONS)
 	@${MKDIR} ${PREFIX}/etc/${BASE_PORTNAME}/conf/directory/default
 .endif
+	@${FIND} ${PREFIX}/etc/${BASE_PORTNAME}/. -type d | ${XARGS} ${CHMOD} 774
 	@${MKDIR} ${PREFIX}/share/${BASE_PORTNAME}/sounds
-	@${CHOWN} -R ${FREESWITCH_USER}:${FREESWITCH_GROUP} ${PREFIX}/etc/${BASE_PORTNAME}
-	@${CHOWN} -R ${FREESWITCH_USER}:${FREESWITCH_GROUP} ${PREFIX}/share/${BASE_PORTNAME}
-	@${CHOWN} -R ${FREESWITCH_USER}:${FREESWITCH_GROUP} ${VARBASE}/db/${BASE_PORTNAME}
-	@${CHOWN} -R ${FREESWITCH_USER}:${FREESWITCH_GROUP} ${VARBASE}/log/${BASE_PORTNAME}
-	@${CHOWN} -R ${FREESWITCH_USER}:${FREESWITCH_GROUP} ${VARBASE}/${BASE_PORTNAME}
-	@${CHOWN} -R ${FREESWITCH_USER}:${FREESWITCH_GROUP} ${VARBASE}/run/${BASE_PORTNAME}
-	@${CHOWN} -R ${FREESWITCH_USER}:${FREESWITCH_GROUP} ${VARBASE}/spool/${BASE_PORTNAME}
+	@${CHMOD} -R 774 ${PREFIX}/share/${BASE_PORTNAME}
+.if defined(WITH_SAMPLECONFIGS)
 	@for i in $$(${FIND} ${PREFIX}/etc/${BASE_PORTNAME}/conf/ -type f -name '*.sample'); do if [ ! -f $${i%.sample} ]; then ${CP} -p $$i $${i%.sample}; fi; done
-	@${CHMOD} -R 775 ${PREFIX}/etc/${BASE_PORTNAME}/conf
-	@${CHMOD} -R 775 ${VARBASE}/log/${BASE_PORTNAME}
-	@${CHMOD} -R 775 ${VARBASE}/${BASE_PORTNAME}
-	@${ECHO_MSG} "This port chown -R various directories ${FREESWITCH_USER}:${FREESWITCH_GROUP} "
-	@${ECHO_MSG} "this is for port security . in the event something should stop working."
-	@${ECHO_MSG} "Please take the time to check chownership of the dir's"
-	@${ECHO_MSG} "${VARBASE}/db/${BASE_PORTNAME} ${VARBASE}/log/${BASE_PORTNAME} ${VARBASE}/${BASE_PORTNAME} ${PREFIX}/etc/${BASE_PORTNAME}"
+.endif
+	@for i in $$(${FIND} ${PREFIX}/www/${BASE_PORTNAME}/htdocs/ -type f -name '*.sample'); do if [ ! -f $${i%.sample} ]; then ${CP} -p $$i $${i%.sample}; fi; done
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/net/freeswitch-core/distinfo b/net/freeswitch-core/distinfo
index b472e79c1377..713b62cbce55 100644
--- a/net/freeswitch-core/distinfo
+++ b/net/freeswitch-core/distinfo
@@ -1,26 +1,30 @@
-SHA256 (freeswitch/freeswitch-201044.tar.gz) = cea3583bcc1febc8b6ad85ca38c991d2d7319945784dd915834c1479b33bbd4b
-SIZE (freeswitch/freeswitch-201044.tar.gz) = 42320468
-SHA256 (freeswitch/celt-0.7.1.tar.gz) = 93f0e2dfb59021b19e69dc0dee855eb89f19397db1dea0d0d6f9329cff933066
-SIZE (freeswitch/celt-0.7.1.tar.gz) = 425092
+SHA256 (freeswitch/freeswitch-1.0.7.tar.gz) = 3ad0abfa104b9ba3ca630791a3d9a394cc2a20c000f099aa5bae245fe290dbb4
+SIZE (freeswitch/freeswitch-1.0.7.tar.gz) = 36116855
+SHA256 (freeswitch/opus-0.9.0.tar.gz) = b2f75c4ac5ab837845eb028413fae2a28754bfb0a6d76416e2af1441ef447649
+SIZE (freeswitch/opus-0.9.0.tar.gz) = 1255227
+SHA256 (freeswitch/celt-0.10.0.tar.gz) = 147c5bc8c6a37b2ad2c8b8af17c91cb35494421ec9b68110018a4bcec72e45dc
+SIZE (freeswitch/celt-0.10.0.tar.gz) = 435953
 SHA256 (freeswitch/flite-1.3.99-latest.tar.gz) = ac5832c7b654c5adf9ec3df0e8a7c817d2105233e11ce5aa7e97a8c6c8e14e13
 SIZE (freeswitch/flite-1.3.99-latest.tar.gz) = 17440698
 SHA256 (freeswitch/json-c-0.9.tar.gz) = 816fb2d4baab09e2f51a7c1be75bc9e03ed09d4cf3c2cd03c183f433bb9b565f
 SIZE (freeswitch/json-c-0.9.tar.gz) = 328935
-SHA256 (freeswitch/lame-3.97.tar.gz) = 0a2334a6d11085298a9a3c46d5d310cca012f2e61d6efae90840a76a364dbe17
-SIZE (freeswitch/lame-3.97.tar.gz) = 1328058
+SHA256 (freeswitch/lame-3.98.4.tar.gz) = ac3144c76617223a9be4aaa3e28a66b51bcab28141050c3af04cb06836f772c8
+SIZE (freeswitch/lame-3.98.4.tar.gz) = 1336025
 SHA256 (freeswitch/libmemcached-0.32.tar.gz) = cf1be20af93163d6ab25b511f79c515778ebced54806875561ebef46011f2a9b
 SIZE (freeswitch/libmemcached-0.32.tar.gz) = 512586
 SHA256 (freeswitch/libshout-2.2.2.tar.gz) = 38701125cb0e0349f4394dd3254d6037eeb8af0747c0942ff433ffbcd48d2367
 SIZE (freeswitch/libshout-2.2.2.tar.gz) = 478582
-SHA256 (freeswitch/mpg123.tar.gz) = 408fed3b37d83ab2396bcf6253d62e75e573ba96b7c4497f0faddd557763b97b
-SIZE (freeswitch/mpg123.tar.gz) = 1253597
+SHA256 (freeswitch/mpg123-1.13.2.tar.gz) = b3a855acc96e0061a0c2b1162e8aff80b6b1a03849e3756786db2fcacfc9a9bd
+SIZE (freeswitch/mpg123-1.13.2.tar.gz) = 924948
 SHA256 (freeswitch/openldap-2.4.11.tar.gz) = 76e57147a2373015f306f2e72128330e51d5c0f1056b4713283234dfd16c1c9c
 SIZE (freeswitch/openldap-2.4.11.tar.gz) = 4941654
-SHA256 (freeswitch/pocketsphinx-0.5.99-20091212.tar.gz) = ad2318103ae16bd1740b0e8658bc6d5fa8964e8eb79de128f7c106d3401f2f48
-SIZE (freeswitch/pocketsphinx-0.5.99-20091212.tar.gz) = 11703230
-SHA256 (freeswitch/soundtouch-1.3.1.tar.gz) = ff5ff8dfe4a078ced7478a71f0d4715ee27743424f5c06db19829e2fee06b2b5
-SIZE (freeswitch/soundtouch-1.3.1.tar.gz) = 407740
-SHA256 (freeswitch/sphinxbase-0.4.99-20091212.tar.gz) = a1e359aa92934414bc4fe1dcbb93edad11bf7b5f625c94bdebe85d6dfe3618f0
-SIZE (freeswitch/sphinxbase-0.4.99-20091212.tar.gz) = 2150613
+SHA256 (freeswitch/pocketsphinx-0.7.tar.gz) = ce0cace1ab153006e631d0a15680f2ec13f289cb2ddafa20c84fb5986fe92455
+SIZE (freeswitch/pocketsphinx-0.7.tar.gz) = 23701750
+SHA256 (freeswitch/soundtouch-1.5.0.tar.gz) = a1465b327f513ab3f75fbf5eba039a21568eebcf0dc18ce2809f874b5a79b1af
+SIZE (freeswitch/soundtouch-1.5.0.tar.gz) = 283273
+SHA256 (freeswitch/sphinxbase-0.7.tar.gz) = 389cb99a545f7d615a2b3bc3f7362a490ca45fc4dc440140ae1d2a41f87773ec
+SIZE (freeswitch/sphinxbase-0.7.tar.gz) = 3291922
 SHA256 (freeswitch/communicator_semi_6000_20080321.tar.gz) = dbb5e9fb85000a7cb97d6958a3ef8d77532dc55fc730ac6979705e8645cb0c18
 SIZE (freeswitch/communicator_semi_6000_20080321.tar.gz) = 5595694
+SHA256 (freeswitch/zeromq-2.1.9.zip) = 43e4044656968cee3313e71964b3e72c43bb81ea2f48071dc28cbf32ba5fd77f
+SIZE (freeswitch/zeromq-2.1.9.zip) = 2156026
diff --git a/net/freeswitch-core/files/freeswitch.in b/net/freeswitch-core/files/freeswitch.in
index 7d4ae7dd97cb..a3ab07dfd407 100644
--- a/net/freeswitch-core/files/freeswitch.in
+++ b/net/freeswitch-core/files/freeswitch.in
@@ -19,17 +19,18 @@ rcvar=`set_rcvar`
 
 load_rc_config $name
 
-freeswitch_enable=${freeswitch_enable:-"NO"}
-freeswitch_user=${freeswitch_user:-"freeswitch"}
-freeswitch_group=${freeswitch_group:-"freeswitch"}
-freeswitch_flags=${freeswitch_flags:-"-nc -waste"}
+: ${freeswitch_enable="NO"}
+: ${freeswitch_user="freeswitch"}
+: ${freeswitch_group="freeswitch"}
+: ${freeswitch_flags="-nc -waste"}
 
 command=%%PREFIX%%/bin/freeswitch
 command_args="-u ${freeswitch_user} -g ${freeswitch_group}"
 
 pidfile=${freeswitch_pidfile:-"/var/run/freeswitch/freeswitch.pid"}
 
-stop_precmd="freeswitch_stop"
+start_precmd="${name}_prestart"
+stop_cmd="${name}_stop"
 
 freeswitch_stop () {
         echo "Stopping FreeSWITCH."
@@ -37,4 +38,8 @@ freeswitch_stop () {
 	wait_for_pids `cat $pidfile`
 }
 
+freeswitch_prestart () {
+	install -d -o ${freeswitch_user} -m755 /var/run/${name}
+}
+
 run_rc_command "$1"
diff --git a/net/freeswitch-core/files/patch-Makefile.am b/net/freeswitch-core/files/patch-Makefile.am
index 45caf1210cad..b0b9b6dce76b 100644
--- a/net/freeswitch-core/files/patch-Makefile.am
+++ b/net/freeswitch-core/files/patch-Makefile.am
@@ -1,23 +1,40 @@
---- Makefile.am	2010-06-22 17:19:37.000000000 -0400
-+++ Makefile.am	2010-07-02 11:45:29.000000000 -0400
-@@ -426,7 +426,7 @@
+--- Makefile.am.orig
++++ Makefile.am
+@@ -453,8 +453,9 @@ vm-sync:
+ 	test -d $(DESTDIR)$(sysconfdir)/lang/en || $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/lang/en
+ 	test -d $(DESTDIR)$(sysconfdir)/lang/en/demo || $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/lang/en/demo
+ 	test -d $(DESTDIR)$(sysconfdir)/lang/en/vm || $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/lang/en/vm
+-	$(INSTALL) -m 644 $(switch_srcdir)/conf/lang/en/vm/* $(DESTDIR)$(sysconfdir)/lang/en/vm
+-	$(INSTALL) -m 644 $(switch_srcdir)/conf/lang/en/demo/* $(DESTDIR)$(sysconfdir)/lang/en/demo
++	$(INSTALL) -m 664 $(switch_srcdir)/conf/lang/en/vm/* $(DESTDIR)$(sysconfdir)/lang/en/vm/$$filename.sample; \
++	$(INSTALL) -m 664 $(switch_srcdir)/conf/lang/en/demo/* $(DESTDIR)$(sysconfdir)/lang/en/demo/$$filename.sample; \
++	done
+ 
+ samples-conf:
+ 	test -d $(DESTDIR)$(sysconfdir) || $(mkinstalldirs) $(DESTDIR)$(sysconfdir)
+@@ -462,9 +463,7 @@ samples-conf:
+ 		dir=`echo $$conffile | sed -e 's|^\.||' | sed -e 's|/[^/]*$$||'`; \
+ 		filename=`echo $$conffile | sed -e 's|^\.||' | sed -e 's|^.*/||'`; \
  		test -d $(DESTDIR)$(sysconfdir)$$dir || $(mkinstalldirs) $(DESTDIR)$(sysconfdir)$$dir ; \
- 		test -f $(DESTDIR)$(sysconfdir)$$dir/$$filename || \
- 		test -f $(DESTDIR)$(sysconfdir)$$dir/$$filename.noload || \
+-		test -f $(DESTDIR)$(sysconfdir)$$dir/$$filename || \
+-		test -f $(DESTDIR)$(sysconfdir)$$dir/$$filename.noload || \
 -			$(INSTALL) -m 644 $(switch_srcdir)/conf/$$dir/$$filename $(DESTDIR)$(sysconfdir)$$dir; \
-+			$(INSTALL) -m 644 $(switch_srcdir)/conf/$$dir/$$filename $(DESTDIR)$(sysconfdir)$$dir/$$filename.sample; \
++		$(INSTALL) -m 664 $(switch_srcdir)/conf/$$dir/$$filename $(DESTDIR)$(sysconfdir)$$dir/$$filename.sample; \
  	done
  
  samples-htdocs: 
-@@ -444,8 +444,9 @@
+@@ -482,11 +481,10 @@ install-exec-local:
  	$(mkinstalldirs) $(DESTDIR)$(modulesdir)
  
  install-data-local:
 -	@echo Installing $(NAME)
 -	@for x in $(modulesdir) $(runtimedir) $(dbdir) $(logfiledir) $(logfiledir)/xml_cdr $(bindir) $(scriptdir) $(recordingsdir) $(grammardir); do \
-+	@for x in $(bindir) $(modulesdir) $(runtimedir) $(logfiledir) \
-+		$(logfiledir)/xml_cdr $(dbdir) $(grammardir) $(scriptdir) \
-+		$(storagedir) $(recordingsdir) $(voicemaildir) ; do \
++	@for x in $(bindir) $(modulesdir) $(runtimedir) $(logfiledir) $(logfiledir)/xml_cdr $(dbdir) $(grammardir) $(scriptdir) $(storagedir) $(recordingsdir) $(voicemaildir) ; do \
  		$(mkinstalldirs) $(DESTDIR)$$x ; \
- 	 done
- 	test -d $(DESTDIR)$(sysconfdir) || $(MAKE) samples-conf
+-	 done
+-	test -d $(DESTDIR)$(sysconfdir) || $(MAKE) samples-conf
++	done
++	$(MAKE) samples-conf
+ 	test -d $(DESTDIR)$(htdocsdir) || $(MAKE) samples-htdocs
+ 
+ is-scm:
diff --git a/net/freeswitch-core/files/patch-libs-freetdm-Makefile.am b/net/freeswitch-core/files/patch-libs-freetdm-Makefile.am
index 818ce765eeca..3fd236f2f3ed 100644
--- a/net/freeswitch-core/files/patch-libs-freetdm-Makefile.am
+++ b/net/freeswitch-core/files/patch-libs-freetdm-Makefile.am
@@ -5,5 +5,5 @@
  	$(mkinstalldirs) $(DESTDIR)$(PREFIX)
  	$(mkinstalldirs) $(DESTDIR)@confdir@
 -	@[ -f "$(DESTDIR)@confdir@/freetdm.conf" ] || ( cp conf/*.conf $(DESTDIR)@confdir@)
-+	@for i in conf/*.conf; do cp $$i $$i.sample; done; cp -f conf/*.conf.sample $(DESTDIR)@confdir@
++	@for i in conf/*.conf; do cp -p $$i $$i.sample; done; cp -f -p conf/*.conf.sample $(DESTDIR)@confdir@
  	@echo FreeTDM Installed
diff --git a/net/freeswitch-core/files/patch-libs-freetdm-mod_freetdm-Makefile.in b/net/freeswitch-core/files/patch-libs-freetdm-mod_freetdm-Makefile.in
index cf0e4a1840e8..b57d1bc73ffb 100644
--- a/net/freeswitch-core/files/patch-libs-freetdm-mod_freetdm-Makefile.in
+++ b/net/freeswitch-core/files/patch-libs-freetdm-mod_freetdm-Makefile.in
@@ -6,7 +6,7 @@
  	cd $(FT_DIR) && $(MAKE) install
 -	[ -f $(DESTDIR)@confdir@/autoload_configs/freetdm.conf.xml ] || cp -f $(FT_DIR)/conf/freetdm.conf.xml  $(DESTDIR)@confdir@/autoload_configs
 -
-+	@for i in $(FT_DIR)/conf/*.xml; do cp $$i $$i.sample; done; cp  -f $(FT_DIR)/conf/*.xml.sample $(DESTDIR)@confdir@/autoload_configs
++	@for i in $(FT_DIR)/conf/*.xml; do cp -p $$i $$i.sample; done; cp -f -p $(FT_DIR)/conf/*.xml.sample $(DESTDIR)@confdir@/autoload_configs
  local_clean:
  	cd $(FT_DIR) && $(MAKE) clean
  
diff --git a/net/freeswitch-core/files/patch-libs-freetdm-src-ftmod-ftmod_zt-ftmod_zt.c b/net/freeswitch-core/files/patch-libs-freetdm-src-ftmod-ftmod_zt-ftmod_zt.c
deleted file mode 100644
index 42c498acfc7b..000000000000
--- a/net/freeswitch-core/files/patch-libs-freetdm-src-ftmod-ftmod_zt-ftmod_zt.c
+++ /dev/null
@@ -1,73 +0,0 @@
---- libs/freetdm/src/ftmod/ftmod_zt/ftmod_zt.c
-+++ libs/freetdm/src/ftmod/ftmod_zt/ftmod_zt.c
-@@ -52,38 +52,38 @@ static struct {
-  * \brief General IOCTL codes
-  */
- struct ioctl_codes {
--    int GET_BLOCKSIZE;
--    int SET_BLOCKSIZE;
--    int FLUSH;
--    int SYNC;
--    int GET_PARAMS;
--    int SET_PARAMS;
--    int HOOK;
--    int GETEVENT;
--    int IOMUX;
--    int SPANSTAT;
--    int MAINT;
--    int GETCONF;
--    int SETCONF;
--    int CONFLINK;
--    int CONFDIAG;
--    int GETGAINS;
--    int SETGAINS;
--    int SPANCONFIG;
--    int CHANCONFIG;
--    int SET_BUFINFO;
--    int GET_BUFINFO;
--    int AUDIOMODE;
--    int ECHOCANCEL;
--    int HDLCRAWMODE;
--    int HDLCFCSMODE;
--    int SPECIFY;
--    int SETLAW;
--    int SETLINEAR;
--    int GETCONFMUTE;
--    int ECHOTRAIN;
--    int SETTXBITS;
--    int GETRXBITS;
-+    long GET_BLOCKSIZE;
-+    long SET_BLOCKSIZE;
-+    long FLUSH;
-+    long SYNC;
-+    long GET_PARAMS;
-+    long SET_PARAMS;
-+    long HOOK;
-+    long GETEVENT;
-+    long IOMUX;
-+    long SPANSTAT;
-+    long MAINT;
-+    long GETCONF;
-+    long SETCONF;
-+    long CONFLINK;
-+    long CONFDIAG;
-+    long GETGAINS;
-+    long SETGAINS;
-+    long SPANCONFIG;
-+    long CHANCONFIG;
-+    long SET_BUFINFO;
-+    long GET_BUFINFO;
-+    long AUDIOMODE;
-+    long ECHOCANCEL;
-+    long HDLCRAWMODE;
-+    long HDLCFCSMODE;
-+    long SPECIFY;
-+    long SETLAW;
-+    long SETLINEAR;
-+    long GETCONFMUTE;
-+    long ECHOTRAIN;
-+    long SETTXBITS;
-+    long GETRXBITS;
- };
- 
- /**
diff --git a/net/freeswitch-core/files/patch-src-include-switch_types.h b/net/freeswitch-core/files/patch-src-include-switch_types.h
index 2ca1600f478c..aa76dcaa57c1 100644
--- a/net/freeswitch-core/files/patch-src-include-switch_types.h
+++ b/net/freeswitch-core/files/patch-src-include-switch_types.h
@@ -1,6 +1,15 @@
---- src/include/switch_types.h	2010-06-22 17:19:31.000000000 -0400
-+++ src/include/switch_types.h	2010-06-29 11:16:17.000000000 -0400
-@@ -391,6 +391,7 @@
+--- src/include/switch_types.h.orig	2011-02-02 16:27:41.000000000 -0500
++++ src/include/switch_types.h	2011-02-02 16:29:16.000000000 -0500
+@@ -108,7 +108,7 @@
+ #define SWITCH_DEFAULT_DTMF_DURATION 2000
+ #define SWITCH_MIN_DTMF_DURATION 400
+ #define SWITCH_MAX_DTMF_DURATION 192000
+-#define SWITCH_DEFAULT_DIR_PERMS SWITCH_FPROT_UREAD | SWITCH_FPROT_UWRITE | SWITCH_FPROT_UEXECUTE | SWITCH_FPROT_GREAD | SWITCH_FPROT_GEXECUTE
++#define SWITCH_DEFAULT_DIR_PERMS SWITCH_FPROT_UREAD | SWITCH_FPROT_UWRITE | SWITCH_FPROT_UEXECUTE | SWITCH_FPROT_GREAD | SWITCH_FPROT_GWRITE | SWITCH_FPROT_GEXECUTE
+ #ifdef WIN32
+ #define SWITCH_PATH_SEPARATOR "\\"
+ #else
+@@ -409,6 +409,7 @@
  	char *storage_dir;
  	char *recordings_dir;
  	char *sounds_dir;
diff --git a/net/freeswitch-core/files/patch-src-mod-applications-mod_ladspa-mod_ladspa.c b/net/freeswitch-core/files/patch-src-mod-applications-mod_ladspa-mod_ladspa.c
new file mode 100644
index 000000000000..b52342b30b62
--- /dev/null
+++ b/net/freeswitch-core/files/patch-src-mod-applications-mod_ladspa-mod_ladspa.c
@@ -0,0 +1,11 @@
+--- src/mod/applications/mod_ladspa/mod_ladspa.c.orig	2011-07-05 22:23:14.000000000 -0400
++++ src/mod/applications/mod_ladspa/mod_ladspa.c	2011-07-05 22:24:32.000000000 -0400
+@@ -634,6 +634,8 @@
+ 			setenv("LADSPA_PATH", "/usr/lib64/ladspa/:/usr/local/lib/ladspa", 1);
+ 		} else if (switch_directory_exists("/usr/lib/ladspa/", pool) == SWITCH_STATUS_SUCCESS) {
+ 			setenv("LADSPA_PATH", "/usr/lib/ladspa/:/usr/local/lib/ladspa", 1);
++		} else if (switch_directory_exists("/usr/local/lib/ladspa/", pool) == SWITCH_STATUS_SUCCESS) {
++			putenv("LADSPA_PATH=/usr/local/lib/ladspa");
+ 		}
+ 	}
+ 
diff --git a/net/freeswitch-core/files/patch-src-mod-loggers-mod_logfile-mod_logfile.c b/net/freeswitch-core/files/patch-src-mod-loggers-mod_logfile-mod_logfile.c
new file mode 100644
index 000000000000..64c5fa73a92e
--- /dev/null
+++ b/net/freeswitch-core/files/patch-src-mod-loggers-mod_logfile-mod_logfile.c
@@ -0,0 +1,11 @@
+--- src/mod/loggers/mod_logfile/mod_logfile.c.orig	2011-02-02 11:08:44.000000000 -0500
++++ src/mod/loggers/mod_logfile/mod_logfile.c	2011-02-02 11:09:38.000000000 -0500
+@@ -94,7 +94,7 @@
+ 	flags |= SWITCH_FOPEN_WRITE;
+ 	flags |= SWITCH_FOPEN_APPEND;
+ 
+-	stat = switch_file_open(&afd, profile->logfile, flags, SWITCH_FPROT_UREAD | SWITCH_FPROT_UWRITE | SWITCH_FPROT_WREAD, module_pool);
++	stat = switch_file_open(&afd, profile->logfile, flags, SWITCH_FPROT_UREAD | SWITCH_FPROT_UWRITE | SWITCH_FPROT_GREAD | SWITCH_FPROT_WREAD, module_pool);
+ 	if (stat != SWITCH_STATUS_SUCCESS) {
+ 		return SWITCH_STATUS_FALSE;
+ 	}
diff --git a/net/freeswitch-core/files/pkg-install.in b/net/freeswitch-core/files/pkg-install.in
index d5ba5da006a1..61d9c9dcf078 100644
--- a/net/freeswitch-core/files/pkg-install.in
+++ b/net/freeswitch-core/files/pkg-install.in
@@ -1,35 +1,39 @@
 #!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/net/freeswitch-core/files/pkg-install.in,v 1.3 2010-12-08 18:33:22 jpaetzel Exp $
+# $FreeBSD: /tmp/pcvs/ports/net/freeswitch-core/files/pkg-install.in,v 1.4 2011-10-28 21:56:51 crees Exp $
 #
 
-if [ "$2" != "PRE-INSTALL" ]; then
+if [ "$2" != "POST-INSTALL" ]; then
 	exit 0
 fi
 
-FREESWITCHUSER=freeswitch
-FREESWITCHGROUP=${FREESWITCHUSER}
-FREESWITCHUID=610
-FREESWITCHGID=${FREESWITCHUID}
-
-if ! pw groupshow "${FREESWITCHGROUP}" 2>/dev/null 1>&2; then
-	if pw groupadd ${FREESWITCHGROUP} -g ${FREESWITCHGID}; then
-		echo "Added group \"${FREESWITCHGROUP}\"."
-	else
-		echo "Adding group \"${FREESWITCHGROUP}\" failed..."
-		exit 1
-	fi
-fi
+for dir in \
+    etc/freeswitch/conf/directory/default \
+    etc/freeswitch/scripts \
+    share/freeswitch/sounds
+	do install -d -o %%FREESWITCH_USER%% -g %%FREESWITCH_GROUP%% ${PKG_PREFIX}/$dir
+done
 
-if ! pw usershow "${FREESWITCHUSER}" 2>/dev/null 1>&2; then
-	if pw useradd ${FREESWITCHUSER} -u ${FREESWITCHUID} -g ${FREESWITCHGROUP} -h - \
-		-s "/sbin/nologin" -d "/nonexistent" \
-		-c "FREESWITCH Owner"; \
-	then
-		echo "Added user \"${FREESWITCHUSER}\"."
-	else
-		echo "Adding user \"${FREESWITCHUSER}\" failed..."
-		exit 1
-	fi
-fi
+for dir in etc/freeswitch include/freeswitch lib/freeswitch share/freeswitch
+	do chown %%FREESWITCH_USER%%:%%FREESWITCH_GROUP%% ${PKG_PREFIX}/$dir
+done
+
+find ${PKG_PREFIX}/etc/freeswitch/ -type d -exec chmod 755 {} +
+chmod 775 ${PKG_PREFIX}/share/freeswitch
+
+# @cwd /var
+
+for dir in \
+    db/freeswitch \
+    freeswitch/recordings \
+    log/freeswitch/xml_cdr \
+    spool/freeswitch/voicemail
+	do install -d -m 775 -o %%FREESWITCH_USER%% -g %%FREESWITCH_GROUP%% /var/$dir
+done
+
+echo "This port chown -R various directories %%FREESWITCH_USER%%:%%FREESWITCH_GROUP%%"
+echo "This port chmod -R 775 various directories"
+echo "This is for security reasons.  In the event something should"
+echo "stop working, please take the time to check the following dirs:"
+echo "/var/spool/freeswitch /var/log/freeswitch /var/freeswitch"
 
 exit 0
diff --git a/net/freeswitch-core/pkg-plist b/net/freeswitch-core/pkg-plist
index b6f167b6930b..21f2e75d06d7 100644
--- a/net/freeswitch-core/pkg-plist
+++ b/net/freeswitch-core/pkg-plist
@@ -1,81 +1,91 @@
-@unexec for i in $(find %D/etc/freeswitch/conf/ -type f -name \*.xml -o -name \*.ttml -o -name \*.tpl -o -name \*.conf -o -name \*.types); do if cmp "$i" "${i}.sample"; then rm "$i"; fi; done
+%%WITH_SAMPLECONFIGS%%@unexec for i in $(find %D/etc/freeswitch/conf/ -type f -name \*.xml -o -name \*.ttml -o -name \*.tpl -o -name \*.conf -o -name \*.types); do if cmp "$i" "${i}.sample"; then rm "$i"; fi; done
 bin/freeswitch
 bin/fs_cli
+bin/fs_encode
 bin/fs_ivrd
 bin/fsxs
-bin/fs_encode
 bin/gentls_cert
 bin/tone2wav
-etc/freeswitch/conf/autoload_configs/acl.conf.xml.sample
-etc/freeswitch/conf/autoload_configs/alsa.conf.xml.sample
-etc/freeswitch/conf/autoload_configs/callcenter.conf.xml.sample
-etc/freeswitch/conf/autoload_configs/cdr_csv.conf.xml.sample
-etc/freeswitch/conf/autoload_configs/cdr_pg_csv.conf.xml.sample
-etc/freeswitch/conf/autoload_configs/cidlookup.conf.xml.sample
-etc/freeswitch/conf/autoload_configs/conference.conf.xml.sample
-etc/freeswitch/conf/autoload_configs/console.conf.xml.sample
-etc/freeswitch/conf/autoload_configs/db.conf.xml.sample
-etc/freeswitch/conf/autoload_configs/dialplan_directory.conf.xml.sample
-etc/freeswitch/conf/autoload_configs/dingaling.conf.xml.sample
-etc/freeswitch/conf/autoload_configs/directory.conf.xml.sample
-etc/freeswitch/conf/autoload_configs/distributor.conf.xml.sample
-etc/freeswitch/conf/autoload_configs/easyroute.conf.xml.sample
-etc/freeswitch/conf/autoload_configs/enum.conf.xml.sample
-etc/freeswitch/conf/autoload_configs/erlang_event.conf.xml.sample
-etc/freeswitch/conf/autoload_configs/event_multicast.conf.xml.sample
-etc/freeswitch/conf/autoload_configs/event_socket.conf.xml.sample
-etc/freeswitch/conf/autoload_configs/fax.conf.xml.sample
-etc/freeswitch/conf/autoload_configs/fifo.conf.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/acl.conf.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/alsa.conf.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/blacklist.conf.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/callcenter.conf.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/cdr_csv.conf.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/cdr_mongodb.conf.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/cdr_pg_csv.conf.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/cdr_sqlite.conf.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/cepstral.conf.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/cidlookup.conf.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/conference.conf.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/console.conf.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/db.conf.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/dialplan_directory.conf.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/dingaling.conf.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/directory.conf.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/distributor.conf.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/easyroute.conf.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/enum.conf.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/erlang_event.conf.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/event_multicast.conf.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/event_socket.conf.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/fax.conf.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/fifo.conf.xml.sample
 %%WITH_MODFREETDM%%etc/freeswitch/conf/autoload_configs/freetdm.conf.xml.sample
-etc/freeswitch/conf/autoload_configs/hash.conf.xml.sample
-etc/freeswitch/conf/autoload_configs/ivr.conf.xml.sample
-etc/freeswitch/conf/autoload_configs/java.conf.xml.sample
-etc/freeswitch/conf/autoload_configs/lcr.conf.xml.sample
-etc/freeswitch/conf/autoload_configs/local_stream.conf.xml.sample
-etc/freeswitch/conf/autoload_configs/logfile.conf.xml.sample
-etc/freeswitch/conf/autoload_configs/lua.conf.xml.sample
-etc/freeswitch/conf/autoload_configs/memcache.conf.xml.sample
-etc/freeswitch/conf/autoload_configs/modules.conf.xml.sample
-etc/freeswitch/conf/autoload_configs/nibblebill.conf.xml.sample
-etc/freeswitch/conf/autoload_configs/opal.conf.xml.sample
-etc/freeswitch/conf/autoload_configs/osp.conf.xml.sample
-etc/freeswitch/conf/autoload_configs/perl.conf.xml.sample
-etc/freeswitch/conf/autoload_configs/pocketsphinx.conf.xml.sample
-etc/freeswitch/conf/autoload_configs/portaudio.conf.xml.sample
-etc/freeswitch/conf/autoload_configs/post_load_modules.conf.xml.sample
-etc/freeswitch/conf/autoload_configs/python.conf.xml.sample
-etc/freeswitch/conf/autoload_configs/redis.conf.xml.sample
-etc/freeswitch/conf/autoload_configs/rss.conf.xml.sample
-etc/freeswitch/conf/autoload_configs/sangoma_codec.conf.xml.sample
-etc/freeswitch/conf/autoload_configs/shout.conf.xml.sample
-etc/freeswitch/conf/autoload_configs/skinny.conf.xml.sample
-etc/freeswitch/conf/autoload_configs/sofia.conf.xml.sample
-etc/freeswitch/conf/autoload_configs/spandsp.conf.xml.sample
-etc/freeswitch/conf/autoload_configs/spidermonkey.conf.xml.sample
-etc/freeswitch/conf/autoload_configs/switch.conf.xml.sample
-etc/freeswitch/conf/autoload_configs/syslog.conf.xml.sample
-etc/freeswitch/conf/autoload_configs/timezones.conf.xml.sample
-etc/freeswitch/conf/autoload_configs/tts_commandline.conf.xml.sample
-etc/freeswitch/conf/autoload_configs/unicall.conf.xml.sample
-etc/freeswitch/conf/autoload_configs/unimrcp.conf.xml.sample
-etc/freeswitch/conf/autoload_configs/voicemail.conf.xml.sample
-etc/freeswitch/conf/autoload_configs/xml_cdr.conf.xml.sample
-etc/freeswitch/conf/autoload_configs/xml_curl.conf.xml.sample
-etc/freeswitch/conf/autoload_configs/xml_rpc.conf.xml.sample
-etc/freeswitch/conf/autoload_configs/zeroconf.conf.xml.sample
-etc/freeswitch/conf/dialplan/default.xml.sample
-etc/freeswitch/conf/dialplan/default/00_pizza_demo.xml.sample
-etc/freeswitch/conf/dialplan/default/01_example.com.xml.sample
-etc/freeswitch/conf/dialplan/features.xml.sample
-etc/freeswitch/conf/dialplan/public.xml.sample
-etc/freeswitch/conf/dialplan/public/00_inbound_did.xml.sample
-etc/freeswitch/conf/dialplan/skinny-patterns.xml.sample
-etc/freeswitch/conf/dialplan/skinny-patterns/20-Demo.xml.sample
-etc/freeswitch/conf/dialplan/skinny-patterns/20-Local_extension.xml.sample
-etc/freeswitch/conf/dialplan/skinny-patterns/90-External.xml.sample
-etc/freeswitch/conf/dialplan/skinny-patterns/99-Default_Drop.xml.sample
-etc/freeswitch/conf/directory/default.xml.sample
-etc/freeswitch/conf/mime.types.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/hash.conf.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/http_cache.conf.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/ivr.conf.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/java.conf.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/lcr.conf.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/local_stream.conf.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/logfile.conf.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/lua.conf.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/memcache.conf.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/modules.conf.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/mongo.conf.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/nibblebill.conf.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/opal.conf.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/osp.conf.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/perl.conf.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/pocketsphinx.conf.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/portaudio.conf.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/post_load_modules.conf.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/presence_map.conf.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/python.conf.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/redis.conf.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/rtmp.conf.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/rss.conf.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/sangoma_codec.conf.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/shout.conf.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/skinny.conf.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/sofia.conf.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/spandsp.conf.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/spidermonkey.conf.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/switch.conf.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/syslog.conf.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/timezones.conf.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/tts_commandline.conf.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/unicall.conf.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/unimrcp.conf.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/voicemail.conf.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/xml_cdr.conf.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/xml_curl.conf.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/xml_rpc.conf.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/autoload_configs/zeroconf.conf.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/chatplan/default.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/dialplan/default.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/dialplan/default/00_ladspa.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/dialplan/default/00_pizza_demo.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/dialplan/default/01_example.com.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/dialplan/default/01_Talking_Clock.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/dialplan/features.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/dialplan/public.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/dialplan/public/00_inbound_did.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/dialplan/skinny-patterns.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/dialplan/skinny-patterns/20-Demo.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/dialplan/skinny-patterns/20-Local_extension.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/dialplan/skinny-patterns/90-External.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/dialplan/skinny-patterns/99-Default_Drop.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/directory/default.xml.sample
 %%WITH_EXTENSIONS%%etc/freeswitch/conf/directory/default/1000.xml.sample
 %%WITH_EXTENSIONS%%etc/freeswitch/conf/directory/default/1001.xml.sample
 %%WITH_EXTENSIONS%%etc/freeswitch/conf/directory/default/1002.xml.sample
@@ -100,59 +110,65 @@ etc/freeswitch/conf/mime.types.sample
 %%WITH_EXTENSIONS%%etc/freeswitch/conf/directory/default/default.xml.sample
 %%WITH_EXTENSIONS%%etc/freeswitch/conf/directory/default/example.com.xml.sample
 %%WITH_EXTENSIONS%%etc/freeswitch/conf/directory/default/skinny-example.xml.sample
-etc/freeswitch/conf/extensions.conf.sample
-etc/freeswitch/conf/freeswitch.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/extensions.conf.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/freeswitch.xml.sample
 %%WITH_MODFREETDM%%etc/freeswitch/conf/freetdm.conf.sample
-etc/freeswitch/conf/fur_elise.ttml.sample
-etc/freeswitch/conf/ivr_menus/demo_ivr.xml.sample
-etc/freeswitch/conf/jingle_profiles/client.xml.sample
-etc/freeswitch/conf/jingle_profiles/server.xml.sample
-etc/freeswitch/conf/lang/de/de.xml.sample
-etc/freeswitch/conf/lang/de/demo/demo.xml.sample
-etc/freeswitch/conf/lang/de/vm/tts.xml.sample
-etc/freeswitch/conf/lang/en/demo/demo-ivr.xml.sample
-etc/freeswitch/conf/lang/en/demo/demo.xml.sample
-etc/freeswitch/conf/lang/en/dir/sounds.xml.sample
-etc/freeswitch/conf/lang/en/dir/tts.xml.sample
-etc/freeswitch/conf/lang/en/en.xml.sample
-etc/freeswitch/conf/lang/en/vm/sounds.xml.sample
-etc/freeswitch/conf/lang/en/vm/tts.xml.sample
-etc/freeswitch/conf/lang/fr/demo/demo.xml.sample
-etc/freeswitch/conf/lang/fr/dir/sounds.xml.sample
-etc/freeswitch/conf/lang/fr/dir/tts.xml.sample
-etc/freeswitch/conf/lang/fr/fr.xml.sample
-etc/freeswitch/conf/lang/fr/vm/sounds.xml.sample
-etc/freeswitch/conf/lang/ru/demo/demo-ivr.xml.sample
-etc/freeswitch/conf/lang/ru/demo/demo.xml.sample
-etc/freeswitch/conf/lang/ru/dir/sounds.xml.sample
-etc/freeswitch/conf/lang/ru/dir/tts.xml.sample
-etc/freeswitch/conf/lang/ru/ru.xml.sample
-etc/freeswitch/conf/lang/ru/vm/sounds.xml.sample
-etc/freeswitch/conf/lang/ru/vm/tts.xml.sample
-%%WITH_MODFREETDM%%etc/freeswitch/conf/m3ua.conf.sample
-%%WITH_MODFREETDM%%etc/freeswitch/conf/mime.types.sample
-etc/freeswitch/conf/mrcp_profiles/loquendo-7-mrcp-v2.xml.sample
-etc/freeswitch/conf/mrcp_profiles/nuance-1.0.0-mrcp-v1.xml.sample
-etc/freeswitch/conf/mrcp_profiles/nuance-5.0-mrcp-v1.xml.sample
-etc/freeswitch/conf/mrcp_profiles/nuance-5.0-mrcp-v2.xml.sample
-etc/freeswitch/conf/mrcp_profiles/unimrcpserver-mrcp-v1.xml.sample
-etc/freeswitch/conf/mrcp_profiles/voxeo-prophecy-8.0-mrcp-v1.xml.sample
-etc/freeswitch/conf/notify-voicemail.tpl.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/fur_elise.ttml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/ivr_menus/demo_ivr.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/jingle_profiles/client.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/jingle_profiles/server.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/lang/de/de.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/lang/de/demo/demo.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/lang/de/vm/sounds.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/lang/de/vm/tts.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/lang/en/demo/demo-ivr.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/lang/en/demo/demo.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/lang/en/dir/sounds.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/lang/en/dir/tts.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/lang/en/en.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/lang/en/ivr/sounds.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/lang/en/vm/sounds.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/lang/en/vm/tts.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/lang/fr/demo/demo.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/lang/fr/dir/sounds.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/lang/fr/dir/tts.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/lang/fr/fr.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/lang/fr/vm/sounds.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/lang/he/demo/demo-ivr.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/lang/he/demo/demo.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/lang/he/dir/sounds.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/lang/he/he.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/lang/he/vm/sounds.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/lang/ru/demo/demo-ivr.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/lang/ru/demo/demo.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/lang/ru/dir/sounds.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/lang/ru/dir/tts.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/lang/ru/ru.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/lang/ru/vm/sounds.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/lang/ru/vm/tts.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/mime.types.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/mrcp_profiles/loquendo-7-mrcp-v2.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/mrcp_profiles/nuance-1.0.0-mrcp-v1.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/mrcp_profiles/nuance-5.0-mrcp-v1.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/mrcp_profiles/nuance-5.0-mrcp-v2.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/mrcp_profiles/unimrcpserver-mrcp-v1.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/mrcp_profiles/voxeo-prophecy-8.0-mrcp-v1.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/notify-voicemail.tpl.sample
 %%WITH_MODFREETDM%%etc/freeswitch/conf/pika.conf.sample
-etc/freeswitch/conf/sip_profiles/external.xml.sample
-etc/freeswitch/conf/sip_profiles/external/example.xml.sample
-etc/freeswitch/conf/sip_profiles/internal-ipv6.xml.sample
-etc/freeswitch/conf/sip_profiles/internal.xml.sample
-etc/freeswitch/conf/sip_profiles/internal/example.xml.sample
-etc/freeswitch/conf/skinny_profiles/internal.xml.sample
-etc/freeswitch/conf/tetris.ttml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/sip_profiles/external.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/sip_profiles/external/example.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/sip_profiles/internal-ipv6.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/sip_profiles/internal.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/sip_profiles/internal/example.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/skinny_profiles/internal.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/tetris.ttml.sample
 %%WITH_MODFREETDM%%etc/freeswitch/conf/tones.conf.sample
-etc/freeswitch/conf/vars.xml.sample
-etc/freeswitch/conf/voicemail.tpl.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/vars.xml.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/voicemail.tpl.sample
 %%WITH_MODFREETDM%%etc/freeswitch/conf/wanpipe.conf.sample
-etc/freeswitch/conf/web-vm.tpl.sample
+%%WITH_SAMPLECONFIGS%%etc/freeswitch/conf/web-vm.tpl.sample
 %%WITH_MODFREETDM%%etc/freeswitch/conf/zt.conf.sample
-@exec for i in $(find %D/etc/freeswitch/conf/ -type f -name *.sample); do if [ ! -f ${i%.sample} ]; then cp $i ${i%.sample}; fi; done
+%%WITH_SAMPLECONFIGS%%@exec for i in $(find %D/etc/freeswitch/conf/ -type f -name *.sample); do if [ ! -f ${i%%.sample} ]; then cp -rp $i ${i%%.sample}; fi; done
 %%WITH_MODPOCKETSPHINX%%etc/freeswitch/grammar/default.dic
 %%WITH_MODPOCKETSPHINX%%etc/freeswitch/grammar/model/communicator/COPYING
 %%WITH_MODPOCKETSPHINX%%etc/freeswitch/grammar/model/communicator/feat.params
@@ -162,17 +178,6 @@ etc/freeswitch/conf/web-vm.tpl.sample
 %%WITH_MODPOCKETSPHINX%%etc/freeswitch/grammar/model/communicator/sendump
 %%WITH_MODPOCKETSPHINX%%etc/freeswitch/grammar/model/communicator/transition_matrices
 %%WITH_MODPOCKETSPHINX%%etc/freeswitch/grammar/model/communicator/variances
-%%WITH_MODPOCKETSPHINX%%etc/freeswitch/grammar/model/wsj1/Makefile
-%%WITH_MODPOCKETSPHINX%%etc/freeswitch/grammar/model/wsj1/Makefile.am
-%%WITH_MODPOCKETSPHINX%%etc/freeswitch/grammar/model/wsj1/Makefile.in
-%%WITH_MODPOCKETSPHINX%%etc/freeswitch/grammar/model/wsj1/feat.params
-%%WITH_MODPOCKETSPHINX%%etc/freeswitch/grammar/model/wsj1/kdtrees
-%%WITH_MODPOCKETSPHINX%%etc/freeswitch/grammar/model/wsj1/mdef
-%%WITH_MODPOCKETSPHINX%%etc/freeswitch/grammar/model/wsj1/means
-%%WITH_MODPOCKETSPHINX%%etc/freeswitch/grammar/model/wsj1/noisedict
-%%WITH_MODPOCKETSPHINX%%etc/freeswitch/grammar/model/wsj1/sendump
-%%WITH_MODPOCKETSPHINX%%etc/freeswitch/grammar/model/wsj1/transition_matrices
-%%WITH_MODPOCKETSPHINX%%etc/freeswitch/grammar/model/wsj1/variances
 include/freeswitch/libteletone.h
 include/freeswitch/libteletone_detect.h
 include/freeswitch/libteletone_generate.h
@@ -240,8 +245,6 @@ lib/freeswitch/lib/libplds4.so.1
 %%WITH_MODFREETDM%%lib/freeswitch/mod/ftmod_analog_em.so
 %%WITH_MODFREETDM%%lib/freeswitch/mod/ftmod_libpri.la
 %%WITH_MODFREETDM%%lib/freeswitch/mod/ftmod_libpri.so
-%%WITH_MODFREETDM%%lib/freeswitch/mod/ftmod_sangoma_boost.la
-%%WITH_MODFREETDM%%lib/freeswitch/mod/ftmod_sangoma_boost.so
 %%WITH_MODFREETDM%%lib/freeswitch/mod/ftmod_skel.a
 %%WITH_MODFREETDM%%lib/freeswitch/mod/ftmod_skel.la
 %%WITH_MODFREETDM%%lib/freeswitch/mod/ftmod_skel.so
@@ -253,12 +256,18 @@ lib/freeswitch/mod/mod_amr.so
 %%WITH_MODAMRWB%%lib/freeswitch/mod/mod_amrwb.so
 %%WITH_MODAVMD%%lib/freeswitch/mod/mod_avmd.la
 %%WITH_MODAVMD%%lib/freeswitch/mod/mod_avmd.so
+lib/freeswitch/mod/mod_blacklist.la
+lib/freeswitch/mod/mod_blacklist.so
 lib/freeswitch/mod/mod_bv.la
 lib/freeswitch/mod/mod_bv.so
 %%WITH_MODCALLCENTER%%lib/freeswitch/mod/mod_callcenter.la
 %%WITH_MODCALLCENTER%%lib/freeswitch/mod/mod_callcenter.so
 lib/freeswitch/mod/mod_cdr_csv.la
 lib/freeswitch/mod/mod_cdr_csv.so
+%%WITH_MODCDRPGCSV%%lib/freeswitch/mod/mod_cdr_pg_csv.la
+%%WITH_MODCDRPGCSV%%lib/freeswitch/mod/mod_cdr_pg_csv.so
+lib/freeswitch/mod/mod_cdr_sqlite.la
+lib/freeswitch/mod/mod_cdr_sqlite.so
 %%WITH_MODCELT%%lib/freeswitch/mod/mod_celt.la
 %%WITH_MODCELT%%lib/freeswitch/mod/mod_celt.so
 %%WITH_MODCIDLOOKUP%%lib/freeswitch/mod/mod_cidlookup.la
@@ -277,8 +286,8 @@ lib/freeswitch/mod/mod_console.so
 %%WITH_MODCURL%%lib/freeswitch/mod/mod_curl.so
 lib/freeswitch/mod/mod_db.la
 lib/freeswitch/mod/mod_db.so
-lib/freeswitch/mod/mod_dialplan_asterisk.la
-lib/freeswitch/mod/mod_dialplan_asterisk.so
+%%WITH_MODDPASTERISK%%lib/freeswitch/mod/mod_dialplan_asterisk.la
+%%WITH_MODDPASTERISK%%lib/freeswitch/mod/mod_dialplan_asterisk.so
 %%WITH_MODDPDIRECTORY%%lib/freeswitch/mod/mod_dialplan_directory.la
 %%WITH_MODDPDIRECTORY%%lib/freeswitch/mod/mod_dialplan_directory.so
 lib/freeswitch/mod/mod_dialplan_xml.la
@@ -307,12 +316,12 @@ lib/freeswitch/mod/mod_expr.la
 lib/freeswitch/mod/mod_expr.so
 lib/freeswitch/mod/mod_fifo.la
 lib/freeswitch/mod/mod_fifo.so
-lib/freeswitch/mod/mod_file_string.la
-lib/freeswitch/mod/mod_file_string.so
 %%WITH_MODFLITE%%lib/freeswitch/mod/mod_flite.la
 %%WITH_MODFLITE%%lib/freeswitch/mod/mod_flite.so
 %%WITH_MODFREETDM%%lib/freeswitch/mod/mod_freetdm.la
 %%WITH_MODFREETDM%%lib/freeswitch/mod/mod_freetdm.so
+%%WITH_MODFSK%%lib/freeswitch/mod/mod_fsk.la
+%%WITH_MODFSK%%lib/freeswitch/mod/mod_fsk.so
 lib/freeswitch/mod/mod_fsv.la
 lib/freeswitch/mod/mod_fsv.so
 lib/freeswitch/mod/mod_g723_1.la
@@ -323,8 +332,12 @@ lib/freeswitch/mod/mod_h26x.la
 lib/freeswitch/mod/mod_h26x.so
 lib/freeswitch/mod/mod_hash.la
 lib/freeswitch/mod/mod_hash.so
+%%WITH_MODHTTPCACHE%%lib/freeswitch/mod/mod_http_cache.la
+%%WITH_MODHTTPCACHE%%lib/freeswitch/mod/mod_http_cache.so
 lib/freeswitch/mod/mod_ilbc.la
 lib/freeswitch/mod/mod_ilbc.so
+%%WITH_MODLADSPA%%lib/freeswitch/mod/mod_ladspa.la
+%%WITH_MODLADSPA%%lib/freeswitch/mod/mod_ladspa.so
 %%WITH_MODLCR%%lib/freeswitch/mod/mod_lcr.la
 %%WITH_MODLCR%%lib/freeswitch/mod/mod_lcr.so
 lib/freeswitch/mod/mod_local_stream.la
@@ -341,6 +354,8 @@ lib/freeswitch/mod/mod_native_file.la
 lib/freeswitch/mod/mod_native_file.so
 %%WITH_MODNIBBLEBILL%%lib/freeswitch/mod/mod_nibblebill.la
 %%WITH_MODNIBBLEBILL%%lib/freeswitch/mod/mod_nibblebill.so
+%%WITH_MODOPUS%%lib/freeswitch/mod/mod_opus.la
+%%WITH_MODOPUS%%lib/freeswitch/mod/mod_opus.so
 %%WITH_MODPERL%%lib/freeswitch/mod/mod_perl.la
 %%WITH_MODPERL%%lib/freeswitch/mod/mod_perl.so
 %%WITH_MODPOCKETSPHINX%%lib/freeswitch/mod/mod_pocketsphinx.la
@@ -351,9 +366,10 @@ lib/freeswitch/mod/mod_native_file.so
 %%WITH_MODPASTREAM%%lib/freeswitch/mod/mod_portaudio_stream.so
 %%WITH_MODPYTHON%%lib/freeswitch/mod/mod_python.la
 %%WITH_MODPYTHON%%lib/freeswitch/mod/mod_python.so
-%%WITH_MODPYTHON%%%%PYTHON_SITELIBDIR%%/freeswitch.py
 %%WITH_MODRSS%%lib/freeswitch/mod/mod_rss.la
 %%WITH_MODRSS%%lib/freeswitch/mod/mod_rss.so
+%%WITH_MODRTMP%%lib/freeswitch/mod/mod_rtmp.la
+%%WITH_MODRTMP%%lib/freeswitch/mod/mod_rtmp.so
 %%WITH_MODSAYDE%%lib/freeswitch/mod/mod_say_de.la
 %%WITH_MODSAYDE%%lib/freeswitch/mod/mod_say_de.so
 %%WITH_MODSAYEN%%lib/freeswitch/mod/mod_say_en.la
@@ -362,6 +378,8 @@ lib/freeswitch/mod/mod_native_file.so
 %%WITH_MODSAYES%%lib/freeswitch/mod/mod_say_es.so
 %%WITH_MODSAYFR%%lib/freeswitch/mod/mod_say_fr.la
 %%WITH_MODSAYFR%%lib/freeswitch/mod/mod_say_fr.so
+%%WITH_MODSAYHE%%lib/freeswitch/mod/mod_say_he.la
+%%WITH_MODSAYHE%%lib/freeswitch/mod/mod_say_he.so
 %%WITH_MODSAYHU%%lib/freeswitch/mod/mod_say_hu.la
 %%WITH_MODSAYHU%%lib/freeswitch/mod/mod_say_hu.so
 %%WITH_MODSAYIT%%lib/freeswitch/mod/mod_say_it.la
@@ -384,18 +402,22 @@ lib/freeswitch/mod/mod_siren.la
 lib/freeswitch/mod/mod_siren.so
 %%WITH_MODSKINNY%%lib/freeswitch/mod/mod_skinny.la
 %%WITH_MODSKINNY%%lib/freeswitch/mod/mod_skinny.so
+lib/freeswitch/mod/mod_sms.la
+lib/freeswitch/mod/mod_sms.so
 %%WITH_MODSNAPSHOT%%lib/freeswitch/mod/mod_snapshot.la
 %%WITH_MODSNAPSHOT%%lib/freeswitch/mod/mod_snapshot.so
 lib/freeswitch/mod/mod_sndfile.la
 lib/freeswitch/mod/mod_sndfile.so
+%%WITH_MODSNMP%%lib/freeswitch/mod/mod_snmp.la
+%%WITH_MODSNMP%%lib/freeswitch/mod/mod_snmp.so
 %%WITH_MODSNOM%%lib/freeswitch/mod/mod_snom.la
 %%WITH_MODSNOM%%lib/freeswitch/mod/mod_snom.so
 lib/freeswitch/mod/mod_sofia.la
 lib/freeswitch/mod/mod_sofia.so
 %%WITH_MODSOUNDTOUCH%%lib/freeswitch/mod/mod_soundtouch.la
 %%WITH_MODSOUNDTOUCH%%lib/freeswitch/mod/mod_soundtouch.so
-%%WITH_MODFAX%%lib/freeswitch/mod/mod_spandsp.la
-%%WITH_MODFAX%%lib/freeswitch/mod/mod_spandsp.so
+lib/freeswitch/mod/mod_spandsp.la
+lib/freeswitch/mod/mod_spandsp.so
 lib/freeswitch/mod/mod_speex.la
 lib/freeswitch/mod/mod_speex.so
 lib/freeswitch/mod/mod_spidermonkey.la
@@ -442,15 +464,14 @@ www/freeswitch/htdocs/slim.swf
 www/freeswitch/htdocs/slimtest.htm
 @dirrm www/freeswitch/htdocs
 @dirrm www/freeswitch
-@dirrm share/freeswitch/sounds
-@dirrm share/freeswitch
+@dirrmtry share/freeswitch/sounds
+@dirrmtry share/freeswitch
 %%WITH_MODPERL%%@dirrm perl
 @dirrm lib/freeswitch/mod
 @dirrm lib/freeswitch/lib
 @dirrm lib/freeswitch
 @dirrm include/freeswitch
 @dirrm etc/freeswitch/scripts
-%%WITH_MODPOCKETSPHINX%%@dirrm etc/freeswitch/grammar/model/wsj1
 %%WITH_MODPOCKETSPHINX%%@dirrm etc/freeswitch/grammar/model/communicator
 %%WITH_MODPOCKETSPHINX%%@dirrm etc/freeswitch/grammar/model
 @dirrm etc/freeswitch/grammar
@@ -463,11 +484,16 @@ www/freeswitch/htdocs/slimtest.htm
 @dirrm etc/freeswitch/conf/lang/ru/dir
 @dirrm etc/freeswitch/conf/lang/ru/demo
 @dirrm etc/freeswitch/conf/lang/ru
+@dirrm etc/freeswitch/conf/lang/he/vm
+@dirrm etc/freeswitch/conf/lang/he/dir
+@dirrm etc/freeswitch/conf/lang/he/demo
+@dirrm etc/freeswitch/conf/lang/he
 @dirrm etc/freeswitch/conf/lang/fr/vm
 @dirrm etc/freeswitch/conf/lang/fr/dir
 @dirrm etc/freeswitch/conf/lang/fr/demo
 @dirrm etc/freeswitch/conf/lang/fr
 @dirrm etc/freeswitch/conf/lang/en/vm
+@dirrm etc/freeswitch/conf/lang/en/ivr
 @dirrm etc/freeswitch/conf/lang/en/dir
 @dirrm etc/freeswitch/conf/lang/en/demo
 @dirrm etc/freeswitch/conf/lang/en
@@ -483,25 +509,15 @@ www/freeswitch/htdocs/slimtest.htm
 @dirrm etc/freeswitch/conf/dialplan/public
 @dirrm etc/freeswitch/conf/dialplan/default
 @dirrm etc/freeswitch/conf/dialplan
+@dirrm etc/freeswitch/conf/chatplan
 @dirrm etc/freeswitch/conf/autoload_configs
 @dirrm etc/freeswitch/conf
 @dirrm etc/freeswitch
-@exec mkdir -p %D/etc/freeswitch/scripts
-@exec mkdir -p %D/share/freeswitch/sounds
 @cwd /var
-@dirrm spool/freeswitch/voicemail
-@dirrm log/freeswitch/xml_cdr
-@dirrm log/freeswitch
-@dirrm freeswitch/recordings
-@dirrm freeswitch
-@dirrm db/freeswitch
-@exec mkdir -p %D/spool/freeswitch/voicemail
-@exec mkdir -p %D/log/freeswitch/
-@exec mkdir -p %D/log/freeswitch/xml_cdr
-@exec mkdir -p %D/freeswitch
-@exec mkdir -p %D/freeswitch/recordings
-@exec mkdir -p %D/db/freeswitch
-@exec chown -R freeswitch:freeswitch spool/freeswitch/voicemail
-@exec chown -R freeswitch:freeswitch log/freeswitch/xml_cdr
-@exec chown -R freeswitch:freeswitch freeswitch/recordings
-@exec chown -R freeswitch:freeswitch db/freeswitch
+@dirrmtry spool/freeswitch/voicemail
+@dirrmtry spool/freeswitch
+@dirrmtry log/freeswitch/xml_cdr
+@dirrmtry log/freeswitch
+@dirrmtry freeswitch/recordings
+@dirrmtry freeswitch
+@dirrmtry db/freeswitch