Index: net/asterisk/Makefile
===================================================================
--- net/asterisk/Makefile
+++ net/asterisk/Makefile
@@ -15,108 +15,142 @@
 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
+#LIB_DEPENDS=	libnewt.so:${PORTSDIR}/devel/newt \
 
 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 ncurses 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}"
+MAKE_ARGS+=	NOISY_BUILD=YES
 
 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 GSM H323 ICONV JABBER PGSQL LUA LDAP MYSQL \
+			MP3PLAYER NEWG711 ODBC OOH323 RADIUS SNMP SPANDSP SRTP SPEEX SQLITE \
+			SYSINFO VORBIS
+OPTIONS_DEFAULT=	BACKTRACE CURL FREETDS GSM H323 ICONV JABBER LUA 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
 
+OPTIONS_SUB=	yes
+
+BACKTRACE_DESC=	Stack backtrace support via (lib)execinfo
+DAHDI_DESC?=	DAHDI support
 EXCHANGE_DESC?=	Exchange calendar support
 NEWG711_DESC?=	New G711 Codec
-SRTP_DESC?=	SecureRTP support
 OOH323_DESC?=	ooh323 support
-DAHDI_DESC?=	DAHDI support
+SRTP_DESC?=	SecureRTP support
 SYSINFO_DESC?=	Use devel/libsysinfo to get system information
 
-OPTIONS_SUB=	yes
-H323_CONFIGURE_WITH=	h323
-H323_LIB_DEPENDS=	libpt_r.so:${PORTSDIR}/devel/pwlib \
-			libh323_r.so:${PORTSDIR}/net/openh323
+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
+
+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\.
Index: net/asterisk/pkg-plist
===================================================================
--- net/asterisk/pkg-plist
+++ net/asterisk/pkg-plist
@@ -450,11 +450,11 @@
 lib/asterisk/modules/func_dialgroup.so
 lib/asterisk/modules/func_dialplan.so
 lib/asterisk/modules/func_extstate.so
-lib/asterisk/modules/func_iconv.so
+%%ICONV%%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
+%%SPEEX%%lib/asterisk/modules/func_speex.so
 lib/asterisk/modules/func_sprintf.so
 lib/asterisk/modules/func_sysinfo.so
 lib/asterisk/modules/func_version.so
@@ -563,7 +563,7 @@
 %%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
+%%SPEEX%%lib/asterisk/modules/codec_speex.so
 lib/asterisk/modules/codec_ulaw.so
 lib/asterisk/modules/format_g723.so
 lib/asterisk/modules/format_g726.so