Refactor to fit better in the ports infrastructure.

PR:	ports/148440
Submitted by:	Richard Neese <r.neese@gmail.com>

15 files changed, 698 insertions, 386 deletions

diff --git a/net/freeswitch-core/Makefile b/net/freeswitch-core/Makefile
index e9e9a378bcb4..467537721c7d 100644
--- a/net/freeswitch-core/Makefile
+++ b/net/freeswitch-core/Makefile
@@ -5,14 +5,26 @@
 # $FreeBSD$
 #
 
-PORTNAME=	freeswitch
+PORTNAME=	freeswitch-core
 PORTVERSION=	1.0.6
+PORTREVISION=	2
 CATEGORIES=	net
-MASTER_SITES=	http://files.freeswitch.org/ \
-		ftp://ftp.secure-computing.net/pub/freeswitch/ \
-		ftp://ftp2.secure-computing.net/pub/freeswitch/
-PKGNAMESUFFIX=	-core
-DISTNAME=	${PORTNAME}-${PORTVERSION}
+MASTER_SITES=	http://files.freeswitch.org/:1 \
+		http://files.freeswitch.org/downloads/libs/:2
+DISTFILES=	freeswitch-${PORTVERSION}.tar.gz:1 \
+		celt-0.7.1.tar.gz:2 \
+		flite-1.3.99-latest.tar.gz:2 \
+		json-c-0.9.tar.gz \
+		lame-3.97.tar.gz:2 \
+		libmemcached-0.32.tar.gz \
+		libshout-2.2.2.tar.gz:2 \
+		mpg123.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 \
+		communicator_semi_6000_20080321.tar.gz:2
+EXTRACT_ONLY=	freeswitch-${PORTVERSION}.tar.gz
 
 MAINTAINER=	ecrist@secure-computing.net
 COMMENT=	FreeSwitch SoftSwitch Port
@@ -35,13 +47,13 @@ SUB_FILES=	pkg-install pkg-message
 USE_RC_SUBR=	freeswitch
 HAS_CONFIGURE=	yes
 VARBASE?=	/var
-CONFIGURE_ARGS=	--prefix=${PREFIX}/share/${PORTNAME} \
+CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--bindir=${PREFIX}/bin \
 		--sysconfdir=${PREFIX}/etc/${PORTNAME}/conf \
 		--includedir=${PREFIX}/include/${PORTNAME} \
 		--libdir=${PREFIX}/lib/${PORTNAME}/lib \
 		--with-modinstdir=${PREFIX}/lib/${PORTNAME}/mod \
-		--with-rundir=${VARBASE}/run \
+		--with-rundir=${VARBASE}/run/freeswitch \
 		--with-libgnutls-prefix=${LOCALBASE} \
 		--with-ogg=${LOCALBASE} \
 		--with-ogg-libraries=${LOCALBASE}/lib \
@@ -54,9 +66,8 @@ CPPFLAGS+=	-I${PREFIX}/include
 
 FREESWITCH_USER=	freeswitch
 FREESWITCH_GROUP=	${FREESWITCH_USER}
-UID=    610
-GID=    ${UID}
-SUB_LIST=	FREESWITCH_USER=${FREESWITCH_USER} FREESWITCH_GROUP=${FREESWITCH_GROUP} UID=${UID} GID=${GID}
+
+SUB_LIST=	FREESWITCH_USER=${FREESWITCH_USER} FREESWITCH_GROUP=${FREESWITCH_GROUP}
 
 OPTIONS=	MODSHOUT        "Enable mod_shout (streaming audio/mp3)" on \
 		MODFLITE	"Enable mod_flite (Text to Speech)" on \
@@ -87,7 +98,6 @@ OPTIONS=	MODSHOUT        "Enable mod_shout (streaming audio/mp3)" on \
 		MODPORTAUDIO    "Enable mod_portaudio" on \
 		MODPASTREAM	"Enable mod_portaudio_stream (new)" on \
 		MODSHELLSTREAM	"Enable mod_SHELL_stream (New)" on \
-		MODSPDRMNKYODBC	"Enable mod_spidermonkey_odbc (req odbc)" on \
 		MODPERL		"Enable mod_perl (perl support)" off \
 		MODPYTHON	"Enable mod_python (python lang)" off \
 		MODCURL		"Enable mod_curl" off \
@@ -103,28 +113,24 @@ OPTIONS=	MODSHOUT        "Enable mod_shout (streaming audio/mp3)" on \
 		MODSAYNL	"Enable mod_say_nl (Dutch support)" off \
 		MODSAYRU	"Enable mod_say_ru (Russian support)" on \
 		MODSAYTH	"Enable mod_say_th (Thi support(new)" off \
-		MODSAYZH	"Enable mod_say_zh (Chinese support)" off
+		MODSAYZH	"Enable mod_say_zh (Chinese support)" off \
+		EXTENSIONS	"Include Default User Extensions" off
 
 .include <bsd.port.options.mk>
 
-.if defined(PACKAGE_BUILDING)
-BROKEN=		Fails to compile on pointyhat
-.endif
-
 .if ${ARCH} == "amd64"
 CFLAGS+=	-fPIC
-CONFIGURE_ARGS+=	--enable-64
 .endif
 
 .for i in MODFLITE MODPOCKETSPHINX MODCIDLOOKUP MODDPDIRECTORY MODEASYROUTE MODLCR MODSOUNDTOUCH \
 	MODRSS MODSNOM MODVMD MODSPY MODAMRWB MODCELT MODMULTICAST MODPORTAUDIO MODCURL MODXMLCURL \
 	MODSAYDE MODSAYEN MODSAYES MODSAYFR MODSAYHU MODSAYIT MODSAYNL MODSAYRU MODSAYTH MODSAYZH \
 	MODNIBBLEBILL MODDINGALING MODDIRECTORY MODMEMCACHE MODPYTHON MODPASTREAM MODSHELLSTREAM \
-	MODSILK MODSPDRMNKYODBC MODUNIMRCP MODTTSCMDLINE MODDISTRIBUTOR MODSNAPSHOT MODSKINNY
+	MODSILK MODUNIMRCP MODTTSCMDLINE MODDISTRIBUTOR MODSNAPSHOT MODSKINNY EXTENSIONS
 .if !defined(WITH_${i})
-PLIST_SUB+=     WITH_${i}="@comment "
+PLIST_SUB+=	WITH_${i}="@comment "
 .else
-PLIST_SUB+=     WITH_${i}=""
+PLIST_SUB+=	WITH_${i}=""
 .endif
 .endfor
 
@@ -168,18 +174,18 @@ PLIST_SUB+=	WITH_MODERLANGEVENT=""
 BUILD_DEPENDS+=	${LOCALBASE}/lib/erlang/usr/include/erl_driver.h:${PORTSDIR}/lang/erlang-lite
 .endif
 
-.if !defined(WITH_MODSKINNY)
-PLIST_SUB+=	WITH_MODSKINNY="@comment "
-.else
-PLIST_SUB+=	WITH_MODSKINNY=""
-.endif
-
 pre-configure:
 	cd ${WRKSRC} && ./rebootstrap.sh
-	@${REINPLACE_CMD} -e 's|pkgconfigdir = $$(libdir)/pkgconfig|pkgconfigdir = $(libdir)data/libdata/pkgconfig|g' ${WRKSRC}/libs/*/Makefile.am
-	@${REINPLACE_CMD} -e 's|pkgconfigdir = $$(libdir)/pkgconfig|pkgconfigdir = $(libdir)data/libdata/pkgconfig|g' ${WRKSRC}/libs/*/Makefile.in
-	@${REINPLACE_CMD} -e 's|pkgconfigdir = $$(libdir)/pkgconfig|pkgconfigdir = $(libdir)data/libdata/pkgconfig|g' ${WRKSRC}/Makefile.am
-	@${REINPLACE_CMD} -e 's|pkgconfigdir = $$(libdir)/pkgconfig|pkgconfigdir = $(libdir)data/libdata/pkgconfig|g' ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e 's|pkgconfigdir = $$(libdir)/pkgconfig|pkgconfigdir = ${PREFIX}/libdata/libdata/pkgconfig|g' ${WRKSRC}/libs/*/Makefile.am
+	@${REINPLACE_CMD} -e 's|pkgconfigdir = $$(libdir)/pkgconfig|pkgconfigdir = ${PREFIX}/libdata/pkgconfig|g' ${WRKSRC}/libs/*/Makefile.in
+	@${REINPLACE_CMD} -e 's|pkgconfigdir = $$(libdir)/pkgconfig|pkgconfigdir = ${PREFIX}/libdata/libdata/pkgconfig|g' ${WRKSRC}/Makefile.am
+	@${REINPLACE_CMD} -e 's|pkgconfigdir = $$(libdir)/pkgconfig|pkgconfigdir = ${PREFIX}/libdata/libdata/pkgconfig|g' ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e 's|base=http://files.freeswitch.org/downloads/libs/|base=file:///usr/ports/distfiles/|g' ${WRKSRC}/build/getlib.sh.in
+
+.if defined(WITH_VOICEMAILPATCH)
+	@${REINPLACE_CMD} -e 's|${storage_dir}/|${voicemail_dir}|g' ${WRKSRC}/src/mod/applications/mod_voicemail/mod_voicemail.c
+	@${REINPLACE_CMD} -e 's|<!--<param name="storage-dir" value="/tmp"/>-->|<!--<param name="voicemail-dir" value="/var/spool/freeswitch/voicemail"/>-->|g' ${WRKSRC}/conf/autoload_configs/voicemail.conf.xml
+.endif
 
 post-configure:
 .for i in mod_unimrcp mod_flite mod_pocketsphinx
@@ -220,9 +226,6 @@ post-configure:
 	@${REINPLACE_CMD} -e 's|#\(languages/${i}\)|\1|g' ${WRKSRC}/modules.conf
 .endif
 .endfor
-.if defined(WITH_MODSPDRMNKYODBC)
-	@${REINPLACE_CMD} -e 's|#languages/mod_spidermonkey_odbc|languages/mod_spidermonkey_odbc|g' ${WRKSRC}/modules.conf
-.endif
 .for i in mod_skinny mod_portaudio mod_dingaling
 .if defined(WITH_${i:C/_//g:U})
 	@${REINPLACE_CMD} -e 's|#\(endpoints/${i}\)|\1|g' ${WRKSRC}/modules.conf
@@ -243,57 +246,36 @@ post-configure:
 .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_MODSKINNY)
-	@${REINPLACE_CMD} -e 's|#endpoints/mod_skinny|endpoints/mod_skinny|g' ${WRKSRC}/modules.conf
-.endif
 
 pre-install:
 	@${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
 
-do-install:
-	cd ${WRKSRC} && ${GMAKE} ${INSTALL}
-	@${MKDIR} ${VARBASE}/db/${PORTNAME}
-	@${RM} -rf ${PREFIX}/share/${PORTNAME}/db
-	@${LN} -F -s ${VARBASE}/db/${PORTNAME}/ ${PREFIX}/share/${PORTNAME}/db
-	@${CHOWN} -R ${FREESWITCH_USER}:${FREESWITCH_GROUP} ${VARBASE}/db/${PORTNAME}
-	@${CHMOD} -R 774 ${VARBASE}/db/${PORTNAME}
-	@${MKDIR} ${VARBASE}/${PORTNAME}/recordings
-	@${RM} -rf ${PREFIX}/share/${PORTNAME}/recordings
-	@${LN} -F -s ${VARBASE}/${PORTNAME}/recordings ${PREFIX}/share/${PORTNAME}/recordings
-	@${MKDIR} ${VARBASE}/${PORTNAME}/scripts
-	@${RM} -rf ${PREFIX}/share/${PORTNAME}/scripts
-	@${LN} -F -s ${VARBASE}/${PORTNAME}/scripts ${PREFIX}/share/${PORTNAME}/scripts
-	@${MKDIR} ${VARBASE}/log/${PORTNAME}/xml_cdr
-	@${RM} -rf ${PREFIX}/share/${PORTNAME}/log
-	@${LN} -F -s ${VARBASE}/log/${PORTNAME}/ ${PREFIX}/share/${PORTNAME}/log
-	@${CHOWN} -R ${FREESWITCH_USER}:${FREESWITCH_GROUP} ${VARBASE}/log/${PORTNAME}
-	@${CHMOD} -R 774 ${VARBASE}/log/${PORTNAME}
-	@${MKDIR} ${VARBASE}/spool/voicemail
-	@${LN} -F -s ${VARBASE}/spool/voicemail ${PREFIX}/share/${PORTNAME}/storage
-	@${CHOWN} -R ${FREESWITCH_USER}:${FREESWITCH_GROUP} ${VARBASE}/spool/voicemail
-	@${CHMOD} -R 774 ${VARBASE}/spool/voicemail
-	@${CHOWN} -R ${FREESWITCH_USER}:${FREESWITCH_GROUP} ${VARBASE}/${PORTNAME}
-	@${CHMOD} -R 774 ${VARBASE}/${PORTNAME}
-	@${CHOWN} -R ${FREESWITCH_USER}:${FREESWITCH_GROUP} ${PREFIX}/share/${PORTNAME}
-	@${CHMOD} -R 774 ${PREFIX}/share/${PORTNAME}
-	@${CHOWN} -R ${FREESWITCH_USER}:${FREESWITCH_GROUP} ${PREFIX}/etc/${PORTNAME}
-	@${CHMOD} -R 774 ${PREFIX}/etc/${PORTNAME}
+.if !defined(WITH_EXTENSIONS)
+	@${RM} ${WRKSRC}/conf/directory/default/*
+.endif
 
 post-install:
-.if !defined(NOPORTEXAMPLES)
-	@${MKDIR} ${EXAMPLESDIR}/conf
-	(cd ${WRKSRC}/conf/ && \
-		${COPYTREE_SHARE} \* ${EXAMPLESDIR}/conf)
-.endif
-.if defined(WITH_MODOPENZAP)
-	(cd ${WRKSRC}/libs/openzap/conf/ && \
-		${CP} *.conf ${EXAMPLESDIR}/conf && \
-		${CP} openzap.conf.xml ${EXAMPLESDIR}/conf/autoload_configs)
+.if !defined(WITH_EXTENSIONS)
+	@${MKDIR} ${PREFIX}/etc/${PORTNAME}/conf/directory/default
 .endif
+	@${MKDIR} ${PREFIX}/share/${PORTNAME}/sounds
+	@${CHOWN} -R ${FREESWITCH_USER}:${FREESWITCH_GROUP} ${PREFIX}/etc/${PORTNAME}
+	@${CHOWN} -R ${FREESWITCH_USER}:${FREESWITCH_GROUP} ${PREFIX}/share/${PORTNAME}
+	@${CHOWN} -R ${FREESWITCH_USER}:${FREESWITCH_GROUP} ${VARBASE}/db/${PORTNAME}
+	@${CHOWN} -R ${FREESWITCH_USER}:${FREESWITCH_GROUP} ${VARBASE}/log/${PORTNAME}
+	@${CHOWN} -R ${FREESWITCH_USER}:${FREESWITCH_GROUP} ${VARBASE}/${PORTNAME}
+	@${CHOWN} -R ${FREESWITCH_USER}:${FREESWITCH_GROUP} ${VARBASE}/run/${PORTNAME}
+	@${CHOWN} -R ${FREESWITCH_USER}:${FREESWITCH_GROUP} ${VARBASE}/spool/${PORTNAME}
+	@for i in $$(${FIND} ${PREFIX}/etc/${PORTNAME}/conf/ -type f -name '*.sample'); do if [ ! -f $${i%.sample} ]; then ${CP} -p $$i $${i%.sample}; fi; done
 	@${CAT} ${PKGMESSAGE}
 
 .if ${OSVERSION} < 700000
 IGNORE=		freeswitch is only supported on FreeBSD 7 or newer
 .endif
 
+	@${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/${PORTNAME} ${VARBASE}/log/${PORTNAME} ${VARBAE}/${PORTNAME} ${PREFIX}/etc/${PORTNAME}"
+
 .include <bsd.port.mk>
diff --git a/net/freeswitch-core/distinfo b/net/freeswitch-core/distinfo
index 7dbf3ccf30ec..90148b66ec7c 100644
--- a/net/freeswitch-core/distinfo
+++ b/net/freeswitch-core/distinfo
@@ -1,3 +1,39 @@
 MD5 (freeswitch-1.0.6.tar.gz) = 388effee587887a81fe7f411b7350590
 SHA256 (freeswitch-1.0.6.tar.gz) = 5610f478307b5c06d38e1ea4029298142c2960e426c3297378857d8734770215
 SIZE (freeswitch-1.0.6.tar.gz) = 36400963
+MD5 (celt-0.7.1.tar.gz) = c7f6b8346e132b1a48dae0eff77ea9f0
+SHA256 (celt-0.7.1.tar.gz) = 93f0e2dfb59021b19e69dc0dee855eb89f19397db1dea0d0d6f9329cff933066
+SIZE (celt-0.7.1.tar.gz) = 425092
+MD5 (flite-1.3.99-latest.tar.gz) = 365b60881715c5e13c0d8bc37d9be6ff
+SHA256 (flite-1.3.99-latest.tar.gz) = ac5832c7b654c5adf9ec3df0e8a7c817d2105233e11ce5aa7e97a8c6c8e14e13
+SIZE (flite-1.3.99-latest.tar.gz) = 17440698
+MD5 (json-c-0.9.tar.gz) = 3a13d264528dcbaf3931b0cede24abae
+SHA256 (json-c-0.9.tar.gz) = 702a486c9bf8e19137d484ab5c49b4ad314eb5e1fe37062a72c0a0fa39439475
+SIZE (json-c-0.9.tar.gz) = 340953
+MD5 (lame-3.97.tar.gz) = 90a4acbb730d150dfe80de145126eef7
+SHA256 (lame-3.97.tar.gz) = 0a2334a6d11085298a9a3c46d5d310cca012f2e61d6efae90840a76a364dbe17
+SIZE (lame-3.97.tar.gz) = 1328058
+MD5 (libmemcached-0.32.tar.gz) = 2f06059803737b6bf6135edfc86db4b3
+SHA256 (libmemcached-0.32.tar.gz) = cf1be20af93163d6ab25b511f79c515778ebced54806875561ebef46011f2a9b
+SIZE (libmemcached-0.32.tar.gz) = 512586
+MD5 (libshout-2.2.2.tar.gz) = e409b006b5dad6d8668c3e429bf20159
+SHA256 (libshout-2.2.2.tar.gz) = 38701125cb0e0349f4394dd3254d6037eeb8af0747c0942ff433ffbcd48d2367
+SIZE (libshout-2.2.2.tar.gz) = 478582
+MD5 (mpg123.tar.gz) = 5af8730df15a50b3814bcb4686f3a8ff
+SHA256 (mpg123.tar.gz) = 408fed3b37d83ab2396bcf6253d62e75e573ba96b7c4497f0faddd557763b97b
+SIZE (mpg123.tar.gz) = 1253597
+MD5 (openldap-2.4.11.tar.gz) = 920fedbbb5bc61c2ca52c56edeef770a
+SHA256 (openldap-2.4.11.tar.gz) = 76e57147a2373015f306f2e72128330e51d5c0f1056b4713283234dfd16c1c9c
+SIZE (openldap-2.4.11.tar.gz) = 4941654
+MD5 (pocketsphinx-0.5.99-20091212.tar.gz) = 9162b0008213bbd3e8b046f6ab576d12
+SHA256 (pocketsphinx-0.5.99-20091212.tar.gz) = ad2318103ae16bd1740b0e8658bc6d5fa8964e8eb79de128f7c106d3401f2f48
+SIZE (pocketsphinx-0.5.99-20091212.tar.gz) = 11703230
+MD5 (soundtouch-1.3.1.tar.gz) = 86979af5a2dde55d58967600476b8c23
+SHA256 (soundtouch-1.3.1.tar.gz) = ff5ff8dfe4a078ced7478a71f0d4715ee27743424f5c06db19829e2fee06b2b5
+SIZE (soundtouch-1.3.1.tar.gz) = 407740
+MD5 (sphinxbase-0.4.99-20091212.tar.gz) = 0a6e3e726d8900961ec998dd1ba6c128
+SHA256 (sphinxbase-0.4.99-20091212.tar.gz) = a1e359aa92934414bc4fe1dcbb93edad11bf7b5f625c94bdebe85d6dfe3618f0
+SIZE (sphinxbase-0.4.99-20091212.tar.gz) = 2150613
+MD5 (communicator_semi_6000_20080321.tar.gz) = 504941aa35924af84cee1bf61914d923
+SHA256 (communicator_semi_6000_20080321.tar.gz) = dbb5e9fb85000a7cb97d6958a3ef8d77532dc55fc730ac6979705e8645cb0c18
+SIZE (communicator_semi_6000_20080321.tar.gz) = 5595694
diff --git a/net/freeswitch-core/files/freeswitch.in b/net/freeswitch-core/files/freeswitch.in
index 0e5ead8bb421..258c25a144c8 100644
--- a/net/freeswitch-core/files/freeswitch.in
+++ b/net/freeswitch-core/files/freeswitch.in
@@ -18,15 +18,15 @@
 freeswitch_enable=${freeswitch_enable:-"NO"}
 freeswitch_user=${freeswitch_user:-"freeswitch"}
 freeswitch_group=${freeswitch_group:-"freeswitch"}
-freeswitch_flags=${freeswitch_flags:-""}
+freeswitch_flags=${freeswitch_flags:-"-nc"}
 
 name=freeswitch
 rcvar=`set_rcvar`
 
 command=%%PREFIX%%/bin/freeswitch
-command_args="-nc -u ${freeswitch_user} -g ${freeswitch_group} ${freeswitch_flags} -db /var/db/freeswitch -log /var/log/freeswitch/"
+command_args="${freeswitch_flags} ${freeswitch_user} -g ${freeswitch_group}"
 
-pidfile=${freeswitch_pidfile:-"/var/run/freeswitch.pid"}
+pidfile=${freeswitch_pidfile:-"/var/run/freeswitch/freeswitch.pid"}
 
 start_cmd="freeswitch_start"
 stop_precmd="freeswitch_stop"
diff --git a/net/freeswitch-core/files/patch-Makefile.am b/net/freeswitch-core/files/patch-Makefile.am
index 10431d0b0045..45caf1210cad 100644
--- a/net/freeswitch-core/files/patch-Makefile.am
+++ b/net/freeswitch-core/files/patch-Makefile.am
@@ -1,13 +1,23 @@
---- Makefile.am.orig	2010-05-11 15:58:08.000000000 -0700
-+++ Makefile.am	2010-05-12 20:01:14.000000000 -0700
-@@ -450,8 +450,8 @@
- 	@echo Installing $(NAME)
- 	@for x in $(modulesdir) $(runtimedir) $(dbdir) $(logfiledir) $(logfiledir)/xml_cdr $(bindir) $(scriptdir) $(recordingsdir) $(grammardir); do \
- 		$(mkinstalldirs) $(DESTDIR)$$x ; \
--	 done
--	test -d $(DESTDIR)$(sysconfdir) || $(MAKE) samples-conf
-+	done
-+	test -d $(DESTDIR)$(sysconfdir) || $(mkinstalldirs) $(DESTDIR)$(sysconfdir)
- 	test -d $(DESTDIR)$(htdocsdir) || $(MAKE) samples-htdocs
+--- Makefile.am	2010-06-22 17:19:37.000000000 -0400
++++ Makefile.am	2010-07-02 11:45:29.000000000 -0400
+@@ -426,7 +426,7 @@
+ 		test -d $(DESTDIR)$(sysconfdir)$$dir || $(mkinstalldirs) $(DESTDIR)$(sysconfdir)$$dir ; \
+ 		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; \
+ 	done
+ 
+ samples-htdocs: 
+@@ -444,8 +444,9 @@
+ 	$(mkinstalldirs) $(DESTDIR)$(modulesdir)
  
- is-scm:
+ 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 \
+ 		$(mkinstalldirs) $(DESTDIR)$$x ; \
+ 	 done
+ 	test -d $(DESTDIR)$(sysconfdir) || $(MAKE) samples-conf
diff --git a/net/freeswitch-core/files/patch-conf-autoload_configs-switch.conf.xml b/net/freeswitch-core/files/patch-conf-autoload_configs-switch.conf.xml
new file mode 100644
index 000000000000..b028ccf588b8
--- /dev/null
+++ b/net/freeswitch-core/files/patch-conf-autoload_configs-switch.conf.xml
@@ -0,0 +1,10 @@
+--- conf/autoload_configs/switch.conf.xml	2010-06-22 17:19:31.000000000 -0400
++++ conf/autoload_configs/switch.conf.xml	2010-06-29 11:06:18.000000000 -0400
+@@ -71,6 +71,7 @@
+  -->    
+     <param name="mailer-app" value="sendmail"/>
+     <param name="mailer-app-args" value="-t"/>
++    <!--<param name="storage-dir" value="/tmp"/>-->
+     <param name="dump-cores" value="yes"/>
+     <!--RTP port range -->
+     <!--<param name="rtp-start-port" value="16384"/>-->
diff --git a/net/freeswitch-core/files/patch-conf-autoload_configs-voicemail.conf.xml b/net/freeswitch-core/files/patch-conf-autoload_configs-voicemail.conf.xml
new file mode 100644
index 000000000000..19ed9ad683d4
--- /dev/null
+++ b/net/freeswitch-core/files/patch-conf-autoload_configs-voicemail.conf.xml
@@ -0,0 +1,11 @@
+--- conf/autoload_configs/voicemail.conf.xml	2010-06-22 17:19:31.000000000 -0400
++++ conf/autoload_configs/voicemail.conf.xml	2010-06-29 11:10:26.000000000 -0400
+@@ -57,7 +57,7 @@
+         <param name="date-fmt" value="%A, %B %d %Y, %I %M %p"/>
+         <param name="email-from" value="${voicemail_account}@${voicemail_domain}"/>
+       </email>
+-      <!--<param name="storage-dir" value="/tmp"/>-->
++      <!--<param name="voicemail-dir" value="/tmp"/>-->
+       <!--<param name="odbc-dsn" value="dsn:user:pass"/>-->
+       <!--<param name="record-comment" value="Your Comment"/>-->
+       <!--<param name="record-title" value="Your Title"/>-->
diff --git a/net/freeswitch-core/files/patch-configure.in b/net/freeswitch-core/files/patch-configure.in
new file mode 100644
index 000000000000..e8545fb68617
--- /dev/null
+++ b/net/freeswitch-core/files/patch-configure.in
@@ -0,0 +1,52 @@
+--- configure.in	2010-06-22 17:19:37.000000000 -0400
++++ configure.in	2010-06-29 12:01:43.000000000 -0400
+@@ -44,34 +44,42 @@
+ AC_SUBST(runtimedir)
+ AC_DEFINE_UNQUOTED([SWITCH_RUN_DIR],"${runtimedir}",[where to put pidfile to])
+ 
+-logfiledir="${prefix}/log"
++logfiledir="/var/log/freeswitch"
+ AC_SUBST(logfiledir)
+ AC_DEFINE_UNQUOTED([SWITCH_LOG_DIR],"${logfiledir}",[where to put log files])
+ 
+-dbdir="${prefix}/db"
++dbdir="/var/db/freeswitch"
+ AC_SUBST(dbdir)
+ AC_DEFINE_UNQUOTED([SWITCH_DB_DIR],"${dbdir}",[where to put db files])
+ 
+-htdocsdir="${prefix}/htdocs"
++htdocsdir="${prefix}/www/freeswitch/htdocs"
+ AC_SUBST(htdocsdir)
+ AC_DEFINE_UNQUOTED([SWITCH_HTDOCS_DIR],"${htdocsdir}",[where to put htdocs files])
+ 
+-soundsdir="${prefix}/sounds"
++soundsdir="${prefix}/share/freeswitch/sounds"
+ AC_SUBST(soundsdir)
+ AC_DEFINE_UNQUOTED([SWITCH_SOUNDS_DIR],"${soundsdir}",[where to put sounds files])
+ 
+-grammardir="${prefix}/grammar"
++grammardir="${prefix}/etc/freeswitch/grammar"
+ AC_SUBST(grammardir)
+ AC_DEFINE_UNQUOTED([SWITCH_GRAMMAR_DIR],"${grammardir}",[where to put grammar files])
+ 
+-scriptdir="${prefix}/scripts"
++scriptdir="${prefix}/etc/freeswitch/scripts"
+ AC_SUBST(scriptdir)
+ AC_DEFINE_UNQUOTED([SWITCH_SCRIPT_DIR],"${scriptdir}",[where to put script files])
+ 
+-recordingsdir="${prefix}/recordings"
++recordingsdir="/var/freeswitch/recordings"
+ AC_SUBST(recordingsdir)
+ AC_DEFINE_UNQUOTED([SWITCH_RECORDINGS_DIR],"${recordingsdir}",[where to put recording files])
+ 
++storagedir="/var/freeswitch"
++AC_SUBST(storagedir)
++AC_DEFINE_UNQUOTED([SWITCH_STORAGE_DIR],"${storagedir}",[where to put extra files])
++
++voicemaildir="/var/spool/freeswitch/voicemail"
++AC_SUBST(voicemaildir)
++AC_DEFINE_UNQUOTED([SWITCH_VOICEMAIL_DIR],"${voicemaildir}",[where to put voicemail])
++
+ if test "$sysconfdir" = "\${prefix}/etc" ; then
+     confdir="$prefix/conf"
+ else
diff --git a/net/freeswitch-core/files/patch-libs-openzap-Makefile.am b/net/freeswitch-core/files/patch-libs-openzap-Makefile.am
new file mode 100644
index 000000000000..8cd8a48e913d
--- /dev/null
+++ b/net/freeswitch-core/files/patch-libs-openzap-Makefile.am
@@ -0,0 +1,18 @@
+--- libs/openzap/Makefile.am	2010-06-22 17:19:27.000000000 -0400
++++ libs/openzap/Makefile.am	2010-06-28 21:10:25.000000000 -0400
+@@ -34,7 +34,7 @@
+ 
+ moddir = @modinstdir@
+ libdir = @libdir@
+-library_includedir = $(PREFIX)/include
++library_includedir = @includedir@
+ 
+ INCS      = -I$(OZ_SRCDIR)/$(SRC)/include -I$(OZ_SRCDIR)/$(SRC)/isdn/include
+ if HAVE_SCTP
+@@ -268,5 +268,5 @@
+ install-data-local:
+ 	$(mkinstalldirs) $(DESTDIR)$(PREFIX)
+ 	$(mkinstalldirs) $(DESTDIR)@confdir@
+-	@[ -f "$(DESTDIR)@confdir@/openzap.conf" ] || ( cp conf/*.conf $(DESTDIR)@confdir@)
++	@for i in conf/*.conf; do cp $$i $$i.sample; done; cp -f conf/*.conf.sample $(DESTDIR)@confdir@
+ 	@echo OpenZAP Installed
diff --git a/net/freeswitch-core/files/patch-libs-openzap-mod_openzap-Makefile.in b/net/freeswitch-core/files/patch-libs-openzap-mod_openzap-Makefile.in
new file mode 100644
index 000000000000..da13490de219
--- /dev/null
+++ b/net/freeswitch-core/files/patch-libs-openzap-mod_openzap-Makefile.in
@@ -0,0 +1,11 @@
+--- libs/openzap/mod_openzap/Makefile.in	2010-06-22 17:19:26.000000000 -0400
++++ libs/openzap/mod_openzap/Makefile.in	2010-06-25 12:31:28.000000000 -0400
+@@ -15,7 +15,7 @@
+ 
+ local_install:
+ 	cd $(OZ_DIR) && $(MAKE) install
+-	[ -f $(DESTDIR)@confdir@/autoload_configs/openzap.conf.xml ] || cp -f $(OZ_DIR)/conf/openzap.conf.xml  $(DESTDIR)@confdir@/autoload_configs
++	@for i in $(OZ_DIR)/conf/*.xml; do cp $$i $$i.sample; done; cp  -f $(OZ_DIR)/conf/*.xml.sample $(DESTDIR)@confdir@/autoload_configs
+ 
+ local_clean:
+ 	cd $(OZ_DIR) && $(MAKE) clean
diff --git a/net/freeswitch-core/files/patch-src-include-private-switch_core_pvt.h b/net/freeswitch-core/files/patch-src-include-private-switch_core_pvt.h
new file mode 100644
index 000000000000..7c9ed30e1f82
--- /dev/null
+++ b/net/freeswitch-core/files/patch-src-include-private-switch_core_pvt.h
@@ -0,0 +1,10 @@
+--- src/include/private/switch_core_pvt.h	2010-06-22 17:19:31.000000000 -0400
++++ src/include/private/switch_core_pvt.h	2010-06-29 11:12:54.000000000 -0400
+@@ -209,6 +209,7 @@
+ 	int32_t sps;
+ 	int32_t sps_last;
+ 	switch_log_level_t hard_log_level;
++	char *storage_dir;
+ 	char *mailer_app;
+ 	char *mailer_app_args;
+ 	uint32_t max_dtmf_duration;
diff --git a/net/freeswitch-core/files/patch-src-include-switch_types.h b/net/freeswitch-core/files/patch-src-include-switch_types.h
new file mode 100644
index 000000000000..2ca1600f478c
--- /dev/null
+++ b/net/freeswitch-core/files/patch-src-include-switch_types.h
@@ -0,0 +1,10 @@
+--- 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 @@
+ 	char *storage_dir;
+ 	char *recordings_dir;
+ 	char *sounds_dir;
++	char *voicemail_dir;
+ };
+ 
+ typedef struct switch_directories switch_directories;
diff --git a/net/freeswitch-core/files/patch-src-mod-applications-mod_voicemail-mod_voicemail.c b/net/freeswitch-core/files/patch-src-mod-applications-mod_voicemail-mod_voicemail.c
new file mode 100644
index 000000000000..64c5a6cc4aa7
--- /dev/null
+++ b/net/freeswitch-core/files/patch-src-mod-applications-mod_voicemail-mod_voicemail.c
@@ -0,0 +1,127 @@
+--- src/mod/applications/mod_voicemail/mod_voicemail.c	2010-06-22 17:19:34.000000000 -0400
++++ src/mod/applications/mod_voicemail/mod_voicemail.c	2010-07-02 13:03:12.000000000 -0400
+@@ -119,7 +119,7 @@
+ 	char *operator_ext;
+ 	char *vmain_ext;
+ 	char *tone_spec;
+-	char *storage_dir;
++	char *voicemail_dir;
+ 	char *callback_dialplan;
+ 	char *callback_context;
+ 	char *email_body;
+@@ -539,8 +539,8 @@
+ 
+ 	SWITCH_CONFIG_SET_ITEM(profile->config[i++], "tone-spec", SWITCH_CONFIG_STRING, CONFIG_RELOADABLE,
+ 						   &profile->tone_spec, "%(1000, 0, 640)", &profile->config_str_pool, NULL, NULL);
+-	SWITCH_CONFIG_SET_ITEM(profile->config[i++], "storage-dir", SWITCH_CONFIG_STRING, CONFIG_RELOADABLE,
+-						   &profile->storage_dir, "", &profile->config_str_pool, NULL, NULL);
++	SWITCH_CONFIG_SET_ITEM(profile->config[i++], "voicemail-dir", SWITCH_CONFIG_STRING, CONFIG_RELOADABLE,
++						   &profile->voicemail_dir, "", &profile->config_str_pool, NULL, NULL);
+ 	SWITCH_CONFIG_SET_ITEM(profile->config[i++], "callback-dialplan", SWITCH_CONFIG_STRING, CONFIG_RELOADABLE,
+ 						   &profile->callback_dialplan, "XML", &profile->config_str_pool, NULL, NULL);
+ 	SWITCH_CONFIG_SET_ITEM(profile->config[i++], "callback-context", SWITCH_CONFIG_STRING, CONFIG_RELOADABLE,
+@@ -1706,7 +1706,7 @@
+ 	char *vm_email = NULL, *email_addr = NULL;
+ 	char *convert_cmd = profile->convert_cmd;
+ 	char *convert_ext = profile->convert_ext;
+-	char *vm_storage_dir = NULL;
++	char *vm_voicemail_dir = NULL;
+ 	char global_buf[2] = "";
+ 	switch_input_args_t args = { 0 };
+ 	const char *caller_id_name = NULL;
+@@ -2149,8 +2149,8 @@
+ 						convert_cmd = switch_core_session_strdup(session, val);
+ 					} else if (!strcasecmp(var, "vm-convert-ext")) {
+ 						convert_ext = switch_core_session_strdup(session, val);
+-					} else if (!strcasecmp(var, "storage-dir")) {
+-						vm_storage_dir = switch_core_session_strdup(session, val);
++					} else if (!strcasecmp(var, "voicemail-dir")) {
++						vm_voicemail_dir = switch_core_session_strdup(session, val);
+ 
+ 					} else if (!strcasecmp(var, "timezone")) {
+ 						switch_channel_set_variable(channel, var, val);
+@@ -2211,14 +2211,14 @@
+ 
+ 				if (auth) {
+ 					if (!dir_path) {
+-						if (!zstr(vm_storage_dir)) {
+-							dir_path = switch_core_session_sprintf(session, "%s%s%s", vm_storage_dir, SWITCH_PATH_SEPARATOR, myid);
+-						} else if (!zstr(profile->storage_dir)) {
++						if (!zstr(vm_voicemail_dir)) {
++							dir_path = switch_core_session_sprintf(session, "%s%s%s", vm_voicemail_dir, SWITCH_PATH_SEPARATOR, myid);
++						} else if (!zstr(profile->voicemail_dir)) {
+ 							dir_path =
+-								switch_core_session_sprintf(session, "%s%s%s%s%s", profile->storage_dir, SWITCH_PATH_SEPARATOR, domain_name,
++								switch_core_session_sprintf(session, "%s%s%s%s%s", profile->voicemail_dir, SWITCH_PATH_SEPARATOR, domain_name,
+ 															SWITCH_PATH_SEPARATOR, myid);
+ 						} else {
+-							dir_path = switch_core_session_sprintf(session, "%s%svoicemail%s%s%s%s%s%s", SWITCH_GLOBAL_dirs.storage_dir,
++							dir_path = switch_core_session_sprintf(session, "%s%s%s%s%s%s%s%s", SWITCH_GLOBAL_dirs.voicemail_dir,
+ 																   SWITCH_PATH_SEPARATOR,
+ 																   SWITCH_PATH_SEPARATOR,
+ 																   profile->name, SWITCH_PATH_SEPARATOR, domain_name, SWITCH_PATH_SEPARATOR, myid);
+@@ -2293,7 +2293,7 @@
+ 	int send_notify = 0;
+ 	int insert_db = 1;
+ 	int email_attach = 0;
+-	char *vm_storage_dir = NULL;
++	char *vm_voicemail_dir = NULL;
+ 	char *myfolder = "inbox";
+ 	int priority = 3;
+ 	const char *tmp;
+@@ -2366,12 +2366,12 @@
+ 
+ 	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Deliver VM to %s@%s\n", myid, domain_name);
+ 
+-	if (!zstr(vm_storage_dir)) {
+-		dir_path = switch_mprintf("%s%s%s", vm_storage_dir, SWITCH_PATH_SEPARATOR, myid);
+-	} else if (!zstr(profile->storage_dir)) {
+-		dir_path = switch_mprintf("%s%s%s%s%s", profile->storage_dir, SWITCH_PATH_SEPARATOR, domain_name, SWITCH_PATH_SEPARATOR, myid);
++	if (!zstr(vm_voicemail_dir)) {
++		dir_path = switch_mprintf("%s%s%s", vm_voicemail_dir, SWITCH_PATH_SEPARATOR, myid);
++	} else if (!zstr(profile->voicemail_dir)) {
++		dir_path = switch_mprintf("%s%s%s%s%s", profile->voicemail_dir, SWITCH_PATH_SEPARATOR, domain_name, SWITCH_PATH_SEPARATOR, myid);
+ 	} else {
+-		dir_path = switch_mprintf("%s%svoicemail%s%s%s%s%s%s", SWITCH_GLOBAL_dirs.storage_dir,
++		dir_path = switch_mprintf("%s%s%s%s%s%s%s%s", SWITCH_GLOBAL_dirs.voicemail_dir,
+ 								  SWITCH_PATH_SEPARATOR,
+ 								  SWITCH_PATH_SEPARATOR, profile->name, SWITCH_PATH_SEPARATOR, domain_name, SWITCH_PATH_SEPARATOR, myid);
+ 	}
+@@ -2822,7 +2822,7 @@
+ 	char date[80] = "";
+ 	switch_size_t retsize;
+ 	switch_time_t ts = switch_micro_time_now();
+-	char *vm_storage_dir = NULL;
++	char *vm_voicemail_dir = NULL;
+ 	char *record_macro = VM_RECORD_MESSAGE_MACRO;
+ 	int send_main = 0;
+ 	int send_notify = 0;
+@@ -2876,8 +2876,8 @@
+ 						email_addr = switch_core_session_strdup(session, val);
+ 					} else if (!strcasecmp(var, "vm-email-all-messages") && (send_main = switch_true(val))) {
+ 						send_mail++;
+-					} else if (!strcasecmp(var, "storage-dir")) {
+-						vm_storage_dir = switch_core_session_strdup(session, val);
++					} else if (!strcasecmp(var, "voicemail-dir")) {
++						vm_voicemail_dir = switch_core_session_strdup(session, val);
+ 					} else if (!strcasecmp(var, "vm-notify-email-all-messages") && (send_notify = switch_true(val))) {
+ 						send_mail++;
+ 					} else if (!strcasecmp(var, "vm-keep-local-after-email")) {
+@@ -2933,12 +2933,12 @@
+ 		}
+ 	}
+ 
+-	if (!zstr(vm_storage_dir)) {
+-		dir_path = switch_core_session_sprintf(session, "%s%s%s", vm_storage_dir, SWITCH_PATH_SEPARATOR, id);
+-	} else if (!zstr(profile->storage_dir)) {
+-		dir_path = switch_core_session_sprintf(session, "%s%s%s%s%s", profile->storage_dir, SWITCH_PATH_SEPARATOR, domain_name, SWITCH_PATH_SEPARATOR, id);
++	if (!zstr(vm_voicemail_dir)) {
++		dir_path = switch_core_session_sprintf(session, "%s%s%s", vm_voicemail_dir, SWITCH_PATH_SEPARATOR, id);
++	} else if (!zstr(profile->voicemail_dir)) {
++		dir_path = switch_core_session_sprintf(session, "%s%s%s%s%s", profile->voicemail_dir, SWITCH_PATH_SEPARATOR, domain_name, SWITCH_PATH_SEPARATOR, id);
+ 	} else {
+-		dir_path = switch_core_session_sprintf(session, "%s%svoicemail%s%s%s%s%s%s", SWITCH_GLOBAL_dirs.storage_dir,
++		dir_path = switch_core_session_sprintf(session, "%s%s%s%s%s%s%s%s", SWITCH_GLOBAL_dirs.voicemail_dir,
+ 											   SWITCH_PATH_SEPARATOR,
+ 											   SWITCH_PATH_SEPARATOR, profile->name, SWITCH_PATH_SEPARATOR, domain_name, SWITCH_PATH_SEPARATOR, id);
+ 	}
diff --git a/net/freeswitch-core/files/patch-src-switch_core.c b/net/freeswitch-core/files/patch-src-switch_core.c
new file mode 100644
index 000000000000..9bd0d482f113
--- /dev/null
+++ b/net/freeswitch-core/files/patch-src-switch_core.c
@@ -0,0 +1,63 @@
+--- src/switch_core.c	2010-06-22 17:19:36.000000000 -0400
++++ src/switch_core.c	2010-06-29 11:42:43.000000000 -0400
+@@ -489,6 +489,14 @@
+ #endif
+ 	}
+ 
++	if (!SWITCH_GLOBAL_dirs.voicemail_dir && (SWITCH_GLOBAL_dirs.voicemail_dir = (char *) malloc(BUFSIZE))) {
++#ifdef SWITCH_VOICEMAIL_DIR
++		switch_snprintf(SWITCH_GLOBAL_dirs.voicemail_dir, BUFSIZE, "%s", SWITCH_VOICEMAIL_DIR);
++#else
++		switch_snprintf(SWITCH_GLOBAL_dirs.voicemail_dir, BUFSIZE, "%s%svoicemail", storage_dir, SWITCH_PATH_SEPARATOR);
++#endif
++       }
++
+ 	if (!SWITCH_GLOBAL_dirs.db_dir && (SWITCH_GLOBAL_dirs.db_dir = (char *) malloc(BUFSIZE))) {
+ #ifdef SWITCH_DB_DIR
+ 		switch_snprintf(SWITCH_GLOBAL_dirs.db_dir, BUFSIZE, "%s", SWITCH_DB_DIR);
+@@ -546,6 +554,8 @@
+ 	switch_assert(SWITCH_GLOBAL_dirs.recordings_dir);
+ 	switch_assert(SWITCH_GLOBAL_dirs.sounds_dir);
+ 	switch_assert(SWITCH_GLOBAL_dirs.temp_dir);
++	switch_assert(SWITCH_GLOBAL_dirs.storage_dir);
++	switch_assert(SWITCH_GLOBAL_dirs.voicemail_dir);
+ }
+ 
+ SWITCH_DECLARE(int32_t) set_high_priority(void)
+@@ -1240,6 +1250,8 @@
+ 	switch_dir_make_recursive(SWITCH_GLOBAL_dirs.recordings_dir, SWITCH_DEFAULT_DIR_PERMS, runtime.memory_pool);
+ 	switch_dir_make_recursive(SWITCH_GLOBAL_dirs.sounds_dir, SWITCH_DEFAULT_DIR_PERMS, runtime.memory_pool);
+ 	switch_dir_make_recursive(SWITCH_GLOBAL_dirs.temp_dir, SWITCH_DEFAULT_DIR_PERMS, runtime.memory_pool);
++	switch_dir_make_recursive(SWITCH_GLOBAL_dirs.storage_dir, SWITCH_DEFAULT_DIR_PERMS, runtime.memory_pool);
++	switch_dir_make_recursive(SWITCH_GLOBAL_dirs.voicemail_dir, SWITCH_DEFAULT_DIR_PERMS, runtime.memory_pool);
+ 
+ 	switch_mutex_init(&runtime.uuid_mutex, SWITCH_MUTEX_NESTED, runtime.memory_pool);
+ 
+@@ -1273,7 +1285,9 @@
+ 	switch_find_local_ip(guess_ip, sizeof(guess_ip), NULL, AF_INET6);
+ 	switch_core_set_variable("local_ip_v6", guess_ip);
+ 	switch_core_set_variable("base_dir", SWITCH_GLOBAL_dirs.base_dir);
++	switch_core_set_variable("storage_dir", SWITCH_GLOBAL_dirs.storage_dir);
+ 	switch_core_set_variable("recordings_dir", SWITCH_GLOBAL_dirs.recordings_dir);
++	switch_core_set_variable("voicemail_dir", SWITCH_GLOBAL_dirs.voicemail_dir);
+ 	switch_core_set_variable("sound_prefix", SWITCH_GLOBAL_dirs.sounds_dir);
+ 	switch_core_set_variable("sounds_dir", SWITCH_GLOBAL_dirs.sounds_dir);
+ 	switch_core_set_serial();
+@@ -1417,6 +1431,8 @@
+ 					switch_set_flag((&runtime), SCF_EARLY_HANGUP);
+ 				} else if (!strcasecmp(var, "colorize-console") && switch_true(val)) {
+ 					runtime.colorize_console = SWITCH_TRUE;
++				} else if (!strcasecmp(var, "storage-dir") && !zstr(val)) {
++					runtime.storage_dir = switch_core_strdup(runtime.memory_pool, val);
+ 				} else if (!strcasecmp(var, "mailer-app") && !zstr(val)) {
+ 					runtime.mailer_app = switch_core_strdup(runtime.memory_pool, val);
+ 				} else if (!strcasecmp(var, "mailer-app-args") && val) {
+@@ -1867,6 +1883,8 @@
+ 	switch_safe_free(SWITCH_GLOBAL_dirs.script_dir);
+ 	switch_safe_free(SWITCH_GLOBAL_dirs.htdocs_dir);
+ 	switch_safe_free(SWITCH_GLOBAL_dirs.grammar_dir);
++	switch_safe_free(SWITCH_GLOBAL_dirs.storage_dir);
++	switch_safe_free(SWITCH_GLOBAL_dirs.voicemail_dir);
+ 	switch_safe_free(SWITCH_GLOBAL_dirs.recordings_dir);
+ 	switch_safe_free(SWITCH_GLOBAL_dirs.sounds_dir);
+ 	switch_safe_free(SWITCH_GLOBAL_dirs.temp_dir);
diff --git a/net/freeswitch-core/files/pkg-install.in b/net/freeswitch-core/files/pkg-install.in
index 7237295def60..fffa2cc5f66d 100644
--- a/net/freeswitch-core/files/pkg-install.in
+++ b/net/freeswitch-core/files/pkg-install.in
@@ -1,35 +1,32 @@
 #!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/net/freeswitch-core/files/pkg-install.in,v 1.1 2010-06-11 22:26:44 jpaetzel Exp $
 #
+# $FreeBSD: /tmp/pcvs/ports/net/freeswitch-core/files/pkg-install.in,v 1.2 2010-07-16 14:57:42 jpaetzel Exp $
+#
+
+PATH=/bin:/usr/bin:/usr/sbin
+
+case $2 in
+
+PRE-INSTALL)
+  echo "---> Starting pre-install script:"
+
+  if pw showgroup "freeswitch" 2>/dev/null; then
+    echo "---> Using existing group \"freeswitch\""
+  else
+    echo "---> Adding group \"freeswitch\""
+    pw addgroup freeswitch -h - || exit 1
+  fi
+
+
+  # Create user if required
+  if pw showuser "freeswitch" 2>/dev/null; then
+    echo "---> Using existing user \"freeswitch\""
+  else
+    echo "---> Adding user \"freeswitch\""
+    pw adduser freeswitch -g freeswitch -h - \
+      -d "/nonexistent" -s "/sbin/nologin" -c "freeswitch User" || exit 1
+  fi
+
+  ;;
 
-if [ "$2" != "PRE-INSTALL" ]; then
-	exit 0
-fi
-
-FREESWITCHUSER=%%FREESWITCH_USER%%
-FREESWITCHGROUP=%%FREESWITCH_GROUP%%
-FREESWITCHUID=%%UID%%
-FREESWITCHGID=%%GID%%
-
-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
-
-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
-
-exit 0
+esac
diff --git a/net/freeswitch-core/pkg-plist b/net/freeswitch-core/pkg-plist
index 8cf35fdba3b7..a100678e344b 100644
--- a/net/freeswitch-core/pkg-plist
+++ b/net/freeswitch-core/pkg-plist
@@ -1,12 +1,175 @@
+@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_ivrd
 bin/fsxs
 bin/gentls_cert
-%%WITH_MODOPENZAP%%%%ETCDIR%%/conf/autoload_configs
+%%ETCDIR%%/conf/autoload_configs/acl.conf.xml.sample
+%%ETCDIR%%/conf/autoload_configs/alsa.conf.xml.sample
+%%ETCDIR%%/conf/autoload_configs/cdr_csv.conf.xml.sample
+%%ETCDIR%%/conf/autoload_configs/cdr_pg_csv.conf.xml.sample
+%%ETCDIR%%/conf/autoload_configs/cidlookup.conf.xml.sample
+%%ETCDIR%%/conf/autoload_configs/conference.conf.xml.sample
+%%ETCDIR%%/conf/autoload_configs/console.conf.xml.sample
+%%ETCDIR%%/conf/autoload_configs/dialplan_directory.conf.xml.sample
+%%ETCDIR%%/conf/autoload_configs/dingaling.conf.xml.sample
+%%ETCDIR%%/conf/autoload_configs/directory.conf.xml.sample
+%%ETCDIR%%/conf/autoload_configs/distributor.conf.xml.sample
+%%ETCDIR%%/conf/autoload_configs/easyroute.conf.xml.sample
+%%ETCDIR%%/conf/autoload_configs/enum.conf.xml.sample
+%%ETCDIR%%/conf/autoload_configs/erlang_event.conf.xml.sample
+%%ETCDIR%%/conf/autoload_configs/event_multicast.conf.xml.sample
+%%ETCDIR%%/conf/autoload_configs/event_socket.conf.xml.sample
+%%ETCDIR%%/conf/autoload_configs/fax.conf.xml.sample
+%%ETCDIR%%/conf/autoload_configs/fifo.conf.xml.sample
+%%ETCDIR%%/conf/autoload_configs/ivr.conf.xml.sample
+%%ETCDIR%%/conf/autoload_configs/java.conf.xml.sample
+%%ETCDIR%%/conf/autoload_configs/lcr.conf.xml.sample
+%%ETCDIR%%/conf/autoload_configs/limit.conf.xml.sample
+%%ETCDIR%%/conf/autoload_configs/local_stream.conf.xml.sample
+%%ETCDIR%%/conf/autoload_configs/logfile.conf.xml.sample
+%%ETCDIR%%/conf/autoload_configs/lua.conf.xml.sample
+%%ETCDIR%%/conf/autoload_configs/memcache.conf.xml.sample
+%%ETCDIR%%/conf/autoload_configs/modules.conf.xml.sample
+%%ETCDIR%%/conf/autoload_configs/nibblebill.conf.xml.sample
+%%ETCDIR%%/conf/autoload_configs/opal.conf.xml.sample
+%%WITH_MODOPENZAP%%%%ETCDIR%%/conf/autoload_configs/openzap.conf.xml.sample
+%%ETCDIR%%/conf/autoload_configs/perl.conf.xml.sample
+%%ETCDIR%%/conf/autoload_configs/pocketsphinx.conf.xml.sample
+%%ETCDIR%%/conf/autoload_configs/portaudio.conf.xml.sample
+%%ETCDIR%%/conf/autoload_configs/post_load_modules.conf.xml.sample
+%%ETCDIR%%/conf/autoload_configs/python.conf.xml.sample
+%%ETCDIR%%/conf/autoload_configs/rss.conf.xml.sample
+%%ETCDIR%%/conf/autoload_configs/sangoma_codec.conf.xml.sample
+%%ETCDIR%%/conf/autoload_configs/shout.conf.xml.sample
+%%ETCDIR%%/conf/autoload_configs/skinny.conf.xml.sample
+%%ETCDIR%%/conf/autoload_configs/sofia.conf.xml.sample
+%%ETCDIR%%/conf/autoload_configs/spidermonkey.conf.xml.sample
+%%ETCDIR%%/conf/autoload_configs/switch.conf.xml.sample
+%%ETCDIR%%/conf/autoload_configs/syslog.conf.xml.sample
+%%ETCDIR%%/conf/autoload_configs/timezones.conf.xml.sample
+%%ETCDIR%%/conf/autoload_configs/tts_commandline.conf.xml.sample
+%%ETCDIR%%/conf/autoload_configs/unicall.conf.xml.sample
+%%ETCDIR%%/conf/autoload_configs/unimrcp.conf.xml.sample
+%%ETCDIR%%/conf/autoload_configs/voicemail.conf.xml.sample
+%%ETCDIR%%/conf/autoload_configs/xml_cdr.conf.xml.sample
+%%ETCDIR%%/conf/autoload_configs/xml_curl.conf.xml.sample
+%%ETCDIR%%/conf/autoload_configs/xml_rpc.conf.xml.sample
+%%ETCDIR%%/conf/autoload_configs/zeroconf.conf.xml.sample
+%%ETCDIR%%/conf/dialplan/default.xml.sample
+%%ETCDIR%%/conf/dialplan/default/00_pizza_demo.xml.sample
+%%ETCDIR%%/conf/dialplan/default/01_example.com.xml.sample
+%%ETCDIR%%/conf/dialplan/default/99999_enum.xml.sample
+%%ETCDIR%%/conf/dialplan/features.xml.sample
+%%ETCDIR%%/conf/dialplan/public.xml.sample
+%%ETCDIR%%/conf/dialplan/public/00_inbound_did.xml.sample
+%%ETCDIR%%/conf/directory/default.xml.sample
+%%WITH_EXTENSIONS%%%%ETCDIR%%/conf/directory/default/1000.xml.sample
+%%WITH_EXTENSIONS%%%%ETCDIR%%/conf/directory/default/1001.xml.sample
+%%WITH_EXTENSIONS%%%%ETCDIR%%/conf/directory/default/1002.xml.sample
+%%WITH_EXTENSIONS%%%%ETCDIR%%/conf/directory/default/1003.xml.sample
+%%WITH_EXTENSIONS%%%%ETCDIR%%/conf/directory/default/1004.xml.sample
+%%WITH_EXTENSIONS%%%%ETCDIR%%/conf/directory/default/1005.xml.sample
+%%WITH_EXTENSIONS%%%%ETCDIR%%/conf/directory/default/1006.xml.sample
+%%WITH_EXTENSIONS%%%%ETCDIR%%/conf/directory/default/1007.xml.sample
+%%WITH_EXTENSIONS%%%%ETCDIR%%/conf/directory/default/1008.xml.sample
+%%WITH_EXTENSIONS%%%%ETCDIR%%/conf/directory/default/1009.xml.sample
+%%WITH_EXTENSIONS%%%%ETCDIR%%/conf/directory/default/1010.xml.sample
+%%WITH_EXTENSIONS%%%%ETCDIR%%/conf/directory/default/1011.xml.sample
+%%WITH_EXTENSIONS%%%%ETCDIR%%/conf/directory/default/1012.xml.sample
+%%WITH_EXTENSIONS%%%%ETCDIR%%/conf/directory/default/1013.xml.sample
+%%WITH_EXTENSIONS%%%%ETCDIR%%/conf/directory/default/1014.xml.sample
+%%WITH_EXTENSIONS%%%%ETCDIR%%/conf/directory/default/1015.xml.sample
+%%WITH_EXTENSIONS%%%%ETCDIR%%/conf/directory/default/1016.xml.sample
+%%WITH_EXTENSIONS%%%%ETCDIR%%/conf/directory/default/1017.xml.sample
+%%WITH_EXTENSIONS%%%%ETCDIR%%/conf/directory/default/1018.xml.sample
+%%WITH_EXTENSIONS%%%%ETCDIR%%/conf/directory/default/1019.xml.sample
+%%WITH_EXTENSIONS%%%%ETCDIR%%/conf/directory/default/brian.xml.sample
+%%WITH_EXTENSIONS%%%%ETCDIR%%/conf/directory/default/default.xml.sample
+%%WITH_EXTENSIONS%%%%ETCDIR%%/conf/directory/default/example.com.xml.sample
+%%ETCDIR%%/conf/extensions.conf.sample
+%%ETCDIR%%/conf/freeswitch.xml.sample
+%%ETCDIR%%/conf/fur_elise.ttml.sample
+%%ETCDIR%%/conf/ivr_menus/demo_ivr.xml.sample
+%%ETCDIR%%/conf/jingle_profiles/client.xml.sample
+%%ETCDIR%%/conf/jingle_profiles/server.xml.sample
+%%ETCDIR%%/conf/lang/de/de.xml.sample
+%%ETCDIR%%/conf/lang/de/demo/demo.xml.sample
+%%ETCDIR%%/conf/lang/de/vm/tts.xml.sample
+%%ETCDIR%%/conf/lang/en/demo/demo-ivr.xml.sample
+%%ETCDIR%%/conf/lang/en/demo/demo.xml.sample
+%%ETCDIR%%/conf/lang/en/dir/sounds.xml.sample
+%%ETCDIR%%/conf/lang/en/dir/tts.xml.sample
+%%ETCDIR%%/conf/lang/en/en.xml.sample
+%%ETCDIR%%/conf/lang/en/vm/sounds.xml.sample
+%%ETCDIR%%/conf/lang/en/vm/tts.xml.sample
+%%ETCDIR%%/conf/lang/fr/demo/demo.xml.sample
+%%ETCDIR%%/conf/lang/fr/dir/sounds.xml.sample
+%%ETCDIR%%/conf/lang/fr/dir/tts.xml.sample
+%%ETCDIR%%/conf/lang/fr/fr.xml.sample
+%%ETCDIR%%/conf/lang/fr/vm/sounds.xml.sample
+%%ETCDIR%%/conf/lang/ru/demo/demo-ivr.xml.sample
+%%ETCDIR%%/conf/lang/ru/demo/demo.xml.sample
+%%ETCDIR%%/conf/lang/ru/dir/sounds.xml.sample
+%%ETCDIR%%/conf/lang/ru/dir/tts.xml.sample
+%%ETCDIR%%/conf/lang/ru/ru.xml.sample
+%%ETCDIR%%/conf/lang/ru/vm/sounds.xml.sample
+%%ETCDIR%%/conf/lang/ru/vm/tts.xml.sample
+%%WITH_MODOPENZAP%%%%ETCDIR%%/conf/m3ua.conf.sample
+%%ETCDIR%%/conf/mime.types.sample
+%%ETCDIR%%/conf/mrcp_profiles/loquendo-7-mrcp-v2.xml.sample
+%%ETCDIR%%/conf/mrcp_profiles/nuance-1.0.0-mrcp-v1.xml.sample
+%%ETCDIR%%/conf/mrcp_profiles/nuance-5.0-mrcp-v1.xml.sample
+%%ETCDIR%%/conf/mrcp_profiles/nuance-5.0-mrcp-v2.xml.sample
+%%ETCDIR%%/conf/mrcp_profiles/unimrcpserver-mrcp-v1.xml.sample
+%%ETCDIR%%/conf/mrcp_profiles/voxeo-prophecy-8.0-mrcp-v1.xml.sample
+%%ETCDIR%%/conf/notify-voicemail.tpl.sample
+%%WITH_MODOPENZAP%%%%ETCDIR%%/conf/openzap.conf.sample
+%%WITH_MODOPENZAP%%%%ETCDIR%%/conf/pika.conf.sample
+%%ETCDIR%%/conf/sip_profiles/external.xml.sample
+%%ETCDIR%%/conf/sip_profiles/external/example.xml.sample
+%%ETCDIR%%/conf/sip_profiles/internal-ipv6.xml.sample
+%%ETCDIR%%/conf/sip_profiles/internal.xml.sample
+%%ETCDIR%%/conf/sip_profiles/internal/example.xml.sample
+%%ETCDIR%%/conf/skinny_profiles/internal.xml.sample
+%%ETCDIR%%/conf/tetris.ttml.sample
+%%WITH_MODOPENZAP%%%%ETCDIR%%/conf/tones.conf.sample
+%%ETCDIR%%/conf/vars.xml.sample
+%%ETCDIR%%/conf/voicemail.tpl.sample
+%%WITH_MODOPENZAP%%%%ETCDIR%%/conf/wanpipe.conf.sample
+%%ETCDIR%%/conf/web-vm.tpl.sample
+%%WITH_MODOPENZAP%%%%ETCDIR%%/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_MODPOCKETSPHINX%%%%ETCDIR%%/grammar/default.dic
+%%WITH_MODPOCKETSPHINX%%%%ETCDIR%%/grammar/model/communicator/COPYING
+%%WITH_MODPOCKETSPHINX%%%%ETCDIR%%/grammar/model/communicator/feat.params
+%%WITH_MODPOCKETSPHINX%%%%ETCDIR%%/grammar/model/communicator/mdef
+%%WITH_MODPOCKETSPHINX%%%%ETCDIR%%/grammar/model/communicator/means
+%%WITH_MODPOCKETSPHINX%%%%ETCDIR%%/grammar/model/communicator/noisedict
+%%WITH_MODPOCKETSPHINX%%%%ETCDIR%%/grammar/model/communicator/sendump
+%%WITH_MODPOCKETSPHINX%%%%ETCDIR%%/grammar/model/communicator/transition_matrices
+%%WITH_MODPOCKETSPHINX%%%%ETCDIR%%/grammar/model/communicator/variances
+%%WITH_MODPOCKETSPHINX%%%%ETCDIR%%/grammar/model/wsj1/Makefile
+%%WITH_MODPOCKETSPHINX%%%%ETCDIR%%/grammar/model/wsj1/Makefile.am
+%%WITH_MODPOCKETSPHINX%%%%ETCDIR%%/grammar/model/wsj1/Makefile.in
+%%WITH_MODPOCKETSPHINX%%%%ETCDIR%%/grammar/model/wsj1/feat.params
+%%WITH_MODPOCKETSPHINX%%%%ETCDIR%%/grammar/model/wsj1/kdtrees
+%%WITH_MODPOCKETSPHINX%%%%ETCDIR%%/grammar/model/wsj1/mdef
+%%WITH_MODPOCKETSPHINX%%%%ETCDIR%%/grammar/model/wsj1/means
+%%WITH_MODPOCKETSPHINX%%%%ETCDIR%%/grammar/model/wsj1/noisedict
+%%WITH_MODPOCKETSPHINX%%%%ETCDIR%%/grammar/model/wsj1/sendump
+%%WITH_MODPOCKETSPHINX%%%%ETCDIR%%/grammar/model/wsj1/transition_matrices
+%%WITH_MODPOCKETSPHINX%%%%ETCDIR%%/grammar/model/wsj1/variances
+%%WITH_MODOPENZAP%%include/freeswitch/fsk.h
+%%WITH_MODOPENZAP%%include/freeswitch/g711.h
+%%WITH_MODOPENZAP%%include/freeswitch/hashtable.h
+%%WITH_MODOPENZAP%%include/freeswitch/hashtable_itr.h
+%%WITH_MODOPENZAP%%include/freeswitch/hashtable_private.h
 include/freeswitch/libteletone.h
 include/freeswitch/libteletone_detect.h
 include/freeswitch/libteletone_generate.h
+%%WITH_MODOPENZAP%%include/freeswitch/openzap.h
+%%WITH_MODOPENZAP%%include/freeswitch/sangoma_tdm_api.h
 include/freeswitch/switch.h
 include/freeswitch/switch_am_config.h
 include/freeswitch/switch_apr.h
@@ -39,23 +202,13 @@ include/freeswitch/switch_types.h
 include/freeswitch/switch_utils.h
 include/freeswitch/switch_xml.h
 include/freeswitch/switch_xml_config.h
-%%WITH_MODOPENZAP%%%%DATADIR%%/include/fsk.h
-%%WITH_MODOPENZAP%%%%DATADIR%%/include/g711.h
-%%WITH_MODOPENZAP%%%%DATADIR%%/include/hashtable.h
-%%WITH_MODOPENZAP%%%%DATADIR%%/include/hashtable_itr.h
-%%WITH_MODOPENZAP%%%%DATADIR%%/include/hashtable_private.h
-%%WITH_MODOPENZAP%%%%DATADIR%%/include/libteletone.h
-%%WITH_MODOPENZAP%%%%DATADIR%%/include/libteletone_detect.h
-%%WITH_MODOPENZAP%%%%DATADIR%%/include/libteletone_generate.h
-%%WITH_MODOPENZAP%%%%DATADIR%%/include/openzap.h
-%%WITH_MODOPENZAP%%%%DATADIR%%/include/sangoma_tdm_api.h
-%%WITH_MODOPENZAP%%%%DATADIR%%/include/uart.h
-%%WITH_MODOPENZAP%%%%DATADIR%%/include/zap_buffer.h
-%%WITH_MODOPENZAP%%%%DATADIR%%/include/zap_config.h
-%%WITH_MODOPENZAP%%%%DATADIR%%/include/zap_cpu_monitor.h
-%%WITH_MODOPENZAP%%%%DATADIR%%/include/zap_dso.h
-%%WITH_MODOPENZAP%%%%DATADIR%%/include/zap_threadmutex.h
-%%WITH_MODOPENZAP%%%%DATADIR%%/include/zap_types.h
+%%WITH_MODOPENZAP%%include/freeswitch/uart.h
+%%WITH_MODOPENZAP%%include/freeswitch/zap_buffer.h
+%%WITH_MODOPENZAP%%include/freeswitch/zap_config.h
+%%WITH_MODOPENZAP%%include/freeswitch/zap_cpu_monitor.h
+%%WITH_MODOPENZAP%%include/freeswitch/zap_dso.h
+%%WITH_MODOPENZAP%%include/freeswitch/zap_threadmutex.h
+%%WITH_MODOPENZAP%%include/freeswitch/zap_types.h
 lib/freeswitch/lib/libfreeswitch.a
 lib/freeswitch/lib/libfreeswitch.la
 lib/freeswitch/lib/libfreeswitch.so
@@ -222,8 +375,8 @@ lib/freeswitch/mod/mod_spidermonkey_core_db.la
 lib/freeswitch/mod/mod_spidermonkey_core_db.so
 lib/freeswitch/mod/mod_spidermonkey_curl.la
 lib/freeswitch/mod/mod_spidermonkey_curl.so
-%%WITH_MODSPDRMNKYODBC%%lib/freeswitch/mod/mod_spidermonkey_odbc.la
-%%WITH_MODSPDRMNKYODBC%%lib/freeswitch/mod/mod_spidermonkey_odbc.so
+lib/freeswitch/mod/mod_spidermonkey_odbc.la
+lib/freeswitch/mod/mod_spidermonkey_odbc.so
 lib/freeswitch/mod/mod_spidermonkey_socket.la
 lib/freeswitch/mod/mod_spidermonkey_socket.so
 lib/freeswitch/mod/mod_spidermonkey_teletone.la
@@ -244,14 +397,6 @@ lib/freeswitch/mod/mod_valet_parking.so
 %%WITH_MODVMD%%lib/freeswitch/mod/mod_vmd.so
 lib/freeswitch/mod/mod_voicemail.la
 lib/freeswitch/mod/mod_voicemail.so
-lib/freeswitch/mod/mod_voipcodecs.la
-lib/freeswitch/mod/mod_voipcodecs.so
-lib/freeswitch/mod/mod_xml_cdr.la
-lib/freeswitch/mod/mod_xml_cdr.so
-%%WITH_MODXMLCURL%%lib/freeswitch/mod/mod_xml_curl.la
-%%WITH_MODXMLCURL%%lib/freeswitch/mod/mod_xml_curl.so
-lib/freeswitch/mod/mod_xml_rpc.la
-lib/freeswitch/mod/mod_xml_rpc.so
 %%WITH_MODOPENZAP%%lib/freeswitch/mod/ozmod_analog.a
 %%WITH_MODOPENZAP%%lib/freeswitch/mod/ozmod_analog.la
 %%WITH_MODOPENZAP%%lib/freeswitch/mod/ozmod_analog.so
@@ -273,247 +418,77 @@ lib/freeswitch/mod/mod_xml_rpc.so
 %%WITH_MODOPENZAP%%lib/freeswitch/mod/ozmod_zt.a
 %%WITH_MODOPENZAP%%lib/freeswitch/mod/ozmod_zt.la
 %%WITH_MODOPENZAP%%lib/freeswitch/mod/ozmod_zt.so
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/autoload_configs/acl.conf.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/autoload_configs/alsa.conf.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/autoload_configs/cdr_csv.conf.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/autoload_configs/cdr_pg_csv.conf.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/autoload_configs/cidlookup.conf.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/autoload_configs/conference.conf.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/autoload_configs/console.conf.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/autoload_configs/dialplan_directory.conf.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/autoload_configs/dingaling.conf.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/autoload_configs/directory.conf.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/autoload_configs/distributor.conf.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/autoload_configs/easyroute.conf.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/autoload_configs/enum.conf.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/autoload_configs/erlang_event.conf.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/autoload_configs/event_multicast.conf.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/autoload_configs/event_socket.conf.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/autoload_configs/fax.conf.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/autoload_configs/fifo.conf.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/autoload_configs/ivr.conf.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/autoload_configs/java.conf.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/autoload_configs/lcr.conf.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/autoload_configs/limit.conf.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/autoload_configs/local_stream.conf.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/autoload_configs/logfile.conf.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/autoload_configs/lua.conf.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/autoload_configs/memcache.conf.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/autoload_configs/modules.conf.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/autoload_configs/nibblebill.conf.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/autoload_configs/opal.conf.xml
-%%WITH_MODOPENZAP%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/autoload_configs/openzap.conf.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/autoload_configs/perl.conf.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/autoload_configs/pocketsphinx.conf.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/autoload_configs/portaudio.conf.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/autoload_configs/post_load_modules.conf.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/autoload_configs/python.conf.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/autoload_configs/rss.conf.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/autoload_configs/sangoma_codec.conf.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/autoload_configs/shout.conf.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/autoload_configs/skinny.conf.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/autoload_configs/sofia.conf.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/autoload_configs/spidermonkey.conf.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/autoload_configs/switch.conf.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/autoload_configs/syslog.conf.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/autoload_configs/timezones.conf.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/autoload_configs/tts_commandline.conf.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/autoload_configs/unicall.conf.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/autoload_configs/unimrcp.conf.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/autoload_configs/voicemail.conf.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/autoload_configs/xml_cdr.conf.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/autoload_configs/xml_curl.conf.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/autoload_configs/xml_rpc.conf.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/autoload_configs/zeroconf.conf.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/dialplan/default.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/dialplan/default/00_pizza_demo.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/dialplan/default/01_example.com.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/dialplan/default/99999_enum.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/dialplan/default/ideasip.com.noload
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/dialplan/default/pulver.com.noload
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/dialplan/default/sipbroker.com.noload
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/dialplan/default/sipphone.com.noload
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/dialplan/default/tollfreegateway.com.noload
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/dialplan/features.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/dialplan/public.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/dialplan/public/00_inbound_did.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/directory/default.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/directory/default/1000.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/directory/default/1001.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/directory/default/1002.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/directory/default/1003.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/directory/default/1004.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/directory/default/1005.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/directory/default/1006.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/directory/default/1007.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/directory/default/1008.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/directory/default/1009.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/directory/default/1010.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/directory/default/1011.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/directory/default/1012.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/directory/default/1013.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/directory/default/1014.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/directory/default/1015.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/directory/default/1016.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/directory/default/1017.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/directory/default/1018.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/directory/default/1019.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/directory/default/brian.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/directory/default/default.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/directory/default/example.com.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/extensions.conf
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/freeswitch.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/fur_elise.ttml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/ivr_menus/demo_ivr.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/jingle_profiles/client.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/jingle_profiles/server.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/lang/de/de.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/lang/de/demo/demo.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/lang/de/vm/tts.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/lang/en/demo/demo-ivr.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/lang/en/demo/demo.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/lang/en/dir/sounds.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/lang/en/dir/tts.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/lang/en/en.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/lang/en/vm/sounds.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/lang/en/vm/tts.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/lang/fr/demo/demo.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/lang/fr/dir/sounds.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/lang/fr/dir/tts.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/lang/fr/fr.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/lang/fr/vm/sounds.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/lang/ru/demo/demo-ivr.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/lang/ru/demo/demo.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/lang/ru/dir/sounds.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/lang/ru/dir/tts.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/lang/ru/ru.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/lang/ru/vm/sounds.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/lang/ru/vm/tts.xml
-%%WITH_MODOPENZAP%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/m3ua.conf
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/mime.types
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/mrcp_profiles/loquendo-7-mrcp-v2.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/mrcp_profiles/nuance-1.0.0-mrcp-v1.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/mrcp_profiles/nuance-5.0-mrcp-v1.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/mrcp_profiles/nuance-5.0-mrcp-v2.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/mrcp_profiles/unimrcpserver-mrcp-v1.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/mrcp_profiles/voxeo-prophecy-8.0-mrcp-v1.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/notify-voicemail.tpl
-%%WITH_MODOPENZAP%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/openzap.conf
-%%WITH_MODOPENZAP%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/pika.conf
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/sip_profiles/external.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/sip_profiles/external/example.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/sip_profiles/internal-ipv6.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/sip_profiles/internal.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/sip_profiles/internal/example.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/skinny_profiles/internal.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/tetris.ttml
-%%WITH_MODOPENZAP%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/tones.conf
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/vars.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/voicemail.tpl
-%%WITH_MODOPENZAP%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/wanpipe.conf
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/web-vm.tpl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/yaml/extensions.yaml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/yaml/mod_yaml.yaml
-%%WITH_MODOPENZAP%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conf/zt.conf
-%%WITH_MODPOCKETSPHINX%%%%DATADIR%%/grammar/default.dic
-%%WITH_MODPOCKETSPHINX%%%%DATADIR%%/grammar/model/communicator/COPYING
-%%WITH_MODPOCKETSPHINX%%%%DATADIR%%/grammar/model/communicator/feat.params
-%%WITH_MODPOCKETSPHINX%%%%DATADIR%%/grammar/model/communicator/mdef
-%%WITH_MODPOCKETSPHINX%%%%DATADIR%%/grammar/model/communicator/means
-%%WITH_MODPOCKETSPHINX%%%%DATADIR%%/grammar/model/communicator/noisedict
-%%WITH_MODPOCKETSPHINX%%%%DATADIR%%/grammar/model/communicator/sendump
-%%WITH_MODPOCKETSPHINX%%%%DATADIR%%/grammar/model/communicator/transition_matrices
-%%WITH_MODPOCKETSPHINX%%%%DATADIR%%/grammar/model/communicator/variances
-%%WITH_MODPOCKETSPHINX%%%%DATADIR%%/grammar/model/wsj1/Makefile
-%%WITH_MODPOCKETSPHINX%%%%DATADIR%%/grammar/model/wsj1/Makefile.am
-%%WITH_MODPOCKETSPHINX%%%%DATADIR%%/grammar/model/wsj1/Makefile.in
-%%WITH_MODPOCKETSPHINX%%%%DATADIR%%/grammar/model/wsj1/feat.params
-%%WITH_MODPOCKETSPHINX%%%%DATADIR%%/grammar/model/wsj1/kdtrees
-%%WITH_MODPOCKETSPHINX%%%%DATADIR%%/grammar/model/wsj1/mdef
-%%WITH_MODPOCKETSPHINX%%%%DATADIR%%/grammar/model/wsj1/means
-%%WITH_MODPOCKETSPHINX%%%%DATADIR%%/grammar/model/wsj1/noisedict
-%%WITH_MODPOCKETSPHINX%%%%DATADIR%%/grammar/model/wsj1/sendump
-%%WITH_MODPOCKETSPHINX%%%%DATADIR%%/grammar/model/wsj1/transition_matrices
-%%WITH_MODPOCKETSPHINX%%%%DATADIR%%/grammar/model/wsj1/variances
-%%DATADIR%%/htdocs/license.txt
-%%DATADIR%%/htdocs/slim.swf
-%%DATADIR%%/htdocs/slimtest.htm
-%%WITH_MODPERL%%%%DATADIR%%/perl/freeswitch.la
-%%WITH_MODPERL%%%%DATADIR%%/perl/freeswitch.pm
-%%WITH_MODPERL%%%%DATADIR%%/perl/freeswitch.so
-%%WITH_MODPERL%%@dirrm %%DATADIR%%/perl
-@rmtry %%DATADIR%%/storage
-@rmtry %%DATADIR%%/scripts
-@rmtry %%DATADIR%%/recordings
-@rmtry %%DATADIR%%/log
-%%WITH_MODOPENZAP%%@dirrm %%DATADIR%%/include
-@dirrm %%DATADIR%%/htdocs
-%%WITH_MODPOCKETSPHINX%%@dirrm %%DATADIR%%/grammar/model/wsj1
-%%WITH_MODPOCKETSPHINX%%@dirrm %%DATADIR%%/grammar/model/communicator
-%%WITH_MODPOCKETSPHINX%%@dirrm %%DATADIR%%/grammar/model
-@dirrm %%DATADIR%%/grammar
-@rmtry %%DATADIR%%/db
-@dirrmtry %%DATADIR%%
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/conf/yaml
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/conf/skinny_profiles
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/conf/sip_profiles/internal
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/conf/sip_profiles/external
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/conf/sip_profiles
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/conf/mrcp_profiles
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/conf/lang/ru/vm
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/conf/lang/ru/dir
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/conf/lang/ru/demo
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/conf/lang/ru
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/conf/lang/fr/vm
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/conf/lang/fr/dir
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/conf/lang/fr/demo
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/conf/lang/fr
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/conf/lang/en/vm
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/conf/lang/en/dir
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/conf/lang/en/demo
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/conf/lang/en
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/conf/lang/de/vm
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/conf/lang/de/demo
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/conf/lang/de
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/conf/lang
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/conf/jingle_profiles
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/conf/ivr_menus
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/conf/directory/default
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/conf/directory
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/conf/dialplan/public
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/conf/dialplan/default
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/conf/dialplan
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/conf/autoload_configs
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/conf
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
+lib/freeswitch/mod/mod_voipcodecs.la
+lib/freeswitch/mod/mod_voipcodecs.so
+lib/freeswitch/mod/mod_xml_cdr.la
+lib/freeswitch/mod/mod_xml_cdr.so
+%%WITH_MODXMLCURL%%lib/freeswitch/mod/mod_xml_curl.la
+%%WITH_MODXMLCURL%%lib/freeswitch/mod/mod_xml_curl.so
+lib/freeswitch/mod/mod_xml_rpc.la
+lib/freeswitch/mod/mod_xml_rpc.so
+%%WITH_MODPERL%%perl/freeswitch.la
+%%WITH_MODPERL%%perl/freeswitch.pm
+%%WITH_MODPERL%%perl/freeswitch.so
+%%WWWDIR%%/htdocs/license.txt
+%%WWWDIR%%/htdocs/slim.swf
+%%WWWDIR%%/htdocs/slimtest.htm
+@dirrm %%WWWDIR%%/htdocs
+@dirrm %%WWWDIR%%
+@dirrm %%DATADIR%%/sounds
+@dirrm %%DATADIR%%
+%%WITH_MODPERL%%@dirrm perl
 @dirrm lib/freeswitch/mod
 @dirrm lib/freeswitch/lib
 @dirrm lib/freeswitch
 @dirrm include/freeswitch
-@dirrmtry %%ETCDIR%%/conf
-@dirrmtry %%ETCDIR%%
-@exec mkdir -p %D/%%DATADIR%%/grammar
+@dirrm %%ETCDIR%%/scripts
+%%WITH_MODPOCKETSPHINX%%@dirrm %%ETCDIR%%/grammar/model/wsj1
+%%WITH_MODPOCKETSPHINX%%@dirrm %%ETCDIR%%/grammar/model/communicator
+%%WITH_MODPOCKETSPHINX%%@dirrm %%ETCDIR%%/grammar/model
+@dirrm %%ETCDIR%%/grammar
+@dirrm %%ETCDIR%%/conf/skinny_profiles
+@dirrm %%ETCDIR%%/conf/sip_profiles/internal
+@dirrm %%ETCDIR%%/conf/sip_profiles/external
+@dirrm %%ETCDIR%%/conf/sip_profiles
+@dirrm %%ETCDIR%%/conf/mrcp_profiles
+@dirrm %%ETCDIR%%/conf/lang/ru/vm
+@dirrm %%ETCDIR%%/conf/lang/ru/dir
+@dirrm %%ETCDIR%%/conf/lang/ru/demo
+@dirrm %%ETCDIR%%/conf/lang/ru
+@dirrm %%ETCDIR%%/conf/lang/fr/vm
+@dirrm %%ETCDIR%%/conf/lang/fr/dir
+@dirrm %%ETCDIR%%/conf/lang/fr/demo
+@dirrm %%ETCDIR%%/conf/lang/fr
+@dirrm %%ETCDIR%%/conf/lang/en/vm
+@dirrm %%ETCDIR%%/conf/lang/en/dir
+@dirrm %%ETCDIR%%/conf/lang/en/demo
+@dirrm %%ETCDIR%%/conf/lang/en
+@dirrm %%ETCDIR%%/conf/lang/de/vm
+@dirrm %%ETCDIR%%/conf/lang/de/demo
+@dirrm %%ETCDIR%%/conf/lang/de
+@dirrm %%ETCDIR%%/conf/lang
+@dirrm %%ETCDIR%%/conf/jingle_profiles
+@dirrm %%ETCDIR%%/conf/ivr_menus
+@dirrm %%ETCDIR%%/conf/directory/default
+@dirrm %%ETCDIR%%/conf/directory
+@dirrm %%ETCDIR%%/conf/dialplan/public
+@dirrm %%ETCDIR%%/conf/dialplan/default
+@dirrm %%ETCDIR%%/conf/dialplan
+@dirrm %%ETCDIR%%/conf/autoload_configs
+@dirrm %%ETCDIR%%/conf
+@dirrm %%ETCDIR%%
+@exec mkdir -p %D/%%ETCDIR%%/scripts
+@exec mkdir -p %D/%%DATADDIR%%/sounds
 @cwd /var/
-@dirrmtry spool/voicemail
-@dirrmtry log/freeswitch/xml_cdr
-@dirrmtry log/freeswitch
-@dirrmtry freeswitch/storage
-@dirrmtry freeswitch/recordings
-@dirrmtry freeswitch
-@dirrmtry db/freeswitch
-@exec mkdir -p %D/freeswitch/storage
-@exec chmod 775 %D/freeswitch/storage
-@exec ln -Ffs %D/freeswitch/storage %%DATADIR%%/storage
-@exec chmod 775 %%DATADIR%%/storage
-@exec rm -rf %%DATADIR%%/recordings
+@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 chmod 775 %D/freeswitch/recordings
-@exec ln -Ffs %D/freeswitch/recordings %%DATADIR%%/recordings
-@exec chmod 775 %%DATADIR%%/recordings
-@exec rm -rf %%DATADIR%%/log
-@exec mkdir -p %D/log/freeswitch/cdr-csv
-@exec chmod -R 775 /log/freeswitch
-@exec ln -Ffs %D/log/freeswitch %%DATADIR%%/log
 @exec mkdir -p %D/db/freeswitch
-@exec ln -Ffs %D/db/freeswitch %%DATADIR%%/db
-@exec chmod 775 %%DATADIR%%/db