Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/net/freeswitch-core/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- Makefile	16 Oct 2010 11:52:25 -0000	1.13
+++ Makefile	3 Dec 2010 20:50:09 -0000
@@ -6,17 +6,17 @@
 #
 
 PORTNAME=	freeswitch-core
-PORTVERSION=	1.0.6
-PORTREVISION=	5
+PORTVERSION=	201044
 CATEGORIES=	net
-MASTER_SITES=	http://files.freeswitch.org/:1 \
+MASTER_SITES=	ftp://ftp.secure-computing.net/pub/freeswitch/ \
+		ftp://ftp2.secure-computing.net/pub/freeswitch/ \
 		http://files.freeswitch.org/downloads/libs/:2
-DISTFILES=	${BASE_PORTNAME}-${PORTVERSION}.tar.gz:1 \
+DISTFILES=	${BASE_PORTNAME}-${PORTVERSION}.tar.gz \
 		celt-0.7.1.tar.gz:2 \
 		flite-1.3.99-latest.tar.gz:2 \
-		json-c-0.9.tar.gz \
+		json-c-0.9.tar.gz:2 \
 		lame-3.97.tar.gz:2 \
-		libmemcached-0.32.tar.gz \
+		libmemcached-0.32.tar.gz:2 \
 		libshout-2.2.2.tar.gz:2 \
 		mpg123.tar.gz:2 \
 		openldap-2.4.11.tar.gz:2 \
@@ -24,6 +24,7 @@
 		soundtouch-1.3.1.tar.gz:2 \
 		sphinxbase-0.4.99-20091212.tar.gz:2 \
 		communicator_semi_6000_20080321.tar.gz:2
+DIST_SUBDIR=	${BASE_PORTNAME}
 EXTRACT_ONLY=	${BASE_PORTNAME}-${PORTVERSION}.tar.gz
 
 MAINTAINER=	r.neese@gmail.com
@@ -52,8 +53,8 @@
 		--sysconfdir=${PREFIX}/etc/${BASE_PORTNAME}/conf \
 		--includedir=${PREFIX}/include/${BASE_PORTNAME} \
 		--libdir=${PREFIX}/lib/${BASE_PORTNAME}/lib \
+		--localstatedir="${VARBASE}" \
 		--with-modinstdir=${PREFIX}/lib/${BASE_PORTNAME}/mod \
-		--with-rundir=${VARBASE}/run/${BASE_PORTNAME} \
 		--with-libgnutls-prefix=${LOCALBASE} \
 		--with-ogg=${LOCALBASE} \
 		--with-ogg-libraries=${LOCALBASE}/lib \
@@ -66,14 +67,15 @@
 
 FREESWITCH_USER=	freeswitch
 FREESWITCH_GROUP=	${FREESWITCH_USER}
-BASE_PORTNAME=	${FREESWITCH_USER}
 
 SUB_LIST=	FREESWITCH_USER=${FREESWITCH_USER} FREESWITCH_GROUP=${FREESWITCH_GROUP}
 
+BASE_PORTNAME=	${FREESWITCH_USER}
+
 OPTIONS=	MODSHOUT        "Enable mod_shout (streaming audio/mp3)" on \
 		MODFLITE	"Enable mod_flite (Text to Speech)" on \
-		MODUNIMRCP	"Enable mod_unimrcp tts (new testing)" off \
-		MODTTSCMDLINE	"Enable mod_tts_commandline (testing)" off \
+		MODUNIMRCP	"Enable mod_unimrcp tts" off \
+		MODTTSCMDLINE	"Enable mod_tts_commandline" off \
 		MODPOCKETSPHINX	"Enable mod_pockectsphinx (voice control)" on \
 		MODCIDLOOKUP	"Enable mod_cidlookup" on \
 		MODDPDIRECTORY	"Enable mod_dialplan_directory" off \
@@ -86,36 +88,39 @@
 		MODSOUNDTOUCH	"Enable mod_soundtouch" on \
 		MODRSS		"Enable mod_rss (rss feed reader)" on \
 		MODSNOM		"Enable mod_snom (snom control)" off \
+		MODAVMD		"Enable mod_avmd (Adavced v-mail detection)" on \
 		MODVMD		"Enable mod_vmd (voice mail detection)" on \
 		MODSPY		"Enable mod_spy" on \
 		MODAMRWB	"Enable mod_amrwb (amrwb codec)" on \
-		MODCELT		"Enable mod_celt (celt codec)" on \
+		MODCELT		"Enable mod_celt (celt 48k  codec)" on \
 		MODSILK		"Enable mod_silk (New Silk Codec)" on \
-		MODOPENZAP	"Enable mod_openzap dahdi support" off \
-		MODSKINNY	"Enable mod_skinny Skinny Support (Beta)" off \
+		MODCODEC2	"Enable mod_codec2 (new codec)" on \
+		MODFREETDM	"Enable mod_freetdm dahdi support (Testing)" off \
+		MODSKINNY	"Enable mod_skinny Skinny Support" on \
 		MODMEMCACHE	"Enable mod_memcache" on \
 		MODMULTICAST	"Enable mod_event_multicast" on \
-		MODNIBBLEBILL   "Enable mod_nibblebill(billing)" on \
+		MODNIBBLEBILL   "Enable mod_nibblebill (billing)" on \
 		MODPORTAUDIO    "Enable mod_portaudio" on \
 		MODPASTREAM	"Enable mod_portaudio_stream (new)" on \
-		MODSHELLSTREAM	"Enable mod_SHELL_stream (New)" on \
+		MODSHELLSTREAM	"Enable mod_shell_stream (new)" on \
 		MODPERL		"Enable mod_perl (perl support)" off \
-		MODPYTHON	"Enable mod_python (python lang)" off \
+		MODPYTHON	"Enable mod_python (python)" off \
 		MODCURL		"Enable mod_curl" off \
 		MODXMLCURL	"Enable mod_xml_curl" off \
-		MODDISTRIBUTOR	"Enable mod_distributor (testing)" off \
+		MODDISTRIBUTOR	"Enable mod_distributor " off \
 		MODSNAPSHOT	"Enable mod_snapshot (testing)" off \
 		MODSAYDE	"Enable mod_say_de (German support)" off \
 		MODSAYES	"Enable mod_say_se (Spanish support)" off \
 		MODSAYEN	"Enable mod_say_en (English support)" on \
-		MODSAYHU	"Enable mod_say_hu (Hungarian support(new)" off \
+		MODSAYHU	"Enable mod_say_hu (Hungarian support)" off \
 		MODSAYFR	"Enable mod_say_fr (French support)" off \
 		MODSAYIT	"Enable mod_say_it (Italian support)" off \
 		MODSAYNL	"Enable mod_say_nl (Dutch support)" off \
 		MODSAYRU	"Enable mod_say_ru (Russian support)" on \
-		MODSAYTH	"Enable mod_say_th (Thi support(new)" off \
+		MODSAYTH	"Enable mod_say_th (Thi support)" off \
 		MODSAYZH	"Enable mod_say_zh (Chinese support)" off \
-		EXTENSIONS	"Include Default User Extensions" off
+		EXTENSIONS	"Include Default User Extensions" off \
+		MODCALLCENTER	"Enable mod_callcenter (new)(test)" on
 
 .include <bsd.port.options.mk>
 
@@ -128,10 +133,10 @@
 .endif
 
 .for i in MODFLITE MODPOCKETSPHINX MODCIDLOOKUP MODDPDIRECTORY MODEASYROUTE MODLCR MODSOUNDTOUCH \
-	MODRSS MODSNOM MODVMD MODSPY MODAMRWB MODCELT MODMULTICAST MODPORTAUDIO MODCURL MODXMLCURL \
+	MODRSS MODSNOM MODAVMD MODVMD MODSPY MODAMRWB MODCELT MODMULTICAST MODPORTAUDIO MODCURL MODXMLCURL \
 	MODSAYDE MODSAYEN MODSAYES MODSAYFR MODSAYHU MODSAYIT MODSAYNL MODSAYRU MODSAYTH MODSAYZH \
-	MODNIBBLEBILL MODDINGALING MODDIRECTORY MODMEMCACHE MODPASTREAM MODSHELLSTREAM \
-	MODSILK MODUNIMRCP MODTTSCMDLINE MODDISTRIBUTOR MODSNAPSHOT MODSKINNY EXTENSIONS
+	MODNIBBLEBILL MODDINGALING MODDIRECTORY MODMEMCACHE MODPYTHON MODPASTREAM MODSHELLSTREAM \
+	MODSILK MODUNIMRCP MODTTSCMDLINE MODDISTRIBUTOR MODSNAPSHOT MODSKINNY EXTENSIONS MODCALLCENTER MODCODEC2
 .if !defined(WITH_${i})
 PLIST_SUB+=	WITH_${i}="@comment "
 .else
@@ -139,13 +144,13 @@
 .endif
 .endfor
 
-.if !defined(WITH_MODOPENZAP)
-PLIST_SUB+=	WITH_MODOPENZAP="@comment "
+.if !defined(WITH_MODFREETDM)
+PLIST_SUB+=	 WITH_MODFREETDM="@comment "
 .else
 .if ${OSVERSION} < 703000 || (${OSVERSION} >= 800000 && ${OSVERSION} < 800108)
-IGNORE=		sorry you can not use mod_openzap on this version of freebsd ( dahdi support broken ) please update
+IGNORE=	sorry you can not use mod_freetdm on this version of freebsd ( dahdi support broken ) please update
 .endif
-PLIST_SUB+=	WITH_MODOPENZAP=""
+PLIST_SUB+=	WITH_MODFREETDM=""
 CONFIGURE_ARGS+=	--with-libpri
 BUILD_DEPENDS+=	libpri>=1.2.0:${PORTSDIR}/misc/libpri \
 		${LOCALBASE}/include/dahdi/wctdm_user.h:${PORTSDIR}/misc/dahdi
@@ -153,13 +158,6 @@
 RUN_DEPENDS+=	${LOCALBASE}/include/dahdi/wctdm_user.h:${PORTSDIR}/misc/dahdi
 .endif
 
-.if !defined(WITH_MODPYTHON)
-PLIST_SUB+=	WITH_MODPYTHON="@comment "
-.else
-PLIST_SUB+=	WITH_MODPYTHON=""
-USE_PYTHON=	yes
-.endif
-
 .if !defined(WITH_MODSHOUT)
 PLIST_SUB+=	WITH_MODSHOUT="@comment "
 .else
@@ -190,17 +188,11 @@
 .endif
 
 pre-configure:
-	cd ${WRKSRC} && ./rebootstrap.sh
 	@${REINPLACE_CMD} -e 's|pkgconfigdir = $$(libdir)/pkgconfig|pkgconfigdir = ${PREFIX}/libdata/pkgconfig|g' ${WRKSRC}/libs/*/Makefile.am
-	@${REINPLACE_CMD} -e 's|pkgconfigdir = $$(libdir)/pkgconfig|pkgconfigdir = ${PREFIX}/libdata/pkgconfig|g' ${WRKSRC}/libs/*/Makefile.in
+	@${REINPLACE_CMD} -e 's|pkgconfigdir   = $$(libdir)/pkgconfig|pkgconfigdir = ${PREFIX}/libdata/pkgconfig|g' ${WRKSRC}/libs/*/Makefile.am
 	@${REINPLACE_CMD} -e 's|pkgconfigdir = $$(libdir)/pkgconfig|pkgconfigdir = ${PREFIX}/libdata/pkgconfig|g' ${WRKSRC}/Makefile.am
-	@${REINPLACE_CMD} -e 's|pkgconfigdir = $$(libdir)/pkgconfig|pkgconfigdir = ${PREFIX}/libdata/pkgconfig|g' ${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e 's|base=http://files.freeswitch.org/downloads/libs/|base=file://${DISTDIR}/|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
+	@${REINPLACE_CMD} -e 's|base=http://files.freeswitch.org/downloads/libs/|base=file://${DISTDIR}/${DIST_SUBDIR}/|g' ${WRKSRC}/build/getlib.sh.in
+	cd ${WRKSRC} && ./rebootstrap.sh
 
 post-configure:
 .for i in mod_unimrcp mod_flite mod_pocketsphinx
@@ -212,13 +204,13 @@
 	@${REINPLACE_CMD} -e 's|#asr_tts/mod_tts_commandline|asr_tts/mod_tts_commandline|g' ${WRKSRC}/modules.conf
 .endif
 .for i in mod_cidlookup mod_easyroute mod_fax mod_lcr mod_soundtouch mod_rss mod_snom \
-	mod_vmd mod_spy mod_curl mod_nibblebill mod_memcache mod_directory mod_distributor \
-	mod_snapshot
+	mod_vmd mod_avmd mod_spy mod_curl mod_nibblebill mod_memcache mod_directory mod_distributor \
+	mod_snapshot mod_callcenter
 .if defined(WITH_${i:C/_//g:U})
 	@${REINPLACE_CMD} -e 's|#\(applications/${i}\)|\1|g' ${WRKSRC}/modules.conf
 .endif
 .endfor
-.for i in mod_amrwb mod_celt mod_silk
+.for i in mod_amrwb mod_celt mod_silk mod_codec2
 .if defined(WITH_${i:C/_//g:U})
 	@${REINPLACE_CMD} -e 's|#\(codecs/${i}\)|\1|g' ${WRKSRC}/modules.conf
 .endif
@@ -249,8 +241,8 @@
 .if defined(WITH_MODDPDIRECTORY)
 	@${REINPLACE_CMD} -e 's|#dialplans/mod_dialplan_directory|dialplans/mod_dialplan_directory|g' ${WRKSRC}/modules.conf
 .endif
-.if defined(WITH_MODOPENZAP)
-	@${REINPLACE_CMD} -e 's|#../../libs/openzap/mod_openzap|../../libs/openzap/mod_openzap|g' ${WRKSRC}/modules.conf
+.if defined(WITH_MODFREETDM)
+	@${REINPLACE_CMD} -e 's|#../../libs/freetdm/mod_freetdm|../../libs/freetdm/mod_freetdm|g' ${WRKSRC}/modules.conf
 .endif
 .if defined(WITH_MODMULTICAST)
 	@${REINPLACE_CMD} -e 's|#event_handlers/mod_event_multicast|event_handlers/mod_event_multicast|g' ${WRKSRC}/modules.conf
@@ -282,10 +274,13 @@
 	@${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}
+	@${CHMOD} -R 775 ${PREFIX}/etc/${BASE_PORTNAME}/conf
+	@${CHMOD} -R 775 ${VARBASE}/log/${BASE_PORTNAME}
+	@${CHMOD} -R 775 ${VARBASE}/${BASE_PORTNAME}
 	@${ECHO_MSG} "This port chown -R various directories ${FREESWITCH_USER}:${FREESWITCH_GROUP} "
 	@${ECHO_MSG} "this is for port security . in the event something should stop working."
 	@${ECHO_MSG} "Please take the time to check chownership of the dir's"
 	@${ECHO_MSG} "${VARBASE}/db/${BASE_PORTNAME} ${VARBASE}/log/${BASE_PORTNAME} ${VARBASE}/${BASE_PORTNAME} ${PREFIX}/etc/${BASE_PORTNAME}"
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/net/freeswitch-core/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- distinfo	16 Jul 2010 14:57:42 -0000	1.2
+++ distinfo	3 Dec 2010 20:50:09 -0000
@@ -1,39 +1,26 @@
-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
+SHA256 (freeswitch/freeswitch-201044.tar.gz) = cea3583bcc1febc8b6ad85ca38c991d2d7319945784dd915834c1479b33bbd4b
+SIZE (freeswitch/freeswitch-201044.tar.gz) = 42320468
+SHA256 (freeswitch/celt-0.7.1.tar.gz) = 93f0e2dfb59021b19e69dc0dee855eb89f19397db1dea0d0d6f9329cff933066
+SIZE (freeswitch/celt-0.7.1.tar.gz) = 425092
+SHA256 (freeswitch/flite-1.3.99-latest.tar.gz) = ac5832c7b654c5adf9ec3df0e8a7c817d2105233e11ce5aa7e97a8c6c8e14e13
+SIZE (freeswitch/flite-1.3.99-latest.tar.gz) = 17440698
+SHA256 (freeswitch/json-c-0.9.tar.gz) = 816fb2d4baab09e2f51a7c1be75bc9e03ed09d4cf3c2cd03c183f433bb9b565f
+SIZE (freeswitch/json-c-0.9.tar.gz) = 328935
+SHA256 (freeswitch/lame-3.97.tar.gz) = 0a2334a6d11085298a9a3c46d5d310cca012f2e61d6efae90840a76a364dbe17
+SIZE (freeswitch/lame-3.97.tar.gz) = 1328058
+SHA256 (freeswitch/libmemcached-0.32.tar.gz) = cf1be20af93163d6ab25b511f79c515778ebced54806875561ebef46011f2a9b
+SIZE (freeswitch/libmemcached-0.32.tar.gz) = 512586
+SHA256 (freeswitch/libshout-2.2.2.tar.gz) = 38701125cb0e0349f4394dd3254d6037eeb8af0747c0942ff433ffbcd48d2367
+SIZE (freeswitch/libshout-2.2.2.tar.gz) = 478582
+SHA256 (freeswitch/mpg123.tar.gz) = 408fed3b37d83ab2396bcf6253d62e75e573ba96b7c4497f0faddd557763b97b
+SIZE (freeswitch/mpg123.tar.gz) = 1253597
+SHA256 (freeswitch/openldap-2.4.11.tar.gz) = 76e57147a2373015f306f2e72128330e51d5c0f1056b4713283234dfd16c1c9c
+SIZE (freeswitch/openldap-2.4.11.tar.gz) = 4941654
+SHA256 (freeswitch/pocketsphinx-0.5.99-20091212.tar.gz) = ad2318103ae16bd1740b0e8658bc6d5fa8964e8eb79de128f7c106d3401f2f48
+SIZE (freeswitch/pocketsphinx-0.5.99-20091212.tar.gz) = 11703230
+SHA256 (freeswitch/soundtouch-1.3.1.tar.gz) = ff5ff8dfe4a078ced7478a71f0d4715ee27743424f5c06db19829e2fee06b2b5
+SIZE (freeswitch/soundtouch-1.3.1.tar.gz) = 407740
+SHA256 (freeswitch/sphinxbase-0.4.99-20091212.tar.gz) = a1e359aa92934414bc4fe1dcbb93edad11bf7b5f625c94bdebe85d6dfe3618f0
+SIZE (freeswitch/sphinxbase-0.4.99-20091212.tar.gz) = 2150613
+SHA256 (freeswitch/communicator_semi_6000_20080321.tar.gz) = dbb5e9fb85000a7cb97d6958a3ef8d77532dc55fc730ac6979705e8645cb0c18
+SIZE (freeswitch/communicator_semi_6000_20080321.tar.gz) = 5595694
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/net/freeswitch-core/pkg-plist,v
retrieving revision 1.4
diff -u -r1.4 pkg-plist
--- pkg-plist	20 Aug 2010 17:13:56 -0000	1.4
+++ pkg-plist	3 Dec 2010 20:50:10 -0000
@@ -6,11 +6,13 @@
 bin/gentls_cert
 etc/freeswitch/conf/autoload_configs/acl.conf.xml.sample
 etc/freeswitch/conf/autoload_configs/alsa.conf.xml.sample
+etc/freeswitch/conf/autoload_configs/callcenter.conf.xml.sample
 etc/freeswitch/conf/autoload_configs/cdr_csv.conf.xml.sample
 etc/freeswitch/conf/autoload_configs/cdr_pg_csv.conf.xml.sample
 etc/freeswitch/conf/autoload_configs/cidlookup.conf.xml.sample
 etc/freeswitch/conf/autoload_configs/conference.conf.xml.sample
 etc/freeswitch/conf/autoload_configs/console.conf.xml.sample
+etc/freeswitch/conf/autoload_configs/db.conf.xml.sample
 etc/freeswitch/conf/autoload_configs/dialplan_directory.conf.xml.sample
 etc/freeswitch/conf/autoload_configs/dingaling.conf.xml.sample
 etc/freeswitch/conf/autoload_configs/directory.conf.xml.sample
@@ -22,10 +24,11 @@
 etc/freeswitch/conf/autoload_configs/event_socket.conf.xml.sample
 etc/freeswitch/conf/autoload_configs/fax.conf.xml.sample
 etc/freeswitch/conf/autoload_configs/fifo.conf.xml.sample
+%%WITH_MODFREETDM%%etc/freeswitch/conf/autoload_configs/freetdm.conf.xml.sample
+etc/freeswitch/conf/autoload_configs/hash.conf.xml.sample
 etc/freeswitch/conf/autoload_configs/ivr.conf.xml.sample
 etc/freeswitch/conf/autoload_configs/java.conf.xml.sample
 etc/freeswitch/conf/autoload_configs/lcr.conf.xml.sample
-etc/freeswitch/conf/autoload_configs/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
@@ -33,17 +36,19 @@
 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/osp.conf.xml.sample
 etc/freeswitch/conf/autoload_configs/perl.conf.xml.sample
 etc/freeswitch/conf/autoload_configs/pocketsphinx.conf.xml.sample
 etc/freeswitch/conf/autoload_configs/portaudio.conf.xml.sample
 etc/freeswitch/conf/autoload_configs/post_load_modules.conf.xml.sample
 etc/freeswitch/conf/autoload_configs/python.conf.xml.sample
+etc/freeswitch/conf/autoload_configs/redis.conf.xml.sample
 etc/freeswitch/conf/autoload_configs/rss.conf.xml.sample
 etc/freeswitch/conf/autoload_configs/sangoma_codec.conf.xml.sample
 etc/freeswitch/conf/autoload_configs/shout.conf.xml.sample
 etc/freeswitch/conf/autoload_configs/skinny.conf.xml.sample
 etc/freeswitch/conf/autoload_configs/sofia.conf.xml.sample
+etc/freeswitch/conf/autoload_configs/spandsp.conf.xml.sample
 etc/freeswitch/conf/autoload_configs/spidermonkey.conf.xml.sample
 etc/freeswitch/conf/autoload_configs/switch.conf.xml.sample
 etc/freeswitch/conf/autoload_configs/syslog.conf.xml.sample
@@ -59,10 +64,14 @@
 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/dialplan/skinny-patterns.xml.sample
+etc/freeswitch/conf/dialplan/skinny-patterns/20-Demo.xml.sample
+etc/freeswitch/conf/dialplan/skinny-patterns/20-Local_extension.xml.sample
+etc/freeswitch/conf/dialplan/skinny-patterns/90-External.xml.sample
+etc/freeswitch/conf/dialplan/skinny-patterns/99-Default_Drop.xml.sample
 etc/freeswitch/conf/directory/default.xml.sample
 %%WITH_EXTENSIONS%%etc/freeswitch/conf/directory/default/1000.xml.sample
 %%WITH_EXTENSIONS%%etc/freeswitch/conf/directory/default/1001.xml.sample
@@ -87,8 +96,10 @@
 %%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
+%%WITH_EXTENSIONS%%etc/freeswitch/conf/directory/default/skinny-example.xml.sample
 etc/freeswitch/conf/extensions.conf.sample
 etc/freeswitch/conf/freeswitch.xml.sample
+%%WITH_MODFREETDM%%etc/freeswitch/conf/freetdm.conf.sample
 etc/freeswitch/conf/fur_elise.ttml.sample
 etc/freeswitch/conf/ivr_menus/demo_ivr.xml.sample
 etc/freeswitch/conf/jingle_profiles/client.xml.sample
@@ -115,8 +126,8 @@
 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
+%%WITH_MODFREETDM%%etc/freeswitch/conf/m3ua.conf.sample
+%%WITH_MODFREETDM%%etc/freeswitch/conf/mime.types.sample
 etc/freeswitch/conf/mrcp_profiles/loquendo-7-mrcp-v2.xml.sample
 etc/freeswitch/conf/mrcp_profiles/nuance-1.0.0-mrcp-v1.xml.sample
 etc/freeswitch/conf/mrcp_profiles/nuance-5.0-mrcp-v1.xml.sample
@@ -124,8 +135,7 @@
 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
+%%WITH_MODFREETDM%%etc/freeswitch/conf/pika.conf.sample
 etc/freeswitch/conf/sip_profiles/external.xml.sample
 etc/freeswitch/conf/sip_profiles/external/example.xml.sample
 etc/freeswitch/conf/sip_profiles/internal-ipv6.xml.sample
@@ -133,12 +143,12 @@
 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
+%%WITH_MODFREETDM%%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
+%%WITH_MODFREETDM%%etc/freeswitch/conf/wanpipe.conf.sample
 etc/freeswitch/conf/web-vm.tpl.sample
-%%WITH_MODOPENZAP%%etc/freeswitch/conf/zt.conf.sample
+%%WITH_MODFREETDM%%etc/freeswitch/conf/zt.conf.sample
 @exec for i in $(find %D/etc/freeswitch/conf/ -type f -name *.sample); do if [ ! -f ${i%.sample} ]; then cp $i ${i%.sample}; fi; done
 %%WITH_MODPOCKETSPHINX%%etc/freeswitch/grammar/default.dic
 %%WITH_MODPOCKETSPHINX%%etc/freeswitch/grammar/model/communicator/COPYING
@@ -160,16 +170,9 @@
 %%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
-%%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
@@ -186,6 +189,8 @@
 include/freeswitch/switch_event.h
 include/freeswitch/switch_frame.h
 include/freeswitch/switch_ivr.h
+include/freeswitch/switch_json.h
+include/freeswitch/switch_limit.h
 include/freeswitch/switch_loadable_module.h
 include/freeswitch/switch_log.h
 include/freeswitch/switch_module_interfaces.h
@@ -195,6 +200,7 @@
 include/freeswitch/switch_platform.h
 include/freeswitch/switch_regex.h
 include/freeswitch/switch_resample.h
+include/freeswitch/switch_rtcp_frame.h
 include/freeswitch/switch_rtp.h
 include/freeswitch/switch_scheduler.h
 include/freeswitch/switch_stun.h
@@ -202,37 +208,52 @@
 include/freeswitch/switch_utils.h
 include/freeswitch/switch_xml.h
 include/freeswitch/switch_xml_config.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
+%%WITH_MODFREETDM%%include/freetdm.h
+%%WITH_MODFREETDM%%include/ftdm_declare.h
+%%WITH_MODFREETDM%%include/ftdm_dso.h
+%%WITH_MODFREETDM%%include/ftdm_os.h
+%%WITH_MODFREETDM%%include/ftdm_threadmutex.h
 lib/freeswitch/lib/libfreeswitch.a
 lib/freeswitch/lib/libfreeswitch.la
 lib/freeswitch/lib/libfreeswitch.so
 lib/freeswitch/lib/libfreeswitch.so.1
+%%WITH_MODFREETDM%%lib/freeswitch/lib/libfreetdm.a
+%%WITH_MODFREETDM%%lib/freeswitch/lib/libfreetdm.la
+%%WITH_MODFREETDM%%lib/freeswitch/lib/libfreetdm.so
+%%WITH_MODFREETDM%%lib/freeswitch/lib/libfreetdm.so.1
 lib/freeswitch/lib/libjs.a
 lib/freeswitch/lib/libjs.la
 lib/freeswitch/lib/libjs.so
 lib/freeswitch/lib/libjs.so.1
 lib/freeswitch/lib/libnspr4.a
 lib/freeswitch/lib/libnspr4.so.1
-%%WITH_MODOPENZAP%%lib/freeswitch/lib/libopenzap.a
-%%WITH_MODOPENZAP%%lib/freeswitch/lib/libopenzap.la
-%%WITH_MODOPENZAP%%lib/freeswitch/lib/libopenzap.so
-%%WITH_MODOPENZAP%%lib/freeswitch/lib/libopenzap.so.1
 lib/freeswitch/lib/libplc4.a
 lib/freeswitch/lib/libplc4.so.1
 lib/freeswitch/lib/libplds4.a
 lib/freeswitch/lib/libplds4.so.1
+%%WITH_MODFREETDM%%lib/freeswitch/mod/ftmod_analog.la
+%%WITH_MODFREETDM%%lib/freeswitch/mod/ftmod_analog.so
+%%WITH_MODFREETDM%%lib/freeswitch/mod/ftmod_analog_em.la
+%%WITH_MODFREETDM%%lib/freeswitch/mod/ftmod_analog_em.so
+%%WITH_MODFREETDM%%lib/freeswitch/mod/ftmod_libpri.la
+%%WITH_MODFREETDM%%lib/freeswitch/mod/ftmod_libpri.so
+%%WITH_MODFREETDM%%lib/freeswitch/mod/ftmod_sangoma_boost.la
+%%WITH_MODFREETDM%%lib/freeswitch/mod/ftmod_sangoma_boost.so
+%%WITH_MODFREETDM%%lib/freeswitch/mod/ftmod_skel.a
+%%WITH_MODFREETDM%%lib/freeswitch/mod/ftmod_skel.la
+%%WITH_MODFREETDM%%lib/freeswitch/mod/ftmod_skel.so
+%%WITH_MODFREETDM%%lib/freeswitch/mod/ftmod_zt.la
+%%WITH_MODFREETDM%%lib/freeswitch/mod/ftmod_zt.so
 lib/freeswitch/mod/mod_amr.la
 lib/freeswitch/mod/mod_amr.so
 %%WITH_MODAMRWB%%lib/freeswitch/mod/mod_amrwb.la
 %%WITH_MODAMRWB%%lib/freeswitch/mod/mod_amrwb.so
+%%WITH_MODAVMD%%lib/freeswitch/mod/mod_avmd.la
+%%WITH_MODAVMD%%lib/freeswitch/mod/mod_avmd.so
 lib/freeswitch/mod/mod_bv.la
 lib/freeswitch/mod/mod_bv.so
+%%WITH_MODCALLCENTER%%lib/freeswitch/mod/mod_callcenter.la
+%%WITH_MODCALLCENTER%%lib/freeswitch/mod/mod_callcenter.so
 lib/freeswitch/mod/mod_cdr_csv.la
 lib/freeswitch/mod/mod_cdr_csv.so
 %%WITH_MODCELT%%lib/freeswitch/mod/mod_celt.la
@@ -241,6 +262,8 @@
 %%WITH_MODCIDLOOKUP%%lib/freeswitch/mod/mod_cidlookup.so
 lib/freeswitch/mod/mod_cluechoo.la
 lib/freeswitch/mod/mod_cluechoo.so
+%%WITH_MODCODEC2%%lib/freeswitch/mod/mod_codec2.la
+%%WITH_MODCODEC2%%lib/freeswitch/mod/mod_codec2.so
 lib/freeswitch/mod/mod_commands.la
 lib/freeswitch/mod/mod_commands.so
 lib/freeswitch/mod/mod_conference.la
@@ -249,6 +272,8 @@
 lib/freeswitch/mod/mod_console.so
 %%WITH_MODCURL%%lib/freeswitch/mod/mod_curl.la
 %%WITH_MODCURL%%lib/freeswitch/mod/mod_curl.so
+lib/freeswitch/mod/mod_db.la
+lib/freeswitch/mod/mod_db.so
 lib/freeswitch/mod/mod_dialplan_asterisk.la
 lib/freeswitch/mod/mod_dialplan_asterisk.so
 %%WITH_MODDPDIRECTORY%%lib/freeswitch/mod/mod_dialplan_directory.la
@@ -277,14 +302,14 @@
 lib/freeswitch/mod/mod_event_socket.so
 lib/freeswitch/mod/mod_expr.la
 lib/freeswitch/mod/mod_expr.so
-%%WITH_MODFAX%%lib/freeswitch/mod/mod_fax.la
-%%WITH_MODFAX%%lib/freeswitch/mod/mod_fax.so
 lib/freeswitch/mod/mod_fifo.la
 lib/freeswitch/mod/mod_fifo.so
 lib/freeswitch/mod/mod_file_string.la
 lib/freeswitch/mod/mod_file_string.so
 %%WITH_MODFLITE%%lib/freeswitch/mod/mod_flite.la
 %%WITH_MODFLITE%%lib/freeswitch/mod/mod_flite.so
+%%WITH_MODFREETDM%%lib/freeswitch/mod/mod_freetdm.la
+%%WITH_MODFREETDM%%lib/freeswitch/mod/mod_freetdm.so
 lib/freeswitch/mod/mod_fsv.la
 lib/freeswitch/mod/mod_fsv.so
 lib/freeswitch/mod/mod_g723_1.la
@@ -293,12 +318,12 @@
 lib/freeswitch/mod/mod_g729.so
 lib/freeswitch/mod/mod_h26x.la
 lib/freeswitch/mod/mod_h26x.so
+lib/freeswitch/mod/mod_hash.la
+lib/freeswitch/mod/mod_hash.so
 lib/freeswitch/mod/mod_ilbc.la
 lib/freeswitch/mod/mod_ilbc.so
 %%WITH_MODLCR%%lib/freeswitch/mod/mod_lcr.la
 %%WITH_MODLCR%%lib/freeswitch/mod/mod_lcr.so
-lib/freeswitch/mod/mod_limit.la
-lib/freeswitch/mod/mod_limit.so
 lib/freeswitch/mod/mod_local_stream.la
 lib/freeswitch/mod/mod_local_stream.so
 lib/freeswitch/mod/mod_logfile.la
@@ -313,8 +338,6 @@
 lib/freeswitch/mod/mod_native_file.so
 %%WITH_MODNIBBLEBILL%%lib/freeswitch/mod/mod_nibblebill.la
 %%WITH_MODNIBBLEBILL%%lib/freeswitch/mod/mod_nibblebill.so
-%%WITH_MODOPENZAP%%lib/freeswitch/mod/mod_openzap.la
-%%WITH_MODOPENZAP%%lib/freeswitch/mod/mod_openzap.so
 %%WITH_MODPERL%%lib/freeswitch/mod/mod_perl.la
 %%WITH_MODPERL%%lib/freeswitch/mod/mod_perl.so
 %%WITH_MODPOCKETSPHINX%%lib/freeswitch/mod/mod_pocketsphinx.la
@@ -325,7 +348,6 @@
 %%WITH_MODPASTREAM%%lib/freeswitch/mod/mod_portaudio_stream.so
 %%WITH_MODPYTHON%%lib/freeswitch/mod/mod_python.la
 %%WITH_MODPYTHON%%lib/freeswitch/mod/mod_python.so
-%%WITH_MODPYTHON%%%%PYTHON_SITELIBDIR%%/freeswitch.py
 %%WITH_MODRSS%%lib/freeswitch/mod/mod_rss.la
 %%WITH_MODRSS%%lib/freeswitch/mod/mod_rss.so
 %%WITH_MODSAYDE%%lib/freeswitch/mod/mod_say_de.la
@@ -368,6 +390,8 @@
 lib/freeswitch/mod/mod_sofia.so
 %%WITH_MODSOUNDTOUCH%%lib/freeswitch/mod/mod_soundtouch.la
 %%WITH_MODSOUNDTOUCH%%lib/freeswitch/mod/mod_soundtouch.so
+%%WITH_MODFAX%%lib/freeswitch/mod/mod_spandsp.la
+%%WITH_MODFAX%%lib/freeswitch/mod/mod_spandsp.so
 lib/freeswitch/mod/mod_speex.la
 lib/freeswitch/mod/mod_speex.so
 lib/freeswitch/mod/mod_spidermonkey.la
@@ -398,29 +422,6 @@
 %%WITH_MODVMD%%lib/freeswitch/mod/mod_vmd.so
 lib/freeswitch/mod/mod_voicemail.la
 lib/freeswitch/mod/mod_voicemail.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
-%%WITH_MODOPENZAP%%lib/freeswitch/mod/ozmod_analog_em.a
-%%WITH_MODOPENZAP%%lib/freeswitch/mod/ozmod_analog_em.la
-%%WITH_MODOPENZAP%%lib/freeswitch/mod/ozmod_analog_em.so
-%%WITH_MODOPENZAP%%lib/freeswitch/mod/ozmod_isdn.a
-%%WITH_MODOPENZAP%%lib/freeswitch/mod/ozmod_isdn.la
-%%WITH_MODOPENZAP%%lib/freeswitch/mod/ozmod_isdn.so
-%%WITH_MODOPENZAP%%lib/freeswitch/mod/ozmod_libpri.a
-%%WITH_MODOPENZAP%%lib/freeswitch/mod/ozmod_libpri.la
-%%WITH_MODOPENZAP%%lib/freeswitch/mod/ozmod_libpri.so
-%%WITH_MODOPENZAP%%lib/freeswitch/mod/ozmod_sangoma_boost.a
-%%WITH_MODOPENZAP%%lib/freeswitch/mod/ozmod_sangoma_boost.la
-%%WITH_MODOPENZAP%%lib/freeswitch/mod/ozmod_sangoma_boost.so
-%%WITH_MODOPENZAP%%lib/freeswitch/mod/ozmod_skel.a
-%%WITH_MODOPENZAP%%lib/freeswitch/mod/ozmod_skel.la
-%%WITH_MODOPENZAP%%lib/freeswitch/mod/ozmod_skel.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
-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
@@ -428,6 +429,7 @@
 lib/freeswitch/mod/mod_xml_rpc.la
 lib/freeswitch/mod/mod_xml_rpc.so
 libdata/pkgconfig/freeswitch.pc
+%%WITH_MODFREETDM%%libdata/pkgconfig/freetdm.pc
 %%WITH_MODPERL%%perl/freeswitch.la
 %%WITH_MODPERL%%perl/freeswitch.pm
 %%WITH_MODPERL%%perl/freeswitch.so
@@ -436,8 +438,8 @@
 www/freeswitch/htdocs/slimtest.htm
 @dirrm www/freeswitch/htdocs
 @dirrm www/freeswitch
-@dirrmtry share/freeswitch/sounds
-@dirrmtry share/freeswitch
+@dirrm share/freeswitch/sounds
+@dirrm share/freeswitch
 %%WITH_MODPERL%%@dirrm perl
 @dirrm lib/freeswitch/mod
 @dirrm lib/freeswitch/lib
@@ -471,8 +473,9 @@
 @dirrm etc/freeswitch/conf/lang
 @dirrm etc/freeswitch/conf/jingle_profiles
 @dirrm etc/freeswitch/conf/ivr_menus
-@dirrmtry etc/freeswitch/conf/directory/default
+@dirrm etc/freeswitch/conf/directory/default
 @dirrm etc/freeswitch/conf/directory
+@dirrm etc/freeswitch/conf/dialplan/skinny-patterns
 @dirrm etc/freeswitch/conf/dialplan/public
 @dirrm etc/freeswitch/conf/dialplan/default
 @dirrm etc/freeswitch/conf/dialplan
@@ -481,7 +484,7 @@
 @dirrm etc/freeswitch
 @exec mkdir -p %D/etc/freeswitch/scripts
 @exec mkdir -p %D/share/freeswitch/sounds
-@cwd /var/
+@cwd /var
 @dirrm spool/freeswitch/voicemail
 @dirrm log/freeswitch/xml_cdr
 @dirrm log/freeswitch
@@ -494,3 +497,7 @@
 @exec mkdir -p %D/freeswitch
 @exec mkdir -p %D/freeswitch/recordings
 @exec mkdir -p %D/db/freeswitch
+@exec chown -R freeswitch:freeswitch spool/freeswitch/voicemail
+@exec chown -R freeswitch:freeswitch log/freeswitch/xml_cdr
+@exec chown -R freeswitch:freeswitch freeswitch/recordings
+@exec chown -R freeswitch:freeswitch db/freeswitch
Index: files/freeswitch.in
===================================================================
RCS file: /home/ncvs/ports/net/freeswitch-core/files/freeswitch.in,v
retrieving revision 1.4
diff -u -r1.4 freeswitch.in
--- files/freeswitch.in	11 Aug 2010 05:22:11 -0000	1.4
+++ files/freeswitch.in	3 Dec 2010 20:50:10 -0000
@@ -1,7 +1,5 @@
 #!/bin/sh
 
-# $FreeBSD: ports/net/freeswitch-core/files/freeswitch.in,v 1.4 2010/08/11 05:22:11 dougb Exp $
-#
 # PROVIDE: freeswitch
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
Index: files/patch-configure.in
===================================================================
RCS file: /home/ncvs/ports/net/freeswitch-core/files/patch-configure.in,v
retrieving revision 1.1
diff -u -r1.1 patch-configure.in
--- files/patch-configure.in	16 Jul 2010 14:57:42 -0000	1.1
+++ files/patch-configure.in	3 Dec 2010 20:50:10 -0000
@@ -1,16 +1,28 @@
---- 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"
+--- configure.in
++++ configure.in
+@@ -38,12 +38,12 @@ AC_ARG_WITH([modinstdir],
+ AC_SUBST(modulesdir)
+ AC_DEFINE_UNQUOTED([SWITCH_MOD_DIR],"${modulesdir}",[where to install the modules to])
+ 
+-if test "$localstatedir" = "\${prefix}/var" ; then
+-    rundir="$prefix/run"
++if test "${localstatedir}" = "\${prefix}/var" ; then
++    rundir="${prefix}/run"
+     logfiledir="${prefix}/log"
+ else
+-    rundir="$localstatedir/run/freeswitch"
+-    logfiledir="$localstatedir/log/freeswitch"
++    rundir="${localstatedir}/run/freeswitch"
++    logfiledir="${localstatedir}/log/freeswitch"
+ fi
+ # Where to put pidfile
+ AC_ARG_WITH([rundir],
+@@ -54,34 +54,34 @@ AC_DEFINE_UNQUOTED([SWITCH_RUN_DIR],"${runtimedir}",[where to put pidfile to])
  AC_SUBST(logfiledir)
  AC_DEFINE_UNQUOTED([SWITCH_LOG_DIR],"${logfiledir}",[where to put log files])
  
 -dbdir="${prefix}/db"
-+dbdir="/var/db/freeswitch"
++dbdir="${localstatedir}/db/freeswitch"
  AC_SUBST(dbdir)
  AC_DEFINE_UNQUOTED([SWITCH_DB_DIR],"${dbdir}",[where to put db files])
  
@@ -35,18 +47,31 @@
  AC_DEFINE_UNQUOTED([SWITCH_SCRIPT_DIR],"${scriptdir}",[where to put script files])
  
 -recordingsdir="${prefix}/recordings"
-+recordingsdir="/var/freeswitch/recordings"
++recordingsdir="${localstatedir}/freeswitch/recordings"
  AC_SUBST(recordingsdir)
  AC_DEFINE_UNQUOTED([SWITCH_RECORDINGS_DIR],"${recordingsdir}",[where to put recording files])
  
-+storagedir="/var/freeswitch"
+ if test "$sysconfdir" = "\${prefix}/etc" ; then
+-    confdir="$prefix/conf"
++    confdir="${prefix}/conf"
+ else
+-    confdir="$sysconfdir"
++    confdir="${sysconfdir}"
+ fi
+ 
+ sysconfdir="$confdir"
+@@ -89,6 +89,14 @@ sysconfdir="$confdir"
+ AC_SUBST(confdir)
+ AC_DEFINE_UNQUOTED([SWITCH_CONF_DIR],"${confdir}",[directory for configuration files])
+ 
++storagedir="${localstatedir}/freeswitch"
 +AC_SUBST(storagedir)
 +AC_DEFINE_UNQUOTED([SWITCH_STORAGE_DIR],"${storagedir}",[where to put extra files])
 +
-+voicemaildir="/var/spool/freeswitch/voicemail"
++voicemaildir="${localstatedir}/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
+ AC_SUBST(libdir)
+ AC_SUBST(bindir)
+ AC_SUBST(includedir)
Index: files/patch-libs-freetdm-Makefile.am
===================================================================
RCS file: files/patch-libs-freetdm-Makefile.am
diff -N files/patch-libs-freetdm-Makefile.am
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-libs-freetdm-Makefile.am	3 Dec 2010 20:50:10 -0000
@@ -0,0 +1,9 @@
+--- libs/freetdm/Makefile.am
++++ libs/freetdm/Makefile.am
+@@ -320,5 +320,5 @@ mod_freetdm-clean:
+ install-data-local:
+ 	$(mkinstalldirs) $(DESTDIR)$(PREFIX)
+ 	$(mkinstalldirs) $(DESTDIR)@confdir@
+-	@[ -f "$(DESTDIR)@confdir@/freetdm.conf" ] || ( cp conf/*.conf $(DESTDIR)@confdir@)
++	@for i in conf/*.conf; do cp $$i $$i.sample; done; cp -f conf/*.conf.sample $(DESTDIR)@confdir@
+ 	@echo FreeTDM Installed
Index: files/patch-libs-freetdm-mod_freetdm-Makefile.in
===================================================================
RCS file: files/patch-libs-freetdm-mod_freetdm-Makefile.in
diff -N files/patch-libs-freetdm-mod_freetdm-Makefile.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-libs-freetdm-mod_freetdm-Makefile.in	3 Dec 2010 20:50:10 -0000
@@ -0,0 +1,12 @@
+--- libs/freetdm/mod_freetdm/Makefile.in
++++ libs/freetdm/mod_freetdm/Makefile.in
+@@ -15,8 +15,7 @@ $(FTLA): $(FT_DIR)/.update
+ 
+ local_install:
+ 	cd $(FT_DIR) && $(MAKE) install
+-	[ -f $(DESTDIR)@confdir@/autoload_configs/freetdm.conf.xml ] || cp -f $(FT_DIR)/conf/freetdm.conf.xml  $(DESTDIR)@confdir@/autoload_configs
+-
++	@for i in $(FT_DIR)/conf/*.xml; do cp $$i $$i.sample; done; cp  -f $(FT_DIR)/conf/*.xml.sample $(DESTDIR)@confdir@/autoload_configs
+ local_clean:
+ 	cd $(FT_DIR) && $(MAKE) clean
+ 
Index: files/patch-libs-freetdm-src-ftmod-ftmod_zt-ftmod_zt.c
===================================================================
RCS file: files/patch-libs-freetdm-src-ftmod-ftmod_zt-ftmod_zt.c
diff -N files/patch-libs-freetdm-src-ftmod-ftmod_zt-ftmod_zt.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-libs-freetdm-src-ftmod-ftmod_zt-ftmod_zt.c	3 Dec 2010 20:50:10 -0000
@@ -0,0 +1,73 @@
+--- libs/freetdm/src/ftmod/ftmod_zt/ftmod_zt.c
++++ libs/freetdm/src/ftmod/ftmod_zt/ftmod_zt.c
+@@ -52,38 +52,38 @@ static struct {
+  * \brief General IOCTL codes
+  */
+ struct ioctl_codes {
+-    int GET_BLOCKSIZE;
+-    int SET_BLOCKSIZE;
+-    int FLUSH;
+-    int SYNC;
+-    int GET_PARAMS;
+-    int SET_PARAMS;
+-    int HOOK;
+-    int GETEVENT;
+-    int IOMUX;
+-    int SPANSTAT;
+-    int MAINT;
+-    int GETCONF;
+-    int SETCONF;
+-    int CONFLINK;
+-    int CONFDIAG;
+-    int GETGAINS;
+-    int SETGAINS;
+-    int SPANCONFIG;
+-    int CHANCONFIG;
+-    int SET_BUFINFO;
+-    int GET_BUFINFO;
+-    int AUDIOMODE;
+-    int ECHOCANCEL;
+-    int HDLCRAWMODE;
+-    int HDLCFCSMODE;
+-    int SPECIFY;
+-    int SETLAW;
+-    int SETLINEAR;
+-    int GETCONFMUTE;
+-    int ECHOTRAIN;
+-    int SETTXBITS;
+-    int GETRXBITS;
++    long GET_BLOCKSIZE;
++    long SET_BLOCKSIZE;
++    long FLUSH;
++    long SYNC;
++    long GET_PARAMS;
++    long SET_PARAMS;
++    long HOOK;
++    long GETEVENT;
++    long IOMUX;
++    long SPANSTAT;
++    long MAINT;
++    long GETCONF;
++    long SETCONF;
++    long CONFLINK;
++    long CONFDIAG;
++    long GETGAINS;
++    long SETGAINS;
++    long SPANCONFIG;
++    long CHANCONFIG;
++    long SET_BUFINFO;
++    long GET_BUFINFO;
++    long AUDIOMODE;
++    long ECHOCANCEL;
++    long HDLCRAWMODE;
++    long HDLCFCSMODE;
++    long SPECIFY;
++    long SETLAW;
++    long SETLINEAR;
++    long GETCONFMUTE;
++    long ECHOTRAIN;
++    long SETTXBITS;
++    long GETRXBITS;
+ };
+ 
+ /**
Index: files/patch-libs-openzap-Makefile.am
===================================================================
RCS file: files/patch-libs-openzap-Makefile.am
diff -N files/patch-libs-openzap-Makefile.am
--- files/patch-libs-openzap-Makefile.am	16 Jul 2010 14:57:42 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
---- 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
--- files/patch-libs-openzap-mod_openzap-Makefile.in	16 Jul 2010 14:57:42 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
---- 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-libs-openzap-src-ozmod-ozmod_zt-ozmod_zt.c
===================================================================
RCS file: files/patch-libs-openzap-src-ozmod-ozmod_zt-ozmod_zt.c
diff -N files/patch-libs-openzap-src-ozmod-ozmod_zt-ozmod_zt.c
--- files/patch-libs-openzap-src-ozmod-ozmod_zt-ozmod_zt.c	11 Jun 2010 22:26:44 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,73 +0,0 @@
---- libs/openzap/src/ozmod/ozmod_zt/ozmod_zt.c.orig	2010-04-26 14:17:55.000000000 -0700
-+++ libs/openzap/src/ozmod/ozmod_zt/ozmod_zt.c	2010-04-26 14:22:56.000000000 -0700
-@@ -52,38 +52,38 @@
-  * \brief General IOCTL codes
-  */
- struct ioctl_codes {
--    int GET_BLOCKSIZE;
--    int SET_BLOCKSIZE;
--    int FLUSH;
--    int SYNC;
--    int GET_PARAMS;
--    int SET_PARAMS;
--    int HOOK;
--    int GETEVENT;
--    int IOMUX;
--    int SPANSTAT;
--    int MAINT;
--    int GETCONF;
--    int SETCONF;
--    int CONFLINK;
--    int CONFDIAG;
--    int GETGAINS;
--    int SETGAINS;
--    int SPANCONFIG;
--    int CHANCONFIG;
--    int SET_BUFINFO;
--    int GET_BUFINFO;
--    int AUDIOMODE;
--    int ECHOCANCEL;
--    int HDLCRAWMODE;
--    int HDLCFCSMODE;
--    int SPECIFY;
--    int SETLAW;
--    int SETLINEAR;
--    int GETCONFMUTE;
--    int ECHOTRAIN;
--    int SETTXBITS;
--    int GETRXBITS;
-+    long GET_BLOCKSIZE;
-+    long SET_BLOCKSIZE;
-+    long FLUSH;
-+    long SYNC;
-+    long GET_PARAMS;
-+    long SET_PARAMS;
-+    long HOOK;
-+    long GETEVENT;
-+    long IOMUX;
-+    long SPANSTAT;
-+    long MAINT;
-+    long GETCONF;
-+    long SETCONF;
-+    long CONFLINK;
-+    long CONFDIAG;
-+    long GETGAINS;
-+    long SETGAINS;
-+    long SPANCONFIG;
-+    long CHANCONFIG;
-+    long SET_BUFINFO;
-+    long GET_BUFINFO;
-+    long AUDIOMODE;
-+    long ECHOCANCEL;
-+    long HDLCRAWMODE;
-+    long HDLCFCSMODE;
-+    long SPECIFY;
-+    long SETLAW;
-+    long SETLINEAR;
-+    long GETCONFMUTE;
-+    long ECHOTRAIN;
-+    long SETTXBITS;
-+    long GETRXBITS;
- };
- 
- /**
Index: files/patch-src-switch.c
===================================================================
RCS file: files/patch-src-switch.c
diff -N files/patch-src-switch.c
--- files/patch-src-switch.c	11 Jun 2010 22:26:44 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
---- src/switch.c.orig	2010-05-11 23:58:27.000000000 -0700
-+++ src/switch.c	2010-05-12 00:19:56.000000000 -0700
-@@ -661,11 +661,6 @@
- 		return 255;
- 	}
- 
--	if (alt_dirs && alt_dirs != 3) {
--		fprintf(stderr, "You must specify all or none of -conf, -log, and -db\n");
--		return 255;
--	}
--
- 	signal(SIGILL, handle_SIGILL);
- 	signal(SIGTERM, handle_SIGILL);
- 
Index: files/patch-src-switch_core.c
===================================================================
RCS file: /home/ncvs/ports/net/freeswitch-core/files/patch-src-switch_core.c,v
retrieving revision 1.1
diff -u -r1.1 patch-src-switch_core.c
--- files/patch-src-switch_core.c	16 Jul 2010 14:57:42 -0000	1.1
+++ files/patch-src-switch_core.c	3 Dec 2010 20:50:10 -0000
@@ -1,6 +1,6 @@
---- 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 @@
+--- src/switch_core.c
++++ src/switch_core.c
+@@ -509,6 +509,14 @@ SWITCH_DECLARE(void) switch_core_set_globals(void)
  #endif
  	}
  
@@ -10,12 +10,12 @@
 +#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 @@
+@@ -566,6 +574,8 @@ SWITCH_DECLARE(void) switch_core_set_globals(void)
  	switch_assert(SWITCH_GLOBAL_dirs.recordings_dir);
  	switch_assert(SWITCH_GLOBAL_dirs.sounds_dir);
  	switch_assert(SWITCH_GLOBAL_dirs.temp_dir);
@@ -24,16 +24,16 @@
  }
  
  SWITCH_DECLARE(int32_t) set_high_priority(void)
-@@ -1240,6 +1250,8 @@
+@@ -1261,6 +1271,8 @@ SWITCH_DECLARE(switch_status_t) switch_core_init(switch_core_flag_t flags, switc
  	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_mutex_init(&runtime.uuid_mutex, SWITCH_MUTEX_NESTED, runtime.memory_pool);
+@@ -1296,7 +1308,9 @@ SWITCH_DECLARE(switch_status_t) switch_core_init(switch_core_flag_t flags, switc
  	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);
@@ -43,7 +43,7 @@
  	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 @@
+@@ -1448,6 +1462,8 @@ static void switch_load_core_config(const char *file)
  					switch_set_flag((&runtime), SCF_EARLY_HANGUP);
  				} else if (!strcasecmp(var, "colorize-console") && switch_true(val)) {
  					runtime.colorize_console = SWITCH_TRUE;
@@ -52,12 +52,11 @@
  				} 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);
+@@ -1932,6 +1948,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_destroy(void)
  	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.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);
+ 	switch_safe_free(SWITCH_GLOBAL_dirs.run_dir);
Index: files/pkg-install.in
===================================================================
RCS file: /home/ncvs/ports/net/freeswitch-core/files/pkg-install.in,v
retrieving revision 1.2
diff -u -r1.2 pkg-install.in
--- files/pkg-install.in	16 Jul 2010 14:57:42 -0000	1.2
+++ files/pkg-install.in	3 Dec 2010 20:50:10 -0000
@@ -1,32 +1,35 @@
 #!/bin/sh
+# $FreeBSD:  Exp $
 #
-# $FreeBSD: 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
+FREESWITCHGROUP=${FREESWITCHUSER}
+FREESWITCHUID=610
+FREESWITCHGID=${FREESWITCHUID}
+
+if ! pw groupshow "${FREESWITCHGROUP}" 2>/dev/null 1>&2; then
+	if pw groupadd ${FREESWITCHGROUP} -g ${FREESWITCHGID}; then
+		echo "Added group \"${FREESWITCHGROUP}\"."
+	else
+		echo "Adding group \"${FREESWITCHGROUP}\" failed..."
+		exit 1
+	fi
+fi
+
+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
 
-esac
+exit 0
