Index: head/net/asterisk11/Makefile
===================================================================
--- head/net/asterisk11/Makefile	(revision 412187)
+++ head/net/asterisk11/Makefile	(revision 412188)
@@ -1,268 +1,268 @@
 # $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 \
 			asterisk/old-releases/:main \
 			sounds/releases/:g729
 PKGNAMESUFFIX=	11
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:main
 
 MAINTAINER=	madpilot@FreeBSD.org
 COMMENT=	Open Source PBX and telephony toolkit
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 EXTRACT_ONLY:=	${DISTNAME}${EXTRACT_SUFX}
 
 ONLY_FOR_ARCHS=	i386 amd64 powerpc sparc64
 
 USES=		bison cpe gmake iconv localbase ncurses shebangfix sqlite
 USE_CSTD=	gnu89
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 USE_OPENSSL=	yes
 USE_RC_SUBR=	asterisk
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--with-crypto=${OPENSSLBASE} \
 			--with-ssl=${OPENSSLBASE}
 
 CPE_VENDOR=	digium
 
 SHEBANG_FILES=	agi/agi-test.agi \
 		agi/jukebox.agi
 
 MAKE_ENV=	PTHREAD_LIBS="-lpthread" \
 		MKDIR="${MKDIR}" \
 		PWLIBDIR=${LOCALBASE}/share/pwlib \
 		OSVERSION=${OSVERSION} \
 		DOCSDIR=${DOCSDIR} \
 		ASTCFLAGS="${CFLAGS}" \
 		ASTLDFLAGS="${LDFLAGS}"
 MAKE_ARGS+=	NOISY_BUILD=yes \
 		ASTDATADIR=${DATADIR}
 
 CONFLICTS_BUILD=	linuxthreads-* pjsip-*
 CONFLICTS_INSTALL=	asterisk*-1.8* asterisk*-13*
 
 OPTIONS_DEFINE=			BACKTRACE CURL EXCHANGE FREETDS LDAP LUA \
 				MP3PLAYER OOH323 RADIUS SNMP SPANDSP SRTP \
 				SYSINFO UUID XMPP
 OPTIONS_DEFAULT=		BACKTRACE CURL FREETDS GCC GSM LUA MP3PLAYER \
 				NEWT ODBC PGSQL RADIUS SNMP SPANDSP SPEEX \
 				SQLITE2 UUID VORBIS XMPP
 
 OPTIONS_DEFINE_i386=		DAHDI
 OPTIONS_DEFINE_amd64=		DAHDI
 OPTIONS_DEFINE_sparc64=		DAHDI
 
 OPTIONS_DEFAULT_i386=		DAHDI
 OPTIONS_DEFAULT_amd64=		DAHDI
 OPTIONS_DEFAULT_sparc64=	DAHDI
 
 OPTIONS_GROUP=			CODECS
 OPTIONS_GROUP_CODECS=		GSM NEWG711 SPEEX VORBIS
 CODECS_DESC=			Encoder/Decoder (Codec) Support
 
 OPTIONS_SINGLE=			COMPILER
 OPTIONS_SINGLE_COMPILER=	BASE GCC
 COMPILER_DESC=			Compiler to use
 
 OPTIONS_GROUP+=			DATABASE
 OPTIONS_GROUP_DATABASE=		MYSQL ODBC PGSQL SQLITE2
 DATABASE_DESC=			Database Support
 
 OPTIONS_MULTI=			MENU
 OPTIONS_MULTI_MENU=		NCURSES NEWT
 MENU_DESC=			Menuselect Interface Backend
 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
 G729_DISTFILES=			${ASTERISK_CORE_G729_SOUNDS}:g729 \
 				${ASTERISK_MOH_G729_SOUNDS}:g729
 
 BACKTRACE_DESC= Stack backtrace support via (lib)execinfo
 BASE_DESC=	Use base compiler (experimental)
 DAHDI_DESC=	DAHDI support
 EXCHANGE_DESC=	Exchange calendar support
 MP3PLAYER_DESC=	Install MP3 Player for Music-On-Hold (mpg123)
 NEWG711_DESC=	New G711 codec
 OOH323_DESC=	ooh323 support
 SRTP_DESC=	SecureRTP support
 SYSINFO_DESC=	Use devel/libsysinfo to get system information
 UUID_DESC=	libuuid support (required for ICE and TURN in RTP)
 XMPP_DESC=	XMPP/GTALK support
 
 OPTIONS_SUB=		yes
 
 BACKTRACE_CONFIGURE_WITH=	execinfo
 BACKTRACE_USES=			execinfo
 
 CURL_CONFIGURE_ON=	--with-libcurl
 CURL_CONFIGURE_OFF=	--with-libcurl=no
 CURL_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
 
 DAHDI_CONFIGURE_ON=	--with-dahdi --with-openr2
 DAHDI_CONFIGURE_OFF=	--without-dahdi --without-openr2
 DAHDI_BUILD_DEPENDS=	libpri>=1.4.10:${PORTSDIR}/misc/libpri \
 			${LOCALBASE}/include/dahdi/user.h:${PORTSDIR}/misc/dahdi
 DAHDI_LIB_DEPENDS=	libpri.so:${PORTSDIR}/misc/libpri \
 			libopenr2.so:${PORTSDIR}/misc/openr2
 
 EXCHANGE_CONFIGURE_OFF=	--without-neon --without-neon29
 EXCHANGE_LIB_DEPENDS=	libneon.so:${PORTSDIR}/www/neon
 
 FREETDS_CONFIGURE_ON=	--with-tds=${LOCALBASE}
 FREETDS_CONFIGURE_OFF=	--without-tds
 FREETDS_LIB_DEPENDS=	libsybdb.so:${PORTSDIR}/databases/freetds
 
 GCC_USE=		GCC=yes
 
 GSM_CONFIGURE_WITH=	gsm
 GSM_LIB_DEPENDS=	libgsm.so:${PORTSDIR}/audio/gsm
 
 LDAP_CONFIGURE_WITH=	ldap
 LDAP_USE=		OPENLDAP=yes
 
 LUA_CONFIGURE_WITH=	lua
 LUA_USES=		lua:51
 LUA_CFLAGS=		-I${LUA_INCDIR}
 LUA_LDFLAGS=		-L${LUA_LIBDIR}
 
 MYSQL_CONFIGURE_WITH=	mysqlclient
 MYSQL_USE=		MYSQL=yes
 
 MP3PLAYER_RUN_DEPENDS=	mpg123:${PORTSDIR}/audio/mpg123
 
 NCURSES_USES=		ncurses
 NEWT_LIB_DEPENDS=	libnewt.so:${PORTSDIR}/devel/newt
 
 ODBC_CONFIGURE_WITH=	unixodbc
 ODBC_CONFIGURE_ON=	--with-ltdl
 ODBC_LIB_DEPENDS=	libodbc.so:${PORTSDIR}/databases/unixODBC \
 			libltdl.so:${PORTSDIR}/devel/libltdl
 
 OOH323_CPPFLAGS=	-I${LOCALBASE}/include/openh323
 OOH323_LIB_DEPENDS=	libpt_r.so:${PORTSDIR}/devel/pwlib \
 			libh323_r.so:${PORTSDIR}/net/openh323
 OOH323_MAKE_ENV=	OPENH323DIR=${LOCALBASE}/share/openh323
 
 PGSQL_CONFIGURE_WITH=	postgres
 PGSQL_USES=		pgsql
 
 RADIUS_CONFIGURE_WITH=	radius
 RADIUS_LIB_DEPENDS=	libradiusclient-ng.so:${PORTSDIR}/net/radiusclient
 
 SNMP_CONFIGURE_WITH=	netsnmp
 SNMP_LIB_DEPENDS=	libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
 
 SPANDSP_CONFIGURE_WITH=	spandsp
 SPANDSP_LIB_DEPENDS=	libspandsp.so:${PORTSDIR}/comms/spandsp
 
 SPEEX_CONFIGURE_WITH=	speex
 SPEEX_LIB_DEPENDS=	libspeex.so:${PORTSDIR}/audio/speex
 
 SQLITE2_CONFIGURE_WITH=	sqlite
 SQLITE2_LIB_DEPENDS=	libsqlite.so:${PORTSDIR}/databases/sqlite2
 
 SRTP_CONFIGURE_WITH=	srtp
 SRTP_BUILD_DEPENDS=	libsrtp>=1.4.4:${PORTSDIR}/net/libsrtp
 
 SYSINFO_LIB_DEPENDS=	libsysinfo.so:${PORTSDIR}/devel/libsysinfo
 
 UUID_LIB_DEPENDS=	libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid
 UUID_CONFIGURE_ON=	--with-uuid=${LOCALBASE}
 UUID_CONFIGURE_OFF=	--disable-uuid
 UUID_CONFLICTS=		ossp-uuid-[0-9]*
 
 VORBIS_CONFIGURE_WITH=	ogg
 VORBIS_LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis
 
 XMPP_CONFIGURE_WITH=	iksemel
 XMPP_LIB_DEPENDS=	libiksemel.so:${PORTSDIR}/textproc/iksemel
 
 ASTERISK_USER?=		asterisk
 ASTERISK_GROUP?=	asterisk
 
 USERS=	${ASTERISK_USER}
 GROUPS=	${ASTERISK_GROUP} dahdi
 
 .include <bsd.port.pre.mk>
 
 .if ${PREFIX} == ${LOCALBASE}
 VARDIR=/var
 .else
 VARDIR=${PREFIX}/var
 .endif
 
 SUB_LIST+=	ASTERISK_USER=${ASTERISK_USER}
 PLIST_SUB+=	ASTERISK_USER=${ASTERISK_USER} \
 		ASTERISK_GROUP=${ASTERISK_GROUP} \
 		VARDIR=${VARDIR}
 
 post-extract:
 	@${FIND} ${WRKSRC} -name '*.d' -delete
 
 .if ${PORT_OPTIONS:MG729}
 	${CP} ${DISTDIR}/${ASTERISK_CORE_G729_SOUNDS} ${WRKSRC}/sounds
 	${CP} ${DISTDIR}/${ASTERISK_MOH_G729_SOUNDS} ${WRKSRC}/sounds
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/var/lib|${PREFIX}/share|g' ${WRKSRC}/configs/musiconhold.conf.sample
 	@${REINPLACE_CMD} -e 's/-liconv/${ICONV_LIB}/' ${WRKSRC}/configure
 .if ${PORT_OPTIONS:MSYSINFO}
 	@${REINPLACE_CMD} -e 's/%%LIBSYSINFO%%/-lsysinfo/' ${WRKSRC}/main/Makefile
 .else
 	@${REINPLACE_CMD} -e '/#define HAVE_SYSINFO 1/d' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e '/%%LIBSYSINFO%%/d' ${WRKSRC}/main/Makefile
 .endif
 
 .if exists(${FILESDIR}/.asterisk.makeopts)
 USER_MAKEOPTS_FILE=${FILESDIR}/.asterisk.makeopts
 .else
 USER_MAKEOPTS_FILE=
 .endif
 
 post-configure:
 	@cd ${WRKSRC} && ${MAKE_CMD} menuselect.makeopts USER_MAKEOPTS="${USER_MAKEOPTS_FILE}"
 	@cd ${WRKSRC} && ./menuselect/menuselect --disable res_timing_kqueue menuselect.makeopts
 	@cd ${WRKSRC} && ./menuselect/menuselect --enable chan_mgcp menuselect.makeopts
 	@cd ${WRKSRC} && ./menuselect/menuselect --enable res_pktccops menuselect.makeopts
 .if ${PORT_OPTIONS:MMYSQL}
 	@cd ${WRKSRC} && ./menuselect/menuselect --enable res_config_mysql menuselect.makeopts
 	@cd ${WRKSRC} && ./menuselect/menuselect --enable app_mysql menuselect.makeopts
 	@cd ${WRKSRC} && ./menuselect/menuselect --enable cdr_mysql menuselect.makeopts
 .endif
 .if ${PORT_OPTIONS:MOOH323}
 	@cd ${WRKSRC} && ./menuselect/menuselect --enable chan_ooh323 menuselect.makeopts
 .endif
 .if ${PORT_OPTIONS:MNEWG711}
 	@cd ${WRKSRC} && ./menuselect/menuselect --enable G711_NEW_ALGORITHM menuselect.makeopts
 .endif
 
 pre-build:
 	@${MKDIR} ${WRKSRC}/res/pjproject/pjnath/lib ${WRKSRC}/res/pjproject/pjlib-util/lib \
 		${WRKSRC}/res/pjproject/pjlib/lib
 
 post-install:
 	@${RM} ${STAGEDIR}${ETCDIR}/*.conf ${STAGEDIR}${ETCDIR}/extensions.ael ${STAGEDIR}${ETCDIR}/extensions.lua
 	${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}
 
 	(cd ${STAGEDIR} && \
 		${FIND} var/spool/${PORTNAME}/voicemail/default -type f | ${SED} "s,^,/," >> ${TMPPLIST} && \
 		${FIND} var/spool/${PORTNAME}/voicemail/ -type d | ${SED} "s,^,@dir /," >> ${TMPPLIST});
 
 .include <bsd.port.post.mk>
Index: head/net/asterisk11/distinfo
===================================================================
--- head/net/asterisk11/distinfo	(revision 412187)
+++ head/net/asterisk11/distinfo	(revision 412188)
@@ -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
Index: head/net/asterisk13/Makefile
===================================================================
--- head/net/asterisk13/Makefile	(revision 412187)
+++ head/net/asterisk13/Makefile	(revision 412188)
@@ -1,289 +1,289 @@
 # $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 \
 			asterisk/old-releases/:main \
 			sounds/releases/:g729
 PKGNAMESUFFIX=	13
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:main
 
 MAINTAINER=	madpilot@FreeBSD.org
 COMMENT=	Open Source PBX and telephony toolkit
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid \
 		libjansson.so:${PORTSDIR}/devel/jansson
 
 EXTRACT_ONLY:=	${DISTNAME}${EXTRACT_SUFX}
 
 ONLY_FOR_ARCHS=	i386 amd64 powerpc sparc64
 
 USES=		bison cpe gmake iconv localbase ncurses shebangfix sqlite
 USE_CSTD=	gnu89
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 USE_OPENSSL=	yes
 USE_RC_SUBR=	asterisk
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--datarootdir=${DATADIR} \
 			--with-crypto=${OPENSSLBASE} \
 			--with-ssl=${OPENSSLBASE}
 
 CPE_VENDOR=	digium
 
 SHEBANG_FILES=	agi/agi-test.agi \
 		agi/jukebox.agi \
 		contrib/scripts/astversion
 
 MAKE_ENV=	PTHREAD_LIBS="-lpthread" \
 		MKDIR="${MKDIR}" \
 		PWLIBDIR=${LOCALBASE}/share/pwlib \
 		OSVERSION=${OSVERSION} \
 		DOCSDIR=${DOCSDIR} \
 		ASTCFLAGS="${CFLAGS}" \
 		ASTLDFLAGS="${LDFLAGS}"
 MAKE_ARGS+=	NOISY_BUILD=yes \
 		ASTDATADIR=${DATADIR}
 
 CONFLICTS=		ossp-uuid-[0-9]*
 CONFLICTS_BUILD=	linuxthreads-*
 CONFLICTS_INSTALL=	asterisk*-1.8* asterisk*-11*
 
 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 \
 				PORTAUDIO RADIUS SNMP SPANDSP SPEEX SQLITE2 VORBIS \
 				XMPP
 
 OPTIONS_DEFINE_i386=		DAHDI
 OPTIONS_DEFINE_amd64=		DAHDI
 OPTIONS_DEFINE_sparc64=		DAHDI
 
 OPTIONS_DEFAULT_i386=		DAHDI
 OPTIONS_DEFAULT_amd64=		DAHDI
 OPTIONS_DEFAULT_sparc64=	DAHDI
 
 OPTIONS_GROUP=			CODECS
 OPTIONS_GROUP_CODECS=		GSM NEWG711 SPEEX VORBIS
 CODECS_DESC=			Encoder/Decoder (Codec) Support
 
 OPTIONS_SINGLE=			COMPILER
 OPTIONS_SINGLE_COMPILER=	BASE GCC
 COMPILER_DESC=			Compiler to use
 
 OPTIONS_GROUP+=			DATABASE
 OPTIONS_GROUP_DATABASE=		MYSQL ODBC PGSQL SQLITE2
 DATABASE_DESC=			Database Support
 
 OPTIONS_MULTI=			MENU
 OPTIONS_MULTI_MENU=		NCURSES NEWT
 MENU_DESC=			Menuselect Interface Backend
 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
 
 ASTVERSION_DESC?= Install astversion (requires bash)
 BACKTRACE_DESC?= Stack backtrace support via (lib)execinfo
 BASE_DESC=	Use base compiler (experimental)
 DAHDI_DESC?=	DAHDI support
 EXCHANGE_DESC?=	Exchange calendar support
 MP3PLAYER_DESC=	Install MP3 Player for Music-On-Hold (mpg123)
 NEWG711_DESC?=	New G711 Codec
 OOH323_DESC?=	ooh323 support
 PJSIP_DESC?=	Build the PJSIP based SIP channel
 SRTP_DESC?=	SecureRTP support
 SYSINFO_DESC?=	Use devel/libsysinfo to get system information
 XMPP_DESC?=	XMPP/GTALK support
 
 OPTIONS_SUB=		yes
 
 ASTVERSION_RUN_DEPENDS=		bash:${PORTSDIR}/shells/bash
 
 BACKTRACE_CONFIGURE_WITH=	execinfo
 BACKTRACE_USES=			execinfo
 
 CURL_CONFIGURE_ON=	--with-libcurl
 CURL_CONFIGURE_OFF=	--with-libcurl=no
 CURL_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
 
 DAHDI_CONFIGURE_ON=	--with-dahdi --with-openr2
 DAHDI_CONFIGURE_OFF=	--without-dahdi --without-openr2
 DAHDI_BUILD_DEPENDS=	libpri>=1.4.10:${PORTSDIR}/misc/libpri \
 			${LOCALBASE}/include/dahdi/user.h:${PORTSDIR}/misc/dahdi
 DAHDI_LIB_DEPENDS=	libpri.so:${PORTSDIR}/misc/libpri \
 			libopenr2.so:${PORTSDIR}/misc/openr2
 
 EXCHANGE_CONFIGURE_OFF=	--without-neon --without-neon29
 EXCHANGE_LIB_DEPENDS=	libneon.so:${PORTSDIR}/www/neon
 
 FREETDS_CONFIGURE_ON=	--with-tds=${LOCALBASE}
 FREETDS_CONFIGURE_OFF=	--without-tds
 FREETDS_LIB_DEPENDS=	libsybdb.so:${PORTSDIR}/databases/freetds
 
 GCC_USE=		GCC=yes
 
 GSM_CONFIGURE_WITH=	gsm
 GSM_LIB_DEPENDS=	libgsm.so:${PORTSDIR}/audio/gsm
 
 LDAP_CONFIGURE_WITH=	ldap
 LDAP_USE=		OPENLDAP=yes
 
 LUA_CONFIGURE_WITH=	lua
 LUA_USES=		lua:51
 LUA_CFLAGS=		-I${LUA_INCDIR}
 LUA_LDFLAGS=		-L${LUA_LIBDIR}
 
 MYSQL_CONFIGURE_WITH=	mysqlclient
 MYSQL_USE=		MYSQL=yes
 
 MP3PLAYER_RUN_DEPENDS=	mpg123:${PORTSDIR}/audio/mpg123
 
 NCURSES_USES=		ncurses
 NEWT_LIB_DEPENDS=	libnewt.so:${PORTSDIR}/devel/newt
 
 ODBC_CONFIGURE_WITH=	unixodbc
 ODBC_CONFIGURE_ON=	--with-ltdl
 ODBC_LIB_DEPENDS=	libodbc.so:${PORTSDIR}/databases/unixODBC \
 			libltdl.so:${PORTSDIR}/devel/libltdl
 
 OOH323_CPPFLAGS=	-I${LOCALBASE}/include/openh323
 OOH323_LIB_DEPENDS=     libpt_r.so:${PORTSDIR}/devel/pwlib \
 			libh323_r.so:${PORTSDIR}/net/openh323
 OOH323_MAKE_ENV=	OPENH323DIR=${LOCALBASE}/share/openh323
 
 PGSQL_CONFIGURE_WITH=	postgres
 PGSQL_USES=		pgsql
 
 PJSIP_CONFIGURE_WITH=	pjproject
 PJSIP_USES=		pkgconfig
 
 PORTAUDIO_CONFIGURE_WITH=	portaudio
 PORTAUDIO_LIB_DEPENDS=	libportaudio.so:${PORTSDIR}/audio/portaudio
 
 RADIUS_CONFIGURE_WITH=	radius
 RADIUS_LIB_DEPENDS=	libradiusclient-ng.so:${PORTSDIR}/net/radiusclient
 
 SNMP_CONFIGURE_WITH=	netsnmp
 SNMP_LIB_DEPENDS=	libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
 
 SPANDSP_CONFIGURE_WITH=	spandsp
 SPANDSP_LIB_DEPENDS=	libspandsp.so:${PORTSDIR}/comms/spandsp
 
 SPEEX_CONFIGURE_WITH=	speex
 SPEEX_LIB_DEPENDS=	libspeex.so:${PORTSDIR}/audio/speex
 
 SQLITE2_CONFIGURE_WITH=	sqlite
 SQLITE2_LIB_DEPENDS=	libsqlite.so:${PORTSDIR}/databases/sqlite2
 
 SRTP_CONFIGURE_WITH=	srtp
 
 SYSINFO_LIB_DEPENDS=	libsysinfo.so:${PORTSDIR}/devel/libsysinfo
 
 VORBIS_CONFIGURE_WITH=	ogg
 VORBIS_LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis
 
 XMPP_CONFIGURE_WITH=	iksemel
 XMPP_LIB_DEPENDS=	libiksemel.so:${PORTSDIR}/textproc/iksemel
 
 ASTERISK_USER?=		asterisk
 ASTERISK_GROUP?=	asterisk
 
 USERS=	${ASTERISK_USER}
 GROUPS=	${ASTERISK_GROUP} dahdi
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPJSIP} && ${PORT_OPTIONS:MSRTP}
 LIB_DEPENDS+=	libpj.so:${PORTSDIR}/net/pjsip-extsrtp
 .elif ${PORT_OPTIONS:MPJSIP} && ! ${PORT_OPTIONS:MSRTP}
 LIB_DEPENDS+=   libpj.so:${PORTSDIR}/net/pjsip
 .elif ! ${PORT_OPTIONS:MPJSIP} && ${PORT_OPTIONS:MSRTP}
 LIB_DEPENDS+=   libsrtp.so:${PORTSDIR}/net/libsrtp
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if empty(ICONV_LIB)
 CONFIGURE_ARGS+=ac_cv_lib_iconv_iconv_open=no \
 		ac_cv_lib_iconv_libiconv_open=no
 .endif
 
 .if ${PREFIX} == ${LOCALBASE}
 VARDIR=/var
 .else
 VARDIR=${PREFIX}/var
 .endif
 
 SUB_LIST+=	ASTERISK_USER=${ASTERISK_USER}
 PLIST_SUB+=	ASTERISK_USER=${ASTERISK_USER} \
 		ASTERISK_GROUP=${ASTERISK_GROUP} \
 		VARDIR=${VARDIR}
 
 post-extract:
 	@${FIND} ${WRKSRC} -name '*.d' -delete
 
 .if ${PORT_OPTIONS:MG729}
 	${CP} ${DISTDIR}/${ASTERISK_CORE_G729_SOUNDS} ${WRKSRC}/sounds
 	${CP} ${DISTDIR}/${ASTERISK_MOH_G729_SOUNDS} ${WRKSRC}/sounds
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/var/lib|${PREFIX}/share|g' ${WRKSRC}/configs/samples/musiconhold.conf.sample
 .if ${PORT_OPTIONS:MSYSINFO}
 	@${REINPLACE_CMD} -e 's/%%LIBSYSINFO%%/-lsysinfo/' ${WRKSRC}/main/Makefile
 .else
 	@${REINPLACE_CMD} -e '/#define HAVE_SYSINFO 1/d' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e '/%%LIBSYSINFO%%/d' ${WRKSRC}/main/Makefile
 .endif
 
 .if exists(${FILESDIR}/.asterisk.makeopts)
 USER_MAKEOPTS_FILE=${FILESDIR}/.asterisk.makeopts
 .else
 USER_MAKEOPTS_FILE=
 .endif
 
 post-configure:
 	@cd ${WRKSRC} && ${MAKE_CMD} menuselect.makeopts USER_MAKEOPTS="${USER_MAKEOPTS_FILE}"
 	@cd ${WRKSRC} && ./menuselect/menuselect --disable res_timing_kqueue menuselect.makeopts
 	@cd ${WRKSRC} && ./menuselect/menuselect --enable chan_mgcp menuselect.makeopts
 	@cd ${WRKSRC} && ./menuselect/menuselect --enable res_pktccops menuselect.makeopts
 .if ${PORT_OPTIONS:MMYSQL}
 	@cd ${WRKSRC} && ./menuselect/menuselect --enable res_config_mysql menuselect.makeopts
 	@cd ${WRKSRC} && ./menuselect/menuselect --enable app_mysql menuselect.makeopts
 	@cd ${WRKSRC} && ./menuselect/menuselect --enable cdr_mysql menuselect.makeopts
 .endif
 .if ${PORT_OPTIONS:MOOH323}
 	@cd ${WRKSRC} && ./menuselect/menuselect --enable chan_ooh323 menuselect.makeopts
 .endif
 .if ${PORT_OPTIONS:MNEWG711}
 	@cd ${WRKSRC} && ./menuselect/menuselect --enable G711_NEW_ALGORITHM menuselect.makeopts
 .endif
 
 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}
 
 	(cd ${STAGEDIR} && \
 		${FIND} var/spool/${PORTNAME}/voicemail/default -type f | ${SED} "s,^,/," >> ${TMPPLIST} && \
 		${FIND} var/spool/${PORTNAME}/voicemail/ -type d | ${SED} "s,^,@dir /," >> ${TMPPLIST});
 
 .include <bsd.port.post.mk>
Index: head/net/asterisk13/distinfo
===================================================================
--- head/net/asterisk13/distinfo	(revision 412187)
+++ head/net/asterisk13/distinfo	(revision 412188)
@@ -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
Index: head/net/asterisk13/files/patch-Makefile
===================================================================
--- head/net/asterisk13/files/patch-Makefile	(revision 412187)
+++ head/net/asterisk13/files/patch-Makefile	(revision 412188)
@@ -1,123 +1,122 @@
---- 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)
 -DEBUG=-g3
 +#DEBUG=-g3
  
  # 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.
 -DAHDI_UDEV_HOOK_DIR = /usr/share/dahdi/span_config.d
 +#DAHDI_UDEV_HOOK_DIR = /usr/share/dahdi/span_config.d
  
  # 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.
 -  BSDVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk)
 +  BSDVERSION=$(OSVERSION)
    _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
 +	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)$(DOCSDIR)/images" ; \
  	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
 -ifeq ($(HAVE_DAHDI),1)
 -	$(INSTALL) -d $(DESTDIR)/$(DAHDI_UDEV_HOOK_DIR)
 -	$(INSTALL) -m 644 contrib/scripts/dahdi_span_config_hook $(DESTDIR)$(DAHDI_UDEV_HOOK_DIR)/40-asterisk
 -endif
 +#ifeq ($(HAVE_DAHDI),1)
 +#	$(INSTALL) -d $(DESTDIR)/$(DAHDI_UDEV_HOOK_DIR)
 +#	$(INSTALL) -m 644 contrib/scripts/dahdi_span_config_hook $(DESTDIR)$(DAHDI_UDEV_HOOK_DIR)/40-asterisk
 +#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
  
 -install: badshell bininstall datafiles
 +install: badshell bininstall datafiles samples
  	@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 \
 -		dst="$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x $(2)`"; \
 -		if [ -f "$${dst}" ]; then \
 -			if [ "$(OVERWRITE)" = "y" ]; then \
 -				if cmp -s "$${dst}" "$$x" ; then \
 -					echo "Config file $$x is unchanged"; \
 -					continue; \
 -				fi ; \
 -				mv -f "$${dst}" "$${dst}.old" ; \
 -			else \
 -				echo "Skipping config file $$x"; \
 -				continue; \
 -			fi ;\
 -		fi ; \
  		echo "Installing file $$x"; \
 -		$(INSTALL) -m 644 "$$x" "$${dst}" ;\
 +		$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`.sample ; \
  	done ; \
 -	if [ "$(OVERWRITE)" = "y" ]; then \
 +	if true; then \
  		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)|' \
 -			"$(DESTDIR)$(ASTCONFPATH)" > "$(DESTDIR)$(ASTCONFPATH).tmp" ; \
 -		$(INSTALL) -m 644 "$(DESTDIR)$(ASTCONFPATH).tmp" "$(DESTDIR)$(ASTCONFPATH)" ; \
 +			"$(DESTDIR)$(ASTCONFPATH).sample" > "$(DESTDIR)$(ASTCONFPATH).tmp" ; \
 +		$(INSTALL) -m 644 "$(DESTDIR)$(ASTCONFPATH).tmp" "$(DESTDIR)$(ASTCONFPATH).sample" ; \
  		rm -f "$(DESTDIR)$(ASTCONFPATH).tmp" ; \
  	fi
  endef
-@@ -728,7 +720,7 @@ adsi:
+@@ -734,7 +725,7 @@ adsi:
  		else \
  			echo "Installing $$x" ; \
  		fi ; \
 -		$(INSTALL) -m 644 "$$x" "$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`" ; \
 +		$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`.sample ; \
  	done
  
  samples: adsi
Index: head/net/asterisk13/files/patch-main__Makefile
===================================================================
--- head/net/asterisk13/files/patch-main__Makefile	(revision 412187)
+++ head/net/asterisk13/files/patch-main__Makefile	(revision 412188)
@@ -1,36 +1,55 @@
---- 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
 +  AST_LIBS+=%%LIBSYSINFO%%
  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)/"
 -endif
 +#ifneq ($(LDCONFIG),)
 +#	$(LDCONFIG) $(LDCONFIG_FLAGS) "$(DESTDIR)$(ASTLIBDIR)/"
 +#endif
- endif
  	$(LN) -sf asterisk "$(DESTDIR)$(ASTSBINDIR)/rasterisk"
  
+ binuninstall:
Index: head/net/asterisk13/pkg-plist
===================================================================
--- head/net/asterisk13/pkg-plist	(revision 412187)
+++ head/net/asterisk13/pkg-plist	(revision 412188)
@@ -1,391 +1,395 @@
 @sample %%ETCDIR%%/acl.conf.sample
 @sample %%ETCDIR%%/adsi.conf.sample
 @sample %%ETCDIR%%/agents.conf.sample
 @sample %%ETCDIR%%/alarmreceiver.conf.sample
 @sample %%ETCDIR%%/alsa.conf.sample
 @sample %%ETCDIR%%/amd.conf.sample
 @sample %%ETCDIR%%/app_mysql.conf.sample
 @sample %%ETCDIR%%/app_skel.conf.sample
 @sample %%ETCDIR%%/ari.conf.sample
 @sample %%ETCDIR%%/asterisk.adsi.sample
 @sample %%ETCDIR%%/asterisk.conf.sample
 @sample %%ETCDIR%%/calendar.conf.sample
 @sample %%ETCDIR%%/ccss.conf.sample
 @sample %%ETCDIR%%/cdr.conf.sample
 @sample %%ETCDIR%%/cdr_adaptive_odbc.conf.sample
 @sample %%ETCDIR%%/cdr_custom.conf.sample
 @sample %%ETCDIR%%/cdr_manager.conf.sample
 @sample %%ETCDIR%%/cdr_mysql.conf.sample
 @sample %%ETCDIR%%/cdr_odbc.conf.sample
 @sample %%ETCDIR%%/cdr_pgsql.conf.sample
 @sample %%ETCDIR%%/cdr_sqlite3_custom.conf.sample
 @sample %%ETCDIR%%/cdr_syslog.conf.sample
 @sample %%ETCDIR%%/cdr_tds.conf.sample
 @sample %%ETCDIR%%/cel.conf.sample
 @sample %%ETCDIR%%/cel_custom.conf.sample
 @sample %%ETCDIR%%/cel_odbc.conf.sample
 @sample %%ETCDIR%%/cel_pgsql.conf.sample
 @sample %%ETCDIR%%/cel_sqlite3_custom.conf.sample
 @sample %%ETCDIR%%/cel_tds.conf.sample
 @sample %%ETCDIR%%/chan_dahdi.conf.sample
 @sample %%ETCDIR%%/chan_mobile.conf.sample
 @sample %%ETCDIR%%/cli.conf.sample
 @sample %%ETCDIR%%/cli_aliases.conf.sample
 @sample %%ETCDIR%%/cli_permissions.conf.sample
 @sample %%ETCDIR%%/codecs.conf.sample
 @sample %%ETCDIR%%/confbridge.conf.sample
 @sample %%ETCDIR%%/config_test.conf.sample
 @sample %%ETCDIR%%/console.conf.sample
 @sample %%ETCDIR%%/dbsep.conf.sample
 @sample %%ETCDIR%%/dnsmgr.conf.sample
 @sample %%ETCDIR%%/dsp.conf.sample
 @sample %%ETCDIR%%/dundi.conf.sample
 @sample %%ETCDIR%%/enum.conf.sample
 @sample %%ETCDIR%%/extconfig.conf.sample
 @sample %%ETCDIR%%/extensions.ael.sample
 @sample %%ETCDIR%%/extensions.conf.sample
 @sample %%ETCDIR%%/extensions.lua.sample
 @sample %%ETCDIR%%/extensions_minivm.conf.sample
 @sample %%ETCDIR%%/features.conf.sample
 @sample %%ETCDIR%%/festival.conf.sample
 @sample %%ETCDIR%%/followme.conf.sample
 @sample %%ETCDIR%%/func_odbc.conf.sample
 @sample %%ETCDIR%%/hep.conf.sample
 @sample %%ETCDIR%%/http.conf.sample
 @sample %%ETCDIR%%/iax.conf.sample
 @sample %%ETCDIR%%/iaxprov.conf.sample
 @sample %%ETCDIR%%/indications.conf.sample
 @sample %%ETCDIR%%/logger.conf.sample
 @sample %%ETCDIR%%/manager.conf.sample
 @sample %%ETCDIR%%/meetme.conf.sample
 @sample %%ETCDIR%%/mgcp.conf.sample
 @sample %%ETCDIR%%/minivm.conf.sample
 @sample %%ETCDIR%%/misdn.conf.sample
 @sample %%ETCDIR%%/modules.conf.sample
 @sample %%ETCDIR%%/motif.conf.sample
 @sample %%ETCDIR%%/musiconhold.conf.sample
 @sample %%ETCDIR%%/muted.conf.sample
 @sample %%ETCDIR%%/ooh323.conf.sample
 @sample %%ETCDIR%%/osp.conf.sample
 @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
 @sample %%ETCDIR%%/queuerules.conf.sample
 @sample %%ETCDIR%%/queues.conf.sample
 @sample %%ETCDIR%%/res_config_mysql.conf.sample
 @sample %%ETCDIR%%/res_config_sqlite.conf.sample
 @sample %%ETCDIR%%/res_config_sqlite3.conf.sample
 @sample %%ETCDIR%%/res_corosync.conf.sample
 @sample %%ETCDIR%%/res_curl.conf.sample
 @sample %%ETCDIR%%/res_fax.conf.sample
 @sample %%ETCDIR%%/res_ldap.conf.sample
 @sample %%ETCDIR%%/res_odbc.conf.sample
 @sample %%ETCDIR%%/res_parking.conf.sample
 @sample %%ETCDIR%%/res_pgsql.conf.sample
 @sample %%ETCDIR%%/res_pktccops.conf.sample
 @sample %%ETCDIR%%/res_snmp.conf.sample
 @sample %%ETCDIR%%/res_stun_monitor.conf.sample
 @sample %%ETCDIR%%/rtp.conf.sample
 @sample %%ETCDIR%%/say.conf.sample
 @sample %%ETCDIR%%/sip.conf.sample
 @sample %%ETCDIR%%/sip_notify.conf.sample
 @sample %%ETCDIR%%/skinny.conf.sample
 @sample %%ETCDIR%%/sla.conf.sample
 @sample %%ETCDIR%%/smdi.conf.sample
 @sample %%ETCDIR%%/sorcery.conf.sample
 @sample %%ETCDIR%%/ss7.timers.sample
 @sample %%ETCDIR%%/stasis.conf.sample
 @sample %%ETCDIR%%/statsd.conf.sample
 @sample %%ETCDIR%%/telcordia-1.adsi.sample
 @sample %%ETCDIR%%/test_sorcery.conf.sample
 @sample %%ETCDIR%%/udptl.conf.sample
 @sample %%ETCDIR%%/unistim.conf.sample
 @sample %%ETCDIR%%/users.conf.sample
 @sample %%ETCDIR%%/voicemail.conf.sample
 @sample %%ETCDIR%%/vpb.conf.sample
 @sample %%ETCDIR%%/xmpp.conf.sample
 include/asterisk.h
 include/asterisk/_private.h
 include/asterisk/abstract_jb.h
 include/asterisk/acl.h
 include/asterisk/adsi.h
 include/asterisk/ael_structs.h
 include/asterisk/agi.h
 include/asterisk/alaw.h
 include/asterisk/aoc.h
 include/asterisk/app.h
 include/asterisk/ari.h
 include/asterisk/ast_expr.h
 include/asterisk/ast_version.h
 include/asterisk/astdb.h
 include/asterisk/astmm.h
 include/asterisk/astobj.h
 include/asterisk/astobj2.h
 include/asterisk/astosp.h
 include/asterisk/audiohook.h
 include/asterisk/autochan.h
 include/asterisk/autoconfig.h
 include/asterisk/backtrace.h
 include/asterisk/beep.h
 include/asterisk/bridge.h
 include/asterisk/bridge_after.h
 include/asterisk/bridge_basic.h
 include/asterisk/bridge_channel.h
 include/asterisk/bridge_channel_internal.h
 include/asterisk/bridge_features.h
 include/asterisk/bridge_internal.h
 include/asterisk/bridge_roles.h
 include/asterisk/bridge_technology.h
 include/asterisk/bucket.h
 include/asterisk/build.h
 include/asterisk/buildinfo.h
 include/asterisk/buildopts.h
 include/asterisk/calendar.h
 include/asterisk/callerid.h
 include/asterisk/causes.h
 include/asterisk/ccss.h
 include/asterisk/cdr.h
 include/asterisk/cel.h
 include/asterisk/celt.h
 include/asterisk/channel.h
 include/asterisk/channel_internal.h
 include/asterisk/channelstate.h
 include/asterisk/chanvars.h
 include/asterisk/cli.h
 include/asterisk/codec.h
 include/asterisk/compat.h
 include/asterisk/compiler.h
 include/asterisk/config.h
 include/asterisk/config_options.h
 include/asterisk/core_local.h
 include/asterisk/core_unreal.h
 include/asterisk/crypto.h
 include/asterisk/data.h
 include/asterisk/datastore.h
 include/asterisk/devicestate.h
 include/asterisk/dial.h
 include/asterisk/dlinkedlists.h
 include/asterisk/dns.h
 include/asterisk/dnsmgr.h
 include/asterisk/doxygen/architecture.h
 include/asterisk/doxygen/asterisk-git-howto.h
 include/asterisk/doxygen/commits.h
 include/asterisk/doxygen/licensing.h
 include/asterisk/doxygen/releases.h
 include/asterisk/doxygen/reviewboard.h
 include/asterisk/doxyref.h
 include/asterisk/dsp.h
 include/asterisk/dundi.h
 include/asterisk/endian.h
 include/asterisk/endpoints.h
 include/asterisk/enum.h
 include/asterisk/event.h
 include/asterisk/event_defs.h
 include/asterisk/extconf.h
 include/asterisk/features.h
 include/asterisk/features_config.h
 include/asterisk/file.h
 include/asterisk/format.h
 include/asterisk/format_cache.h
 include/asterisk/format_cap.h
 include/asterisk/format_compatibility.h
 include/asterisk/frame.h
 include/asterisk/framehook.h
 include/asterisk/fskmodem.h
 include/asterisk/fskmodem_float.h
 include/asterisk/fskmodem_int.h
 include/asterisk/global_datastores.h
 include/asterisk/hashtab.h
 include/asterisk/heap.h
 include/asterisk/http.h
 include/asterisk/http_websocket.h
 include/asterisk/image.h
 include/asterisk/indications.h
 include/asterisk/inline_api.h
 include/asterisk/io.h
 include/asterisk/json.h
 include/asterisk/linkedlists.h
 include/asterisk/localtime.h
 include/asterisk/lock.h
 include/asterisk/logger.h
 include/asterisk/manager.h
 include/asterisk/max_forwards.h
 include/asterisk/md5.h
 include/asterisk/media_index.h
 include/asterisk/message.h
 include/asterisk/mixmonitor.h
 include/asterisk/mod_format.h
 include/asterisk/module.h
 include/asterisk/monitor.h
 include/asterisk/musiconhold.h
 include/asterisk/netsock.h
 include/asterisk/netsock2.h
 include/asterisk/network.h
 include/asterisk/optional_api.h
 include/asterisk/options.h
 include/asterisk/opus.h
 include/asterisk/parking.h
 include/asterisk/paths.h
 include/asterisk/pbx.h
 include/asterisk/phoneprov.h
 include/asterisk/pickup.h
 include/asterisk/pktccops.h
 include/asterisk/plc.h
 include/asterisk/poll-compat.h
 include/asterisk/presencestate.h
 include/asterisk/privacy.h
 include/asterisk/pval.h
 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
 include/asterisk/res_pjsip_outbound_publish.h
 include/asterisk/res_pjsip_presence_xml.h
 include/asterisk/res_pjsip_pubsub.h
 include/asterisk/res_pjsip_session.h
 include/asterisk/res_srtp.h
 include/asterisk/rtp_engine.h
 include/asterisk/say.h
 include/asterisk/sched.h
 include/asterisk/sdp_srtp.h
 include/asterisk/security_events.h
 include/asterisk/security_events_defs.h
 include/asterisk/select.h
 include/asterisk/sem.h
 include/asterisk/sha1.h
 include/asterisk/silk.h
 include/asterisk/sip_api.h
 include/asterisk/slin.h
 include/asterisk/slinfactory.h
 include/asterisk/smdi.h
 include/asterisk/smoother.h
 include/asterisk/sorcery.h
 include/asterisk/sounds_index.h
 include/asterisk/speech.h
 include/asterisk/spinlock.h
 include/asterisk/srv.h
 include/asterisk/stasis.h
 include/asterisk/stasis_app.h
 include/asterisk/stasis_app_device_state.h
 include/asterisk/stasis_app_impl.h
 include/asterisk/stasis_app_mailbox.h
 include/asterisk/stasis_app_playback.h
 include/asterisk/stasis_app_recording.h
 include/asterisk/stasis_app_snoop.h
 include/asterisk/stasis_bridges.h
 include/asterisk/stasis_cache_pattern.h
 include/asterisk/stasis_channels.h
 include/asterisk/stasis_endpoints.h
 include/asterisk/stasis_internal.h
 include/asterisk/stasis_message_router.h
 include/asterisk/stasis_system.h
 include/asterisk/stasis_test.h
 include/asterisk/statsd.h
 include/asterisk/stringfields.h
 include/asterisk/strings.h
 include/asterisk/stun.h
 include/asterisk/syslog.h
 include/asterisk/taskprocessor.h
 include/asterisk/tcptls.h
 include/asterisk/tdd.h
 include/asterisk/term.h
 include/asterisk/test.h
 include/asterisk/threadpool.h
 include/asterisk/threadstorage.h
 include/asterisk/time.h
 include/asterisk/timing.h
 include/asterisk/transcap.h
 include/asterisk/translate.h
 include/asterisk/udptl.h
 include/asterisk/ulaw.h
 include/asterisk/unaligned.h
 include/asterisk/uri.h
 include/asterisk/utils.h
 include/asterisk/uuid.h
 include/asterisk/vector.h
 include/asterisk/version.h
 include/asterisk/xml.h
 include/asterisk/xmldoc.h
 include/asterisk/xmpp.h
 lib/libasteriskssl.so
 lib/libasteriskssl.so.1
 man/man8/astdb2bdb.8.gz
 man/man8/astdb2sqlite3.8.gz
 man/man8/asterisk.8.gz
 man/man8/astgenkey.8.gz
 man/man8/autosupport.8.gz
 man/man8/safe_asterisk.8.gz
 sbin/astcanary
 sbin/astdb2bdb
 sbin/astdb2sqlite3
 sbin/asterisk
 sbin/astgenkey
 %%ASTVERSION%%sbin/astversion
 sbin/autosupport
 sbin/rasterisk
 sbin/safe_asterisk
 %%DATADIR%%/agi-bin/agi-test.agi
 %%DATADIR%%/agi-bin/eagi-sphinx-test
 %%DATADIR%%/agi-bin/eagi-test
 %%DATADIR%%/agi-bin/jukebox.agi
 %%DATADIR%%/documentation/appdocsxml.dtd
 %%DATADIR%%/documentation/appdocsxml.xslt
 %%DATADIR%%/documentation/core-en_US.xml
 %%DATADIR%%/phoneprov/000000000000-directory.xml
 %%DATADIR%%/phoneprov/000000000000-phone.cfg
 %%DATADIR%%/phoneprov/000000000000.cfg
 %%DATADIR%%/phoneprov/polycom.xml
 %%DATADIR%%/phoneprov/polycom_line.xml
 %%DATADIR%%/phoneprov/snom-mac.xml
 %%DATADIR%%/rest-api/applications.json
 %%DATADIR%%/rest-api/asterisk.json
 %%DATADIR%%/rest-api/bridges.json
 %%DATADIR%%/rest-api/channels.json
 %%DATADIR%%/rest-api/deviceStates.json
 %%DATADIR%%/rest-api/endpoints.json
 %%DATADIR%%/rest-api/events.json
 %%DATADIR%%/rest-api/mailboxes.json
 %%DATADIR%%/rest-api/playbacks.json
 %%DATADIR%%/rest-api/recordings.json
 %%DATADIR%%/rest-api/resources.json
 %%DATADIR%%/rest-api/sounds.json
 %%DATADIR%%/static-http/appdocsxml.xslt
 %%DATADIR%%/static-http/ajamdemo.html
 %%DATADIR%%/static-http/astman.css
 %%DATADIR%%/static-http/astman.js
 %%DATADIR%%/static-http/core-en_US.xml
 %%DATADIR%%/static-http/prototype.js
 %%DATADIR%%/static-http/mantest.html
 %%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
 @dir %%VARDIR%%/log/asterisk/cdr-custom
 @dir %%VARDIR%%/log/asterisk/cel-custom
 @dir %%VARDIR%%/log/asterisk
 @dir %%VARDIR%%/spool/asterisk/dictate
 @dir %%VARDIR%%/spool/asterisk/meetme
 @dir %%VARDIR%%/spool/asterisk/monitor
 @dir %%VARDIR%%/spool/asterisk/outgoing
 @dir %%VARDIR%%/spool/asterisk/recording
 @dir %%VARDIR%%/spool/asterisk
 @dir %%VARDIR%%/spool/asterisk/system
 @dir %%VARDIR%%/spool/asterisk/tmp
 @dir %%VARDIR%%/db/asterisk
 @dir %%VARDIR%%/run/asterisk
 @owner
 @group