- update net/asterisk to 1.8.21.0

- update net/asterisk11 to 11.3.0
- add -F to command_args in the rc script, this ensures that asterisk
  detaches from the controlling terminal. It was possible for the asterisk
  rc script to prevent a box from reaching full multiuser if e.g. -v was
  passed to command_args. [1]

Reported by:	Kurt Lidl <lidl@pix.net>

5 files changed, 22 insertions, 20 deletions

diff --git a/net/asterisk/Makefile b/net/asterisk/Makefile
index 5a850426c9a9..32c9d8a0faf2 100644
--- a/net/asterisk/Makefile
+++ b/net/asterisk/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	asterisk
-PORTVERSION=	1.8.20.2
+PORTVERSION=	1.8.21.0
 CATEGORIES=	net
 MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/asterisk/ \
 		http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/
diff --git a/net/asterisk/distinfo b/net/asterisk/distinfo
index f2e9b4a097ca..c095042f2d3b 100644
--- a/net/asterisk/distinfo
+++ b/net/asterisk/distinfo
@@ -1,2 +1,2 @@
-SHA256 (asterisk-1.8.20.2.tar.gz) = 67d9cb7f569d49bfdbd94f6d81b13bac690abadaff79d68c242ed4e55426b59e
-SIZE (asterisk-1.8.20.2.tar.gz) = 25180212
+SHA256 (asterisk-1.8.21.0.tar.gz) = 5f7ae7ac26eaedb6b7274281073a6b469157eaf4b8fd7e69bd0880125cea3380
+SIZE (asterisk-1.8.21.0.tar.gz) = 25334905
diff --git a/net/asterisk/files/asterisk.in b/net/asterisk/files/asterisk.in
index a612850c5603..85dce3d6c84f 100644
--- a/net/asterisk/files/asterisk.in
+++ b/net/asterisk/files/asterisk.in
@@ -23,7 +23,7 @@ stop_cmd="asterisk_stop"
 reload_cmd="asterisk_reload"
 
 command="%%PREFIX%%/sbin/asterisk"
-command_args="-n -U %%ASTERISK_USER%%"
+command_args="-n -F -U %%ASTERISK_USER%%"
 pidfile=${asterisk_pidfile:-"/var/run/asterisk/asterisk.pid"}
 
 asterisk_stop() {
diff --git a/net/asterisk/files/patch-configure b/net/asterisk/files/patch-configure
index 4712b202b045..751a0d633583 100644
--- a/net/asterisk/files/patch-configure
+++ b/net/asterisk/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2012-08-09 20:58:44.000000000 +0200
-+++ configure	2012-10-09 00:23:16.383254715 +0200
-@@ -4419,9 +4419,9 @@
+--- configure.orig	2013-01-30 18:44:11.000000000 +0100
++++ configure	2013-04-20 10:54:05.213563665 +0200
+@@ -4680,9 +4680,9 @@
  astheaderdir='${includedir}/asterisk'
  astlibdir='${libdir}/asterisk'
  astmandir='${mandir}'
@@ -12,7 +12,7 @@
  astkeydir='${astvarlibdir}'
  astspooldir='${localstatedir}/spool/asterisk'
  astlogdir='${localstatedir}/log/asterisk'
-@@ -4444,8 +4444,6 @@
+@@ -4705,8 +4705,6 @@
  case "${host_os}" in
       freebsd*)
       ac_default_prefix=/usr/local
@@ -21,16 +21,16 @@
       ;;
       openbsd*)
       ac_default_prefix=/usr/local
-@@ -29734,6 +29732,8 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+@@ -18262,6 +18260,8 @@
+ 
+ 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
-+#include <sys/types.h>
-+#include <sys/socket.h>
- #include <ifaddrs.h>
++ #include <sys/types.h>
++ #include <sys/socket.h>
+  #include <ifaddrs.h>
  int
  main ()
-@@ -47845,7 +47845,7 @@
+@@ -25941,7 +25941,7 @@
  
  	fi
  
@@ -38,4 +38,4 @@
 +	PLATFORM_OPENH323="h323_${OPENH323_SUFFIX}"
  
  	if test "${HAS_OPENH323:-unset}" != "unset"; then
- 	   { $as_echo "$as_me:$LINENO: checking OpenH323 installation validity" >&5
+ 	   { $as_echo "$as_me:${as_lineno-$LINENO}: checking OpenH323 installation validity" >&5
diff --git a/net/asterisk/pkg-plist b/net/asterisk/pkg-plist
index c7d6ad401325..7174e108f1d7 100644
--- a/net/asterisk/pkg-plist
+++ b/net/asterisk/pkg-plist
@@ -654,11 +654,13 @@ 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.22
-share/asterisk/sounds/en/CREDITS-asterisk-core-en-1.4.22
-share/asterisk/sounds/en/LICENSE-asterisk-core-en-1.4.22
+share/asterisk/sounds/en/CHANGES-asterisk-core-en-1.4.23
+share/asterisk/sounds/en/CREDITS-asterisk-core-en-1.4.23
+share/asterisk/sounds/en/LICENSE-asterisk-core-en-1.4.23
 share/asterisk/sounds/en/ascending-2tone.gsm
+share/asterisk/sounds/en/conf-adminmenu-18.gsm
 share/asterisk/sounds/en/conf-adminmenu-162.gsm
+share/asterisk/sounds/en/conf-adminmenu-menu8.gsm
 share/asterisk/sounds/en/conf-extended.gsm
 share/asterisk/sounds/en/conf-nonextended.gsm
 share/asterisk/sounds/en/conf-now-muted.gsm
@@ -1156,7 +1158,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/en/.asterisk-core-sounds-en-gsm-1.4.22
+share/asterisk/sounds/en/.asterisk-core-sounds-en-gsm-1.4.23
 share/asterisk/static-http/ajamdemo.html
 share/asterisk/static-http/astman.css
 share/asterisk/static-http/astman.js