- Update asterisk11 to 11.22.0

- Update asterisk13 to 13.8.0

7 files changed, 69 insertions, 47 deletions

diff --git a/net/asterisk11/Makefile b/net/asterisk11/Makefile
index c6b1155235b4..422d5a42d2ff 100644
--- a/net/asterisk11/Makefile
+++ b/net/asterisk11/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	asterisk
-PORTVERSION=	11.21.2
+PORTVERSION=	11.22.0
 CATEGORIES=	net
 MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/%SUBDIR%/:main,g729
 MASTER_SITE_SUBDIR=	asterisk/:main \
@@ -84,7 +84,7 @@ NEWT_DESC=			Newt User Interface
 OPTIONS_GROUP+=			SOUNDS
 OPTIONS_GROUP_SOUNDS=		G729
 SOUNDS_DESC=			Core and Music-on-Hold (MoH) Sound Files
-ASTERISK_CORE_G729_SOUNDS=	asterisk-core-sounds-en-g729-1.4.27.tar.gz
+ASTERISK_CORE_G729_SOUNDS=	asterisk-core-sounds-en-g729-1.5.tar.gz
 ASTERISK_MOH_G729_SOUNDS=	asterisk-moh-opsound-g729-2.03.tar.gz
 
 G729_DESC=			Install G.729 format sounds
diff --git a/net/asterisk11/distinfo b/net/asterisk11/distinfo
index 83216834913c..0cedfb48581a 100644
--- a/net/asterisk11/distinfo
+++ b/net/asterisk11/distinfo
@@ -1,6 +1,6 @@
-SHA256 (asterisk-11.21.2.tar.gz) = 9f4408ecda81efccbc0ce6728a7c53fa1528c527ea65d81a165e830c9f91bcac
-SIZE (asterisk-11.21.2.tar.gz) = 34867025
-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-11.22.0.tar.gz) = 590c361f8926e08eeaf320a35985cd39a2ea651ec3e94fb62484a7179c32f527
+SIZE (asterisk-11.22.0.tar.gz) = 35101090
+SHA256 (asterisk-core-sounds-en-g729-1.5.tar.gz) = 8b28a59cfa53b59c76e0a191704f0708e3d83acffab8c5e6f25dfc599f0123f9
+SIZE (asterisk-core-sounds-en-g729-1.5.tar.gz) = 1551123
 SHA256 (asterisk-moh-opsound-g729-2.03.tar.gz) = 0147ca9a97f0c550227aacb7793499057c4d2c64e021c95f93722f27d5549585
 SIZE (asterisk-moh-opsound-g729-2.03.tar.gz) = 1103000
diff --git a/net/asterisk13/Makefile b/net/asterisk13/Makefile
index 8f68b39335c3..ff1f873c82be 100644
--- a/net/asterisk13/Makefile
+++ b/net/asterisk13/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	asterisk
-PORTVERSION=	13.7.2
-PORTREVISION=	1
+PORTVERSION=	13.8.0
 CATEGORIES=	net
 MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/%SUBDIR%/:main,g729
 MASTER_SITE_SUBDIR=	asterisk/:main \
@@ -91,7 +90,8 @@ NEWT_DESC=			Newt User Interface
 OPTIONS_GROUP+=			SOUNDS
 OPTIONS_GROUP_SOUNDS=		G729
 SOUNDS_DESC=			Core and Music-on-Hold (MoH) Sound Files
-ASTERISK_CORE_G729_SOUNDS=	asterisk-core-sounds-en-g729-1.4.27.tar.gz
+G729_DESC=			Install G.729 format sounds
+ASTERISK_CORE_G729_SOUNDS=	asterisk-core-sounds-en-g729-1.5.tar.gz
 ASTERISK_MOH_G729_SOUNDS=	asterisk-moh-opsound-g729-2.03.tar.gz
 G729_DISTFILES=			${ASTERISK_CORE_G729_SOUNDS}:g729 \
 				${ASTERISK_MOH_G729_SOUNDS}:g729
diff --git a/net/asterisk13/distinfo b/net/asterisk13/distinfo
index c75994d54b60..142d7414b2df 100644
--- a/net/asterisk13/distinfo
+++ b/net/asterisk13/distinfo
@@ -1,6 +1,6 @@
-SHA256 (asterisk-13.7.2.tar.gz) = 8a22856f0cff22b6f1d901eb0a91d459cd73f3ab1f71e9738b947428947fb232
-SIZE (asterisk-13.7.2.tar.gz) = 32176731
-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-13.8.0.tar.gz) = 9953d3ea0023f7be0e14aed587725dacc199116c9453587093e1489073b53d5d
+SIZE (asterisk-13.8.0.tar.gz) = 32520658
+SHA256 (asterisk-core-sounds-en-g729-1.5.tar.gz) = 8b28a59cfa53b59c76e0a191704f0708e3d83acffab8c5e6f25dfc599f0123f9
+SIZE (asterisk-core-sounds-en-g729-1.5.tar.gz) = 1551123
 SHA256 (asterisk-moh-opsound-g729-2.03.tar.gz) = 0147ca9a97f0c550227aacb7793499057c4d2c64e021c95f93722f27d5549585
 SIZE (asterisk-moh-opsound-g729-2.03.tar.gz) = 1103000
diff --git a/net/asterisk13/files/patch-Makefile b/net/asterisk13/files/patch-Makefile
index 597680e2e2e6..b84468d112b8 100644
--- a/net/asterisk13/files/patch-Makefile
+++ b/net/asterisk13/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig	2015-12-15 18:01:38 UTC
+--- Makefile.orig	2016-03-22 18:32:00 UTC
 +++ Makefile
-@@ -128,7 +128,7 @@ ASTTOPDIR:=$(subst $(space),\$(space),$(
+@@ -131,7 +131,7 @@ ASTTOPDIR:=$(subst $(space),\$(space),$(
  OVERWRITE=y
  
  # Include debug and macro symbols in the executables (-g) and profiling info (-pg)
@@ -9,7 +9,7 @@
  
  # Asterisk.conf is located in ASTETCDIR or by using the -C flag
  # when starting Asterisk
-@@ -152,7 +152,7 @@ LINKER_SYMBOL_PREFIX=
+@@ -155,7 +155,7 @@ LINKER_SYMBOL_PREFIX=
  #_ASTCFLAGS+=-DOLD_DSP_ROUTINES
  
  # Default install directory for DAHDI hooks.
@@ -18,7 +18,7 @@
  
  # This Makefile previously contained a note about the ability to use .asterisk.makeopts
  # from your home directory or /etc/asterisk.makeopts to set defaults for menuselect.
-@@ -214,7 +214,7 @@ endif
+@@ -217,7 +217,7 @@ endif
  
  ifeq ($(OSARCH),FreeBSD)
    # -V is understood by BSD Make, not by GNU make.
@@ -27,7 +27,7 @@
    _ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi)
    # flag to tell 'ldconfig' to only process specified directories
    LDCONFIG_FLAGS=-m
-@@ -471,8 +471,12 @@ datafiles: _all doc/core-en_US.xml
+@@ -476,8 +476,12 @@ datafiles: _all doc/core-en_US.xml
  			$(INSTALL) -m 644 $$n "$(DESTDIR)$(ASTDATADIR)/static-http/docs" ; \
  		done \
  	fi
@@ -41,17 +41,16 @@
  	done
  	$(MAKE) -C sounds install
  	find rest-api -name "*.json" | while read x; do \
-@@ -566,7 +570,8 @@ INSTALLDIRS="$(ASTLIBDIR)" "$(ASTMODDIR)
- 	"$(ASTDATADIR)/documentation/thirdparty" "$(ASTDATADIR)/firmware" \
+@@ -572,7 +576,7 @@ INSTALLDIRS="$(ASTLIBDIR)" "$(ASTMODDIR)
  	"$(ASTDATADIR)/firmware/iax" "$(ASTDATADIR)/images" "$(ASTDATADIR)/keys" \
  	"$(ASTDATADIR)/phoneprov" "$(ASTDATADIR)/rest-api" "$(ASTDATADIR)/static-http" \
--	"$(ASTDATADIR)/sounds" "$(ASTDATADIR)/moh" "$(ASTMANDIR)/man8" "$(AGI_DIR)" "$(ASTDBDIR)"
-+	"$(ASTDATADIR)/sounds" "$(ASTDATADIR)/moh" "$(ASTMANDIR)/man8" "$(AGI_DIR)" "$(ASTDBDIR)" \
-+	"$(ASTSPOOLDIR)/outgoing"
+ 	"$(ASTDATADIR)/sounds" "$(ASTDATADIR)/moh" "$(ASTMANDIR)/man8" "$(AGI_DIR)" "$(ASTDBDIR)" \
+-	"$(ASTDATADIR)/third-party"
++	"$(ASTDATADIR)/third-party" "$(ASTSPOOLDIR)/outgoing"
  
  installdirs:
  	@for i in $(INSTALLDIRS); do \
-@@ -603,10 +608,10 @@ bininstall: _all installdirs $(SUBDIRS_I
+@@ -609,10 +613,10 @@ bininstall: _all installdirs $(SUBDIRS_I
  	if [ -f contrib/firmware/iax/iaxy.bin ] ; then \
  		$(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin "$(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin"; \
  	fi
@@ -65,8 +64,8 @@
 +#endif
  
  $(SUBDIRS_INSTALL):
- 	+@DESTDIR="$(DESTDIR)" ASTSBINDIR="$(ASTSBINDIR)" $(SUBMAKE) -C $(@:-install=) install
-@@ -639,7 +644,7 @@ ifneq ($(filter ~%,$(DESTDIR)),)
+ 	+@DESTDIR="$(DESTDIR)" ASTSBINDIR="$(ASTSBINDIR)" ASTDATADIR="$(ASTDATADIR)" $(SUBMAKE) -C $(@:-install=) install
+@@ -645,7 +649,7 @@ ifneq ($(filter ~%,$(DESTDIR)),)
  	@exit 1
  endif
  
@@ -75,7 +74,7 @@
  	@if [ -x /usr/sbin/asterisk-post-install ]; then \
  		/usr/sbin/asterisk-post-install "$(DESTDIR)" . ; \
  	fi
-@@ -682,23 +687,10 @@ upgrade: bininstall
+@@ -688,23 +692,10 @@ upgrade: bininstall
  #  (2) the extension to strip off
  define INSTALL_CONFIGS
  	@for x in configs/$(1)/*$(2); do \
@@ -101,7 +100,7 @@
  		echo "Updating asterisk.conf" ; \
  		sed -e 's|^astetcdir.*$$|astetcdir => $(ASTETCDIR)|' \
  			-e 's|^astmoddir.*$$|astmoddir => $(ASTMODDIR)|' \
-@@ -711,8 +703,8 @@ define INSTALL_CONFIGS
+@@ -717,8 +708,8 @@ define INSTALL_CONFIGS
  			-e 's|^astrundir.*$$|astrundir => $(ASTVARRUNDIR)|' \
  			-e 's|^astlogdir.*$$|astlogdir => $(ASTLOGDIR)|' \
  			-e 's|^astsbindir.*$$|astsbindir => $(ASTSBINDIR)|' \
@@ -112,7 +111,7 @@
  		rm -f "$(DESTDIR)$(ASTCONFPATH).tmp" ; \
  	fi
  endef
-@@ -728,7 +720,7 @@ adsi:
+@@ -734,7 +725,7 @@ adsi:
  		else \
  			echo "Installing $$x" ; \
  		fi ; \
diff --git a/net/asterisk13/files/patch-main__Makefile b/net/asterisk13/files/patch-main__Makefile
index abd3a30833e1..fa292db149e9 100644
--- a/net/asterisk13/files/patch-main__Makefile
+++ b/net/asterisk13/files/patch-main__Makefile
@@ -1,6 +1,6 @@
---- main/Makefile.orig	2015-03-12 12:39:26 UTC
+--- main/Makefile.orig	2016-03-22 18:32:00 UTC
 +++ main/Makefile
-@@ -79,6 +79,7 @@ ifeq ($(OSARCH),FreeBSD)
+@@ -82,6 +82,7 @@ ifeq ($(OSARCH),FreeBSD)
    BSDVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk)
    AST_LIBS+=$(shell if test $(BSDVERSION) -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi)
    AST_LIBS+=-lcrypto
@@ -8,22 +8,41 @@
  endif
  
  ifneq ($(findstring $(OSARCH), mingw32 cygwin ),)
-@@ -218,9 +219,9 @@ ifeq ($(GNU_LD),1)
- endif
- 	$(ECHO_PREFIX) echo "   [LD] $^ -> $@"
- 	$(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(CC_LDFLAGS_SO) $^ $(CC_LIBS)
+@@ -224,11 +225,11 @@ endif
+ 
+ $(ASTSSL_LIB): $(ASTSSL_LIB).$(ASTSSL_SO_VERSION)
+ 	$(ECHO_PREFIX) echo "   [LN] $< -> $@"
 -ifneq ($(LDCONFIG),)
--	$(LDCONFIG) $(LDCONFIG_FLAGS) .
+-	$(CMD_PREFIX) $(LDCONFIG) $(LDCONFIG_FLAGS) . 2>/dev/null
+-else
++#ifneq ($(LDCONFIG),)
++#	$(CMD_PREFIX) $(LDCONFIG) $(LDCONFIG_FLAGS) . 2>/dev/null
++#else
+ 	$(CMD_PREFIX) $(LN) -sf $< $@
 -endif
++#endif
+ 
+ else # Darwin
+ ASTSSL_LIB:=libasteriskssl.dylib
+@@ -304,11 +305,11 @@ $(ASTPJ_LIB).$(ASTPJ_SO_VERSION): libast
+ 
+ $(ASTPJ_LIB): $(ASTPJ_LIB).$(ASTPJ_SO_VERSION)
+ 	$(ECHO_PREFIX) echo "   [LN] $< -> $@"
+-ifneq ($(LDCONFIG),)
+-	$(CMD_PREFIX) $(LDCONFIG) $(LDCONFIG_FLAGS) . 2>/dev/null
+-else
 +#ifneq ($(LDCONFIG),)
-+#	$(LDCONFIG) $(LDCONFIG_FLAGS) .
++#	$(CMD_PREFIX) $(LDCONFIG) $(LDCONFIG_FLAGS) . 2>/dev/null
++#else
+ 	$(CMD_PREFIX) $(LN) -sf $< $@
+-endif
 +#endif
  
- $(ASTSSL_LIB): $(ASTSSL_LIB).$(ASTSSL_SO_VERSION)
- 	$(LN) -sf $< $@
-@@ -265,9 +266,9 @@ ifeq ($(findstring darwin,$(OSARCH)),) #
  else # Darwin
- 	$(INSTALL) -m 755 $(ASTSSL_LIB) "$(DESTDIR)$(ASTLIBDIR)/"
+ ASTPJ_LIB:=libasteriskpj.dylib
+@@ -359,9 +360,9 @@ else # Darwin
+ 	$(INSTALL) -m 755 $(ASTPJ_LIB) "$(DESTDIR)$(ASTLIBDIR)/"
+ endif
  endif
 -ifneq ($(LDCONFIG),)
 -	$(LDCONFIG) $(LDCONFIG_FLAGS) "$(DESTDIR)$(ASTLIBDIR)/"
@@ -31,6 +50,6 @@
 +#ifneq ($(LDCONFIG),)
 +#	$(LDCONFIG) $(LDCONFIG_FLAGS) "$(DESTDIR)$(ASTLIBDIR)/"
 +#endif
- endif
  	$(LN) -sf asterisk "$(DESTDIR)$(ASTSBINDIR)/rasterisk"
  
+ binuninstall:
diff --git a/net/asterisk13/pkg-plist b/net/asterisk13/pkg-plist
index 3a106cab8a57..2813499f9ac8 100644
--- a/net/asterisk13/pkg-plist
+++ b/net/asterisk13/pkg-plist
@@ -70,6 +70,7 @@
 @sample %%ETCDIR%%/oss.conf.sample
 @sample %%ETCDIR%%/phone.conf.sample
 @sample %%ETCDIR%%/phoneprov.conf.sample
+@sample %%ETCDIR%%/pjproject.conf.sample
 @sample %%ETCDIR%%/pjsip.conf.sample
 @sample %%ETCDIR%%/pjsip_notify.conf.sample
 @sample %%ETCDIR%%/pjsip_wizard.conf.sample
@@ -242,6 +243,8 @@ include/asterisk/res_fax.h
 include/asterisk/res_hep.h
 include/asterisk/res_mwi_external.h
 include/asterisk/res_odbc.h
+include/asterisk/res_odbc_transaction.h
+include/asterisk/res_pjproject.h
 include/asterisk/res_pjsip.h
 include/asterisk/res_pjsip_body_generator_types.h
 include/asterisk/res_pjsip_cli.h
@@ -365,12 +368,13 @@ sbin/safe_asterisk
 %%DOCSDIR%%/images/asterisk-intro.jpg
 %%DOCSDIR%%/images/kpad2.jpg
 @dir lib/asterisk/modules
-@dir %%DATADIR%%/sounds
-@dir %%DATADIR%%/moh
-@dir %%DATADIR%%/keys
-@dir %%DATADIR%%/images
-@dir %%DATADIR%%/firmware/iax
 @dir %%DATADIR%%/documentation/thirdparty
+@dir %%DATADIR%%/firmware/iax
+@dir %%DATADIR%%/images
+@dir %%DATADIR%%/keys
+@dir %%DATADIR%%/moh
+@dir %%DATADIR%%/sounds
+@dir %%DATADIR%%/third-party
 @owner %%ASTERISK_USER%%
 @group %%ASTERISK_GROUP%%
 @dir %%VARDIR%%/log/asterisk/cdr-csv