4 files changed, 23 insertions, 25 deletions

diff --git a/net/asterisk10/Makefile b/net/asterisk10/Makefile
index 449eab1796d0..127363337978 100644
--- a/net/asterisk10/Makefile
+++ b/net/asterisk10/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	asterisk
-DISTVERSION=	10.0.0-beta1
+DISTVERSION=	10.0.0-beta2
 CATEGORIES=	net
 MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/asterisk/ \
 		http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/
diff --git a/net/asterisk10/distinfo b/net/asterisk10/distinfo
index 31803e4a7a3c..1ac12201f6c0 100644
--- a/net/asterisk10/distinfo
+++ b/net/asterisk10/distinfo
@@ -1,2 +1,2 @@
-SHA256 (asterisk-10.0.0-beta1.tar.gz) = 5ce2147962324bfb1807c2899109aee6584a3791d7f2e7613ab9b6cd112e9845
-SIZE (asterisk-10.0.0-beta1.tar.gz) = 27693425
+SHA256 (asterisk-10.0.0-beta2.tar.gz) = 702ef1fe285637e5295899e01b25affd944534c2e90516da1d5567a5151e7db9
+SIZE (asterisk-10.0.0-beta2.tar.gz) = 27733356
diff --git a/net/asterisk10/files/patch-Makefile b/net/asterisk10/files/patch-Makefile
index f493cb5c590b..8237087c39e2 100644
--- a/net/asterisk10/files/patch-Makefile
+++ b/net/asterisk10/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig	2011-07-19 23:31:16.000000000 +0200
-+++ Makefile	2011-07-23 00:32:54.955232647 +0200
+--- Makefile.orig	2011-09-19 22:29:40.000000000 +0200
++++ Makefile	2011-10-07 11:17:16.000000000 +0200
 @@ -122,7 +122,7 @@
  OVERWRITE=y
  
@@ -39,8 +39,8 @@
 +	fi
 +
  	for x in images/*.jpg; do \
--		$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/images ; \
-+		$(INSTALL) -m 644 $$x $(DESTDIR)$(DOCSDIR)/images ; \
+-		$(INSTALL) -m 644 $$x "$(DESTDIR)$(ASTDATADIR)/images" ; \
++		$(INSTALL) -m 644 $$x "$(DESTDIR)$(DOCSDIR)/images" ; \
  	done
  	$(MAKE) -C sounds install
  
@@ -52,20 +52,20 @@
  	$(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/system"
  	$(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/tmp"
  	$(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/voicemail"
-@@ -617,7 +624,7 @@
+@@ -618,7 +625,7 @@
  	@exit 1
  endif
  
 -install: badshell bininstall datafiles
 +install: badshell bininstall datafiles samples
  	@if [ -x /usr/sbin/asterisk-post-install ]; then \
- 		/usr/sbin/asterisk-post-install $(DESTDIR) . ; \
+ 		/usr/sbin/asterisk-post-install "$(DESTDIR)" . ; \
  	fi
-@@ -659,29 +666,18 @@
+@@ -660,29 +667,18 @@
  		else \
  			echo "Installing $$x" ; \
  		fi ; \
--		$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x` ; \
+-		$(INSTALL) -m 644 "$$x" "$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`" ; \
 +		$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`-dist ; \
  	done
  
@@ -73,13 +73,13 @@
  	@echo Installing other config files...
  	@for x in configs/*.sample; do \
 -		dst="$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`" ;	\
--		if [ -f $${dst} ]; then \
+-		if [ -f "$${dst}" ]; then \
 -			if [ "$(OVERWRITE)" = "y" ]; then \
--				if cmp -s $${dst} $$x ; then \
+-				if cmp -s "$${dst}" "$$x" ; then \
 -					echo "Config file $$x is unchanged"; \
 -					continue; \
 -				fi ; \
--				mv -f $${dst} $${dst}.old ; \
+-				mv -f "$${dst}" "$${dst}.old" ; \
 -			else \
 -				echo "Skipping config file $$x"; \
 -				continue; \
@@ -89,18 +89,18 @@
 +			$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`; \
  		fi ; \
 -		echo "Installing file $$x"; \
--		$(INSTALL) -m 644 $$x $${dst} ;\
+-		$(INSTALL) -m 644 "$$x" "$${dst}" ;\
  	done
 -	if [ "$(OVERWRITE)" = "y" ]; then \
 +	@if true; then \
  		echo "Updating asterisk.conf" ; \
  		sed -e 's|^astetcdir.*$$|astetcdir => $(ASTETCDIR)|' \
  			-e 's|^astmoddir.*$$|astmoddir => $(MODULES_DIR)|' \
-@@ -695,6 +691,7 @@
+@@ -696,6 +692,7 @@
  			-e 's|^astlogdir.*$$|astlogdir => $(ASTLOGDIR)|' \
- 			$(DESTDIR)$(ASTCONFPATH) > $(DESTDIR)$(ASTCONFPATH).tmp ; \
- 		$(INSTALL) -m 644 $(DESTDIR)$(ASTCONFPATH).tmp $(DESTDIR)$(ASTCONFPATH) ; \
-+		$(INSTALL) -m 644 $(DESTDIR)$(ASTCONFPATH).tmp $(DESTDIR)$(ASTCONFPATH)-dist ; \
- 		rm -f $(DESTDIR)$(ASTCONFPATH).tmp ; \
+ 			"$(DESTDIR)$(ASTCONFPATH)" > "$(DESTDIR)$(ASTCONFPATH).tmp" ; \
+ 		$(INSTALL) -m 644 "$(DESTDIR)$(ASTCONFPATH).tmp" "$(DESTDIR)$(ASTCONFPATH)" ; \
++		$(INSTALL) -m 644 "$(DESTDIR)$(ASTCONFPATH).tmp" "$(DESTDIR)$(ASTCONFPATH)-dist" ; \
+ 		rm -f "$(DESTDIR)$(ASTCONFPATH).tmp" ; \
  	fi ; \
- 	$(INSTALL) -d $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
+ 	$(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX"
diff --git a/net/asterisk10/pkg-plist b/net/asterisk10/pkg-plist
index 2e43c8356472..fdeed8490636 100644
--- a/net/asterisk10/pkg-plist
+++ b/net/asterisk10/pkg-plist
@@ -570,6 +570,7 @@ lib/asterisk/modules/codec_g726.so
 %%WITH_GSM%%lib/asterisk/modules/codec_gsm.so
 %%WITH_ILBC%%lib/asterisk/modules/codec_ilbc.so
 lib/asterisk/modules/codec_lpc10.so
+lib/asterisk/modules/codec_resample.so
 lib/asterisk/modules/codec_speex.so
 lib/asterisk/modules/codec_ulaw.so
 lib/asterisk/modules/format_g723.so
@@ -667,6 +668,7 @@ share/asterisk/phoneprov/000000000000.cfg
 share/asterisk/phoneprov/polycom.xml
 share/asterisk/phoneprov/polycom_line.xml
 share/asterisk/phoneprov/snom-mac.xml
+share/asterisk/sounds/en/.asterisk-core-sounds-en-gsm-1.4.21
 share/asterisk/sounds/en/CHANGES-asterisk-core-en-1.4.21
 share/asterisk/sounds/en/CREDITS-asterisk-core-en-1.4.21
 share/asterisk/sounds/en/LICENSE-asterisk-core-en-1.4.21
@@ -1124,7 +1126,6 @@ share/asterisk/sounds/en/vm-undeleted.gsm
 share/asterisk/sounds/en/vm-unknown-caller.gsm
 share/asterisk/sounds/en/vm-whichbox.gsm
 share/asterisk/sounds/en/vm-youhave.gsm
-share/asterisk/sounds/.asterisk-core-sounds-en-gsm-1.4.21
 share/asterisk/static-http/ajamdemo.html
 share/asterisk/static-http/astman.css
 share/asterisk/static-http/astman.js
@@ -1151,10 +1152,7 @@ share/asterisk/static-http/mantest.html
 @dirrm share/asterisk/sounds/en/followme
 @dirrm share/asterisk/sounds/en/digits
 @dirrm share/asterisk/sounds/en/dictate
-@dirrm share/asterisk/sounds/en_AU
 @dirrm share/asterisk/sounds/en
-@dirrm share/asterisk/sounds/es
-@dirrm share/asterisk/sounds/fr
 @dirrm share/asterisk/sounds
 @dirrm share/asterisk/phoneprov
 @dirrm share/asterisk/moh