Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 26 Nov 2009 13:31:04 GMT
From:      Vladimir Korkodinov <viper@perm.raid.ru>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/140898: [FIX] net/freeswitch
Message-ID:  <200911261331.nAQDV4v7047621@www.freebsd.org>
Resent-Message-ID: <200911261340.nAQDe6Fe092656@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         140898
>Category:       ports
>Synopsis:       [FIX] net/freeswitch
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Nov 26 13:40:06 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Vladimir Korkodinov
>Release:        6.4-RELEASE
>Organization:
>Environment:
FreeBSD xxxx 6.4-RELEASE FreeBSD 6.4-RELEASE #2: Thu Dec  4 11:29:00 YEKT 2008     root@xxxx:/usr/obj/usr/src/sys/kernel  i386

>Description:
Unbreak build on Freebsd 6.x 
Fix pkg-plist
Fix fetch url
>How-To-Repeat:
try install
>Fix:
apply patch

Patch attached with submission follows:

diff -ruN freeswitch.old/Makefile freeswitch/Makefile
--- freeswitch.old/Makefile	2009-09-05 01:39:09.000000000 +0600
+++ freeswitch/Makefile	2009-11-13 15:52:41.000000000 +0500
@@ -6,14 +6,14 @@
 #
 
 PORTNAME=	freeswitch
-PORTVERSION=	1.0.4.3
+PORTVERSION=	1.0.4
 CATEGORIES=	net
 MASTER_SITES=	http://files.freeswitch.org/:source1 \
 		http://dl.getdropbox.com/u/152504/:source2 \
 		http://www.freeswitch.org/eg/:source3
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 DISTFILES=	pizza_gram.tar.gz:source1 \
-		${PORTNAME}-${PORTVERSION}.tar.gz:source2 \
+		${PORTNAME}-${PORTVERSION}.tar.gz:source1 \
 		pizza_sounds.tar.gz:source3 \
 		${PORTNAME}-sounds-en-us-callie-8000-1.0.11.tar.gz:source1 \
 		${PORTNAME}-sounds-en-us-callie-16000-1.0.11.tar.gz:source1 \
@@ -340,11 +340,11 @@
 PLIST_SUB+=	WITH_MODERLANGEVENT=""
 .endif
 
-pre-configure:
-	@cd ${WRKSRC} && ./bootstrap.sh
-	@${CP} ${WRKSRC}/build/modules.conf.in ${WRKSRC}/modules.conf
-	@${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${LOCALBASE}/${PORTNAME}/libdata/pkgconfig|g' ${WRKSRC}/libs/*/Makefile.am
-	@${REINPLACE_CMD} -e 's|$(DESTDIR)$$(libdir)/pkgconfig|${LOCALBASE}/${PORTNAME}/libdata/pkgconfig|g' ${WRKSRC}/libs/*/Makefile.in
+#pre-configure:
+#	@cd ${WRKSRC} && ./bootstrap.sh
+#	@${CP} ${WRKSRC}/build/modules.conf.in ${WRKSRC}/modules.conf
+#	@${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${LOCALBASE}/${PORTNAME}/libdata/pkgconfig|g' ${WRKSRC}/libs/*/Makefile.am
+#	@${REINPLACE_CMD} -e 's|$(DESTDIR)$$(libdir)/pkgconfig|${LOCALBASE}/${PORTNAME}/libdata/pkgconfig|g' ${WRKSRC}/libs/*/Makefile.in
 
 post-configure:
 .if defined(WITH_MODSHOUT)
@@ -517,8 +517,8 @@
 
 	@${CAT} ${PKGMESSAGE}
 
-.if ${OSVERSION} < 700000
-IGNORE=		it's to unsupported before FreeBSD 7.X
-.endif
+#.if ${OSVERSION} < 700000
+#IGNORE=		it's to unsupported before FreeBSD 7.X
+#.endif
 
 .include <bsd.port.post.mk>
diff -ruN freeswitch.old/distinfo freeswitch/distinfo
--- freeswitch.old/distinfo	2009-09-05 01:39:09.000000000 +0600
+++ freeswitch/distinfo	2009-11-13 15:45:48.000000000 +0500
@@ -1,9 +1,9 @@
 MD5 (pizza_gram.tar.gz) = dc10f21c8d6bd708b7deae9f18a82b92
 SHA256 (pizza_gram.tar.gz) = e713406834ba40fe07c69b84f042fcb27493c15bc6b51133418527bc7a818027
 SIZE (pizza_gram.tar.gz) = 1053
-MD5 (freeswitch-1.0.4.3.tar.gz) = 05572d867c25b23b4dcdaae096e71cbd
-SHA256 (freeswitch-1.0.4.3.tar.gz) = 6e3adaf153d63eea7ad127978886cecc9b09d0f952675f2dccc2c12e38a2b8d2
-SIZE (freeswitch-1.0.4.3.tar.gz) = 57172620
+MD5 (freeswitch-1.0.4.tar.gz) = 86e34bdd8cc027d71772cb0dc51388da
+SHA256 (freeswitch-1.0.4.tar.gz) = 0e5f36be7f737c32a68ef8be8c59ada55cf83e412897c7ee359d628186fdce7a
+SIZE (freeswitch-1.0.4.tar.gz) = 32108364
 MD5 (pizza_sounds.tar.gz) = dacfde8879da8dd0e0542069e5cba6a2
 SHA256 (pizza_sounds.tar.gz) = 606f736625b7f331e219e10460029c8e0b0e58136feeddde976a0dcc68a97bef
 SIZE (pizza_sounds.tar.gz) = 1498679
diff -ruN freeswitch.old/files/patch-modules.conf freeswitch/files/patch-modules.conf
--- freeswitch.old/files/patch-modules.conf	1970-01-01 05:00:00.000000000 +0500
+++ freeswitch/files/patch-modules.conf	2009-11-13 18:18:21.000000000 +0500
@@ -0,0 +1,18 @@
+--- modules.conf.orig	2009-11-13 18:17:31.000000000 +0500
++++ modules.conf	2009-11-13 18:18:02.000000000 +0500
+@@ -1,6 +1,7 @@
+ loggers/mod_console
+ loggers/mod_logfile
+ loggers/mod_syslog
++#applications/mod_cidlookup
+ applications/mod_commands
+ applications/mod_conference
+ applications/mod_dptools
+@@ -19,6 +20,7 @@
+ #applications/mod_soundtouch
+ #applications/mod_rss
+ #applications/mod_snom
++#applications/mod_t38gateway
+ #applications/mod_vmd
+ #applications/mod_memcache
+ #applications/mod_spy
diff -ruN freeswitch.old/pkg-plist freeswitch/pkg-plist
--- freeswitch.old/pkg-plist	2009-09-05 01:39:09.000000000 +0600
+++ freeswitch/pkg-plist	2009-11-14 10:17:24.000000000 +0500
@@ -260,7 +260,7 @@
 %%WITH_MODOPENZAP%%freeswitch/include/spandsp/vector_float.h
 %%WITH_MODOPENZAP%%freeswitch/include/spandsp/vector_int.h
 %%WITH_MODOPENZAP%%freeswitch/include/spandsp/version.h
-%%WITH_MODOPENZAP%%freeswitch/libdata/pkgconfig/spandsp.pc
+%%WITH_MODOPENZAP%%freeswitch/lib/pkgconfig/spandsp.pc
 freeswitch/lib/libfreeswitch.a
 freeswitch/lib/libfreeswitch.la
 freeswitch/lib/libfreeswitch.so
@@ -270,161 +270,88 @@
 freeswitch/lib/libjs.so
 freeswitch/lib/libjs.so.1
 freeswitch/lib/libnspr4.a
-freeswitch/lib/libnspr4.so.1
+freeswitch/lib/libnspr4.so
 freeswitch/lib/libplc4.a
-freeswitch/lib/libplc4.so.1
+freeswitch/lib/libplc4.so
 freeswitch/lib/libplds4.a
-freeswitch/lib/libplds4.so.1
+freeswitch/lib/libplds4.so
 %%WITH_MODOPENZAP%%freeswitch/lib/libspandsp.a
 %%WITH_MODOPENZAP%%freeswitch/lib/libspandsp.la
-freeswitch/mod/mod_amr.la
 freeswitch/mod/mod_amr.so
-%%WITH_MODAMRWB%%freeswitch/mod/mod_amrwb.la
 %%WITH_MODAMRWB%%freeswitch/mod/mod_amrwb.so
-freeswitch/mod/mod_cdr_csv.la
 freeswitch/mod/mod_cdr_csv.so
-%%WITH_MODCELT%%freeswitch/mod/mod_celt.la
 %%WITH_MODCELT%%freeswitch/mod/mod_celt.so
-%%WITH_MODCIDLOOKUP%%freeswitch/mod/mod_cidlookup.la
 %%WITH_MODCIDLOOKUP%%freeswitch/mod/mod_cidlookup.so
-freeswitch/mod/mod_cluechoo.la
 freeswitch/mod/mod_cluechoo.so
-freeswitch/mod/mod_commands.la
 freeswitch/mod/mod_commands.so
-freeswitch/mod/mod_conference.la
 freeswitch/mod/mod_conference.so
-freeswitch/mod/mod_console.la
 freeswitch/mod/mod_console.so
-freeswitch/mod/mod_dialplan_asterisk.la
 freeswitch/mod/mod_dialplan_asterisk.so
-%%WITH_MODDPDIRECTORY%%freeswitch/mod/mod_dialplan_directory.la
 %%WITH_MODDPDIRECTORY%%freeswitch/mod/mod_dialplan_directory.so
-freeswitch/mod/mod_dialplan_xml.la
 freeswitch/mod/mod_dialplan_xml.so
-%%WITH_MODDINGALING%%freeswitch/mod/mod_dingaling.la
 %%WITH_MODDINGALING%%freeswitch/mod/mod_dingaling.so
-freeswitch/mod/mod_dptools.la
 freeswitch/mod/mod_dptools.so
-%%WITH_MODEASYROUTE%%freeswitch/mod/mod_easyroute.la
 %%WITH_MODEASYROUTE%%freeswitch/mod/mod_easyroute.so
-freeswitch/mod/mod_enum.la
 freeswitch/mod/mod_enum.so
-%%WITH_MODERLANGEVENT%%freeswitch/mod/mod_erlang_event.la
 %%WITH_MODERLANGEVENT%%freeswitch/mod/mod_erlang_event.so
-freeswitch/mod/mod_esf.la
 freeswitch/mod/mod_esf.so
-%%WITH_MODMULTICAST%%freeswitch/mod/mod_event_multicast.la
 %%WITH_MODMULTICAST%%freeswitch/mod/mod_event_multicast.so
-freeswitch/mod/mod_event_socket.la
 freeswitch/mod/mod_event_socket.so
-freeswitch/mod/mod_expr.la
 freeswitch/mod/mod_expr.so
-%%WITH_MODFAX%%freeswitch/mod/mod_fax.la
 %%WITH_MODFAX%%freeswitch/mod/mod_fax.so
-freeswitch/mod/mod_fifo.la
 freeswitch/mod/mod_fifo.so
-freeswitch/mod/mod_file_string.la
 freeswitch/mod/mod_file_string.so
-%%WITH_MODFLITE%%freeswitch/mod/mod_flite.la
 %%WITH_MODFLITE%%freeswitch/mod/mod_flite.so
-freeswitch/mod/mod_fsv.la
 freeswitch/mod/mod_fsv.so
-freeswitch/mod/mod_g723_1.la
 freeswitch/mod/mod_g723_1.so
-freeswitch/mod/mod_g729.la
 freeswitch/mod/mod_g729.so
-freeswitch/mod/mod_h26x.la
 freeswitch/mod/mod_h26x.so
-freeswitch/mod/mod_iax.la
 freeswitch/mod/mod_iax.so
-freeswitch/mod/mod_ilbc.la
 freeswitch/mod/mod_ilbc.so
-%%WITH_MODLCR%%freeswitch/mod/mod_lcr.la
 %%WITH_MODLCR%%freeswitch/mod/mod_lcr.so
-freeswitch/mod/mod_limit.la
 freeswitch/mod/mod_limit.so
-freeswitch/mod/mod_local_stream.la
 freeswitch/mod/mod_local_stream.so
-freeswitch/mod/mod_logfile.la
 freeswitch/mod/mod_logfile.so
-freeswitch/mod/mod_loopback.la
 freeswitch/mod/mod_loopback.so
-freeswitch/mod/mod_lua.la
 freeswitch/mod/mod_lua.so
-freeswitch/mod/mod_native_file.la
 freeswitch/mod/mod_native_file.so
-%%WITH_MODNIBBLEBILL%%freeswitch/mod/mod_nibblebill.la
 %%WITH_MODNIBBLEBILL%%freeswitch/mod/mod_nibblebill.so
-%%WITH_MODOPENZAP%%freeswitch/mod/mod_openzap.la
 %%WITH_MODOPENZAP%%freeswitch/mod/mod_openzap.so
-%%WITH_MODPERL%%freeswitch/mod/mod_perl.la
 %%WITH_MODPERL%%freeswitch/mod/mod_perl.so
-%%WITH_MODPOCKETSPHINX%%freeswitch/mod/mod_pocketsphinx.la
 %%WITH_MODPOCKETSPHINX%%freeswitch/mod/mod_pocketsphinx.so
-%%WITH_MODPORTAUDIO%%freeswitch/mod/mod_portaudio.la
 %%WITH_MODPORTAUDIO%%freeswitch/mod/mod_portaudio.so
-%%WITH_MODRSS%%freeswitch/mod/mod_rss.la
 %%WITH_MODRSS%%freeswitch/mod/mod_rss.so
-%%WITH_MODSAYDE%%freeswitch/mod/mod_say_de.la
 %%WITH_MODSAYDE%%freeswitch/mod/mod_say_de.so
-freeswitch/mod/mod_say_en.la
 freeswitch/mod/mod_say_en.so
-%%WITH_MODSAYES%%freeswitch/mod/mod_say_es.la
 %%WITH_MODSAYES%%freeswitch/mod/mod_say_es.so
-%%WITH_MODSAYFR%%freeswitch/mod/mod_say_fr.la
 %%WITH_MODSAYFR%%freeswitch/mod/mod_say_fr.so
-%%WITH_MODSAYIT%%freeswitch/mod/mod_say_it.la
 %%WITH_MODSAYIT%%freeswitch/mod/mod_say_it.so
-%%WITH_MODSAYNL%%freeswitch/mod/mod_say_nl.la
 %%WITH_MODSAYNL%%freeswitch/mod/mod_say_nl.so
-%%WITH_MODSAYRU%%freeswitch/mod/mod_say_ru.la
 %%WITH_MODSAYRU%%freeswitch/mod/mod_say_ru.so
-%%WITH_MODSAYZH%%freeswitch/mod/mod_say_zh.la
 %%WITH_MODSAYZH%%freeswitch/mod/mod_say_zh.so
-%%WITH_MODSHOUT%%freeswitch/mod/mod_shout.la
 %%WITH_MODSHOUT%%freeswitch/mod/mod_shout.so
-%%WITH_MODSIREN%%freeswitch/mod/mod_siren.la
 %%WITH_MODSIREN%%freeswitch/mod/mod_siren.so
-freeswitch/mod/mod_sndfile.la
 freeswitch/mod/mod_sndfile.so
-%%WITH_MODSNOM%%freeswitch/mod/mod_snom.la
 %%WITH_MODSNOM%%freeswitch/mod/mod_snom.so
 freeswitch/mod/mod_sofia.a
 freeswitch/mod/mod_sofia.la
 freeswitch/mod/mod_sofia.so
-%%WITH_MODSOUNDTOUCH%%freeswitch/mod/mod_soundtouch.la
 %%WITH_MODSOUNDTOUCH%%freeswitch/mod/mod_soundtouch.so
-freeswitch/mod/mod_speex.la
 freeswitch/mod/mod_speex.so
-freeswitch/mod/mod_spidermonkey.la
 freeswitch/mod/mod_spidermonkey.so
-freeswitch/mod/mod_spidermonkey_core_db.la
 freeswitch/mod/mod_spidermonkey_core_db.so
-freeswitch/mod/mod_spidermonkey_curl.la
 freeswitch/mod/mod_spidermonkey_curl.so
-%%WITH_MODSPDRMNKYODBC%%freeswitch/mod/mod_spidermonkey_odbc.la
 %%WITH_MODSPDRMNKYODBC%%freeswitch/mod/mod_spidermonkey_odbc.so
-freeswitch/mod/mod_spidermonkey_socket.la
 freeswitch/mod/mod_spidermonkey_socket.so
-freeswitch/mod/mod_spidermonkey_teletone.la
 freeswitch/mod/mod_spidermonkey_teletone.so
-%%WITH_MODSPY%%freeswitch/mod/mod_spy.la
 %%WITH_MODSPY%%freeswitch/mod/mod_spy.so
-freeswitch/mod/mod_syslog.la
 freeswitch/mod/mod_syslog.so
-freeswitch/mod/mod_tone_stream.la
 freeswitch/mod/mod_tone_stream.so
-%%WITH_MODVMD%%freeswitch/mod/mod_vmd.la
 %%WITH_MODVMD%%freeswitch/mod/mod_vmd.so
-freeswitch/mod/mod_voicemail.la
 freeswitch/mod/mod_voicemail.so
-freeswitch/mod/mod_voipcodecs.la
 freeswitch/mod/mod_voipcodecs.so
-freeswitch/mod/mod_xml_cdr.la
 freeswitch/mod/mod_xml_cdr.so
-freeswitch/mod/mod_xml_curl.la
 freeswitch/mod/mod_xml_curl.so
-freeswitch/mod/mod_xml_rpc.la
 freeswitch/mod/mod_xml_rpc.so
 %%WITH_MODOPENZAP%%freeswitch/mod/ozmod_analog.a
 %%WITH_MODOPENZAP%%freeswitch/mod/ozmod_analog.la
@@ -520,9 +447,8 @@
 %%WITH_MODOPENZAP%%freeswitch/lib/libopenzap.la
 %%WITH_MODOPENZAP%%freeswitch/lib/libopenzap.so
 %%WITH_MODOPENZAP%%freeswitch/lib/libopenzap.so.1
-%%WITH_MODOPENZAP%%freeswitch/libdata/pkgconfig/openzap.pc
+%%WITH_MODOPENZAP%%freeswitch/lib/pkgconfig/openzap.pc
 %%WITH_MODOPENZAP%%freeswitch/perl/freeswitch.pm
-%%WITH_MODPERL%%freeswitch/perl/freeswitch.la
 %%WITH_MODPERL%%freeswitch/perl/freeswitch.so
 %%WITH_SOUNDS%%freeswitch/sounds/en/us/callie/base256/8000/Algol.wav
 %%WITH_SOUNDS%%freeswitch/sounds/en/us/callie/base256/8000/Apollo.wav
@@ -3942,66 +3868,66 @@
 %%WITH_CDSOUNDS%%freeswitch/sounds/music/48000/partita-no-3-in-e-major-bwv-1006-1-preludio.wav
 %%WITH_CDSOUNDS%%freeswitch/sounds/music/48000/ponce-preludio-in-e-major.wav
 %%WITH_CDSOUNDS%%freeswitch/sounds/music/48000/suite-espanola-op-47-leyenda.wav
-@dirrm freeswitch/sounds/music/48000
-@dirrm freeswitch/sounds/music/32000
-@dirrm freeswitch/sounds/music/16000
-@dirrm freeswitch/sounds/music/8000
+%%WITH_CDSOUNDS%%@dirrm freeswitch/sounds/music/48000
+%%WITH_UHDSOUNDS%%@dirrm freeswitch/sounds/music/32000
+%%WITH_HDSOUNDS%%@dirrm freeswitch/sounds/music/16000
+%%WITH_SOUNDS%%@dirrm freeswitch/sounds/music/8000
 @dirrm freeswitch/sounds/music
 @dirrm freeswitch/sounds/en/us/pizza
-@dirrm freeswitch/sounds/en/us/callie/zrtp/48000
-@dirrm freeswitch/sounds/en/us/callie/zrtp/32000
-@dirrm freeswitch/sounds/en/us/callie/zrtp/16000
-@dirrm freeswitch/sounds/en/us/callie/zrtp/8000
+%%WITH_CDSOUNDS%%@dirrm freeswitch/sounds/en/us/callie/zrtp/48000
+%%WITH_UHDSOUNDS%%@dirrm freeswitch/sounds/en/us/callie/zrtp/32000
+%%WITH_HDSOUNDS%%@dirrm freeswitch/sounds/en/us/callie/zrtp/16000
+%%WITH_SOUNDS%%@dirrm freeswitch/sounds/en/us/callie/zrtp/8000
 @dirrm freeswitch/sounds/en/us/callie/zrtp
-@dirrm freeswitch/sounds/en/us/callie/voicemail/48000
-@dirrm freeswitch/sounds/en/us/callie/voicemail/32000
-@dirrm freeswitch/sounds/en/us/callie/voicemail/16000
-@dirrm freeswitch/sounds/en/us/callie/voicemail/8000
+%%WITH_CDSOUNDS%%@dirrm freeswitch/sounds/en/us/callie/voicemail/48000
+%%WITH_UHDSOUNDS%%@dirrm freeswitch/sounds/en/us/callie/voicemail/32000
+%%WITH_HDSOUNDS%%@dirrm freeswitch/sounds/en/us/callie/voicemail/16000
+%%WITH_SOUNDS%%@dirrm freeswitch/sounds/en/us/callie/voicemail/8000
 @dirrm freeswitch/sounds/en/us/callie/voicemail
-@dirrm freeswitch/sounds/en/us/callie/time/48000
-@dirrm freeswitch/sounds/en/us/callie/time/32000
-@dirrm freeswitch/sounds/en/us/callie/time/16000
-@dirrm freeswitch/sounds/en/us/callie/time/8000
+%%WITH_CDSOUNDS%%@dirrm freeswitch/sounds/en/us/callie/time/48000
+%%WITH_UHDSOUNDS%%@dirrm freeswitch/sounds/en/us/callie/time/32000
+%%WITH_HDSOUNDS%%@dirrm freeswitch/sounds/en/us/callie/time/16000
+%%WITH_SOUNDS%%@dirrm freeswitch/sounds/en/us/callie/time/8000
 @dirrm freeswitch/sounds/en/us/callie/time
-@dirrm freeswitch/sounds/en/us/callie/phonetic-ascii/48000
-@dirrm freeswitch/sounds/en/us/callie/phonetic-ascii/32000
-@dirrm freeswitch/sounds/en/us/callie/phonetic-ascii/16000
-@dirrm freeswitch/sounds/en/us/callie/phonetic-ascii/8000
+%%WITH_CDSOUNDS%%@dirrm freeswitch/sounds/en/us/callie/phonetic-ascii/48000
+%%WITH_UHDSOUNDS%%@dirrm freeswitch/sounds/en/us/callie/phonetic-ascii/32000
+%%WITH_HDSOUNDS%%@dirrm freeswitch/sounds/en/us/callie/phonetic-ascii/16000
+%%WITH_SOUNDS%%@dirrm freeswitch/sounds/en/us/callie/phonetic-ascii/8000
 @dirrm freeswitch/sounds/en/us/callie/phonetic-ascii
-@dirrm freeswitch/sounds/en/us/callie/misc/48000
-@dirrm freeswitch/sounds/en/us/callie/misc/32000
-@dirrm freeswitch/sounds/en/us/callie/misc/16000
-@dirrm freeswitch/sounds/en/us/callie/misc/8000
+%%WITH_CDSOUNDS%%@dirrm freeswitch/sounds/en/us/callie/misc/48000
+%%WITH_UHDSOUNDS%%@dirrm freeswitch/sounds/en/us/callie/misc/32000
+%%WITH_HDSOUNDS%%@dirrm freeswitch/sounds/en/us/callie/misc/16000
+%%WITH_SOUNDS%%@dirrm freeswitch/sounds/en/us/callie/misc/8000
 @dirrm freeswitch/sounds/en/us/callie/misc
-@dirrm freeswitch/sounds/en/us/callie/ivr/48000
-@dirrm freeswitch/sounds/en/us/callie/ivr/32000
-@dirrm freeswitch/sounds/en/us/callie/ivr/16000
-@dirrm freeswitch/sounds/en/us/callie/ivr/8000
+%%WITH_CDSOUNDS%%@dirrm freeswitch/sounds/en/us/callie/ivr/48000
+%%WITH_UHDSOUNDS%%@dirrm freeswitch/sounds/en/us/callie/ivr/32000
+%%WITH_HDSOUNDS%%@dirrm freeswitch/sounds/en/us/callie/ivr/16000
+%%WITH_SOUNDS%%@dirrm freeswitch/sounds/en/us/callie/ivr/8000
 @dirrm freeswitch/sounds/en/us/callie/ivr
-@dirrm freeswitch/sounds/en/us/callie/digits/48000
-@dirrm freeswitch/sounds/en/us/callie/digits/32000
-@dirrm freeswitch/sounds/en/us/callie/digits/16000
-@dirrm freeswitch/sounds/en/us/callie/digits/8000
+%%WITH_CDSOUNDS%%@dirrm freeswitch/sounds/en/us/callie/digits/48000
+%%WITH_UHDSOUNDS%%@dirrm freeswitch/sounds/en/us/callie/digits/32000
+%%WITH_HDSOUNDS%%@dirrm freeswitch/sounds/en/us/callie/digits/16000
+%%WITH_SOUNDS%%@dirrm freeswitch/sounds/en/us/callie/digits/8000
 @dirrm freeswitch/sounds/en/us/callie/digits
-@dirrm freeswitch/sounds/en/us/callie/currency/48000
-@dirrm freeswitch/sounds/en/us/callie/currency/32000
-@dirrm freeswitch/sounds/en/us/callie/currency/16000
-@dirrm freeswitch/sounds/en/us/callie/currency/8000
+%%WITH_CDSOUNDS%%@dirrm freeswitch/sounds/en/us/callie/currency/48000
+%%WITH_UHDSOUNDS%%@dirrm freeswitch/sounds/en/us/callie/currency/32000
+%%WITH_HDSOUNDS%%@dirrm freeswitch/sounds/en/us/callie/currency/16000
+%%WITH_SOUNDS%%@dirrm freeswitch/sounds/en/us/callie/currency/8000
 @dirrm freeswitch/sounds/en/us/callie/currency
-@dirrm freeswitch/sounds/en/us/callie/conference/48000
-@dirrm freeswitch/sounds/en/us/callie/conference/32000
-@dirrm freeswitch/sounds/en/us/callie/conference/16000
-@dirrm freeswitch/sounds/en/us/callie/conference/8000
+%%WITH_CDSOUNDS%%@dirrm freeswitch/sounds/en/us/callie/conference/48000
+%%WITH_UHDSOUNDS%%@dirrm freeswitch/sounds/en/us/callie/conference/32000
+%%WITH_HDSOUNDS%%@dirrm freeswitch/sounds/en/us/callie/conference/16000
+%%WITH_SOUNDS%%@dirrm freeswitch/sounds/en/us/callie/conference/8000
 @dirrm freeswitch/sounds/en/us/callie/conference
-@dirrm freeswitch/sounds/en/us/callie/base256/48000
-@dirrm freeswitch/sounds/en/us/callie/base256/32000
-@dirrm freeswitch/sounds/en/us/callie/base256/16000
-@dirrm freeswitch/sounds/en/us/callie/base256/8000
+%%WITH_CDSOUNDS%%@dirrm freeswitch/sounds/en/us/callie/base256/48000
+%%WITH_UHDSOUNDS%%@dirrm freeswitch/sounds/en/us/callie/base256/32000
+%%WITH_HDSOUNDS%%@dirrm freeswitch/sounds/en/us/callie/base256/16000
+%%WITH_SOUNDS%%@dirrm freeswitch/sounds/en/us/callie/base256/8000
 @dirrm freeswitch/sounds/en/us/callie/base256
-@dirrm freeswitch/sounds/en/us/callie/ascii/48000
-@dirrm freeswitch/sounds/en/us/callie/ascii/32000
-@dirrm freeswitch/sounds/en/us/callie/ascii/16000
-@dirrm freeswitch/sounds/en/us/callie/ascii/8000
+%%WITH_CDSOUNDS%%@dirrm freeswitch/sounds/en/us/callie/ascii/48000
+%%WITH_UHDSOUNDS%%@dirrm freeswitch/sounds/en/us/callie/ascii/32000
+%%WITH_HDSOUNDS%%@dirrm freeswitch/sounds/en/us/callie/ascii/16000
+%%WITH_SOUNDS%%@dirrm freeswitch/sounds/en/us/callie/ascii/8000
 @dirrm freeswitch/sounds/en/us/callie/ascii
 @dirrm freeswitch/sounds/en/us/callie
 @dirrm freeswitch/sounds/en/us
@@ -4019,8 +3945,7 @@
 @dirrm freeswitch/mod
 @dirrm freeswitch/log/xml_cdr
 @dirrm freeswitch/log
-@dirrm freeswitch/libdata/pkgconfig
-@dirrm freeswitch/libdata
+@dirrm freeswitch/lib/pkgconfig
 @dirrm freeswitch/lib
 @dirrm freeswitch/include/spandsp/private
 @dirrm freeswitch/include/spandsp


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200911261331.nAQDV4v7047621>