svn commit: r395609 - in head/net/asterisk: . files

Kubilay Kocak koobs at FreeBSD.org
Sun Aug 30 10:36:18 UTC 2015 

Author: koobs
Date: Sun Aug 30 10:36:13 2015
New Revision: 395609
URL: https://svnweb.freebsd.org/changeset/ports/395609

Log:
  net/asterisk: Overhaul & Add *BONUS* user feature
  
  This port now supports custom Asterisk configurations using a
  *user-supplied* menuselect.makeopt file.
  
  This feature is of most value for users that want to disable or
  override default functionality that they dont want or need, particular
  in space and/or resource constrained, or embedded environments.
  
  For more information see this ports pkg-message file.
  
  OPTIONS Changes:
  
  - Make speex, libexecinfo and mpg123 OPTION'al
  - Make menuselect backends (curses/newt) OPTION'al
  - Re-order, sort and group all OPTIONS
  - Rename MP3 option to MP3PLAYER (ambiguous with format_mp3 module)
  - Remove override-able OPTION descriptions (dont appear necessary)
  - Add CODECS, SOUNDS and DATABASE options groups for better UX
  - Improve OPTION descriptions
  - Temporarily disable ICONV option until libxml2 is fixed [1][2]
  
  General Changes:
  
  - Add support for fetching G.279 Core and MOH sounds
  - Re-do patches using makepatch (portlint)
  - Use %%DATADIR%% in pkg-plist (portlint)
  - Make DATADIR-safe (portlint)
  - Re-order Makefile sections (portlint)
  - Reset @owner/@group after pkg-plist entries
  - Simplify post-install: find files/dirs pkg-plist commands
  - De-scope global use of LDFLAGS and CPPFLAGS
  - Use OPTIONS helpers for  openh323 CPPFLAGS and MAKE_ENV
  - Use USE_OPENSSL and its respective variables in CONFIGURE_ARGS
  - Modify build to be verbose (NOISY_BUILD)
  - Pass CFLAGS/LDFLAGS to ASTCFLAGS/ASTLDFLAGS respectively in MAKE_ENV
  - Update and cleanup pkg-plist
  - Bump PORTREVISION
  
  Note: These changes will be merged into net/asterisk11 and net/asterisk13
        ports in the near future.
  
  [1] https://reviews.freebsd.org/D3261
  [2] https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=202006
  
  Reviewed by:		madpilot (maintainer)
  Approved by:		madpilot (maintainer)
  Differential Revision:	https://reviews.freebsd.org/D3262

Added:
  head/net/asterisk/pkg-message   (contents, props changed)
Modified:
  head/net/asterisk/Makefile
  head/net/asterisk/distinfo
  head/net/asterisk/files/patch-Makefile
  head/net/asterisk/files/patch-agi__Makefile
  head/net/asterisk/files/patch-channels-chan_dahdi.c
  head/net/asterisk/files/patch-channels__Makefile
  head/net/asterisk/files/patch-channels__sip__include__sip.h
  head/net/asterisk/files/patch-channels_h323_Makefile.in
  head/net/asterisk/files/patch-configure
  head/net/asterisk/files/patch-main__asterisk.exports.in
  head/net/asterisk/files/patch-main__db.c
  head/net/asterisk/files/patch-main__lock.c
  head/net/asterisk/files/patch-main__utils.c
  head/net/asterisk/pkg-plist

Modified: head/net/asterisk/Makefile
==============================================================================
--- head/net/asterisk/Makefile	Sun Aug 30 10:30:10 2015	(r395608)
+++ head/net/asterisk/Makefile	Sun Aug 30 10:36:13 2015	(r395609)
@@ -3,11 +3,14 @@
 
 PORTNAME=	asterisk
 PORTVERSION=	1.8.32.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
-MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/asterisk/ \
-		http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/
+MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/%SUBDIR%/:main,g729
+MASTER_SITE_SUBDIR=	asterisk/:main \
+			asterisk/old-releases/:main \
+			sounds/releases/:g729
 PKGNAMESUFFIX=	18
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:main
 
 MAINTAINER=	madpilot at FreeBSD.org
 COMMENT=	Open Source PBX and telephony toolkit
@@ -15,108 +18,172 @@ COMMENT=	Open Source PBX and telephony t
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libspeex.so:${PORTSDIR}/audio/speex \
-		libnewt.so:${PORTSDIR}/devel/newt \
-		libexecinfo.so:${PORTSDIR}/devel/libexecinfo
-RUN_DEPENDS=	mpg123:${PORTSDIR}/audio/mpg123
+EXTRACT_ONLY:=	${DISTNAME}${EXTRACT_SUFX}
 
 ONLY_FOR_ARCHS=	i386 amd64 powerpc sparc64
 
-GNU_CONFIGURE=	yes
-LDFLAGS+=	-L${LOCALBASE}/lib
-CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/openh323
-USE_GCC=	yes
+USES=		alias bison cpe gmake shebangfix
 USE_CSTD=	gnu89
+USE_GCC=	yes
 USE_GNOME=	libxml2
-USES=		alias bison cpe gmake shebangfix
+USE_OPENSSL=	yes
+USE_RC_SUBR=	asterisk
+
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-crypto=${OPENSSLBASE} \
+		--with-ssl=${OPENSSLBASE}
+
 CPE_VENDOR=	digium
+
 SHEBANG_FILES=	agi/agi-test.agi \
 		agi/jukebox.agi
 STRIP=
 
-USE_RC_SUBR=	asterisk
 MAKE_ENV=	PTHREAD_LIBS="-lpthread" \
 		MKDIR="${MKDIR}" \
 		PWLIBDIR=${LOCALBASE}/share/pwlib \
-		OPENH323DIR=${LOCALBASE}/share/openh323 \
 		OSVERSION=${OSVERSION} \
-		NOISY_BUILD=YES \
 		DOCSDIR=${DOCSDIR} \
-		ASTCFLAGS="${CFLAGS}"
+		ASTCFLAGS="${CFLAGS}" \
+		ASTLDFLAGS="${LDFLAGS}"
+MAKE_ARGS+=	NOISY_BUILD=yes \
+		ASTDATADIR=${DATADIR}
 
 CONFLICTS_BUILD=	linuxthreads-*
 CONFLICTS_INSTALL=	asterisk*-11* asterisk*-13*
 
-OPTIONS_DEFINE=	VORBIS PGSQL MYSQL ODBC RADIUS SNMP H323 FREETDS JABBER SQLITE GSM \
-		CURL SPANDSP EXCHANGE NEWG711 SRTP LUA LDAP OOH323 SYSINFO
-OPTIONS_DEFAULT=	VORBIS ODBC PGSQL RADIUS SNMP H323 FREETDS JABBER GSM \
-		SQLITE CURL LUA
+OPTIONS_DEFINE=		BACKTRACE CURL EXCHANGE FREETDS H323 JABBER LUA LDAP \
+			MP3PLAYER OOH323 RADIUS SNMP SPANDSP SRTP SYSINFO
+OPTIONS_DEFAULT=	BACKTRACE CURL FREETDS GSM H323 JABBER LUA NEWT ODBC PGSQL RADIUS SNMP SPEEX \
+			SQLITE VORBIS
 
 OPTIONS_DEFINE_i386=	DAHDI
 OPTIONS_DEFINE_amd64=	DAHDI
 OPTIONS_DEFINE_sparc64=	DAHDI
 
-OPTIONS_DEFAULT_i386=	DAHDI
-OPTIONS_DEFAULT_amd64=	DAHDI
+OPTIONS_DEFAULT_i386=		DAHDI
+OPTIONS_DEFAULT_amd64=		DAHDI
 OPTIONS_DEFAULT_sparc64=	DAHDI
 
-EXCHANGE_DESC?=	Exchange calendar support
-NEWG711_DESC?=	New G711 Codec
-SRTP_DESC?=	SecureRTP support
-OOH323_DESC?=	ooh323 support
-DAHDI_DESC?=	DAHDI support
-SYSINFO_DESC?=	Use devel/libsysinfo to get system information
+OPTIONS_GROUP=		CODECS
+OPTIONS_GROUP_CODECS=	GSM NEWG711 SPEEX VORBIS
+CODECS_DESC=		Encoder/Decoder (Codec) Support
+
+OPTIONS_GROUP+=		DATABASE
+OPTIONS_GROUP_DATABASE=	MYSQL ODBC PGSQL SQLITE
+DATABASE_DESC=		Database Support
+
+OPTIONS_MULTI=		MENU
+OPTIONS_MULTI_MENU=	NCURSES NEWT
+MENU_DESC=		Menuselect Interface Backend
+NEWT_DESC=		Newt User Interface
+
+OPTIONS_GROUP+=		SOUNDS
+OPTIONS_GROUP_SOUNDS=	G729
+SOUNDS_DESC=		Core and Music-on-Hold (MoH) Sound Files
+ASTERISK_CORE_G729_SOUNDS=	asterisk-core-sounds-en-g729-1.4.26.tar.gz
+ASTERISK_MOH_G729_SOUNDS=	asterisk-moh-opsound-g729-2.03.tar.gz
+
+G729_DESC=			Install G.729 format sounds
+G729_DISTFILES=			${ASTERISK_CORE_G729_SOUNDS}:g729 \
+				${ASTERISK_MOH_G729_SOUNDS}:g729
 
 OPTIONS_SUB=	yes
-H323_CONFIGURE_WITH=	h323
-H323_LIB_DEPENDS=	libpt_r.so:${PORTSDIR}/devel/pwlib \
-			libh323_r.so:${PORTSDIR}/net/openh323
+
+BACKTRACE_DESC=	Stack backtrace support via (lib)execinfo
+DAHDI_DESC=	Digium Asterisk Hardware Device Interface (DAHDI) support
+EXCHANGE_DESC=	Exchange calendar support
+MP3PLAYER_DESC=	Install MP3 Player for Music-On-Hold (mpg123)
+NEWG711_DESC=	Use the NEW G.711 (ulaw/alaw) codecs (slower, but cleaner)
+
+OOH323_DESC=	ooh323 support
+SRTP_DESC=	Secure Real-time Transport Protocol (SRTP RFC3711) support
+SYSINFO_DESC=	Use devel/libsysinfo to get system information
+
+BACKTRACE_CONFIGURE_WITH=	execinfo
+BACKTRACE_LIB_DEPENDS=		libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+
+CURL_CONFIGURE_ON=	--with-libcurl
+CURL_CONFIGURE_OFF=	--with-libcurl=no
+CURL_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+
 DAHDI_CONFIGURE_ON=	--with-dahdi --with-openr2
 DAHDI_CONFIGURE_OFF=	--without-dahdi --without-openr2
 DAHDI_BUILD_DEPENDS=	libpri>=1.4.10:${PORTSDIR}/misc/libpri \
 			${LOCALBASE}/include/dahdi/user.h:${PORTSDIR}/misc/dahdi
 DAHDI_LIB_DEPENDS=	libpri.so:${PORTSDIR}/misc/libpri \
 			libopenr2.so:${PORTSDIR}/misc/openr2
+
+EXCHANGE_CONFIGURE_OFF=	--without-neon --without-neon29
+EXCHANGE_LIB_DEPENDS=	libneon.so:${PORTSDIR}/www/neon
+
+FREETDS_CONFIGURE_ON=	--with-tds=${LOCALBASE}
+FREETDS_CONFIGURE_OFF=	--without-tds
+FREETDS_LIB_DEPENDS=	libsybdb.so:${PORTSDIR}/databases/freetds
+
+GSM_CONFIGURE_WITH=	gsm
+GSM_LIB_DEPENDS=	libgsm.so:${PORTSDIR}/audio/gsm
+
+H323_CONFIGURE_WITH=	h323
+H323_CPPFLAGS=		-I${LOCALBASE}/include/openh323
+H323_LIB_DEPENDS=	libpt_r.so:${PORTSDIR}/devel/pwlib \
+			libh323_r.so:${PORTSDIR}/net/openh323
+H323_MAKE_ENV=		OPENH323DIR=${LOCALBASE}/share/openh323
+
+ICONV_CONFIGURE_OFF=	--with-iconv=/dev/null --with-iconv=no
+ICONV_CONFIGURE_WITH=	iconv
+ICONV_USES=		iconv
+
+JABBER_CONFIGURE_WITH=	iksemel
+JABBER_LIB_DEPENDS=	libiksemel.so:${PORTSDIR}/textproc/iksemel
+
 ODBC_CONFIGURE_WITH=	unixodbc
 ODBC_CONFIGURE_ON=	--with-ltdl
 ODBC_LIB_DEPENDS=	libodbc.so:${PORTSDIR}/databases/unixODBC \
 			libltdl.so:${PORTSDIR}/devel/libltdl
-FREETDS_CONFIGURE_ON=	--with-tds=${LOCALBASE}
-FREETDS_CONFIGURE_OFF=	--without-tds
-FREETDS_LIB_DEPENDS=	libsybdb.so:${PORTSDIR}/databases/freetds
-PGSQL_CONFIGURE_WITH=	postgres
-PGSQL_USES=		pgsql
+
+LDAP_CONFIGURE_WITH=	ldap
+LDAP_USE=		OPENLDAP=yes
+
+LUA_CONFIGURE_WITH=	lua
+LUA_USES=		lua:51
+LUA_CFLAGS=		-I${LUA_INCDIR}
+LUA_LDFLAGS=		-L${LUA_LIBDIR}
+
+MP3PLAYER_RUN_DEPENDS=	mpg123:${PORTSDIR}/audio/mpg123
+
 MYSQL_CONFIGURE_WITH=	mysqlclient
 MYSQL_USE=		MYSQL=yes
-VORBIS_CONFIGURE_WITH=	ogg
-VORBIS_LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis
+
+NCURSES_USES=		ncurses
+
+NEWT_LIB_DEPENDS=	libnewt.so:${PORTSDIR}/devel/newt
+
+PGSQL_CONFIGURE_WITH=	postgres
+PGSQL_USES=		pgsql
+
 RADIUS_CONFIGURE_WITH=	radius
 RADIUS_LIB_DEPENDS=	libradiusclient-ng.so:${PORTSDIR}/net/radiusclient
+
 SNMP_CONFIGURE_WITH=	netsnmp
 SNMP_LIB_DEPENDS=	libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
-JABBER_CONFIGURE_WITH=	iksemel
-JABBER_LIB_DEPENDS=	libiksemel.so:${PORTSDIR}/textproc/iksemel
+
+SPEEX_LIB_DEPENDS=	libspeex.so:${PORTSDIR}/audio/speex
+
 SQLITE_CONFIGURE_WITH=	sqlite
 SQLITE_CONFIGURE_OFF=	--with-sqlite3=no
 SQLITE_LIB_DEPENDS=	libsqlite.so:${PORTSDIR}/databases/sqlite2 \
 			libsqlite3.so:${PORTSDIR}/databases/sqlite3
-GSM_CONFIGURE_WITH=	gsm
-GSM_LIB_DEPENDS=	libgsm.so:${PORTSDIR}/audio/gsm
-CURL_CONFIGURE_ON=	--with-libcurl
-CURL_CONFIGURE_OFF=	--with-libcurl=no
-CURL_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+
+VORBIS_CONFIGURE_WITH=	ogg
+VORBIS_LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis
+
 SPANDSP_CONFIGURE_WITH=	spandsp
 SPANDSP_LIB_DEPENDS=	libspandsp.so:${PORTSDIR}/comms/spandsp
-EXCHANGE_CONFIGURE_OFF=	--without-neon --without-neon29
-EXCHANGE_LIB_DEPENDS=	libneon.so:${PORTSDIR}/www/neon
+
 SRTP_CONFIGURE_WITH=	srtp
 SRTP_BUILD_DEPENDS=	libsrtp>=1.4.4:${PORTSDIR}/net/libsrtp
-LUA_CONFIGURE_WITH=	lua
-LUA_USES=		lua:51
-LUA_CFLAGS=		-I${LUA_INCDIR}
-LUA_LDFLAGS=		-L${LUA_LIBDIR}
-LDAP_CONFIGURE_WITH=	ldap
-LDAP_USE=		OPENLDAP=yes
+
 SYSINFO_LIB_DEPENDS=	libsysinfo.so:${PORTSDIR}/devel/libsysinfo
 
 PORTSCOUT=	limit:^1\.8\.
@@ -136,13 +203,18 @@ VARDIR=${PREFIX}/var
 .endif
 
 SUB_LIST+=	ASTERISK_USER=${ASTERISK_USER}
-PLIST_SUB+=	ASTERISK_USER=${ASTERISK_USER}
-PLIST_SUB+=	ASTERISK_GROUP=${ASTERISK_GROUP}
-PLIST_SUB+=	VARDIR=${VARDIR}
+PLIST_SUB+=	ASTERISK_USER=${ASTERISK_USER} \
+		ASTERISK_GROUP=${ASTERISK_GROUP} \
+		VARDIR=${VARDIR}
 
 post-extract:
 	@${FIND} ${WRKSRC} -name '*.d' -delete
 
+.if ${PORT_OPTIONS:MG729}
+	${CP} ${DISTDIR}/${ASTERISK_CORE_G729_SOUNDS} ${WRKSRC}/sounds
+	${CP} ${DISTDIR}/${ASTERISK_MOH_G729_SOUNDS} ${WRKSRC}/sounds
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|/var/lib|${PREFIX}/share|g' ${WRKSRC}/configs/musiconhold.conf.sample
 .if ${PORT_OPTIONS:MSYSINFO}
@@ -152,9 +224,14 @@ post-patch:
 	@${REINPLACE_CMD} -e '/%%LIBSYSINFO%%/d' ${WRKSRC}/main/Makefile
 .endif
 
+.if exists(${FILESDIR}/.asterisk.makeopts)
+USER_MAKEOPTS_FILE=${FILESDIR}/.asterisk.makeopts
+.else
+USER_MAKEOPTS_FILE=
+.endif
+
 post-configure:
-	@cd ${WRKSRC} && ${MAKE_CMD} menuselect.makeopts
-	@cd ${WRKSRC} && ./menuselect/menuselect --disable res_timing_kqueue menuselect.makeopts
+	@cd ${WRKSRC} && ${MAKE_CMD} menuselect.makeopts USER_MAKEOPTS="${USER_MAKEOPTS_FILE}"
 .if ${PORT_OPTIONS:MMYSQL}
 	@cd ${WRKSRC} && ./menuselect/menuselect --enable res_config_mysql menuselect.makeopts
 	@cd ${WRKSRC} && ./menuselect/menuselect --enable app_mysql menuselect.makeopts
@@ -164,10 +241,17 @@ post-configure:
 	@cd ${WRKSRC} && ./menuselect/menuselect --enable chan_ooh323 menuselect.makeopts
 .endif
 .if ${PORT_OPTIONS:MNEWG711}
-	@cd ${WRKSRC} && ./menuselect/menuselect --enable  G711_NEW_ALGORITHM menuselect.makeopts
+	@cd ${WRKSRC} && ./menuselect/menuselect --enable G711_NEW_ALGORITHM menuselect.makeopts
 .endif
 
 post-install:
 	@${RM} ${STAGEDIR}${ETCDIR}/*.conf ${STAGEDIR}${ETCDIR}/extensions.ael ${STAGEDIR}${ETCDIR}/extensions.lua
+	${FIND} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/modules -type f -name '*.so' | ${SED} "s,^${STAGEDIR}${PREFIX}/,," >> ${TMPPLIST}
+	${FIND} ${STAGEDIR}${DATADIR}/sounds -type f | ${SED} "s,^${STAGEDIR}${DATADIR},${DATADIR}," >> ${TMPPLIST}
+	${FIND} ${STAGEDIR}${DATADIR}/moh -type f | ${SED} "s,^${STAGEDIR}${DATADIR},${DATADIR}," >> ${TMPPLIST}
+
+	(cd ${STAGEDIR} && \
+		${FIND} var/spool/${PORTNAME}/voicemail/default -type f | ${SED} "s,^,/," >> ${TMPPLIST} && \
+		${FIND} var/spool/${PORTNAME}/voicemail/ -type d | ${SED} "s,^, at dir /," >> ${TMPPLIST});
 
 .include <bsd.port.post.mk>

Modified: head/net/asterisk/distinfo
==============================================================================
--- head/net/asterisk/distinfo	Sun Aug 30 10:30:10 2015	(r395608)
+++ head/net/asterisk/distinfo	Sun Aug 30 10:36:13 2015	(r395609)
@@ -1,2 +1,6 @@
 SHA256 (asterisk-1.8.32.3.tar.gz) = 3c12ddbb86e2b901af449bd5a3ac7bbc55a28664159d0c4fb70f89d761d8bf9e
 SIZE (asterisk-1.8.32.3.tar.gz) = 29637478
+SHA256 (asterisk-core-sounds-en-g729-1.4.26.tar.gz) = 0e81f61b22650bd350c17fd5eaad746fb1f184386773b792a5a1106f22d27df4
+SIZE (asterisk-core-sounds-en-g729-1.4.26.tar.gz) = 1381942
+SHA256 (asterisk-moh-opsound-g729-2.03.tar.gz) = 0147ca9a97f0c550227aacb7793499057c4d2c64e021c95f93722f27d5549585
+SIZE (asterisk-moh-opsound-g729-2.03.tar.gz) = 1103000

Modified: head/net/asterisk/files/patch-Makefile
==============================================================================
--- head/net/asterisk/files/patch-Makefile	Sun Aug 30 10:30:10 2015	(r395608)
+++ head/net/asterisk/files/patch-Makefile	Sun Aug 30 10:36:13 2015	(r395609)
@@ -1,6 +1,6 @@
---- Makefile.orig	2012-06-13 16:27:57.000000000 +0200
-+++ Makefile	2012-08-02 00:02:38.030569971 +0200
-@@ -121,7 +121,7 @@
+--- Makefile.orig	2014-10-31 16:37:55 UTC
++++ Makefile
+@@ -121,7 +121,7 @@ ASTTOPDIR:=$(subst $(space),\$(space),$(
  OVERWRITE=y
  
  # Include debug and macro symbols in the executables (-g) and profiling info (-pg)
@@ -9,7 +9,7 @@
  
  # Asterisk.conf is located in ASTETCDIR or by using the -C flag
  # when starting Asterisk
-@@ -188,7 +188,7 @@
+@@ -187,7 +187,7 @@ endif
  
  ifeq ($(OSARCH),FreeBSD)
    # -V is understood by BSD Make, not by GNU make.
@@ -18,7 +18,7 @@
    _ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi)
  endif
  
-@@ -415,8 +415,13 @@
+@@ -418,8 +418,13 @@ datafiles: _all doc/core-en_US.xml
  		$(INSTALL) -m 644 $$x "$(DESTDIR)$(ASTDATADIR)/static-http" ; \
  	done
  	$(INSTALL) -m 644 doc/core-en_US.xml "$(DESTDIR)$(ASTDATADIR)/static-http";
@@ -33,7 +33,7 @@
  	done
  	$(MAKE) -C sounds install
  
-@@ -475,7 +480,7 @@
+@@ -478,7 +483,7 @@ INSTALLDIRS="$(ASTLIBDIR)" "$(MODULES_DI
  	"$(ASTDATADIR)/documentation/thirdparty" "$(ASTDATADIR)/firmware" \
  	"$(ASTDATADIR)/firmware/iax" "$(ASTDATADIR)/images" "$(ASTDATADIR)/keys" \
  	"$(ASTDATADIR)/phoneprov" "$(ASTDATADIR)/static-http" "$(ASTDATADIR)/sounds" \
@@ -42,7 +42,7 @@
  
  installdirs:
  	@for i in $(INSTALLDIRS); do \
-@@ -542,7 +547,7 @@
+@@ -545,7 +550,7 @@ ifneq ($(filter ~%,$(DESTDIR)),)
  	@exit 1
  endif
  
@@ -51,7 +51,7 @@
  	@if [ -x /usr/sbin/asterisk-post-install ]; then \
  		/usr/sbin/asterisk-post-install "$(DESTDIR)" . ; \
  	fi
-@@ -584,29 +589,18 @@
+@@ -587,29 +592,18 @@ adsi:
  		else \
  			echo "Installing $$x" ; \
  		fi ; \
@@ -87,7 +87,7 @@
  		echo "Updating asterisk.conf" ; \
  		sed -e 's|^astetcdir.*$$|astetcdir => $(ASTETCDIR)|' \
  			-e 's|^astmoddir.*$$|astmoddir => $(MODULES_DIR)|' \
-@@ -620,6 +614,7 @@
+@@ -623,6 +617,7 @@ samples: adsi
  			-e 's|^astlogdir.*$$|astlogdir => $(ASTLOGDIR)|' \
  			"$(DESTDIR)$(ASTCONFPATH)" > "$(DESTDIR)$(ASTCONFPATH).tmp" ; \
  		$(INSTALL) -m 644 "$(DESTDIR)$(ASTCONFPATH).tmp" "$(DESTDIR)$(ASTCONFPATH)" ; \

Modified: head/net/asterisk/files/patch-agi__Makefile
==============================================================================
--- head/net/asterisk/files/patch-agi__Makefile	Sun Aug 30 10:30:10 2015	(r395608)
+++ head/net/asterisk/files/patch-agi__Makefile	Sun Aug 30 10:36:13 2015	(r395609)
@@ -1,6 +1,6 @@
---- ./agi/Makefile.orig	2010-07-23 15:26:41.000000000 +0200
-+++ ./agi/Makefile	2010-11-06 14:54:36.000000000 +0100
-@@ -16,7 +16,9 @@
+--- agi/Makefile.orig	2011-08-17 19:21:36 UTC
++++ agi/Makefile
+@@ -16,7 +16,9 @@ ASTTOPDIR?=..
  
  .PHONY: clean all uninstall
  

Modified: head/net/asterisk/files/patch-channels-chan_dahdi.c
==============================================================================
--- head/net/asterisk/files/patch-channels-chan_dahdi.c	Sun Aug 30 10:30:10 2015	(r395608)
+++ head/net/asterisk/files/patch-channels-chan_dahdi.c	Sun Aug 30 10:36:13 2015	(r395609)
@@ -1,6 +1,6 @@
---- channels/chan_dahdi.c.orig	2010-11-09 11:18:39.000000000 +0100
-+++ channels/chan_dahdi.c	2010-11-09 11:22:15.000000000 +0100
-@@ -4688,6 +4688,8 @@
+--- channels/chan_dahdi.c.orig	2014-07-03 21:38:30 UTC
++++ channels/chan_dahdi.c
+@@ -4907,6 +4907,8 @@ static void dahdi_enable_ec(struct dahdi
  		return;
  	}
  	if (p->echocancel.head.tap_length) {
@@ -9,7 +9,7 @@
  #if defined(HAVE_PRI) || defined(HAVE_SS7)
  		switch (p->sig) {
  #if defined(HAVE_PRI)
-@@ -4718,7 +4720,9 @@
+@@ -4937,7 +4939,9 @@ static void dahdi_enable_ec(struct dahdi
  			break;
  		}
  #endif	/* defined(HAVE_PRI) || defined(HAVE_SS7) */
@@ -20,7 +20,7 @@
  		if (res) {
  			ast_log(LOG_WARNING, "Unable to enable echo cancellation on channel %d (%s)\n", p->channel, strerror(errno));
  		} else {
-@@ -4752,8 +4756,9 @@
+@@ -4971,8 +4975,9 @@ static void dahdi_disable_ec(struct dahd
  
  	if (p->echocanon) {
  		struct dahdi_echocanparams ecp = { .tap_length = 0 };

Modified: head/net/asterisk/files/patch-channels__Makefile
==============================================================================
--- head/net/asterisk/files/patch-channels__Makefile	Sun Aug 30 10:30:10 2015	(r395608)
+++ head/net/asterisk/files/patch-channels__Makefile	Sun Aug 30 10:36:13 2015	(r395609)
@@ -1,6 +1,6 @@
---- ./channels/Makefile.orig	2010-06-07 22:04:42.000000000 +0200
-+++ ./channels/Makefile	2010-11-06 14:54:36.000000000 +0100
-@@ -27,9 +27,10 @@
+--- channels/Makefile.orig	2010-06-07 20:04:42 UTC
++++ channels/Makefile
+@@ -27,9 +27,10 @@ ifeq ($(OSARCH),linux-gnu)
  endif
  
  ifeq ($(OSARCH),FreeBSD)
@@ -13,7 +13,7 @@
  endif
  
  ifeq ($(OSARCH),NetBSD)
-@@ -86,9 +87,13 @@
+@@ -86,9 +87,13 @@ chan_h323.so: chan_h323.o h323/libchanh3
  else
  chan_h323.so: chan_h323.o h323/libchanh323.a
  	$(ECHO_PREFIX) echo "   [LD] $^ -> $@"

Modified: head/net/asterisk/files/patch-channels__sip__include__sip.h
==============================================================================
--- head/net/asterisk/files/patch-channels__sip__include__sip.h	Sun Aug 30 10:30:10 2015	(r395608)
+++ head/net/asterisk/files/patch-channels__sip__include__sip.h	Sun Aug 30 10:36:13 2015	(r395609)
@@ -1,6 +1,6 @@
---- ./channels/sip/include/sip.h.orig	2010-11-08 04:46:46.000000000 +0100
-+++ ./channels/sip/include/sip.h	2010-11-08 04:47:07.000000000 +0100
-@@ -180,7 +180,7 @@
+--- channels/sip/include/sip.h.orig	2014-05-09 22:18:59 UTC
++++ channels/sip/include/sip.h
+@@ -184,7 +184,7 @@
  #define DEFAULT_MOHINTERPRET   "default"  /*!< The default music class */
  #define DEFAULT_MOHSUGGEST     ""
  #define DEFAULT_VMEXTEN        "asterisk" /*!< Default voicemail extension */

Modified: head/net/asterisk/files/patch-channels_h323_Makefile.in
==============================================================================
--- head/net/asterisk/files/patch-channels_h323_Makefile.in	Sun Aug 30 10:30:10 2015	(r395608)
+++ head/net/asterisk/files/patch-channels_h323_Makefile.in	Sun Aug 30 10:36:13 2015	(r395609)
@@ -1,6 +1,6 @@
---- ./channels/h323/Makefile.in.orig	2010-06-03 16:48:09.000000000 +0200
-+++ ./channels/h323/Makefile.in	2010-11-06 14:54:36.000000000 +0100
-@@ -13,7 +13,7 @@
+--- channels/h323/Makefile.in.orig	2010-06-03 14:48:09 UTC
++++ channels/h323/Makefile.in
+@@ -13,7 +13,7 @@ STDCCFLAGS	= -DNDEBUG
  STDCCFLAGS	+= -I../../include -include ../../include/asterisk/autoconfig.h
  STDCCFLAGS	+= -fPIC
  #OPTCCFLAGS	+=

Modified: head/net/asterisk/files/patch-configure
==============================================================================
--- head/net/asterisk/files/patch-configure	Sun Aug 30 10:30:10 2015	(r395608)
+++ head/net/asterisk/files/patch-configure	Sun Aug 30 10:36:13 2015	(r395609)
@@ -1,6 +1,6 @@
---- configure.orig	2014-06-21 01:12:25.000000000 +0200
-+++ configure	2014-07-30 00:01:20.820891824 +0200
-@@ -4720,9 +4720,9 @@
+--- configure.orig	2014-08-17 22:31:23 UTC
++++ configure
+@@ -4698,9 +4698,9 @@ astetcdir='${sysconfdir}/asterisk'
  astheaderdir='${includedir}/asterisk'
  astlibdir='${libdir}/asterisk'
  astmandir='${mandir}'
@@ -12,7 +12,7 @@
  astkeydir='${astvarlibdir}'
  astspooldir='${localstatedir}/spool/asterisk'
  astlogdir='${localstatedir}/log/asterisk'
-@@ -4745,8 +4745,6 @@
+@@ -4723,8 +4723,6 @@ esac
  case "${host_os}" in
       freebsd*)
       ac_default_prefix=/usr/local
@@ -21,7 +21,7 @@
       ;;
       openbsd*)
       ac_default_prefix=/usr/local
-@@ -18493,6 +18491,8 @@
+@@ -18470,6 +18468,8 @@ $as_echo_n "checking if \"struct ifaddrs
  
  	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
@@ -30,7 +30,7 @@
   #include <ifaddrs.h>
  int
  main ()
-@@ -26268,7 +26268,7 @@
+@@ -26245,7 +26245,7 @@ $as_echo "${OPENH323_BUILD}" >&6; }
  
  	fi
  
@@ -39,7 +39,7 @@
  
  	if test "${HAS_OPENH323:-unset}" != "unset"; then
  	   { $as_echo "$as_me:${as_lineno-$LINENO}: checking OpenH323 installation validity" >&5
-@@ -26366,13 +26366,13 @@
+@@ -26343,13 +26343,13 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_
        ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
        CFLAGS="${CFLAGS} "
        as_ac_Lib=`$as_echo "ac_cv_lib_lua5.2_${pbxfuncname}" | $as_tr_sh`
@@ -56,7 +56,7 @@
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
-@@ -26414,18 +26414,18 @@
+@@ -26391,18 +26391,18 @@ fi
  
     # now check for the header.
     if test "${AST_LUA_FOUND}" = "yes"; then
@@ -78,7 +78,7 @@
  if test "x$ac_cv_header_lua5_2_lua_h" = xyes; then :
    LUA_HEADER_FOUND=1
  else
-@@ -26478,13 +26478,13 @@
+@@ -26455,13 +26455,13 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_
        ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
        CFLAGS="${CFLAGS} "
        as_ac_Lib=`$as_echo "ac_cv_lib_lua5.1_${pbxfuncname}" | $as_tr_sh`
@@ -95,7 +95,7 @@
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
-@@ -26526,18 +26526,18 @@
+@@ -26503,18 +26503,18 @@ fi
  
     # now check for the header.
     if test "${AST_LUA_FOUND}" = "yes"; then

Modified: head/net/asterisk/files/patch-main__asterisk.exports.in
==============================================================================
--- head/net/asterisk/files/patch-main__asterisk.exports.in	Sun Aug 30 10:30:10 2015	(r395608)
+++ head/net/asterisk/files/patch-main__asterisk.exports.in	Sun Aug 30 10:36:13 2015	(r395609)
@@ -1,5 +1,5 @@
---- main/asterisk.exports.in.orig	2013-08-22 10:19:02.000000000 +0200
-+++ main/asterisk.exports.in	2013-10-27 13:37:29.053477896 +0100
+--- main/asterisk.exports.in.orig	2013-08-22 08:19:02 UTC
++++ main/asterisk.exports.in
 @@ -63,6 +63,8 @@
  
  		*/

Modified: head/net/asterisk/files/patch-main__db.c
==============================================================================
--- head/net/asterisk/files/patch-main__db.c	Sun Aug 30 10:30:10 2015	(r395608)
+++ head/net/asterisk/files/patch-main__db.c	Sun Aug 30 10:36:13 2015	(r395609)
@@ -1,6 +1,6 @@
---- ./main/db.c.orig	2010-09-10 22:31:58.000000000 +0200
-+++ ./main/db.c	2010-11-06 14:54:37.000000000 +0100
-@@ -36,6 +36,7 @@
+--- main/db.c.orig	2012-12-10 23:13:48 UTC
++++ main/db.c
+@@ -40,6 +40,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi
  #include <sys/time.h>
  #include <signal.h>
  #include <dirent.h>
@@ -8,7 +8,7 @@
  
  #include "asterisk/channel.h"
  #include "asterisk/file.h"
-@@ -46,7 +47,6 @@
+@@ -50,7 +51,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi
  #include "asterisk/utils.h"
  #include "asterisk/lock.h"
  #include "asterisk/manager.h"

Modified: head/net/asterisk/files/patch-main__lock.c
==============================================================================
--- head/net/asterisk/files/patch-main__lock.c	Sun Aug 30 10:30:10 2015	(r395608)
+++ head/net/asterisk/files/patch-main__lock.c	Sun Aug 30 10:36:13 2015	(r395609)
@@ -1,6 +1,6 @@
---- ./main/lock.c.orig	2010-11-06 15:00:15.000000000 +0100
-+++ ./main/lock.c	2010-11-06 15:00:23.000000000 +0100
-@@ -679,10 +679,6 @@
+--- main/lock.c.orig	2013-09-09 19:56:02 UTC
++++ main/lock.c
+@@ -691,10 +691,6 @@ int __ast_rwlock_init(int tracking, cons
  
  	pthread_rwlockattr_init(&attr);
  

Modified: head/net/asterisk/files/patch-main__utils.c
==============================================================================
--- head/net/asterisk/files/patch-main__utils.c	Sun Aug 30 10:30:10 2015	(r395608)
+++ head/net/asterisk/files/patch-main__utils.c	Sun Aug 30 10:36:13 2015	(r395609)
@@ -1,6 +1,6 @@
---- ./main/utils.c.orig	2010-08-06 20:57:10.000000000 +0200
-+++ ./main/utils.c	2010-11-06 14:54:37.000000000 +0100
-@@ -990,8 +990,8 @@
+--- main/utils.c.orig	2014-11-07 20:16:06 UTC
++++ main/utils.c
+@@ -1192,8 +1192,8 @@ int ast_pthread_create_stack(pthread_t *
  		pthread_attr_init(attr);
  	}
  

Added: head/net/asterisk/pkg-message
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/asterisk/pkg-message	Sun Aug 30 10:36:13 2015	(r395609)
@@ -0,0 +1,36 @@
+###########################################################################
+
+  This port supports custom Asterisk configurations using a *user-supplied*
+  menuselect.makeopt file. 
+
+  This feature is of most value for users that want to disable or override
+  default functionality that they dont want or need, particular in space
+  and/or resource constrained, or embedded environments.
+
+  If a file named ".asterisk.makeopts" is found in the ports files/
+  directory, its contents will be used to configure Asterisk at the 
+  post-configure stage.
+
+  If the file is *not* found, the port will default to a 'normal' Asterisk
+  menuselect configuration, and only execute menuselect commands according
+  to what port OPTIONS the user has selected.
+
+  The format of this file is the same as the output of a standard
+  `make menuselect` command, as per standard build instructions for
+  Asterisk.
+
+  NOTE: The contents of this file *MUST* be syntactically and semantically
+        valid, as the port does *NOT* perform validation of this file. 
+
+        In particular, ensure that all Asterisk options have their
+        dependencies met, using the corresponding port OPTIONS dependencies.
+
+  The `menuselect --check-deps` command can be used to verify the
+  configuration
+
+  The following related documentation resources are also available:
+
+    * https://wiki.asterisk.org/wiki/display/AST/Using+Menuselect+to+Select+Asterisk+Options
+    * http://www.asteriskdocs.org/en/3rd_Edition/asterisk-book-html-chunk/installing_base_configuration.html#Installing_id293213
+
+################################################################################

Modified: head/net/asterisk/pkg-plist
==============================================================================
--- head/net/asterisk/pkg-plist	Sun Aug 30 10:30:10 2015	(r395608)
+++ head/net/asterisk/pkg-plist	Sun Aug 30 10:36:13 2015	(r395609)
@@ -421,217 +421,6 @@ include/asterisk/utils.h
 include/asterisk/version.h
 include/asterisk/xml.h
 include/asterisk/xmldoc.h
-lib/asterisk/modules/app_celgenuserevent.so
-lib/asterisk/modules/app_confbridge.so
-lib/asterisk/modules/app_minivm.so
-%%MYSQL%%lib/asterisk/modules/app_mysql.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
-%%ODBC%%lib/asterisk/modules/cdr_adaptive_odbc.so
-%%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_g719.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
-lib/asterisk/modules/func_extstate.so
-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
-%%CURL%%lib/asterisk/modules/res_curl.so
-%%CURL%%lib/asterisk/modules/res_config_curl.so
-%%LDAP%%lib/asterisk/modules/res_config_ldap.so
-%%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
-%%SRTP%%lib/asterisk/modules/res_srtp.so
-%%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
-lib/asterisk/modules/app_authenticate.so
-lib/asterisk/modules/app_cdr.so
-lib/asterisk/modules/app_chanisavail.so
-lib/asterisk/modules/app_channelredirect.so
-lib/asterisk/modules/app_chanspy.so
-lib/asterisk/modules/app_controlplayback.so
-lib/asterisk/modules/app_db.so
-lib/asterisk/modules/app_dial.so
-lib/asterisk/modules/app_dictate.so
-lib/asterisk/modules/app_directed_pickup.so
-lib/asterisk/modules/app_directory.so
-lib/asterisk/modules/app_disa.so
-lib/asterisk/modules/app_dumpchan.so
-lib/asterisk/modules/app_echo.so
-lib/asterisk/modules/app_exec.so
-lib/asterisk/modules/app_externalivr.so
-lib/asterisk/modules/app_festival.so
-lib/asterisk/modules/app_followme.so
-lib/asterisk/modules/app_forkcdr.so
-lib/asterisk/modules/app_getcpeid.so
-lib/asterisk/modules/app_ices.so
-lib/asterisk/modules/app_image.so
-lib/asterisk/modules/app_macro.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
-lib/asterisk/modules/app_parkandannounce.so
-lib/asterisk/modules/app_playback.so
-lib/asterisk/modules/app_privacy.so
-lib/asterisk/modules/app_queue.so
-lib/asterisk/modules/app_read.so
-lib/asterisk/modules/app_readfile.so
-lib/asterisk/modules/app_record.so
-lib/asterisk/modules/app_sayunixtime.so
-lib/asterisk/modules/app_senddtmf.so
-lib/asterisk/modules/app_sendtext.so
-lib/asterisk/modules/app_setcallerid.so
-lib/asterisk/modules/app_sms.so
-lib/asterisk/modules/app_softhangup.so
-lib/asterisk/modules/app_speech_utils.so
-lib/asterisk/modules/app_stack.so
-lib/asterisk/modules/app_system.so
-lib/asterisk/modules/app_talkdetect.so
-lib/asterisk/modules/app_test.so
-lib/asterisk/modules/app_transfer.so
-lib/asterisk/modules/app_url.so
-lib/asterisk/modules/app_userevent.so
-lib/asterisk/modules/app_verbose.so
-lib/asterisk/modules/app_voicemail.so
-lib/asterisk/modules/app_waitforring.so
-lib/asterisk/modules/app_waitforsilence.so
-lib/asterisk/modules/app_while.so
-lib/asterisk/modules/app_zapateller.so
-lib/asterisk/modules/cdr_csv.so
-lib/asterisk/modules/cdr_custom.so
-lib/asterisk/modules/cdr_manager.so
-%%MYSQL%%lib/asterisk/modules/cdr_mysql.so
-%%PGSQL%%lib/asterisk/modules/cdr_pgsql.so
-%%RADIUS%%lib/asterisk/modules/cdr_radius.so
-%%SQLITE%%lib/asterisk/modules/cdr_sqlite.so
-%%SQLITE%%lib/asterisk/modules/cdr_sqlite3_custom.so
-lib/asterisk/modules/cdr_syslog.so
-lib/asterisk/modules/cel_custom.so
-lib/asterisk/modules/cel_manager.so
-%%ODBC%%lib/asterisk/modules/cel_odbc.so
-%%PGSQL%%lib/asterisk/modules/cel_pgsql.so
-%%RADIUS%%lib/asterisk/modules/cel_radius.so
-%%SQLITE%%lib/asterisk/modules/cel_sqlite3_custom.so
-%%FREETDS%%lib/asterisk/modules/cel_tds.so
-lib/asterisk/modules/chan_agent.so
-%%JABBER%%lib/asterisk/modules/chan_gtalk.so
-lib/asterisk/modules/chan_iax2.so
-lib/asterisk/modules/chan_local.so
- at comment lib/asterisk/modules/chan_mgcp.so
-lib/asterisk/modules/chan_multicast_rtp.so
-%%OOH323%%lib/asterisk/modules/chan_ooh323.so
-lib/asterisk/modules/chan_oss.so
-lib/asterisk/modules/chan_sip.so
-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
-lib/asterisk/modules/codec_g726.so
-%%GSM%%lib/asterisk/modules/codec_gsm.so
-lib/asterisk/modules/codec_ilbc.so
-lib/asterisk/modules/codec_lpc10.so
-lib/asterisk/modules/codec_speex.so
-lib/asterisk/modules/codec_ulaw.so
-lib/asterisk/modules/format_g723.so
-lib/asterisk/modules/format_g726.so
-lib/asterisk/modules/format_g729.so
-lib/asterisk/modules/format_gsm.so
-lib/asterisk/modules/format_h263.so
-lib/asterisk/modules/format_h264.so
-lib/asterisk/modules/format_ilbc.so
-lib/asterisk/modules/format_jpeg.so
-%%VORBIS%%lib/asterisk/modules/format_ogg_vorbis.so
-lib/asterisk/modules/format_pcm.so
-lib/asterisk/modules/format_sln.so
-lib/asterisk/modules/format_vox.so
-lib/asterisk/modules/format_wav.so
-lib/asterisk/modules/format_wav_gsm.so
-lib/asterisk/modules/func_base64.so
-lib/asterisk/modules/func_callcompletion.so
-lib/asterisk/modules/func_callerid.so
-lib/asterisk/modules/func_cdr.so
-lib/asterisk/modules/func_channel.so
-%%CURL%%lib/asterisk/modules/func_curl.so
-lib/asterisk/modules/func_cut.so
-lib/asterisk/modules/func_db.so
-lib/asterisk/modules/func_enum.so
-lib/asterisk/modules/func_env.so
-lib/asterisk/modules/func_frame_trace.so
-lib/asterisk/modules/func_global.so
-lib/asterisk/modules/func_groupcount.so
-lib/asterisk/modules/func_logic.so
-lib/asterisk/modules/func_math.so
-lib/asterisk/modules/func_md5.so
-%%ODBC%%lib/asterisk/modules/func_odbc.so
-lib/asterisk/modules/func_pitchshift.so
-lib/asterisk/modules/func_rand.so
-lib/asterisk/modules/func_realtime.so
-lib/asterisk/modules/func_sha1.so
-lib/asterisk/modules/func_srv.so
-lib/asterisk/modules/func_strings.so
-lib/asterisk/modules/func_timeout.so
-lib/asterisk/modules/func_uri.so
-lib/asterisk/modules/pbx_ael.so
-lib/asterisk/modules/pbx_config.so
-lib/asterisk/modules/pbx_dundi.so
-lib/asterisk/modules/pbx_loopback.so
-lib/asterisk/modules/pbx_realtime.so
-lib/asterisk/modules/pbx_spool.so
-lib/asterisk/modules/res_adsi.so
-lib/asterisk/modules/res_agi.so
-lib/asterisk/modules/res_calendar.so
-%%EXCHANGE%%lib/asterisk/modules/res_calendar_ews.so
-lib/asterisk/modules/res_clioriginate.so
-%%MYSQL%%lib/asterisk/modules/res_config_mysql.so
-%%PGSQL%%lib/asterisk/modules/res_config_pgsql.so
-lib/asterisk/modules/res_convert.so
-lib/asterisk/modules/res_crypto.so
-lib/asterisk/modules/res_fax.so
-%%SPANDSP%%lib/asterisk/modules/res_fax_spandsp.so
-%%JABBER%%lib/asterisk/modules/res_jabber.so
-lib/asterisk/modules/res_monitor.so
-lib/asterisk/modules/res_musiconhold.so
-lib/asterisk/modules/res_mutestream.so
-lib/asterisk/modules/res_rtp_asterisk.so
-lib/asterisk/modules/res_rtp_multicast.so
-lib/asterisk/modules/res_security_log.so
-lib/asterisk/modules/res_stun_monitor.so
-lib/asterisk/modules/res_smdi.so
-%%SNMP%%lib/asterisk/modules/res_snmp.so
-lib/asterisk/modules/res_speech.so
 man/man8/asterisk.8.gz
 man/man8/astgenkey.8.gz
 man/man8/autosupport.8.gz
@@ -642,569 +431,32 @@ sbin/astgenkey
 sbin/autosupport
 sbin/rasterisk
 sbin/safe_asterisk
-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/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
-share/asterisk/moh/macroform-cold_day.wav
-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/phoneprov/000000000000-directory.xml
-share/asterisk/phoneprov/000000000000-phone.cfg
-share/asterisk/phoneprov/000000000000.cfg
-share/asterisk/phoneprov/polycom.xml
-share/asterisk/phoneprov/polycom_line.xml
-share/asterisk/phoneprov/snom-mac.xml
-share/asterisk/sounds/en/CHANGES-asterisk-core-en-1.4.26
-share/asterisk/sounds/en/CREDITS-asterisk-core-en-1.4.26
-share/asterisk/sounds/en/LICENSE-asterisk-core-en-1.4.26
-share/asterisk/sounds/en/ascending-2tone.gsm
-share/asterisk/sounds/en/conf-adminmenu-18.gsm
-share/asterisk/sounds/en/conf-adminmenu-162.gsm
-share/asterisk/sounds/en/conf-adminmenu-menu8.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/confbridge-begin-glorious-a.gsm
-share/asterisk/sounds/en/confbridge-begin-glorious-b.gsm
-share/asterisk/sounds/en/confbridge-begin-glorious-c.gsm
-share/asterisk/sounds/en/confbridge-begin-leader.gsm
-share/asterisk/sounds/en/confbridge-conf-begin.gsm
-share/asterisk/sounds/en/confbridge-conf-end.gsm
-share/asterisk/sounds/en/confbridge-dec-list-vol-in.gsm
-share/asterisk/sounds/en/confbridge-dec-list-vol-out.gsm
-share/asterisk/sounds/en/confbridge-dec-talk-vol-in.gsm
-share/asterisk/sounds/en/confbridge-dec-talk-vol-out.gsm
-share/asterisk/sounds/en/confbridge-has-joined.gsm
-share/asterisk/sounds/en/confbridge-has-left.gsm
-share/asterisk/sounds/en/confbridge-inc-list-vol-in.gsm
-share/asterisk/sounds/en/confbridge-inc-list-vol-out.gsm
-share/asterisk/sounds/en/confbridge-inc-talk-vol-in.gsm
-share/asterisk/sounds/en/confbridge-inc-talk-vol-out.gsm
-share/asterisk/sounds/en/confbridge-invalid.gsm
-share/asterisk/sounds/en/confbridge-join.gsm
-share/asterisk/sounds/en/confbridge-leave-in.gsm
-share/asterisk/sounds/en/confbridge-leave-out.gsm
-share/asterisk/sounds/en/confbridge-leave.gsm
-share/asterisk/sounds/en/confbridge-lock-extended.gsm
-share/asterisk/sounds/en/confbridge-lock-in.gsm
-share/asterisk/sounds/en/confbridge-lock-no-join.gsm
-share/asterisk/sounds/en/confbridge-lock-out.gsm
-share/asterisk/sounds/en/confbridge-locked.gsm
-share/asterisk/sounds/en/confbridge-menu-exit-in.gsm
-share/asterisk/sounds/en/confbridge-menu-exit-out.gsm
-share/asterisk/sounds/en/confbridge-mute-extended.gsm
-share/asterisk/sounds/en/confbridge-mute-in.gsm
-share/asterisk/sounds/en/confbridge-mute-out.gsm
-share/asterisk/sounds/en/confbridge-muted.gsm
-share/asterisk/sounds/en/confbridge-only-one.gsm
-share/asterisk/sounds/en/confbridge-only-participant.gsm
-share/asterisk/sounds/en/confbridge-participants.gsm
-share/asterisk/sounds/en/confbridge-pin-bad.gsm
-share/asterisk/sounds/en/confbridge-pin.gsm
-share/asterisk/sounds/en/confbridge-remove-last-in.gsm
-share/asterisk/sounds/en/confbridge-remove-last-out.gsm
-share/asterisk/sounds/en/confbridge-removed.gsm
-share/asterisk/sounds/en/confbridge-rest-list-vol-in.gsm
-share/asterisk/sounds/en/confbridge-rest-list-vol-out.gsm
-share/asterisk/sounds/en/confbridge-rest-talk-vol-in.gsm
-share/asterisk/sounds/en/confbridge-rest-talk-vol-out.gsm
-share/asterisk/sounds/en/confbridge-there-are.gsm
-share/asterisk/sounds/en/confbridge-unlocked.gsm
-share/asterisk/sounds/en/confbridge-unmuted.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
-share/asterisk/sounds/en/vm-invalid-password.gsm
-share/asterisk/sounds/en/vm-marked-nonurgent.gsm
-share/asterisk/sounds/en/vm-marked-urgent.gsm
-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/dir-usingkeypad.gsm
-share/asterisk/sounds/en/dir-welcome.gsm
-share/asterisk/sounds/en/agent-alreadyon.gsm
-share/asterisk/sounds/en/agent-incorrect.gsm
-share/asterisk/sounds/en/agent-loggedoff.gsm
-share/asterisk/sounds/en/agent-loginok.gsm
-share/asterisk/sounds/en/agent-newlocation.gsm
-share/asterisk/sounds/en/agent-pass.gsm
-share/asterisk/sounds/en/agent-user.gsm
-share/asterisk/sounds/en/auth-incorrect.gsm
-share/asterisk/sounds/en/auth-thankyou.gsm
-share/asterisk/sounds/en/beep.gsm
-share/asterisk/sounds/en/beeperr.gsm
-share/asterisk/sounds/en/conf-adminmenu.gsm
-share/asterisk/sounds/en/conf-enteringno.gsm
-share/asterisk/sounds/en/conf-errormenu.gsm
-share/asterisk/sounds/en/conf-getchannel.gsm
-share/asterisk/sounds/en/conf-getconfno.gsm
-share/asterisk/sounds/en/conf-getpin.gsm
-share/asterisk/sounds/en/conf-hasjoin.gsm
-share/asterisk/sounds/en/conf-hasleft.gsm
-share/asterisk/sounds/en/conf-invalid.gsm
-share/asterisk/sounds/en/conf-invalidpin.gsm
-share/asterisk/sounds/en/conf-kicked.gsm
-share/asterisk/sounds/en/conf-leaderhasleft.gsm
-share/asterisk/sounds/en/conf-locked.gsm
-share/asterisk/sounds/en/conf-lockednow.gsm
-share/asterisk/sounds/en/conf-muted.gsm
-share/asterisk/sounds/en/conf-noempty.gsm
-share/asterisk/sounds/en/conf-onlyone.gsm
-share/asterisk/sounds/en/conf-onlyperson.gsm
-share/asterisk/sounds/en/conf-otherinparty.gsm
-share/asterisk/sounds/en/conf-placeintoconf.gsm
-share/asterisk/sounds/en/conf-thereare.gsm
-share/asterisk/sounds/en/conf-unlockednow.gsm
-share/asterisk/sounds/en/conf-unmuted.gsm
-share/asterisk/sounds/en/conf-usermenu.gsm
-share/asterisk/sounds/en/conf-userswilljoin.gsm
-share/asterisk/sounds/en/conf-userwilljoin.gsm
-share/asterisk/sounds/en/conf-waitforleader.gsm
-share/asterisk/sounds/en/core-sounds-en.txt
-share/asterisk/sounds/en/demo-abouttotry.gsm
-share/asterisk/sounds/en/demo-congrats.gsm
-share/asterisk/sounds/en/demo-echodone.gsm
-share/asterisk/sounds/en/demo-echotest.gsm
-share/asterisk/sounds/en/demo-enterkeywords.gsm
-share/asterisk/sounds/en/demo-instruct.gsm
-share/asterisk/sounds/en/demo-moreinfo.gsm
-share/asterisk/sounds/en/demo-nogo.gsm
-share/asterisk/sounds/en/demo-nomatch.gsm
-share/asterisk/sounds/en/demo-thanks.gsm

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

More information about the svn-ports-all mailing list