- Update to 1.4.37

- Switch from Zaptel to DAHDI

Approved by:	MAINTAINER

8 files changed, 148 insertions, 142 deletions

diff --git a/net/asterisk14/Makefile b/net/asterisk14/Makefile
index 2d1ced08fcf..97f1719e773 100644
--- a/net/asterisk14/Makefile
+++ b/net/asterisk14/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	asterisk
-PORTVERSION=	1.4.29
-PORTREVISION=	4
+PORTVERSION=	1.4.37
 CATEGORIES=	net
 MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/asterisk/ \
 		http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/
@@ -58,11 +57,11 @@ OPTIONS=	OGGVORBIS	"Enable Ogg Vorbis support" on \
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == "i386" || ${ARCH} == "amd64"
-OPTIONS+=	ZAPTEL		"Enable Zaptel support" off
+.if ${ARCH} == "i386" || ${ARCH} == "amd64" || ${ARCH} == "sparc64"
+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)
@@ -75,16 +74,16 @@ LIB_DEPENDS+=	pt_r.1:${PORTSDIR}/devel/pwlib \
 		h323_r.1:${PORTSDIR}/net/openh323
 .endif
 
-.if !defined(WITH_ZAPTEL)
-PLIST_SUB+=	WITH_ZAPTEL="@comment "
-CONFIGURE_ARGS+= --without-zaptel
+.if !defined(WITH_DAHDI)
+PLIST_SUB+=	WITH_DAHDI="@comment "
+CONFIGURE_ARGS+=	--without-dahdi
 .else
-PLIST_SUB+=	WITH_ZAPTEL=""
-CONFIGURE_ARGS+= --with-zaptel
-BUILD_DEPENDS+=	libpri>=1.2.0:${PORTSDIR}/misc/libpri \
-		${LOCALBASE}/include/zaptel/zaptel.h:${PORTSDIR}/misc/zaptel
+PLIST_SUB+=	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
-RUN_DEPENDS+=	${LOCALBASE}/include/zaptel/zaptel.h:${PORTSDIR}/misc/zaptel
+RUN_DEPENDS+=	${LOCALBASE}/lib/dahdi/dahdi.ko:${PORTSDIR}/misc/dahdi
 .endif
 
 #
@@ -171,8 +170,9 @@ EXTRA_PATCHES+=	${PATCHDIR}/ilbc_enable.diff
 .endif
 
 .if defined(WITH_CODEC_PATCH)
-PATCHFILES=	asterisk-1.4.27-codec-negotiation-20091120.diff.gz
-PATCH_SITES=	http://b2bua.org/chrome/site/
+PATCHFILES=	asterisk-1.4.37-codec-negotiation-20101130.diff.gz
+PATCH_SITES=	${MASTER_SITE_LOCAL}
+PATCH_SITE_SUBDIR=	fjoe/
 EXTRA_PATCHES+=	${PATCHDIR}/codecnego-patch-Makefile
 .else
 EXTRA_PATCHES+=	${PATCHDIR}/nocodecnego-patch-Makefile
diff --git a/net/asterisk14/distinfo b/net/asterisk14/distinfo
index 1c21b1a25ea..6028ee86614 100644
--- a/net/asterisk14/distinfo
+++ b/net/asterisk14/distinfo
@@ -1,6 +1,4 @@
-MD5 (asterisk-1.4.29.tar.gz) = b49d0a269e11b6e85c75edce577b5103
-SHA256 (asterisk-1.4.29.tar.gz) = ecb1202f50fc5d7738d1b5bf6451b28e356f3469266dd64bcd637be71f91bd09
-SIZE (asterisk-1.4.29.tar.gz) = 21534219
-MD5 (asterisk-1.4.27-codec-negotiation-20091120.diff.gz) = 4dedd23b3c9c00bcdcc69b8be878f15c
-SHA256 (asterisk-1.4.27-codec-negotiation-20091120.diff.gz) = 68f895de29f30296a47d32a5eaab8df367d92ae87b01ea9f2262556a1f1e5cbb
-SIZE (asterisk-1.4.27-codec-negotiation-20091120.diff.gz) = 40455
+SHA256 (asterisk-1.4.37.tar.gz) = 0168cc552eb5c3758a447d22c6d08a8cba0509b0be4036e253f895066facf3f6
+SIZE (asterisk-1.4.37.tar.gz) = 21666828
+SHA256 (asterisk-1.4.37-codec-negotiation-20101130.diff.gz) = fa1acd617b9648e5e7b5d4da4691eded88834d93957f113ac8ddf94f9307200c
+SIZE (asterisk-1.4.37-codec-negotiation-20101130.diff.gz) = 40520
diff --git a/net/asterisk14/files/dtmf_debug.diff b/net/asterisk14/files/dtmf_debug.diff
index 2a5b6bc9ea3..d360744d10e 100644
--- a/net/asterisk14/files/dtmf_debug.diff
+++ b/net/asterisk14/files/dtmf_debug.diff
@@ -60,9 +60,9 @@
  static int rtcpstats;			/*!< Are we debugging RTCP? */
  static int rtcpinterval = RTCP_DEFAULT_INTERVALMS; /*!< Time between rtcp reports in millisecs */
 @@ -170,6 +171,8 @@
+ 	struct ast_codec_pref pref;
  	struct ast_rtp *bridged;        /*!< Who we are Packet bridged to */
  	int set_marker_bit:1;           /*!< Whether to set the marker bit or not */
- 	unsigned int constantssrc:1;
 +        char chan_name[100];
 +        char chan_id[100];
  };
@@ -82,7 +82,7 @@
 @@ -691,12 +694,25 @@
  	}
  	if (rtp->resp && (rtp->resp != resp)) {
- 		f = send_dtmf(rtp, AST_FRAME_DTMF_END);
+ 		f = create_dtmf_frame(rtp, AST_FRAME_DTMF_END);
 +                ast_log(LOG_DEBUG, "Channel: %s %s Cisco DTMF event: %c\n", rtp->chan_name, rtp->chan_id, rtp->resp);
  	}
  	rtp->resp = resp;
@@ -141,20 +141,15 @@
  				data = rtp->rawdata + AST_FRIENDLY_OFFSET + hdrlen;
  				event = ntohl(*((unsigned int *)(data)));
  				event >>= 24;
-@@ -1319,9 +1336,12 @@
+@@ -1319,7 +1336,7 @@
  				event_end >>= 24;
  				duration = ntohl(*((unsigned int *)(data)));
  				duration &= 0xFFFF;
 -				ast_verbose("Got  RTP RFC2833 from   %s:%u (type %-2.2d, seq %-6.6u, ts %-6.6u, len %-6.6u, mark %d, event %08x, end %d, duration %-5.5d) \n", ast_inet_ntoa(sin.sin_addr), ntohs(sin.sin_port), payloadtype, seqno, timestamp, res - hdrlen, (mark?1:0), event, ((event_end & 0x80)?1:0), duration);
-+
 +				ast_verbose("Channel: %s %s Got RTP RFC2833 from %s:%u to %s:%u (type %-2.2d, seq %-6.6u, ts %-6.6u, len %-6.6u, mark %d, event %08x, end %d, duration %-5.5d)\n", rtp->chan_name, rtp->chan_id, ast_inet_ntoa(sin.sin_addr), ntohs(sin.sin_port), ast_inet_ntoa(rtp->us.sin_addr), ntohs(rtp->us.sin_port), payloadtype, seqno, timestamp, res - hdrlen, (mark?1:0), event, ((event_end & 0x80)?1:0), duration);
  			}
- 			f = process_rfc2833(rtp, rtp->rawdata + AST_FRIENDLY_OFFSET + hdrlen, res - hdrlen, seqno, timestamp);
-+			if (rtpdebugdtmf && f)
-+				ast_verbose("Channel: %s %s Got RFC2833 DTMF event %c of type %s\n", rtp->chan_name, rtp->chan_id, f->subclass, (f->frametype == AST_FRAME_DTMF_BEGIN ? "DTMF BEGIN" : (f->frametype == AST_FRAME_DTMF_END ? "DTMF_END" : "UNKNOWN")));
- 		} else if (rtpPT.code == AST_RTP_CISCO_DTMF) {
- 			/* It's really special -- process it the Cisco way */
- 			if (rtp->lastevent <= seqno || (rtp->lastevent >= 65530 && seqno <= 6)) {
+ 			/* process_rfc2833 may need to return multiple frames. We do this
+ 			 * by passing the pointer to the frame list to it so that the method
 @@ -2287,8 +2307,9 @@
  			ast_log(LOG_ERROR, "RTP Transmission error to %s:%u: %s\n",
  				ast_inet_ntoa(rtp->them.sin_addr),
diff --git a/net/asterisk14/files/nocodecnego-patch-Makefile b/net/asterisk14/files/nocodecnego-patch-Makefile
index c5df459f1b2..f0dff261d91 100644
--- a/net/asterisk14/files/nocodecnego-patch-Makefile
+++ b/net/asterisk14/files/nocodecnego-patch-Makefile
@@ -39,16 +39,10 @@
    _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
-@@ -410,21 +412,21 @@
- 	rm -f build_tools/menuselect-deps
+@@ -410,18 +412,18 @@
  
  datafiles: _all
--	if [ `$(ID) -u` = 0 ]; then \
--		CFLAGS="$(_ASTCFLAGS) $(ASTCFLAGS)" build_tools/mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; \
--	fi
-+	#if [ `$(ID) -u` = 0 ]; then \
-+	#	CFLAGS="$(_ASTCFLAGS) $(ASTCFLAGS)" build_tools/mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; \
-+	#fi
+	CFLAGS="$(_ASTCFLAGS) $(ASTCFLAGS)" build_tools/mkpkgconfig $(DESTDIR)$(libdir)/pkgconfig;
  # 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.
diff --git a/net/asterisk14/files/patch-configure b/net/asterisk14/files/patch-configure
index 93432489e41..c94b169ad3d 100644
--- a/net/asterisk14/files/patch-configure
+++ b/net/asterisk14/files/patch-configure
@@ -1,18 +1,16 @@
-
-$FreeBSD$
-
---- configure.orig
-+++ configure
-@@ -4308,8 +4308,6 @@
+--- configure.orig	2010-09-10 07:13:45.000000000 +0700
++++ configure	2010-11-30 00:38:53.000000000 +0600
+@@ -4017,9 +4017,6 @@
+ 
  case "${host_os}" in
       freebsd*)
-      ac_default_prefix=/usr/local
+-
 -     CPPFLAGS=-I/usr/local/include
 -     LDFLAGS=-L/usr/local/lib
       ;;
       darwin*)
  
-@@ -16837,7 +16835,7 @@
+@@ -29664,7 +29661,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/asterisk14/files/patch-main::Makefile b/net/asterisk14/files/patch-main::Makefile
index a4758b78bdc..621b9ebb8f5 100644
--- a/net/asterisk14/files/patch-main::Makefile
+++ b/net/asterisk14/files/patch-main::Makefile
@@ -26,11 +26,11 @@
 -	$(ECHO_PREFIX) echo "   [LD] $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) -> $@"
 +	$(ECHO_PREFIX) echo "   [LD] $(OBJS) editline/libedit.a $(AST_EMBED_LDSCRIPTS) -> $@"
  ifneq ($(findstring chan_h323,$(MENUSELECT_CHANNELS)),)
--	$(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(ASTLDFLAGS)
-+	$(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(OBJS) editline/libedit.a $(AST_EMBED_LDSCRIPTS) buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(ASTLDFLAGS)
+-	$(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(PTHREAD_CFLAGS) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(ASTLDFLAGS)
++	$(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(PTHREAD_CFLAGS) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(OBJS) editline/libedit.a $(AST_EMBED_LDSCRIPTS) buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(ASTLDFLAGS)
  else
--	$(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(H323LDFLAGS) $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(ASTLDFLAGS)
-+	$(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(H323LDFLAGS) $(OBJS) editline/libedit.a $(AST_EMBED_LDSCRIPTS) buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(ASTLDFLAGS)
+-	$(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(PTHREAD_CFLAGS) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(H323LDFLAGS) $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(ASTLDFLAGS)
++	$(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(PTHREAD_CFLAGS) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(H323LDFLAGS) $(OBJS) editline/libedit.a $(AST_EMBED_LDSCRIPTS) buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(ASTLDFLAGS)
  endif
  
  clean::
diff --git a/net/asterisk14/files/patch-suppress_log_dups.diff b/net/asterisk14/files/patch-suppress_log_dups.diff
index 115b69f21ca..603c6d4540c 100644
--- a/net/asterisk14/files/patch-suppress_log_dups.diff
+++ b/net/asterisk14/files/patch-suppress_log_dups.diff
@@ -175,9 +175,9 @@ Index: main/logger.c
 +			snprintf(buf, sizeof(buf), 
  				"[%s] %s[%ld] %s: ",
  				date, levels[level], (long)GETTID(), file);
--			res = fprintf(chan->fileptr, "%s", buf->str);
+-			res = fprintf(chan->fileptr, "%s", term_strip(buf->str, buf->str, strlen(buf->str) + 1));
 -			if (res <= 0 && !ast_strlen_zero(buf->str)) {	/* Error, no characters printed */
-+			res = fprintf(chan->fileptr, "%s", buf);
++			res = fprintf(chan->fileptr, "%s", term_strip(buf, buf, strlen(buf) + 1));
 +			if (res <= 0 && !ast_strlen_zero(buf)) {	/* Error, no characters printed */
  				fprintf(stderr,"**** Asterisk Logging Error: ***********\n");
  				if (errno == ENOMEM || errno == ENOSPC) {
diff --git a/net/asterisk14/pkg-plist b/net/asterisk14/pkg-plist
index fa747b6e8a6..67fdd2a2e58 100644
--- a/net/asterisk14/pkg-plist
+++ b/net/asterisk14/pkg-plist
@@ -8,6 +8,8 @@ etc/asterisk/agents.conf-dist
 etc/asterisk/alarmreceiver.conf-dist
 @unexec if cmp -s %D/etc/asterisk/alsa.conf %D/etc/asterisk/alsa.conf-dist; then rm -f %D/etc/asterisk/alsa.conf; fi
 etc/asterisk/alsa.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/asterisk.adsi %D/etc/asterisk/asterisk.adsi-dist; then rm -f %D/etc/asterisk/asterisk.adsi; fi
 etc/asterisk/asterisk.adsi-dist
 @unexec if cmp -s %D/etc/asterisk/asterisk.conf %D/etc/asterisk/asterisk.conf-dist; then rm -f %D/etc/asterisk/asterisk.conf; fi
@@ -24,6 +26,8 @@ etc/asterisk/cdr_odbc.conf-dist
 etc/asterisk/cdr_pgsql.conf-dist
 @unexec if cmp -s %D/etc/asterisk/cdr_tds.conf %D/etc/asterisk/cdr_tds.conf-dist; then rm -f %D/etc/asterisk/cdr_tds.conf; fi
 etc/asterisk/cdr_tds.conf-dist
+@unexec if cmp -s %D/etc/asterisk/chan_dahdi.conf %D/etc/asterisk/chan_dahdi.conf-dist; then rm -f %D/etc/asterisk/chan_dahdi.conf; fi
+etc/asterisk/chan_dahdi.conf-dist
 @unexec if cmp -s %D/etc/asterisk/codecs.conf %D/etc/asterisk/codecs.conf-dist; then rm -f %D/etc/asterisk/codecs.conf; fi
 etc/asterisk/codecs.conf-dist
 @unexec if cmp -s %D/etc/asterisk/dnsmgr.conf %D/etc/asterisk/dnsmgr.conf-dist; then rm -f %D/etc/asterisk/dnsmgr.conf; fi
@@ -42,12 +46,24 @@ etc/asterisk/extensions.conf-dist
 etc/asterisk/features.conf-dist
 @unexec if cmp -s %D/etc/asterisk/festival.conf %D/etc/asterisk/festival.conf-dist; then rm -f %D/etc/asterisk/festival.conf; fi
 etc/asterisk/festival.conf-dist
+@unexec if cmp -s %D/etc/asterisk/followme.conf %D/etc/asterisk/followme.conf-dist; then rm -f %D/etc/asterisk/followme.conf; fi
+etc/asterisk/followme.conf-dist
+@unexec if cmp -s %D/etc/asterisk/func_odbc.conf %D/etc/asterisk/func_odbc.conf-dist; then rm -f %D/etc/asterisk/func_odbc.conf; fi
+etc/asterisk/func_odbc.conf-dist
+@unexec if cmp -s %D/etc/asterisk/gtalk.conf %D/etc/asterisk/gtalk.conf-dist; then rm -f %D/etc/asterisk/gtalk.conf; fi
+etc/asterisk/gtalk.conf-dist
+@unexec if cmp -s %D/etc/asterisk/h323.conf %D/etc/asterisk/h323.conf-dist; then rm -f %D/etc/asterisk/h323.conf; fi
+etc/asterisk/h323.conf-dist
+@unexec if cmp -s %D/etc/asterisk/http.conf %D/etc/asterisk/http.conf-dist; then rm -f %D/etc/asterisk/http.conf; fi
+etc/asterisk/http.conf-dist
 @unexec if cmp -s %D/etc/asterisk/iax.conf %D/etc/asterisk/iax.conf-dist; then rm -f %D/etc/asterisk/iax.conf; fi
 etc/asterisk/iax.conf-dist
 @unexec if cmp -s %D/etc/asterisk/iaxprov.conf %D/etc/asterisk/iaxprov.conf-dist; then rm -f %D/etc/asterisk/iaxprov.conf; fi
 etc/asterisk/iaxprov.conf-dist
 @unexec if cmp -s %D/etc/asterisk/indications.conf %D/etc/asterisk/indications.conf-dist; then rm -f %D/etc/asterisk/indications.conf; fi
 etc/asterisk/indications.conf-dist
+@unexec if cmp -s %D/etc/asterisk/jabber.conf %D/etc/asterisk/jabber.conf-dist; then rm -f %D/etc/asterisk/jabber.conf; fi
+etc/asterisk/jabber.conf-dist
 @unexec if cmp -s %D/etc/asterisk/logger.conf %D/etc/asterisk/logger.conf-dist; then rm -f %D/etc/asterisk/logger.conf; fi
 etc/asterisk/logger.conf-dist
 @unexec if cmp -s %D/etc/asterisk/manager.conf %D/etc/asterisk/manager.conf-dist; then rm -f %D/etc/asterisk/manager.conf; fi
@@ -62,6 +78,8 @@ etc/asterisk/misdn.conf-dist
 etc/asterisk/modules.conf-dist
 @unexec if cmp -s %D/etc/asterisk/musiconhold.conf %D/etc/asterisk/musiconhold.conf-dist; then rm -f %D/etc/asterisk/musiconhold.conf; fi
 etc/asterisk/musiconhold.conf-dist
+@unexec if cmp -s %D/etc/asterisk/muted.conf %D/etc/asterisk/muted.conf-dist; then rm -f %D/etc/asterisk/muted.conf; fi
+etc/asterisk/muted.conf-dist
 @unexec if cmp -s %D/etc/asterisk/osp.conf %D/etc/asterisk/osp.conf-dist; then rm -f %D/etc/asterisk/osp.conf; fi
 etc/asterisk/osp.conf-dist
 @unexec if cmp -s %D/etc/asterisk/oss.conf %D/etc/asterisk/oss.conf-dist; then rm -f %D/etc/asterisk/oss.conf; fi
@@ -72,61 +90,44 @@ etc/asterisk/phone.conf-dist
 etc/asterisk/privacy.conf-dist
 @unexec if cmp -s %D/etc/asterisk/queues.conf %D/etc/asterisk/queues.conf-dist; then rm -f %D/etc/asterisk/queues.conf; fi
 etc/asterisk/queues.conf-dist
-@unexec if cmp -s %D/etc/asterisk/res_pgsql.conf %D/etc/asterisk/res_pgsql.conf-dist; then rm -f %D/etc/asterisk/res_pgsql.conf; fi
-etc/asterisk/res_pgsql.conf-dist
 @unexec if cmp -s %D/etc/asterisk/res_odbc.conf %D/etc/asterisk/res_odbc.conf-dist; then rm -f %D/etc/asterisk/res_odbc.conf; fi
 etc/asterisk/res_odbc.conf-dist
+@unexec if cmp -s %D/etc/asterisk/res_pgsql.conf %D/etc/asterisk/res_pgsql.conf-dist; then rm -f %D/etc/asterisk/res_pgsql.conf; fi
+etc/asterisk/res_pgsql.conf-dist
+@unexec if cmp -s %D/etc/asterisk/res_snmp.conf %D/etc/asterisk/res_snmp.conf-dist; then rm -f %D/etc/asterisk/res_snmp.conf; fi
+etc/asterisk/res_snmp.conf-dist
 @unexec if cmp -s %D/etc/asterisk/rpt.conf %D/etc/asterisk/rpt.conf-dist; then rm -f %D/etc/asterisk/rpt.conf; fi
 etc/asterisk/rpt.conf-dist
 @unexec if cmp -s %D/etc/asterisk/rtp.conf %D/etc/asterisk/rtp.conf-dist; then rm -f %D/etc/asterisk/rtp.conf; fi
 etc/asterisk/rtp.conf-dist
+@unexec if cmp -s %D/etc/asterisk/say.conf %D/etc/asterisk/say.conf-dist; then rm -f %D/etc/asterisk/say.conf; fi
+etc/asterisk/say.conf-dist
 @unexec if cmp -s %D/etc/asterisk/sip.conf %D/etc/asterisk/sip.conf-dist; then rm -f %D/etc/asterisk/sip.conf; fi
 etc/asterisk/sip.conf-dist
 @unexec if cmp -s %D/etc/asterisk/sip_notify.conf %D/etc/asterisk/sip_notify.conf-dist; then rm -f %D/etc/asterisk/sip_notify.conf; fi
 etc/asterisk/sip_notify.conf-dist
 @unexec if cmp -s %D/etc/asterisk/skinny.conf %D/etc/asterisk/skinny.conf-dist; then rm -f %D/etc/asterisk/skinny.conf; fi
 etc/asterisk/skinny.conf-dist
+@unexec if cmp -s %D/etc/asterisk/sla.conf %D/etc/asterisk/sla.conf-dist; then rm -f %D/etc/asterisk/sla.conf; fi
+etc/asterisk/sla.conf-dist
+@unexec if cmp -s %D/etc/asterisk/smdi.conf %D/etc/asterisk/smdi.conf-dist; then rm -f %D/etc/asterisk/smdi.conf; fi
+etc/asterisk/smdi.conf-dist
 @unexec if cmp -s %D/etc/asterisk/telcordia-1.adsi %D/etc/asterisk/telcordia-1.adsi-dist; then rm -f %D/etc/asterisk/telcordia-1.adsi; fi
 etc/asterisk/telcordia-1.adsi-dist
-@unexec if cmp -s %D/etc/asterisk/voicemail.conf %D/etc/asterisk/voicemail.conf-dist; then rm -f %D/etc/asterisk/voicemail.conf; fi
-etc/asterisk/voicemail.conf-dist
-@unexec if cmp -s %D/etc/asterisk/vpb.conf %D/etc/asterisk/vpb.conf-dist; then rm -f %D/etc/asterisk/vpb.conf; fi
-etc/asterisk/vpb.conf-dist
-@unexec if cmp -s %D/etc/asterisk/chan_dahdi.conf %D/etc/asterisk/chan_dahdi.conf-dist; then rm -f %D/etc/asterisk/chan_dahdi.conf; fi
-etc/asterisk/chan_dahdi.conf-dist
 @unexec if cmp -s %D/etc/asterisk/udptl.conf %D/etc/asterisk/udptl.conf-dist; then rm -f %D/etc/asterisk/udptl.conf; fi
 etc/asterisk/udptl.conf-dist
 @unexec if cmp -s %D/etc/asterisk/users.conf %D/etc/asterisk/users.conf-dist; then rm -f %D/etc/asterisk/users.conf; fi
 etc/asterisk/users.conf-dist
-@unexec if cmp -s %D/etc/asterisk/smdi.conf %D/etc/asterisk/smdi.conf-dist; then rm -f %D/etc/asterisk/smdi.conf; fi
-etc/asterisk/smdi.conf-dist
-@unexec if cmp -s %D/etc/asterisk/sla.conf %D/etc/asterisk/sla.conf-dist; then rm -f %D/etc/asterisk/sla.conf; fi
-etc/asterisk/sla.conf-dist
-@unexec if cmp -s %D/etc/asterisk/say.conf %D/etc/asterisk/say.conf-dist; then rm -f %D/etc/asterisk/say.conf; fi
-etc/asterisk/say.conf-dist
-@unexec if cmp -s %D/etc/asterisk/res_snmp.conf %D/etc/asterisk/res_snmp.conf-dist; then rm -f %D/etc/asterisk/res_snmp.conf; fi
-etc/asterisk/res_snmp.conf-dist
-@unexec if cmp -s %D/etc/asterisk/muted.conf %D/etc/asterisk/muted.conf-dist; then rm -f %D/etc/asterisk/muted.conf; fi
-etc/asterisk/muted.conf-dist
-@unexec if cmp -s %D/etc/asterisk/jabber.conf %D/etc/asterisk/jabber.conf-dist; then rm -f %D/etc/asterisk/jabber.conf; fi
-etc/asterisk/jabber.conf-dist
-@unexec if cmp -s %D/etc/asterisk/http.conf %D/etc/asterisk/http.conf-dist; then rm -f %D/etc/asterisk/http.conf; fi
-etc/asterisk/http.conf-dist
-@unexec if cmp -s %D/etc/asterisk/h323.conf %D/etc/asterisk/h323.conf-dist; then rm -f %D/etc/asterisk/h323.conf; fi
-etc/asterisk/h323.conf-dist
-@unexec if cmp -s %D/etc/asterisk/gtalk.conf %D/etc/asterisk/gtalk.conf-dist; then rm -f %D/etc/asterisk/gtalk.conf; fi
-etc/asterisk/gtalk.conf-dist
-@unexec if cmp -s %D/etc/asterisk/func_odbc.conf %D/etc/asterisk/func_odbc.conf-dist; then rm -f %D/etc/asterisk/func_odbc.conf; fi
-etc/asterisk/func_odbc.conf-dist
-@unexec if cmp -s %D/etc/asterisk/followme.conf %D/etc/asterisk/followme.conf-dist; then rm -f %D/etc/asterisk/followme.conf; fi
-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/voicemail.conf %D/etc/asterisk/voicemail.conf-dist; then rm -f %D/etc/asterisk/voicemail.conf; fi
+etc/asterisk/voicemail.conf-dist
+@unexec if cmp -s %D/etc/asterisk/vpb.conf %D/etc/asterisk/vpb.conf-dist; then rm -f %D/etc/asterisk/vpb.conf; fi
+etc/asterisk/vpb.conf-dist
 @exec if test ! -e %D/etc/asterisk/adsi.conf; then cp -p %D/etc/asterisk/adsi.conf-dist %D/etc/asterisk/adsi.conf; fi
 @exec if test ! -e %D/etc/asterisk/adtranvofr.conf; then cp -p %D/etc/asterisk/adtranvofr.conf-dist %D/etc/asterisk/adtranvofr.conf; fi
 @exec if test ! -e %D/etc/asterisk/agents.conf; then cp -p %D/etc/asterisk/agents.conf-dist %D/etc/asterisk/agents.conf; fi
 @exec if test ! -e %D/etc/asterisk/alarmreceiver.conf; then cp -p %D/etc/asterisk/alarmreceiver.conf-dist %D/etc/asterisk/alarmreceiver.conf; fi
 @exec if test ! -e %D/etc/asterisk/alsa.conf; then cp -p %D/etc/asterisk/alsa.conf-dist %D/etc/asterisk/alsa.conf; fi
+@exec if test ! -e %D/etc/asterisk/amd.conf; then cp -p %D/etc/asterisk/amd.conf-dist %D/etc/asterisk/amd.conf; fi
 @exec if test ! -e %D/etc/asterisk/asterisk.adsi; then cp -p %D/etc/asterisk/asterisk.adsi-dist %D/etc/asterisk/asterisk.adsi; fi
 @exec if test ! -e %D/etc/asterisk/asterisk.conf; then cp -p %D/etc/asterisk/asterisk.conf-dist %D/etc/asterisk/asterisk.conf; fi
 @exec if test ! -e %D/etc/asterisk/cdr.conf; then cp -p %D/etc/asterisk/cdr.conf-dist %D/etc/asterisk/cdr.conf; fi
@@ -135,6 +136,7 @@ etc/asterisk/amd.conf-dist
 @exec if test ! -e %D/etc/asterisk/cdr_odbc.conf; then cp -p %D/etc/asterisk/cdr_odbc.conf-dist %D/etc/asterisk/cdr_odbc.conf; fi
 @exec if test ! -e %D/etc/asterisk/cdr_pgsql.conf; then cp -p %D/etc/asterisk/cdr_pgsql.conf-dist %D/etc/asterisk/cdr_pgsql.conf; fi
 @exec if test ! -e %D/etc/asterisk/cdr_tds.conf; then cp -p %D/etc/asterisk/cdr_tds.conf-dist %D/etc/asterisk/cdr_tds.conf; fi
+@exec if test ! -e %D/etc/asterisk/chan_dahdi.conf; then cp -p %D/etc/asterisk/chan_dahdi.conf-dist %D/etc/asterisk/chan_dahdi.conf; fi
 @exec if test ! -e %D/etc/asterisk/codecs.conf; then cp -p %D/etc/asterisk/codecs.conf-dist %D/etc/asterisk/codecs.conf; fi
 @exec if test ! -e %D/etc/asterisk/dnsmgr.conf; then cp -p %D/etc/asterisk/dnsmgr.conf-dist %D/etc/asterisk/dnsmgr.conf; fi
 @exec if test ! -e %D/etc/asterisk/dundi.conf; then cp -p %D/etc/asterisk/dundi.conf-dist %D/etc/asterisk/dundi.conf; fi
@@ -144,9 +146,15 @@ etc/asterisk/amd.conf-dist
 @exec if test ! -e %D/etc/asterisk/extensions.conf; then cp -p %D/etc/asterisk/extensions.conf-dist %D/etc/asterisk/extensions.conf; fi
 @exec if test ! -e %D/etc/asterisk/features.conf; then cp -p %D/etc/asterisk/features.conf-dist %D/etc/asterisk/features.conf; fi
 @exec if test ! -e %D/etc/asterisk/festival.conf; then cp -p %D/etc/asterisk/festival.conf-dist %D/etc/asterisk/festival.conf; fi
+@exec if test ! -e %D/etc/asterisk/followme.conf; then cp -p %D/etc/asterisk/followme.conf-dist %D/etc/asterisk/followme.conf; fi
+@exec if test ! -e %D/etc/asterisk/func_odbc.conf; then cp -p %D/etc/asterisk/func_odbc.conf-dist %D/etc/asterisk/func_odbc.conf; fi
+@exec if test ! -e %D/etc/asterisk/gtalk.conf; then cp -p %D/etc/asterisk/gtalk.conf-dist %D/etc/asterisk/gtalk.conf; fi
+@exec if test ! -e %D/etc/asterisk/h323.conf; then cp -p %D/etc/asterisk/h323.conf-dist %D/etc/asterisk/h323.conf; fi
+@exec if test ! -e %D/etc/asterisk/http.conf; then cp -p %D/etc/asterisk/http.conf-dist %D/etc/asterisk/http.conf; fi
 @exec if test ! -e %D/etc/asterisk/iax.conf; then cp -p %D/etc/asterisk/iax.conf-dist %D/etc/asterisk/iax.conf; fi
 @exec if test ! -e %D/etc/asterisk/iaxprov.conf; then cp -p %D/etc/asterisk/iaxprov.conf-dist %D/etc/asterisk/iaxprov.conf; fi
 @exec if test ! -e %D/etc/asterisk/indications.conf; then cp -p %D/etc/asterisk/indications.conf-dist %D/etc/asterisk/indications.conf; fi
+@exec if test ! -e %D/etc/asterisk/jabber.conf; then cp -p %D/etc/asterisk/jabber.conf-dist %D/etc/asterisk/jabber.conf; fi
 @exec if test ! -e %D/etc/asterisk/logger.conf; then cp -p %D/etc/asterisk/logger.conf-dist %D/etc/asterisk/logger.conf; fi
 @exec if test ! -e %D/etc/asterisk/manager.conf; then cp -p %D/etc/asterisk/manager.conf-dist %D/etc/asterisk/manager.conf; fi
 @exec if test ! -e %D/etc/asterisk/meetme.conf; then cp -p %D/etc/asterisk/meetme.conf-dist %D/etc/asterisk/meetme.conf; fi
@@ -154,36 +162,28 @@ etc/asterisk/amd.conf-dist
 @exec if test ! -e %D/etc/asterisk/misdn.conf; then cp -p %D/etc/asterisk/misdn.conf-dist %D/etc/asterisk/misdn.conf; fi
 @exec if test ! -e %D/etc/asterisk/modules.conf; then cp -p %D/etc/asterisk/modules.conf-dist %D/etc/asterisk/modules.conf; fi
 @exec if test ! -e %D/etc/asterisk/musiconhold.conf; then cp -p %D/etc/asterisk/musiconhold.conf-dist %D/etc/asterisk/musiconhold.conf; fi
+@exec if test ! -e %D/etc/asterisk/muted.conf; then cp -p %D/etc/asterisk/muted.conf-dist %D/etc/asterisk/muted.conf; fi
 @exec if test ! -e %D/etc/asterisk/osp.conf; then cp -p %D/etc/asterisk/osp.conf-dist %D/etc/asterisk/osp.conf; fi
 @exec if test ! -e %D/etc/asterisk/oss.conf; then cp -p %D/etc/asterisk/oss.conf-dist %D/etc/asterisk/oss.conf; fi
 @exec if test ! -e %D/etc/asterisk/phone.conf; then cp -p %D/etc/asterisk/phone.conf-dist %D/etc/asterisk/phone.conf; fi
 @exec if test ! -e %D/etc/asterisk/privacy.conf; then cp -p %D/etc/asterisk/privacy.conf-dist %D/etc/asterisk/privacy.conf; fi
 @exec if test ! -e %D/etc/asterisk/queues.conf; then cp -p %D/etc/asterisk/queues.conf-dist %D/etc/asterisk/queues.conf; fi
-@exec if test ! -e %D/etc/asterisk/res_pgsql.conf; then cp -p %D/etc/asterisk/res_pgsql.conf-dist %D/etc/asterisk/res_pgsql.conf; fi
 @exec if test ! -e %D/etc/asterisk/res_odbc.conf; then cp -p %D/etc/asterisk/res_odbc.conf-dist %D/etc/asterisk/res_odbc.conf; fi
+@exec if test ! -e %D/etc/asterisk/res_pgsql.conf; then cp -p %D/etc/asterisk/res_pgsql.conf-dist %D/etc/asterisk/res_pgsql.conf; fi
+@exec if test ! -e %D/etc/asterisk/res_snmp.conf; then cp -p %D/etc/asterisk/res_snmp.conf-dist %D/etc/asterisk/res_snmp.conf; fi
 @exec if test ! -e %D/etc/asterisk/rpt.conf; then cp -p %D/etc/asterisk/rpt.conf-dist %D/etc/asterisk/rpt.conf; fi
 @exec if test ! -e %D/etc/asterisk/rtp.conf; then cp -p %D/etc/asterisk/rtp.conf-dist %D/etc/asterisk/rtp.conf; fi
+@exec if test ! -e %D/etc/asterisk/say.conf; then cp -p %D/etc/asterisk/say.conf-dist %D/etc/asterisk/say.conf; fi
 @exec if test ! -e %D/etc/asterisk/sip.conf; then cp -p %D/etc/asterisk/sip.conf-dist %D/etc/asterisk/sip.conf; fi
 @exec if test ! -e %D/etc/asterisk/sip_notify.conf; then cp -p %D/etc/asterisk/sip_notify.conf-dist %D/etc/asterisk/sip_notify.conf; fi
 @exec if test ! -e %D/etc/asterisk/skinny.conf; then cp -p %D/etc/asterisk/skinny.conf-dist %D/etc/asterisk/skinny.conf; fi
+@exec if test ! -e %D/etc/asterisk/sla.conf; then cp -p %D/etc/asterisk/sla.conf-dist %D/etc/asterisk/sla.conf; fi
+@exec if test ! -e %D/etc/asterisk/smdi.conf; then cp -p %D/etc/asterisk/smdi.conf-dist %D/etc/asterisk/smdi.conf; fi
 @exec if test ! -e %D/etc/asterisk/telcordia-1.adsi; then cp -p %D/etc/asterisk/telcordia-1.adsi-dist %D/etc/asterisk/telcordia-1.adsi; fi
-@exec if test ! -e %D/etc/asterisk/voicemail.conf; then cp -p %D/etc/asterisk/voicemail.conf-dist %D/etc/asterisk/voicemail.conf; fi
-@exec if test ! -e %D/etc/asterisk/vpb.conf; then cp -p %D/etc/asterisk/vpb.conf-dist %D/etc/asterisk/vpb.conf; fi
-@exec if test ! -e %D/etc/asterisk/chan_dahdi.conf; then cp -p %D/etc/asterisk/chan_dahdi.conf-dist %D/etc/asterisk/chan_dahdi.conf; fi
 @exec if test ! -e %D/etc/asterisk/udptl.conf; then cp -p %D/etc/asterisk/udptl.conf-dist %D/etc/asterisk/udptl.conf; fi
 @exec if test ! -e %D/etc/asterisk/users.conf; then cp -p %D/etc/asterisk/users.conf-dist %D/etc/asterisk/users.conf; fi
-@exec if test ! -e %D/etc/asterisk/smdi.conf; then cp -p %D/etc/asterisk/smdi.conf-dist %D/etc/asterisk/smdi.conf; fi
-@exec if test ! -e %D/etc/asterisk/sla.conf; then cp -p %D/etc/asterisk/sla.conf-dist %D/etc/asterisk/sla.conf; fi
-@exec if test ! -e %D/etc/asterisk/say.conf; then cp -p %D/etc/asterisk/say.conf-dist %D/etc/asterisk/say.conf; fi
-@exec if test ! -e %D/etc/asterisk/res_snmp.conf; then cp -p %D/etc/asterisk/res_snmp.conf-dist %D/etc/asterisk/res_snmp.conf; fi
-@exec if test ! -e %D/etc/asterisk/muted.conf; then cp -p %D/etc/asterisk/muted.conf-dist %D/etc/asterisk/muted.conf; fi
-@exec if test ! -e %D/etc/asterisk/jabber.conf; then cp -p %D/etc/asterisk/jabber.conf-dist %D/etc/asterisk/jabber.conf; fi
-@exec if test ! -e %D/etc/asterisk/http.conf; then cp -p %D/etc/asterisk/http.conf-dist %D/etc/asterisk/http.conf; fi
-@exec if test ! -e %D/etc/asterisk/h323.conf; then cp -p %D/etc/asterisk/h323.conf-dist %D/etc/asterisk/h323.conf; fi
-@exec if test ! -e %D/etc/asterisk/gtalk.conf; then cp -p %D/etc/asterisk/gtalk.conf-dist %D/etc/asterisk/gtalk.conf; fi
-@exec if test ! -e %D/etc/asterisk/func_odbc.conf; then cp -p %D/etc/asterisk/func_odbc.conf-dist %D/etc/asterisk/func_odbc.conf; fi
-@exec if test ! -e %D/etc/asterisk/followme.conf; then cp -p %D/etc/asterisk/followme.conf-dist %D/etc/asterisk/followme.conf; fi
-@exec if test ! -e %D/etc/asterisk/amd.conf; then cp -p %D/etc/asterisk/amd.conf-dist %D/etc/asterisk/amd.conf; fi
+@exec if test ! -e %D/etc/asterisk/voicemail.conf; then cp -p %D/etc/asterisk/voicemail.conf-dist %D/etc/asterisk/voicemail.conf; fi
+@exec if test ! -e %D/etc/asterisk/vpb.conf; then cp -p %D/etc/asterisk/vpb.conf-dist %D/etc/asterisk/vpb.conf; fi
 include/asterisk.h
 include/asterisk/abstract_jb.h
 include/asterisk/acl.h
@@ -255,6 +255,7 @@ include/asterisk/res_odbc.h
 include/asterisk/rtp.h
 include/asterisk/say.h
 include/asterisk/sched.h
+include/asterisk/select.h
 include/asterisk/sha1.h
 include/asterisk/slinfactory.h
 include/asterisk/smdi.h
@@ -264,6 +265,7 @@ include/asterisk/stringfields.h
 include/asterisk/strings.h
 include/asterisk/tdd.h
 include/asterisk/term.h
+include/asterisk/test.h
 include/asterisk/threadstorage.h
 include/asterisk/time.h
 include/asterisk/tonezone_compat.h
@@ -283,6 +285,9 @@ lib/asterisk/modules/app_chanisavail.so
 lib/asterisk/modules/app_channelredirect.so
 lib/asterisk/modules/app_chanspy.so
 lib/asterisk/modules/app_controlplayback.so
+%%WITH_DAHDI%%lib/asterisk/modules/app_dahdibarge.so
+%%WITH_DAHDI%%lib/asterisk/modules/app_dahdiras.so
+%%WITH_DAHDI%%lib/asterisk/modules/app_dahdiscan.so
 lib/asterisk/modules/app_db.so
 lib/asterisk/modules/app_dial.so
 lib/asterisk/modules/app_dictate.so
@@ -294,6 +299,7 @@ lib/asterisk/modules/app_echo.so
 lib/asterisk/modules/app_exec.so
 lib/asterisk/modules/app_externalivr.so
 lib/asterisk/modules/app_festival.so
+%%WITH_DAHDI%%lib/asterisk/modules/app_flash.so
 lib/asterisk/modules/app_followme.so
 lib/asterisk/modules/app_forkcdr.so
 lib/asterisk/modules/app_getcpeid.so
@@ -303,11 +309,13 @@ lib/asterisk/modules/app_image.so
 lib/asterisk/modules/app_lookupblacklist.so
 lib/asterisk/modules/app_lookupcidname.so
 lib/asterisk/modules/app_macro.so
+%%WITH_DAHDI%%lib/asterisk/modules/app_meetme.so
 lib/asterisk/modules/app_milliwatt.so
 lib/asterisk/modules/app_mixmonitor.so
 lib/asterisk/modules/app_morsecode.so
 lib/asterisk/modules/app_mp3.so
 lib/asterisk/modules/app_nbscat.so
+%%WITH_DAHDI%%lib/asterisk/modules/app_page.so
 lib/asterisk/modules/app_parkandannounce.so
 lib/asterisk/modules/app_playback.so
 lib/asterisk/modules/app_privacy.so
@@ -342,11 +350,15 @@ lib/asterisk/modules/app_zapateller.so
 lib/asterisk/modules/cdr_csv.so
 lib/asterisk/modules/cdr_custom.so
 lib/asterisk/modules/cdr_manager.so
+%%WITH_ODBC%%lib/asterisk/modules/cdr_odbc.so
 %%WITH_POSTGRES%%lib/asterisk/modules/cdr_pgsql.so
 %%WITH_RADIUS%%lib/asterisk/modules/cdr_radius.so
 %%WITH_SQLITE%%lib/asterisk/modules/cdr_sqlite.so
+%%WITH_FREETDS%%lib/asterisk/modules/cdr_tds.so
 lib/asterisk/modules/chan_agent.so
+%%WITH_DAHDI%%lib/asterisk/modules/chan_dahdi.so
 %%WITH_JABBER%%lib/asterisk/modules/chan_gtalk.so
+%%WITH_H323%%lib/asterisk/modules/chan_h323.so
 lib/asterisk/modules/chan_iax2.so
 lib/asterisk/modules/chan_local.so
 lib/asterisk/modules/chan_mgcp.so
@@ -356,6 +368,7 @@ lib/asterisk/modules/chan_skinny.so
 lib/asterisk/modules/codec_a_mu.so
 lib/asterisk/modules/codec_adpcm.so
 lib/asterisk/modules/codec_alaw.so
+%%WITH_DAHDI%%lib/asterisk/modules/codec_dahdi.so
 lib/asterisk/modules/codec_g726.so
 lib/asterisk/modules/codec_gsm.so
 %%WITH_ILBC%%lib/asterisk/modules/codec_ilbc.so
@@ -409,6 +422,7 @@ lib/asterisk/modules/pbx_spool.so
 lib/asterisk/modules/res_adsi.so
 lib/asterisk/modules/res_agi.so
 lib/asterisk/modules/res_clioriginate.so
+%%WITH_ODBC%%lib/asterisk/modules/res_config_odbc.so
 %%WITH_POSTGRES%%lib/asterisk/modules/res_config_pgsql.so
 lib/asterisk/modules/res_convert.so
 lib/asterisk/modules/res_crypto.so
@@ -417,6 +431,7 @@ 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
+%%WITH_ODBC%%lib/asterisk/modules/res_odbc.so
 lib/asterisk/modules/res_smdi.so
 %%WITH_SNMP%%lib/asterisk/modules/res_snmp.so
 lib/asterisk/modules/res_speech.so
@@ -438,7 +453,7 @@ share/asterisk/agi-bin/jukebox.agi
 share/asterisk/images/asterisk-intro.jpg
 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
@@ -447,10 +462,10 @@ share/asterisk/moh/macroform-robot_dity.wav
 share/asterisk/moh/macroform-the_simplicity.wav
 share/asterisk/moh/manolo_camp-morning_coffee.wav
 share/asterisk/moh/reno_project-system.wav
-share/asterisk/sounds/.asterisk-core-sounds-en-gsm-1.4.17
-share/asterisk/sounds/CHANGES-asterisk-core-en-1.4.17
-share/asterisk/sounds/CREDITS-asterisk-core-en-1.4.17
-share/asterisk/sounds/LICENSE-asterisk-core-en-1.4.17
+share/asterisk/sounds/.asterisk-core-sounds-en-gsm-1.4.19
+share/asterisk/sounds/CHANGES-asterisk-core-en-1.4.19
+share/asterisk/sounds/CREDITS-asterisk-core-en-1.4.19
+share/asterisk/sounds/LICENSE-asterisk-core-en-1.4.19
 share/asterisk/sounds/agent-alreadyon.gsm
 share/asterisk/sounds/agent-incorrect.gsm
 share/asterisk/sounds/agent-loggedoff.gsm
@@ -458,25 +473,13 @@ share/asterisk/sounds/agent-loginok.gsm
 share/asterisk/sounds/agent-newlocation.gsm
 share/asterisk/sounds/agent-pass.gsm
 share/asterisk/sounds/agent-user.gsm
+share/asterisk/sounds/ascending-2tone.gsm
 share/asterisk/sounds/auth-incorrect.gsm
 share/asterisk/sounds/auth-thankyou.gsm
 share/asterisk/sounds/beep.gsm
 share/asterisk/sounds/beeperr.gsm
-share/asterisk/sounds/conf-nonextended.gsm
-share/asterisk/sounds/conf-usermenu-162.gsm
-share/asterisk/sounds/dir-usingkeypad.gsm
-share/asterisk/sounds/dir-welcome.gsm
-share/asterisk/sounds/spy-dahdi.gsm
-share/asterisk/sounds/vm-Urgent.gsm
-share/asterisk/sounds/vm-forward-multiple.gsm
-share/asterisk/sounds/vm-invalid-password.gsm
-share/asterisk/sounds/vm-marked-nonurgent.gsm
-share/asterisk/sounds/vm-marked-urgent.gsm
-share/asterisk/sounds/vm-record-prepend.gsm
-share/asterisk/sounds/vm-review-nonurgent.gsm
-share/asterisk/sounds/vm-review-urgent.gsm
-share/asterisk/sounds/conf-adminmenu.gsm
 share/asterisk/sounds/conf-adminmenu-162.gsm
+share/asterisk/sounds/conf-adminmenu.gsm
 share/asterisk/sounds/conf-enteringno.gsm
 share/asterisk/sounds/conf-errormenu.gsm
 share/asterisk/sounds/conf-extended.gsm
@@ -493,13 +496,19 @@ share/asterisk/sounds/conf-locked.gsm
 share/asterisk/sounds/conf-lockednow.gsm
 share/asterisk/sounds/conf-muted.gsm
 share/asterisk/sounds/conf-noempty.gsm
+share/asterisk/sounds/conf-nonextended.gsm
+share/asterisk/sounds/conf-now-muted.gsm
+share/asterisk/sounds/conf-now-recording.gsm
+share/asterisk/sounds/conf-now-unmuted.gsm
 share/asterisk/sounds/conf-onlyone.gsm
 share/asterisk/sounds/conf-onlyperson.gsm
 share/asterisk/sounds/conf-otherinparty.gsm
 share/asterisk/sounds/conf-placeintoconf.gsm
+share/asterisk/sounds/conf-roll-callcomplete.gsm
 share/asterisk/sounds/conf-thereare.gsm
 share/asterisk/sounds/conf-unlockednow.gsm
 share/asterisk/sounds/conf-unmuted.gsm
+share/asterisk/sounds/conf-usermenu-162.gsm
 share/asterisk/sounds/conf-usermenu.gsm
 share/asterisk/sounds/conf-userswilljoin.gsm
 share/asterisk/sounds/conf-userwilljoin.gsm
@@ -515,6 +524,7 @@ share/asterisk/sounds/demo-moreinfo.gsm
 share/asterisk/sounds/demo-nogo.gsm
 share/asterisk/sounds/demo-nomatch.gsm
 share/asterisk/sounds/demo-thanks.gsm
+share/asterisk/sounds/descending-2tone.gsm
 share/asterisk/sounds/dictate/both_help.gsm
 share/asterisk/sounds/dictate/enter_filename.gsm
 share/asterisk/sounds/dictate/forhelp.gsm
@@ -557,6 +567,7 @@ share/asterisk/sounds/digits/9.gsm
 share/asterisk/sounds/digits/90.gsm
 share/asterisk/sounds/digits/a-m.gsm
 share/asterisk/sounds/digits/at.gsm
+share/asterisk/sounds/digits/billion.gsm
 share/asterisk/sounds/digits/day-0.gsm
 share/asterisk/sounds/digits/day-1.gsm
 share/asterisk/sounds/digits/day-2.gsm
@@ -581,11 +592,21 @@ share/asterisk/sounds/digits/h-20.gsm
 share/asterisk/sounds/digits/h-3.gsm
 share/asterisk/sounds/digits/h-30.gsm
 share/asterisk/sounds/digits/h-4.gsm
+share/asterisk/sounds/digits/h-40.gsm
 share/asterisk/sounds/digits/h-5.gsm
+share/asterisk/sounds/digits/h-50.gsm
 share/asterisk/sounds/digits/h-6.gsm
+share/asterisk/sounds/digits/h-60.gsm
 share/asterisk/sounds/digits/h-7.gsm
+share/asterisk/sounds/digits/h-70.gsm
 share/asterisk/sounds/digits/h-8.gsm
+share/asterisk/sounds/digits/h-80.gsm
 share/asterisk/sounds/digits/h-9.gsm
+share/asterisk/sounds/digits/h-90.gsm
+share/asterisk/sounds/digits/h-billion.gsm
+share/asterisk/sounds/digits/h-hundred.gsm
+share/asterisk/sounds/digits/h-million.gsm
+share/asterisk/sounds/digits/h-thousand.gsm
 share/asterisk/sounds/digits/hundred.gsm
 share/asterisk/sounds/digits/million.gsm
 share/asterisk/sounds/digits/minus.gsm
@@ -623,6 +644,8 @@ share/asterisk/sounds/dir-multi9.gsm
 share/asterisk/sounds/dir-nomatch.gsm
 share/asterisk/sounds/dir-nomore.gsm
 share/asterisk/sounds/dir-pls-enter.gsm
+share/asterisk/sounds/dir-usingkeypad.gsm
+share/asterisk/sounds/dir-welcome.gsm
 share/asterisk/sounds/followme/call-from.gsm
 share/asterisk/sounds/followme/no-recording.gsm
 share/asterisk/sounds/followme/options.gsm
@@ -696,6 +719,7 @@ share/asterisk/sounds/letters/zed.gsm
 share/asterisk/sounds/minutes.gsm
 share/asterisk/sounds/pbx-invalid.gsm
 share/asterisk/sounds/pbx-invalidpark.gsm
+share/asterisk/sounds/pbx-parkingfailed.gsm
 share/asterisk/sounds/pbx-transfer.gsm
 share/asterisk/sounds/phonetic/9_p.gsm
 share/asterisk/sounds/phonetic/a_p.gsm
@@ -735,6 +759,7 @@ share/asterisk/sounds/privacy-unident.gsm
 share/asterisk/sounds/queue-callswaiting.gsm
 share/asterisk/sounds/queue-holdtime.gsm
 share/asterisk/sounds/queue-less-than.gsm
+share/asterisk/sounds/queue-minute.gsm
 share/asterisk/sounds/queue-minutes.gsm
 share/asterisk/sounds/queue-periodic-announce.gsm
 share/asterisk/sounds/queue-quantity1.gsm
@@ -758,6 +783,7 @@ share/asterisk/sounds/silence/8.gsm
 share/asterisk/sounds/silence/9.gsm
 share/asterisk/sounds/spy-agent.gsm
 share/asterisk/sounds/spy-console.gsm
+share/asterisk/sounds/spy-dahdi.gsm
 share/asterisk/sounds/spy-h323.gsm
 share/asterisk/sounds/spy-iax.gsm
 share/asterisk/sounds/spy-iax2.gsm
@@ -788,6 +814,7 @@ share/asterisk/sounds/vm-Family.gsm
 share/asterisk/sounds/vm-Friends.gsm
 share/asterisk/sounds/vm-INBOX.gsm
 share/asterisk/sounds/vm-Old.gsm
+share/asterisk/sounds/vm-Urgent.gsm
 share/asterisk/sounds/vm-Work.gsm
 share/asterisk/sounds/vm-advopts.gsm
 share/asterisk/sounds/vm-and.gsm
@@ -801,6 +828,7 @@ share/asterisk/sounds/vm-enter-num-to-call.gsm
 share/asterisk/sounds/vm-extension.gsm
 share/asterisk/sounds/vm-first.gsm
 share/asterisk/sounds/vm-for.gsm
+share/asterisk/sounds/vm-forward-multiple.gsm
 share/asterisk/sounds/vm-forward.gsm
 share/asterisk/sounds/vm-forwardoptions.gsm
 share/asterisk/sounds/vm-from-extension.gsm
@@ -812,6 +840,7 @@ share/asterisk/sounds/vm-incorrect-mailbox.gsm
 share/asterisk/sounds/vm-incorrect.gsm
 share/asterisk/sounds/vm-instructions.gsm
 share/asterisk/sounds/vm-intro.gsm
+share/asterisk/sounds/vm-invalid-password.gsm
 share/asterisk/sounds/vm-invalidpassword.gsm
 share/asterisk/sounds/vm-isonphone.gsm
 share/asterisk/sounds/vm-isunavail.gsm
@@ -819,6 +848,8 @@ share/asterisk/sounds/vm-last.gsm
 share/asterisk/sounds/vm-leavemsg.gsm
 share/asterisk/sounds/vm-login.gsm
 share/asterisk/sounds/vm-mailboxfull.gsm
+share/asterisk/sounds/vm-marked-nonurgent.gsm
+share/asterisk/sounds/vm-marked-urgent.gsm
 share/asterisk/sounds/vm-message.gsm
 share/asterisk/sounds/vm-messages.gsm
 share/asterisk/sounds/vm-minutes.gsm
@@ -834,11 +865,11 @@ share/asterisk/sounds/vm-nobox.gsm
 share/asterisk/sounds/vm-nomore.gsm
 share/asterisk/sounds/vm-nonumber.gsm
 share/asterisk/sounds/vm-num-i-have.gsm
-share/asterisk/sounds/vm-onefor.gsm
 share/asterisk/sounds/vm-onefor-full.gsm
+share/asterisk/sounds/vm-onefor.gsm
 share/asterisk/sounds/vm-options.gsm
-share/asterisk/sounds/vm-opts.gsm
 share/asterisk/sounds/vm-opts-full.gsm
+share/asterisk/sounds/vm-opts.gsm
 share/asterisk/sounds/vm-passchanged.gsm
 share/asterisk/sounds/vm-password.gsm
 share/asterisk/sounds/vm-pls-try-again.gsm
@@ -850,8 +881,11 @@ share/asterisk/sounds/vm-rec-name.gsm
 share/asterisk/sounds/vm-rec-temp.gsm
 share/asterisk/sounds/vm-rec-unv.gsm
 share/asterisk/sounds/vm-received.gsm
+share/asterisk/sounds/vm-record-prepend.gsm
 share/asterisk/sounds/vm-reenterpassword.gsm
 share/asterisk/sounds/vm-repeat.gsm
+share/asterisk/sounds/vm-review-nonurgent.gsm
+share/asterisk/sounds/vm-review-urgent.gsm
 share/asterisk/sounds/vm-review.gsm
 share/asterisk/sounds/vm-saved.gsm
 share/asterisk/sounds/vm-savedto.gsm
@@ -888,19 +922,6 @@ share/asterisk/static-http/ajamdemo.html
 share/asterisk/static-http/astman.css
 share/asterisk/static-http/astman.js
 share/asterisk/static-http/prototype.js
-%%WITH_ZAPTEL%%lib/asterisk/modules/app_flash.so
-%%WITH_ZAPTEL%%lib/asterisk/modules/app_meetme.so
-%%WITH_ZAPTEL%%lib/asterisk/modules/app_page.so
-%%WITH_ZAPTEL%%lib/asterisk/modules/app_dahdibarge.so
-%%WITH_ZAPTEL%%lib/asterisk/modules/app_dahdiras.so
-%%WITH_ZAPTEL%%lib/asterisk/modules/app_dahdiscan.so
-%%WITH_ZAPTEL%%lib/asterisk/modules/codec_dahdi.so
-%%WITH_ODBC%%lib/asterisk/modules/cdr_odbc.so
-%%WITH_FREETDS%%lib/asterisk/modules/cdr_tds.so
-%%WITH_H323%%lib/asterisk/modules/chan_h323.so
-%%WITH_ZAPTEL%%lib/asterisk/modules/chan_dahdi.so
-%%WITH_ODBC%%lib/asterisk/modules/res_config_odbc.so
-%%WITH_ODBC%%lib/asterisk/modules/res_odbc.so
 @dirrm share/asterisk/static-http
 @dirrm share/asterisk/sounds/silence
 @dirrm share/asterisk/sounds/phonetic
@@ -929,22 +950,22 @@ spool/asterisk/voicemail/default/1234/busy.gsm
 spool/asterisk/voicemail/default/1234/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/system
 @exec mkdir -p %D/spool/asterisk/tmp
-@dirrm spool/asterisk/dictate
-@dirrm spool/asterisk/meetme
-@dirrm spool/asterisk/monitor
-@dirrm spool/asterisk/system
+@exec mkdir -p %D/spool/asterisk/voicemail/default/1234/INBOX
 @dirrm spool/asterisk/voicemail/default/1234/INBOX
 @dirrm spool/asterisk/voicemail/default/1234
 @dirrm spool/asterisk/voicemail/default
 @dirrm spool/asterisk/voicemail
 @dirrm spool/asterisk/tmp
+@dirrm spool/asterisk/system
+@dirrm spool/asterisk/monitor
+@dirrm spool/asterisk/meetme
+@dirrm spool/asterisk/dictate
 @dirrm spool/asterisk
-@dirrm log/asterisk/cdr-csv
 @dirrm log/asterisk/cdr-custom
+@dirrm log/asterisk/cdr-csv
 @dirrm log/asterisk