- Update net/asterisk11 to 11.16.0

- Update net/asterisk13 to 13.2.0

8 files changed, 21 insertions, 28 deletions

diff --git a/net/asterisk11/Makefile b/net/asterisk11/Makefile
index 33441eeed339..27bf28173db3 100644
--- a/net/asterisk11/Makefile
+++ b/net/asterisk11/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	asterisk
-PORTVERSION=	11.15.1
+PORTVERSION=	11.16.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/asterisk11/distinfo b/net/asterisk11/distinfo
index 65a87f173146..96e19b36b6d3 100644
--- a/net/asterisk11/distinfo
+++ b/net/asterisk11/distinfo
@@ -1,2 +1,2 @@
-SHA256 (asterisk-11.15.1.tar.gz) = 54f02df8a8e40b05a338f686705a28349175f31e5c6b2ec9f44bef1042b78fca
-SIZE (asterisk-11.15.1.tar.gz) = 34974674
+SHA256 (asterisk-11.16.0.tar.gz) = f98da93ed0ffbdddfbc301351ea32e5a63d2dbecf05a4f97fb794a68a3bdbe4d
+SIZE (asterisk-11.16.0.tar.gz) = 34995495
diff --git a/net/asterisk11/files/patch-main__lock.c b/net/asterisk11/files/patch-main__lock.c
index a802d8817a1e..3621177e74ba 100644
--- a/net/asterisk11/files/patch-main__lock.c
+++ b/net/asterisk11/files/patch-main__lock.c
@@ -1,13 +1,12 @@
---- ./main/lock.c.orig	2010-11-06 15:00:15.000000000 +0100
-+++ ./main/lock.c	2010-11-06 15:00:23.000000000 +0100
-@@ -679,10 +679,6 @@
+--- main/lock.c.orig	2014-12-12 23:31:38 UTC
++++ main/lock.c
+@@ -701,9 +701,6 @@ int __ast_rwlock_init(int tracking, cons
+ #endif /* DEBUG_THREADS */
  
  	pthread_rwlockattr_init(&attr);
- 
 -#ifdef HAVE_PTHREAD_RWLOCK_PREFER_WRITER_NP
 -	pthread_rwlockattr_setkind_np(&attr, PTHREAD_RWLOCK_PREFER_WRITER_NP);
 -#endif
--
  	res = pthread_rwlock_init(&t->lock, &attr);
  	pthread_rwlockattr_destroy(&attr);
- 	return res;
+ 
diff --git a/net/asterisk13/Makefile b/net/asterisk13/Makefile
index 13c2dff6f036..779515bc01f1 100644
--- a/net/asterisk13/Makefile
+++ b/net/asterisk13/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	asterisk
-PORTVERSION=	13.1.1
+PORTVERSION=	13.2.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/asterisk13/distinfo b/net/asterisk13/distinfo
index 24c77725efb3..8f8b4c183fba 100644
--- a/net/asterisk13/distinfo
+++ b/net/asterisk13/distinfo
@@ -1,2 +1,2 @@
-SHA256 (asterisk-13.1.1.tar.gz) = 070b68238734117c0b9c1018ba192ff29964a115a71620e648d4286c92f2f02b
-SIZE (asterisk-13.1.1.tar.gz) = 31869064
+SHA256 (asterisk-13.2.0.tar.gz) = bcef6b30cf7bb1943b12939a4dc98a53f837a8f7ef564fe44cf73ea87e114a9b
+SIZE (asterisk-13.2.0.tar.gz) = 31951737
diff --git a/net/asterisk13/files/patch-channels_sip_include_route.h b/net/asterisk13/files/patch-channels_sip_include_route.h
deleted file mode 100644
index 018fb7c158a5..000000000000
--- a/net/asterisk13/files/patch-channels_sip_include_route.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- channels/sip/include/route.h.orig	2014-02-10 18:28:35 UTC
-+++ channels/sip/include/route.h
-@@ -98,7 +98,7 @@ void sip_route_dump(const struct sip_rou
-  * \retval NULL on failure
-  */
- struct ast_str *sip_route_list(const struct sip_route *route, int formatcli, int skip)
--		__attribute_malloc__ __attribute_warn_unused_result__;
-+		__attribute__((__malloc__)) __attribute__((__warn_unused_result__));
- 
- /*!
-  * \brief Check if the route is strict
diff --git a/net/asterisk13/files/patch-main__lock.c b/net/asterisk13/files/patch-main__lock.c
index 32101d0f3514..5dfd2e27dc0d 100644
--- a/net/asterisk13/files/patch-main__lock.c
+++ b/net/asterisk13/files/patch-main__lock.c
@@ -1,13 +1,12 @@
---- main/lock.c.orig	2014-03-25 15:47:17 UTC
+--- main/lock.c.orig	2014-12-12 23:40:50 UTC
 +++ main/lock.c
-@@ -691,10 +691,6 @@ int __ast_rwlock_init(int tracking, cons
+@@ -701,9 +701,6 @@ int __ast_rwlock_init(int tracking, cons
+ #endif /* DEBUG_THREADS */
  
  	pthread_rwlockattr_init(&attr);
- 
 -#ifdef HAVE_PTHREAD_RWLOCK_PREFER_WRITER_NP
 -	pthread_rwlockattr_setkind_np(&attr, PTHREAD_RWLOCK_PREFER_WRITER_NP);
 -#endif
--
  	res = pthread_rwlock_init(&t->lock, &attr);
  	pthread_rwlockattr_destroy(&attr);
- 	return res;
+ 
diff --git a/net/asterisk13/pkg-plist b/net/asterisk13/pkg-plist
index 157831137fb6..0c5524bab440 100644
--- a/net/asterisk13/pkg-plist
+++ b/net/asterisk13/pkg-plist
@@ -72,6 +72,7 @@
 @sample %%ETCDIR%%/phoneprov.conf.sample
 @sample %%ETCDIR%%/pjsip.conf.sample
 @sample %%ETCDIR%%/pjsip_notify.conf.sample
+@sample %%ETCDIR%%/pjsip_wizard.conf.sample
 @sample %%ETCDIR%%/queuerules.conf.sample
 @sample %%ETCDIR%%/queues.conf.sample
 @sample %%ETCDIR%%/res_config_mysql.conf.sample
@@ -354,6 +355,11 @@ lib/asterisk/modules/func_lock.so
 lib/asterisk/modules/func_module.so
 lib/asterisk/modules/func_periodic_hook.so
 %%PJSIP%%lib/asterisk/modules/func_pjsip_endpoint.so
+%%PJSIP%%lib/asterisk/modules/func_pjsip_aor.so
+%%PJSIP%%lib/asterisk/modules/func_pjsip_contact.so
+%%PJSIP%%lib/asterisk/modules/res_pjsip_config_wizard.so
+%%PJSIP%%lib/asterisk/modules/res_pjsip_keepalive.so
+%%PJSIP%%lib/asterisk/modules/res_pjsip_sips_contact.so
 lib/asterisk/modules/func_presencestate.so
 lib/asterisk/modules/func_shell.so
 lib/asterisk/modules/func_sorcery.so