- Upgrade to 1.6.2.13

  * switch to 1.6.2.X release series because 1.6.0.X is approaching
    its End of Life date.
    see http://www.asterisk.org/asterisk-versions
  * make sure your asterisk configurations between 1.6.0.X and 1.6.2.X
    before upgrading it.

PR:	ports/144065 [1], ports/146964 [2]
Submitted by:	Tom Judge <tjudge_AT_mintel_DOT_com> [1],
		Eugene M. Zheganin <emz_AT_norma_DOT_perm_DOT_ru> [2]
Approved by:	Florian Smeets (maintainer)

12 files changed, 229 insertions, 351 deletions

diff --git a/net/asterisk16/Makefile b/net/asterisk16/Makefile
index 2e57dd070822..7f1ecfd09b2a 100644
--- a/net/asterisk16/Makefile
+++ b/net/asterisk16/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	asterisk
-PORTVERSION=	1.6.0.21
-PORTREVISION=	4
-PKGNAMESUFFIX=	16
+PORTVERSION=	1.6.2.13
 CATEGORIES=	net
 MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/asterisk/ \
 		http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/
+PKGNAMESUFFIX=	16
 
 MAINTAINER=	flo@smeets.im
 COMMENT=	An Open Source PBX and telephony toolkit
@@ -26,9 +25,10 @@ ONLY_FOR_ARCHS=	i386 amd64
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/openh323" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--with-gsm=${LOCALBASE}
+CONFIGURE_ARGS=	--with-gsm=${LOCALBASE} --localstatedir=/var
 CPPFLAGS=	-I${LOCALBASE}/include -I${LOCALBASE}/include/openh323
 USE_GMAKE=	yes
+USE_GNOME=	libxml2
 USE_BISON=	build
 USE_RC_SUBR=	asterisk.sh
 MAKE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
@@ -55,9 +55,7 @@ OPTIONS=	OGGVORBIS	"Enable Ogg Vorbis support" on \
 		GSM		"Enable GSM codec" on \
 		CURL		"Enable CURL support" on \
 		ILBC		"Enable iLBC codec" off \
-		SPANDSP		"Enable Spandsp faxing support" off \
-#		CODEC_PATCH	"Apply codec negotiation patch" off \
-#		MISC_PATCHES	"Apply additional patches" off
+		SPANDSP		"Enable Spandsp faxing support" off
 
 .include <bsd.port.pre.mk>
 
@@ -65,25 +63,25 @@ OPTIONS=	OGGVORBIS	"Enable Ogg Vorbis support" on \
 OPTIONS+=	DAHDI		"Enable DAHDI support" on
 
 # Include this since we have altered OPTIONS.
-.include "$(PORTSDIR)/Mk/bsd.port.options.mk"
+.include <bsd.port.options.mk>
 .endif
 
 .if !defined(WITH_H323)
 PLIST_SUB+=	WITH_H323="@comment "
-CONFIGURE_ARGS+= --without-h323
+CONFIGURE_ARGS+=	--without-h323
 .else
 PLIST_SUB+=	WITH_H323=""
-CONFIGURE_ARGS+= --with-h323=${LOCALBASE}
+CONFIGURE_ARGS+=	--with-h323=${LOCALBASE}
 LIB_DEPENDS+=	pt_r.1:${PORTSDIR}/devel/pwlib \
 		h323_r.1:${PORTSDIR}/net/openh323
 .endif
 
 .if !defined(WITH_DAHDI)
 PLIST_SUB+=	WITH_DAHDI="@comment "
-CONFIGURE_ARGS+= --without-dahdi
+CONFIGURE_ARGS+=	--without-dahdi
 .else
 PLIST_SUB+=	WITH_DAHDI=""
-CONFIGURE_ARGS+= --with-dahdi
+CONFIGURE_ARGS+=	--with-dahdi
 BUILD_DEPENDS+=	libpri>=1.4.10:${PORTSDIR}/misc/libpri \
 		${LOCALBASE}/include/dahdi/user.h:${PORTSDIR}/misc/dahdi
 LIB_DEPENDS+=	pri.1:${PORTSDIR}/misc/libpri
@@ -95,75 +93,75 @@ RUN_DEPENDS+=	${LOCALBASE}/lib/dahdi/dahdi.ko:${PORTSDIR}/misc/dahdi
 # similarly
 .if !defined(WITH_ODBC)
 PLIST_SUB+=	WITH_ODBC="@comment "
-CONFIGURE_ARGS+= --without-odbc
+CONFIGURE_ARGS+=	--without-unixodbc
 .else
 PLIST_SUB+=	WITH_ODBC=""
-CONFIGURE_ARGS+= --with-odbc --with-ltdl
-LIB_DEPENDS+=	odbc.1:${PORTSDIR}/databases/unixODBC \
-		ltdl.7:${PORTSDIR}/devel/libltdl22
+CONFIGURE_ARGS+=	--with-unixodbc --with-ltdl
+LIB_DEPENDS+=	odbc.1:${PORTSDIR}/databases/unixODBC
+USE_AUTOTOOLS=	libltdl
 .endif
 
 .if !defined(WITH_FREETDS)
 PLIST_SUB+=	WITH_FREETDS="@comment "
-CONFIGURE_ARGS+= --without-tds
+CONFIGURE_ARGS+=	--without-tds
 .else
 PLIST_SUB+=	WITH_FREETDS=""
-CONFIGURE_ARGS+= --with-tds=${LOCALBASE}
+CONFIGURE_ARGS+=	--with-tds=${LOCALBASE}
 LIB_DEPENDS+=	tds.5:${PORTSDIR}/databases/freetds
 .endif
 
 .if !defined(WITH_POSTGRES)
 PLIST_SUB+=	WITH_POSTGRES="@comment "
-CONFIGURE_ARGS+= --without-postgres
+CONFIGURE_ARGS+=	--without-postgres
 .else
 PLIST_SUB+=	WITH_POSTGRES=""
 USE_PGSQL=	yes
-CONFIGURE_ARGS+= --with-postgres
+CONFIGURE_ARGS+=	--with-postgres
 .endif
 
 .if !defined(WITH_OGGVORBIS)
 PLIST_SUB+=	WITH_OGGVORBIS="@comment "
-CONFIGURE_ARGS+= --without-ogg
+CONFIGURE_ARGS+=	--without-ogg
 .else
 PLIST_SUB+=	WITH_OGGVORBIS=""
-CONFIGURE_ARGS+= --with-ogg
+CONFIGURE_ARGS+=	--with-ogg
 LIB_DEPENDS+=	vorbis.4:${PORTSDIR}/audio/libvorbis
 .endif
 
 .if !defined(WITH_RADIUS)
 PLIST_SUB+=	WITH_RADIUS="@comment "
-CONFIGURE_ARGS+= --without-radius
+CONFIGURE_ARGS+=	--without-radius
 .else
 PLIST_SUB+=	WITH_RADIUS=""
-CONFIGURE_ARGS+= --with-radius
+CONFIGURE_ARGS+=	--with-radius
 LIB_DEPENDS+=	radiusclient-ng.2:${PORTSDIR}/net/radiusclient
 .endif
 
 .if !defined(WITH_SNMP)
 PLIST_SUB+=	WITH_SNMP="@comment "
-CONFIGURE_ARGS+= --without-netsnmp
+CONFIGURE_ARGS+=	--without-netsnmp
 .else
 PLIST_SUB+=	WITH_SNMP=""
-CONFIGURE_ARGS+= --with-netsnmp
-LIB_DEPENDS+=	netsnmp.20:${PORTSDIR}/net-mgmt/net-snmp
+CONFIGURE_ARGS+=	--with-netsnmp
+LIB_DEPENDS+=	netsnmp:${PORTSDIR}/net-mgmt/net-snmp
 .endif
 
 .if !defined(WITH_JABBER)
 PLIST_SUB+=	WITH_JABBER="@comment "
-CONFIGURE_ARGS+= --without-iksemel
+CONFIGURE_ARGS+=	--without-iksemel
 .else
 PLIST_SUB+=	WITH_JABBER=""
-CONFIGURE_ARGS+= --with-iksemel
+CONFIGURE_ARGS+=	--with-iksemel
 LIB_DEPENDS+=	iksemel.4:${PORTSDIR}/textproc/iksemel
 .endif
 
 .if !defined(WITH_SQLITE)
 PLIST_SUB+=	WITH_SQLITE="@comment "
 CONFIGURE_ARGS+=	--without-sqlite \
-		--with-sqlite3=no
+			--with-sqlite3=no
 .else
 PLIST_SUB+=	WITH_SQLITE=""
-CONFIGURE_ARGS+= --with-sqlite
+CONFIGURE_ARGS+=	--with-sqlite
 LIB_DEPENDS+=	sqlite:${PORTSDIR}/databases/sqlite2 \
 		sqlite3:${PORTSDIR}/databases/sqlite3
 .endif
@@ -177,41 +175,31 @@ EXTRA_PATCHES+=	${PATCHDIR}/ilbc_enable.diff
 
 .if !defined(WITH_GSM)
 PLIST_SUB+=	WITH_GSM="@comment "
-CONFIGURE_ARGS+= --without-gsm
+CONFIGURE_ARGS+=	--without-gsm
 .else
 PLIST_SUB+=	WITH_GSM=""
-CONFIGURE_ARGS+= --with-gsm
+CONFIGURE_ARGS+=	--with-gsm
 LIB_DEPENDS+=	gsm.1:${PORTSDIR}/audio/gsm
 .endif
 
 .if !defined(WITH_CURL)
 PLIST_SUB+=	WITH_CURL="@comment "
-CONFIGURE_ARGS+= --with-curl=no \
-		--with-libcurl=no
+CONFIGURE_ARGS+=	--with-libcurl=no
 .else
 PLIST_SUB+=	WITH_CURL=""
-CONFIGURE_ARGS+= --with-curl \
-		--with-libcurl
+CONFIGURE_ARGS+=	--with-libcurl
 LIB_DEPENDS+=	curl.6:${PORTSDIR}/ftp/curl
 .endif
 
 .if !defined(WITH_SPANDSP)
 PLIST_SUB+=	WITH_SPANDSP="@comment "
-CONFIGURE_ARGS+= --without-spandsp
+CONFIGURE_ARGS+=	--without-spandsp
 .else
 PLIST_SUB+=	WITH_SPANDSP=""
-CONFIGURE_ARGS+= --with-spandsp
+CONFIGURE_ARGS+=	--with-spandsp
 LIB_DEPENDS+=	spandsp.2:${PORTSDIR}/comms/spandsp-devel
 .endif
 
-.if defined(WITH_CODEC_PATCH)
-PATCHFILES=	asterisk-1.4.22-codec-negotiation-20081110.diff.gz
-PATCH_SITES=	http://b2bua.org/chrome/site/
-EXTRA_PATCHES+=	${PATCHDIR}/codecnego-patch-Makefile
-.else
-EXTRA_PATCHES+=	${PATCHDIR}/nocodecnego-patch-Makefile
-.endif
-
 .if defined(WITH_MISC_PATCHES)
 EXTRA_PATCHES+=	${PATCHDIR}/dtmf_debug.diff
 EXTRA_PATCHES+=	${PATCHDIR}/feature_disconnect.diff
diff --git a/net/asterisk16/distinfo b/net/asterisk16/distinfo
index 88b8a6a7a44d..606126e6350c 100644
--- a/net/asterisk16/distinfo
+++ b/net/asterisk16/distinfo
@@ -1,3 +1,3 @@
-MD5 (asterisk-1.6.0.21.tar.gz) = a172fb030adab50bdff6ae3b5e765283
-SHA256 (asterisk-1.6.0.21.tar.gz) = 0d41a9033934640992da29ee03ae96a208eb3ff8a46440e388920d471ecbbaff
-SIZE (asterisk-1.6.0.21.tar.gz) = 23145584
+MD5 (asterisk-1.6.2.13.tar.gz) = 1e184a4d9301e2e4b9de3bc98b507d4f
+SHA256 (asterisk-1.6.2.13.tar.gz) = 28bb18e988d22557ee77220cb33209212af1e618348c3d42666f785da517c01e
+SIZE (asterisk-1.6.2.13.tar.gz) = 23679304
diff --git a/net/asterisk16/files/asterisk.sh.in b/net/asterisk16/files/asterisk.sh.in
index ca5941068460..a8cbb1f1eadf 100644
--- a/net/asterisk16/files/asterisk.sh.in
+++ b/net/asterisk16/files/asterisk.sh.in
@@ -11,10 +11,10 @@
 
 . /etc/rc.subr
 
-stop_precmd=asterisk_shutdown
-sig_stop=KILL
+stop_cmd=asterisk_shutdown
 asterisk_shutdown () {
-  %%PREFIX%%/sbin/asterisk -qrx 'stop now'
+  echo 'Stopping asterisk'
+  %%PREFIX%%/sbin/asterisk -qrx 'core stop now'
   sleep 1
   return 0
 }
diff --git a/net/asterisk16/files/codecnego-patch-Makefile b/net/asterisk16/files/codecnego-patch-Makefile
deleted file mode 100644
index 0146d59c7b21..000000000000
--- a/net/asterisk16/files/codecnego-patch-Makefile
+++ /dev/null
@@ -1,210 +0,0 @@
---- Makefile.orig	2008-10-16 17:36:35.000000000 +0300
-+++ Makefile	2008-10-16 17:36:36.000000000 +0300
-@@ -129,7 +129,7 @@
-   ASTMANDIR=$(mandir)
- ifneq ($(findstring BSD,$(OSARCH)),)
-   ASTVARLIBDIR=$(prefix)/share/asterisk
--  ASTVARRUNDIR=$(localstatedir)/run/asterisk
-+  ASTVARRUNDIR=$(localstatedir)/run
- else
-   ASTVARLIBDIR=$(localstatedir)/lib/asterisk
- endif
-@@ -214,9 +214,11 @@
-   ASTLDFLAGS+=-L/usr/local/lib
- endif
- 
-+ifneq ($(OSARCH),FreeBSD)
- ifneq ($(PROC),ultrasparc)
-   ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
- endif
-+endif
- 
- ifeq ($(PROC),ppc)
-   ASTCFLAGS+=-fsigned-char
-@@ -224,7 +226,7 @@
- 
- 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)
-   AST_LIBS+=$(shell if test  $(BSDVERSION) -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi)
- endif
-@@ -401,15 +403,15 @@
- # Should static HTTP be installed during make samples or even with its own target ala
- # webvoicemail?  There are portions here that *could* be customized but might also be
- # improved a lot.  I'll put it here for now.
--	mkdir -p $(DESTDIR)$(ASTDATADIR)/static-http
-+	$(MKDIR) $(DESTDIR)$(ASTDATADIR)/static-http
- 	for x in static-http/*; do \
--		$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/static-http ; \
-+		$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTDATADIR)/static-http ; \
- 	done
--	mkdir -p $(DESTDIR)$(ASTDATADIR)/images
-+	$(MKDIR) $(DESTDIR)$(ASTDATADIR)/images
- 	for x in images/*.jpg; do \
--		$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/images ; \
-+		$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTDATADIR)/images ; \
- 	done
--	mkdir -p $(DESTDIR)$(AGI_DIR)
-+	$(MKDIR) $(DESTDIR)$(AGI_DIR)
- 	$(MAKE) -C sounds install
- 
- update: 
-@@ -430,47 +432,47 @@
- OLDHEADERS=$(filter-out $(NEWHEADERS),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h)))
- 
- installdirs:
--	mkdir -p $(DESTDIR)$(MODULES_DIR)
--	mkdir -p $(DESTDIR)$(ASTSBINDIR)
--	mkdir -p $(DESTDIR)$(ASTETCDIR)
--	mkdir -p $(DESTDIR)$(ASTBINDIR)
--	mkdir -p $(DESTDIR)$(ASTVARRUNDIR)
--	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail
--	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/dictate
--	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/system
--	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/tmp
--	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/meetme
--	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/monitor
-+	$(MKDIR) $(DESTDIR)$(MODULES_DIR)
-+	$(MKDIR) $(DESTDIR)$(ASTSBINDIR)
-+	$(MKDIR) $(DESTDIR)$(ASTETCDIR)
-+	$(MKDIR) $(DESTDIR)$(ASTBINDIR)
-+	$(MKDIR) $(DESTDIR)$(ASTVARRUNDIR)
-+	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail
-+	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/dictate
-+	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/system
-+	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/tmp
-+	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/meetme
-+	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/monitor
- 
- bininstall: _all installdirs $(SUBDIRS_INSTALL)
--	$(INSTALL) -m 755 main/asterisk $(DESTDIR)$(ASTSBINDIR)/
-+	$(BSD_INSTALL_PROGRAM) main/asterisk $(DESTDIR)$(ASTSBINDIR)/
- 	$(LN) -sf asterisk $(DESTDIR)$(ASTSBINDIR)/rasterisk
--	$(INSTALL) -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
--	$(INSTALL) -m 755 contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/
-+	$(BSD_INSTALL_SCRIPT) contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
-+	$(BSD_INSTALL_SCRIPT) contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/
- 	if [ ! -f $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ]; then \
--		cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;' > $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ;\
--		chmod 755 $(DESTDIR)$(ASTSBINDIR)/safe_asterisk;\
-+		cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;' > contrib/scripts/safe_asterisk.out;\
-+		${BSD_INSTALL_SCRIPT} contrib/scripts/safe_asterisk.out $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ;\
- 	fi
--	$(INSTALL) -d $(DESTDIR)$(ASTHEADERDIR)
--	$(INSTALL) -m 644 include/asterisk.h $(DESTDIR)$(includedir)
--	$(INSTALL) -m 644 include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR)
-+	$(MKDIR) $(DESTDIR)$(ASTHEADERDIR)
-+	$(BSD_INSTALL_DATA) include/asterisk.h $(DESTDIR)$(includedir)
-+	$(BSD_INSTALL_DATA) include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR)
- 	if [ -n "$(OLDHEADERS)" ]; then \
- 		rm -f $(addprefix $(DESTDIR)$(ASTHEADERDIR)/,$(OLDHEADERS)) ;\
- 	fi
--	mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv
--	mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-custom
--	mkdir -p $(DESTDIR)$(ASTDATADIR)/keys
--	mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware
--	mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware/iax
--	mkdir -p $(DESTDIR)$(ASTMANDIR)/man8
--	$(INSTALL) -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTDATADIR)/keys
--	$(INSTALL) -m 644 keys/freeworlddialup.pub $(DESTDIR)$(ASTDATADIR)/keys
--	$(INSTALL) -m 644 doc/asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
--	$(INSTALL) -m 644 contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8
--	$(INSTALL) -m 644 contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8
--	$(INSTALL) -m 644 contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
-+	$(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-csv
-+	$(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-custom
-+	$(MKDIR) $(DESTDIR)$(ASTDATADIR)/keys
-+	$(MKDIR) $(DESTDIR)$(ASTDATADIR)/firmware
-+	$(MKDIR) $(DESTDIR)$(ASTDATADIR)/firmware/iax
-+	$(MKDIR) $(DESTDIR)$(ASTMANDIR)/man8
-+	$(BSD_INSTALL_DATA) keys/iaxtel.pub $(DESTDIR)$(ASTDATADIR)/keys
-+	$(BSD_INSTALL_DATA) keys/freeworlddialup.pub $(DESTDIR)$(ASTDATADIR)/keys
-+	$(BSD_INSTALL_MAN) doc/asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
-+	$(BSD_INSTALL_MAN) contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8
-+	$(BSD_INSTALL_MAN) contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8
-+	$(BSD_INSTALL_MAN) contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
- 	if [ -f contrib/firmware/iax/iaxy.bin ] ; then \
--		$(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin; \
-+		$(BSD_INSTALL_DATA) contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin; \
- 	fi
- 
- $(SUBDIRS_INSTALL):
-@@ -506,7 +508,7 @@
- 	@exit 1
- endif
- 
--install: badshell datafiles bininstall
-+install: badshell datafiles bininstall samples
- 	@if [ -x /usr/sbin/asterisk-post-install ]; then \
- 		/usr/sbin/asterisk-post-install $(DESTDIR) . ; \
- 	fi
-@@ -544,31 +546,23 @@
- upgrade: bininstall
- 
- adsi:
--	mkdir -p $(DESTDIR)$(ASTETCDIR)
-+	$(MKDIR) $(DESTDIR)$(ASTETCDIR)
- 	for x in configs/*.adsi; do \
- 		if [ ! -f $(DESTDIR)$(ASTETCDIR)/$$x ]; then \
--			$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x` ; \
-+			$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x` ; \
- 		fi ; \
-+		$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`-dist ; \
- 	done
- 
- samples: adsi
--	mkdir -p $(DESTDIR)$(ASTETCDIR)
-+	$(MKDIR) $(DESTDIR)$(ASTETCDIR)
- 	for x in configs/*.sample; do \
--		if [ -f $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` ]; then \
--			if [ "$(OVERWRITE)" = "y" ]; then \
--				if cmp -s $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` $$x ; then \
--					echo "Config file $$x is unchanged"; \
--					continue; \
--				fi ; \
--				mv -f $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`.old ; \
--			else \
--				echo "Skipping config file $$x"; \
--				continue; \
--			fi ;\
-+		$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`-dist ;\
-+		if [ ! -f $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` ]; then \
-+			$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`;\
- 		fi ; \
--		$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` ;\
- 	done
--	if [ "$(OVERWRITE)" = "y" ] || [ ! -f $(DESTDIR)$(ASTCONFPATH) ]; then \
-+	if true; then \
- 		( \
- 		echo "[directories]" ; \
- 		echo "astetcdir => $(ASTETCDIR)" ; \
-@@ -655,20 +649,23 @@
- 		echo "; Default: strict"; \
- 		echo ";"; \
- 		echo ";translation_algorithm = strict"; \
--		) > $(DESTDIR)$(ASTCONFPATH) ; \
-+		) > $(DESTDIR)$(ASTCONFPATH)-dist ; \
-+		if [ ! -f $(DESTDIR)$(ASTCONFPATH) ]; then \
-+			cp $(DESTDIR)$(ASTCONFPATH)-dist $(DESTDIR)$(ASTCONFPATH); \
-+		fi; \
- 	else \
- 		echo "Skipping asterisk.conf creation"; \
- 	fi
--	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
-+	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
- 	build_tools/make_sample_voicemail $(DESTDIR)/$(ASTDATADIR) $(DESTDIR)/$(ASTSPOOLDIR)
- 
- webvmail:
- 	@[ -d $(DESTDIR)$(HTTP_DOCSDIR)/ ] || ( printf "http docs directory not found.\nUpdate assignment of variable HTTP_DOCSDIR in Makefile!\n" && exit 1 )
- 	@[ -d $(DESTDIR)$(HTTP_CGIDIR) ] || ( printf "cgi-bin directory not found.\nUpdate assignment of variable HTTP_CGIDIR in Makefile!\n" && exit 1 )
- 	$(INSTALL) -m 4755 -o root -g root contrib/scripts/vmail.cgi $(DESTDIR)$(HTTP_CGIDIR)/vmail.cgi
--	mkdir -p $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk
-+	$(MKDIR) $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk
- 	for x in images/*.gif; do \
--		$(INSTALL) -m 644 $$x $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/; \
-+		$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/; \
- 	done
- 	@echo " +--------- Asterisk Web Voicemail ----------+"  
- 	@echo " +                                           +"
diff --git a/net/asterisk16/files/nocodecnego-patch-Makefile b/net/asterisk16/files/patch-Makefile
index ad36c7ac3288..7ad5f7b8d362 100644
--- a/net/asterisk16/files/nocodecnego-patch-Makefile
+++ b/net/asterisk16/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig	2009-11-03 12:00:27.000000000 -0800
-+++ Makefile	2009-11-20 13:13:06.000000000 -0800
-@@ -118,7 +118,7 @@
+--- Makefile.orig	2010-06-11 05:35:06.000000000 +0900
++++ Makefile	2010-09-25 23:04:59.000000000 +0900
+@@ -121,7 +121,7 @@
  OVERWRITE=y
  
  # Include debug and macro symbols in the executables (-g) and profiling info (-pg)
@@ -9,7 +9,7 @@
  
  
  # Define standard directories for various platforms
-@@ -148,7 +148,7 @@
+@@ -149,7 +149,7 @@
    ASTMANDIR=$(mandir)
  ifneq ($(findstring BSD,$(OSARCH)),)
    ASTVARLIBDIR=$(prefix)/share/asterisk
@@ -18,19 +18,22 @@
    ASTDBDIR=$(localstatedir)/db/asterisk
  else
    ASTVARLIBDIR=$(localstatedir)/lib/asterisk
-@@ -248,9 +248,11 @@
+@@ -248,12 +248,13 @@
+ ifneq ($(findstring BSD,$(OSARCH)),)
    _ASTCFLAGS+=-isystem /usr/local/include
  endif
- 
+-
 +ifneq ($(OSARCH),FreeBSD)
- ifneq ($(PROC),ultrasparc)
-   _ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
+ ifeq ($(findstring -march,$(_ASTCFLAGS) $(ASTCFLAGS)),)
+   ifneq ($(PROC),ultrasparc)
+     _ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
+   endif
  endif
 +endif
  
  ifeq ($(PROC),ppc)
    _ASTCFLAGS+=-fsigned-char
-@@ -258,7 +260,7 @@
+@@ -261,7 +262,7 @@
  
  ifeq ($(OSARCH),FreeBSD)
    # -V is understood by BSD Make, not by GNU make.
@@ -39,7 +42,7 @@
    _ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi)
  endif
  
-@@ -467,21 +469,21 @@
+@@ -478,21 +479,23 @@
  # Should static HTTP be installed during make samples or even with its own target ala
  # webvoicemail?  There are portions here that *could* be customized but might also be
  # improved a lot.  I'll put it here for now.
@@ -58,7 +61,9 @@
  			done \
  	fi
 -	mkdir -p $(DESTDIR)$(ASTDATADIR)/images
-+	$(MKDIR) $(DESTDIR)$(DOCSDIR)/images
++	if [ ! -d $(DESTDIR)$(DOCSDIR)/images ]; then \
++	    $(MKDIR) $(DESTDIR)$(DOCSDIR)/images; \
++	fi
  	for x in images/*.jpg; do \
 -		$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/images ; \
 +		$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(DOCSDIR)/images ; \
@@ -67,15 +72,14 @@
 +	$(MKDIR) $(DESTDIR)$(AGI_DIR)
  	$(MAKE) -C sounds install
  
- update: 
-@@ -505,47 +507,47 @@
+ doc/core-en_US.xml: $(foreach dir,$(MOD_SUBDIRS),$(shell $(GREP) -l "language=\"en_US\"" $(dir)/*.c $(dir)/*.cc 2>/dev/null))
+@@ -539,50 +542,52 @@
  OLDHEADERS=$(filter-out $(NEWHEADERS),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h)))
  
  installdirs:
 -	mkdir -p $(DESTDIR)$(MODULES_DIR)
 -	mkdir -p $(DESTDIR)$(ASTSBINDIR)
 -	mkdir -p $(DESTDIR)$(ASTETCDIR)
--	mkdir -p $(DESTDIR)$(ASTBINDIR)
 -	mkdir -p $(DESTDIR)$(ASTVARRUNDIR)
 -	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail
 -	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/dictate
@@ -86,10 +90,11 @@
 +	$(MKDIR) $(DESTDIR)$(MODULES_DIR)
 +	$(MKDIR) $(DESTDIR)$(ASTSBINDIR)
 +	$(MKDIR) $(DESTDIR)$(ASTETCDIR)
-+	$(MKDIR) $(DESTDIR)$(ASTBINDIR)
 +	$(MKDIR) $(DESTDIR)$(ASTVARRUNDIR)
++	$(MKDIR) $(DESTDIR)$(ASTDBDIR)
 +	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail
 +	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/dictate
++	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/outgoing
 +	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/system
 +	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/tmp
 +	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/meetme
@@ -107,7 +112,7 @@
 -		cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;' > $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ;\
 -		chmod 755 $(DESTDIR)$(ASTSBINDIR)/safe_asterisk;\
 +		cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;' > contrib/scripts/safe_asterisk.out;\
-+		 ${BSD_INSTALL_SCRIPT} contrib/scripts/safe_asterisk.out $(DESTDIR)$(ASTSBINDIR)/safe_asterisk;\
++		${BSD_INSTALL_SCRIPT} contrib/scripts/safe_asterisk.out $(DESTDIR)$(ASTSBINDIR)/safe_asterisk;\
  	fi
 -	$(INSTALL) -d $(DESTDIR)$(ASTHEADERDIR)
 -	$(INSTALL) -m 644 include/asterisk.h $(DESTDIR)$(includedir)
@@ -118,24 +123,32 @@
  	if [ -n "$(OLDHEADERS)" ]; then \
  		rm -f $(addprefix $(DESTDIR)$(ASTHEADERDIR)/,$(OLDHEADERS)) ;\
  	fi
+-	mkdir -p $(DESTDIR)$(ASTDATADIR)/documentation
+-	mkdir -p $(DESTDIR)$(ASTDATADIR)/documentation/thirdparty
 -	mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv
 -	mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-custom
 -	mkdir -p $(DESTDIR)$(ASTDATADIR)/keys
 -	mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware
 -	mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware/iax
 -	mkdir -p $(DESTDIR)$(ASTMANDIR)/man8
+-	$(INSTALL) -m 644 doc/core-*.xml $(DESTDIR)$(ASTDATADIR)/documentation
+-	$(INSTALL) -m 644 doc/appdocsxml.dtd $(DESTDIR)$(ASTDATADIR)/documentation
 -	$(INSTALL) -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTDATADIR)/keys
 -	$(INSTALL) -m 644 keys/freeworlddialup.pub $(DESTDIR)$(ASTDATADIR)/keys
 -	$(INSTALL) -m 644 doc/asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
 -	$(INSTALL) -m 644 contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8
 -	$(INSTALL) -m 644 contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8
 -	$(INSTALL) -m 644 contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
++	$(MKDIR) $(DESTDIR)$(ASTDATADIR)/documentation
++	$(MKDIR) $(DESTDIR)$(ASTDATADIR)/documentation/thirdparty
 +	$(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-csv
 +	$(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-custom
 +	$(MKDIR) $(DESTDIR)$(ASTDATADIR)/keys
 +	$(MKDIR) $(DESTDIR)$(ASTDATADIR)/firmware
 +	$(MKDIR) $(DESTDIR)$(ASTDATADIR)/firmware/iax
 +	$(MKDIR) $(DESTDIR)$(ASTMANDIR)/man8
++	$(BSD_INSTALL_DATA) doc/core-*.xml $(DESTDIR)$(ASTDATADIR)/documentation
++	$(BSD_INSTALL_DATA) doc/appdocsxml.dtd $(DESTDIR)$(ASTDATADIR)/documentation
 +	$(BSD_INSTALL_DATA) keys/iaxtel.pub $(DESTDIR)$(ASTDATADIR)/keys
 +	$(BSD_INSTALL_DATA) keys/freeworlddialup.pub $(DESTDIR)$(ASTDATADIR)/keys
 +	$(BSD_INSTALL_MAN) doc/asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
@@ -148,7 +161,7 @@
  	fi
  
  $(SUBDIRS_INSTALL):
-@@ -579,7 +581,7 @@
+@@ -616,7 +621,7 @@
  	@exit 1
  endif
  
@@ -157,7 +170,7 @@
  	@if [ -x /usr/sbin/asterisk-post-install ]; then \
  		/usr/sbin/asterisk-post-install $(DESTDIR) . ; \
  	fi
-@@ -611,38 +613,25 @@
+@@ -650,38 +655,25 @@
  # XXX why *.adsi is installed first ?
  adsi:
  	@echo Installing adsi config files...
@@ -169,7 +182,7 @@
 -			echo "Overwriting $$x" ; \
 -		else \
 -			echo "Installing $$x" ; \
-+			$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x` ; \
++		    $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x` ; \
  		fi ; \
 -		$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x` ; \
 +		$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`-dist ; \
@@ -192,9 +205,9 @@
 -				echo "Skipping config file $$x"; \
 -				continue; \
 -			fi ;\
-+		$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`-dist ;\
++		$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`-dist ; \
 +		if [ ! -f $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` ]; then \
-+			$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`;\
++		    $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`; \
  		fi ; \
 -		echo "Installing file $$x"; \
 -		$(INSTALL) -m 644 $$x $${dst} ;\
@@ -204,14 +217,14 @@
  		echo "Creating asterisk.conf"; \
  		( \
  		echo "[directories](!) ; remove the (!) to enable this" ; \
-@@ -698,13 +687,16 @@
+@@ -745,14 +737,17 @@
  		echo "pbx_realtime=1.6" ; \
  		echo "res_agi=1.6" ; \
  		echo "app_set=1.6" ; \
 -		) > $(DESTDIR)$(ASTCONFPATH) ; \
 +		) > $(DESTDIR)$(ASTCONFPATH)-dist ; \
 +		if [ ! -f $(DESTDIR)$(ASTCONFPATH) ]; then \
-+			$(BSD_INSTALL_DATA) $(DESTDIR)$(ASTCONFPATH)-dist $(DESTDIR)$(ASTCONFPATH); \
++		    $(BSD_INSTALL_DATA) $(DESTDIR)$(ASTCONFPATH)-dist $(DESTDIR)$(ASTCONFPATH); \
 +		fi; \
  	else \
  		echo "Skipping asterisk.conf creation"; \
@@ -220,11 +233,13 @@
 +	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
  	build_tools/make_sample_voicemail $(DESTDIR)/$(ASTDATADIR) $(DESTDIR)/$(ASTSPOOLDIR)
 -	@mkdir -p $(DESTDIR)$(ASTDATADIR)/phoneprov
+-	@for x in phoneprov/*; do \
 +	@$(MKDIR) $(DESTDIR)$(ASTDATADIR)/phoneprov
- 	@for x in phoneprov/*; do \
++	for x in phoneprov/*; do \
  		dst="$(DESTDIR)$(ASTDATADIR)/$$x" ;	\
  		if [ -f $${dst} ]; then \
-@@ -720,14 +712,14 @@
+ 			if [ "$(OVERWRITE)" = "y" ]; then \
+@@ -767,14 +762,14 @@
  			fi ;\
  		fi ; \
  		echo "Installing file $$x"; \
diff --git a/net/asterisk16/files/patch-Makefile.rules b/net/asterisk16/files/patch-Makefile.rules
index eed64af48b97..4c8ab0340baa 100644
--- a/net/asterisk16/files/patch-Makefile.rules
+++ b/net/asterisk16/files/patch-Makefile.rules
@@ -1,15 +1,13 @@
-
-$FreeBSD$
-
---- Makefile.rules
-+++ Makefile.rules
-@@ -35,7 +35,9 @@
-     CMD_PREFIX=
+--- Makefile.rules.orig	2010-05-05 15:59:28.000000000 +0600
++++ Makefile.rules	2010-05-05 15:26:04.000000000 +0600
+@@ -43,6 +43,10 @@
+   endif
  endif
  
 +ifneq ($(OSARCH),FreeBSD)
- OPTIMIZE?=-O6
++ OPTIMIZE?=-O6
 +endif
- 
++
  ifeq ($(findstring DONT_OPTIMIZE,$(MENUSELECT_CFLAGS)),)
-     # More GSM codec optimization
+     _ASTCFLAGS+=$(OPTIMIZE)
+ else
diff --git a/net/asterisk16/files/patch-channels-chan_dahdi.c b/net/asterisk16/files/patch-channels-chan_dahdi.c
index b856d3266c2a..1c2bd48db785 100644
--- a/net/asterisk16/files/patch-channels-chan_dahdi.c
+++ b/net/asterisk16/files/patch-channels-chan_dahdi.c
@@ -1,6 +1,6 @@
---- channels/chan_dahdi.c.orig	2009-10-22 17:19:21.568250985 +0000
-+++ channels/chan_dahdi.c	2009-10-22 17:26:26.261584076 +0000
-@@ -1997,13 +1997,17 @@
+--- channels/chan_dahdi.c.orig	2010-05-05 17:50:15.000000000 +0600
++++ channels/chan_dahdi.c	2010-05-05 17:50:09.000000000 +0600
+@@ -2672,13 +2672,17 @@
  		return;
  	}
  	if (p->echocancel.head.tap_length) {
@@ -13,13 +13,13 @@
  				ast_log(LOG_WARNING, "Unable to enable audio mode on channel %d (%s)\n", p->channel, strerror(errno));
  		}
 -		res = ioctl(p->subs[SUB_REAL].dfd, DAHDI_ECHOCANCEL_PARAMS, &p->echocancel);
-+
++		
 +		pecp = &p->echocancel.head;
 +		res = ioctl(p->subs[SUB_REAL].dfd, DAHDI_ECHOCANCEL_PARAMS, &pecp);
- 		if (res)  {
+ 		if (res) {
  			ast_log(LOG_WARNING, "Unable to enable echo cancellation on channel %d (%s)\n", p->channel, strerror(errno));
  		} else {
-@@ -2037,8 +2041,9 @@
+@@ -2712,8 +2716,9 @@
  
  	if (p->echocanon) {
  		struct dahdi_echocanparams ecp = { .tap_length = 0 };
diff --git a/net/asterisk16/files/patch-channels::Makefile b/net/asterisk16/files/patch-channels::Makefile
index 39731fc19d6d..d5d3e639c25e 100644
--- a/net/asterisk16/files/patch-channels::Makefile
+++ b/net/asterisk16/files/patch-channels::Makefile
@@ -1,8 +1,5 @@
-
-$FreeBSD$
-
---- channels/Makefile.orig
-+++ channels/Makefile
+--- channels/Makefile.orig	2010-05-05 17:57:22.000000000 +0600
++++ channels/Makefile	2010-05-05 18:01:58.000000000 +0600
 @@ -27,9 +27,10 @@
  endif
  
@@ -21,9 +18,9 @@ $FreeBSD$
  chan_h323.so: chan_h323.o h323/libchanh323.a
  	$(ECHO_PREFIX) echo "   [LD] $^ -> $@"
 +ifeq ($(OSARCH),FreeBSD)
-+	$(CMD_PREFIX) $(CXX) $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK) -L$(PREFIX)/lib $(H323LDFLAGS) -o $@ $< h323/libchanh323.a $(H323LDLIBS) $(CHANH323LIB)
++	$(CMD_PREFIX) $(CXX) $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK) -L$(LOCALBASE)/lib $(H323LDFLAGS) -o $@ $< h323/libchanh323.a $(H323LDLIBS) $(CHANH323LIB)
 +else
- 	$(CMD_PREFIX) $(CXX) $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK) -o $@ $< h323/libchanh323.a $(CHANH323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -L$(OPENH323DIR)/lib $(H323LIB) -L/usr/lib -lcrypto -lssl -lexpat
+ 	$(CMD_PREFIX) $(CXX) $(PTHREAD_CFLAGS) $(_ASTLDFLAGS) $(ASTLDFLAGS) $(SOLINK) -o $@ $< h323/libchanh323.a $(CHANH323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -L$(OPENH323DIR)/lib $(H323LIB) -L/usr/lib -lcrypto -lssl -lexpat
  endif
  endif
 +endif
diff --git a/net/asterisk16/files/patch-channels::chan_sip.c b/net/asterisk16/files/patch-channels::chan_sip.c
index e57f93aa527f..b930d60504a2 100644
--- a/net/asterisk16/files/patch-channels::chan_sip.c
+++ b/net/asterisk16/files/patch-channels::chan_sip.c
@@ -1,14 +1,11 @@
-
-$FreeBSD$
-
---- channels/chan_sip.c
-+++ channels/chan_sip.c
-@@ -611,7 +611,7 @@
- #define DEFAULT_MOHINTERPRET    "default"
+--- channels/chan_sip.c.orig	2010-05-28 23:57:40.000000000 +0600
++++ channels/chan_sip.c	2010-08-11 10:47:07.000000000 +0600
+@@ -980,7 +980,7 @@
+ #define DEFAULT_MOHINTERPRET    "default"	/*!< The default music class */
  #define DEFAULT_MOHSUGGEST      ""
- #define DEFAULT_VMEXTEN 	"asterisk"
--#define DEFAULT_CALLERID 	"asterisk"
-+#define DEFAULT_CALLERID 	"Unknown"
+ #define DEFAULT_VMEXTEN 	"asterisk"	/*!< Default voicemail extension */
+-#define DEFAULT_CALLERID 	"asterisk"	/*!< Default caller ID */
++#define DEFAULT_CALLERID 	"Unknown"	/*!< Default caller ID */
  #define DEFAULT_NOTIFYMIME 	"application/simple-message-summary"
  #define DEFAULT_ALLOWGUEST	TRUE
- #define DEFAULT_CALLCOUNTER	FALSE
+ #define DEFAULT_RTPKEEPALIVE	0		/*!< Default RTPkeepalive setting */
diff --git a/net/asterisk16/files/patch-configure b/net/asterisk16/files/patch-configure
index 525650191d49..7cd2e8abbb6c 100644
--- a/net/asterisk16/files/patch-configure
+++ b/net/asterisk16/files/patch-configure
@@ -1,18 +1,16 @@
-
-$FreeBSD$
-
---- configure.orig
-+++ configure
-@@ -4432,8 +4432,6 @@
+--- ./configure.orig	2010-07-17 23:43:50.000000000 +0600
++++ ./configure	2010-08-24 09:37:46.000000000 +0600
+@@ -4147,9 +4147,6 @@
+ 
  case "${host_os}" in
       freebsd*)
-      ac_default_prefix=/usr/local
+-
 -     CPPFLAGS=-I/usr/local/include
 -     LDFLAGS=-L/usr/local/lib
       ;;
+      openbsd*)
  
-      darwin*)
-@@ -18784,7 +18782,7 @@
+@@ -34755,7 +34752,7 @@
  
  	fi
  
@@ -20,4 +18,4 @@ $FreeBSD$
 +	PLATFORM_OPENH323="h323_${OPENH323_SUFFIX}"
  
  	if test "${HAS_OPENH323:-unset}" != "unset"; then
- 	   { $as_echo "$as_me:${as_lineno-$LINENO}: checking OpenH323 installation validity" >&5
+ 	   { echo "$as_me:$LINENO: checking OpenH323 installation validity" >&5
diff --git a/net/asterisk16/files/patch-main::Makefile b/net/asterisk16/files/patch-main::Makefile
index 836cee89062d..01a394a3f939 100644
--- a/net/asterisk16/files/patch-main::Makefile
+++ b/net/asterisk16/files/patch-main::Makefile
@@ -1,20 +1,20 @@
 
 $FreeBSD$
 
---- main/Makefile.orig
-+++ main/Makefile
-@@ -101,8 +101,8 @@
- 	cd editline && test -f config.h || CFLAGS="$(PTHREAD_CFLAGS) $(subst $(ASTTOPDIR),../../,$(_ASTCFLAGS:-Werror=) $(ASTCFLAGS))" LDFLAGS="$(ASTLDFLAGS)" ./configure --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --with-ncurses=$(NCURSES_DIR) --with-curses=$(CURSES_DIR) --with-termcap=$(TERMCAP_DIR) --with-tinfo=$(TINFO_DIR)
+--- ./main/Makefile.orig	2010-06-26 00:58:37.000000000 +0600
++++ ./main/Makefile	2010-08-24 09:40:39.000000000 +0600
+@@ -113,8 +113,8 @@
+ 	cd editline && test -f config.h || CFLAGS="$(PTHREAD_CFLAGS) $(subst $(ASTTOPDIR),../../,$(_ASTCFLAGS:-Werror=) $(ASTCFLAGS))" LDFLAGS="$(_ASTLDFLAGS) $(ASTLDFLAGS)" ./configure --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --with-ncurses=$(NCURSES_DIR) --with-curses=$(CURSES_DIR) --with-termcap=$(TERMCAP_DIR) --with-tinfo=$(TINFO_DIR)
  	$(MAKE) -C editline libedit.a
  
 -db1-ast/libdb1.a: CHECK_SUBDIR
--	_ASTCFLAGS="$(_ASTCFLAGS)" ASTCFLAGS="$(ASTCFLAGS) -Wno-strict-aliasing" $(MAKE) -C db1-ast libdb1.a
+-	_ASTCFLAGS="$(_ASTCFLAGS) -Wno-strict-aliasing" ASTCFLAGS="$(ASTCFLAGS)" $(MAKE) -C db1-ast libdb1.a
 +#db1-ast/libdb1.a: CHECK_SUBDIR
-+#	_ASTCFLAGS="$(_ASTCFLAGS)" ASTCFLAGS="$(ASTCFLAGS) -Wno-strict-aliasing" $(MAKE) -C db1-ast libdb1.a
++#	_ASTCFLAGS="$(_ASTCFLAGS) -Wno-strict-aliasing" ASTCFLAGS="$(ASTCFLAGS)" $(MAKE) -C db1-ast libdb1.a
  
- ast_expr2.c ast_expr2.h:
- 	bison -o $@ -d --name-prefix=ast_yy ast_expr2.y
-@@ -159,13 +159,13 @@
+ ifneq ($(findstring REBUILD_PARSERS,$(MENUSELECT_CFLAGS)),)
+ ast_expr2.c ast_expr2.h: ast_expr2.y
+@@ -177,13 +177,13 @@
  GMIMELDFLAGS+=$(GMIME_LIB)
  endif
  
@@ -23,10 +23,10 @@ $FreeBSD$
  	@$(CC) -c -o buildinfo.o $(_ASTCFLAGS) buildinfo.c $(ASTCFLAGS)
  	$(ECHO_PREFIX) echo "   [LD] $^ -> $@"
  ifneq ($(findstring chan_h323,$(MENUSELECT_CHANNELS)),)
--	$(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(GMIMELDFLAGS)
+-	$(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(ASTLDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(GMIMELDFLAGS)
 +	$(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(LDFLAGS) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(GMIMELDFLAGS)
  else
--	$(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(GMIMELDFLAGS)
+-	$(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(GMIMELDFLAGS)
 +	$(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(LDFLAGS) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(GMIMELDFLAGS)
  endif
  	$(CMD_PREFIX) $(ASTTOPDIR)/build_tools/strip_nonapi $@ || rm $@
diff --git a/net/asterisk16/pkg-plist b/net/asterisk16/pkg-plist
index c0652c26acf5..d44913a5d804 100644
--- a/net/asterisk16/pkg-plist
+++ b/net/asterisk16/pkg-plist
@@ -1,11 +1,21 @@
+@unexec if cmp -s %D/etc/asterisk/ais.conf %D/etc/asterisk/ais.conf-dist; then rm -f %D/etc/asterisk/ais.conf; fi
+etc/asterisk/ais.conf-dist
 @unexec if cmp -s %D/etc/asterisk/cdr_adaptive_odbc.conf %D/etc/asterisk/cdr_adaptive_odbc.conf-dist; then rm -f %D/etc/asterisk/cdr_adaptive_odbc.conf; fi
 etc/asterisk/cdr_adaptive_odbc.conf-dist
 @unexec if cmp -s %D/etc/asterisk/cdr_sqlite3_custom.conf %D/etc/asterisk/cdr_sqlite3_custom.conf-dist; then rm -f %D/etc/asterisk/cdr_sqlite3_custom.conf; fi
 etc/asterisk/cdr_sqlite3_custom.conf-dist
 @unexec if cmp -s %D/etc/asterisk/cli.conf %D/etc/asterisk/cli.conf-dist; then rm -f %D/etc/asterisk/cli.conf; fi
 etc/asterisk/cli.conf-dist
+@unexec if cmp -s %D/etc/asterisk/cli_aliases.conf %D/etc/asterisk/cli_aliases.conf-dist; then rm -f %D/etc/asterisk/cli_aliases.conf; fi
+etc/asterisk/cli_aliases.conf-dist
+@unexec if cmp -s %D/etc/asterisk/cli_permissions.conf %D/etc/asterisk/cli_permissions.conf-dist; then rm -f %D/etc/asterisk/cli_permissions.conf; fi
+etc/asterisk/cli_permissions.conf-dist
 @unexec if cmp -s %D/etc/asterisk/console.conf %D/etc/asterisk/console.conf-dist; then rm -f %D/etc/asterisk/console.conf; fi
 etc/asterisk/console.conf-dist
+@unexec if cmp -s %D/etc/asterisk/dbsep.conf %D/etc/asterisk/dbsep.conf-dist; then rm -f %D/etc/asterisk/dbsep.conf; fi
+etc/asterisk/dbsep.conf-dist
+@unexec if cmp -s %D/etc/asterisk/dsp.conf %D/etc/asterisk/dsp.conf-dist; then rm -f %D/etc/asterisk/dsp.conf; fi
+etc/asterisk/dsp.conf-dist
 @unexec if cmp -s %D/etc/asterisk/extensions.lua %D/etc/asterisk/extensions.lua-dist; then rm -f %D/etc/asterisk/extensions.lua; fi
 etc/asterisk/extensions.lua-dist
 @unexec if cmp -s %D/etc/asterisk/extensions_minivm.conf %D/etc/asterisk/extensions_minivm.conf-dist; then rm -f %D/etc/asterisk/extensions_minivm.conf; fi
@@ -146,6 +156,8 @@ etc/asterisk/func_odbc.conf-dist
 etc/asterisk/followme.conf-dist
 @unexec if cmp -s %D/etc/asterisk/amd.conf %D/etc/asterisk/amd.conf-dist; then rm -f %D/etc/asterisk/amd.conf; fi
 etc/asterisk/amd.conf-dist
+@unexec if cmp -s %D/etc/asterisk/res_config_sqlite.conf %D/etc/asterisk/res_config_sqlite.conf-dist; then rm -f %D/etc/asterisk/res_config_sqlite.conf; fi
+etc/asterisk/res_config_sqlite.conf-dist
 @exec if test ! -e %D/etc/asterisk/cdr_adaptive_odbc.conf; then cp -p %D/etc/asterisk/cdr_adaptive_odbc.conf-dist %D/etc/asterisk/cdr_adaptive_odbc.conf; fi
 @exec if test ! -e %D/etc/asterisk/cdr_sqlite3_custom.conf; then cp -p %D/etc/asterisk/cdr_sqlite3_custom.conf-dist %D/etc/asterisk/cdr_sqlite3_custom.conf; fi
 @exec if test ! -e %D/etc/asterisk/cli.conf; then cp -p %D/etc/asterisk/cli.conf-dist %D/etc/asterisk/cli.conf; fi
@@ -250,7 +262,11 @@ include/asterisk/astobj2.h
 include/asterisk/astosp.h
 include/asterisk/audiohook.h
 include/asterisk/autoconfig.h
+include/asterisk/bridging.h
+include/asterisk/bridging_features.h
+include/asterisk/bridging_technology.h
 include/asterisk/build.h
+include/asterisk/buildinfo.h
 include/asterisk/buildopts.h
 include/asterisk/callerid.h
 include/asterisk/causes.h
@@ -262,8 +278,10 @@ include/asterisk/compat.h
 include/asterisk/compiler.h
 include/asterisk/config.h
 include/asterisk/crypto.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/doxyref.h
@@ -276,6 +294,7 @@ include/asterisk/file.h
 include/asterisk/frame.h
 include/asterisk/fskmodem.h
 include/asterisk/global_datastores.h
+include/asterisk/heap.h
 include/asterisk/http.h
 include/asterisk/image.h
 include/asterisk/indications.h
@@ -304,16 +323,20 @@ include/asterisk/rtp.h
 include/asterisk/say.h
 include/asterisk/sched.h
 include/asterisk/sha1.h
+include/asterisk/slin.h
 include/asterisk/slinfactory.h
 include/asterisk/smdi.h
 include/asterisk/speech.h
 include/asterisk/srv.h
 include/asterisk/stringfields.h
 include/asterisk/strings.h
+include/asterisk/taskprocessor.h
 include/asterisk/tdd.h
 include/asterisk/term.h
+include/asterisk/test.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
@@ -321,17 +344,30 @@ include/asterisk/ulaw.h
 include/asterisk/unaligned.h
 include/asterisk/utils.h
 include/asterisk/version.h
+include/asterisk/xml.h
+include/asterisk/xmldoc.h
+lib/asterisk/modules/app_confbridge.so
 lib/asterisk/modules/app_minivm.so
-lib/asterisk/modules/app_pickupchan.so
+lib/asterisk/modules/app_originate.so
+lib/asterisk/modules/app_playtones.so
 lib/asterisk/modules/app_readexten.so
 lib/asterisk/modules/app_waituntil.so
+lib/asterisk/modules/bridge_builtin_features.so
+lib/asterisk/modules/bridge_multiplexed.so
+lib/asterisk/modules/bridge_simple.so
+lib/asterisk/modules/bridge_softmix.so
 %%WITH_ODBC%%lib/asterisk/modules/cdr_adaptive_odbc.so
 %%WITH_JABBER%%lib/asterisk/modules/chan_jingle.so
+lib/asterisk/modules/chan_bridge.so
 lib/asterisk/modules/chan_unistim.so
 lib/asterisk/modules/codec_g722.so
 lib/asterisk/modules/format_sln16.so
+lib/asterisk/modules/format_siren14.so
+lib/asterisk/modules/format_siren7.so
+lib/asterisk/modules/func_aes.so
 lib/asterisk/modules/func_audiohookinherit.so
 lib/asterisk/modules/func_blacklist.so
+lib/asterisk/modules/func_config.so
 lib/asterisk/modules/func_devstate.so
 lib/asterisk/modules/func_dialgroup.so
 lib/asterisk/modules/func_dialplan.so
@@ -340,17 +376,23 @@ lib/asterisk/modules/func_iconv.so
 lib/asterisk/modules/func_lock.so
 lib/asterisk/modules/func_module.so
 lib/asterisk/modules/func_shell.so
+lib/asterisk/modules/func_speex.so
+lib/asterisk/modules/func_sprintf.so
 lib/asterisk/modules/func_sysinfo.so
 lib/asterisk/modules/func_version.so
 lib/asterisk/modules/func_vmcount.so
 lib/asterisk/modules/func_volume.so
 lib/asterisk/modules/res_ael_share.so
+lib/asterisk/modules/res_clialiases.so
+%%WITH_CURL%%lib/asterisk/modules/res_curl.so
 %%WITH_CURL%%lib/asterisk/modules/res_config_curl.so
 lib/asterisk/modules/res_config_ldap.so
 %%WITH_SQLITE%%lib/asterisk/modules/res_config_sqlite.so
 lib/asterisk/modules/res_limit.so
 lib/asterisk/modules/res_phoneprov.so
 lib/asterisk/modules/res_realtime.so
+%%WITH_DAHDI%%lib/asterisk/modules/res_timing_dahdi.so
+lib/asterisk/modules/res_timing_pthread.so
 lib/asterisk/modules/app_adsiprog.so
 lib/asterisk/modules/app_alarmreceiver.so
 lib/asterisk/modules/app_amd.so
@@ -481,7 +523,6 @@ lib/asterisk/modules/res_clioriginate.so
 %%WITH_POSTGRES%%lib/asterisk/modules/res_config_pgsql.so
 lib/asterisk/modules/res_convert.so
 lib/asterisk/modules/res_crypto.so
-lib/asterisk/modules/res_indications.so
 %%WITH_JABBER%%lib/asterisk/modules/res_jabber.so
 lib/asterisk/modules/res_monitor.so
 lib/asterisk/modules/res_musiconhold.so
@@ -498,6 +539,7 @@ sbin/astgenkey
 sbin/astman
 sbin/autosupport
 sbin/muted
+sbin/refcounter
 sbin/rasterisk
 sbin/safe_asterisk
 sbin/smsq
@@ -507,9 +549,11 @@ share/asterisk/agi-bin/agi-test.agi
 share/asterisk/agi-bin/eagi-sphinx-test
 share/asterisk/agi-bin/eagi-test
 share/asterisk/agi-bin/jukebox.agi
+share/asterisk/documentation/appdocsxml.dtd
+share/asterisk/documentation/core-en_US.xml
 share/asterisk/keys/freeworlddialup.pub
 share/asterisk/keys/iaxtel.pub
-share/asterisk/moh/.asterisk-moh-opsound-wav
+share/asterisk/moh/.asterisk-moh-opsound-wav-2.03
 share/asterisk/moh/CHANGES-asterisk-moh-opsound-wav
 share/asterisk/moh/CREDITS-asterisk-moh-opsound-wav
 share/asterisk/moh/LICENSE-asterisk-moh-opsound-wav
@@ -522,12 +566,19 @@ share/asterisk/phoneprov/000000000000-directory.xml
 share/asterisk/phoneprov/000000000000-phone.cfg
 share/asterisk/phoneprov/000000000000.cfg
 share/asterisk/phoneprov/polycom.xml
-share/asterisk/sounds/.asterisk-core-sounds-en-gsm-1.4.17
-share/asterisk/sounds/en/LICENSE-asterisk-core-en-1.4.17
+share/asterisk/phoneprov/polycom_line.xml
+share/asterisk/sounds/.asterisk-core-sounds-en-gsm-1.4.19
+share/asterisk/sounds/en/LICENSE-asterisk-core-en-1.4.19
+share/asterisk/sounds/en/ascending-2tone.gsm
 share/asterisk/sounds/en/conf-adminmenu-162.gsm
 share/asterisk/sounds/en/conf-extended.gsm
 share/asterisk/sounds/en/conf-nonextended.gsm
+share/asterisk/sounds/en/conf-now-muted.gsm
+share/asterisk/sounds/en/conf-now-recording.gsm
+share/asterisk/sounds/en/conf-now-unmuted.gsm
+share/asterisk/sounds/en/conf-roll-callcomplete.gsm
 share/asterisk/sounds/en/conf-usermenu-162.gsm
+share/asterisk/sounds/en/descending-2tone.gsm
 share/asterisk/sounds/en/spy-dahdi.gsm
 share/asterisk/sounds/en/vm-Urgent.gsm
 share/asterisk/sounds/en/vm-forward-multiple.gsm
@@ -538,8 +589,8 @@ share/asterisk/sounds/en/vm-pls-try-again.gsm
 share/asterisk/sounds/en/vm-record-prepend.gsm
 share/asterisk/sounds/en/vm-review-nonurgent.gsm
 share/asterisk/sounds/en/vm-review-urgent.gsm
-share/asterisk/sounds/en/CHANGES-asterisk-core-en-1.4.17
-share/asterisk/sounds/en/CREDITS-asterisk-core-en-1.4.17
+share/asterisk/sounds/en/CHANGES-asterisk-core-en-1.4.19
+share/asterisk/sounds/en/CREDITS-asterisk-core-en-1.4.19
 share/asterisk/sounds/en/dir-usingkeypad.gsm
 share/asterisk/sounds/en/dir-welcome.gsm
 share/asterisk/sounds/en/agent-alreadyon.gsm
@@ -633,6 +684,7 @@ share/asterisk/sounds/en/digits/9.gsm
 share/asterisk/sounds/en/digits/90.gsm
 share/asterisk/sounds/en/digits/a-m.gsm
 share/asterisk/sounds/en/digits/at.gsm
+share/asterisk/sounds/en/digits/billion.gsm
 share/asterisk/sounds/en/digits/day-0.gsm
 share/asterisk/sounds/en/digits/day-1.gsm
 share/asterisk/sounds/en/digits/day-2.gsm
@@ -657,11 +709,21 @@ share/asterisk/sounds/en/digits/h-20.gsm
 share/asterisk/sounds/en/digits/h-3.gsm
 share/asterisk/sounds/en/digits/h-30.gsm
 share/asterisk/sounds/en/digits/h-4.gsm
+share/asterisk/sounds/en/digits/h-40.gsm
 share/asterisk/sounds/en/digits/h-5.gsm
+share/asterisk/sounds/en/digits/h-50.gsm
 share/asterisk/sounds/en/digits/h-6.gsm
+share/asterisk/sounds/en/digits/h-60.gsm
 share/asterisk/sounds/en/digits/h-7.gsm
+share/asterisk/sounds/en/digits/h-70.gsm
 share/asterisk/sounds/en/digits/h-8.gsm
+share/asterisk/sounds/en/digits/h-80.gsm
 share/asterisk/sounds/en/digits/h-9.gsm
+share/asterisk/sounds/en/digits/h-90.gsm
+share/asterisk/sounds/en/digits/h-billion.gsm
+share/asterisk/sounds/en/digits/h-hundred.gsm
+share/asterisk/sounds/en/digits/h-million.gsm
+share/asterisk/sounds/en/digits/h-thousand.gsm
 share/asterisk/sounds/en/digits/hundred.gsm
 share/asterisk/sounds/en/digits/million.gsm
 share/asterisk/sounds/en/digits/minus.gsm
@@ -772,6 +834,7 @@ share/asterisk/sounds/en/letters/zed.gsm
 share/asterisk/sounds/en/minutes.gsm
 share/asterisk/sounds/en/pbx-invalid.gsm
 share/asterisk/sounds/en/pbx-invalidpark.gsm
+share/asterisk/sounds/en/pbx-parkingfailed.gsm
 share/asterisk/sounds/en/pbx-transfer.gsm
 share/asterisk/sounds/en/phonetic/9_p.gsm
 share/asterisk/sounds/en/phonetic/a_p.gsm
@@ -811,6 +874,7 @@ share/asterisk/sounds/en/privacy-unident.gsm
 share/asterisk/sounds/en/queue-callswaiting.gsm
 share/asterisk/sounds/en/queue-holdtime.gsm
 share/asterisk/sounds/en/queue-less-than.gsm
+share/asterisk/sounds/en/queue-minute.gsm
 share/asterisk/sounds/en/queue-minutes.gsm
 share/asterisk/sounds/en/queue-periodic-announce.gsm
 share/asterisk/sounds/en/queue-quantity1.gsm
@@ -991,6 +1055,10 @@ share/asterisk/static-http/prototype.js
 %%DOCSDIR%%/img3.png
 %%DOCSDIR%%/img4.png
 %%DOCSDIR%%/img5.png
+%%DOCSDIR%%/img6.png
+%%DOCSDIR%%/img7.png
+%%DOCSDIR%%/img8.png
+%%DOCSDIR%%/img9.png
 %%DOCSDIR%%/index.html
 %%DOCSDIR%%/internals.pl
 %%DOCSDIR%%/labels.pl
@@ -1195,6 +1263,25 @@ share/asterisk/static-http/prototype.js
 %%DOCSDIR%%/node278.html
 %%DOCSDIR%%/node279.html
 %%DOCSDIR%%/node28.html
+%%DOCSDIR%%/node280.html
+%%DOCSDIR%%/node281.html
+%%DOCSDIR%%/node282.html
+%%DOCSDIR%%/node283.html
+%%DOCSDIR%%/node284.html
+%%DOCSDIR%%/node285.html
+%%DOCSDIR%%/node286.html
+%%DOCSDIR%%/node287.html
+%%DOCSDIR%%/node288.html
+%%DOCSDIR%%/node289.html
+%%DOCSDIR%%/node290.html
+%%DOCSDIR%%/node291.html
+%%DOCSDIR%%/node292.html
+%%DOCSDIR%%/node293.html
+%%DOCSDIR%%/node294.html
+%%DOCSDIR%%/node295.html
+%%DOCSDIR%%/node296.html
+%%DOCSDIR%%/node297.html
+%%DOCSDIR%%/node298.html
 %%DOCSDIR%%/node29.html
 %%DOCSDIR%%/node3.html
 %%DOCSDIR%%/node30.html
@@ -1291,12 +1378,16 @@ share/asterisk/static-http/prototype.js
 @dirrm share/asterisk/keys
 @dirrm share/asterisk/firmware/iax
 @dirrm share/asterisk/firmware
+@dirrm share/asterisk/documentation/thirdparty
+@dirrm share/asterisk/documentation
 @dirrm share/asterisk/agi-bin
 @dirrm share/asterisk
 @dirrm lib/asterisk/modules
 @dirrm lib/asterisk
 @dirrm include/asterisk
 @dirrmtry etc/asterisk
+@exec mkdir -p %D/share/asterisk/firmware/iax
+@exec mkdir -p %D/share/asterisk/documentation/thirdparty
 @exec mkdir -p %D/share/asterisk/sounds/es
 @exec mkdir -p %D/share/asterisk/sounds/fr
 @cwd /var
@@ -1304,15 +1395,19 @@ spool/asterisk/voicemail/default/1234/en/busy.gsm
 spool/asterisk/voicemail/default/1234/en/unavail.gsm
 @exec mkdir -p %D/log/asterisk/cdr-csv
 @exec mkdir -p %D/log/asterisk/cdr-custom
-@exec mkdir -p %D/spool/asterisk/voicemail/default/1234/INBOX
 @exec mkdir -p %D/spool/asterisk/dictate
 @exec mkdir -p %D/spool/asterisk/meetme
 @exec mkdir -p %D/spool/asterisk/monitor
+@exec mkdir -p %D/spool/asterisk/outgoing
 @exec mkdir -p %D/spool/asterisk/system
+@exec mkdir -p %D/spool/asterisk/voicemail/default/1234/INBOX
+@exec mkdir -p %D/spool/asterisk/voicemail/default/1234/en
 @exec mkdir -p %D/spool/asterisk/tmp
+@exec mkdir -p %D/db/asterisk
 @dirrm spool/asterisk/dictate
 @dirrm spool/asterisk/meetme
 @dirrm spool/asterisk/monitor
+@dirrm spool/asterisk/outgoing
 @dirrm spool/asterisk/system
 @dirrm spool/asterisk/voicemail/default/1234/INBOX
 @dirrm spool/asterisk/voicemail/default/1234/en