add asterisk 10 beta1 to net/asterisk10

As asterisk 1.8 is a LTS release it is going to stay in net/asterisk for the
time being.

6 files changed, 38 insertions, 87 deletions

diff --git a/net/asterisk10/Makefile b/net/asterisk10/Makefile
index f9ca14f83ac4..dc3e047ee537 100644
--- a/net/asterisk10/Makefile
+++ b/net/asterisk10/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	asterisk
-PORTVERSION=	1.8.5.0
+DISTVERSION=	10.0.0-beta1
 CATEGORIES=	net
 MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/asterisk/ \
 		http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/
-PKGNAMESUFFIX=	18
 
 MAINTAINER=	flo@FreeBSD.org
 COMMENT=	An Open Source PBX and telephony toolkit
diff --git a/net/asterisk10/distinfo b/net/asterisk10/distinfo
index 27efcb2028b5..31803e4a7a3c 100644
--- a/net/asterisk10/distinfo
+++ b/net/asterisk10/distinfo
@@ -1,2 +1,2 @@
-SHA256 (asterisk-1.8.5.0.tar.gz) = 5c4601c0dab2c94a3dc37cab5d55af8eab67765a31eb8aed7321dd98e7c62a46
-SIZE (asterisk-1.8.5.0.tar.gz) = 27417584
+SHA256 (asterisk-10.0.0-beta1.tar.gz) = 5ce2147962324bfb1807c2899109aee6584a3791d7f2e7613ab9b6cd112e9845
+SIZE (asterisk-10.0.0-beta1.tar.gz) = 27693425
diff --git a/net/asterisk10/files/patch-Makefile b/net/asterisk10/files/patch-Makefile
index 23027da55ea7..f493cb5c590b 100644
--- a/net/asterisk10/files/patch-Makefile
+++ b/net/asterisk10/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig	2011-02-01 19:02:06.000000000 +0100
-+++ Makefile	2011-05-22 18:45:02.809438425 +0200
+--- Makefile.orig	2011-07-19 23:31:16.000000000 +0200
++++ Makefile	2011-07-23 00:32:54.955232647 +0200
 @@ -122,7 +122,7 @@
  OVERWRITE=y
  
@@ -9,22 +9,20 @@
  
  # Asterisk.conf is located in ASTETCDIR or by using the -C flag
  # when starting Asterisk
-@@ -220,11 +220,13 @@
-   _ASTCFLAGS+=-isystem /usr/local/include
- endif
- 
-+ifneq ($(OSARCH),FreeBSD)
- ifeq ($(findstring -march,$(_ASTCFLAGS) $(ASTCFLAGS)),)
-   ifneq ($(PROC),ultrasparc)
-     _ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
+@@ -226,9 +226,11 @@
+   ifneq ($(AST_MARCH_NATIVE),)
+     _ASTCFLAGS+=$(AST_MARCH_NATIVE)
+   else
++    ifneq ($(OSARCH),FreeBSD)
+     ifneq ($(PROC),ultrasparc)
+       _ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
+     endif
++    endif
    endif
  endif
-+endif
  
- ifeq ($(PROC),ppc)
-   _ASTCFLAGS+=-fsigned-char
-@@ -235,7 +237,7 @@
-     _ASTCFLAGS+=-march=i686
+@@ -243,7 +245,7 @@
+     endif
    endif
    # -V is understood by BSD Make, not by GNU make.
 -  BSDVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk)
@@ -32,22 +30,21 @@
    _ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi)
  endif
  
-@@ -462,8 +464,13 @@
- 		$(INSTALL) -m 644 $$x "$(DESTDIR)$(ASTDATADIR)/static-http" ; \
- 	done
- 	$(INSTALL) -m 644 doc/core-en_US.xml "$(DESTDIR)$(ASTDATADIR)/static-http";
-+
+@@ -476,8 +478,12 @@
+ 			$(INSTALL) -m 644 $$n "$(DESTDIR)$(ASTDATADIR)/static-http/docs" ; \
+ 		done \
+ 	fi
 +	if [ ! -d $(DESTDIR)$(DOCSDIR)/images ]; then \
 +		$(MKDIR) $(DESTDIR)$(DOCSDIR)/images; \
 +	fi
 +
  	for x in images/*.jpg; do \
--		$(INSTALL) -m 644 $$x "$(DESTDIR)$(ASTDATADIR)/images" ; \
+-		$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/images ; \
 +		$(INSTALL) -m 644 $$x $(DESTDIR)$(DOCSDIR)/images ; \
  	done
  	$(MAKE) -C sounds install
  
-@@ -523,6 +530,7 @@
+@@ -537,6 +543,7 @@
  	$(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/dictate"
  	$(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/meetme"
  	$(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/monitor"
@@ -55,7 +52,7 @@
  	$(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/system"
  	$(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/tmp"
  	$(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/voicemail"
-@@ -603,7 +612,7 @@
+@@ -617,7 +624,7 @@
  	@exit 1
  endif
  
@@ -64,7 +61,7 @@
  	@if [ -x /usr/sbin/asterisk-post-install ]; then \
  		/usr/sbin/asterisk-post-install $(DESTDIR) . ; \
  	fi
-@@ -645,29 +654,18 @@
+@@ -659,29 +666,18 @@
  		else \
  			echo "Installing $$x" ; \
  		fi ; \
@@ -99,7 +96,7 @@
  		echo "Updating asterisk.conf" ; \
  		sed -e 's|^astetcdir.*$$|astetcdir => $(ASTETCDIR)|' \
  			-e 's|^astmoddir.*$$|astmoddir => $(MODULES_DIR)|' \
-@@ -681,6 +679,7 @@
+@@ -695,6 +691,7 @@
  			-e 's|^astlogdir.*$$|astlogdir => $(ASTLOGDIR)|' \
  			$(DESTDIR)$(ASTCONFPATH) > $(DESTDIR)$(ASTCONFPATH).tmp ; \
  		$(INSTALL) -m 644 $(DESTDIR)$(ASTCONFPATH).tmp $(DESTDIR)$(ASTCONFPATH) ; \
diff --git a/net/asterisk10/files/patch-main::Makefile b/net/asterisk10/files/patch-main::Makefile
deleted file mode 100644
index 4bb726d70c0f..000000000000
--- a/net/asterisk10/files/patch-main::Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
---- ./main/Makefile.orig	2010-08-02 16:41:46.000000000 +0200
-+++ ./main/Makefile	2010-11-06 14:54:37.000000000 +0100
-@@ -107,8 +107,8 @@
- 	cd editline && test -f config.h || CFLAGS="$(PTHREAD_CFLAGS) $(subst $(ASTTOPDIR),../../,$(_ASTCFLAGS:-Werror=) $(ASTCFLAGS))" LDFLAGS="$(_ASTLDFLAGS) $(ASTLDFLAGS)" ./configure --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --with-ncurses=$(NCURSES_DIR) --with-curses=$(CURSES_DIR) --with-termcap=$(TERMCAP_DIR) --with-tinfo=$(TINFO_DIR)
- 	$(MAKE) -C editline libedit.a
- 
--db1-ast/libdb1.a: CHECK_SUBDIR
--	_ASTCFLAGS="$(_ASTCFLAGS) -Wno-strict-aliasing" ASTCFLAGS="$(ASTCFLAGS)" $(MAKE) -C db1-ast libdb1.a
-+#db1-ast/libdb1.a: CHECK_SUBDIR
-+#	_ASTCFLAGS="$(_ASTCFLAGS) -Wno-strict-aliasing" ASTCFLAGS="$(ASTCFLAGS)" $(MAKE) -C db1-ast libdb1.a
- 
- ifneq ($(findstring REBUILD_PARSERS,$(MENUSELECT_CFLAGS)),)
- ast_expr2.c ast_expr2.h: ast_expr2.y
-@@ -173,13 +173,13 @@
- 
- $(OBJS): _ASTCFLAGS+=-DAST_MODULE=\"core\"
- 
--$(MAIN_TGT): $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS)
-+$(MAIN_TGT): $(OBJS) editline/libedit.a $(AST_EMBED_LDSCRIPTS)
- 	@$(CC) -c -o buildinfo.o $(_ASTCFLAGS) buildinfo.c $(ASTCFLAGS)
- 	$(ECHO_PREFIX) echo "   [LD] $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) -> $@"
- ifneq ($(findstring chan_h323,$(MENUSELECT_CHANNELS)),)
--	$(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(ASTLDFLAGS) $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(GMIMELDFLAGS)
-+	$(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(LDFLAGS) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $(OBJS) editline/libedit.a $(AST_EMBED_LDSCRIPTS) buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(GMIMELDFLAGS)
- else
--	$(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(GMIMELDFLAGS)
-+	$(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(LDFLAGS) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $(OBJS) editline/libedit.a $(AST_EMBED_LDSCRIPTS) buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(GMIMELDFLAGS)
- endif
- 
- ifeq ($(GNU_LD),1)
diff --git a/net/asterisk10/files/patch-main::db.c b/net/asterisk10/files/patch-main::db.c
deleted file mode 100644
index 34c9bd20a8a0..000000000000
--- a/net/asterisk10/files/patch-main::db.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- ./main/db.c.orig	2010-09-10 22:31:58.000000000 +0200
-+++ ./main/db.c	2010-11-06 14:54:37.000000000 +0100
-@@ -36,6 +36,7 @@
- #include <sys/time.h>
- #include <signal.h>
- #include <dirent.h>
-+#include <db.h>
- 
- #include "asterisk/channel.h"
- #include "asterisk/file.h"
-@@ -46,7 +47,6 @@
- #include "asterisk/utils.h"
- #include "asterisk/lock.h"
- #include "asterisk/manager.h"
--#include "db1-ast/include/db.h"
- 
- /*** DOCUMENTATION
- 	<manager name="DBGet" language="en_US">
diff --git a/net/asterisk10/pkg-plist b/net/asterisk10/pkg-plist
index 5dfc4e12e5e6..2e43c8356472 100644
--- a/net/asterisk10/pkg-plist
+++ b/net/asterisk10/pkg-plist
@@ -12,6 +12,8 @@ etc/asterisk/cli.conf-dist
 etc/asterisk/cli_aliases.conf-dist
 @unexec if cmp -s %D/etc/asterisk/cli_permissions.conf %D/etc/asterisk/cli_permissions.conf-dist; then rm -f %D/etc/asterisk/cli_permissions.conf; fi
 etc/asterisk/cli_permissions.conf-dist
+@unexec if cmp -s %D/etc/asterisk/confbridge.conf %D/etc/asterisk/confbridge.conf-dist; then rm -f %D/etc/asterisk/confbridge.conf; fi
+etc/asterisk/confbridge.conf-dist
 @unexec if cmp -s %D/etc/asterisk/console.conf %D/etc/asterisk/console.conf-dist; then rm -f %D/etc/asterisk/console.conf; fi
 etc/asterisk/console.conf-dist
 @unexec if cmp -s %D/etc/asterisk/dbsep.conf %D/etc/asterisk/dbsep.conf-dist; then rm -f %D/etc/asterisk/dbsep.conf; fi
@@ -196,6 +198,7 @@ etc/asterisk/res_fax.conf-dist
 @exec if test ! -e %D/etc/asterisk/cdr_syslog.conf; then cp -p %D/etc/asterisk/cdr_syslog.conf-dist %D/etc/asterisk/cdr_syslog.conf; fi
 @exec if test ! -e %D/etc/asterisk/cdr_sqlite3_custom.conf; then cp -p %D/etc/asterisk/cdr_sqlite3_custom.conf-dist %D/etc/asterisk/cdr_sqlite3_custom.conf; fi
 @exec if test ! -e %D/etc/asterisk/cli.conf; then cp -p %D/etc/asterisk/cli.conf-dist %D/etc/asterisk/cli.conf; fi
+@exec if test ! -e %D/etc/asterisk/confbridge.conf; then cp -p %D/etc/asterisk/confbridge.conf-dist %D/etc/asterisk/confbridge.conf; fi
 @exec if test ! -e %D/etc/asterisk/console.conf; then cp -p %D/etc/asterisk/console.conf-dist %D/etc/asterisk/console.conf; fi
 @exec if test ! -e %D/etc/asterisk/extensions.lua; then cp -p %D/etc/asterisk/extensions.lua-dist %D/etc/asterisk/extensions.lua; fi
 @exec if test ! -e %D/etc/asterisk/extensions_minivm.conf; then cp -p %D/etc/asterisk/extensions_minivm.conf-dist %D/etc/asterisk/extensions_minivm.conf; fi
@@ -298,6 +301,7 @@ include/asterisk/autochan.h
 include/asterisk/calendar.h
 include/asterisk/ccss.h
 include/asterisk/cel.h
+include/asterisk/celt.h
 include/asterisk/channelstate.h
 include/asterisk/data.h
 include/asterisk/event.h
@@ -305,9 +309,13 @@ include/asterisk/event_defs.h
 include/asterisk/extconf.h
 include/asterisk/frame_defs.h
 include/asterisk/framehook.h
+include/asterisk/format.h
+include/asterisk/format_cap.h
+include/asterisk/format_pref.h
 include/asterisk/fskmodem_float.h
 include/asterisk/fskmodem_int.h
 include/asterisk/hashtab.h
+include/asterisk/message.h
 include/asterisk/mod_format.h
 include/asterisk/netsock2.h
 include/asterisk/network.h
@@ -320,6 +328,7 @@ include/asterisk/rtp_engine.h
 include/asterisk/select.h
 include/asterisk/security_events.h
 include/asterisk/security_events_defs.h
+include/asterisk/silk.h
 include/asterisk/stun.h
 include/asterisk/syslog.h
 include/asterisk/tcptls.h
@@ -435,12 +444,10 @@ lib/asterisk/modules/bridge_multiplexed.so
 lib/asterisk/modules/bridge_simple.so
 lib/asterisk/modules/bridge_softmix.so
 %%WITH_ODBC%%lib/asterisk/modules/cdr_adaptive_odbc.so
-%%WITH_JABBER%%lib/asterisk/modules/chan_jingle.so
 lib/asterisk/modules/chan_bridge.so
 lib/asterisk/modules/chan_unistim.so
 lib/asterisk/modules/codec_g722.so
 lib/asterisk/modules/format_g719.so
-lib/asterisk/modules/format_sln16.so
 lib/asterisk/modules/format_siren14.so
 lib/asterisk/modules/format_siren7.so
 lib/asterisk/modules/func_aes.so
@@ -452,6 +459,7 @@ lib/asterisk/modules/func_dialgroup.so
 lib/asterisk/modules/func_dialplan.so
 lib/asterisk/modules/func_extstate.so
 lib/asterisk/modules/func_iconv.so
+lib/asterisk/modules/func_jitterbuffer.so
 lib/asterisk/modules/func_lock.so
 lib/asterisk/modules/func_module.so
 lib/asterisk/modules/func_shell.so
@@ -467,6 +475,8 @@ lib/asterisk/modules/res_clialiases.so
 %%WITH_CURL%%lib/asterisk/modules/res_config_curl.so
 %%WITH_H323%%lib/asterisk/modules/res_config_ldap.so
 %%WITH_SQLITE%%lib/asterisk/modules/res_config_sqlite.so
+lib/asterisk/modules/res_format_attr_celt.so
+lib/asterisk/modules/res_format_attr_silk.so
 lib/asterisk/modules/res_limit.so
 lib/asterisk/modules/res_phoneprov.so
 lib/asterisk/modules/res_realtime.so
@@ -509,12 +519,10 @@ lib/asterisk/modules/app_playback.so
 lib/asterisk/modules/app_privacy.so
 lib/asterisk/modules/app_queue.so
 lib/asterisk/modules/app_read.so
-lib/asterisk/modules/app_readfile.so
 lib/asterisk/modules/app_record.so
 lib/asterisk/modules/app_sayunixtime.so
 lib/asterisk/modules/app_senddtmf.so
 lib/asterisk/modules/app_sendtext.so
-lib/asterisk/modules/app_setcallerid.so
 lib/asterisk/modules/app_sms.so
 lib/asterisk/modules/app_softhangup.so
 lib/asterisk/modules/app_speech_utils.so
@@ -537,7 +545,6 @@ lib/asterisk/modules/cdr_manager.so
 %%WITH_MYSQL%%lib/asterisk/modules/cdr_mysql.so
 %%WITH_POSTGRES%%lib/asterisk/modules/cdr_pgsql.so
 %%WITH_RADIUS%%lib/asterisk/modules/cdr_radius.so
-%%WITH_SQLITE%%lib/asterisk/modules/cdr_sqlite.so
 %%WITH_SQLITE%%lib/asterisk/modules/cdr_sqlite3_custom.so
 lib/asterisk/modules/cdr_syslog.so
 lib/asterisk/modules/cel_custom.so
@@ -633,6 +640,7 @@ lib/asterisk/modules/res_smdi.so
 %%WITH_SNMP%%lib/asterisk/modules/res_snmp.so
 lib/asterisk/modules/res_speech.so
 sbin/astcanary
+sbin/astdb2sqlite3
 sbin/asterisk
 sbin/astgenkey
 sbin/autosupport
@@ -1124,13 +1132,9 @@ share/asterisk/static-http/core-en_US.xml
 share/asterisk/static-http/prototype.js
 share/asterisk/static-http/mantest.html
 %%WITH_DAHDI%%lib/asterisk/modules/app_flash.so
-%%WITH_DAHDI%%lib/asterisk/modules/app_meetme.so
-%%WITH_DAHDI%%lib/asterisk/modules/app_page.so
-%%WITH_DAHDI%%lib/asterisk/modules/app_dahdibarge.so
 %%WITH_DAHDI%%lib/asterisk/modules/app_dahdiras.so
 %%WITH_ODBC%%lib/asterisk/modules/cdr_odbc.so
 %%WITH_FREETDS%%lib/asterisk/modules/cdr_tds.so
-%%WITH_H323%%lib/asterisk/modules/chan_h323.so
 %%WITH_DAHDI%%lib/asterisk/modules/chan_dahdi.so
 %%WITH_DAHDI%%lib/asterisk/modules/codec_dahdi.so
 %%WITH_ODBC%%lib/asterisk/modules/res_config_odbc.so
@@ -1151,7 +1155,6 @@ 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