20 files changed, 1 insertions, 1155 deletions

diff --git a/MOVED b/MOVED
index 37504bde664e..e18d84db113c 100644
--- a/MOVED
+++ b/MOVED
@@ -9597,3 +9597,4 @@ x11/tkXwin||2017-10-16|Has expired: This port depends on Tcl/Tk 8.4 , which is n
 games/crafty-tablebase-pawn||2017-10-17|Waste of resources
 devel/p5-Log-Any-Adapter-Syslog|devel/p5-Log-Any|2017-10-19|Has expired: Merged with devel/p5-Log-Any
 lang/fpc-tcl||2017-10-20|Has expired: This port depends on Tcl/Tk 8.4 , which is no longer maintained. Please port it to 8.5+
+net/asterisk11|net/asterisk13|2017-10-28|Has expired: Asterisk 11.x will reach EOL on 2017-10-25. Please migrate to net/asterisk13
diff --git a/net/Makefile b/net/Makefile
index 7c4881c6dc2c..7750d3a0b4a2 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -28,7 +28,6 @@
     SUBDIR += aslookup
     SUBDIR += asterisk-chan_sccp
     SUBDIR += asterisk-g72x
-    SUBDIR += asterisk11
     SUBDIR += asterisk13
     SUBDIR += avahi
     SUBDIR += avahi-app
diff --git a/net/asterisk11/Makefile b/net/asterisk11/Makefile
deleted file mode 100644
index daab2a72bc25..000000000000
--- a/net/asterisk11/Makefile
+++ /dev/null
@@ -1,278 +0,0 @@
-# $FreeBSD$
-
-PORTNAME=	asterisk
-PORTVERSION=	11.25.3
-CATEGORIES=	net
-MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729
-MASTER_SITE_SUBDIR=	asterisk/ \
-			asterisk/old-releases/ \
-			sounds/releases/:g729
-PKGNAMESUFFIX=	11
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
-
-MAINTAINER=	madpilot@FreeBSD.org
-COMMENT=	Open Source PBX and telephony toolkit
-
-LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/LICENSE
-
-DEPRECATED=	Asterisk 11.x will reach EOL on 2017-10-25. Please migrate to net/asterisk13
-EXPIRATION_DATE=2017-10-25
-
-EXTRACT_ONLY:=	${DISTNAME}${EXTRACT_SUFX}
-
-BROKEN_armv6=		fails to configure: the SPANDSP installation appears to be missing or broken
-ONLY_FOR_ARCHS=		amd64 armv6 i386 powerpc sparc64
-
-USES=		bison cpe gmake iconv localbase ncurses shebangfix \
-		sqlite ssl
-USE_CSTD=	gnu89
-USE_GNOME=	libxml2
-USE_LDCONFIG=	yes
-USE_RC_SUBR=	asterisk
-
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--with-ilbc=internal \
-			--with-crypto=${OPENSSLBASE} \
-			--with-ssl=${OPENSSLBASE} \
-			--with-libedit=internal
-
-CPE_VENDOR=	digium
-
-SHEBANG_FILES=	agi/agi-test.agi \
-		agi/jukebox.agi
-
-MAKE_ENV=	PTHREAD_LIBS="-lpthread" \
-		MKDIR="${MKDIR}" \
-		PWLIBDIR=${LOCALBASE}/share/pwlib \
-		OSVERSION=${OSVERSION} \
-		DOCSDIR=${DOCSDIR} \
-		ASTCFLAGS="${CFLAGS}" \
-		ASTLDFLAGS="${LDFLAGS}"
-MAKE_ARGS+=	NOISY_BUILD=yes \
-		ASTDATADIR=${DATADIR}
-
-CONFLICTS_BUILD=	linuxthreads-* pjsip-*
-CONFLICTS_INSTALL=	asterisk*-13*
-
-OPTIONS_DEFINE=			BACKTRACE CURL EXCHANGE FREETDS LDAP LUA \
-				MP3PLAYER OOH323 OPTIMIZED_CFLAGS RADIUS SNMP SPANDSP SRTP \
-				SYSINFO UUID XMPP
-OPTIONS_DEFAULT=		BACKTRACE CURL FREETDS GSM LUA MP3PLAYER \
-				NEWT MYSQL ODBC PGSQL RADIUS SNMP SPANDSP SPEEX \
-				SQLITE2 UUID VORBIS
-
-OPTIONS_DEFINE_i386=		DAHDI
-OPTIONS_DEFINE_amd64=		DAHDI
-OPTIONS_DEFINE_sparc64=		DAHDI
-
-OPTIONS_DEFAULT_i386=		DAHDI GCC XMPP
-OPTIONS_DEFAULT_amd64=		DAHDI GCC XMPP
-OPTIONS_DEFAULT_sparc64=	DAHDI GCC XMPP
-OPTIONS_DEFAULT_powerpc=	GCC XMPP
-OPTIONS_DEFAULT_armv6=		BASE
-
-OPTIONS_GROUP=			CODECS
-OPTIONS_GROUP_CODECS=		GSM NEWG711 SPEEX VORBIS
-CODECS_DESC=			Encoder/Decoder (Codec) Support
-
-OPTIONS_SINGLE=			COMPILER
-OPTIONS_SINGLE_COMPILER=	BASE GCC
-COMPILER_DESC=			Compiler to use
-
-OPTIONS_GROUP+=			DATABASE
-OPTIONS_GROUP_DATABASE=		MYSQL ODBC PGSQL SQLITE2
-DATABASE_DESC=			Database Support
-
-OPTIONS_MULTI=			MENU
-OPTIONS_MULTI_MENU=		NCURSES NEWT
-MENU_DESC=			Menuselect Interface Backend
-NEWT_DESC=			Newt User Interface
-
-OPTIONS_GROUP+=			SOUNDS
-OPTIONS_GROUP_SOUNDS=		G729
-SOUNDS_DESC=			Core and Music-on-Hold (MoH) Sound Files
-ASTERISK_CORE_G729_SOUNDS=	asterisk-core-sounds-en-g729-1.5.tar.gz
-ASTERISK_MOH_G729_SOUNDS=	asterisk-moh-opsound-g729-2.03.tar.gz
-
-G729_DESC=			Install G.729 format sounds
-G729_DISTFILES=			${ASTERISK_CORE_G729_SOUNDS}:g729 \
-				${ASTERISK_MOH_G729_SOUNDS}:g729
-
-BACKTRACE_DESC= Stack backtrace support via (lib)execinfo
-BASE_DESC=	Use base compiler (experimental)
-DAHDI_DESC=	DAHDI support
-EXCHANGE_DESC=	Exchange calendar support
-MP3PLAYER_DESC=	Install MP3 Player for Music-On-Hold (mpg123)
-NEWG711_DESC=	New G711 codec
-OOH323_DESC=	ooh323 support
-SRTP_DESC=	SecureRTP support
-SYSINFO_DESC=	Use devel/libsysinfo to get system information
-UUID_DESC=	libuuid support (required for ICE and TURN in RTP)
-XMPP_DESC=	XMPP/GTALK support
-
-OPTIONS_SUB=		yes
-
-BACKTRACE_CONFIGURE_WITH=	execinfo
-
-CURL_CONFIGURE_ON=	--with-libcurl
-CURL_CONFIGURE_OFF=	--with-libcurl=no
-CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
-
-DAHDI_CONFIGURE_ON=	--with-dahdi --with-openr2
-DAHDI_CONFIGURE_OFF=	--without-dahdi --without-openr2
-DAHDI_LIB_DEPENDS=	libpri.so:misc/libpri \
-			libopenr2.so:misc/openr2 \
-			libtonezone.so:misc/dahdi
-
-EXCHANGE_CONFIGURE_OFF=	--without-neon --without-neon29
-EXCHANGE_LIB_DEPENDS=	libneon.so:www/neon
-
-FREETDS_CONFIGURE_ON=	--with-tds=${LOCALBASE}
-FREETDS_CONFIGURE_OFF=	--without-tds
-FREETDS_LIB_DEPENDS=	libsybdb.so:databases/freetds
-
-GCC_USE=		GCC=yes
-
-GSM_CONFIGURE_WITH=	gsm
-GSM_LIB_DEPENDS=	libgsm.so:audio/gsm
-
-LDAP_CONFIGURE_WITH=	ldap
-LDAP_USE=		OPENLDAP=yes
-
-LUA_CONFIGURE_WITH=	lua
-LUA_USES=		lua:51
-LUA_CFLAGS=		-I${LUA_INCDIR}
-LUA_LDFLAGS=		-L${LUA_LIBDIR}
-
-MYSQL_CONFIGURE_WITH=	mysqlclient
-MYSQL_USES=		mysql
-
-MP3PLAYER_RUN_DEPENDS=	mpg123:audio/mpg123
-
-NCURSES_USES=		ncurses
-NEWT_LIB_DEPENDS=	libnewt.so:devel/newt
-
-ODBC_CONFIGURE_WITH=	unixodbc
-ODBC_CONFIGURE_ON=	--with-ltdl
-ODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC \
-			libltdl.so:devel/libltdl
-
-OOH323_CPPFLAGS=	-I${LOCALBASE}/include/openh323
-OOH323_LIB_DEPENDS=	libpt_r.so:devel/pwlib \
-			libh323_r.so:net/openh323
-OOH323_MAKE_ENV=	OPENH323DIR=${LOCALBASE}/share/openh323
-
-PGSQL_CONFIGURE_WITH=	postgres
-PGSQL_USES=		pgsql
-
-RADIUS_CONFIGURE_WITH=	radius
-RADIUS_LIB_DEPENDS=	libradiusclient-ng.so:net/radiusclient
-
-SNMP_CONFIGURE_WITH=	netsnmp
-SNMP_LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
-
-SPANDSP_CONFIGURE_WITH=	spandsp
-SPANDSP_LIB_DEPENDS=	libspandsp.so:comms/spandsp
-
-SPEEX_CONFIGURE_WITH=	speex
-SPEEX_LIB_DEPENDS=	libspeex.so:audio/speex
-
-SQLITE2_CONFIGURE_WITH=	sqlite
-SQLITE2_LIB_DEPENDS=	libsqlite.so:databases/sqlite2
-
-SRTP_CONFIGURE_WITH=	srtp
-SRTP_BUILD_DEPENDS=	libsrtp>=1.4.4:net/libsrtp
-
-SYSINFO_LIB_DEPENDS=	libsysinfo.so:devel/libsysinfo
-
-UUID_LIB_DEPENDS=	libuuid.so:misc/e2fsprogs-libuuid
-UUID_CONFIGURE_ON=	--with-uuid=${LOCALBASE}
-UUID_CONFIGURE_OFF=	--disable-uuid
-UUID_CONFLICTS=		ossp-uuid-[0-9]*
-
-VORBIS_CONFIGURE_WITH=	ogg
-VORBIS_LIB_DEPENDS=	libvorbis.so:audio/libvorbis
-
-XMPP_CONFIGURE_WITH=	iksemel
-XMPP_LIB_DEPENDS=	libiksemel.so:textproc/iksemel
-
-ASTERISK_USER?=		asterisk
-ASTERISK_GROUP?=	asterisk
-
-USERS=	${ASTERISK_USER}
-GROUPS=	${ASTERISK_GROUP} dahdi
-
-.include <bsd.port.pre.mk>
-
-.if ${PREFIX} == ${LOCALBASE}
-VARDIR=/var
-.else
-VARDIR=${PREFIX}/var
-.endif
-
-SUB_LIST+=	ASTERISK_USER=${ASTERISK_USER}
-PLIST_SUB+=	ASTERISK_USER=${ASTERISK_USER} \
-		ASTERISK_GROUP=${ASTERISK_GROUP} \
-		VARDIR=${VARDIR}
-
-post-extract:
-	@${FIND} ${WRKSRC} -name '*.d' -delete
-
-post-extract-G729-on:
-	${CP} ${DISTDIR}/${ASTERISK_CORE_G729_SOUNDS} ${WRKSRC}/sounds
-	${CP} ${DISTDIR}/${ASTERISK_MOH_G729_SOUNDS} ${WRKSRC}/sounds
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|/var/lib|${PREFIX}/share|g' ${WRKSRC}/configs/musiconhold.conf.sample
-	@${REINPLACE_CMD} -e 's/-liconv/${ICONV_LIB}/' ${WRKSRC}/configure
-.if exists(${FILESDIR}/.asterisk.makeopts)
-	${CP} ${FILESDIR}/.asterisk.makeopts ${WRKSRC}/menuselect.makeopts
-.endif
-
-post-patch-SYSINFO-on:
-	@${REINPLACE_CMD} -e 's/%%LIBSYSINFO%%/-lsysinfo/' ${WRKSRC}/main/Makefile
-
-post-patch-SYSINFO-off:
-	@${REINPLACE_CMD} -e '/#define HAVE_SYSINFO 1/d' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e '/%%LIBSYSINFO%%/d' ${WRKSRC}/main/Makefile
-
-post-configure:
-	@cd ${WRKSRC} && ${MAKE_CMD} menuselect.makeopts
-	@cd ${WRKSRC} && ./menuselect/menuselect --disable res_timing_kqueue menuselect.makeopts
-	@cd ${WRKSRC} && ./menuselect/menuselect --enable chan_mgcp menuselect.makeopts
-	@cd ${WRKSRC} && ./menuselect/menuselect --enable res_pktccops menuselect.makeopts
-
-post-configure-MYSQL-on:
-	@cd ${WRKSRC} && ./menuselect/menuselect --enable res_config_mysql menuselect.makeopts
-	@cd ${WRKSRC} && ./menuselect/menuselect --enable app_mysql menuselect.makeopts
-	@cd ${WRKSRC} && ./menuselect/menuselect --enable cdr_mysql menuselect.makeopts
-
-post-configure-OOH323-on:
-	@cd ${WRKSRC} && ./menuselect/menuselect --enable chan_ooh323 menuselect.makeopts
-
-post-configure-NEWG711-on:
-	@cd ${WRKSRC} && ./menuselect/menuselect --enable G711_NEW_ALGORITHM menuselect.makeopts
-
-post-configure-OPTIMIZED_CFLAGS-off:
-	@cd ${WRKSRC} && ./menuselect/menuselect --disable BUILD_NATIVE menuselect.makeopts
-
-pre-build:
-	@${MKDIR} ${WRKSRC}/res/pjproject/pjnath/lib ${WRKSRC}/res/pjproject/pjlib-util/lib \
-		${WRKSRC}/res/pjproject/pjlib/lib
-
-post-install:
-	@${RM} ${STAGEDIR}${ETCDIR}/*.conf ${STAGEDIR}${ETCDIR}/extensions.ael ${STAGEDIR}${ETCDIR}/extensions.lua
-	${FIND} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/modules -type f -name '*.so' | ${SED} "s,^${STAGEDIR}${PREFIX}/,," >> ${TMPPLIST}
-	${FIND} ${STAGEDIR}${DATADIR}/sounds -type f | ${SED} "s,^${STAGEDIR}${DATADIR},${DATADIR}," >> ${TMPPLIST}
-	${FIND} ${STAGEDIR}${DATADIR}/moh -type f | ${SED} "s,^${STAGEDIR}${DATADIR},${DATADIR}," >> ${TMPPLIST}
-
-	(cd ${STAGEDIR} && \
-		${ECHO} "@owner ${ASTERISK_USER}" >> ${TMPPLIST} && \
-		${ECHO} "@group ${ASTERISK_GROUP}" >> ${TMPPLIST} && \
-		${FIND} var/spool/${PORTNAME}/voicemail/default -type f | ${SED} "s,^,/," >> ${TMPPLIST} && \
-		${FIND} var/spool/${PORTNAME}/voicemail/ -type d | ${SED} "s,^,@dir /," >> ${TMPPLIST} && \
-		${ECHO} "@owner" >> ${TMPPLIST} && \
-		${ECHO} "@group" >> ${TMPPLIST});
-
-.include <bsd.port.post.mk>
diff --git a/net/asterisk11/distinfo b/net/asterisk11/distinfo
deleted file mode 100644
index c88c5a4ac08e..000000000000
--- a/net/asterisk11/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-TIMESTAMP = 1505852140
-SHA256 (asterisk-11.25.3.tar.gz) = beb63953cb61b9822fc8f1d79842d821c5147f2a2944941d54a02f2e5fd4db20
-SIZE (asterisk-11.25.3.tar.gz) = 35134682
-SHA256 (asterisk-core-sounds-en-g729-1.5.tar.gz) = 8b28a59cfa53b59c76e0a191704f0708e3d83acffab8c5e6f25dfc599f0123f9
-SIZE (asterisk-core-sounds-en-g729-1.5.tar.gz) = 1551123
-SHA256 (asterisk-moh-opsound-g729-2.03.tar.gz) = 0147ca9a97f0c550227aacb7793499057c4d2c64e021c95f93722f27d5549585
-SIZE (asterisk-moh-opsound-g729-2.03.tar.gz) = 1103000
diff --git a/net/asterisk11/files/asterisk.in b/net/asterisk11/files/asterisk.in
deleted file mode 100644
index 54adef50c7e6..000000000000
--- a/net/asterisk11/files/asterisk.in
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: asterisk
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-#
-# Add the following lines to /etc/rc.conf to enable asterisk:
-#
-# asterisk_enable (bool):	Set it to "YES" to enable asterisk
-#				Default is "NO"
-# asterisk_user (string):	User asterisk runs as
-#				Default is %%ASTERISK_USER%%
-# asterisk_args (string):	Extra argumeents to pass to asterisk at startup
-# 				Default is "-n"
-# asterisk_pidfile (string):	Location of the asterisk pid file
-#				Default is /var/run/asterisk/asterisk.pid
-# asterisk_stopsleep (int):	Number of seconds to sleep before sending stop command
-#				Default is 0, which disables it
-#
-
-. /etc/rc.subr
-
-name=asterisk
-rcvar=asterisk_enable
-desc="Asterisk PBX server"
-
-load_rc_config $name
-
-: ${asterisk_enable:=NO}
-: ${asterisk_user:=%%ASTERISK_USER%%}
-: ${asterisk_args=-n}
-: ${asterisk_pidfile:=/var/run/asterisk/asterisk.pid}
-: ${asterisk_stopsleep:=0}
-
-extra_commands=reload
-
-start_precmd=asterisk_precmd
-stop_cmd=asterisk_stop
-reload_cmd=asterisk_reload
-
-command="%%PREFIX%%/sbin/asterisk"
-command_args="${asterisk_args} -F -U ${asterisk_user}"
-pidfile=${asterisk_pidfile}
-
-asterisk_precmd()
-{
-	local rundir=${asterisk_pidfile%/*}
-	if [ ! -d $rundir ] ; then
-		install -d -m 0755 -o asterisk -g asterisk $rundir
-	fi
-}
-
-asterisk_stop()
-{
-	if [ -z "$rc_pid" ]; then
-		[ -n "$rc_fast" ] && return 0
-		_run_rc_notrunning
-		return 1
-	fi
-	echo 'Stopping asterisk.'
-	if [ ${asterisk_stopsleep} > 0 ]; then
-		sleep ${asterisk_stopsleep}
-	fi
-	$command -nqrx 'core stop now'
-	wait_for_pids $rc_pid
-}
-
-asterisk_reload()
-{
-	if [ -z "$rc_pid" ]; then
-		_run_rc_notrunning
-		return 1
-	fi
-	echo 'Reloading asterisk.'
-	$command -nqrx 'reload'
-}
-
-run_rc_command "$1"
diff --git a/net/asterisk11/files/patch-Makefile b/net/asterisk11/files/patch-Makefile
deleted file mode 100644
index fcf836a2a627..000000000000
--- a/net/asterisk11/files/patch-Makefile
+++ /dev/null
@@ -1,137 +0,0 @@
---- Makefile.orig	2015-07-24 22:06:05 UTC
-+++ Makefile
-@@ -126,7 +126,7 @@ ASTTOPDIR:=$(subst $(space),\$(space),$(
- OVERWRITE=y
- 
- # Include debug and macro symbols in the executables (-g) and profiling info (-pg)
--DEBUG=-g3
-+#DEBUG=-g3
- 
- # Asterisk.conf is located in ASTETCDIR or by using the -C flag
- # when starting Asterisk
-@@ -209,7 +209,7 @@ endif
- 
- ifeq ($(OSARCH),FreeBSD)
-   # -V is understood by BSD Make, not by GNU make.
--  BSDVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk)
-+  BSDVERSION=$(OSVERSION)
-   _ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi)
-   # flag to tell 'ldconfig' to only process specified directories
-   LDCONFIG_FLAGS=-m
-@@ -466,8 +466,12 @@ datafiles: _all doc/core-en_US.xml
- 			$(INSTALL) -m 644 $$n "$(DESTDIR)$(ASTDATADIR)/static-http/docs" ; \
- 		done \
- 	fi
-+	if [ ! -d $(DESTDIR)$(DOCSDIR)/images ]; then \
-+		$(MKDIR) $(DESTDIR)$(DOCSDIR)/images; \
-+	fi
-+
- 	for x in images/*.jpg; do \
--		$(INSTALL) -m 644 $$x "$(DESTDIR)$(ASTDATADIR)/images" ; \
-+		$(INSTALL) -m 644 $$x "$(DESTDIR)$(DOCSDIR)/images" ; \
- 	done
- 	$(MAKE) -C sounds install
- 
-@@ -547,7 +551,7 @@ INSTALLDIRS="$(ASTLIBDIR)" "$(ASTMODDIR)
- 	"$(ASTDATADIR)/documentation/thirdparty" "$(ASTDATADIR)/firmware" \
- 	"$(ASTDATADIR)/firmware/iax" "$(ASTDATADIR)/images" "$(ASTDATADIR)/keys" \
- 	"$(ASTDATADIR)/phoneprov" "$(ASTDATADIR)/static-http" "$(ASTDATADIR)/sounds" \
--	"$(ASTDATADIR)/moh" "$(ASTMANDIR)/man8" "$(AGI_DIR)" "$(ASTDBDIR)"
-+	"$(ASTDATADIR)/moh" "$(ASTMANDIR)/man8" "$(AGI_DIR)" "$(ASTDBDIR)" "$(ASTSPOOLDIR)/outgoing"
- 
- installdirs:
- 	@for i in $(INSTALLDIRS); do \
-@@ -616,7 +620,7 @@ ifneq ($(filter ~%,$(DESTDIR)),)
- 	@exit 1
- endif
- 
--install: badshell bininstall datafiles
-+install: badshell bininstall datafiles samples
- 	@if [ -x /usr/sbin/asterisk-post-install ]; then \
- 		/usr/sbin/asterisk-post-install "$(DESTDIR)" . ; \
- 	fi
-@@ -625,21 +629,7 @@ install: badshell bininstall datafiles
- 	@echo " +    YOU MUST READ THE SECURITY DOCUMENT    +"
- 	@echo " +                                           +"
- 	@echo " + Asterisk has successfully been installed. +"
--	@echo " + If you would like to install the sample   +"
--	@echo " + configuration files (overwriting any      +"
--	@echo " + existing config files), run:              +"
- 	@echo " +                                           +"
--	@echo " +               $(mK) samples               +"
--	@echo " +                                           +"
--	@echo " +-----------------  or ---------------------+"
--	@echo " +                                           +"
--	@echo " + You can go ahead and install the asterisk +"
--	@echo " + program documentation now or later run:   +"
--	@echo " +                                           +"
--	@echo " +              $(mK) progdocs               +"
--	@echo " +                                           +"
--	@echo " + **Note** This requires that you have      +"
--	@echo " + doxygen installed on your local system    +"
- 	@echo " +-------------------------------------------+"
- 	@$(MAKE) -s oldmodcheck
- 
-@@ -658,45 +648,30 @@ adsi:
- 		else \
- 			echo "Installing $$x" ; \
- 		fi ; \
--		$(INSTALL) -m 644 "$$x" "$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`" ; \
-+		$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`.sample ; \
- 	done
- 
- samples: adsi
- 	@echo Installing other config files...
- 	@for x in configs/*.sample; do \
--		dst="$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`" ;	\
--		if [ -f "$${dst}" ]; then \
--			if [ "$(OVERWRITE)" = "y" ]; then \
--				if cmp -s "$${dst}" "$$x" ; then \
--					echo "Config file $$x is unchanged"; \
--					continue; \
--				fi ; \
--				mv -f "$${dst}" "$${dst}.old" ; \
--			else \
--				echo "Skipping config file $$x"; \
--				continue; \
--			fi ;\
--		fi ; \
- 		echo "Installing file $$x"; \
--		$(INSTALL) -m 644 "$$x" "$${dst}" ;\
-+		$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x` ;\
- 	done
--	if [ "$(OVERWRITE)" = "y" ]; then \
--		echo "Updating asterisk.conf" ; \
--		sed -e 's|^astetcdir.*$$|astetcdir => $(ASTETCDIR)|' \
--			-e 's|^astmoddir.*$$|astmoddir => $(ASTMODDIR)|' \
--			-e 's|^astvarlibdir.*$$|astvarlibdir => $(ASTVARLIBDIR)|' \
--			-e 's|^astdbdir.*$$|astdbdir => $(ASTDBDIR)|' \
--			-e 's|^astkeydir.*$$|astkeydir => $(ASTKEYDIR)|' \
--			-e 's|^astdatadir.*$$|astdatadir => $(ASTDATADIR)|' \
--			-e 's|^astagidir.*$$|astagidir => $(AGI_DIR)|' \
--			-e 's|^astspooldir.*$$|astspooldir => $(ASTSPOOLDIR)|' \
--			-e 's|^astrundir.*$$|astrundir => $(ASTVARRUNDIR)|' \
--			-e 's|^astlogdir.*$$|astlogdir => $(ASTLOGDIR)|' \
--			-e 's|^astsbindir.*$$|astsbindir => $(ASTSBINDIR)|' \
--			"$(DESTDIR)$(ASTCONFPATH)" > "$(DESTDIR)$(ASTCONFPATH).tmp" ; \
--		$(INSTALL) -m 644 "$(DESTDIR)$(ASTCONFPATH).tmp" "$(DESTDIR)$(ASTCONFPATH)" ; \
--		rm -f "$(DESTDIR)$(ASTCONFPATH).tmp" ; \
--	fi ; \
-+	echo "Updating asterisk.conf" ; \
-+	sed -e 's|^astetcdir.*$$|astetcdir => $(ASTETCDIR)|' \
-+		-e 's|^astmoddir.*$$|astmoddir => $(ASTMODDIR)|' \
-+		-e 's|^astvarlibdir.*$$|astvarlibdir => $(ASTVARLIBDIR)|' \
-+		-e 's|^astdbdir.*$$|astdbdir => $(ASTDBDIR)|' \
-+		-e 's|^astkeydir.*$$|astkeydir => $(ASTKEYDIR)|' \
-+		-e 's|^astdatadir.*$$|astdatadir => $(ASTDATADIR)|' \
-+		-e 's|^astagidir.*$$|astagidir => $(AGI_DIR)|' \
-+		-e 's|^astspooldir.*$$|astspooldir => $(ASTSPOOLDIR)|' \
-+		-e 's|^astrundir.*$$|astrundir => $(ASTVARRUNDIR)|' \
-+		-e 's|^astlogdir.*$$|astlogdir => $(ASTLOGDIR)|' \
-+		-e 's|^astsbindir.*$$|astsbindir => $(ASTSBINDIR)|' \
-+		"$(DESTDIR)$(ASTCONFPATH).sample" > "$(DESTDIR)$(ASTCONFPATH).tmp" ; \
-+	$(INSTALL) -m 644 "$(DESTDIR)$(ASTCONFPATH).tmp" "$(DESTDIR)$(ASTCONFPATH).sample" ; \
-+	rm -f "$(DESTDIR)$(ASTCONFPATH).tmp" ; \
- 	$(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX"
- 	build_tools/make_sample_voicemail "$(DESTDIR)/$(ASTDATADIR)" "$(DESTDIR)/$(ASTSPOOLDIR)"
- 
diff --git a/net/asterisk11/files/patch-agi__Makefile b/net/asterisk11/files/patch-agi__Makefile
deleted file mode 100644
index 8137c4f54741..000000000000
--- a/net/asterisk11/files/patch-agi__Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
---- agi/Makefile.orig	2015-07-24 22:06:05 UTC
-+++ agi/Makefile
-@@ -16,7 +16,9 @@ ASTTOPDIR?=..
- 
- .PHONY: clean all uninstall
- 
--AGIS=$(MENUSELECT_AGIS)
-+AGIS_BIN=eagi-test eagi-sphinx-test
-+AGIS_SCR=agi-test.agi jukebox.agi
-+AGIS=$(AGIS_SCR) $(AGIS_BIN)
- 
- ifeq ($(OSARCH),SunOS)
-   LIBS+=-lsocket -lnsl
diff --git a/net/asterisk11/files/patch-channels-chan_dahdi.c b/net/asterisk11/files/patch-channels-chan_dahdi.c
deleted file mode 100644
index 1aa9540d67f2..000000000000
--- a/net/asterisk11/files/patch-channels-chan_dahdi.c
+++ /dev/null
@@ -1,33 +0,0 @@
---- channels/chan_dahdi.c.orig	2015-07-24 22:06:05 UTC
-+++ channels/chan_dahdi.c
-@@ -5030,6 +5030,8 @@ static void dahdi_enable_ec(struct dahdi
- 		return;
- 	}
- 	if (p->echocancel.head.tap_length) {
-+		struct dahdi_echocanparams *pecp;
-+
- #if defined(HAVE_PRI) || defined(HAVE_SS7)
- 		switch (p->sig) {
- #if defined(HAVE_PRI)
-@@ -5060,7 +5062,9 @@ static void dahdi_enable_ec(struct dahdi
- 			break;
- 		}
- #endif	/* defined(HAVE_PRI) || defined(HAVE_SS7) */
--		res = ioctl(p->subs[SUB_REAL].dfd, DAHDI_ECHOCANCEL_PARAMS, &p->echocancel);
-+
-+		pecp = &p->echocancel.head;
-+		res = ioctl(p->subs[SUB_REAL].dfd, DAHDI_ECHOCANCEL_PARAMS, &pecp);
- 		if (res) {
- 			ast_log(LOG_WARNING, "Unable to enable echo cancellation on channel %d (%s)\n", p->channel, strerror(errno));
- 		} else {
-@@ -5094,8 +5098,9 @@ static void dahdi_disable_ec(struct dahd
- 
- 	if (p->echocanon) {
- 		struct dahdi_echocanparams ecp = { .tap_length = 0 };
-+		struct dahdi_echocanparams *pecp = &ecp;
- 
--		res = ioctl(p->subs[SUB_REAL].dfd, DAHDI_ECHOCANCEL_PARAMS, &ecp);
-+		res = ioctl(p->subs[SUB_REAL].dfd, DAHDI_ECHOCANCEL_PARAMS, &pecp);
- 
- 		if (res)
- 			ast_log(LOG_WARNING, "Unable to disable echo cancellation on channel %d: %s\n", p->channel, strerror(errno));
diff --git a/net/asterisk11/files/patch-channels__Makefile b/net/asterisk11/files/patch-channels__Makefile
deleted file mode 100644
index 200a97166e86..000000000000
--- a/net/asterisk11/files/patch-channels__Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
---- channels/Makefile.orig	2015-07-24 22:06:05 UTC
-+++ channels/Makefile
-@@ -27,9 +27,10 @@ ifeq ($(OSARCH),linux-gnu)
- endif
- 
- ifeq ($(OSARCH),FreeBSD)
--  PTLIB=-lpt_FreeBSD_x86_r
--  H323LIB=-lh323_FreeBSD_x86_r
-+  PTLIB=-lpt_r
-+  H323LIB=-lh323_r
-   CHANH323LIB=-pthread
-+  H323LDLIBS=$(PTLIB) $(H323LIB) $(CHANH323LIB)
- endif
- 
- ifeq ($(OSARCH),NetBSD)
-@@ -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] $^ -> $@"
-+ifeq ($(OSARCH),FreeBSD)
-+	$(CMD_PREFIX) $(CXX) $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK) -L$(LOCALBASE)/lib $(H323LDFLAGS) -o $@ $< h323/libchanh323.a $(H323LDLIBS) $(CHANH323LIB)
-+else
- 	$(CMD_PREFIX) $(CXX) $(PTHREAD_CFLAGS) $(_ASTLDFLAGS) $(ASTLDFLAGS) $(SOLINK) -o $@ $< h323/libchanh323.a $(CHANH323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -L$(OPENH323DIR)/lib $(H323LIB) -L/usr/lib -lcrypto -lssl -lexpat
- endif
- endif
-+endif
- 
- chan_misdn.o: _ASTCFLAGS+=-Imisdn
- 
diff --git a/net/asterisk11/files/patch-channels__sip__include__sip.h b/net/asterisk11/files/patch-channels__sip__include__sip.h
deleted file mode 100644
index 0158fd5f0a5e..000000000000
--- a/net/asterisk11/files/patch-channels__sip__include__sip.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- channels/sip/include/sip.h.orig	2015-07-24 22:06:05 UTC
-+++ channels/sip/include/sip.h
-@@ -190,7 +190,7 @@
- #define DEFAULT_MOHINTERPRET   "default"  /*!< The default music class */
- #define DEFAULT_MOHSUGGEST     ""
- #define DEFAULT_VMEXTEN        "asterisk" /*!< Default voicemail extension */
--#define DEFAULT_CALLERID       "asterisk" /*!< Default caller ID */
-+#define DEFAULT_CALLERID       "Unknown" /*!< Default caller ID */
- #define DEFAULT_MWI_FROM       ""
- #define DEFAULT_NOTIFYMIME     "application/simple-message-summary"
- #define DEFAULT_ALLOWGUEST     TRUE
diff --git a/net/asterisk11/files/patch-channels_h323_Makefile.in b/net/asterisk11/files/patch-channels_h323_Makefile.in
deleted file mode 100644
index 1c8a5fae138e..000000000000
--- a/net/asterisk11/files/patch-channels_h323_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- channels/h323/Makefile.in.orig	2015-07-24 22:06:05 UTC
-+++ channels/h323/Makefile.in
-@@ -13,7 +13,7 @@ STDCCFLAGS	= -DNDEBUG
- STDCCFLAGS	+= -I../../include -include ../../include/asterisk/autoconfig.h
- STDCCFLAGS	+= -fPIC
- #OPTCCFLAGS	+=
--CFLAGS		= -pipe
-+CFLAGS		= -pipe @CXXFLAGS@
- TARGET		= libchanh323.a
- TARGET		+= Makefile.ast
- SOURCES		= ast_h323.cxx compat_h323.cxx cisco-h225.cxx caps_h323.cxx
diff --git a/net/asterisk11/files/patch-configure b/net/asterisk11/files/patch-configure
deleted file mode 100644
index 488b0015a3a1..000000000000
--- a/net/asterisk11/files/patch-configure
+++ /dev/null
@@ -1,119 +0,0 @@
---- configure.orig	2015-07-24 22:06:05 UTC
-+++ configure
-@@ -4619,9 +4619,9 @@ astheaderdir='${includedir}/asterisk'
- astlibdir='${libdir}'
- astmoddir='${libdir}/asterisk/modules'
- astmandir='${mandir}'
--astvarlibdir='${localstatedir}/lib/asterisk'
-+astvarlibdir='${prefix}/share/asterisk'
- astdatadir='${astvarlibdir}'
--astdbdir='${astvarlibdir}'
-+astdbdir='${localstatedir}/db/asterisk'
- astkeydir='${astvarlibdir}'
- astspooldir='${localstatedir}/spool/asterisk'
- astlogdir='${localstatedir}/log/asterisk'
-@@ -4644,8 +4644,6 @@ esac
- case "${host_os}" in
-      freebsd*)
-      ac_default_prefix=/usr/local
--     CPPFLAGS=-I/usr/local/include
--     LDFLAGS=-L/usr/local/lib
-      ;;
-      openbsd*)
-      ac_default_prefix=/usr/local
-@@ -18202,6 +18200,8 @@ $as_echo_n "checking if \"struct ifaddrs
- 
- 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
-+ #include <sys/types.h>
-+ #include <sys/socket.h>
-  #include <ifaddrs.h>
- int
- main ()
-@@ -26503,7 +26503,7 @@ $as_echo "${OPENH323_BUILD}" >&6; }
- 
- 	fi
- 
--	PLATFORM_OPENH323="h323_${PWLIB_PLATFORM}_${OPENH323_SUFFIX}"
-+	PLATFORM_OPENH323="h323_${OPENH323_SUFFIX}"
- 
- 	if test "${HAS_OPENH323:-unset}" != "unset"; then
- 	   { $as_echo "$as_me:${as_lineno-$LINENO}: checking OpenH323 installation validity" >&5
-@@ -26601,13 +26601,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`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -llua5.2" >&5
--$as_echo_n "checking for ${pbxfuncname} in -llua5.2... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -llua-5.2" >&5
-+$as_echo_n "checking for ${pbxfuncname} in -llua-5.2... " >&6; }
- if eval \${$as_ac_Lib+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-llua5.2 ${pbxlibdir} -lm $LIBS"
-+LIBS="-llua-5.2 ${pbxlibdir} -lm $LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
-@@ -26649,18 +26649,18 @@ fi
- 
-    # now check for the header.
-    if test "${AST_LUA_FOUND}" = "yes"; then
--      LUA_LIB="${pbxlibdir} -llua5.2 -lm"
-+      LUA_LIB="${pbxlibdir} -llua-5.2 -lm"
-       # if --with-LUA=DIR has been specified, use it.
-       if test "x${LUA_DIR}" != "x"; then
-          LUA_INCLUDE="-I${LUA_DIR}/include"
-       fi
-       LUA_INCLUDE="${LUA_INCLUDE} "
--      if test "xlua5.2/lua.h" = "x" ; then	# no header, assume found
-+      if test "xlua52/lua.h" = "x" ; then	# no header, assume found
-          LUA_HEADER_FOUND="1"
-       else				# check for the header
-          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
-          CPPFLAGS="${CPPFLAGS} ${LUA_INCLUDE}"
--         ac_fn_c_check_header_mongrel "$LINENO" "lua5.2/lua.h" "ac_cv_header_lua5_2_lua_h" "$ac_includes_default"
-+         ac_fn_c_check_header_mongrel "$LINENO" "lua52/lua.h" "ac_cv_header_lua5_2_lua_h" "$ac_includes_default"
- if test "x$ac_cv_header_lua5_2_lua_h" = xyes; then :
-   LUA_HEADER_FOUND=1
- else
-@@ -26713,13 +26713,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`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -llua5.1" >&5
--$as_echo_n "checking for ${pbxfuncname} in -llua5.1... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -llua-5.1" >&5
-+$as_echo_n "checking for ${pbxfuncname} in -llua-5.1... " >&6; }
- if eval \${$as_ac_Lib+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-llua5.1 ${pbxlibdir} -lm $LIBS"
-+LIBS="-llua-5.1 ${pbxlibdir} -lm $LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
-@@ -26761,18 +26761,18 @@ fi
- 
-    # now check for the header.
-    if test "${AST_LUA_FOUND}" = "yes"; then
--      LUA_LIB="${pbxlibdir} -llua5.1 -lm"
-+      LUA_LIB="${pbxlibdir} -llua-5.1 -lm"
-       # if --with-LUA=DIR has been specified, use it.
-       if test "x${LUA_DIR}" != "x"; then
-          LUA_INCLUDE="-I${LUA_DIR}/include"
-       fi
-       LUA_INCLUDE="${LUA_INCLUDE} "
--      if test "xlua5.1/lua.h" = "x" ; then	# no header, assume found
-+      if test "xlua51/lua.h" = "x" ; then	# no header, assume found
-          LUA_HEADER_FOUND="1"
-       else				# check for the header
-          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
-          CPPFLAGS="${CPPFLAGS} ${LUA_INCLUDE}"
--         ac_fn_c_check_header_mongrel "$LINENO" "lua5.1/lua.h" "ac_cv_header_lua5_1_lua_h" "$ac_includes_default"
-+         ac_fn_c_check_header_mongrel "$LINENO" "lua51/lua.h" "ac_cv_header_lua5_1_lua_h" "$ac_includes_default"
- if test "x$ac_cv_header_lua5_1_lua_h" = xyes; then :
-   LUA_HEADER_FOUND=1
- else
diff --git a/net/asterisk11/files/patch-main__Makefile b/net/asterisk11/files/patch-main__Makefile
deleted file mode 100644
index a0e3ebc7cf42..000000000000
--- a/net/asterisk11/files/patch-main__Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
---- main/Makefile.orig	2015-03-12 12:26:57 UTC
-+++ main/Makefile
-@@ -76,6 +76,7 @@ ifeq ($(OSARCH),FreeBSD)
-   BSDVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk)
-   AST_LIBS+=$(shell if test $(BSDVERSION) -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi)
-   AST_LIBS+=-lcrypto
-+  AST_LIBS+=%%LIBSYSINFO%%
- endif
- 
- ifneq ($(findstring $(OSARCH), mingw32 cygwin ),)
-@@ -218,9 +219,9 @@ ifeq ($(GNU_LD),1)
- endif
- 	$(ECHO_PREFIX) echo "   [LD] $^ -> $@"
- 	$(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(CC_LDFLAGS_SO) $^ $(CC_LIBS)
--ifneq ($(LDCONFIG),)
--	$(LDCONFIG) $(LDCONFIG_FLAGS) .
--endif
-+#ifneq ($(LDCONFIG),)
-+#	$(LDCONFIG) $(LDCONFIG_FLAGS) .
-+#endif
- 
- $(ASTSSL_LIB): $(ASTSSL_LIB).$(ASTSSL_SO_VERSION)
- 	$(LN) -sf $< $@
-@@ -269,9 +270,9 @@ ifeq ($(findstring darwin,$(OSARCH)),) #
- else # Darwin
- 	$(INSTALL) -m 755 $(ASTSSL_LIB) "$(DESTDIR)$(ASTLIBDIR)/"
- endif
--ifneq ($(LDCONFIG),)
--	$(LDCONFIG) $(LDCONFIG_FLAGS) "$(DESTDIR)$(ASTLIBDIR)/"
--endif
-+#ifneq ($(LDCONFIG),)
-+#	$(LDCONFIG) $(LDCONFIG_FLAGS) "$(DESTDIR)$(ASTLIBDIR)/"
-+#endif
- endif
- 	$(LN) -sf asterisk "$(DESTDIR)$(ASTSBINDIR)/rasterisk"
- 
diff --git a/net/asterisk11/files/patch-main__asterisk.exports.in b/net/asterisk11/files/patch-main__asterisk.exports.in
deleted file mode 100644
index 0d112c2f6d08..000000000000
--- a/net/asterisk11/files/patch-main__asterisk.exports.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- main/asterisk.exports.in.orig	2015-07-24 22:06:05 UTC
-+++ main/asterisk.exports.in
-@@ -65,6 +65,8 @@
- 
- 		*/
- 		LINKER_SYMBOL_PREFIX_IO_stdin_used;
-+		LINKER_SYMBOL_PREFIX__progname;
-+		LINKER_SYMBOL_PREFIXenviron;
- 	local:
- 		*;
- };
diff --git a/net/asterisk11/files/patch-main__http.c b/net/asterisk11/files/patch-main__http.c
deleted file mode 100644
index df838e5b74e6..000000000000
--- a/net/asterisk11/files/patch-main__http.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- main/http.c.orig	2015-07-24 22:06:05 UTC
-+++ main/http.c
-@@ -1072,7 +1072,7 @@ static int __ast_http_load(int reload)
- 	struct http_uri_redirect *redirect;
- 	struct ast_flags config_flags = { reload ? CONFIG_FLAG_FILEUNCHANGED : 0 };
- 	uint32_t bindport = DEFAULT_PORT;
--	RAII_VAR(struct ast_sockaddr *, addrs, NULL, ast_free);
-+	struct ast_sockaddr *addrs = NULL;
- 	int num_addrs = 0;
- 	int http_tls_was_enabled = 0;
- 
diff --git a/net/asterisk11/files/patch-main__lock.c b/net/asterisk11/files/patch-main__lock.c
deleted file mode 100644
index 3621177e74ba..000000000000
--- a/net/asterisk11/files/patch-main__lock.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- main/lock.c.orig	2014-12-12 23:31:38 UTC
-+++ main/lock.c
-@@ -701,9 +701,6 @@ int __ast_rwlock_init(int tracking, cons
- #endif /* DEBUG_THREADS */
- 
- 	pthread_rwlockattr_init(&attr);
--#ifdef HAVE_PTHREAD_RWLOCK_PREFER_WRITER_NP
--	pthread_rwlockattr_setkind_np(&attr, PTHREAD_RWLOCK_PREFER_WRITER_NP);
--#endif
- 	res = pthread_rwlock_init(&t->lock, &attr);
- 	pthread_rwlockattr_destroy(&attr);
- 
diff --git a/net/asterisk11/files/patch-res_Makefile b/net/asterisk11/files/patch-res_Makefile
deleted file mode 100644
index 96ef8d728d3c..000000000000
--- a/net/asterisk11/files/patch-res_Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- res/Makefile.orig	2015-06-04 00:44:42 UTC
-+++ res/Makefile
-@@ -78,7 +78,7 @@ distclean::
- 	rm -f pjproject/build.mak
- 
- pjproject/build.mak: pjproject/aconfigure
--	(cd pjproject && CFLAGS="-fPIC" ./configure --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --disable-floating-point --disable-sound --disable-oss --disable-speex-aec --disable-l16-codec --disable-gsm-codec --disable-g722-codec --disable-g7221-codec --disable-speex-codec --disable-ilbc-codec --disable-g711-codec)
-+	(cd pjproject && CFLAGS="-fPIC" ./configure --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --disable-floating-point --disable-sound --disable-oss --disable-speex-aec --disable-l16-codec --disable-gsm-codec --disable-g722-codec --disable-g7221-codec --disable-speex-codec --disable-ilbc-codec --disable-g711-codec --disable-ffmpeg --disable-v4l2)
- 
- ifneq ($(findstring $(MAKECMDGOALS),all),)
- -include pjproject/build.mak
diff --git a/net/asterisk11/pkg-descr b/net/asterisk11/pkg-descr
deleted file mode 100644
index 74a40a9455fc..000000000000
--- a/net/asterisk11/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-Asterisk is an Open Source PBX and telephony toolkit.  It is, in a
-sense, middleware between Internet and telephony channels on the bottom,
-and Internet and telephony applications at the top.
-
-WWW: http://www.asterisk.org
diff --git a/net/asterisk11/pkg-message b/net/asterisk11/pkg-message
deleted file mode 100644
index 08d8de995d68..000000000000
--- a/net/asterisk11/pkg-message
+++ /dev/null
@@ -1,36 +0,0 @@
-###########################################################################
-
-  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
-
-################################################################################
diff --git a/net/asterisk11/pkg-plist b/net/asterisk11/pkg-plist
deleted file mode 100644
index 9f8130357c03..000000000000
--- a/net/asterisk11/pkg-plist
+++ /dev/null
@@ -1,313 +0,0 @@
-@sample %%ETCDIR%%/acl.conf.sample
-@sample %%ETCDIR%%/cdr_adaptive_odbc.conf.sample
-@sample %%ETCDIR%%/cdr_sqlite3_custom.conf.sample
-@sample %%ETCDIR%%/cdr_syslog.conf.sample
-@sample %%ETCDIR%%/cli.conf.sample
-@sample %%ETCDIR%%/cli_aliases.conf.sample
-@sample %%ETCDIR%%/cli_permissions.conf.sample
-@sample %%ETCDIR%%/confbridge.conf.sample
-@sample %%ETCDIR%%/config_test.conf.sample
-@sample %%ETCDIR%%/console.conf.sample
-@sample %%ETCDIR%%/dbsep.conf.sample
-@sample %%ETCDIR%%/dsp.conf.sample
-@sample %%ETCDIR%%/extensions.lua.sample
-@sample %%ETCDIR%%/extensions_minivm.conf.sample
-@sample %%ETCDIR%%/jingle.conf.sample
-@sample %%ETCDIR%%/minivm.conf.sample
-@sample %%ETCDIR%%/motif.conf.sample
-@sample %%ETCDIR%%/ooh323.conf.sample
-@sample %%ETCDIR%%/phoneprov.conf.sample
-@sample %%ETCDIR%%/queuerules.conf.sample
-@sample %%ETCDIR%%/res_ldap.conf.sample
-@sample %%ETCDIR%%/unistim.conf.sample
-@sample %%ETCDIR%%/adsi.conf.sample
-@sample %%ETCDIR%%/agents.conf.sample
-@sample %%ETCDIR%%/alarmreceiver.conf.sample
-@sample %%ETCDIR%%/alsa.conf.sample
-@sample %%ETCDIR%%/asterisk.adsi.sample
-@sample %%ETCDIR%%/asterisk.conf.sample
-@sample %%ETCDIR%%/calendar.conf.sample
-@sample %%ETCDIR%%/ccss.conf.sample
-@sample %%ETCDIR%%/cdr.conf.sample
-@sample %%ETCDIR%%/cdr_custom.conf.sample
-@sample %%ETCDIR%%/cdr_manager.conf.sample
-@sample %%ETCDIR%%/cdr_mysql.conf.sample
-@sample %%ETCDIR%%/cdr_odbc.conf.sample
-@sample %%ETCDIR%%/cdr_pgsql.conf.sample
-@sample %%ETCDIR%%/cdr_tds.conf.sample
-@sample %%ETCDIR%%/cel.conf.sample
-@sample %%ETCDIR%%/cel_custom.conf.sample
-@sample %%ETCDIR%%/cel_odbc.conf.sample
-@sample %%ETCDIR%%/cel_pgsql.conf.sample
-@sample %%ETCDIR%%/cel_sqlite3_custom.conf.sample
-@sample %%ETCDIR%%/cel_tds.conf.sample
-@sample %%ETCDIR%%/codecs.conf.sample
-@sample %%ETCDIR%%/dnsmgr.conf.sample
-@sample %%ETCDIR%%/dundi.conf.sample
-@sample %%ETCDIR%%/enum.conf.sample
-@sample %%ETCDIR%%/extconfig.conf.sample
-@sample %%ETCDIR%%/extensions.ael.sample
-@sample %%ETCDIR%%/extensions.conf.sample
-@sample %%ETCDIR%%/features.conf.sample
-@sample %%ETCDIR%%/festival.conf.sample
-@sample %%ETCDIR%%/iax.conf.sample
-@sample %%ETCDIR%%/iaxprov.conf.sample
-@sample %%ETCDIR%%/indications.conf.sample
-@sample %%ETCDIR%%/logger.conf.sample
-@sample %%ETCDIR%%/manager.conf.sample
-@sample %%ETCDIR%%/meetme.conf.sample
-@sample %%ETCDIR%%/mgcp.conf.sample
-@sample %%ETCDIR%%/misdn.conf.sample
-@sample %%ETCDIR%%/modules.conf.sample
-@sample %%ETCDIR%%/musiconhold.conf.sample
-@sample %%ETCDIR%%/osp.conf.sample
-@sample %%ETCDIR%%/oss.conf.sample
-@sample %%ETCDIR%%/phone.conf.sample
-@sample %%ETCDIR%%/queues.conf.sample
-@sample %%ETCDIR%%/res_config_mysql.conf.sample
-@sample %%ETCDIR%%/res_config_sqlite3.conf.sample
-@sample %%ETCDIR%%/res_corosync.conf.sample
-@sample %%ETCDIR%%/res_pgsql.conf.sample
-@sample %%ETCDIR%%/res_pktccops.conf.sample
-@sample %%ETCDIR%%/res_odbc.conf.sample
-@sample %%ETCDIR%%/rtp.conf.sample
-@sample %%ETCDIR%%/sip.conf.sample
-@sample %%ETCDIR%%/sip_notify.conf.sample
-@sample %%ETCDIR%%/skinny.conf.sample
-@sample %%ETCDIR%%/telcordia-1.adsi.sample
-@sample %%ETCDIR%%/voicemail.conf.sample
-@sample %%ETCDIR%%/vpb.conf.sample
-@sample %%ETCDIR%%/chan_dahdi.conf.sample
-@sample %%ETCDIR%%/chan_mobile.conf.sample
-@sample %%ETCDIR%%/udptl.conf.sample
-@sample %%ETCDIR%%/users.conf.sample
-@sample %%ETCDIR%%/smdi.conf.sample
-@sample %%ETCDIR%%/sla.conf.sample
-@sample %%ETCDIR%%/say.conf.sample
-@sample %%ETCDIR%%/res_snmp.conf.sample
-@sample %%ETCDIR%%/res_stun_monitor.conf.sample
-@sample %%ETCDIR%%/muted.conf.sample
-@sample %%ETCDIR%%/jabber.conf.sample
-@sample %%ETCDIR%%/http.conf.sample
-@sample %%ETCDIR%%/h323.conf.sample
-@sample %%ETCDIR%%/gtalk.conf.sample
-@sample %%ETCDIR%%/func_odbc.conf.sample
-@sample %%ETCDIR%%/followme.conf.sample
-@sample %%ETCDIR%%/amd.conf.sample
-@sample %%ETCDIR%%/app_skel.conf.sample
-@sample %%ETCDIR%%/app_mysql.conf.sample
-@sample %%ETCDIR%%/res_config_sqlite.conf.sample
-@sample %%ETCDIR%%/res_curl.conf.sample
-@sample %%ETCDIR%%/res_fax.conf.sample
-@sample %%ETCDIR%%/xmpp.conf.sample
-include/asterisk/doxygen/architecture.h
-include/asterisk/doxygen/asterisk-git-howto.h
-include/asterisk/doxygen/commits.h
-include/asterisk/doxygen/licensing.h
-include/asterisk/doxygen/mantisworkflow.h
-include/asterisk/doxygen/releases.h
-include/asterisk/doxygen/reviewboard.h
-include/asterisk/_private.h
-include/asterisk/aoc.h
-include/asterisk/ast_version.h
-include/asterisk/autochan.h
-include/asterisk/calendar.h
-include/asterisk/ccss.h
-include/asterisk/cel.h
-include/asterisk/celt.h
-include/asterisk/channel_internal.h
-include/asterisk/channelstate.h
-include/asterisk/config_options.h
-include/asterisk/data.h
-include/asterisk/event.h
-include/asterisk/event_defs.h
-include/asterisk/extconf.h
-include/asterisk/frame_defs.h
-include/asterisk/framehook.h
-include/asterisk/format.h
-include/asterisk/format_cap.h
-include/asterisk/format_pref.h
-include/asterisk/fskmodem_float.h
-include/asterisk/fskmodem_int.h
-include/asterisk/hashtab.h
-include/asterisk/http_websocket.h
-include/asterisk/message.h
-include/asterisk/mod_format.h
-include/asterisk/netsock2.h
-include/asterisk/network.h
-include/asterisk/optional_api.h
-include/asterisk/pktccops.h
-include/asterisk/presencestate.h
-include/asterisk/pval.h
-include/asterisk/res_fax.h
-include/asterisk/res_srtp.h
-include/asterisk/rtp_engine.h
-include/asterisk/select.h
-include/asterisk/security_events.h
-include/asterisk/security_events_defs.h
-include/asterisk/silk.h
-include/asterisk/sip_api.h
-include/asterisk/stun.h
-include/asterisk/syslog.h
-include/asterisk/tcptls.h
-include/asterisk.h
-include/asterisk/abstract_jb.h
-include/asterisk/acl.h
-include/asterisk/adsi.h
-include/asterisk/ael_structs.h
-include/asterisk/agi.h
-include/asterisk/alaw.h
-include/asterisk/app.h
-include/asterisk/ast_expr.h
-include/asterisk/astdb.h
-include/asterisk/astmm.h
-include/asterisk/astobj.h
-include/asterisk/astobj2.h
-include/asterisk/astosp.h
-include/asterisk/audiohook.h
-include/asterisk/autoconfig.h
-include/asterisk/bridging.h
-include/asterisk/bridging_features.h
-include/asterisk/bridging_technology.h
-include/asterisk/build.h
-include/asterisk/buildinfo.h
-include/asterisk/buildopts.h
-include/asterisk/callerid.h
-include/asterisk/causes.h
-include/asterisk/cdr.h
-include/asterisk/channel.h
-include/asterisk/chanvars.h
-include/asterisk/cli.h
-include/asterisk/compat.h
-include/asterisk/compiler.h
-include/asterisk/config.h
-include/asterisk/crypto.h
-include/asterisk/datastore.h
-include/asterisk/devicestate.h
-include/asterisk/dial.h
-include/asterisk/dlinkedlists.h
-include/asterisk/dns.h
-include/asterisk/dnsmgr.h
-include/asterisk/doxyref.h
-include/asterisk/dsp.h
-include/asterisk/dundi.h
-include/asterisk/endian.h
-include/asterisk/enum.h
-include/asterisk/features.h
-include/asterisk/file.h
-include/asterisk/frame.h
-include/asterisk/fskmodem.h
-include/asterisk/global_datastores.h
-include/asterisk/heap.h
-include/asterisk/http.h
-include/asterisk/image.h
-include/asterisk/indications.h
-include/asterisk/inline_api.h
-include/asterisk/io.h
-include/asterisk/jabber.h
-include/asterisk/jingle.h
-include/asterisk/linkedlists.h
-include/asterisk/localtime.h
-include/asterisk/lock.h
-include/asterisk/logger.h
-include/asterisk/manager.h
-include/asterisk/md5.h
-include/asterisk/module.h
-include/asterisk/monitor.h
-include/asterisk/musiconhold.h
-include/asterisk/netsock.h
-include/asterisk/options.h
-include/asterisk/paths.h
-include/asterisk/pbx.h
-include/asterisk/plc.h
-include/asterisk/poll-compat.h
-include/asterisk/privacy.h
-include/asterisk/res_odbc.h
-include/asterisk/say.h
-include/asterisk/sched.h
-include/asterisk/sha1.h
-include/asterisk/slin.h
-include/asterisk/slinfactory.h
-include/asterisk/smdi.h
-include/asterisk/speech.h
-include/asterisk/srv.h
-include/asterisk/stringfields.h
-include/asterisk/strings.h
-include/asterisk/taskprocessor.h
-include/asterisk/tdd.h
-include/asterisk/term.h
-include/asterisk/test.h
-include/asterisk/threadstorage.h
-include/asterisk/time.h
-include/asterisk/timing.h
-include/asterisk/transcap.h
-include/asterisk/translate.h
-include/asterisk/udptl.h
-include/asterisk/ulaw.h
-include/asterisk/unaligned.h
-include/asterisk/utils.h
-include/asterisk/vector.h
-include/asterisk/version.h
-include/asterisk/xml.h
-include/asterisk/xmldoc.h
-include/asterisk/xmpp.h
-lib/libasteriskssl.so
-lib/libasteriskssl.so.1
-man/man8/astdb2bdb.8.gz
-man/man8/astdb2sqlite3.8.gz
-man/man8/asterisk.8.gz
-man/man8/astgenkey.8.gz
-man/man8/autosupport.8.gz
-man/man8/safe_asterisk.8.gz
-sbin/astcanary
-sbin/astdb2bdb
-sbin/astdb2sqlite3
-sbin/asterisk
-sbin/astgenkey
-sbin/autosupport
-sbin/rasterisk
-sbin/safe_asterisk
-%%DATADIR%%/agi-bin/agi-test.agi
-%%DATADIR%%/agi-bin/eagi-sphinx-test
-%%DATADIR%%/agi-bin/eagi-test
-%%DATADIR%%/agi-bin/jukebox.agi
-%%DATADIR%%/documentation/appdocsxml.dtd
-%%DATADIR%%/documentation/core-en_US.xml
-%%DATADIR%%/phoneprov/000000000000-directory.xml
-%%DATADIR%%/phoneprov/000000000000-phone.cfg
-%%DATADIR%%/phoneprov/000000000000.cfg
-%%DATADIR%%/phoneprov/polycom.xml
-%%DATADIR%%/phoneprov/polycom_line.xml
-%%DATADIR%%/phoneprov/snom-mac.xml
-%%DATADIR%%/static-http/ajamdemo.html
-%%DATADIR%%/static-http/astman.css
-%%DATADIR%%/static-http/astman.js
-%%DATADIR%%/static-http/core-en_US.xml
-%%DATADIR%%/static-http/prototype.js
-%%DATADIR%%/static-http/mantest.html
-%%DOCSDIR%%/images/asterisk-intro.jpg
-%%DOCSDIR%%/images/kpad2.jpg
-@dir lib/asterisk/modules
-@dir %%DATADIR%%/sounds
-@dir %%DATADIR%%/moh
-@dir %%DATADIR%%/keys
-@dir %%DATADIR%%/images
-@dir %%DATADIR%%/firmware/iax
-@dir %%DATADIR%%/documentation/thirdparty
-@owner %%ASTERISK_USER%%
-@group %%ASTERISK_GROUP%%
-@dir %%VARDIR%%/log/asterisk/cdr-csv
-@dir %%VARDIR%%/log/asterisk/cdr-custom
-@dir %%VARDIR%%/log/asterisk/cel-custom
-@dir %%VARDIR%%/log/asterisk
-@dir %%VARDIR%%/spool/asterisk/dictate
-@dir %%VARDIR%%/spool/asterisk/meetme
-@dir %%VARDIR%%/spool/asterisk/monitor
-@dir %%VARDIR%%/spool/asterisk/outgoing
-@dir %%VARDIR%%/spool/asterisk
-@dir %%VARDIR%%/spool/asterisk/system
-@dir %%VARDIR%%/spool/asterisk/tmp
-@dir %%VARDIR%%/db/asterisk
-@dir %%VARDIR%%/run/asterisk
-@owner
-@group