Update to the latest sounds package (1.2.1), and sort the PLIST.

4 files changed, 289 insertions, 256 deletions

diff --git a/comms/asterisk-sounds-extra/Makefile b/comms/asterisk-sounds-extra/Makefile
index 265e0c11187..9695354fa30 100644
--- a/comms/asterisk-sounds-extra/Makefile
+++ b/comms/asterisk-sounds-extra/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2005/12/05 20:49:54 rillig Exp $
+# $NetBSD: Makefile,v 1.4 2006/01/25 18:41:14 riz Exp $
 #
 
-VER=			1.0.9
+VER=			1.2.1
 DISTNAME=		asterisk-sounds-${VER}
 PKGNAME=		asterisk-sounds-extra-${VER}
 CATEGORIES=		comms
diff --git a/comms/asterisk-sounds-extra/PLIST b/comms/asterisk-sounds-extra/PLIST
index 56a9439bffb..4baaac351d8 100644
--- a/comms/asterisk-sounds-extra/PLIST
+++ b/comms/asterisk-sounds-extra/PLIST
@@ -1,195 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/09/30 21:17:24 mjl Exp $
-libdata/asterisk/sounds/phonetic/alpha.gsm
-libdata/asterisk/sounds/phonetic/bravo.gsm
-libdata/asterisk/sounds/phonetic/charlie.gsm
-libdata/asterisk/sounds/phonetic/delta.gsm
-libdata/asterisk/sounds/phonetic/echo.gsm
-libdata/asterisk/sounds/phonetic/foxtrot.gsm
-libdata/asterisk/sounds/phonetic/golf.gsm
-libdata/asterisk/sounds/phonetic/hotel.gsm
-libdata/asterisk/sounds/phonetic/india.gsm
-libdata/asterisk/sounds/phonetic/juliet.gsm
-libdata/asterisk/sounds/phonetic/kilo.gsm
-libdata/asterisk/sounds/phonetic/lima.gsm
-libdata/asterisk/sounds/phonetic/mike.gsm
-libdata/asterisk/sounds/phonetic/niner.gsm
-libdata/asterisk/sounds/phonetic/november.gsm
-libdata/asterisk/sounds/phonetic/oscar.gsm
-libdata/asterisk/sounds/phonetic/papa.gsm
-libdata/asterisk/sounds/phonetic/quebec.gsm
-libdata/asterisk/sounds/phonetic/romeo.gsm
-libdata/asterisk/sounds/phonetic/sierra.gsm
-libdata/asterisk/sounds/phonetic/tango.gsm
-libdata/asterisk/sounds/phonetic/uniform.gsm
-libdata/asterisk/sounds/phonetic/victor.gsm
-libdata/asterisk/sounds/phonetic/whiskey.gsm
-libdata/asterisk/sounds/phonetic/xray.gsm
-libdata/asterisk/sounds/phonetic/yankee.gsm
-libdata/asterisk/sounds/phonetic/zulu.gsm
-libdata/asterisk/sounds/silence/1.gsm
-libdata/asterisk/sounds/silence/10.gsm
-libdata/asterisk/sounds/silence/2.gsm
-libdata/asterisk/sounds/silence/3.gsm
-libdata/asterisk/sounds/silence/4.gsm
-libdata/asterisk/sounds/silence/5.gsm
-libdata/asterisk/sounds/silence/6.gsm
-libdata/asterisk/sounds/silence/7.gsm
-libdata/asterisk/sounds/silence/8.gsm
-libdata/asterisk/sounds/silence/9.gsm
-libdata/asterisk/sounds/wx/around.gsm
-libdata/asterisk/sounds/wx/barometer.gsm
-libdata/asterisk/sounds/wx/ceiling.gsm
-libdata/asterisk/sounds/wx/dew-point.gsm
-libdata/asterisk/sounds/wx/falling.gsm
-libdata/asterisk/sounds/wx/feet.gsm
-libdata/asterisk/sounds/wx/foot.gsm
-libdata/asterisk/sounds/wx/gust.gsm
-libdata/asterisk/sounds/wx/gusting-to.gsm
-libdata/asterisk/sounds/wx/gusts.gsm
-libdata/asterisk/sounds/wx/gusty.gsm
-libdata/asterisk/sounds/wx/heat-index.gsm
-libdata/asterisk/sounds/wx/humidity.gsm
-libdata/asterisk/sounds/wx/inch.gsm
-libdata/asterisk/sounds/wx/inches.gsm
-libdata/asterisk/sounds/wx/kilometer.gsm
-libdata/asterisk/sounds/wx/large.gsm
-libdata/asterisk/sounds/wx/meter.gsm
-libdata/asterisk/sounds/wx/mist.gsm
-libdata/asterisk/sounds/wx/northeast.gsm
-libdata/asterisk/sounds/wx/northwest.gsm
-libdata/asterisk/sounds/wx/percent.gsm
-libdata/asterisk/sounds/wx/point.gsm
-libdata/asterisk/sounds/wx/rising.gsm
-libdata/asterisk/sounds/wx/southeast.gsm
-libdata/asterisk/sounds/wx/southwest.gsm
-libdata/asterisk/sounds/wx/steady.gsm
-libdata/asterisk/sounds/wx/temperature.gsm
-libdata/asterisk/sounds/wx/wind-chill.gsm
-libdata/asterisk/sounds/wx/winds.gsm
-libdata/asterisk/sounds/ha/ac.gsm
-libdata/asterisk/sounds/ha/air-conditioner.gsm
-libdata/asterisk/sounds/ha/alarm.gsm
-libdata/asterisk/sounds/ha/amp.gsm
-libdata/asterisk/sounds/ha/amps.gsm
-libdata/asterisk/sounds/ha/attic.gsm
-libdata/asterisk/sounds/ha/baby-sleeping-mode.gsm
-libdata/asterisk/sounds/ha/back.gsm
-libdata/asterisk/sounds/ha/basement.gsm
-libdata/asterisk/sounds/ha/bathroom.gsm
-libdata/asterisk/sounds/ha/bedroom.gsm
-libdata/asterisk/sounds/ha/bright.gsm
-libdata/asterisk/sounds/ha/callerid.gsm
-libdata/asterisk/sounds/ha/carport.gsm
-libdata/asterisk/sounds/ha/closet.gsm
-libdata/asterisk/sounds/ha/coffee-pot.gsm
-libdata/asterisk/sounds/ha/cool.gsm
-libdata/asterisk/sounds/ha/cooling.gsm
-libdata/asterisk/sounds/ha/dc.gsm
-libdata/asterisk/sounds/ha/decibel.gsm
-libdata/asterisk/sounds/ha/decibels.gsm
-libdata/asterisk/sounds/ha/deck.gsm
-libdata/asterisk/sounds/ha/degree.gsm
-libdata/asterisk/sounds/ha/degrees.gsm
-libdata/asterisk/sounds/ha/den.gsm
-libdata/asterisk/sounds/ha/dim.gsm
-libdata/asterisk/sounds/ha/dining-room.gsm
-libdata/asterisk/sounds/ha/door.gsm
-libdata/asterisk/sounds/ha/doors.gsm
-libdata/asterisk/sounds/ha/down.gsm
-libdata/asterisk/sounds/ha/driveway.gsm
-libdata/asterisk/sounds/ha/dryer.gsm
-libdata/asterisk/sounds/ha/fan.gsm
-libdata/asterisk/sounds/ha/farad.gsm
-libdata/asterisk/sounds/ha/farads.gsm
-libdata/asterisk/sounds/ha/first-floor.gsm
-libdata/asterisk/sounds/ha/floor.gsm
-libdata/asterisk/sounds/ha/floors.gsm
-libdata/asterisk/sounds/ha/for-extended-status-report.gsm
-libdata/asterisk/sounds/ha/for-quick-status-report.gsm
-libdata/asterisk/sounds/ha/for-wx-report.gsm
-libdata/asterisk/sounds/ha/fountain.gsm
-libdata/asterisk/sounds/ha/foyer.gsm
-libdata/asterisk/sounds/ha/front.gsm
-libdata/asterisk/sounds/ha/furnace.gsm
-libdata/asterisk/sounds/ha/game-room.gsm
-libdata/asterisk/sounds/ha/garage.gsm
-libdata/asterisk/sounds/ha/great-room.gsm
-libdata/asterisk/sounds/ha/guest-room.gsm
-libdata/asterisk/sounds/ha/hall.gsm
-libdata/asterisk/sounds/ha/has-been-left.gsm
-libdata/asterisk/sounds/ha/heat-pump.gsm
-libdata/asterisk/sounds/ha/heat.gsm
-libdata/asterisk/sounds/ha/heating.gsm
-libdata/asterisk/sounds/ha/hot-tub.gsm
-libdata/asterisk/sounds/ha/house.gsm
-libdata/asterisk/sounds/ha/intruder.gsm
-libdata/asterisk/sounds/ha/is.gsm
-libdata/asterisk/sounds/ha/kelvin.gsm
-libdata/asterisk/sounds/ha/kitchen.gsm
-libdata/asterisk/sounds/ha/lamp.gsm
-libdata/asterisk/sounds/ha/lamps.gsm
-libdata/asterisk/sounds/ha/landscape.gsm
-libdata/asterisk/sounds/ha/laundry.gsm
-libdata/asterisk/sounds/ha/library.gsm
-libdata/asterisk/sounds/ha/light.gsm
-libdata/asterisk/sounds/ha/lights.gsm
-libdata/asterisk/sounds/ha/living-room.gsm
-libdata/asterisk/sounds/ha/locked.gsm
-libdata/asterisk/sounds/ha/locking.gsm
-libdata/asterisk/sounds/ha/mailbox.gsm
-libdata/asterisk/sounds/ha/master.gsm
-libdata/asterisk/sounds/ha/off.gsm
-libdata/asterisk/sounds/ha/office.gsm
-libdata/asterisk/sounds/ha/ohm.gsm
-libdata/asterisk/sounds/ha/ohms.gsm
-libdata/asterisk/sounds/ha/on.gsm
-libdata/asterisk/sounds/ha/open.gsm
-libdata/asterisk/sounds/ha/patio.gsm
-libdata/asterisk/sounds/ha/phone.gsm
-libdata/asterisk/sounds/ha/play-room.gsm
-libdata/asterisk/sounds/ha/play.gsm
-libdata/asterisk/sounds/ha/pool.gsm
-libdata/asterisk/sounds/ha/porch.gsm
-libdata/asterisk/sounds/ha/power-failure.gsm
-libdata/asterisk/sounds/ha/pressure.gsm
-libdata/asterisk/sounds/ha/psi.gsm
-libdata/asterisk/sounds/ha/quiet-mode.gsm
-libdata/asterisk/sounds/ha/reset.gsm
-libdata/asterisk/sounds/ha/roof.gsm
-libdata/asterisk/sounds/ha/room.gsm
-libdata/asterisk/sounds/ha/rooms.gsm
-libdata/asterisk/sounds/ha/second-floor.gsm
-libdata/asterisk/sounds/ha/secure.gsm
-libdata/asterisk/sounds/ha/set.gsm
-libdata/asterisk/sounds/ha/security-system.gsm
-libdata/asterisk/sounds/ha/side.gsm
-libdata/asterisk/sounds/ha/solar.gsm
-libdata/asterisk/sounds/ha/sprinklers.gsm
-libdata/asterisk/sounds/ha/still.gsm
-libdata/asterisk/sounds/ha/stove.gsm
-libdata/asterisk/sounds/ha/sump-pump.gsm
-libdata/asterisk/sounds/ha/sun-room.gsm
-libdata/asterisk/sounds/ha/system.gsm
-libdata/asterisk/sounds/ha/systems.gsm
-libdata/asterisk/sounds/ha/thermostat.gsm
-libdata/asterisk/sounds/ha/to-control-environ-sys.gsm
-libdata/asterisk/sounds/ha/to-control-lights-appl.gsm
-libdata/asterisk/sounds/ha/tower.gsm
-libdata/asterisk/sounds/ha/unlocked.gsm
-libdata/asterisk/sounds/ha/unlocking.gsm
-libdata/asterisk/sounds/ha/up.gsm
-libdata/asterisk/sounds/ha/volt.gsm
-libdata/asterisk/sounds/ha/volts.gsm
-libdata/asterisk/sounds/ha/washing-machine.gsm
-libdata/asterisk/sounds/ha/water-heater.gsm
-libdata/asterisk/sounds/ha/watt.gsm
-libdata/asterisk/sounds/ha/watts.gsm
-libdata/asterisk/sounds/ha/well-pump.gsm
-libdata/asterisk/sounds/ha/window.gsm
-libdata/asterisk/sounds/ha/windows.gsm
-libdata/asterisk/sounds/ha/xmas-lights.gsm
-libdata/asterisk/sounds/ha/xmas-tree.gsm
-libdata/asterisk/sounds/ha/yard.gsm
+@comment $NetBSD: PLIST,v 1.2 2006/01/25 18:41:14 riz Exp $
 libdata/asterisk/sounds/1-for-am-2-for-pm.gsm
 libdata/asterisk/sounds/1-yes-2-no.gsm
 libdata/asterisk/sounds/T-changed-to.gsm
@@ -200,15 +9,16 @@ libdata/asterisk/sounds/T-to-hear-cur-ancmnt.gsm
 libdata/asterisk/sounds/T-to-leave-msg.gsm
 libdata/asterisk/sounds/T-to-reach-main-office.gsm
 libdata/asterisk/sounds/T-to-rec-ancmnt.gsm
-libdata/asterisk/sounds/a-collect-charge-of.gsm
 libdata/asterisk/sounds/T-to-rtrn-to-main-menu.gsm
 libdata/asterisk/sounds/a-charge-for-this-svc.gsm
+libdata/asterisk/sounds/a-collect-charge-of.gsm
 libdata/asterisk/sounds/a-collect-charge.gsm
 libdata/asterisk/sounds/a-connect-charge-of.gsm
 libdata/asterisk/sounds/a-connect-charge.gsm
 libdata/asterisk/sounds/abandon-all-hope.gsm
 libdata/asterisk/sounds/abandons.gsm
 libdata/asterisk/sounds/academic-support.gsm
+libdata/asterisk/sounds/access-code.gsm
 libdata/asterisk/sounds/accessible-through-system.gsm
 libdata/asterisk/sounds/account-balance-is.gsm
 libdata/asterisk/sounds/accounting.gsm
@@ -220,7 +30,6 @@ libdata/asterisk/sounds/added.gsm
 libdata/asterisk/sounds/address.gsm
 libdata/asterisk/sounds/administration.gsm
 libdata/asterisk/sounds/advised-to-seek-shelter.gsm
-libdata/asterisk/sounds/and.gsm
 libdata/asterisk/sounds/after-the-tone.gsm
 libdata/asterisk/sounds/afternoon.gsm
 libdata/asterisk/sounds/airport.gsm
@@ -236,10 +45,10 @@ libdata/asterisk/sounds/ampersand.gsm
 libdata/asterisk/sounds/an-error-has-occured.gsm
 libdata/asterisk/sounds/and-area-code.gsm
 libdata/asterisk/sounds/and-or.gsm
-libdata/asterisk/sounds/another-time.gsm
 libdata/asterisk/sounds/and-prs-pound-whn-finished.gsm
+libdata/asterisk/sounds/and.gsm
+libdata/asterisk/sounds/another-time.gsm
 libdata/asterisk/sounds/approaching.gsm
-libdata/asterisk/sounds/at.gsm
 libdata/asterisk/sounds/approximately.gsm
 libdata/asterisk/sounds/are-you-still-there.gsm
 libdata/asterisk/sounds/are-you-still-there2.gsm
@@ -252,7 +61,6 @@ libdata/asterisk/sounds/astcc-balance-of-account-is.gsm
 libdata/asterisk/sounds/astcc-card-number-invalid.gsm
 libdata/asterisk/sounds/astcc-digit-account-number.gsm
 libdata/asterisk/sounds/astcc-followed-by-pound.gsm
-libdata/asterisk/sounds/at-sign.gsm
 libdata/asterisk/sounds/astcc-followed-by-the-hash-key.gsm
 libdata/asterisk/sounds/astcc-followed-by-the-pound-key.gsm
 libdata/asterisk/sounds/astcc-login12pound.gsm
@@ -262,7 +70,9 @@ libdata/asterisk/sounds/asterisk-friend.gsm
 libdata/asterisk/sounds/at-any-time.gsm
 libdata/asterisk/sounds/at-customers-request.gsm
 libdata/asterisk/sounds/at-following-number.gsm
+libdata/asterisk/sounds/at-sign.gsm
 libdata/asterisk/sounds/at-tone-time-exactly.gsm
+libdata/asterisk/sounds/at.gsm
 libdata/asterisk/sounds/athletics.gsm
 libdata/asterisk/sounds/atlanta.gsm
 libdata/asterisk/sounds/atlantic.gsm
@@ -288,8 +98,8 @@ libdata/asterisk/sounds/before-the-number.gsm
 libdata/asterisk/sounds/believe-its-free.gsm
 libdata/asterisk/sounds/billing-and-collections.gsm
 libdata/asterisk/sounds/billing.gsm
-libdata/asterisk/sounds/bits.gsm
 libdata/asterisk/sounds/billionth.gsm
+libdata/asterisk/sounds/bits.gsm
 libdata/asterisk/sounds/blue-eyed-polar-bear.gsm
 libdata/asterisk/sounds/bookstore.gsm
 libdata/asterisk/sounds/boston.gsm
@@ -311,11 +121,11 @@ libdata/asterisk/sounds/call-fwd-on-busy.gsm
 libdata/asterisk/sounds/call-fwd-parallel.gsm
 libdata/asterisk/sounds/call-fwd-unconditional.gsm
 libdata/asterisk/sounds/call-preempted.gsm
-libdata/asterisk/sounds/call.gsm
 libdata/asterisk/sounds/call-quality-menu.gsm
 libdata/asterisk/sounds/call-requres.gsm
 libdata/asterisk/sounds/call-terminated.gsm
 libdata/asterisk/sounds/call-waiting.gsm
+libdata/asterisk/sounds/call.gsm
 libdata/asterisk/sounds/calls-taken-by.gsm
 libdata/asterisk/sounds/calls-waiting-for-rep.gsm
 libdata/asterisk/sounds/calls.gsm
@@ -344,11 +154,10 @@ libdata/asterisk/sounds/channel.gsm
 libdata/asterisk/sounds/charlotte.gsm
 libdata/asterisk/sounds/chat-room.gsm
 libdata/asterisk/sounds/check-number-dial-again.gsm
-libdata/asterisk/sounds/chicago.gsm
 libdata/asterisk/sounds/chemistry.gsm
+libdata/asterisk/sounds/chicago.gsm
 libdata/asterisk/sounds/chris.gsm
 libdata/asterisk/sounds/claims.gsm
-libdata/asterisk/sounds/day.gsm
 libdata/asterisk/sounds/clear.gsm
 libdata/asterisk/sounds/clearing.gsm
 libdata/asterisk/sounds/cleveland.gsm
@@ -371,22 +180,15 @@ libdata/asterisk/sounds/conditions.gsm
 libdata/asterisk/sounds/conf-banned.gsm
 libdata/asterisk/sounds/conf-full.gsm
 libdata/asterisk/sounds/conf-hasentered.gsm
-libdata/asterisk/sounds/conf-hasleft.gsm
-libdata/asterisk/sounds/conf-leaderhasleft.gsm
 libdata/asterisk/sounds/conf-onlypersonleft.gsm
 libdata/asterisk/sounds/conf-peopleinconf.gsm
-libdata/asterisk/sounds/conf-placeintoconf.gsm
 libdata/asterisk/sounds/conf-sysop.gsm
 libdata/asterisk/sounds/conf-sysopreq.gsm
 libdata/asterisk/sounds/conf-sysopreqcancelled.gsm
-libdata/asterisk/sounds/conf-thereare.gsm
-libdata/asterisk/sounds/conf-userswilljoin.gsm
-libdata/asterisk/sounds/conf-userwilljoin.gsm
-libdata/asterisk/sounds/conf-waitforleader.gsm
 libdata/asterisk/sounds/conf-youareinconfnum.gsm
 libdata/asterisk/sounds/conference-call.gsm
-libdata/asterisk/sounds/conference.gsm
 libdata/asterisk/sounds/conference-reservations.gsm
+libdata/asterisk/sounds/conference.gsm
 libdata/asterisk/sounds/confirm-number-is.gsm
 libdata/asterisk/sounds/connected.gsm
 libdata/asterisk/sounds/connecticut.gsm
@@ -400,16 +202,16 @@ libdata/asterisk/sounds/could-lose-a-few-pounds.gsm
 libdata/asterisk/sounds/counseling-services.gsm
 libdata/asterisk/sounds/count.gsm
 libdata/asterisk/sounds/crash.gsm
-libdata/asterisk/sounds/dns.gsm
 libdata/asterisk/sounds/current-time-is.gsm
 libdata/asterisk/sounds/currently.gsm
 libdata/asterisk/sounds/customer-accounts.gsm
-libdata/asterisk/sounds/cyclone.gsm
 libdata/asterisk/sounds/customer-relations.gsm
 libdata/asterisk/sounds/customer-service.gsm
+libdata/asterisk/sounds/cyclone.gsm
 libdata/asterisk/sounds/dallas.gsm
 libdata/asterisk/sounds/dash.gsm
 libdata/asterisk/sounds/date.gsm
+libdata/asterisk/sounds/day.gsm
 libdata/asterisk/sounds/daylight.gsm
 libdata/asterisk/sounds/days.gsm
 libdata/asterisk/sounds/de-activated.gsm
@@ -425,9 +227,9 @@ libdata/asterisk/sounds/department.gsm
 libdata/asterisk/sounds/deposit.gsm
 libdata/asterisk/sounds/design.gsm
 libdata/asterisk/sounds/detroit.gsm
-libdata/asterisk/sounds/digit.gsm
 libdata/asterisk/sounds/development.gsm
 libdata/asterisk/sounds/dial-here-often.gsm
+libdata/asterisk/sounds/digit.gsm
 libdata/asterisk/sounds/digits.gsm
 libdata/asterisk/sounds/directory-assistance.gsm
 libdata/asterisk/sounds/directory.gsm
@@ -437,6 +239,7 @@ libdata/asterisk/sounds/disconnected.gsm
 libdata/asterisk/sounds/disk.gsm
 libdata/asterisk/sounds/distribution.gsm
 libdata/asterisk/sounds/divided-by.gsm
+libdata/asterisk/sounds/dns.gsm
 libdata/asterisk/sounds/do-not-disturb.gsm
 libdata/asterisk/sounds/doing-enum-lookup.gsm
 libdata/asterisk/sounds/dollar.gsm
@@ -452,6 +255,7 @@ libdata/asterisk/sounds/early.gsm
 libdata/asterisk/sounds/east.gsm
 libdata/asterisk/sounds/easterly.gsm
 libdata/asterisk/sounds/eastern.gsm
+libdata/asterisk/sounds/echo-test.gsm
 libdata/asterisk/sounds/ed.gsm
 libdata/asterisk/sounds/eighteenth.gsm
 libdata/asterisk/sounds/eighth.gsm
@@ -463,7 +267,6 @@ libdata/asterisk/sounds/emergency.gsm
 libdata/asterisk/sounds/enabled.gsm
 libdata/asterisk/sounds/encode.gsm
 libdata/asterisk/sounds/engineering.gsm
-libdata/asterisk/sounds/fog.gsm
 libdata/asterisk/sounds/ent-target-attendant.gsm
 libdata/asterisk/sounds/enter-a-time.gsm
 libdata/asterisk/sounds/enter-conf-call-number.gsm
@@ -505,6 +308,7 @@ libdata/asterisk/sounds/first.gsm
 libdata/asterisk/sounds/flagged-for-lea.gsm
 libdata/asterisk/sounds/flooding.gsm
 libdata/asterisk/sounds/florida.gsm
+libdata/asterisk/sounds/fog.gsm
 libdata/asterisk/sounds/foggy.gsm
 libdata/asterisk/sounds/followed-by.gsm
 libdata/asterisk/sounds/food-service.gsm
@@ -519,7 +323,6 @@ libdata/asterisk/sounds/for-louie-louie.gsm
 libdata/asterisk/sounds/for-no-press.gsm
 libdata/asterisk/sounds/for-qc-and-training-purposes.gsm
 libdata/asterisk/sounds/for-quality-purposes.gsm
-libdata/asterisk/sounds/for.gsm
 libdata/asterisk/sounds/for-sales.gsm
 libdata/asterisk/sounds/for-service.gsm
 libdata/asterisk/sounds/for-tech-support.gsm
@@ -527,6 +330,7 @@ libdata/asterisk/sounds/for-the-first.gsm
 libdata/asterisk/sounds/for-the-weather.gsm
 libdata/asterisk/sounds/for-wakeup-call.gsm
 libdata/asterisk/sounds/for-yes-press.gsm
+libdata/asterisk/sounds/for.gsm
 libdata/asterisk/sounds/fort-worth.gsm
 libdata/asterisk/sounds/fortieth.gsm
 libdata/asterisk/sounds/fourteenth.gsm
@@ -552,6 +356,130 @@ libdata/asterisk/sounds/good.gsm
 libdata/asterisk/sounds/goodbye.gsm
 libdata/asterisk/sounds/greater-than.gsm
 libdata/asterisk/sounds/groovy.gsm
+libdata/asterisk/sounds/ha/ac.gsm
+libdata/asterisk/sounds/ha/air-conditioner.gsm
+libdata/asterisk/sounds/ha/alarm.gsm
+libdata/asterisk/sounds/ha/amp.gsm
+libdata/asterisk/sounds/ha/amps.gsm
+libdata/asterisk/sounds/ha/attic.gsm
+libdata/asterisk/sounds/ha/baby-sleeping-mode.gsm
+libdata/asterisk/sounds/ha/back.gsm
+libdata/asterisk/sounds/ha/basement.gsm
+libdata/asterisk/sounds/ha/bathroom.gsm
+libdata/asterisk/sounds/ha/bedroom.gsm
+libdata/asterisk/sounds/ha/bright.gsm
+libdata/asterisk/sounds/ha/callerid.gsm
+libdata/asterisk/sounds/ha/carport.gsm
+libdata/asterisk/sounds/ha/closet.gsm
+libdata/asterisk/sounds/ha/coffee-pot.gsm
+libdata/asterisk/sounds/ha/cool.gsm
+libdata/asterisk/sounds/ha/cooling.gsm
+libdata/asterisk/sounds/ha/dc.gsm
+libdata/asterisk/sounds/ha/decibel.gsm
+libdata/asterisk/sounds/ha/decibels.gsm
+libdata/asterisk/sounds/ha/deck.gsm
+libdata/asterisk/sounds/ha/degree.gsm
+libdata/asterisk/sounds/ha/degrees.gsm
+libdata/asterisk/sounds/ha/den.gsm
+libdata/asterisk/sounds/ha/dim.gsm
+libdata/asterisk/sounds/ha/dining-room.gsm
+libdata/asterisk/sounds/ha/door.gsm
+libdata/asterisk/sounds/ha/doors.gsm
+libdata/asterisk/sounds/ha/down.gsm
+libdata/asterisk/sounds/ha/driveway.gsm
+libdata/asterisk/sounds/ha/dryer.gsm
+libdata/asterisk/sounds/ha/fan.gsm
+libdata/asterisk/sounds/ha/farad.gsm
+libdata/asterisk/sounds/ha/farads.gsm
+libdata/asterisk/sounds/ha/first-floor.gsm
+libdata/asterisk/sounds/ha/floor.gsm
+libdata/asterisk/sounds/ha/floors.gsm
+libdata/asterisk/sounds/ha/for-extended-status-report.gsm
+libdata/asterisk/sounds/ha/for-quick-status-report.gsm
+libdata/asterisk/sounds/ha/for-wx-report.gsm
+libdata/asterisk/sounds/ha/fountain.gsm
+libdata/asterisk/sounds/ha/foyer.gsm
+libdata/asterisk/sounds/ha/front.gsm
+libdata/asterisk/sounds/ha/furnace.gsm
+libdata/asterisk/sounds/ha/game-room.gsm
+libdata/asterisk/sounds/ha/garage.gsm
+libdata/asterisk/sounds/ha/great-room.gsm
+libdata/asterisk/sounds/ha/guest-room.gsm
+libdata/asterisk/sounds/ha/hall.gsm
+libdata/asterisk/sounds/ha/has-been-left.gsm
+libdata/asterisk/sounds/ha/heat-pump.gsm
+libdata/asterisk/sounds/ha/heat.gsm
+libdata/asterisk/sounds/ha/heating.gsm
+libdata/asterisk/sounds/ha/hot-tub.gsm
+libdata/asterisk/sounds/ha/house.gsm
+libdata/asterisk/sounds/ha/intruder.gsm
+libdata/asterisk/sounds/ha/is.gsm
+libdata/asterisk/sounds/ha/kelvin.gsm
+libdata/asterisk/sounds/ha/kitchen.gsm
+libdata/asterisk/sounds/ha/lamp.gsm
+libdata/asterisk/sounds/ha/lamps.gsm
+libdata/asterisk/sounds/ha/landscape.gsm
+libdata/asterisk/sounds/ha/laundry.gsm
+libdata/asterisk/sounds/ha/library.gsm
+libdata/asterisk/sounds/ha/light.gsm
+libdata/asterisk/sounds/ha/lights.gsm
+libdata/asterisk/sounds/ha/living-room.gsm
+libdata/asterisk/sounds/ha/locked.gsm
+libdata/asterisk/sounds/ha/locking.gsm
+libdata/asterisk/sounds/ha/mailbox.gsm
+libdata/asterisk/sounds/ha/master.gsm
+libdata/asterisk/sounds/ha/off.gsm
+libdata/asterisk/sounds/ha/office.gsm
+libdata/asterisk/sounds/ha/ohm.gsm
+libdata/asterisk/sounds/ha/ohms.gsm
+libdata/asterisk/sounds/ha/on.gsm
+libdata/asterisk/sounds/ha/open.gsm
+libdata/asterisk/sounds/ha/patio.gsm
+libdata/asterisk/sounds/ha/phone.gsm
+libdata/asterisk/sounds/ha/play-room.gsm
+libdata/asterisk/sounds/ha/play.gsm
+libdata/asterisk/sounds/ha/pool.gsm
+libdata/asterisk/sounds/ha/porch.gsm
+libdata/asterisk/sounds/ha/power-failure.gsm
+libdata/asterisk/sounds/ha/pressure.gsm
+libdata/asterisk/sounds/ha/psi.gsm
+libdata/asterisk/sounds/ha/quiet-mode.gsm
+libdata/asterisk/sounds/ha/reset.gsm
+libdata/asterisk/sounds/ha/roof.gsm
+libdata/asterisk/sounds/ha/room.gsm
+libdata/asterisk/sounds/ha/rooms.gsm
+libdata/asterisk/sounds/ha/second-floor.gsm
+libdata/asterisk/sounds/ha/secure.gsm
+libdata/asterisk/sounds/ha/security-system.gsm
+libdata/asterisk/sounds/ha/set.gsm
+libdata/asterisk/sounds/ha/side.gsm
+libdata/asterisk/sounds/ha/solar.gsm
+libdata/asterisk/sounds/ha/sprinklers.gsm
+libdata/asterisk/sounds/ha/still.gsm
+libdata/asterisk/sounds/ha/stove.gsm
+libdata/asterisk/sounds/ha/sump-pump.gsm
+libdata/asterisk/sounds/ha/sun-room.gsm
+libdata/asterisk/sounds/ha/system.gsm
+libdata/asterisk/sounds/ha/systems.gsm
+libdata/asterisk/sounds/ha/thermostat.gsm
+libdata/asterisk/sounds/ha/to-control-environ-sys.gsm
+libdata/asterisk/sounds/ha/to-control-lights-appl.gsm
+libdata/asterisk/sounds/ha/tower.gsm
+libdata/asterisk/sounds/ha/unlocked.gsm
+libdata/asterisk/sounds/ha/unlocking.gsm
+libdata/asterisk/sounds/ha/up.gsm
+libdata/asterisk/sounds/ha/volt.gsm
+libdata/asterisk/sounds/ha/volts.gsm
+libdata/asterisk/sounds/ha/washing-machine.gsm
+libdata/asterisk/sounds/ha/water-heater.gsm
+libdata/asterisk/sounds/ha/watt.gsm
+libdata/asterisk/sounds/ha/watts.gsm
+libdata/asterisk/sounds/ha/well-pump.gsm
+libdata/asterisk/sounds/ha/window.gsm
+libdata/asterisk/sounds/ha/windows.gsm
+libdata/asterisk/sounds/ha/xmas-lights.gsm
+libdata/asterisk/sounds/ha/xmas-tree.gsm
+libdata/asterisk/sounds/ha/yard.gsm
 libdata/asterisk/sounds/hail.gsm
 libdata/asterisk/sounds/half.gsm
 libdata/asterisk/sounds/hang-on-a-second-angry.gsm
@@ -564,9 +492,9 @@ libdata/asterisk/sounds/has-been-disconnected.gsm
 libdata/asterisk/sounds/has-been-set-to.gsm
 libdata/asterisk/sounds/has-been.gsm
 libdata/asterisk/sounds/has-expired.gsm
-libdata/asterisk/sounds/has.gsm
 libdata/asterisk/sounds/has-issued-a.gsm
 libdata/asterisk/sounds/has-not-been-seen-for.gsm
+libdata/asterisk/sounds/has.gsm
 libdata/asterisk/sounds/hash.gsm
 libdata/asterisk/sounds/hawaii.gsm
 libdata/asterisk/sounds/headed-towards.gsm
@@ -602,7 +530,6 @@ libdata/asterisk/sounds/ice.gsm
 libdata/asterisk/sounds/icmp.gsm
 libdata/asterisk/sounds/icy.gsm
 libdata/asterisk/sounds/idaho.gsm
-libdata/asterisk/sounds/illinois.gsm
 libdata/asterisk/sounds/if-correct-press.gsm
 libdata/asterisk/sounds/if-grtg-played-indefinately.gsm
 libdata/asterisk/sounds/if-grtg-should-expire-at.gsm
@@ -616,13 +543,14 @@ libdata/asterisk/sounds/if-unsuccessful-speak-to.gsm
 libdata/asterisk/sounds/if-you-know-the.gsm
 libdata/asterisk/sounds/if-you-need-help.gsm
 libdata/asterisk/sounds/if-youd-like-to-make-a-call.gsm
+libdata/asterisk/sounds/illinois.gsm
 libdata/asterisk/sounds/im-sorry-unable-to-connect-to-eng.gsm
 libdata/asterisk/sounds/im-sorry.gsm
 libdata/asterisk/sounds/imap.gsm
 libdata/asterisk/sounds/in-service.gsm
-libdata/asterisk/sounds/in-the.gsm
 libdata/asterisk/sounds/in-the-line.gsm
 libdata/asterisk/sounds/in-the-queue.gsm
+libdata/asterisk/sounds/in-the.gsm
 libdata/asterisk/sounds/in-your-city.gsm
 libdata/asterisk/sounds/in-your-zip-code.gsm
 libdata/asterisk/sounds/inbound.gsm
@@ -639,7 +567,6 @@ libdata/asterisk/sounds/inside-sales.gsm
 libdata/asterisk/sounds/internal-audit.gsm
 libdata/asterisk/sounds/international-call.gsm
 libdata/asterisk/sounds/interstate.gsm
-libdata/asterisk/sounds/is.gsm
 libdata/asterisk/sounds/invalid-date.gsm
 libdata/asterisk/sounds/investor-relations.gsm
 libdata/asterisk/sounds/iowa.gsm
@@ -652,10 +579,10 @@ libdata/asterisk/sounds/is-not-in-the.gsm
 libdata/asterisk/sounds/is-not-set.gsm
 libdata/asterisk/sounds/is-now-being-recorded.gsm
 libdata/asterisk/sounds/is-set-to.gsm
+libdata/asterisk/sounds/is.gsm
 libdata/asterisk/sounds/it-now.gsm
 libdata/asterisk/sounds/it-services.gsm
 libdata/asterisk/sounds/jacksonville.gsm
-libdata/asterisk/sounds/len.gsm
 libdata/asterisk/sounds/janitorial.gsm
 libdata/asterisk/sounds/jason.gsm
 libdata/asterisk/sounds/jedi-extension-trick.gsm
@@ -675,12 +602,13 @@ libdata/asterisk/sounds/knots.gsm
 libdata/asterisk/sounds/language.gsm
 libdata/asterisk/sounds/las-vegas.gsm
 libdata/asterisk/sounds/last-error-was.gsm
-libdata/asterisk/sounds/late.gsm
 libdata/asterisk/sounds/last-num-to-call.gsm
+libdata/asterisk/sounds/late.gsm
 libdata/asterisk/sounds/later.gsm
-libdata/asterisk/sounds/left-bracket.gsm
 libdata/asterisk/sounds/lea-may-request-info.gsm
+libdata/asterisk/sounds/left-bracket.gsm
 libdata/asterisk/sounds/legal.gsm
+libdata/asterisk/sounds/len.gsm
 libdata/asterisk/sounds/less-than.gsm
 libdata/asterisk/sounds/library.gsm
 libdata/asterisk/sounds/lightning.gsm
@@ -742,7 +670,6 @@ libdata/asterisk/sounds/minimum.gsm
 libdata/asterisk/sounds/minneapolis.gsm
 libdata/asterisk/sounds/minnesota.gsm
 libdata/asterisk/sounds/minus.gsm
-libdata/asterisk/sounds/ms.gsm
 libdata/asterisk/sounds/minute.gsm
 libdata/asterisk/sounds/minutes.gsm
 libdata/asterisk/sounds/missed.gsm
@@ -761,6 +688,7 @@ libdata/asterisk/sounds/mostly.gsm
 libdata/asterisk/sounds/motor-pool.gsm
 libdata/asterisk/sounds/mountain.gsm
 libdata/asterisk/sounds/moving.gsm
+libdata/asterisk/sounds/ms.gsm
 libdata/asterisk/sounds/nashville.gsm
 libdata/asterisk/sounds/national-weather-service.gsm
 libdata/asterisk/sounds/nautical-miles.gsm
@@ -798,13 +726,14 @@ libdata/asterisk/sounds/northerly.gsm
 libdata/asterisk/sounds/not-auth-pstn.gsm
 libdata/asterisk/sounds/not-enough-credit.gsm
 libdata/asterisk/sounds/not-necessary-1.gsm
-libdata/asterisk/sounds/now.gsm
 libdata/asterisk/sounds/not-necessary-ac.gsm
 libdata/asterisk/sounds/not-necessary-dial-1-or-ac.gsm
 libdata/asterisk/sounds/not-rqsted-wakeup.gsm
 libdata/asterisk/sounds/not-taking-your-call.gsm
 libdata/asterisk/sounds/not-yet-assigned.gsm
+libdata/asterisk/sounds/not-yet-connected.gsm
 libdata/asterisk/sounds/nothing-recorded.gsm
+libdata/asterisk/sounds/now.gsm
 libdata/asterisk/sounds/num-not-in-db.gsm
 libdata/asterisk/sounds/num-outside-area.gsm
 libdata/asterisk/sounds/num-was-successfully.gsm
@@ -816,7 +745,6 @@ libdata/asterisk/sounds/off-duty.gsm
 libdata/asterisk/sounds/office-code.gsm
 libdata/asterisk/sounds/office-iguanas.gsm
 libdata/asterisk/sounds/office.gsm
-libdata/asterisk/sounds/on.gsm
 libdata/asterisk/sounds/ohio.gsm
 libdata/asterisk/sounds/oklahoma-city.gsm
 libdata/asterisk/sounds/oklahoma.gsm
@@ -824,6 +752,7 @@ libdata/asterisk/sounds/omaha.gsm
 libdata/asterisk/sounds/on-busy.gsm
 libdata/asterisk/sounds/on-monthly-tel-stment.gsm
 libdata/asterisk/sounds/on-no-answer.gsm
+libdata/asterisk/sounds/on.gsm
 libdata/asterisk/sounds/one-moment-please.gsm
 libdata/asterisk/sounds/one-small-step.gsm
 libdata/asterisk/sounds/one-small-step2.gsm
@@ -858,7 +787,6 @@ libdata/asterisk/sounds/pence.gsm
 libdata/asterisk/sounds/pennies.gsm
 libdata/asterisk/sounds/pennsylvania.gsm
 libdata/asterisk/sounds/penny.gsm
-libdata/asterisk/sounds/pop.gsm
 libdata/asterisk/sounds/percent.gsm
 libdata/asterisk/sounds/perhaps-we-are.gsm
 libdata/asterisk/sounds/perhaps-we-are2.gsm
@@ -867,6 +795,33 @@ libdata/asterisk/sounds/personnel.gsm
 libdata/asterisk/sounds/persons-in-path-of.gsm
 libdata/asterisk/sounds/philadelphia.gsm
 libdata/asterisk/sounds/phoenix.gsm
+libdata/asterisk/sounds/phonetic/alpha.gsm
+libdata/asterisk/sounds/phonetic/bravo.gsm
+libdata/asterisk/sounds/phonetic/charlie.gsm
+libdata/asterisk/sounds/phonetic/delta.gsm
+libdata/asterisk/sounds/phonetic/echo.gsm
+libdata/asterisk/sounds/phonetic/foxtrot.gsm
+libdata/asterisk/sounds/phonetic/golf.gsm
+libdata/asterisk/sounds/phonetic/hotel.gsm
+libdata/asterisk/sounds/phonetic/india.gsm
+libdata/asterisk/sounds/phonetic/juliet.gsm
+libdata/asterisk/sounds/phonetic/kilo.gsm
+libdata/asterisk/sounds/phonetic/lima.gsm
+libdata/asterisk/sounds/phonetic/mike.gsm
+libdata/asterisk/sounds/phonetic/niner.gsm
+libdata/asterisk/sounds/phonetic/november.gsm
+libdata/asterisk/sounds/phonetic/oscar.gsm
+libdata/asterisk/sounds/phonetic/papa.gsm
+libdata/asterisk/sounds/phonetic/quebec.gsm
+libdata/asterisk/sounds/phonetic/romeo.gsm
+libdata/asterisk/sounds/phonetic/sierra.gsm
+libdata/asterisk/sounds/phonetic/tango.gsm
+libdata/asterisk/sounds/phonetic/uniform.gsm
+libdata/asterisk/sounds/phonetic/victor.gsm
+libdata/asterisk/sounds/phonetic/whiskey.gsm
+libdata/asterisk/sounds/phonetic/xray.gsm
+libdata/asterisk/sounds/phonetic/yankee.gsm
+libdata/asterisk/sounds/phonetic/zulu.gsm
 libdata/asterisk/sounds/physics.gsm
 libdata/asterisk/sounds/pin-invalid.gsm
 libdata/asterisk/sounds/pin-number-accepted.gsm
@@ -889,8 +844,8 @@ libdata/asterisk/sounds/pls-enter-conf-password.gsm
 libdata/asterisk/sounds/pls-enter-num-message-after-tone.gsm
 libdata/asterisk/sounds/pls-enter-vm-password.gsm
 libdata/asterisk/sounds/pls-entr-num-uwish2-call.gsm
+libdata/asterisk/sounds/pls-hold-silent30.gsm
 libdata/asterisk/sounds/pls-hold-while-try.gsm
-libdata/asterisk/sounds/plugh.gsm
 libdata/asterisk/sounds/pls-lv-msg-will-contact.gsm
 libdata/asterisk/sounds/pls-rcrd-name-at-tone.gsm
 libdata/asterisk/sounds/pls-stay-on-line.gsm
@@ -899,6 +854,7 @@ libdata/asterisk/sounds/pls-try-area-code.gsm
 libdata/asterisk/sounds/pls-try-call-later.gsm
 libdata/asterisk/sounds/pls-try-manually.gsm
 libdata/asterisk/sounds/pls-wait-connect-call.gsm
+libdata/asterisk/sounds/plugh.gsm
 libdata/asterisk/sounds/plus.gsm
 libdata/asterisk/sounds/pm-announcement-number.gsm
 libdata/asterisk/sounds/pm-invalid-option.gsm
@@ -907,8 +863,10 @@ libdata/asterisk/sounds/pm-prompt-number.gsm
 libdata/asterisk/sounds/pm-to-record-phrase.gsm
 libdata/asterisk/sounds/pm-to-review-phrase.gsm
 libdata/asterisk/sounds/point.gsm
+libdata/asterisk/sounds/pop.gsm
 libdata/asterisk/sounds/port.gsm
 libdata/asterisk/sounds/portland.gsm
+libdata/asterisk/sounds/portnumber.gsm
 libdata/asterisk/sounds/position.gsm
 libdata/asterisk/sounds/post-entry-pound.gsm
 libdata/asterisk/sounds/pound.gsm
@@ -928,7 +886,6 @@ libdata/asterisk/sounds/press-8.gsm
 libdata/asterisk/sounds/press-9.gsm
 libdata/asterisk/sounds/press-button-again.gsm
 libdata/asterisk/sounds/press-enter.gsm
-libdata/asterisk/sounds/press.gsm
 libdata/asterisk/sounds/press-escape.gsm
 libdata/asterisk/sounds/press-hash.gsm
 libdata/asterisk/sounds/press-pound-save-changes.gsm
@@ -939,6 +896,7 @@ libdata/asterisk/sounds/press-star-cancel.gsm
 libdata/asterisk/sounds/press-star.gsm
 libdata/asterisk/sounds/press-the-space-bar.gsm
 libdata/asterisk/sounds/press-tilde.gsm
+libdata/asterisk/sounds/press.gsm
 libdata/asterisk/sounds/pressure.gsm
 libdata/asterisk/sounds/printing.gsm
 libdata/asterisk/sounds/privacy-blacklisted.gsm
@@ -948,7 +906,6 @@ libdata/asterisk/sounds/privacy-if-error.gsm
 libdata/asterisk/sounds/privacy-if-sales-call-contact-in-writing.gsm
 libdata/asterisk/sounds/privacy-last-caller-was.gsm
 libdata/asterisk/sounds/privacy-not.gsm
-libdata/asterisk/sounds/ssh.gsm
 libdata/asterisk/sounds/privacy-please-dial.gsm
 libdata/asterisk/sounds/privacy-please-stay-on-line-to-be-connected.gsm
 libdata/asterisk/sounds/privacy-screening-unidentified-calls.gsm
@@ -967,6 +924,7 @@ libdata/asterisk/sounds/privacy-your-callerid-is.gsm
 libdata/asterisk/sounds/product.gsm
 libdata/asterisk/sounds/production.gsm
 libdata/asterisk/sounds/projects.gsm
+libdata/asterisk/sounds/protocol.gsm
 libdata/asterisk/sounds/public-relations.gsm
 libdata/asterisk/sounds/purchasing.gsm
 libdata/asterisk/sounds/purposes.gsm
@@ -978,7 +936,6 @@ libdata/asterisk/sounds/quarter.gsm
 libdata/asterisk/sounds/quickly.gsm
 libdata/asterisk/sounds/quote.gsm
 libdata/asterisk/sounds/race.gsm
-libdata/asterisk/sounds/sun.gsm
 libdata/asterisk/sounds/rain.gsm
 libdata/asterisk/sounds/rainfall.gsm
 libdata/asterisk/sounds/rainy.gsm
@@ -998,7 +955,6 @@ libdata/asterisk/sounds/repair.gsm
 libdata/asterisk/sounds/repeat-only.gsm
 libdata/asterisk/sounds/repeater.gsm
 libdata/asterisk/sounds/research-and-development.gsm
-libdata/asterisk/sounds/tcp.gsm
 libdata/asterisk/sounds/research.gsm
 libdata/asterisk/sounds/reservations.gsm
 libdata/asterisk/sounds/restarting.gsm
@@ -1008,6 +964,7 @@ libdata/asterisk/sounds/rising.gsm
 libdata/asterisk/sounds/risk-management.gsm
 libdata/asterisk/sounds/roaming.gsm
 libdata/asterisk/sounds/room-service.gsm
+libdata/asterisk/sounds/route-sip.gsm
 libdata/asterisk/sounds/rqsted-wakeup-for.gsm
 libdata/asterisk/sounds/sacramento.gsm
 libdata/asterisk/sounds/saint-louis.gsm
@@ -1018,9 +975,9 @@ libdata/asterisk/sounds/san-diego.gsm
 libdata/asterisk/sounds/san-francisco.gsm
 libdata/asterisk/sounds/san-jose.gsm
 libdata/asterisk/sounds/save-announce-press.gsm
-libdata/asterisk/sounds/scattered.gsm
 libdata/asterisk/sounds/say-temp-msg-prs-pound.gsm
 libdata/asterisk/sounds/says-thats-stupid.gsm
+libdata/asterisk/sounds/scattered.gsm
 libdata/asterisk/sounds/sciences.gsm
 libdata/asterisk/sounds/seattle.gsm
 libdata/asterisk/sounds/second.gsm
@@ -1042,6 +999,16 @@ libdata/asterisk/sounds/shipping.gsm
 libdata/asterisk/sounds/shop.gsm
 libdata/asterisk/sounds/show-office.gsm
 libdata/asterisk/sounds/sighted.gsm
+libdata/asterisk/sounds/silence/1.gsm
+libdata/asterisk/sounds/silence/10.gsm
+libdata/asterisk/sounds/silence/2.gsm
+libdata/asterisk/sounds/silence/3.gsm
+libdata/asterisk/sounds/silence/4.gsm
+libdata/asterisk/sounds/silence/5.gsm
+libdata/asterisk/sounds/silence/6.gsm
+libdata/asterisk/sounds/silence/7.gsm
+libdata/asterisk/sounds/silence/8.gsm
+libdata/asterisk/sounds/silence/9.gsm
 libdata/asterisk/sounds/simplex.gsm
 libdata/asterisk/sounds/simul-call-limit-reached.gsm
 libdata/asterisk/sounds/sixteenth.gsm
@@ -1059,26 +1026,29 @@ libdata/asterisk/sounds/software.gsm
 libdata/asterisk/sounds/someone-you-trust1.gsm
 libdata/asterisk/sounds/someone-you-trust2.gsm
 libdata/asterisk/sounds/someone-you-trust3.gsm
-libdata/asterisk/sounds/sorry-mailbox-full.gsm
 libdata/asterisk/sounds/something-terribly-wrong.gsm
 libdata/asterisk/sounds/sorry-cant-let-you-do-that.gsm
 libdata/asterisk/sounds/sorry-cant-let-you-do-that2.gsm
 libdata/asterisk/sounds/sorry-cant-let-you-do-that3.gsm
+libdata/asterisk/sounds/sorry-mailbox-full.gsm
 libdata/asterisk/sounds/sorry-youre-having-problems.gsm
+libdata/asterisk/sounds/sorry.gsm
+libdata/asterisk/sounds/sorry2.gsm
 libdata/asterisk/sounds/south-carolina.gsm
 libdata/asterisk/sounds/south-dakota.gsm
 libdata/asterisk/sounds/south.gsm
 libdata/asterisk/sounds/southerly.gsm
 libdata/asterisk/sounds/space.gsm
 libdata/asterisk/sounds/spam.gsm
+libdata/asterisk/sounds/spam2.gsm
 libdata/asterisk/sounds/speak-louder-into-phone.gsm
 libdata/asterisk/sounds/speak-louder.gsm
 libdata/asterisk/sounds/speak-to-the-operator.gsm
 libdata/asterisk/sounds/speed-dial-empty.gsm
 libdata/asterisk/sounds/speed-dial.gsm
-libdata/asterisk/sounds/udp.gsm
 libdata/asterisk/sounds/speed.gsm
 libdata/asterisk/sounds/splat.gsm
+libdata/asterisk/sounds/ssh.gsm
 libdata/asterisk/sounds/staff.gsm
 libdata/asterisk/sounds/staffing.gsm
 libdata/asterisk/sounds/standard.gsm
@@ -1091,6 +1061,7 @@ libdata/asterisk/sounds/step-in-stream.gsm
 libdata/asterisk/sounds/sterling.gsm
 libdata/asterisk/sounds/store-accounting.gsm
 libdata/asterisk/sounds/storm.gsm
+libdata/asterisk/sounds/sun.gsm
 libdata/asterisk/sounds/sunny.gsm
 libdata/asterisk/sounds/support.gsm
 libdata/asterisk/sounds/swap.gsm
@@ -1100,6 +1071,7 @@ libdata/asterisk/sounds/system.gsm
 libdata/asterisk/sounds/systems.gsm
 libdata/asterisk/sounds/talking-to-myself.gsm
 libdata/asterisk/sounds/target-attendant.gsm
+libdata/asterisk/sounds/tcp.gsm
 libdata/asterisk/sounds/technical-support.gsm
 libdata/asterisk/sounds/telephone-in-your-pocket.gsm
 libdata/asterisk/sounds/telephone-in-your-pocket2.gsm
@@ -1119,6 +1091,7 @@ libdata/asterisk/sounds/test-tones-follow.gsm
 libdata/asterisk/sounds/texas.gsm
 libdata/asterisk/sounds/thank-you-cooperation.gsm
 libdata/asterisk/sounds/thank-you-for-calling.gsm
+libdata/asterisk/sounds/thanks-for-calling-today.gsm
 libdata/asterisk/sounds/thanks-for-using.gsm
 libdata/asterisk/sounds/that-is-not-rec-phn-num.gsm
 libdata/asterisk/sounds/that-number.gsm
@@ -1132,24 +1105,24 @@ libdata/asterisk/sounds/the-num-i-have-is.gsm
 libdata/asterisk/sounds/the-number-u-dialed.gsm
 libdata/asterisk/sounds/the-party-you-are-calling.gsm
 libdata/asterisk/sounds/the-weather-at.gsm
-libdata/asterisk/sounds/third.gsm
 libdata/asterisk/sounds/then-press-pound.gsm
 libdata/asterisk/sounds/there-is-no-customer-support.gsm
 libdata/asterisk/sounds/these-are-currently.gsm
+libdata/asterisk/sounds/third.gsm
 libdata/asterisk/sounds/thirteenth.gsm
 libdata/asterisk/sounds/thirtieth.gsm
 libdata/asterisk/sounds/this-call-may-be-monitored-or-recorded.gsm
 libdata/asterisk/sounds/this-call-may-be.gsm
 libdata/asterisk/sounds/this-call-will-cost.gsm
+libdata/asterisk/sounds/this-call-will-end-in.gsm
 libdata/asterisk/sounds/this-is-the-voice-mail-system.gsm
-libdata/asterisk/sounds/this.gsm
 libdata/asterisk/sounds/this-is-yr-wakeup-call.gsm
+libdata/asterisk/sounds/this.gsm
 libdata/asterisk/sounds/thnk-u-for-patience.gsm
 libdata/asterisk/sounds/thousandth.gsm
 libdata/asterisk/sounds/through.gsm
 libdata/asterisk/sounds/thunderstorm.gsm
 libdata/asterisk/sounds/tide.gsm
-libdata/asterisk/sounds/uk.gsm
 libdata/asterisk/sounds/time.gsm
 libdata/asterisk/sounds/times.gsm
 libdata/asterisk/sounds/to-accept-recording.gsm
@@ -1160,7 +1133,6 @@ libdata/asterisk/sounds/to-call-num-press.gsm
 libdata/asterisk/sounds/to-call-prson-w-sent-msg.gsm
 libdata/asterisk/sounds/to-call-this-number.gsm
 libdata/asterisk/sounds/to-cancel-this-msg.gsm
-libdata/asterisk/sounds/to-dial-by-name.gsm
 libdata/asterisk/sounds/to-cancel-wakeup.gsm
 libdata/asterisk/sounds/to-change-exp-date.gsm
 libdata/asterisk/sounds/to-change-your-pin-number.gsm
@@ -1168,6 +1140,7 @@ libdata/asterisk/sounds/to-collect-voicemail.gsm
 libdata/asterisk/sounds/to-compose-a-message.gsm
 libdata/asterisk/sounds/to-confirm-wakeup.gsm
 libdata/asterisk/sounds/to-dial-by-name-press.gsm
+libdata/asterisk/sounds/to-dial-by-name.gsm
 libdata/asterisk/sounds/to-enter-a-diff-number.gsm
 libdata/asterisk/sounds/to-enter-a-number.gsm
 libdata/asterisk/sounds/to-erase-yr-temp-grtg.gsm
@@ -1176,7 +1149,6 @@ libdata/asterisk/sounds/to-hang-up-2.gsm
 libdata/asterisk/sounds/to-hang-up.gsm
 libdata/asterisk/sounds/to-hear-callerid.gsm
 libdata/asterisk/sounds/to-hear-menu-again.gsm
-libdata/asterisk/sounds/up.gsm
 libdata/asterisk/sounds/to-hear-msg-again.gsm
 libdata/asterisk/sounds/to-hear-msg-envelope.gsm
 libdata/asterisk/sounds/to-hear-net-status.gsm
@@ -1191,15 +1163,15 @@ libdata/asterisk/sounds/to-reach-first-rep.gsm
 libdata/asterisk/sounds/to-reach-operator.gsm
 libdata/asterisk/sounds/to-rec-yr-temp-grtg.gsm
 libdata/asterisk/sounds/to-record-call.gsm
-libdata/asterisk/sounds/to-report-emergency.gsm
 libdata/asterisk/sounds/to-redial-the-last-number-you-called.gsm
+libdata/asterisk/sounds/to-report-emergency.gsm
 libdata/asterisk/sounds/to-report-system-network-down.gsm
 libdata/asterisk/sounds/to-rerecord-announce.gsm
 libdata/asterisk/sounds/to-rerecord-it.gsm
-libdata/asterisk/sounds/to-send-a-reply.gsm
 libdata/asterisk/sounds/to-rerecord-yr-message.gsm
 libdata/asterisk/sounds/to-rmv-num-blklist.gsm
 libdata/asterisk/sounds/to-rqst-wakeup-call.gsm
+libdata/asterisk/sounds/to-send-a-reply.gsm
 libdata/asterisk/sounds/to-snooze-for.gsm
 libdata/asterisk/sounds/to-use-def-attendant.gsm
 libdata/asterisk/sounds/today.gsm
@@ -1227,23 +1199,28 @@ libdata/asterisk/sounds/twelveth.gsm
 libdata/asterisk/sounds/twentieth.gsm
 libdata/asterisk/sounds/twisty-maze.gsm
 libdata/asterisk/sounds/typhoon.gsm
+libdata/asterisk/sounds/udp.gsm
 libdata/asterisk/sounds/uh-oh1.gsm
 libdata/asterisk/sounds/uh-oh2.gsm
+libdata/asterisk/sounds/uk.gsm
 libdata/asterisk/sounds/unavailable.gsm
 libdata/asterisk/sounds/unconditional.gsm
 libdata/asterisk/sounds/unidentified-no-callback.gsm
+libdata/asterisk/sounds/units.gsm
 libdata/asterisk/sounds/unix.gsm
+libdata/asterisk/sounds/up.gsm
 libdata/asterisk/sounds/uptime.gsm
 libdata/asterisk/sounds/user.gsm
 libdata/asterisk/sounds/users.gsm
 libdata/asterisk/sounds/utah.gsm
-libdata/asterisk/sounds/vermont.gsm
 libdata/asterisk/sounds/variable.gsm
+libdata/asterisk/sounds/vermont.gsm
 libdata/asterisk/sounds/virginia-beach.gsm
 libdata/asterisk/sounds/virginia.gsm
 libdata/asterisk/sounds/visibility.gsm
 libdata/asterisk/sounds/visit-asterisk-website.gsm
 libdata/asterisk/sounds/voice-mail-system.gsm
+libdata/asterisk/sounds/wait-moment.gsm
 libdata/asterisk/sounds/wait-offensive-sounds.gsm
 libdata/asterisk/sounds/wakeup-call-cancelled.gsm
 libdata/asterisk/sounds/wakeup-call.gsm
@@ -1274,9 +1251,9 @@ libdata/asterisk/sounds/what-are-you-wearing.gsm
 libdata/asterisk/sounds/what-time-it-is.gsm
 libdata/asterisk/sounds/what-time-it-is2.gsm
 libdata/asterisk/sounds/when-dialing-this-number.gsm
-libdata/asterisk/sounds/wichita.gsm
 libdata/asterisk/sounds/who-would-you-like-to-call.gsm
 libdata/asterisk/sounds/why-no-answer-mystery.gsm
+libdata/asterisk/sounds/wichita.gsm
 libdata/asterisk/sounds/will-apply.gsm
 libdata/asterisk/sounds/will-expire.gsm
 libdata/asterisk/sounds/will-not-expire.gsm
@@ -1292,6 +1269,36 @@ libdata/asterisk/sounds/work.gsm
 libdata/asterisk/sounds/wrong-try-again-smarty.gsm
 libdata/asterisk/sounds/wtng-to-spk-w-rep.gsm
 libdata/asterisk/sounds/www-switchboard-com.gsm
+libdata/asterisk/sounds/wx/around.gsm
+libdata/asterisk/sounds/wx/barometer.gsm
+libdata/asterisk/sounds/wx/ceiling.gsm
+libdata/asterisk/sounds/wx/dew-point.gsm
+libdata/asterisk/sounds/wx/falling.gsm
+libdata/asterisk/sounds/wx/feet.gsm
+libdata/asterisk/sounds/wx/foot.gsm
+libdata/asterisk/sounds/wx/gust.gsm
+libdata/asterisk/sounds/wx/gusting-to.gsm
+libdata/asterisk/sounds/wx/gusts.gsm
+libdata/asterisk/sounds/wx/gusty.gsm
+libdata/asterisk/sounds/wx/heat-index.gsm
+libdata/asterisk/sounds/wx/humidity.gsm
+libdata/asterisk/sounds/wx/inch.gsm
+libdata/asterisk/sounds/wx/inches.gsm
+libdata/asterisk/sounds/wx/kilometer.gsm
+libdata/asterisk/sounds/wx/large.gsm
+libdata/asterisk/sounds/wx/meter.gsm
+libdata/asterisk/sounds/wx/mist.gsm
+libdata/asterisk/sounds/wx/northeast.gsm
+libdata/asterisk/sounds/wx/northwest.gsm
+libdata/asterisk/sounds/wx/percent.gsm
+libdata/asterisk/sounds/wx/point.gsm
+libdata/asterisk/sounds/wx/rising.gsm
+libdata/asterisk/sounds/wx/southeast.gsm
+libdata/asterisk/sounds/wx/southwest.gsm
+libdata/asterisk/sounds/wx/steady.gsm
+libdata/asterisk/sounds/wx/temperature.gsm
+libdata/asterisk/sounds/wx/wind-chill.gsm
+libdata/asterisk/sounds/wx/winds.gsm
 libdata/asterisk/sounds/wyoming.gsm
 libdata/asterisk/sounds/yeah.gsm
 libdata/asterisk/sounds/year.gsm
@@ -1304,8 +1311,8 @@ libdata/asterisk/sounds/you-are-curr-call-num.gsm
 libdata/asterisk/sounds/you-can-press.gsm
 libdata/asterisk/sounds/you-dialed-wrong-number.gsm
 libdata/asterisk/sounds/you-entered.gsm
+libdata/asterisk/sounds/you-have-dialed.gsm
 libdata/asterisk/sounds/you-have-reached-a-test-number.gsm
-libdata/asterisk/sounds/your.gsm
 libdata/asterisk/sounds/you-have-these-options.gsm
 libdata/asterisk/sounds/you-must-first-dial.gsm
 libdata/asterisk/sounds/you-seem-impatient.gsm
@@ -1315,10 +1322,10 @@ libdata/asterisk/sounds/your-account.gsm
 libdata/asterisk/sounds/your-msg-has-been-saved.gsm
 libdata/asterisk/sounds/your-msg-is-too-short.gsm
 libdata/asterisk/sounds/your-temp-greeting.gsm
+libdata/asterisk/sounds/your.gsm
 libdata/asterisk/sounds/zip-code.gsm
-@dirrm libdata/asterisk/sounds/silence
 @dirrm libdata/asterisk/sounds/wx
+@dirrm libdata/asterisk/sounds/silence
 @dirrm libdata/asterisk/sounds/ha
 @unexec ${RMDIR} %D/libdata/asterisk/sounds/phonetic 2>/dev/null || ${TRUE}
 @unexec ${RMDIR} %D/libdata/asterisk/sounds 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/libdata/asterisk/sounds 2>/dev/null || ${TRUE}
diff --git a/comms/asterisk-sounds-extra/distinfo b/comms/asterisk-sounds-extra/distinfo
index e6cf378f1b6..9f30707d954 100644
--- a/comms/asterisk-sounds-extra/distinfo
+++ b/comms/asterisk-sounds-extra/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/09/30 21:17:24 mjl Exp $
+$NetBSD: distinfo,v 1.2 2006/01/25 18:41:14 riz Exp $
 
-SHA1 (asterisk-sounds-1.0.9.tar.gz) = 969bae38aea688c6312bde1e8900c640e26e0482
-RMD160 (asterisk-sounds-1.0.9.tar.gz) = 4d086d9e2f4f8f2e4e3a98ee6c6655f01bf580f1
-Size (asterisk-sounds-1.0.9.tar.gz) = 3170386 bytes
+SHA1 (asterisk-sounds-1.2.1.tar.gz) = 219dd5412d4bbaeeef798a49bfd0f1a591fcc177
+RMD160 (asterisk-sounds-1.2.1.tar.gz) = 02d99d136e8a0a3ddd7fa3eec70f9332febedd36
+Size (asterisk-sounds-1.2.1.tar.gz) = 3249876 bytes
 SHA1 (patch-aa) = 152db5d9f2c1d6be7c79077d2be39c493d589dbd
-SHA1 (patch-ab) = 3aad200eeb1b049f6a531de49a2c92a5f537cee1
+SHA1 (patch-ab) = ec80ff880fb4d28c79af51c77a89268002681c0b
diff --git a/comms/asterisk-sounds-extra/patches/patch-ab b/comms/asterisk-sounds-extra/patches/patch-ab
index 3a2dbe41b55..e3471abf2ce 100644
--- a/comms/asterisk-sounds-extra/patches/patch-ab
+++ b/comms/asterisk-sounds-extra/patches/patch-ab
@@ -1,7 +1,33 @@
-$NetBSD: patch-ab,v 1.1.1.1 2005/09/30 21:17:24 mjl Exp $
-
---- sounds-extra.txt.orig	2005-09-16 23:20:17.000000000 +0200
-+++ sounds-extra.txt	2005-09-16 23:26:41.000000000 +0200
+$NetBSD: patch-ab,v 1.2 2006/01/25 18:41:15 riz Exp $
+--- sounds-extra.txt.orig	2005-11-30 20:01:24.000000000 -0800
++++ sounds-extra.txt	2006-01-25 10:17:48.000000000 -0800
+@@ -1477,19 +1477,19 @@
+ %conference-reservations.gsm%Conference Reservations
+ %conf-full.gsm%That conference is full.
+ %conf-hasentered.gsm%has entered the conference
+-%conf-hasleft.gsm%has left the conference
++%xxxxxconf-hasleft.gsm%has left the conference
+ %confirm-number-is.gsm%Your confirmation number is
+-%conf-leaderhasleft.gsm%The leader has left the conference.
++%xxxxxconf-leaderhasleft.gsm%The leader has left the conference.
+ %conf-onlypersonleft.gsm%You are now the only person left in this conference.
+ %conf-peopleinconf.gsm%people in this conference
+-%conf-placeintoconf.gsm%You will now be placed into the conference.
++%xxxxxconf-placeintoconf.gsm%You will now be placed into the conference.
+ %conf-sysop.gsm%The sysop
+ %conf-sysopreqcancelled.gsm%System operator request cancelled.
+ %conf-sysopreq.gsm%System operator requested.
+-%conf-thereare.gsm%There are...
+-%conf-userswilljoin.gsm%users will join the conference.
+-%conf-userwilljoin.gsm%user will join the conference.
+-%conf-waitforleader.gsm%The conference will begin when the leader arrives.
++%xxxxxconf-thereare.gsm%There are...
++%xxxxxconf-userswilljoin.gsm%users will join the conference.
++%xxxxxconf-userwilljoin.gsm%user will join the conference.
++%xxxxxconf-waitforleader.gsm%The conference will begin when the leader arrives.
+ %conf-youareinconfnum.gsm%You are in conference number...
+ %connected.gsm%Connected
+ %connecticut.gsm%Connecticut
 @@ -1606,7 +1606,7 @@
  %inside-sales.gsm%Inside Sales
  %internal-audit.gsm%Internal Audit