Makefile only is not enough, commit the remaining patches for the 1.8.5.0 update

- update to 1.8.5.0
- remove leftovers from asterisk 1.6.X
- use menuselect to enable addons

6 files changed, 10 insertions, 75 deletions

diff --git a/net/asterisk/distinfo b/net/asterisk/distinfo
index 86a532bdc329..27efcb2028b5 100644
--- a/net/asterisk/distinfo
+++ b/net/asterisk/distinfo
@@ -1,2 +1,2 @@
-SHA256 (asterisk-1.8.4.4.tar.gz) = 08d44e7cfd5c306d944cd48eb8a497a345ebbb4e781d7a6cc917376784789c1f
-SIZE (asterisk-1.8.4.4.tar.gz) = 27326189
+SHA256 (asterisk-1.8.5.0.tar.gz) = 5c4601c0dab2c94a3dc37cab5d55af8eab67765a31eb8aed7321dd98e7c62a46
+SIZE (asterisk-1.8.5.0.tar.gz) = 27417584
diff --git a/net/asterisk/files/extra-patch-addons__.moduleinfo.diff b/net/asterisk/files/extra-patch-addons__.moduleinfo.diff
deleted file mode 100644
index 93cb3d904f2d..000000000000
--- a/net/asterisk/files/extra-patch-addons__.moduleinfo.diff
+++ /dev/null
@@ -1,24 +0,0 @@
---- ./addons/.moduleinfo.orig	2011-04-21 22:02:46.000000000 +0200
-+++ ./addons/.moduleinfo	2011-04-26 20:00:53.552445281 +0200
-@@ -1,14 +1,12 @@
- <category name="MENUSELECT_ADDONS" displayname="Add-ons (See README-addons.txt)" remove_on_change="addons/modules.link">
- <member name="app_mysql" displayname="Simple Mysql Interface" remove_on_change="addons/app_mysql.o addons/app_mysql.so">
- 	<depend>mysqlclient</depend>
--	<defaultenabled>no</defaultenabled>
- </member>
- <member name="app_saycountpl" displayname="Say polish counting words" remove_on_change="addons/app_saycountpl.o addons/app_saycountpl.so">
- 	<defaultenabled>no</defaultenabled>
- </member>
- <member name="cdr_mysql" displayname="MySQL CDR Backend" remove_on_change="addons/cdr_mysql.o addons/cdr_mysql.so">
- 	<depend>mysqlclient</depend>
--	<defaultenabled>no</defaultenabled>
- </member>
- <member name="chan_mobile" displayname="Bluetooth Mobile Device Channel Driver" remove_on_change="addons/chan_mobile.o addons/chan_mobile.so">
- 	<depend>bluetooth</depend>
-@@ -22,6 +20,5 @@
- </member>
- <member name="res_config_mysql" displayname="MySQL RealTime Configuration Driver" remove_on_change="addons/res_config_mysql.o addons/res_config_mysql.so">
- 	<depend>mysqlclient</depend>
--	<defaultenabled>no</defaultenabled>
- </member>
- </category>
diff --git a/net/asterisk/files/extra-patch-menuselect-tree-g711-new-codec.diff b/net/asterisk/files/extra-patch-menuselect-tree-g711-new-codec.diff
deleted file mode 100644
index d93e9cb28b17..000000000000
--- a/net/asterisk/files/extra-patch-menuselect-tree-g711-new-codec.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- menuselect-tree.orig	2011-02-21 09:56:29.000000000 +0100
-+++ menuselect-tree	2011-02-21 09:56:46.000000000 +0100
-@@ -777,7 +777,6 @@
- 		<member name="RADIO_RELAX" displayname="Relax DTMF for Radio Applications">
- 		</member>
- 		<member name="G711_NEW_ALGORITHM" displayname="Use the NEW ulaw/alaw codecs (slower, but cleaner)">
--			<defaultenabled>no</defaultenabled>
- 		</member>
- 		<member name="G711_REDUCED_BRANCHING" displayname="New ulaw/alaw codec, reduced branching (might help it run faster in some architectures)">
- 			<depend>G711_NEW_ALGORITHM</depend>
diff --git a/net/asterisk/files/extra-patch-menuselect-tree-mysql.diff b/net/asterisk/files/extra-patch-menuselect-tree-mysql.diff
deleted file mode 100644
index c562dbbdf14f..000000000000
--- a/net/asterisk/files/extra-patch-menuselect-tree-mysql.diff
+++ /dev/null
@@ -1,25 +0,0 @@
---- menuselect-tree.orig	2011-02-11 17:33:25.000000000 +0200
-+++ menuselect-tree	2011-02-11 17:33:52.000000000 +0200
-@@ -4,14 +4,12 @@
- <category name="MENUSELECT_ADDONS" displayname="Add-ons (See README-addons.txt)" remove_on_change="addons/modules.link">
- <member name="app_mysql" displayname="Simple Mysql Interface" remove_on_change="addons/app_mysql.o addons/app_mysql.so">
- 	<depend>mysqlclient</depend>
--	<defaultenabled>no</defaultenabled>
- </member>
- <member name="app_saycountpl" displayname="Say polish counting words" remove_on_change="addons/app_saycountpl.o addons/app_saycountpl.so">
- 	<defaultenabled>no</defaultenabled>
- </member>
- <member name="cdr_mysql" displayname="MySQL CDR Backend" remove_on_change="addons/cdr_mysql.o addons/cdr_mysql.so">
- 	<depend>mysqlclient</depend>
--	<defaultenabled>no</defaultenabled>
- </member>
- <member name="chan_mobile" displayname="Bluetooth Mobile Device Channel Driver" remove_on_change="addons/chan_mobile.o addons/chan_mobile.so">
- 	<depend>bluetooth</depend>
-@@ -25,7 +23,6 @@
- </member>
- <member name="res_config_mysql" displayname="MySQL RealTime Configuration Driver" remove_on_change="addons/res_config_mysql.o addons/res_config_mysql.so">
- 	<depend>mysqlclient</depend>
--	<defaultenabled>no</defaultenabled>
- </member>
- </category>
- <category name="MENUSELECT_APPS" displayname="Applications" remove_on_change="apps/modules.link">
diff --git a/net/asterisk/files/patch-Makefile b/net/asterisk/files/patch-Makefile
index b18b820d1949..23027da55ea7 100644
--- a/net/asterisk/files/patch-Makefile
+++ b/net/asterisk/files/patch-Makefile
@@ -55,14 +55,6 @@
  	$(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/system"
  	$(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/tmp"
  	$(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/voicemail"
-@@ -544,6 +552,7 @@
- 	$(INSTALL) -d "$(DESTDIR)$(ASTDATADIR)/static-http"
- 	$(INSTALL) -d "$(DESTDIR)$(ASTMANDIR)/man8"
- 	$(INSTALL) -d "$(DESTDIR)$(AGI_DIR)"
-+	$(INSTALL) -d "$(DESTDIR)$(ASTDBDIR)"
- 
- bininstall: _all installdirs $(SUBDIRS_INSTALL)
- 	$(INSTALL) -m 755 main/asterisk $(DESTDIR)$(ASTSBINDIR)/
 @@ -603,7 +612,7 @@
  	@exit 1
  endif
diff --git a/net/asterisk/pkg-plist b/net/asterisk/pkg-plist
index 117ebdc21acf..5dfc4e12e5e6 100644
--- a/net/asterisk/pkg-plist
+++ b/net/asterisk/pkg-plist
@@ -659,9 +659,9 @@ 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/CHANGES-asterisk-core-en-1.4.20
-share/asterisk/sounds/en/CREDITS-asterisk-core-en-1.4.20
-share/asterisk/sounds/en/LICENSE-asterisk-core-en-1.4.20
+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
 share/asterisk/sounds/en/ascending-2tone.gsm
 share/asterisk/sounds/en/conf-adminmenu-162.gsm
 share/asterisk/sounds/en/conf-extended.gsm
@@ -671,6 +671,8 @@ share/asterisk/sounds/en/conf-now-recording.gsm
 share/asterisk/sounds/en/conf-now-unmuted.gsm
 share/asterisk/sounds/en/conf-roll-callcomplete.gsm
 share/asterisk/sounds/en/conf-usermenu-162.gsm
+share/asterisk/sounds/en/confbridge-join.gsm
+share/asterisk/sounds/en/confbridge-leave.gsm
 share/asterisk/sounds/en/descending-2tone.gsm
 share/asterisk/sounds/en/spy-dahdi.gsm
 share/asterisk/sounds/en/vm-Urgent.gsm
@@ -1114,7 +1116,7 @@ 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.20
+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
@@ -1149,6 +1151,7 @@ share/asterisk/static-http/mantest.html
 @dirrm share/asterisk/sounds/en
 @dirrm share/asterisk/sounds/es
 @dirrm share/asterisk/sounds/fr
+@dirrm share/asterisk/sounds/ru
 @dirrm share/asterisk/sounds
 @dirrm share/asterisk/phoneprov
 @dirrm share/asterisk/moh
@@ -1172,11 +1175,11 @@ share/asterisk/static-http/mantest.html
 @exec mkdir -p %D/share/asterisk/sounds/es
 @exec mkdir -p %D/share/asterisk/sounds/fr
 @exec mkdir -p %D/share/asterisk/sounds/en_AU
+@exec mkdir -p %D/share/asterisk/sounds/ru
 @cwd %%VARDIR%%
 spool/asterisk/voicemail/default/1234/en/busy.gsm
 spool/asterisk/voicemail/default/1234/en/unavail.gsm
 @exec mkdir -p %D/log/asterisk/cdr-csv
-@exec mkdir -p %D/log/asterisk/cel-csv
 @exec mkdir -p %D/log/asterisk/cdr-custom
 @exec mkdir -p %D/log/asterisk/cel-custom
 @exec mkdir -p %D/spool/asterisk/dictate
@@ -1204,7 +1207,6 @@ spool/asterisk/voicemail/default/1234/en/unavail.gsm
 @dirrm spool/asterisk/tmp
 @dirrm spool/asterisk
 @dirrm log/asterisk/cdr-csv
-@dirrm log/asterisk/cel-csv
 @dirrm log/asterisk/cdr-custom
 @dirrm log/asterisk/cel-custom
 @dirrm log/asterisk