Update to 1.0.7.

Requested by:	many

35 files changed, 224 insertions, 119 deletions

diff --git a/net/asterisk-bristuff/Makefile b/net/asterisk-bristuff/Makefile
index 6aef3e6708bc..ce7f82474c8f 100644
--- a/net/asterisk-bristuff/Makefile
+++ b/net/asterisk-bristuff/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	asterisk
-PORTVERSION=	1.0.6
+PORTVERSION=	1.0.7
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.asterisk.org/pub/telephony/asterisk/ \
 		ftp://ftp.asterisk.org/pub/telephony/asterisk/old-releases/
 
-PATCHFILES=	${PORTNAME}-${PORTVERSION}-${BRIVER}.patch.gz
+PATCHFILES=	${PORTNAME}-1.0.6-${BRIVER}.patch.gz
 PATCH_SITES=	${MASTER_SITE_LOCAL}
 PATCH_SITE_SUBDIR=	fjoe
 PATCH_DIST_STRIP=	-p1
diff --git a/net/asterisk-bristuff/distinfo b/net/asterisk-bristuff/distinfo
index 4b14ce651b0d..7824440e6c18 100644
--- a/net/asterisk-bristuff/distinfo
+++ b/net/asterisk-bristuff/distinfo
@@ -1,4 +1,4 @@
-MD5 (asterisk-1.0.6.tar.gz) = c16efa9a64564763a0d9e3e1e9350c8d
-SIZE (asterisk-1.0.6.tar.gz) = 9589123
+MD5 (asterisk-1.0.7.tar.gz) = 4cc3c1e4a1b12e0e4c748326ad153291
+SIZE (asterisk-1.0.7.tar.gz) = 9591705
 MD5 (asterisk-1.0.6-bristuff-0.2.0-RC7j.patch.gz) = cdffa574bb65250d93abf98fb11e29f9
 SIZE (asterisk-1.0.6-bristuff-0.2.0-RC7j.patch.gz) = 40762
diff --git a/net/asterisk-bristuff/files/patch-Makefile b/net/asterisk-bristuff/files/patch-Makefile
index 312cbe904760..c509623ce46a 100644
--- a/net/asterisk-bristuff/files/patch-Makefile
+++ b/net/asterisk-bristuff/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig	Fri Jan 21 11:18:35 2005
-+++ Makefile	Mon Feb 28 00:19:37 2005
+--- Makefile.orig	Thu Apr 14 00:05:14 2005
++++ Makefile	Thu Apr 14 00:05:14 2005
 @@ -45,6 +45,15 @@
  PROC=$(shell uname -m)
  endif
@@ -225,7 +225,7 @@
  
  update: 
  	@if [ -d CVS ]; then \
-@@ -367,113 +372,88 @@
+@@ -367,125 +372,90 @@
  	fi
  
  bininstall: all
@@ -239,6 +239,7 @@
 -	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/tmp
 -	install -m 755 asterisk $(DESTDIR)$(ASTSBINDIR)/
 -	install -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
+-	install -m 755 contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/
 +	$(MKDIR) $(DESTDIR)$(MODULES_DIR)
 +	$(MKDIR) $(DESTDIR)$(ASTSBINDIR)
 +	$(MKDIR) $(DESTDIR)$(ASTETCDIR)
@@ -249,6 +250,7 @@
 +	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/tmp
 +	$(BSD_INSTALL_PROGRAM) asterisk $(DESTDIR)$(ASTSBINDIR)/
 +	$(BSD_INSTALL_SCRIPT) contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
++	$(BSD_INSTALL_SCRIPT) contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/
  	if [ ! -f $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ]; then \
 -		install -m 755 contrib/scripts/safe_asterisk $(DESTDIR)$(ASTSBINDIR)/ ;\
 +		$(BSD_INSTALL_SCRIPT) contrib/scripts/safe_asterisk $(DESTDIR)$(ASTSBINDIR)/ ;\
@@ -316,9 +318,20 @@
 -	@echo " + **Note** This requires that you have      +"
 -	@echo " + doxygen installed on your local system    +"
 -	@echo " +-------------------------------------------+"
+-	@echo " +                                           +"
+-	@echo " + ** NOTE FOR DOWNGRADING FROM CVS HEAD **  +"
+-	@echo " +                                           +"
+-	@echo " + If you are downgrading from CVS HEAD to   +"
+-	@echo " + a stable release, remember to delete      +"
+-	@echo " + everything from your asterisk modules     +"
+-	@echo " + directory (/usr/lib/asterisk/modules/)    +"
+-	@echo " + before doing a '$(MAKE) install'.            +"
+-	@echo " +                                           +"
+-	@echo " +-------------------------------------------+"
 +	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds  ; ln -sf $(ASTSPOOLDIR)/vm . )
 +	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds  ; ln -sf $(ASTSPOOLDIR)/voicemail . )
  
+ 
 -install: all datafiles bininstall
 +install: all datafiles bininstall samples
  
@@ -390,7 +403,7 @@
  	:> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm
  	for x in vm-theperson digits/1 digits/2 digits/3 digits/4 vm-isunavail; do \
  		cat $(DESTDIR)$(ASTVARLIBDIR)/sounds/$$x.gsm >> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm ; \
-@@ -486,7 +466,7 @@
+@@ -500,7 +470,7 @@
  	@[ -d $(DESTDIR)$(HTTPDIR)/html ] || ( echo "No http directory" && exit 1 )
  	@[ -d $(DESTDIR)$(HTTPDIR)/cgi-bin ] || ( echo "No cgi-bin directory" && exit 1 )
  	install -m 4755 -o root -g root contrib/scripts/vmail.cgi $(DESTDIR)$(HTTPDIR)/cgi-bin/vmail.cgi
@@ -399,7 +412,7 @@
  	for x in images/*.gif; do \
  		install -m 644 $$x $(DESTDIR)$(HTTPDIR)/html/_asterisk/; \
  	done
-@@ -506,10 +486,10 @@
+@@ -520,10 +490,10 @@
  
  __rpm: _version
  	rm -rf /tmp/asterisk ; \
diff --git a/net/asterisk-bristuff/files/patch-codecs::Makefile b/net/asterisk-bristuff/files/patch-codecs::Makefile
index 353c6dd1e62e..325e590423a2 100644
--- a/net/asterisk-bristuff/files/patch-codecs::Makefile
+++ b/net/asterisk-bristuff/files/patch-codecs::Makefile
@@ -1,12 +1,12 @@
---- codecs/Makefile.orig	Thu Jan 13 10:22:07 2005
-+++ codecs/Makefile	Sun Feb 27 23:53:30 2005
-@@ -17,24 +17,23 @@
+--- codecs/Makefile.orig	Thu Mar 17 20:43:51 2005
++++ codecs/Makefile	Thu Apr 14 00:09:04 2005
+@@ -17,25 +17,23 @@
  # g723.1b)
  #
  #MODG723=codec_g723_1.so codec_g723_1b.so
 -MODG723=$(shell [ -f g723.1/coder.c ] && echo "codec_g723_1.so")
 -MODG723+=$(shell [ -f g723.1b/coder2.c ] && echo "codec_g723_1b.so")
--MODSPEEX=$(shell [ -f /usr/include/speex.h ] || [ -f /usr/local/include/speex.h ] || [ -f /usr/local/include/speex/speex.h ] && echo "codec_speex.so")
+-MODSPEEX=$(shell [ -f /usr/include/speex.h ] || [ -f /usr/include/speex/speex.h ] || [ -f /usr/local/include/speex.h ] || [ -f /usr/local/include/speex/speex.h ] && echo "codec_speex.so")
 -MODILBC=$(shell [ -f ilbc/iLBC_decode.h ] && echo "codec_ilbc.so")
 +MODG723=codec_g723_1_dummy.so
 +MODG729=codec_g729_dummy.so
@@ -15,6 +15,7 @@
  CFLAGS+=-fPIC
 -CFLAGS+=$(shell [ -f /usr/local/include/speex.h ] && echo "-I/usr/local/include")
 -CFLAGS+=$(shell [ -f /usr/local/include/speex/speex.h ] && echo "-I/usr/local/include/speex")
+-CFLAGS+=$(shell [ -f /usr/include/speex/speex.h ] && echo "-I/usr/include/speex")
 +CFLAGS+=-I$(LOCALBASE)/include
  
  LIBG723=g723.1/libg723.a
@@ -32,7 +33,7 @@
          codec_adpcm.so codec_ulaw.so codec_alaw.so codec_a_mu.so \
  	codec_g726.so
  
-@@ -92,7 +91,7 @@
+@@ -93,7 +91,7 @@
  endif
  
  install: all
diff --git a/net/asterisk-bristuff/pkg-plist b/net/asterisk-bristuff/pkg-plist
index 7cc3218bde84..d79b0ca154a8 100644
--- a/net/asterisk-bristuff/pkg-plist
+++ b/net/asterisk-bristuff/pkg-plist
@@ -300,6 +300,7 @@ lib/asterisk/modules/res_musiconhold.so
 sbin/asterisk
 sbin/astgenkey
 sbin/astman
+sbin/autosupport
 sbin/safe_asterisk
 %%DATADIR%%/agi-bin/agi-test.agi
 %%DATADIR%%/agi-bin/eagi-sphinx-test
@@ -431,8 +432,8 @@ sbin/safe_asterisk
 %%DATADIR%%/sounds/digits/tomorrow.gsm
 %%DATADIR%%/sounds/digits/yesterday.gsm
 %%DATADIR%%/sounds/dir-instr.gsm
-%%DATADIR%%/sounds/dir-intro.gsm
 %%DATADIR%%/sounds/dir-intro-fn.gsm
+%%DATADIR%%/sounds/dir-intro.gsm
 %%DATADIR%%/sounds/dir-nomatch.gsm
 %%DATADIR%%/sounds/dir-nomore.gsm
 %%DATADIR%%/sounds/invalid.gsm
@@ -549,8 +550,8 @@ sbin/safe_asterisk
 %%DATADIR%%/sounds/vm-from.gsm
 %%DATADIR%%/sounds/vm-goodbye.gsm
 %%DATADIR%%/sounds/vm-helpexit.gsm
-%%DATADIR%%/sounds/vm-incorrect.gsm
 %%DATADIR%%/sounds/vm-incorrect-mailbox.gsm
+%%DATADIR%%/sounds/vm-incorrect.gsm
 %%DATADIR%%/sounds/vm-instructions.gsm
 %%DATADIR%%/sounds/vm-intro.gsm
 %%DATADIR%%/sounds/vm-isonphone.gsm
@@ -590,8 +591,8 @@ sbin/safe_asterisk
 %%DATADIR%%/sounds/vm-saved.gsm
 %%DATADIR%%/sounds/vm-savedto.gsm
 %%DATADIR%%/sounds/vm-savefolder.gsm
-%%DATADIR%%/sounds/vm-saveoper.gsm
 %%DATADIR%%/sounds/vm-savemessage.gsm
+%%DATADIR%%/sounds/vm-saveoper.gsm
 %%DATADIR%%/sounds/vm-sorry.gsm
 %%DATADIR%%/sounds/vm-star-cancel.gsm
 %%DATADIR%%/sounds/vm-starmain.gsm
diff --git a/net/asterisk-devel/Makefile b/net/asterisk-devel/Makefile
index 6aef3e6708bc..ce7f82474c8f 100644
--- a/net/asterisk-devel/Makefile
+++ b/net/asterisk-devel/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	asterisk
-PORTVERSION=	1.0.6
+PORTVERSION=	1.0.7
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.asterisk.org/pub/telephony/asterisk/ \
 		ftp://ftp.asterisk.org/pub/telephony/asterisk/old-releases/
 
-PATCHFILES=	${PORTNAME}-${PORTVERSION}-${BRIVER}.patch.gz
+PATCHFILES=	${PORTNAME}-1.0.6-${BRIVER}.patch.gz
 PATCH_SITES=	${MASTER_SITE_LOCAL}
 PATCH_SITE_SUBDIR=	fjoe
 PATCH_DIST_STRIP=	-p1
diff --git a/net/asterisk-devel/distinfo b/net/asterisk-devel/distinfo
index 4b14ce651b0d..7824440e6c18 100644
--- a/net/asterisk-devel/distinfo
+++ b/net/asterisk-devel/distinfo
@@ -1,4 +1,4 @@
-MD5 (asterisk-1.0.6.tar.gz) = c16efa9a64564763a0d9e3e1e9350c8d
-SIZE (asterisk-1.0.6.tar.gz) = 9589123
+MD5 (asterisk-1.0.7.tar.gz) = 4cc3c1e4a1b12e0e4c748326ad153291
+SIZE (asterisk-1.0.7.tar.gz) = 9591705
 MD5 (asterisk-1.0.6-bristuff-0.2.0-RC7j.patch.gz) = cdffa574bb65250d93abf98fb11e29f9
 SIZE (asterisk-1.0.6-bristuff-0.2.0-RC7j.patch.gz) = 40762
diff --git a/net/asterisk-devel/files/patch-Makefile b/net/asterisk-devel/files/patch-Makefile
index 312cbe904760..c509623ce46a 100644
--- a/net/asterisk-devel/files/patch-Makefile
+++ b/net/asterisk-devel/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig	Fri Jan 21 11:18:35 2005
-+++ Makefile	Mon Feb 28 00:19:37 2005
+--- Makefile.orig	Thu Apr 14 00:05:14 2005
++++ Makefile	Thu Apr 14 00:05:14 2005
 @@ -45,6 +45,15 @@
  PROC=$(shell uname -m)
  endif
@@ -225,7 +225,7 @@
  
  update: 
  	@if [ -d CVS ]; then \
-@@ -367,113 +372,88 @@
+@@ -367,125 +372,90 @@
  	fi
  
  bininstall: all
@@ -239,6 +239,7 @@
 -	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/tmp
 -	install -m 755 asterisk $(DESTDIR)$(ASTSBINDIR)/
 -	install -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
+-	install -m 755 contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/
 +	$(MKDIR) $(DESTDIR)$(MODULES_DIR)
 +	$(MKDIR) $(DESTDIR)$(ASTSBINDIR)
 +	$(MKDIR) $(DESTDIR)$(ASTETCDIR)
@@ -249,6 +250,7 @@
 +	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/tmp
 +	$(BSD_INSTALL_PROGRAM) asterisk $(DESTDIR)$(ASTSBINDIR)/
 +	$(BSD_INSTALL_SCRIPT) contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
++	$(BSD_INSTALL_SCRIPT) contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/
  	if [ ! -f $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ]; then \
 -		install -m 755 contrib/scripts/safe_asterisk $(DESTDIR)$(ASTSBINDIR)/ ;\
 +		$(BSD_INSTALL_SCRIPT) contrib/scripts/safe_asterisk $(DESTDIR)$(ASTSBINDIR)/ ;\
@@ -316,9 +318,20 @@
 -	@echo " + **Note** This requires that you have      +"
 -	@echo " + doxygen installed on your local system    +"
 -	@echo " +-------------------------------------------+"
+-	@echo " +                                           +"
+-	@echo " + ** NOTE FOR DOWNGRADING FROM CVS HEAD **  +"
+-	@echo " +                                           +"
+-	@echo " + If you are downgrading from CVS HEAD to   +"
+-	@echo " + a stable release, remember to delete      +"
+-	@echo " + everything from your asterisk modules     +"
+-	@echo " + directory (/usr/lib/asterisk/modules/)    +"
+-	@echo " + before doing a '$(MAKE) install'.            +"
+-	@echo " +                                           +"
+-	@echo " +-------------------------------------------+"
 +	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds  ; ln -sf $(ASTSPOOLDIR)/vm . )
 +	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds  ; ln -sf $(ASTSPOOLDIR)/voicemail . )
  
+ 
 -install: all datafiles bininstall
 +install: all datafiles bininstall samples
  
@@ -390,7 +403,7 @@
  	:> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm
  	for x in vm-theperson digits/1 digits/2 digits/3 digits/4 vm-isunavail; do \
  		cat $(DESTDIR)$(ASTVARLIBDIR)/sounds/$$x.gsm >> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm ; \
-@@ -486,7 +466,7 @@
+@@ -500,7 +470,7 @@
  	@[ -d $(DESTDIR)$(HTTPDIR)/html ] || ( echo "No http directory" && exit 1 )
  	@[ -d $(DESTDIR)$(HTTPDIR)/cgi-bin ] || ( echo "No cgi-bin directory" && exit 1 )
  	install -m 4755 -o root -g root contrib/scripts/vmail.cgi $(DESTDIR)$(HTTPDIR)/cgi-bin/vmail.cgi
@@ -399,7 +412,7 @@
  	for x in images/*.gif; do \
  		install -m 644 $$x $(DESTDIR)$(HTTPDIR)/html/_asterisk/; \
  	done
-@@ -506,10 +486,10 @@
+@@ -520,10 +490,10 @@
  
  __rpm: _version
  	rm -rf /tmp/asterisk ; \
diff --git a/net/asterisk-devel/files/patch-codecs::Makefile b/net/asterisk-devel/files/patch-codecs::Makefile
index 353c6dd1e62e..325e590423a2 100644
--- a/net/asterisk-devel/files/patch-codecs::Makefile
+++ b/net/asterisk-devel/files/patch-codecs::Makefile
@@ -1,12 +1,12 @@
---- codecs/Makefile.orig	Thu Jan 13 10:22:07 2005
-+++ codecs/Makefile	Sun Feb 27 23:53:30 2005
-@@ -17,24 +17,23 @@
+--- codecs/Makefile.orig	Thu Mar 17 20:43:51 2005
++++ codecs/Makefile	Thu Apr 14 00:09:04 2005
+@@ -17,25 +17,23 @@
  # g723.1b)
  #
  #MODG723=codec_g723_1.so codec_g723_1b.so
 -MODG723=$(shell [ -f g723.1/coder.c ] && echo "codec_g723_1.so")
 -MODG723+=$(shell [ -f g723.1b/coder2.c ] && echo "codec_g723_1b.so")
--MODSPEEX=$(shell [ -f /usr/include/speex.h ] || [ -f /usr/local/include/speex.h ] || [ -f /usr/local/include/speex/speex.h ] && echo "codec_speex.so")
+-MODSPEEX=$(shell [ -f /usr/include/speex.h ] || [ -f /usr/include/speex/speex.h ] || [ -f /usr/local/include/speex.h ] || [ -f /usr/local/include/speex/speex.h ] && echo "codec_speex.so")
 -MODILBC=$(shell [ -f ilbc/iLBC_decode.h ] && echo "codec_ilbc.so")
 +MODG723=codec_g723_1_dummy.so
 +MODG729=codec_g729_dummy.so
@@ -15,6 +15,7 @@
  CFLAGS+=-fPIC
 -CFLAGS+=$(shell [ -f /usr/local/include/speex.h ] && echo "-I/usr/local/include")
 -CFLAGS+=$(shell [ -f /usr/local/include/speex/speex.h ] && echo "-I/usr/local/include/speex")
+-CFLAGS+=$(shell [ -f /usr/include/speex/speex.h ] && echo "-I/usr/include/speex")
 +CFLAGS+=-I$(LOCALBASE)/include
  
  LIBG723=g723.1/libg723.a
@@ -32,7 +33,7 @@
          codec_adpcm.so codec_ulaw.so codec_alaw.so codec_a_mu.so \
  	codec_g726.so
  
-@@ -92,7 +91,7 @@
+@@ -93,7 +91,7 @@
  endif
  
  install: all
diff --git a/net/asterisk-devel/pkg-plist b/net/asterisk-devel/pkg-plist
index 7cc3218bde84..d79b0ca154a8 100644
--- a/net/asterisk-devel/pkg-plist
+++ b/net/asterisk-devel/pkg-plist
@@ -300,6 +300,7 @@ lib/asterisk/modules/res_musiconhold.so
 sbin/asterisk
 sbin/astgenkey
 sbin/astman
+sbin/autosupport
 sbin/safe_asterisk
 %%DATADIR%%/agi-bin/agi-test.agi
 %%DATADIR%%/agi-bin/eagi-sphinx-test
@@ -431,8 +432,8 @@ sbin/safe_asterisk
 %%DATADIR%%/sounds/digits/tomorrow.gsm
 %%DATADIR%%/sounds/digits/yesterday.gsm
 %%DATADIR%%/sounds/dir-instr.gsm
-%%DATADIR%%/sounds/dir-intro.gsm
 %%DATADIR%%/sounds/dir-intro-fn.gsm
+%%DATADIR%%/sounds/dir-intro.gsm
 %%DATADIR%%/sounds/dir-nomatch.gsm
 %%DATADIR%%/sounds/dir-nomore.gsm
 %%DATADIR%%/sounds/invalid.gsm
@@ -549,8 +550,8 @@ sbin/safe_asterisk
 %%DATADIR%%/sounds/vm-from.gsm
 %%DATADIR%%/sounds/vm-goodbye.gsm
 %%DATADIR%%/sounds/vm-helpexit.gsm
-%%DATADIR%%/sounds/vm-incorrect.gsm
 %%DATADIR%%/sounds/vm-incorrect-mailbox.gsm
+%%DATADIR%%/sounds/vm-incorrect.gsm
 %%DATADIR%%/sounds/vm-instructions.gsm
 %%DATADIR%%/sounds/vm-intro.gsm
 %%DATADIR%%/sounds/vm-isonphone.gsm
@@ -590,8 +591,8 @@ sbin/safe_asterisk
 %%DATADIR%%/sounds/vm-saved.gsm
 %%DATADIR%%/sounds/vm-savedto.gsm
 %%DATADIR%%/sounds/vm-savefolder.gsm
-%%DATADIR%%/sounds/vm-saveoper.gsm
 %%DATADIR%%/sounds/vm-savemessage.gsm
+%%DATADIR%%/sounds/vm-saveoper.gsm
 %%DATADIR%%/sounds/vm-sorry.gsm
 %%DATADIR%%/sounds/vm-star-cancel.gsm
 %%DATADIR%%/sounds/vm-starmain.gsm
diff --git a/net/asterisk/Makefile b/net/asterisk/Makefile
index 6aef3e6708bc..ce7f82474c8f 100644
--- a/net/asterisk/Makefile
+++ b/net/asterisk/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	asterisk
-PORTVERSION=	1.0.6
+PORTVERSION=	1.0.7
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.asterisk.org/pub/telephony/asterisk/ \
 		ftp://ftp.asterisk.org/pub/telephony/asterisk/old-releases/
 
-PATCHFILES=	${PORTNAME}-${PORTVERSION}-${BRIVER}.patch.gz
+PATCHFILES=	${PORTNAME}-1.0.6-${BRIVER}.patch.gz
 PATCH_SITES=	${MASTER_SITE_LOCAL}
 PATCH_SITE_SUBDIR=	fjoe
 PATCH_DIST_STRIP=	-p1
diff --git a/net/asterisk/distinfo b/net/asterisk/distinfo
index 4b14ce651b0d..7824440e6c18 100644
--- a/net/asterisk/distinfo
+++ b/net/asterisk/distinfo
@@ -1,4 +1,4 @@
-MD5 (asterisk-1.0.6.tar.gz) = c16efa9a64564763a0d9e3e1e9350c8d
-SIZE (asterisk-1.0.6.tar.gz) = 9589123
+MD5 (asterisk-1.0.7.tar.gz) = 4cc3c1e4a1b12e0e4c748326ad153291
+SIZE (asterisk-1.0.7.tar.gz) = 9591705
 MD5 (asterisk-1.0.6-bristuff-0.2.0-RC7j.patch.gz) = cdffa574bb65250d93abf98fb11e29f9
 SIZE (asterisk-1.0.6-bristuff-0.2.0-RC7j.patch.gz) = 40762
diff --git a/net/asterisk/files/patch-Makefile b/net/asterisk/files/patch-Makefile
index 312cbe904760..c509623ce46a 100644
--- a/net/asterisk/files/patch-Makefile
+++ b/net/asterisk/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig	Fri Jan 21 11:18:35 2005
-+++ Makefile	Mon Feb 28 00:19:37 2005
+--- Makefile.orig	Thu Apr 14 00:05:14 2005
++++ Makefile	Thu Apr 14 00:05:14 2005
 @@ -45,6 +45,15 @@
  PROC=$(shell uname -m)
  endif
@@ -225,7 +225,7 @@
  
  update: 
  	@if [ -d CVS ]; then \
-@@ -367,113 +372,88 @@
+@@ -367,125 +372,90 @@
  	fi
  
  bininstall: all
@@ -239,6 +239,7 @@
 -	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/tmp
 -	install -m 755 asterisk $(DESTDIR)$(ASTSBINDIR)/
 -	install -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
+-	install -m 755 contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/
 +	$(MKDIR) $(DESTDIR)$(MODULES_DIR)
 +	$(MKDIR) $(DESTDIR)$(ASTSBINDIR)
 +	$(MKDIR) $(DESTDIR)$(ASTETCDIR)
@@ -249,6 +250,7 @@
 +	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/tmp
 +	$(BSD_INSTALL_PROGRAM) asterisk $(DESTDIR)$(ASTSBINDIR)/
 +	$(BSD_INSTALL_SCRIPT) contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
++	$(BSD_INSTALL_SCRIPT) contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/
  	if [ ! -f $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ]; then \
 -		install -m 755 contrib/scripts/safe_asterisk $(DESTDIR)$(ASTSBINDIR)/ ;\
 +		$(BSD_INSTALL_SCRIPT) contrib/scripts/safe_asterisk $(DESTDIR)$(ASTSBINDIR)/ ;\
@@ -316,9 +318,20 @@
 -	@echo " + **Note** This requires that you have      +"
 -	@echo " + doxygen installed on your local system    +"
 -	@echo " +-------------------------------------------+"
+-	@echo " +                                           +"
+-	@echo " + ** NOTE FOR DOWNGRADING FROM CVS HEAD **  +"
+-	@echo " +                                           +"
+-	@echo " + If you are downgrading from CVS HEAD to   +"
+-	@echo " + a stable release, remember to delete      +"
+-	@echo " + everything from your asterisk modules     +"
+-	@echo " + directory (/usr/lib/asterisk/modules/)    +"
+-	@echo " + before doing a '$(MAKE) install'.            +"
+-	@echo " +                                           +"
+-	@echo " +-------------------------------------------+"
 +	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds  ; ln -sf $(ASTSPOOLDIR)/vm . )
 +	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds  ; ln -sf $(ASTSPOOLDIR)/voicemail . )
  
+ 
 -install: all datafiles bininstall
 +install: all datafiles bininstall samples
  
@@ -390,7 +403,7 @@
  	:> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm
  	for x in vm-theperson digits/1 digits/2 digits/3 digits/4 vm-isunavail; do \
  		cat $(DESTDIR)$(ASTVARLIBDIR)/sounds/$$x.gsm >> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm ; \
-@@ -486,7 +466,7 @@
+@@ -500,7 +470,7 @@
  	@[ -d $(DESTDIR)$(HTTPDIR)/html ] || ( echo "No http directory" && exit 1 )
  	@[ -d $(DESTDIR)$(HTTPDIR)/cgi-bin ] || ( echo "No cgi-bin directory" && exit 1 )
  	install -m 4755 -o root -g root contrib/scripts/vmail.cgi $(DESTDIR)$(HTTPDIR)/cgi-bin/vmail.cgi
@@ -399,7 +412,7 @@
  	for x in images/*.gif; do \
  		install -m 644 $$x $(DESTDIR)$(HTTPDIR)/html/_asterisk/; \
  	done
-@@ -506,10 +486,10 @@
+@@ -520,10 +490,10 @@
  
  __rpm: _version
  	rm -rf /tmp/asterisk ; \
diff --git a/net/asterisk/files/patch-codecs::Makefile b/net/asterisk/files/patch-codecs::Makefile
index 353c6dd1e62e..325e590423a2 100644
--- a/net/asterisk/files/patch-codecs::Makefile
+++ b/net/asterisk/files/patch-codecs::Makefile
@@ -1,12 +1,12 @@
---- codecs/Makefile.orig	Thu Jan 13 10:22:07 2005
-+++ codecs/Makefile	Sun Feb 27 23:53:30 2005
-@@ -17,24 +17,23 @@
+--- codecs/Makefile.orig	Thu Mar 17 20:43:51 2005
++++ codecs/Makefile	Thu Apr 14 00:09:04 2005
+@@ -17,25 +17,23 @@
  # g723.1b)
  #
  #MODG723=codec_g723_1.so codec_g723_1b.so
 -MODG723=$(shell [ -f g723.1/coder.c ] && echo "codec_g723_1.so")
 -MODG723+=$(shell [ -f g723.1b/coder2.c ] && echo "codec_g723_1b.so")
--MODSPEEX=$(shell [ -f /usr/include/speex.h ] || [ -f /usr/local/include/speex.h ] || [ -f /usr/local/include/speex/speex.h ] && echo "codec_speex.so")
+-MODSPEEX=$(shell [ -f /usr/include/speex.h ] || [ -f /usr/include/speex/speex.h ] || [ -f /usr/local/include/speex.h ] || [ -f /usr/local/include/speex/speex.h ] && echo "codec_speex.so")
 -MODILBC=$(shell [ -f ilbc/iLBC_decode.h ] && echo "codec_ilbc.so")
 +MODG723=codec_g723_1_dummy.so
 +MODG729=codec_g729_dummy.so
@@ -15,6 +15,7 @@
  CFLAGS+=-fPIC
 -CFLAGS+=$(shell [ -f /usr/local/include/speex.h ] && echo "-I/usr/local/include")
 -CFLAGS+=$(shell [ -f /usr/local/include/speex/speex.h ] && echo "-I/usr/local/include/speex")
+-CFLAGS+=$(shell [ -f /usr/include/speex/speex.h ] && echo "-I/usr/include/speex")
 +CFLAGS+=-I$(LOCALBASE)/include
  
  LIBG723=g723.1/libg723.a
@@ -32,7 +33,7 @@
          codec_adpcm.so codec_ulaw.so codec_alaw.so codec_a_mu.so \
  	codec_g726.so
  
-@@ -92,7 +91,7 @@
+@@ -93,7 +91,7 @@
  endif
  
  install: all
diff --git a/net/asterisk/pkg-plist b/net/asterisk/pkg-plist
index 7cc3218bde84..d79b0ca154a8 100644
--- a/net/asterisk/pkg-plist
+++ b/net/asterisk/pkg-plist
@@ -300,6 +300,7 @@ lib/asterisk/modules/res_musiconhold.so
 sbin/asterisk
 sbin/astgenkey
 sbin/astman
+sbin/autosupport
 sbin/safe_asterisk
 %%DATADIR%%/agi-bin/agi-test.agi
 %%DATADIR%%/agi-bin/eagi-sphinx-test
@@ -431,8 +432,8 @@ sbin/safe_asterisk
 %%DATADIR%%/sounds/digits/tomorrow.gsm
 %%DATADIR%%/sounds/digits/yesterday.gsm
 %%DATADIR%%/sounds/dir-instr.gsm
-%%DATADIR%%/sounds/dir-intro.gsm
 %%DATADIR%%/sounds/dir-intro-fn.gsm
+%%DATADIR%%/sounds/dir-intro.gsm
 %%DATADIR%%/sounds/dir-nomatch.gsm
 %%DATADIR%%/sounds/dir-nomore.gsm
 %%DATADIR%%/sounds/invalid.gsm
@@ -549,8 +550,8 @@ sbin/safe_asterisk
 %%DATADIR%%/sounds/vm-from.gsm
 %%DATADIR%%/sounds/vm-goodbye.gsm
 %%DATADIR%%/sounds/vm-helpexit.gsm
-%%DATADIR%%/sounds/vm-incorrect.gsm
 %%DATADIR%%/sounds/vm-incorrect-mailbox.gsm
+%%DATADIR%%/sounds/vm-incorrect.gsm
 %%DATADIR%%/sounds/vm-instructions.gsm
 %%DATADIR%%/sounds/vm-intro.gsm
 %%DATADIR%%/sounds/vm-isonphone.gsm
@@ -590,8 +591,8 @@ sbin/safe_asterisk
 %%DATADIR%%/sounds/vm-saved.gsm
 %%DATADIR%%/sounds/vm-savedto.gsm
 %%DATADIR%%/sounds/vm-savefolder.gsm
-%%DATADIR%%/sounds/vm-saveoper.gsm
 %%DATADIR%%/sounds/vm-savemessage.gsm
+%%DATADIR%%/sounds/vm-saveoper.gsm
 %%DATADIR%%/sounds/vm-sorry.gsm
 %%DATADIR%%/sounds/vm-star-cancel.gsm
 %%DATADIR%%/sounds/vm-starmain.gsm
diff --git a/net/asterisk10/Makefile b/net/asterisk10/Makefile
index 6aef3e6708bc..ce7f82474c8f 100644
--- a/net/asterisk10/Makefile
+++ b/net/asterisk10/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	asterisk
-PORTVERSION=	1.0.6
+PORTVERSION=	1.0.7
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.asterisk.org/pub/telephony/asterisk/ \
 		ftp://ftp.asterisk.org/pub/telephony/asterisk/old-releases/
 
-PATCHFILES=	${PORTNAME}-${PORTVERSION}-${BRIVER}.patch.gz
+PATCHFILES=	${PORTNAME}-1.0.6-${BRIVER}.patch.gz
 PATCH_SITES=	${MASTER_SITE_LOCAL}
 PATCH_SITE_SUBDIR=	fjoe
 PATCH_DIST_STRIP=	-p1
diff --git a/net/asterisk10/distinfo b/net/asterisk10/distinfo
index 4b14ce651b0d..7824440e6c18 100644
--- a/net/asterisk10/distinfo
+++ b/net/asterisk10/distinfo
@@ -1,4 +1,4 @@
-MD5 (asterisk-1.0.6.tar.gz) = c16efa9a64564763a0d9e3e1e9350c8d
-SIZE (asterisk-1.0.6.tar.gz) = 9589123
+MD5 (asterisk-1.0.7.tar.gz) = 4cc3c1e4a1b12e0e4c748326ad153291
+SIZE (asterisk-1.0.7.tar.gz) = 9591705
 MD5 (asterisk-1.0.6-bristuff-0.2.0-RC7j.patch.gz) = cdffa574bb65250d93abf98fb11e29f9
 SIZE (asterisk-1.0.6-bristuff-0.2.0-RC7j.patch.gz) = 40762
diff --git a/net/asterisk10/files/patch-Makefile b/net/asterisk10/files/patch-Makefile
index 312cbe904760..c509623ce46a 100644
--- a/net/asterisk10/files/patch-Makefile
+++ b/net/asterisk10/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig	Fri Jan 21 11:18:35 2005
-+++ Makefile	Mon Feb 28 00:19:37 2005
+--- Makefile.orig	Thu Apr 14 00:05:14 2005
++++ Makefile	Thu Apr 14 00:05:14 2005
 @@ -45,6 +45,15 @@
  PROC=$(shell uname -m)
  endif
@@ -225,7 +225,7 @@
  
  update: 
  	@if [ -d CVS ]; then \
-@@ -367,113 +372,88 @@
+@@ -367,125 +372,90 @@
  	fi
  
  bininstall: all
@@ -239,6 +239,7 @@
 -	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/tmp
 -	install -m 755 asterisk $(DESTDIR)$(ASTSBINDIR)/
 -	install -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
+-	install -m 755 contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/
 +	$(MKDIR) $(DESTDIR)$(MODULES_DIR)
 +	$(MKDIR) $(DESTDIR)$(ASTSBINDIR)
 +	$(MKDIR) $(DESTDIR)$(ASTETCDIR)
@@ -249,6 +250,7 @@
 +	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/tmp
 +	$(BSD_INSTALL_PROGRAM) asterisk $(DESTDIR)$(ASTSBINDIR)/
 +	$(BSD_INSTALL_SCRIPT) contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
++	$(BSD_INSTALL_SCRIPT) contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/
  	if [ ! -f $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ]; then \
 -		install -m 755 contrib/scripts/safe_asterisk $(DESTDIR)$(ASTSBINDIR)/ ;\
 +		$(BSD_INSTALL_SCRIPT) contrib/scripts/safe_asterisk $(DESTDIR)$(ASTSBINDIR)/ ;\
@@ -316,9 +318,20 @@
 -	@echo " + **Note** This requires that you have      +"
 -	@echo " + doxygen installed on your local system    +"
 -	@echo " +-------------------------------------------+"
+-	@echo " +                                           +"
+-	@echo " + ** NOTE FOR DOWNGRADING FROM CVS HEAD **  +"
+-	@echo " +                                           +"
+-	@echo " + If you are downgrading from CVS HEAD to   +"
+-	@echo " + a stable release, remember to delete      +"
+-	@echo " + everything from your asterisk modules     +"
+-	@echo " + directory (/usr/lib/asterisk/modules/)    +"
+-	@echo " + before doing a '$(MAKE) install'.            +"
+-	@echo " +                                           +"
+-	@echo " +-------------------------------------------+"
 +	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds  ; ln -sf $(ASTSPOOLDIR)/vm . )
 +	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds  ; ln -sf $(ASTSPOOLDIR)/voicemail . )
  
+ 
 -install: all datafiles bininstall
 +install: all datafiles bininstall samples
  
@@ -390,7 +403,7 @@
  	:> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm
  	for x in vm-theperson digits/1 digits/2 digits/3 digits/4 vm-isunavail; do \
  		cat $(DESTDIR)$(ASTVARLIBDIR)/sounds/$$x.gsm >> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm ; \
-@@ -486,7 +466,7 @@
+@@ -500,7 +470,7 @@
  	@[ -d $(DESTDIR)$(HTTPDIR)/html ] || ( echo "No http directory" && exit 1 )
  	@[ -d $(DESTDIR)$(HTTPDIR)/cgi-bin ] || ( echo "No cgi-bin directory" && exit 1 )
  	install -m 4755 -o root -g root contrib/scripts/vmail.cgi $(DESTDIR)$(HTTPDIR)/cgi-bin/vmail.cgi
@@ -399,7 +412,7 @@
  	for x in images/*.gif; do \
  		install -m 644 $$x $(DESTDIR)$(HTTPDIR)/html/_asterisk/; \
  	done
-@@ -506,10 +486,10 @@
+@@ -520,10 +490,10 @@
  
  __rpm: _version
  	rm -rf /tmp/asterisk ; \
diff --git a/net/asterisk10/files/patch-codecs::Makefile b/net/asterisk10/files/patch-codecs::Makefile
index 353c6dd1e62e..325e590423a2 100644
--- a/net/asterisk10/files/patch-codecs::Makefile
+++ b/net/asterisk10/files/patch-codecs::Makefile
@@ -1,12 +1,12 @@
---- codecs/Makefile.orig	Thu Jan 13 10:22:07 2005
-+++ codecs/Makefile	Sun Feb 27 23:53:30 2005
-@@ -17,24 +17,23 @@
+--- codecs/Makefile.orig	Thu Mar 17 20:43:51 2005
++++ codecs/Makefile	Thu Apr 14 00:09:04 2005
+@@ -17,25 +17,23 @@
  # g723.1b)
  #
  #MODG723=codec_g723_1.so codec_g723_1b.so
 -MODG723=$(shell [ -f g723.1/coder.c ] && echo "codec_g723_1.so")
 -MODG723+=$(shell [ -f g723.1b/coder2.c ] && echo "codec_g723_1b.so")
--MODSPEEX=$(shell [ -f /usr/include/speex.h ] || [ -f /usr/local/include/speex.h ] || [ -f /usr/local/include/speex/speex.h ] && echo "codec_speex.so")
+-MODSPEEX=$(shell [ -f /usr/include/speex.h ] || [ -f /usr/include/speex/speex.h ] || [ -f /usr/local/include/speex.h ] || [ -f /usr/local/include/speex/speex.h ] && echo "codec_speex.so")
 -MODILBC=$(shell [ -f ilbc/iLBC_decode.h ] && echo "codec_ilbc.so")
 +MODG723=codec_g723_1_dummy.so
 +MODG729=codec_g729_dummy.so
@@ -15,6 +15,7 @@
  CFLAGS+=-fPIC
 -CFLAGS+=$(shell [ -f /usr/local/include/speex.h ] && echo "-I/usr/local/include")
 -CFLAGS+=$(shell [ -f /usr/local/include/speex/speex.h ] && echo "-I/usr/local/include/speex")
+-CFLAGS+=$(shell [ -f /usr/include/speex/speex.h ] && echo "-I/usr/include/speex")
 +CFLAGS+=-I$(LOCALBASE)/include
  
  LIBG723=g723.1/libg723.a
@@ -32,7 +33,7 @@
          codec_adpcm.so codec_ulaw.so codec_alaw.so codec_a_mu.so \
  	codec_g726.so
  
-@@ -92,7 +91,7 @@
+@@ -93,7 +91,7 @@
  endif
  
  install: all
diff --git a/net/asterisk10/pkg-plist b/net/asterisk10/pkg-plist
index 7cc3218bde84..d79b0ca154a8 100644
--- a/net/asterisk10/pkg-plist
+++ b/net/asterisk10/pkg-plist
@@ -300,6 +300,7 @@ lib/asterisk/modules/res_musiconhold.so
 sbin/asterisk
 sbin/astgenkey
 sbin/astman
+sbin/autosupport
 sbin/safe_asterisk
 %%DATADIR%%/agi-bin/agi-test.agi
 %%DATADIR%%/agi-bin/eagi-sphinx-test
@@ -431,8 +432,8 @@ sbin/safe_asterisk
 %%DATADIR%%/sounds/digits/tomorrow.gsm
 %%DATADIR%%/sounds/digits/yesterday.gsm
 %%DATADIR%%/sounds/dir-instr.gsm
-%%DATADIR%%/sounds/dir-intro.gsm
 %%DATADIR%%/sounds/dir-intro-fn.gsm
+%%DATADIR%%/sounds/dir-intro.gsm
 %%DATADIR%%/sounds/dir-nomatch.gsm
 %%DATADIR%%/sounds/dir-nomore.gsm
 %%DATADIR%%/sounds/invalid.gsm
@@ -549,8 +550,8 @@ sbin/safe_asterisk
 %%DATADIR%%/sounds/vm-from.gsm
 %%DATADIR%%/sounds/vm-goodbye.gsm
 %%DATADIR%%/sounds/vm-helpexit.gsm
-%%DATADIR%%/sounds/vm-incorrect.gsm
 %%DATADIR%%/sounds/vm-incorrect-mailbox.gsm
+%%DATADIR%%/sounds/vm-incorrect.gsm
 %%DATADIR%%/sounds/vm-instructions.gsm
 %%DATADIR%%/sounds/vm-intro.gsm
 %%DATADIR%%/sounds/vm-isonphone.gsm
@@ -590,8 +591,8 @@ sbin/safe_asterisk
 %%DATADIR%%/sounds/vm-saved.gsm
 %%DATADIR%%/sounds/vm-savedto.gsm
 %%DATADIR%%/sounds/vm-savefolder.gsm
-%%DATADIR%%/sounds/vm-saveoper.gsm
 %%DATADIR%%/sounds/vm-savemessage.gsm
+%%DATADIR%%/sounds/vm-saveoper.gsm
 %%DATADIR%%/sounds/vm-sorry.gsm
 %%DATADIR%%/sounds/vm-star-cancel.gsm
 %%DATADIR%%/sounds/vm-starmain.gsm
diff --git a/net/asterisk12/Makefile b/net/asterisk12/Makefile
index 6aef3e6708bc..ce7f82474c8f 100644
--- a/net/asterisk12/Makefile
+++ b/net/asterisk12/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	asterisk
-PORTVERSION=	1.0.6
+PORTVERSION=	1.0.7
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.asterisk.org/pub/telephony/asterisk/ \
 		ftp://ftp.asterisk.org/pub/telephony/asterisk/old-releases/
 
-PATCHFILES=	${PORTNAME}-${PORTVERSION}-${BRIVER}.patch.gz
+PATCHFILES=	${PORTNAME}-1.0.6-${BRIVER}.patch.gz
 PATCH_SITES=	${MASTER_SITE_LOCAL}
 PATCH_SITE_SUBDIR=	fjoe
 PATCH_DIST_STRIP=	-p1
diff --git a/net/asterisk12/distinfo b/net/asterisk12/distinfo
index 4b14ce651b0d..7824440e6c18 100644
--- a/net/asterisk12/distinfo
+++ b/net/asterisk12/distinfo
@@ -1,4 +1,4 @@
-MD5 (asterisk-1.0.6.tar.gz) = c16efa9a64564763a0d9e3e1e9350c8d
-SIZE (asterisk-1.0.6.tar.gz) = 9589123
+MD5 (asterisk-1.0.7.tar.gz) = 4cc3c1e4a1b12e0e4c748326ad153291
+SIZE (asterisk-1.0.7.tar.gz) = 9591705
 MD5 (asterisk-1.0.6-bristuff-0.2.0-RC7j.patch.gz) = cdffa574bb65250d93abf98fb11e29f9
 SIZE (asterisk-1.0.6-bristuff-0.2.0-RC7j.patch.gz) = 40762
diff --git a/net/asterisk12/files/patch-Makefile b/net/asterisk12/files/patch-Makefile
index 312cbe904760..c509623ce46a 100644
--- a/net/asterisk12/files/patch-Makefile
+++ b/net/asterisk12/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig	Fri Jan 21 11:18:35 2005
-+++ Makefile	Mon Feb 28 00:19:37 2005
+--- Makefile.orig	Thu Apr 14 00:05:14 2005
++++ Makefile	Thu Apr 14 00:05:14 2005
 @@ -45,6 +45,15 @@
  PROC=$(shell uname -m)
  endif
@@ -225,7 +225,7 @@
  
  update: 
  	@if [ -d CVS ]; then \
-@@ -367,113 +372,88 @@
+@@ -367,125 +372,90 @@
  	fi
  
  bininstall: all
@@ -239,6 +239,7 @@
 -	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/tmp
 -	install -m 755 asterisk $(DESTDIR)$(ASTSBINDIR)/
 -	install -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
+-	install -m 755 contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/
 +	$(MKDIR) $(DESTDIR)$(MODULES_DIR)
 +	$(MKDIR) $(DESTDIR)$(ASTSBINDIR)
 +	$(MKDIR) $(DESTDIR)$(ASTETCDIR)
@@ -249,6 +250,7 @@
 +	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/tmp
 +	$(BSD_INSTALL_PROGRAM) asterisk $(DESTDIR)$(ASTSBINDIR)/
 +	$(BSD_INSTALL_SCRIPT) contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
++	$(BSD_INSTALL_SCRIPT) contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/
  	if [ ! -f $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ]; then \
 -		install -m 755 contrib/scripts/safe_asterisk $(DESTDIR)$(ASTSBINDIR)/ ;\
 +		$(BSD_INSTALL_SCRIPT) contrib/scripts/safe_asterisk $(DESTDIR)$(ASTSBINDIR)/ ;\
@@ -316,9 +318,20 @@
 -	@echo " + **Note** This requires that you have      +"
 -	@echo " + doxygen installed on your local system    +"
 -	@echo " +-------------------------------------------+"
+-	@echo " +                                           +"
+-	@echo " + ** NOTE FOR DOWNGRADING FROM CVS HEAD **  +"
+-	@echo " +                                           +"
+-	@echo " + If you are downgrading from CVS HEAD to   +"
+-	@echo " + a stable release, remember to delete      +"
+-	@echo " + everything from your asterisk modules     +"
+-	@echo " + directory (/usr/lib/asterisk/modules/)    +"
+-	@echo " + before doing a '$(MAKE) install'.            +"
+-	@echo " +                                           +"
+-	@echo " +-------------------------------------------+"
 +	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds  ; ln -sf $(ASTSPOOLDIR)/vm . )
 +	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds  ; ln -sf $(ASTSPOOLDIR)/voicemail . )
  
+ 
 -install: all datafiles bininstall
 +install: all datafiles bininstall samples
  
@@ -390,7 +403,7 @@
  	:> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm
  	for x in vm-theperson digits/1 digits/2 digits/3 digits/4 vm-isunavail; do \
  		cat $(DESTDIR)$(ASTVARLIBDIR)/sounds/$$x.gsm >> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm ; \
-@@ -486,7 +466,7 @@
+@@ -500,7 +470,7 @@
  	@[ -d $(DESTDIR)$(HTTPDIR)/html ] || ( echo "No http directory" && exit 1 )
  	@[ -d $(DESTDIR)$(HTTPDIR)/cgi-bin ] || ( echo "No cgi-bin directory" && exit 1 )
  	install -m 4755 -o root -g root contrib/scripts/vmail.cgi $(DESTDIR)$(HTTPDIR)/cgi-bin/vmail.cgi
@@ -399,7 +412,7 @@
  	for x in images/*.gif; do \
  		install -m 644 $$x $(DESTDIR)$(HTTPDIR)/html/_asterisk/; \
  	done
-@@ -506,10 +486,10 @@
+@@ -520,10 +490,10 @@
  
  __rpm: _version
  	rm -rf /tmp/asterisk ; \
diff --git a/net/asterisk12/files/patch-codecs::Makefile b/net/asterisk12/files/patch-codecs::Makefile
index 353c6dd1e62e..325e590423a2 100644
--- a/net/asterisk12/files/patch-codecs::Makefile
+++ b/net/asterisk12/files/patch-codecs::Makefile
@@ -1,12 +1,12 @@
---- codecs/Makefile.orig	Thu Jan 13 10:22:07 2005
-+++ codecs/Makefile	Sun Feb 27 23:53:30 2005
-@@ -17,24 +17,23 @@
+--- codecs/Makefile.orig	Thu Mar 17 20:43:51 2005
++++ codecs/Makefile	Thu Apr 14 00:09:04 2005
+@@ -17,25 +17,23 @@
  # g723.1b)
  #
  #MODG723=codec_g723_1.so codec_g723_1b.so
 -MODG723=$(shell [ -f g723.1/coder.c ] && echo "codec_g723_1.so")
 -MODG723+=$(shell [ -f g723.1b/coder2.c ] && echo "codec_g723_1b.so")
--MODSPEEX=$(shell [ -f /usr/include/speex.h ] || [ -f /usr/local/include/speex.h ] || [ -f /usr/local/include/speex/speex.h ] && echo "codec_speex.so")
+-MODSPEEX=$(shell [ -f /usr/include/speex.h ] || [ -f /usr/include/speex/speex.h ] || [ -f /usr/local/include/speex.h ] || [ -f /usr/local/include/speex/speex.h ] && echo "codec_speex.so")
 -MODILBC=$(shell [ -f ilbc/iLBC_decode.h ] && echo "codec_ilbc.so")
 +MODG723=codec_g723_1_dummy.so
 +MODG729=codec_g729_dummy.so
@@ -15,6 +15,7 @@
  CFLAGS+=-fPIC
 -CFLAGS+=$(shell [ -f /usr/local/include/speex.h ] && echo "-I/usr/local/include")
 -CFLAGS+=$(shell [ -f /usr/local/include/speex/speex.h ] && echo "-I/usr/local/include/speex")
+-CFLAGS+=$(shell [ -f /usr/include/speex/speex.h ] && echo "-I/usr/include/speex")
 +CFLAGS+=-I$(LOCALBASE)/include
  
  LIBG723=g723.1/libg723.a
@@ -32,7 +33,7 @@
          codec_adpcm.so codec_ulaw.so codec_alaw.so codec_a_mu.so \
  	codec_g726.so
  
-@@ -92,7 +91,7 @@
+@@ -93,7 +91,7 @@
  endif
  
  install: all
diff --git a/net/asterisk12/pkg-plist b/net/asterisk12/pkg-plist
index 7cc3218bde84..d79b0ca154a8 100644
--- a/net/asterisk12/pkg-plist
+++ b/net/asterisk12/pkg-plist
@@ -300,6 +300,7 @@ lib/asterisk/modules/res_musiconhold.so
 sbin/asterisk
 sbin/astgenkey
 sbin/astman
+sbin/autosupport
 sbin/safe_asterisk
 %%DATADIR%%/agi-bin/agi-test.agi
 %%DATADIR%%/agi-bin/eagi-sphinx-test
@@ -431,8 +432,8 @@ sbin/safe_asterisk
 %%DATADIR%%/sounds/digits/tomorrow.gsm
 %%DATADIR%%/sounds/digits/yesterday.gsm
 %%DATADIR%%/sounds/dir-instr.gsm
-%%DATADIR%%/sounds/dir-intro.gsm
 %%DATADIR%%/sounds/dir-intro-fn.gsm
+%%DATADIR%%/sounds/dir-intro.gsm
 %%DATADIR%%/sounds/dir-nomatch.gsm
 %%DATADIR%%/sounds/dir-nomore.gsm
 %%DATADIR%%/sounds/invalid.gsm
@@ -549,8 +550,8 @@ sbin/safe_asterisk
 %%DATADIR%%/sounds/vm-from.gsm
 %%DATADIR%%/sounds/vm-goodbye.gsm
 %%DATADIR%%/sounds/vm-helpexit.gsm
-%%DATADIR%%/sounds/vm-incorrect.gsm
 %%DATADIR%%/sounds/vm-incorrect-mailbox.gsm
+%%DATADIR%%/sounds/vm-incorrect.gsm
 %%DATADIR%%/sounds/vm-instructions.gsm
 %%DATADIR%%/sounds/vm-intro.gsm
 %%DATADIR%%/sounds/vm-isonphone.gsm
@@ -590,8 +591,8 @@ sbin/safe_asterisk
 %%DATADIR%%/sounds/vm-saved.gsm
 %%DATADIR%%/sounds/vm-savedto.gsm
 %%DATADIR%%/sounds/vm-savefolder.gsm
-%%DATADIR%%/sounds/vm-saveoper.gsm
 %%DATADIR%%/sounds/vm-savemessage.gsm
+%%DATADIR%%/sounds/vm-saveoper.gsm
 %%DATADIR%%/sounds/vm-sorry.gsm
 %%DATADIR%%/sounds/vm-star-cancel.gsm
 %%DATADIR%%/sounds/vm-starmain.gsm
diff --git a/net/asterisk14/Makefile b/net/asterisk14/Makefile
index 6aef3e6708bc..ce7f82474c8f 100644
--- a/net/asterisk14/Makefile
+++ b/net/asterisk14/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	asterisk
-PORTVERSION=	1.0.6
+PORTVERSION=	1.0.7
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.asterisk.org/pub/telephony/asterisk/ \
 		ftp://ftp.asterisk.org/pub/telephony/asterisk/old-releases/
 
-PATCHFILES=	${PORTNAME}-${PORTVERSION}-${BRIVER}.patch.gz
+PATCHFILES=	${PORTNAME}-1.0.6-${BRIVER}.patch.gz
 PATCH_SITES=	${MASTER_SITE_LOCAL}
 PATCH_SITE_SUBDIR=	fjoe
 PATCH_DIST_STRIP=	-p1
diff --git a/net/asterisk14/distinfo b/net/asterisk14/distinfo
index 4b14ce651b0d..7824440e6c18 100644
--- a/net/asterisk14/distinfo
+++ b/net/asterisk14/distinfo
@@ -1,4 +1,4 @@
-MD5 (asterisk-1.0.6.tar.gz) = c16efa9a64564763a0d9e3e1e9350c8d
-SIZE (asterisk-1.0.6.tar.gz) = 9589123
+MD5 (asterisk-1.0.7.tar.gz) = 4cc3c1e4a1b12e0e4c748326ad153291
+SIZE (asterisk-1.0.7.tar.gz) = 9591705
 MD5 (asterisk-1.0.6-bristuff-0.2.0-RC7j.patch.gz) = cdffa574bb65250d93abf98fb11e29f9
 SIZE (asterisk-1.0.6-bristuff-0.2.0-RC7j.patch.gz) = 40762
diff --git a/net/asterisk14/files/patch-Makefile b/net/asterisk14/files/patch-Makefile
index 312cbe904760..c509623ce46a 100644
--- a/net/asterisk14/files/patch-Makefile
+++ b/net/asterisk14/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig	Fri Jan 21 11:18:35 2005
-+++ Makefile	Mon Feb 28 00:19:37 2005
+--- Makefile.orig	Thu Apr 14 00:05:14 2005
++++ Makefile	Thu Apr 14 00:05:14 2005
 @@ -45,6 +45,15 @@
  PROC=$(shell uname -m)
  endif
@@ -225,7 +225,7 @@
  
  update: 
  	@if [ -d CVS ]; then \
-@@ -367,113 +372,88 @@
+@@ -367,125 +372,90 @@
  	fi
  
  bininstall: all
@@ -239,6 +239,7 @@
 -	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/tmp
 -	install -m 755 asterisk $(DESTDIR)$(ASTSBINDIR)/
 -	install -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
+-	install -m 755 contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/
 +	$(MKDIR) $(DESTDIR)$(MODULES_DIR)
 +	$(MKDIR) $(DESTDIR)$(ASTSBINDIR)
 +	$(MKDIR) $(DESTDIR)$(ASTETCDIR)
@@ -249,6 +250,7 @@
 +	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/tmp
 +	$(BSD_INSTALL_PROGRAM) asterisk $(DESTDIR)$(ASTSBINDIR)/
 +	$(BSD_INSTALL_SCRIPT) contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
++	$(BSD_INSTALL_SCRIPT) contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/
  	if [ ! -f $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ]; then \
 -		install -m 755 contrib/scripts/safe_asterisk $(DESTDIR)$(ASTSBINDIR)/ ;\
 +		$(BSD_INSTALL_SCRIPT) contrib/scripts/safe_asterisk $(DESTDIR)$(ASTSBINDIR)/ ;\
@@ -316,9 +318,20 @@
 -	@echo " + **Note** This requires that you have      +"
 -	@echo " + doxygen installed on your local system    +"
 -	@echo " +-------------------------------------------+"
+-	@echo " +                                           +"
+-	@echo " + ** NOTE FOR DOWNGRADING FROM CVS HEAD **  +"
+-	@echo " +                                           +"
+-	@echo " + If you are downgrading from CVS HEAD to   +"
+-	@echo " + a stable release, remember to delete      +"
+-	@echo " + everything from your asterisk modules     +"
+-	@echo " + directory (/usr/lib/asterisk/modules/)    +"
+-	@echo " + before doing a '$(MAKE) install'.            +"
+-	@echo " +                                           +"
+-	@echo " +-------------------------------------------+"
 +	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds  ; ln -sf $(ASTSPOOLDIR)/vm . )
 +	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds  ; ln -sf $(ASTSPOOLDIR)/voicemail . )
  
+ 
 -install: all datafiles bininstall
 +install: all datafiles bininstall samples
  
@@ -390,7 +403,7 @@
  	:> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm
  	for x in vm-theperson digits/1 digits/2 digits/3 digits/4 vm-isunavail; do \
  		cat $(DESTDIR)$(ASTVARLIBDIR)/sounds/$$x.gsm >> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm ; \
-@@ -486,7 +466,7 @@
+@@ -500,7 +470,7 @@
  	@[ -d $(DESTDIR)$(HTTPDIR)/html ] || ( echo "No http directory" && exit 1 )
  	@[ -d $(DESTDIR)$(HTTPDIR)/cgi-bin ] || ( echo "No cgi-bin directory" && exit 1 )
  	install -m 4755 -o root -g root contrib/scripts/vmail.cgi $(DESTDIR)$(HTTPDIR)/cgi-bin/vmail.cgi
@@ -399,7 +412,7 @@
  	for x in images/*.gif; do \
  		install -m 644 $$x $(DESTDIR)$(HTTPDIR)/html/_asterisk/; \
  	done
-@@ -506,10 +486,10 @@
+@@ -520,10 +490,10 @@
  
  __rpm: _version
  	rm -rf /tmp/asterisk ; \
diff --git a/net/asterisk14/files/patch-codecs::Makefile b/net/asterisk14/files/patch-codecs::Makefile
index 353c6dd1e62e..325e590423a2 100644
--- a/net/asterisk14/files/patch-codecs::Makefile
+++ b/net/asterisk14/files/patch-codecs::Makefile
@@ -1,12 +1,12 @@
---- codecs/Makefile.orig	Thu Jan 13 10:22:07 2005
-+++ codecs/Makefile	Sun Feb 27 23:53:30 2005
-@@ -17,24 +17,23 @@
+--- codecs/Makefile.orig	Thu Mar 17 20:43:51 2005
++++ codecs/Makefile	Thu Apr 14 00:09:04 2005
+@@ -17,25 +17,23 @@
  # g723.1b)
  #
  #MODG723=codec_g723_1.so codec_g723_1b.so
 -MODG723=$(shell [ -f g723.1/coder.c ] && echo "codec_g723_1.so")
 -MODG723+=$(shell [ -f g723.1b/coder2.c ] && echo "codec_g723_1b.so")
--MODSPEEX=$(shell [ -f /usr/include/speex.h ] || [ -f /usr/local/include/speex.h ] || [ -f /usr/local/include/speex/speex.h ] && echo "codec_speex.so")
+-MODSPEEX=$(shell [ -f /usr/include/speex.h ] || [ -f /usr/include/speex/speex.h ] || [ -f /usr/local/include/speex.h ] || [ -f /usr/local/include/speex/speex.h ] && echo "codec_speex.so")
 -MODILBC=$(shell [ -f ilbc/iLBC_decode.h ] && echo "codec_ilbc.so")
 +MODG723=codec_g723_1_dummy.so
 +MODG729=codec_g729_dummy.so
@@ -15,6 +15,7 @@
  CFLAGS+=-fPIC
 -CFLAGS+=$(shell [ -f /usr/local/include/speex.h ] && echo "-I/usr/local/include")
 -CFLAGS+=$(shell [ -f /usr/local/include/speex/speex.h ] && echo "-I/usr/local/include/speex")
+-CFLAGS+=$(shell [ -f /usr/include/speex/speex.h ] && echo "-I/usr/include/speex")
 +CFLAGS+=-I$(LOCALBASE)/include
  
  LIBG723=g723.1/libg723.a
@@ -32,7 +33,7 @@
          codec_adpcm.so codec_ulaw.so codec_alaw.so codec_a_mu.so \
  	codec_g726.so
  
-@@ -92,7 +91,7 @@
+@@ -93,7 +91,7 @@
  endif
  
  install: all
diff --git a/net/asterisk14/pkg-plist b/net/asterisk14/pkg-plist
index 7cc3218bde84..d79b0ca154a8 100644
--- a/net/asterisk14/pkg-plist
+++ b/net/asterisk14/pkg-plist
@@ -300,6 +300,7 @@ lib/asterisk/modules/res_musiconhold.so
 sbin/asterisk
 sbin/astgenkey
 sbin/astman
+sbin/autosupport
 sbin/safe_asterisk
 %%DATADIR%%/agi-bin/agi-test.agi
 %%DATADIR%%/agi-bin/eagi-sphinx-test
@@ -431,8 +432,8 @@ sbin/safe_asterisk
 %%DATADIR%%/sounds/digits/tomorrow.gsm
 %%DATADIR%%/sounds/digits/yesterday.gsm
 %%DATADIR%%/sounds/dir-instr.gsm
-%%DATADIR%%/sounds/dir-intro.gsm
 %%DATADIR%%/sounds/dir-intro-fn.gsm
+%%DATADIR%%/sounds/dir-intro.gsm
 %%DATADIR%%/sounds/dir-nomatch.gsm
 %%DATADIR%%/sounds/dir-nomore.gsm
 %%DATADIR%%/sounds/invalid.gsm
@@ -549,8 +550,8 @@ sbin/safe_asterisk
 %%DATADIR%%/sounds/vm-from.gsm
 %%DATADIR%%/sounds/vm-goodbye.gsm
 %%DATADIR%%/sounds/vm-helpexit.gsm
-%%DATADIR%%/sounds/vm-incorrect.gsm
 %%DATADIR%%/sounds/vm-incorrect-mailbox.gsm
+%%DATADIR%%/sounds/vm-incorrect.gsm
 %%DATADIR%%/sounds/vm-instructions.gsm
 %%DATADIR%%/sounds/vm-intro.gsm
 %%DATADIR%%/sounds/vm-isonphone.gsm
@@ -590,8 +591,8 @@ sbin/safe_asterisk
 %%DATADIR%%/sounds/vm-saved.gsm
 %%DATADIR%%/sounds/vm-savedto.gsm
 %%DATADIR%%/sounds/vm-savefolder.gsm
-%%DATADIR%%/sounds/vm-saveoper.gsm
 %%DATADIR%%/sounds/vm-savemessage.gsm
+%%DATADIR%%/sounds/vm-saveoper.gsm
 %%DATADIR%%/sounds/vm-sorry.gsm
 %%DATADIR%%/sounds/vm-star-cancel.gsm
 %%DATADIR%%/sounds/vm-starmain.gsm
diff --git a/net/asterisk16/Makefile b/net/asterisk16/Makefile
index 6aef3e6708bc..ce7f82474c8f 100644
--- a/net/asterisk16/Makefile
+++ b/net/asterisk16/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	asterisk
-PORTVERSION=	1.0.6
+PORTVERSION=	1.0.7
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.asterisk.org/pub/telephony/asterisk/ \
 		ftp://ftp.asterisk.org/pub/telephony/asterisk/old-releases/
 
-PATCHFILES=	${PORTNAME}-${PORTVERSION}-${BRIVER}.patch.gz
+PATCHFILES=	${PORTNAME}-1.0.6-${BRIVER}.patch.gz
 PATCH_SITES=	${MASTER_SITE_LOCAL}
 PATCH_SITE_SUBDIR=	fjoe
 PATCH_DIST_STRIP=	-p1
diff --git a/net/asterisk16/distinfo b/net/asterisk16/distinfo
index 4b14ce651b0d..7824440e6c18 100644
--- a/net/asterisk16/distinfo
+++ b/net/asterisk16/distinfo
@@ -1,4 +1,4 @@
-MD5 (asterisk-1.0.6.tar.gz) = c16efa9a64564763a0d9e3e1e9350c8d
-SIZE (asterisk-1.0.6.tar.gz) = 9589123
+MD5 (asterisk-1.0.7.tar.gz) = 4cc3c1e4a1b12e0e4c748326ad153291
+SIZE (asterisk-1.0.7.tar.gz) = 9591705
 MD5 (asterisk-1.0.6-bristuff-0.2.0-RC7j.patch.gz) = cdffa574bb65250d93abf98fb11e29f9
 SIZE (asterisk-1.0.6-bristuff-0.2.0-RC7j.patch.gz) = 40762
diff --git a/net/asterisk16/files/patch-Makefile b/net/asterisk16/files/patch-Makefile
index 312cbe904760..c509623ce46a 100644
--- a/net/asterisk16/files/patch-Makefile
+++ b/net/asterisk16/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig	Fri Jan 21 11:18:35 2005
-+++ Makefile	Mon Feb 28 00:19:37 2005
+--- Makefile.orig	Thu Apr 14 00:05:14 2005
++++ Makefile	Thu Apr 14 00:05:14 2005
 @@ -45,6 +45,15 @@
  PROC=$(shell uname -m)
  endif
@@ -225,7 +225,7 @@
  
  update: 
  	@if [ -d CVS ]; then \
-@@ -367,113 +372,88 @@
+@@ -367,125 +372,90 @@
  	fi
  
  bininstall: all
@@ -239,6 +239,7 @@
 -	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/tmp
 -	install -m 755 asterisk $(DESTDIR)$(ASTSBINDIR)/
 -	install -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
+-	install -m 755 contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/
 +	$(MKDIR) $(DESTDIR)$(MODULES_DIR)
 +	$(MKDIR) $(DESTDIR)$(ASTSBINDIR)
 +	$(MKDIR) $(DESTDIR)$(ASTETCDIR)
@@ -249,6 +250,7 @@
 +	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/tmp
 +	$(BSD_INSTALL_PROGRAM) asterisk $(DESTDIR)$(ASTSBINDIR)/
 +	$(BSD_INSTALL_SCRIPT) contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
++	$(BSD_INSTALL_SCRIPT) contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/
  	if [ ! -f $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ]; then \
 -		install -m 755 contrib/scripts/safe_asterisk $(DESTDIR)$(ASTSBINDIR)/ ;\
 +		$(BSD_INSTALL_SCRIPT) contrib/scripts/safe_asterisk $(DESTDIR)$(ASTSBINDIR)/ ;\
@@ -316,9 +318,20 @@
 -	@echo " + **Note** This requires that you have      +"
 -	@echo " + doxygen installed on your local system    +"
 -	@echo " +-------------------------------------------+"
+-	@echo " +                                           +"
+-	@echo " + ** NOTE FOR DOWNGRADING FROM CVS HEAD **  +"
+-	@echo " +                                           +"
+-	@echo " + If you are downgrading from CVS HEAD to   +"
+-	@echo " + a stable release, remember to delete      +"
+-	@echo " + everything from your asterisk modules     +"
+-	@echo " + directory (/usr/lib/asterisk/modules/)    +"
+-	@echo " + before doing a '$(MAKE) install'.            +"
+-	@echo " +                                           +"
+-	@echo " +-------------------------------------------+"
 +	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds  ; ln -sf $(ASTSPOOLDIR)/vm . )
 +	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds  ; ln -sf $(ASTSPOOLDIR)/voicemail . )
  
+ 
 -install: all datafiles bininstall
 +install: all datafiles bininstall samples
  
@@ -390,7 +403,7 @@
  	:> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm
  	for x in vm-theperson digits/1 digits/2 digits/3 digits/4 vm-isunavail; do \
  		cat $(DESTDIR)$(ASTVARLIBDIR)/sounds/$$x.gsm >> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm ; \
-@@ -486,7 +466,7 @@
+@@ -500,7 +470,7 @@
  	@[ -d $(DESTDIR)$(HTTPDIR)/html ] || ( echo "No http directory" && exit 1 )
  	@[ -d $(DESTDIR)$(HTTPDIR)/cgi-bin ] || ( echo "No cgi-bin directory" && exit 1 )
  	install -m 4755 -o root -g root contrib/scripts/vmail.cgi $(DESTDIR)$(HTTPDIR)/cgi-bin/vmail.cgi
@@ -399,7 +412,7 @@
  	for x in images/*.gif; do \
  		install -m 644 $$x $(DESTDIR)$(HTTPDIR)/html/_asterisk/; \
  	done
-@@ -506,10 +486,10 @@
+@@ -520,10 +490,10 @@
  
  __rpm: _version
  	rm -rf /tmp/asterisk ; \
diff --git a/net/asterisk16/files/patch-codecs::Makefile b/net/asterisk16/files/patch-codecs::Makefile
index 353c6dd1e62e..325e590423a2 100644
--- a/net/asterisk16/files/patch-codecs::Makefile
+++ b/net/asterisk16/files/patch-codecs::Makefile
@@ -1,12 +1,12 @@
---- codecs/Makefile.orig	Thu Jan 13 10:22:07 2005
-+++ codecs/Makefile	Sun Feb 27 23:53:30 2005
-@@ -17,24 +17,23 @@
+--- codecs/Makefile.orig	Thu Mar 17 20:43:51 2005
++++ codecs/Makefile	Thu Apr 14 00:09:04 2005
+@@ -17,25 +17,23 @@
  # g723.1b)
  #
  #MODG723=codec_g723_1.so codec_g723_1b.so
 -MODG723=$(shell [ -f g723.1/coder.c ] && echo "codec_g723_1.so")
 -MODG723+=$(shell [ -f g723.1b/coder2.c ] && echo "codec_g723_1b.so")
--MODSPEEX=$(shell [ -f /usr/include/speex.h ] || [ -f /usr/local/include/speex.h ] || [ -f /usr/local/include/speex/speex.h ] && echo "codec_speex.so")
+-MODSPEEX=$(shell [ -f /usr/include/speex.h ] || [ -f /usr/include/speex/speex.h ] || [ -f /usr/local/include/speex.h ] || [ -f /usr/local/include/speex/speex.h ] && echo "codec_speex.so")
 -MODILBC=$(shell [ -f ilbc/iLBC_decode.h ] && echo "codec_ilbc.so")
 +MODG723=codec_g723_1_dummy.so
 +MODG729=codec_g729_dummy.so
@@ -15,6 +15,7 @@
  CFLAGS+=-fPIC
 -CFLAGS+=$(shell [ -f /usr/local/include/speex.h ] && echo "-I/usr/local/include")
 -CFLAGS+=$(shell [ -f /usr/local/include/speex/speex.h ] && echo "-I/usr/local/include/speex")
+-CFLAGS+=$(shell [ -f /usr/include/speex/speex.h ] && echo "-I/usr/include/speex")
 +CFLAGS+=-I$(LOCALBASE)/include
  
  LIBG723=g723.1/libg723.a
@@ -32,7 +33,7 @@
          codec_adpcm.so codec_ulaw.so codec_alaw.so codec_a_mu.so \
  	codec_g726.so
  
-@@ -92,7 +91,7 @@
+@@ -93,7 +91,7 @@
  endif
  
  install: all
diff --git a/net/asterisk16/pkg-plist b/net/asterisk16/pkg-plist
index 7cc3218bde84..d79b0ca154a8 100644
--- a/net/asterisk16/pkg-plist
+++ b/net/asterisk16/pkg-plist
@@ -300,6 +300,7 @@ lib/asterisk/modules/res_musiconhold.so
 sbin/asterisk
 sbin/astgenkey
 sbin/astman
+sbin/autosupport
 sbin/safe_asterisk
 %%DATADIR%%/agi-bin/agi-test.agi
 %%DATADIR%%/agi-bin/eagi-sphinx-test
@@ -431,8 +432,8 @@ sbin/safe_asterisk
 %%DATADIR%%/sounds/digits/tomorrow.gsm
 %%DATADIR%%/sounds/digits/yesterday.gsm
 %%DATADIR%%/sounds/dir-instr.gsm
-%%DATADIR%%/sounds/dir-intro.gsm
 %%DATADIR%%/sounds/dir-intro-fn.gsm
+%%DATADIR%%/sounds/dir-intro.gsm
 %%DATADIR%%/sounds/dir-nomatch.gsm
 %%DATADIR%%/sounds/dir-nomore.gsm
 %%DATADIR%%/sounds/invalid.gsm
@@ -549,8 +550,8 @@ sbin/safe_asterisk
 %%DATADIR%%/sounds/vm-from.gsm
 %%DATADIR%%/sounds/vm-goodbye.gsm
 %%DATADIR%%/sounds/vm-helpexit.gsm
-%%DATADIR%%/sounds/vm-incorrect.gsm
 %%DATADIR%%/sounds/vm-incorrect-mailbox.gsm
+%%DATADIR%%/sounds/vm-incorrect.gsm
 %%DATADIR%%/sounds/vm-instructions.gsm
 %%DATADIR%%/sounds/vm-intro.gsm
 %%DATADIR%%/sounds/vm-isonphone.gsm
@@ -590,8 +591,8 @@ sbin/safe_asterisk
 %%DATADIR%%/sounds/vm-saved.gsm
 %%DATADIR%%/sounds/vm-savedto.gsm
 %%DATADIR%%/sounds/vm-savefolder.gsm
-%%DATADIR%%/sounds/vm-saveoper.gsm
 %%DATADIR%%/sounds/vm-savemessage.gsm
+%%DATADIR%%/sounds/vm-saveoper.gsm
 %%DATADIR%%/sounds/vm-sorry.gsm
 %%DATADIR%%/sounds/vm-star-cancel.gsm
 %%DATADIR%%/sounds/vm-starmain.gsm