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.

3 files changed, 22 insertions, 73 deletions

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">