- Update net/asterisk11 to 11.20.0

- Update net/asterisk13 to 13.6.0
- Remove upstreamed patch

In net/asterisk13:

- Add ASTVERSION option to control installation of bash only script
astversion, and avoid an unconditional dependency on bash

7 files changed, 16 insertions, 36 deletions

diff --git a/net/asterisk11/Makefile b/net/asterisk11/Makefile
index 91e80ff8270b..a3203d19e6f0 100644
--- a/net/asterisk11/Makefile
+++ b/net/asterisk11/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	asterisk
-PORTVERSION=	11.19.0
-PORTREVISION=	1
+PORTVERSION=	11.20.0
 CATEGORIES=	net
 MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/%SUBDIR%/:main,g729
 MASTER_SITE_SUBDIR=	asterisk/:main \
diff --git a/net/asterisk11/distinfo b/net/asterisk11/distinfo
index db8283740ad1..2f42eb735b4d 100644
--- a/net/asterisk11/distinfo
+++ b/net/asterisk11/distinfo
@@ -1,5 +1,5 @@
-SHA256 (asterisk-11.19.0.tar.gz) = 339f82f75dd15144a8de6f29aa5aa91e8e6a789dbfbd6c1283f345391505dc1e
-SIZE (asterisk-11.19.0.tar.gz) = 34852510
+SHA256 (asterisk-11.20.0.tar.gz) = ba3a26a7ea2b76884ad4984b0694fc9814d98bb373e0cbe42c64962f666720f4
+SIZE (asterisk-11.20.0.tar.gz) = 34864289
 SHA256 (asterisk-core-sounds-en-g729-1.4.27.tar.gz) = f5d21ca8305b29ea84fb4603c65c041483ea3a9cd0bf313eb4f098342a29af5f
 SIZE (asterisk-core-sounds-en-g729-1.4.27.tar.gz) = 1408055
 SHA256 (asterisk-moh-opsound-g729-2.03.tar.gz) = 0147ca9a97f0c550227aacb7793499057c4d2c64e021c95f93722f27d5549585
diff --git a/net/asterisk11/files/patch-main__utils.c b/net/asterisk11/files/patch-main__utils.c
deleted file mode 100644
index 26f6ed6cce39..000000000000
--- a/net/asterisk11/files/patch-main__utils.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- main/utils.c.orig	2015-07-24 22:06:05 UTC
-+++ main/utils.c
-@@ -1242,8 +1242,8 @@ int ast_pthread_create_stack(pthread_t *
- 		pthread_attr_init(attr);
- 	}
- 
--#ifdef __linux__
--	/* On Linux, pthread_attr_init() defaults to PTHREAD_EXPLICIT_SCHED,
-+#if defined(__linux__) || defined(__FreeBSD__)
-+	/* On Linux and FreeBSD, pthread_attr_init() defaults to PTHREAD_EXPLICIT_SCHED,
- 	   which is kind of useless. Change this here to
- 	   PTHREAD_INHERIT_SCHED; that way the -p option to set realtime
- 	   priority will propagate down to new threads by default.
diff --git a/net/asterisk13/Makefile b/net/asterisk13/Makefile
index e4c7a22a5b81..0171f58a9013 100644
--- a/net/asterisk13/Makefile
+++ b/net/asterisk13/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	asterisk
-PORTVERSION=	13.5.0
-PORTREVISION=	1
+PORTVERSION=	13.6.0
 CATEGORIES=	net
 MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/%SUBDIR%/:main,g729
 MASTER_SITE_SUBDIR=	asterisk/:main \
@@ -40,7 +39,8 @@ CONFIGURE_ARGS+=	--datarootdir=${DATADIR} \
 CPE_VENDOR=	digium
 
 SHEBANG_FILES=	agi/agi-test.agi \
-		agi/jukebox.agi
+		agi/jukebox.agi \
+		contrib/scripts/astversion
 
 MAKE_ENV=	PTHREAD_LIBS="-lpthread" \
 		MKDIR="${MKDIR}" \
@@ -56,7 +56,7 @@ CONFLICTS=		ossp-uuid-[0-9]*
 CONFLICTS_BUILD=	linuxthreads-*
 CONFLICTS_INSTALL=	asterisk*-1.8* asterisk*-11*
 
-OPTIONS_DEFINE=			BACKTRACE CURL EXCHANGE FREETDS LDAP LUA \
+OPTIONS_DEFINE=			ASTVERSION BACKTRACE CURL EXCHANGE FREETDS LDAP LUA \
 				MP3PLAYER OOH323 PJSIP PORTAUDIO RADIUS SNMP \
 				SPANDSP SRTP SYSINFO XMPP
 OPTIONS_DEFAULT=		CURL FREETDS GCC GSM LUA MP3PLAYER NEWT ODBC PGSQL PJSIP \
@@ -96,6 +96,7 @@ ASTERISK_MOH_G729_SOUNDS=	asterisk-moh-opsound-g729-2.03.tar.gz
 G729_DISTFILES=			${ASTERISK_CORE_G729_SOUNDS}:g729 \
 				${ASTERISK_MOH_G729_SOUNDS}:g729
 
+ASTVERSION_DESC?= Install astversion (requires bash)
 BACKTRACE_DESC?= Stack backtrace support via (lib)execinfo
 BASE_DESC=	Use base compiler (experimental)
 DAHDI_DESC?=	DAHDI support
@@ -111,6 +112,8 @@ XMPP_DESC?=	XMPP/GTALK support
 
 OPTIONS_SUB=		yes
 
+ASTVERSION_RUN_DEPENDS=		bash:${PORTSDIR}/shells/bash
+
 BACKTRACE_CONFIGURE_WITH=	execinfo
 BACKTRACE_LIB_DEPENDS=		libexecinfo.so:${PORTSDIR}/devel/libexecinfo
 
@@ -273,6 +276,9 @@ post-configure:
 
 post-install:
 	@${RM} ${STAGEDIR}${ETCDIR}/*.conf ${STAGEDIR}${ETCDIR}/extensions.ael ${STAGEDIR}${ETCDIR}/extensions.lua
+.if ! ${PORT_OPTIONS:MASTVERSION}
+	@${RM} ${STAGEDIR}${PREFIX}/sbin/astversion
+.endif
 	${FIND} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/modules -type f -name '*.so' | ${SED} "s,^${STAGEDIR}${PREFIX}/,," >> ${TMPPLIST}
 	${FIND} ${STAGEDIR}${DATADIR}/sounds -type f | ${SED} "s,^${STAGEDIR}${DATADIR},${DATADIR}," >> ${TMPPLIST}
 	${FIND} ${STAGEDIR}${DATADIR}/moh -type f | ${SED} "s,^${STAGEDIR}${DATADIR},${DATADIR}," >> ${TMPPLIST}
diff --git a/net/asterisk13/distinfo b/net/asterisk13/distinfo
index 8965743f6ab6..963891e5eaef 100644
--- a/net/asterisk13/distinfo
+++ b/net/asterisk13/distinfo
@@ -1,5 +1,5 @@
-SHA256 (asterisk-13.5.0.tar.gz) = e8b8d071f783edea82de510194dd272070ffbb7cdb2f5f6b020be5d15b67e8b9
-SIZE (asterisk-13.5.0.tar.gz) = 32107014
+SHA256 (asterisk-13.6.0.tar.gz) = 8a01b53c946d092ac561c11b404f68cd328306d0e3b434a7485a11d4b175005a
+SIZE (asterisk-13.6.0.tar.gz) = 32146107
 SHA256 (asterisk-core-sounds-en-g729-1.4.27.tar.gz) = f5d21ca8305b29ea84fb4603c65c041483ea3a9cd0bf313eb4f098342a29af5f
 SIZE (asterisk-core-sounds-en-g729-1.4.27.tar.gz) = 1408055
 SHA256 (asterisk-moh-opsound-g729-2.03.tar.gz) = 0147ca9a97f0c550227aacb7793499057c4d2c64e021c95f93722f27d5549585
diff --git a/net/asterisk13/files/patch-main__utils.c b/net/asterisk13/files/patch-main__utils.c
deleted file mode 100644
index 3f1a6492e75d..000000000000
--- a/net/asterisk13/files/patch-main__utils.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- main/utils.c.orig	2015-07-24 22:20:17 UTC
-+++ main/utils.c
-@@ -1256,8 +1256,8 @@ int ast_pthread_create_stack(pthread_t *
- 		pthread_attr_init(attr);
- 	}
- 
--#ifdef __linux__
--	/* On Linux, pthread_attr_init() defaults to PTHREAD_EXPLICIT_SCHED,
-+#if defined(__linux__) || defined(__FreeBSD__)
-+	/* On Linux and FreeBSD, pthread_attr_init() defaults to PTHREAD_EXPLICIT_SCHED,
- 	   which is kind of useless. Change this here to
- 	   PTHREAD_INHERIT_SCHED; that way the -p option to set realtime
- 	   priority will propagate down to new threads by default.
diff --git a/net/asterisk13/pkg-plist b/net/asterisk13/pkg-plist
index 9aeb41423fd2..3a106cab8a57 100644
--- a/net/asterisk13/pkg-plist
+++ b/net/asterisk13/pkg-plist
@@ -326,6 +326,7 @@ sbin/astdb2bdb
 sbin/astdb2sqlite3
 sbin/asterisk
 sbin/astgenkey
+%%ASTVERSION%%sbin/astversion
 sbin/autosupport
 sbin/rasterisk
 sbin/safe_asterisk