Attachment 107870 Details for Bug 148693 – freeswitch-core.diff

[patch] freeswitch-core.diff

freeswitch-core.diff (text/plain), 46.06 KB, created by RIchard Neese on 2010-07-19 16:00:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: RIchard Neese

Created: 2010-07-19 16:00:41 UTC

Size: 46.06 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/ncvs/ports/net/freeswitch-core/Makefile,v
>retrieving revision 1.5
>diff -u -r1.5 Makefile
>--- Makefile	16 Jul 2010 17:29:05 -0000	1.5
>+++ Makefile	19 Jul 2010 14:53:59 -0000
>@@ -7,11 +7,11 @@
> 
> PORTNAME=	freeswitch-core
> PORTVERSION=	1.0.6
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	net
> MASTER_SITES=	http://files.freeswitch.org/:1 \
> 		http://files.freeswitch.org/downloads/libs/:2
>-DISTFILES=	freeswitch-${PORTVERSION}.tar.gz:1 \
>+DISTFILES=	${BASE_PORTNAME}-${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 \
>@@ -24,7 +24,7 @@
> 		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
>+EXTRACT_ONLY=	${BASE_PORTNAME}-${PORTVERSION}.tar.gz
> 
> MAINTAINER=	ecrist@secure-computing.net
> COMMENT=	FreeSwitch SoftSwitch Port
>@@ -49,11 +49,11 @@
> VARBASE?=	/var
> 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/freeswitch \
>+		--sysconfdir=${PREFIX}/etc/${BASE_PORTNAME}/conf \
>+		--includedir=${PREFIX}/include/${BASE_PORTNAME} \
>+		--libdir=${PREFIX}/lib/${BASE_PORTNAME}/lib \
>+		--with-modinstdir=${PREFIX}/lib/${BASE_PORTNAME}/mod \
>+		--with-rundir=${VARBASE}/run/${BASE_PORTNAME} \
> 		--with-libgnutls-prefix=${LOCALBASE} \
> 		--with-ogg=${LOCALBASE} \
> 		--with-ogg-libraries=${LOCALBASE}/lib \
>@@ -64,12 +64,9 @@
> USE_LDCONFIG=	yes
> CPPFLAGS+=	-I${PREFIX}/include
> 
>-.if ${OSVERSION} < 700000
>-IGNORE=		freeswitch is only supported on FreeBSD 7 or newer
>-.endif
>-
> FREESWITCH_USER=	freeswitch
> FREESWITCH_GROUP=	${FREESWITCH_USER}
>+BASE_PORTNAME=	${FREESWITCH_USER}
> 
> SUB_LIST=	FREESWITCH_USER=${FREESWITCH_USER} FREESWITCH_GROUP=${FREESWITCH_GROUP}
> 
>@@ -122,6 +119,10 @@
> 
> .include <bsd.port.options.mk>
> 
>+.if ${OSVERSION} < 700000
>+BROKEN=	Does not compile on FreeBSD < 7.0
>+.endif
>+
> .if ${ARCH} == "amd64"
> CFLAGS+=	-fPIC
> .endif
>@@ -141,6 +142,9 @@
> .if !defined(WITH_MODOPENZAP)
> PLIST_SUB+=	WITH_MODOPENZAP="@comment "
> .else
>+.if ${OSVERSION} < ${OSVERSION} < 800108)
>+IGNORE=		sorry you can not use mod_openzap on this version of freebsd please update
>+.endif
> PLIST_SUB+=	WITH_MODOPENZAP=""
> CONFIGURE_ARGS+=	--with-libpri
> BUILD_DEPENDS+=	libpri>=1.2.0:${PORTSDIR}/misc/libpri \
>@@ -252,29 +256,29 @@
> .endif
> 
> pre-install:
>-	@${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
>+	@${SH} ${PKGINSTALL} ${BASE_PORTNAME} PRE-INSTALL
> 
> .if !defined(WITH_EXTENSIONS)
>-	@${RM} ${WRKSRC}/conf/directory/default/*
>+	@${FIND} ${WRKSRC}/conf/directory/default -type f -name '*.xml' -delete
> .endif
> 
> post-install:
> .if !defined(WITH_EXTENSIONS)
>-	@${MKDIR} ${PREFIX}/etc/${PORTNAME}/conf/directory/default
>+	@${MKDIR} ${PREFIX}/etc/${BASE_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
>+	@${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}
>+	@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
> 	@${CAT} ${PKGMESSAGE}
> 	@${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}"
>+	@${ECHO_MSG} "${VARBASE}/db/${BASE_PORTNAME} ${VARBASE}/log/${BASE_PORTNAME} ${VARBASE}/${BASE_PORTNAME} ${PREFIX}/etc/${BASE_PORTNAME}"
> 
> .include <bsd.port.mk>
>Index: pkg-plist
>===================================================================
>RCS file: /home/ncvs/ports/net/freeswitch-core/pkg-plist,v
>retrieving revision 1.2
>diff -u -r1.2 pkg-plist
>--- pkg-plist	16 Jul 2010 14:57:42 -0000	1.2
>+++ pkg-plist	19 Jul 2010 14:53:59 -0000
>@@ -4,162 +4,162 @@
> bin/fs_ivrd
> bin/fsxs
> bin/gentls_cert
>-%%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
>+etc/freeswitch/conf/autoload_configs/acl.conf.xml.sample
>+etc/freeswitch/conf/autoload_configs/alsa.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/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
>+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/limit.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
>+%%WITH_MODOPENZAP%%etc/freeswitch/conf/autoload_configs/openzap.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/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/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/default/99999_enum.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/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
>+%%WITH_EXTENSIONS%%etc/freeswitch/conf/directory/default/1003.xml.sample
>+%%WITH_EXTENSIONS%%etc/freeswitch/conf/directory/default/1004.xml.sample
>+%%WITH_EXTENSIONS%%etc/freeswitch/conf/directory/default/1005.xml.sample
>+%%WITH_EXTENSIONS%%etc/freeswitch/conf/directory/default/1006.xml.sample
>+%%WITH_EXTENSIONS%%etc/freeswitch/conf/directory/default/1007.xml.sample
>+%%WITH_EXTENSIONS%%etc/freeswitch/conf/directory/default/1008.xml.sample
>+%%WITH_EXTENSIONS%%etc/freeswitch/conf/directory/default/1009.xml.sample
>+%%WITH_EXTENSIONS%%etc/freeswitch/conf/directory/default/1010.xml.sample
>+%%WITH_EXTENSIONS%%etc/freeswitch/conf/directory/default/1011.xml.sample
>+%%WITH_EXTENSIONS%%etc/freeswitch/conf/directory/default/1012.xml.sample
>+%%WITH_EXTENSIONS%%etc/freeswitch/conf/directory/default/1013.xml.sample
>+%%WITH_EXTENSIONS%%etc/freeswitch/conf/directory/default/1014.xml.sample
>+%%WITH_EXTENSIONS%%etc/freeswitch/conf/directory/default/1015.xml.sample
>+%%WITH_EXTENSIONS%%etc/freeswitch/conf/directory/default/1016.xml.sample
>+%%WITH_EXTENSIONS%%etc/freeswitch/conf/directory/default/1017.xml.sample
>+%%WITH_EXTENSIONS%%etc/freeswitch/conf/directory/default/1018.xml.sample
>+%%WITH_EXTENSIONS%%etc/freeswitch/conf/directory/default/1019.xml.sample
>+%%WITH_EXTENSIONS%%etc/freeswitch/conf/directory/default/brian.xml.sample
>+%%WITH_EXTENSIONS%%etc/freeswitch/conf/directory/default/default.xml.sample
>+%%WITH_EXTENSIONS%%etc/freeswitch/conf/directory/default/example.com.xml.sample
>+etc/freeswitch/conf/extensions.conf.sample
>+etc/freeswitch/conf/freeswitch.xml.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_MODOPENZAP%%etc/freeswitch/conf/m3ua.conf.sample
>+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_MODOPENZAP%%etc/freeswitch/conf/openzap.conf.sample
>+%%WITH_MODOPENZAP%%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_MODOPENZAP%%etc/freeswitch/conf/tones.conf.sample
>+etc/freeswitch/conf/vars.xml.sample
>+etc/freeswitch/conf/voicemail.tpl.sample
>+%%WITH_MODOPENZAP%%etc/freeswitch/conf/wanpipe.conf.sample
>+etc/freeswitch/conf/web-vm.tpl.sample
>+%%WITH_MODOPENZAP%%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_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_MODPOCKETSPHINX%%etc/freeswitch/grammar/default.dic
>+%%WITH_MODPOCKETSPHINX%%etc/freeswitch/grammar/model/communicator/COPYING
>+%%WITH_MODPOCKETSPHINX%%etc/freeswitch/grammar/model/communicator/feat.params
>+%%WITH_MODPOCKETSPHINX%%etc/freeswitch/grammar/model/communicator/mdef
>+%%WITH_MODPOCKETSPHINX%%etc/freeswitch/grammar/model/communicator/means
>+%%WITH_MODPOCKETSPHINX%%etc/freeswitch/grammar/model/communicator/noisedict
>+%%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
> %%WITH_MODOPENZAP%%include/freeswitch/fsk.h
> %%WITH_MODOPENZAP%%include/freeswitch/g711.h
> %%WITH_MODOPENZAP%%include/freeswitch/hashtable.h
>@@ -429,56 +429,56 @@
> %%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%%
>+www/freeswitch/htdocs/license.txt
>+www/freeswitch/htdocs/slim.swf
>+www/freeswitch/htdocs/slimtest.htm
>+@dirrm www/freeswitch/htdocs
>+@dirrm www/freeswitch
>+@dirrm share/freeswitch/sounds
>+@dirrm share/freeswitch
> %%WITH_MODPERL%%@dirrm perl
> @dirrm lib/freeswitch/mod
> @dirrm lib/freeswitch/lib
> @dirrm lib/freeswitch
> @dirrm include/freeswitch
>-@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
>+@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
>+@dirrm etc/freeswitch/conf/skinny_profiles
>+@dirrm etc/freeswitch/conf/sip_profiles/internal
>+@dirrm etc/freeswitch/conf/sip_profiles/external
>+@dirrm etc/freeswitch/conf/sip_profiles
>+@dirrm etc/freeswitch/conf/mrcp_profiles
>+@dirrm etc/freeswitch/conf/lang/ru/vm
>+@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/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/dir
>+@dirrm etc/freeswitch/conf/lang/en/demo
>+@dirrm etc/freeswitch/conf/lang/en
>+@dirrm etc/freeswitch/conf/lang/de/vm
>+@dirrm etc/freeswitch/conf/lang/de/demo
>+@dirrm etc/freeswitch/conf/lang/de
>+@dirrm etc/freeswitch/conf/lang
>+@dirrm etc/freeswitch/conf/jingle_profiles
>+@dirrm etc/freeswitch/conf/ivr_menus
>+@dirrm etc/freeswitch/conf/directory/default
>+@dirrm etc/freeswitch/conf/directory
>+@dirrm etc/freeswitch/conf/dialplan/public
>+@dirrm etc/freeswitch/conf/dialplan/default
>+@dirrm etc/freeswitch/conf/dialplan
>+@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
>@@ -492,3 +492,4 @@
> @exec mkdir -p %D/freeswitch
> @exec mkdir -p %D/freeswitch/recordings
> @exec mkdir -p %D/db/freeswitch
>+
>Index: files/freeswitch.in
>===================================================================
>RCS file: /home/ncvs/ports/net/freeswitch-core/files/freeswitch.in,v
>retrieving revision 1.2
>diff -u -r1.2 freeswitch.in
>--- files/freeswitch.in	16 Jul 2010 14:57:42 -0000	1.2
>+++ files/freeswitch.in	19 Jul 2010 14:53:59 -0000
>@@ -24,7 +24,7 @@
> rcvar=`set_rcvar`
> 
> command=%%PREFIX%%/bin/freeswitch
>-command_args="${freeswitch_flags} ${freeswitch_user} -g ${freeswitch_group}"
>+command_args="${freeswitch_flags} -u ${freeswitch_user} -g ${freeswitch_group}"
> 
> pidfile=${freeswitch_pidfile:-"/var/run/freeswitch/freeswitch.pid"}
> 
>Index: files/patch-conf-autoload_configs-switch.conf.xml
>===================================================================
>RCS file: files/patch-conf-autoload_configs-switch.conf.xml
>diff -N files/patch-conf-autoload_configs-switch.conf.xml
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/patch-conf-autoload_configs-switch.conf.xml	19 Jul 2010 14:53:59 -0000
>@@ -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="dump-cores" value="yes"/>
>+     
>+     
>Index: files/patch-conf-autoload_configs-voicemail.conf.xml
>===================================================================
>RCS file: files/patch-conf-autoload_configs-voicemail.conf.xml
>diff -N files/patch-conf-autoload_configs-voicemail.conf.xml
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/patch-conf-autoload_configs-voicemail.conf.xml	19 Jul 2010 14:53:59 -0000
>@@ -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>
>+-      
>++      
>+       
>+       
>+       
>Index: files/patch-configure.in
>===================================================================
>RCS file: files/patch-configure.in
>diff -N files/patch-configure.in
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/patch-configure.in	19 Jul 2010 14:53:59 -0000
>@@ -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
>Index: files/patch-libs-openzap-Makefile.am
>===================================================================
>RCS file: files/patch-libs-openzap-Makefile.am
>diff -N files/patch-libs-openzap-Makefile.am
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/patch-libs-openzap-Makefile.am	19 Jul 2010 14:53:59 -0000
>@@ -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
>Index: files/patch-libs-openzap-mod_openzap-Makefile.in
>===================================================================
>RCS file: files/patch-libs-openzap-mod_openzap-Makefile.in
>diff -N files/patch-libs-openzap-mod_openzap-Makefile.in
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/patch-libs-openzap-mod_openzap-Makefile.in	19 Jul 2010 14:53:59 -0000
>@@ -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
>Index: files/patch-src-include-private-switch_core_pvt.h
>===================================================================
>RCS file: files/patch-src-include-private-switch_core_pvt.h
>diff -N files/patch-src-include-private-switch_core_pvt.h
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/patch-src-include-private-switch_core_pvt.h	19 Jul 2010 14:53:59 -0000
>@@ -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;
>Index: files/patch-src-include-switch_types.h
>===================================================================
>RCS file: files/patch-src-include-switch_types.h
>diff -N files/patch-src-include-switch_types.h
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/patch-src-include-switch_types.h	19 Jul 2010 14:53:59 -0000
>@@ -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;
>Index: files/patch-src-mod-applications-mod_voicemail-mod_voicemail.c
>===================================================================
>RCS file: files/patch-src-mod-applications-mod_voicemail-mod_voicemail.c
>diff -N files/patch-src-mod-applications-mod_voicemail-mod_voicemail.c
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/patch-src-mod-applications-mod_voicemail-mod_voicemail.c	19 Jul 2010 14:53:59 -0000
>@@ -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);
>+ 	}
>Index: files/patch-src-switch_core.c
>===================================================================
>RCS file: files/patch-src-switch_core.c
>diff -N files/patch-src-switch_core.c
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/patch-src-switch_core.c	19 Jul 2010 14:53:59 -0000
>@@ -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);

Actions: View | Diff

Attachments on bug 148693: 107869 | 107870 | 107871 | 107872 | 107873 | 107874