20 files changed, 1 insertions, 1206 deletions
diff --git a/MOVED b/MOVED
index d41d2de6c115..bb0c2e989b55 100644
--- a/MOVED
+++ b/MOVED
@@ -16542,3 +16542,4 @@ devel/geany-plugin-vimode@gtk2|devel/geany-plugin-vimode|2021-10-10|Project drop
 devel/geany-plugin-workbench@gtk2|devel/geany-plugin-workbench|2021-10-10|Project dropped GTK2 support
 devel/geany-plugin-xmlsnippets@gtk2|devel/geany-plugin-xmlsnippets|2021-10-10|Project dropped GTK2 support
 net-mgmt/unifi5|net-mgmt/unifi6|2021-10-16|Has expired: Use net-mgmt/unifi6 instead
+net/asterisk13|net/asterisk18|2021-10-24|Has expired: Asterisk 13.x will reach EOL on 2021-10-24. Please migrate to net/asterisk18
diff --git a/net/Makefile b/net/Makefile
index a7d53f3f2e27..38dcfcc5b213 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -34,7 +34,6 @@
     SUBDIR += aslookup
     SUBDIR += asterisk-chan_sccp
     SUBDIR += asterisk-g72x
-    SUBDIR += asterisk13
     SUBDIR += asterisk16
     SUBDIR += asterisk18
     SUBDIR += astron
diff --git a/net/asterisk13/Makefile b/net/asterisk13/Makefile
deleted file mode 100644
index 2f1aa06b5197..000000000000
--- a/net/asterisk13/Makefile
+++ /dev/null
@@ -1,296 +0,0 @@
-PORTNAME=	asterisk
-PORTVERSION=	13.38.3
-CATEGORIES=	net
-MASTER_SITES=	https://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729
-MASTER_SITE_SUBDIR=	asterisk/ \
-			asterisk/old-releases/ \
-			sounds/releases/:g729
-PKGNAMESUFFIX=	13
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
-DIST_SUBDIR=	${PORTNAME}
-
-MAINTAINER=	madpilot@FreeBSD.org
-COMMENT=	Open Source PBX and telephony toolkit
-
-LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/LICENSE
-
-DEPRECATED=	Asterisk 13.x will reach EOL on 2021-10-24. Please migrate to net/asterisk18
-EXPIRATION_DATE=2021-10-24
-
-LIB_DEPENDS=	libuuid.so:misc/e2fsprogs-libuuid \
-		libjansson.so:devel/jansson
-
-USES=		bison compiler:c11 cpe gmake gnome iconv libedit localbase \
-		shebangfix sqlite ssl ncurses
-USE_GNOME=	libxml2
-USE_LDCONFIG=	yes
-USE_RC_SUBR=	asterisk
-USE_GITHUB=	nodefault
-
-EXTRACT_ONLY:=	${DISTNAME}${EXTRACT_SUFX}
-
-PJSIP_VERSION=	2.10
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--datarootdir=${DATADIR} \
-		--with-ilbc=internal \
-		--with-crypto=${OPENSSLBASE} \
-		--with-ssl=${OPENSSLBASE} \
-		--with-externals-cache=${DISTDIR}/${DIST_SUBDIR}
-
-CPE_VENDOR=	digium
-
-SHEBANG_FILES=	agi/agi-test.agi \
-		agi/jukebox.agi \
-		contrib/scripts/astversion
-LDFLAGS+=	-L.
-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=		ossp-uuid-[0-9]*
-CONFLICTS_BUILD=	linuxthreads-*
-CONFLICTS_INSTALL=	asterisk16 asterisk18
-
-OPTIONS_DEFINE=			ASTVERSION BACKTRACE CURL EXCHANGE FREETDS G729 LDAP LUA \
-				MP3PLAYER OOH323 OPTIMIZED_CFLAGS PJSIP PORTAUDIO RADIUS SNMP \
-				SPANDSP SRTP SYSINFO URIPARSER XMLDOC XMPP
-OPTIONS_DEFAULT=		CURL FREETDS GSM LUA MP3PLAYER NEWT ODBC OPUS MYSQL PGSQL PJSIP \
-				PORTAUDIO RADIUS SNMP SPANDSP SPEEX SRTP URIPARSER \
-				VORBIS XMLDOC
-
-OPTIONS_DEFINE_i386=		DAHDI
-OPTIONS_DEFINE_amd64=		DAHDI
-OPTIONS_DEFINE_sparc64=		DAHDI
-
-OPTIONS_DEFAULT_i386=		DAHDI XMPP
-OPTIONS_DEFAULT_amd64=		DAHDI XMPP
-OPTIONS_DEFAULT_sparc64=	DAHDI XMPP
-OPTIONS_DEFAULT_powerpc=	XMPP
-
-OPTIONS_GROUP=			CODECS
-OPTIONS_GROUP_CODECS=		GSM NEWG711 OPUS SPEEX VORBIS
-CODECS_DESC=			Encoder/Decoder (Codec) Support
-
-OPTIONS_GROUP+=			DATABASE
-OPTIONS_GROUP_DATABASE=		MYSQL ODBC PGSQL
-DATABASE_DESC=			Database Support
-
-OPTIONS_MULTI=			MENU
-OPTIONS_MULTI_MENU=		NCURSES NEWT
-MENU_DESC=			Menuselect Interface Backend
-NEWT_DESC=			Newt User Interface
-
-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_DISTFILES=			${ASTERISK_CORE_G729_SOUNDS}:g729 \
-				${ASTERISK_MOH_G729_SOUNDS}:g729
-
-ASTVERSION_DESC?= Install astversion (requires bash)
-BACKTRACE_DESC?= Stack backtrace support via (lib)execinfo
-DAHDI_DESC?=	DAHDI support
-EXCHANGE_DESC?=	Exchange calendar support
-G729_DESC=	Install G.729 format sounds for Music-on-Hold (MoH)
-MP3PLAYER_DESC=	Install MP3 Player for Music-On-Hold (mpg123)
-NEWG711_DESC?=	New G711 Codec
-OOH323_DESC?=	ooh323 support
-OPUS_DESC?=	Opus Codec
-PJSIP_DESC?=	Build the PJSIP based SIP channel
-SRTP_DESC?=	SecureRTP support
-SYSINFO_DESC?=	Use devel/libsysinfo to get system information
-URIPARSER_DESC?= Use RFC 3986 compliant uriparser library
-XMLDOC_DESC?=	Build and install XML documentation
-XMPP_DESC?=	XMPP/GTALK support
-
-OPTIONS_SUB=		yes
-
-ASTVERSION_RUN_DEPENDS=		bash:shells/bash
-
-BACKTRACE_CONFIGURE_WITH=	execinfo
-
-CURL_CONFIGURE_WITH=	libcurl
-CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
-
-DAHDI_CONFIGURE_WITH=	dahdi 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 \
-			libexpat.so:textproc/expat2
-EXCHANGE_USES=		gettext-runtime
-
-FREETDS_CONFIGURE_ON=	--with-tds=${LOCALBASE}
-FREETDS_CONFIGURE_OFF=	--without-tds
-FREETDS_LIB_DEPENDS=	libsybdb.so:databases/freetds
-
-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
-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
-
-OPUS_LIB_DEPENDS=	libopus.so:audio/opus
-OPUS_EXTRACT_ONLY=	${DISTFILE_opus}
-OPUS_GH_TUPLE=		traud:asterisk-opus:83e1b458c77e0e287adeca494eeb79edb077b0ff:opus
-
-PGSQL_CONFIGURE_WITH=	postgres
-PGSQL_USES=		pgsql
-
-PJSIP_CONFIGURE_WITH=	pjproject pjproject-bundled
-PJSIP_LIB_DEPENDS=	libsrtp2.so:net/libsrtp2 \
-			libspeex.so:audio/speex \
-			libspeexdsp.so:audio/speexdsp
-PJSIP_GH_TUPLE=		pjsip:pjproject:${PJSIP_VERSION}:pjsip
-
-PORTAUDIO_CONFIGURE_WITH=	portaudio
-PORTAUDIO_LIB_DEPENDS=	libportaudio.so:audio/portaudio
-
-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 \
-			libpkg.so:${PKG_ORIGIN}
-
-SPANDSP_CONFIGURE_WITH=	spandsp
-SPANDSP_LIB_DEPENDS=	libspandsp.so:comms/spandsp \
-			libtiff.so:graphics/tiff
-
-SPEEX_CONFIGURE_WITH=	speex
-SPEEX_LIB_DEPENDS=	libspeex.so:audio/speex \
-			libspeexdsp.so:audio/speexdsp
-
-SRTP_CONFIGURE_WITH=	srtp
-SRTP_LIB_DEPENDS=	libsrtp2.so:net/libsrtp2
-
-SYSINFO_LIB_DEPENDS=	libsysinfo.so:devel/libsysinfo
-
-URIPARSER_CONFIGURE_WITH=	uriparser
-URIPARSER_LIB_DEPENDS=	liburiparser.so:net/uriparser
-
-VORBIS_CONFIGURE_WITH=	ogg
-VORBIS_LIB_DEPENDS=	libvorbis.so:audio/libvorbis \
-			libogg.so:audio/libogg
-
-XMLDOC_CONFIGURE_ENABLE=	xmldoc
-
-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 empty(ICONV_LIB)
-CONFIGURE_ARGS+=ac_cv_lib_iconv_iconv_open=no \
-		ac_cv_lib_iconv_libiconv_open=no
-.endif
-
-.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}/${DIST_SUBDIR}/${ASTERISK_CORE_G729_SOUNDS} ${WRKSRC}/sounds
-	${CP} ${DISTDIR}/${DIST_SUBDIR}/${ASTERISK_MOH_G729_SOUNDS} ${WRKSRC}/sounds
-
-post-extract-OPUS-on:
-	${CP} ${WRKSRC_opus}/include/asterisk/* ${WRKSRC}/include/asterisk
-	${CP} ${WRKSRC_opus}/codecs/* ${WRKSRC}/codecs
-	${CP} ${WRKSRC_opus}/res/* ${WRKSRC}/res
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|/var/lib|${PREFIX}/share|g' ${WRKSRC}/configs/samples/musiconhold.conf.sample
-.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
-
-post-configure-OPUS-on:
-	@cd ${WRKSRC} && ./menuselect/menuselect --enable codec_opus_open_source menuselect.makeopts
-
-post-install:
-	@${RM} ${STAGEDIR}${ETCDIR}/*.conf ${STAGEDIR}${ETCDIR}/extensions.ael ${STAGEDIR}${ETCDIR}/extensions.lua
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/ast[a-f]* ${STAGEDIR}${PREFIX}/lib/*.so.* ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/modules/*.so ${STAGEDIR}${DATADIR}/agi-bin/eagi-*
-	${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});
-
-post-install-ASTVERSION-off:
-	@${RM} ${STAGEDIR}${PREFIX}/sbin/astversion
-
-.include <bsd.port.post.mk>
diff --git a/net/asterisk13/distinfo b/net/asterisk13/distinfo
deleted file mode 100644
index 1c3387e7d842..000000000000
--- a/net/asterisk13/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-TIMESTAMP = 1627074643
-SHA256 (asterisk/asterisk-13.38.3.tar.gz) = 478040705f5819259bb1d22cb4e27970092a5bfdb691d27d321c26235eea4bb3
-SIZE (asterisk/asterisk-13.38.3.tar.gz) = 33711458
-SHA256 (asterisk/asterisk-core-sounds-en-g729-1.5.tar.gz) = 8b28a59cfa53b59c76e0a191704f0708e3d83acffab8c5e6f25dfc599f0123f9
-SIZE (asterisk/asterisk-core-sounds-en-g729-1.5.tar.gz) = 1551123
-SHA256 (asterisk/asterisk-moh-opsound-g729-2.03.tar.gz) = 0147ca9a97f0c550227aacb7793499057c4d2c64e021c95f93722f27d5549585
-SIZE (asterisk/asterisk-moh-opsound-g729-2.03.tar.gz) = 1103000
-SHA256 (asterisk/traud-asterisk-opus-83e1b458c77e0e287adeca494eeb79edb077b0ff_GH0.tar.gz) = 572a3c956371ed62b44a4bcd973db10eb4c84f3040cf7156e3acfad3b6bf3ded
-SIZE (asterisk/traud-asterisk-opus-83e1b458c77e0e287adeca494eeb79edb077b0ff_GH0.tar.gz) = 24044
-SHA256 (asterisk/pjsip-pjproject-2.10_GH0.tar.gz) = 936a4c5b98601b52325463a397ddf11ab4106c6a7b04f8dc7cdd377efbb597de
-SIZE (asterisk/pjsip-pjproject-2.10_GH0.tar.gz) = 8768705
diff --git a/net/asterisk13/files/asterisk.in b/net/asterisk13/files/asterisk.in
deleted file mode 100644
index aaa2ce8cdd8f..000000000000
--- a/net/asterisk13/files/asterisk.in
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/bin/sh
-
-# 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_group (string):	Group asterisk runs as
-#				Default is %%ASTERISK_GROUP%%
-# 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
-# asterisk_umask (string):	File creation mode mask to run asterisk with
-#
-
-. /etc/rc.subr
-
-name=asterisk
-rcvar=asterisk_enable
-desc="Asterisk PBX server"
-
-load_rc_config $name
-
-: ${asterisk_enable:=NO}
-: ${asterisk_user:=%%ASTERISK_USER%%}
-: ${asterisk_group:=%%ASTERISK_GROUP%%}
-: ${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
-
-pidfile="${asterisk_pidfile}"
-
-command="%%PREFIX%%/sbin/asterisk"
-command_args="${asterisk_args} -F -U ${asterisk_user}"
-
-asterisk_precmd()
-{
-	local rundir=${asterisk_pidfile%/*}
-	if [ ! -d $rundir ] ; then
-		install -d -m 0750 -o "${asterisk_user}" -g "${asterisk_group}" "$rundir"
-	fi
-	if [ -n "${asterisk_umask}" ]; then
-		umask ${asterisk_umask}
-	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} -gt 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/asterisk13/files/patch-Makefile b/net/asterisk13/files/patch-Makefile
deleted file mode 100644
index 63fb3a33e4e0..000000000000
--- a/net/asterisk13/files/patch-Makefile
+++ /dev/null
@@ -1,122 +0,0 @@
---- Makefile.orig	2020-07-09 15:33:47 UTC
-+++ Makefile
-@@ -141,7 +141,7 @@ ASTTOPDIR:=$(subst $(space),\$(space),$(CURDIR))
- 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
-@@ -165,7 +165,7 @@ LINKER_SYMBOL_PREFIX=
- #_ASTCFLAGS+=-DOLD_DSP_ROUTINES
- 
- # Default install directory for DAHDI hooks.
--DAHDI_UDEV_HOOK_DIR = /usr/share/dahdi/span_config.d
-+#DAHDI_UDEV_HOOK_DIR = /usr/share/dahdi/span_config.d
- 
- # This Makefile previously contained a note about the ability to use .asterisk.makeopts
- # from your home directory or /etc/asterisk.makeopts to set defaults for menuselect.
-@@ -226,7 +226,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)
- endif
- 
-@@ -470,8 +470,12 @@ endif
- 			$(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
- 	find rest-api -name "*.json" | while read x; do \
-@@ -569,7 +573,7 @@ INSTALLDIRS="$(ASTLIBDIR)" "$(ASTMODDIR)" "$(ASTSBINDI
- 	"$(ASTDATADIR)/firmware/iax" "$(ASTDATADIR)/images" "$(ASTDATADIR)/keys" \
- 	"$(ASTDATADIR)/phoneprov" "$(ASTDATADIR)/rest-api" "$(ASTDATADIR)/static-http" \
- 	"$(ASTDATADIR)/sounds" "$(ASTDATADIR)/moh" "$(ASTMANDIR)/man8" "$(AGI_DIR)" "$(ASTDBDIR)" \
--	"$(ASTDATADIR)/third-party"
-+	"$(ASTDATADIR)/third-party" "$(ASTSPOOLDIR)/outgoing"
- 
- installdirs:
- 	@for i in $(INSTALLDIRS); do \
-@@ -602,10 +606,10 @@ endif
- 	if [ -f contrib/firmware/iax/iaxy.bin ] ; then \
- 		$(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin "$(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin"; \
- 	fi
--ifeq ($(HAVE_DAHDI),1)
--	$(INSTALL) -d $(DESTDIR)/$(DAHDI_UDEV_HOOK_DIR)
--	$(INSTALL) -m 644 contrib/scripts/dahdi_span_config_hook $(DESTDIR)$(DAHDI_UDEV_HOOK_DIR)/40-asterisk
--endif
-+#ifeq ($(HAVE_DAHDI),1)
-+#	$(INSTALL) -d $(DESTDIR)/$(DAHDI_UDEV_HOOK_DIR)
-+#	$(INSTALL) -m 644 contrib/scripts/dahdi_span_config_hook $(DESTDIR)$(DAHDI_UDEV_HOOK_DIR)/40-asterisk
-+#endif
- 
- $(SUBDIRS_INSTALL):
- 	+@DESTDIR="$(DESTDIR)" ASTSBINDIR="$(ASTSBINDIR)" ASTDATADIR="$(ASTDATADIR)" $(SUBMAKE) -C $(@:-install=) install
-@@ -720,7 +724,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
-@@ -765,23 +769,10 @@ upgrade: bininstall
- #  (2) the extension to strip off
- define INSTALL_CONFIGS
- 	@for x in $(1)/*$(2); do \
--		dst="$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x $(2)`"; \
--		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 .sample`.sample" ; \
- 	done ; \
--	if [ "$(OVERWRITE)" = "y" ]; then \
-+	if true; then \
- 		echo "Updating asterisk.conf" ; \
- 		sed -e 's|^astetcdir.*$$|astetcdir => $(ASTETCDIR)|' \
- 			-e 's|^astmoddir.*$$|astmoddir => $(ASTMODDIR)|' \
-@@ -794,8 +785,8 @@ define INSTALL_CONFIGS
- 			-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)" ; \
-+			"$(DESTDIR)$(ASTCONFPATH).sample" > "$(DESTDIR)$(ASTCONFPATH).tmp" ; \
-+		$(INSTALL) -m 644 "$(DESTDIR)$(ASTCONFPATH).tmp" "$(DESTDIR)$(ASTCONFPATH).sample" ; \
- 		rm -f "$(DESTDIR)$(ASTCONFPATH).tmp" ; \
- 	fi
- endef
-@@ -829,7 +820,7 @@ 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
diff --git a/net/asterisk13/files/patch-agi_Makefile b/net/asterisk13/files/patch-agi_Makefile
deleted file mode 100644
index 29735b138c09..000000000000
--- a/net/asterisk13/files/patch-agi_Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
---- agi/Makefile.orig	2020-07-09 15:33:47 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/asterisk13/files/patch-channels_chan__dahdi.c b/net/asterisk13/files/patch-channels_chan__dahdi.c
deleted file mode 100644
index a9844096f6ca..000000000000
--- a/net/asterisk13/files/patch-channels_chan__dahdi.c
+++ /dev/null
@@ -1,32 +0,0 @@
---- channels/chan_dahdi.c.orig	2020-07-09 15:33:47 UTC
-+++ channels/chan_dahdi.c
-@@ -4716,6 +4716,8 @@ void dahdi_ec_enable(struct dahdi_pvt *p)
- 		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)
-@@ -4746,7 +4748,8 @@ void dahdi_ec_enable(struct dahdi_pvt *p)
- 			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 {
-@@ -4780,8 +4783,9 @@ void dahdi_ec_disable(struct dahdi_pvt *p)
- 
- 	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/asterisk13/files/patch-channels_sip_include_sip.h b/net/asterisk13/files/patch-channels_sip_include_sip.h
deleted file mode 100644
index 0a12caf80277..000000000000
--- a/net/asterisk13/files/patch-channels_sip_include_sip.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- channels/sip/include/sip.h.orig	2020-07-09 15:33:47 UTC
-+++ channels/sip/include/sip.h
-@@ -192,7 +192,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/asterisk13/files/patch-configure b/net/asterisk13/files/patch-configure
deleted file mode 100644
index 592edfbeea76..000000000000
--- a/net/asterisk13/files/patch-configure
+++ /dev/null
@@ -1,74 +0,0 @@
---- configure.orig	2020-07-09 15:33:47 UTC
-+++ configure
-@@ -4667,8 +4667,6 @@ case "${host_os}" in
-      ;;
-      dragonfly*|freebsd*)
-      ac_default_prefix=/usr/local
--     CPPFLAGS=-I/usr/local/include
--     LDFLAGS=-L/usr/local/lib
-      ;;
-      openbsd*)
-      ac_default_prefix=/usr/local
-@@ -20570,6 +20568,8 @@ $as_echo_n "checking for getifaddrs() support... " >&6
- 
- 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
-+ #include <sys/types.h>
-+ #include <sys/socket.h>
-  #include <ifaddrs.h>
- int
- main ()
-@@ -29285,6 +29285,8 @@ fi
- 
- for ver in 5.3 5.2 5.1; do
- 
-+vernodot=`echo ${ver} | sed 's/\.//'`
-+
- if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no"; then
-    pbxlibdir=""
-    # if --with-LUA=DIR has been specified, use it.
-@@ -29300,12 +29302,12 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no";
-       CFLAGS="${CFLAGS} "
-       as_ac_Lib=`$as_echo "ac_cv_lib_lua${ver}''_luaL_newstate" | $as_tr_sh`
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua${ver}" >&5
--$as_echo_n "checking for luaL_newstate in -llua${ver}... " >&6; }
-+$as_echo_n "checking for luaL_newstate in -llua-${ver}... " >&6; }
- if eval \${$as_ac_Lib+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-llua${ver} ${pbxlibdir} -lm $LIBS"
-+LIBS="-llua-${ver} ${pbxlibdir} -lm $LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
-@@ -29347,7 +29349,7 @@ fi
- 
-    # now check for the header.
-    if test "${AST_LUA_FOUND}" = "yes"; then
--      LUA_LIB="${pbxlibdir} -llua${ver} -lm"
-+      LUA_LIB="${pbxlibdir} -llua-${ver} -lm"
-       # if --with-LUA=DIR has been specified, use it.
-       if test "x${LUA_DIR}" != "x"; then
-          LUA_INCLUDE="-I${LUA_DIR}/include"
-@@ -29358,7 +29360,7 @@ fi
-          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
-          CPPFLAGS="${CPPFLAGS} ${LUA_INCLUDE}"
-          as_ac_Header=`$as_echo "ac_cv_header_lua${ver}/lua.h" | $as_tr_sh`
--ac_fn_c_check_header_mongrel "$LINENO" "lua${ver}/lua.h" "$as_ac_Header" "$ac_includes_default"
-+ac_fn_c_check_header_mongrel "$LINENO" "lua${vernodot}/lua.h" "$as_ac_Header" "$ac_includes_default"
- if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-   LUA_HEADER_FOUND=1
- else
-@@ -29385,9 +29387,9 @@ fi
- 
- 	if test "x${PBX_LUA}" = "x1" ; then
- 		if test x"${LUA_DIR}" = x; then
--			LUA_INCLUDE="${LUA_INCLUDE} -I/usr/include/lua${ver}"
-+			LUA_INCLUDE="${LUA_INCLUDE} -I/usr/include/lua${vernodot}"
- 		else
--			LUA_INCLUDE="${LUA_INCLUDE} -I${LUA_DIR}/lua${ver}"
-+			LUA_INCLUDE="${LUA_INCLUDE} -I${LUA_DIR}/lua${vernodot}"
- 		fi
- 		break;
- 	fi
diff --git a/net/asterisk13/files/patch-contrib_Makefile b/net/asterisk13/files/patch-contrib_Makefile
deleted file mode 100644
index d079d318d26a..000000000000
--- a/net/asterisk13/files/patch-contrib_Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
---- contrib/Makefile.orig	2020-07-09 15:33:47 UTC
-+++ contrib/Makefile
-@@ -24,10 +24,10 @@ install:
- 	$(INSTALL) -m 755 scripts/ast_logescalator "$(DESTDIR)$(ASTDATADIR)/scripts/ast_logescalator"
- 	$(INSTALL) -m 755 scripts/ast_loggrabber "$(DESTDIR)$(ASTDATADIR)/scripts/ast_loggrabber"
- 	$(INSTALL) -m 755 scripts/ast_coredumper "$(DESTDIR)$(ASTDATADIR)/scripts/ast_coredumper"
--	$(INSTALL) -m 755 scripts/refcounter.py "$(DESTDIR)$(ASTDATADIR)/scripts/refcounter.py"
-+#	$(INSTALL) -m 755 scripts/refcounter.py "$(DESTDIR)$(ASTDATADIR)/scripts/refcounter.py"
- 
- uninstall:
- 	-rm -f "$(DESTDIR)$(ASTDATADIR)/scripts/ast_logescalator"
- 	-rm -f "$(DESTDIR)$(ASTDATADIR)/scripts/ast_loggrabber"
- 	-rm -f "$(DESTDIR)$(ASTDATADIR)/scripts/ast_coredumper"
--	-rm -f "$(DESTDIR)$(ASTDATADIR)/scripts/refcounter.py"
-+#	-rm -f "$(DESTDIR)$(ASTDATADIR)/scripts/refcounter.py"
diff --git a/net/asterisk13/files/patch-main_Makefile b/net/asterisk13/files/patch-main_Makefile
deleted file mode 100644
index e2ea9aa25018..000000000000
--- a/net/asterisk13/files/patch-main_Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
---- main/Makefile.orig	2020-07-09 15:33:47 UTC
-+++ main/Makefile
-@@ -75,9 +75,12 @@ 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)
-+  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)
-+  CRYPT_LIB=$(shell if test $(BSDVERSION) -ge 1200001 ; then echo "-lcrypt"; fi)
-   AST_LIBS+=-lcrypto
-+  AST_LIBS+=%%LIBSYSINFO%%
- endif
- 
- ifneq ($(findstring $(OSARCH), mingw32 cygwin ),)
diff --git a/net/asterisk13/files/patch-main_asterisk.exports.in b/net/asterisk13/files/patch-main_asterisk.exports.in
deleted file mode 100644
index 46639880e2fa..000000000000
--- a/net/asterisk13/files/patch-main_asterisk.exports.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- main/asterisk.exports.in.orig	2020-07-09 15:33:47 UTC
-+++ main/asterisk.exports.in
-@@ -67,6 +67,8 @@
- 
- 		*/
- 		LINKER_SYMBOL_PREFIX_IO_stdin_used;
-+		LINKER_SYMBOL_PREFIX__progname;
-+		LINKER_SYMBOL_PREFIXenviron;
- 	local:
- 		*;
- };
diff --git a/net/asterisk13/files/patch-main_http.c b/net/asterisk13/files/patch-main_http.c
deleted file mode 100644
index 19c3b1b8e5b8..000000000000
--- a/net/asterisk13/files/patch-main_http.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- main/http.c.orig	2020-07-09 15:33:47 UTC
-+++ main/http.c
-@@ -2110,7 +2110,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/asterisk13/files/patch-main_lock.c b/net/asterisk13/files/patch-main_lock.c
deleted file mode 100644
index ceb3177cb193..000000000000
--- a/net/asterisk13/files/patch-main_lock.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- main/lock.c.orig	2020-07-09 15:33:47 UTC
-+++ main/lock.c
-@@ -700,9 +700,6 @@ int __ast_rwlock_init(int tracking, const char *filena
- #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/asterisk13/files/patch-third-party_pjproject_Makefile b/net/asterisk13/files/patch-third-party_pjproject_Makefile
deleted file mode 100644
index 3ff96606b3ec..000000000000
--- a/net/asterisk13/files/patch-third-party_pjproject_Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
---- third-party/pjproject/Makefile.orig	2020-07-09 15:33:47 UTC
-+++ third-party/pjproject/Makefile
-@@ -90,14 +90,10 @@ _all: $(TARGETS)
- 
- .DELETE_ON_ERROR:
- 
--$(DOWNLOAD_DIR)/$(TARBALL_FILE): ../versions.mak
--	$(CMD_PREFIX) ($(TARBALL_EXISTS) && $(TARBALL_VERIFY) && touch $@) || (rm -rf $@ ;\
--	$(TARBALL_DOWNLOAD)) || (rm -rf $@ ;\
--	$(SHELL_ECHO_PREFIX) Retrying download ; $(TARBALL_DOWNLOAD))
-+$(DOWNLOAD_DIR)/$(TARBALL_FILE):
-+	@true
- 
- source/.unpacked: $(DOWNLOAD_DIR)/$(TARBALL_FILE)
--	$(CMD_PREFIX) $(TARBALL_VERIFY) || (rm -rf $@ ;\
--	$(SHELL_ECHO_PREFIX) Retrying download ; $(TARBALL_DOWNLOAD))
- 	$(ECHO_PREFIX) Unpacking $<
- 	-@rm -rf source pjproject-*/ >/dev/null 2>&1
- 	$(CMD_PREFIX) $(TAR) -xjf $<
-@@ -157,7 +153,7 @@ $(PJSIP_LIB_FILES): $(PJLIB_UTIL_LIB_FILES)
- 
- pjproject.symbols: $(ALL_LIB_FILES)
- 	$(ECHO_PREFIX) Generating symbols
--	$(CMD_PREFIX) $(NM) -Pog $(ALL_LIB_FILES) | $(SED) -n -r -e "s/.+: ([pP][jJ][^ ]+) .+/\1/gp" | sort -u > pjproject.symbols
-+	$(CMD_PREFIX) $(NM) -Pog $(ALL_LIB_FILES) | $(SED) -n -r -e "s/^([pP][jJ][^ ]+) .+/\1/gp" | sort -u > pjproject.symbols
- 
- source/pjsip-apps/src/asterisk_malloc_debug.c: patches/asterisk_malloc_debug.c
- 	$(ECHO_PREFIX) Copying $< to $@
diff --git a/net/asterisk13/files/patch-third-party_pjproject_Makefile.rules b/net/asterisk13/files/patch-third-party_pjproject_Makefile.rules
deleted file mode 100644
index 3b9a877325cc..000000000000
--- a/net/asterisk13/files/patch-third-party_pjproject_Makefile.rules
+++ /dev/null
@@ -1,20 +0,0 @@
---- third-party/pjproject/Makefile.rules.orig	2020-07-09 15:33:47 UTC
-+++ third-party/pjproject/Makefile.rules
-@@ -7,7 +7,7 @@
- # PACKAGE_URL ?= http://www.pjsip.org/release/$(PJPROJECT_VERSION)
- 
- PACKAGE_URL ?= https://raw.githubusercontent.com/asterisk/third-party/master/pjproject/$(PJPROJECT_VERSION)
--TARBALL_FILE = pjproject-$(PJPROJECT_VERSION).tar.bz2
-+TARBALL_FILE = pjsip-pjproject-$(PJPROJECT_VERSION)_GH0.tar.gz
- 
- # PJPROJECT_CONFIGURE_OPTS could come from the command line or could be
- # set/modified by configure.m4 if the build or host tuples aren't the same
-@@ -37,7 +37,7 @@ PJPROJECT_CONFIG_OPTS = $(PJPROJECT_CONFIGURE_OPTS) --
- 	--disable-ipp \
- 	--disable-libwebrtc \
- 	--without-external-pa \
--	--without-external-srtp
-+	--with-external-srtp
- 
- ifneq ($(AST_DEVMODE),yes)
-     PJPROJECT_CONFIG_OPTS += --disable-resample --disable-g711-codec
diff --git a/net/asterisk13/pkg-descr b/net/asterisk13/pkg-descr
deleted file mode 100644
index 9acc93a1d51a..000000000000
--- a/net/asterisk13/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: https://www.asterisk.org
diff --git a/net/asterisk13/pkg-message b/net/asterisk13/pkg-message
deleted file mode 100644
index 5b79202b6b21..000000000000
--- a/net/asterisk13/pkg-message
+++ /dev/null
@@ -1,38 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-  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
-EOM
-}
-]
diff --git a/net/asterisk13/pkg-plist b/net/asterisk13/pkg-plist
deleted file mode 100644
index 7b8332c12d41..000000000000
--- a/net/asterisk13/pkg-plist
+++ /dev/null
@@ -1,404 +0,0 @@
-@sample %%ETCDIR%%/acl.conf.sample
-@sample %%ETCDIR%%/adsi.conf.sample
-@sample %%ETCDIR%%/agents.conf.sample
-@sample %%ETCDIR%%/alarmreceiver.conf.sample
-@sample %%ETCDIR%%/alsa.conf.sample
-@sample %%ETCDIR%%/amd.conf.sample
-@sample %%ETCDIR%%/app_mysql.conf.sample
-@sample %%ETCDIR%%/app_skel.conf.sample
-@sample %%ETCDIR%%/ari.conf.sample
-@sample %%ETCDIR%%/ast_debug_tools.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_adaptive_odbc.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_sqlite3_custom.conf.sample
-@sample %%ETCDIR%%/cdr_syslog.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%%/chan_dahdi.conf.sample
-@sample %%ETCDIR%%/chan_mobile.conf.sample
-@sample %%ETCDIR%%/cli.conf.sample
-@sample %%ETCDIR%%/cli_aliases.conf.sample
-@sample %%ETCDIR%%/cli_permissions.conf.sample
-@sample %%ETCDIR%%/codecs.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%%/dnsmgr.conf.sample
-@sample %%ETCDIR%%/dsp.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%%/extensions.lua.sample
-@sample %%ETCDIR%%/extensions_minivm.conf.sample
-@sample %%ETCDIR%%/features.conf.sample
-@sample %%ETCDIR%%/festival.conf.sample
-@sample %%ETCDIR%%/followme.conf.sample
-@sample %%ETCDIR%%/func_odbc.conf.sample
-@sample %%ETCDIR%%/hep.conf.sample
-@sample %%ETCDIR%%/http.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%%/minivm.conf.sample
-@sample %%ETCDIR%%/misdn.conf.sample
-@sample %%ETCDIR%%/modules.conf.sample
-@sample %%ETCDIR%%/motif.conf.sample
-@sample %%ETCDIR%%/musiconhold.conf.sample
-@sample %%ETCDIR%%/muted.conf.sample
-@sample %%ETCDIR%%/ooh323.conf.sample
-@sample %%ETCDIR%%/osp.conf.sample
-@sample %%ETCDIR%%/oss.conf.sample
-@sample %%ETCDIR%%/phone.conf.sample
-@sample %%ETCDIR%%/phoneprov.conf.sample
-@sample %%ETCDIR%%/pjproject.conf.sample
-@sample %%ETCDIR%%/pjsip.conf.sample
-@sample %%ETCDIR%%/pjsip_notify.conf.sample
-@sample %%ETCDIR%%/pjsip_wizard.conf.sample
-@sample %%ETCDIR%%/queuerules.conf.sample
-@sample %%ETCDIR%%/queues.conf.sample
-@sample %%ETCDIR%%/res_config_mysql.conf.sample
-@sample %%ETCDIR%%/res_config_sqlite.conf.sample
-@sample %%ETCDIR%%/res_config_sqlite3.conf.sample
-@sample %%ETCDIR%%/res_corosync.conf.sample
-@sample %%ETCDIR%%/res_curl.conf.sample
-@sample %%ETCDIR%%/res_fax.conf.sample
-@sample %%ETCDIR%%/res_ldap.conf.sample
-@sample %%ETCDIR%%/res_odbc.conf.sample
-@sample %%ETCDIR%%/res_parking.conf.sample
-@sample %%ETCDIR%%/res_pgsql.conf.sample
-@sample %%ETCDIR%%/res_pktccops.conf.sample
-@sample %%ETCDIR%%/res_snmp.conf.sample
-@sample %%ETCDIR%%/res_stun_monitor.conf.sample
-@sample %%ETCDIR%%/rtp.conf.sample
-@sample %%ETCDIR%%/say.conf.sample
-@sample %%ETCDIR%%/sip.conf.sample
-@sample %%ETCDIR%%/sip_notify.conf.sample
-@sample %%ETCDIR%%/skinny.conf.sample
-@sample %%ETCDIR%%/sla.conf.sample
-@sample %%ETCDIR%%/smdi.conf.sample
-@sample %%ETCDIR%%/sorcery.conf.sample
-@sample %%ETCDIR%%/ss7.timers.sample
-@sample %%ETCDIR%%/stasis.conf.sample
-@sample %%ETCDIR%%/statsd.conf.sample
-@sample %%ETCDIR%%/telcordia-1.adsi.sample
-@sample %%ETCDIR%%/test_sorcery.conf.sample
-@sample %%ETCDIR%%/udptl.conf.sample
-@sample %%ETCDIR%%/unistim.conf.sample
-@sample %%ETCDIR%%/users.conf.sample
-@sample %%ETCDIR%%/voicemail.conf.sample
-@sample %%ETCDIR%%/vpb.conf.sample
-@sample %%ETCDIR%%/xmpp.conf.sample
-include/asterisk.h
-include/asterisk/_private.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/alertpipe.h
-include/asterisk/aoc.h
-include/asterisk/app.h
-include/asterisk/ari.h
-include/asterisk/ast_expr.h
-include/asterisk/ast_version.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/autochan.h
-include/asterisk/autoconfig.h
-include/asterisk/backtrace.h
-include/asterisk/beep.h
-include/asterisk/bridge.h
-include/asterisk/bridge_after.h
-include/asterisk/bridge_basic.h
-include/asterisk/bridge_channel.h
-include/asterisk/bridge_channel_internal.h
-include/asterisk/bridge_features.h
-include/asterisk/bridge_internal.h
-include/asterisk/bridge_roles.h
-include/asterisk/bridge_technology.h
-include/asterisk/bucket.h
-include/asterisk/build.h
-include/asterisk/buildinfo.h
-include/asterisk/buildopts.h
-include/asterisk/calendar.h
-include/asterisk/callerid.h
-include/asterisk/causes.h
-include/asterisk/ccss.h
-include/asterisk/cdr.h
-include/asterisk/cel.h
-include/asterisk/celt.h
-include/asterisk/channel.h
-include/asterisk/channel_internal.h
-include/asterisk/channelstate.h
-include/asterisk/chanvars.h
-include/asterisk/cli.h
-include/asterisk/codec.h
-include/asterisk/compat.h
-include/asterisk/compiler.h
-include/asterisk/config.h
-include/asterisk/config_options.h
-include/asterisk/core_local.h
-include/asterisk/core_unreal.h
-include/asterisk/crypto.h
-include/asterisk/data.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/doxygen/architecture.h
-include/asterisk/doxygen/licensing.h
-include/asterisk/doxyref.h
-include/asterisk/dsp.h
-include/asterisk/dundi.h
-include/asterisk/endian.h
-include/asterisk/endpoints.h
-include/asterisk/enum.h
-include/asterisk/event.h
-include/asterisk/event_defs.h
-include/asterisk/extconf.h
-include/asterisk/features.h
-include/asterisk/features_config.h
-include/asterisk/file.h
-include/asterisk/format.h
-include/asterisk/format_cache.h
-include/asterisk/format_cap.h
-include/asterisk/format_compatibility.h
-include/asterisk/frame.h
-include/asterisk/framehook.h
-include/asterisk/fskmodem.h
-include/asterisk/fskmodem_float.h
-include/asterisk/fskmodem_int.h
-include/asterisk/global_datastores.h
-include/asterisk/hashtab.h
-include/asterisk/heap.h
-include/asterisk/http.h
-include/asterisk/http_websocket.h
-include/asterisk/image.h
-include/asterisk/indications.h
-include/asterisk/inline_api.h
-include/asterisk/io.h
-include/asterisk/json.h
-include/asterisk/linkedlists.h
-include/asterisk/localtime.h
-include/asterisk/lock.h
-include/asterisk/logger.h
-include/asterisk/manager.h
-include/asterisk/max_forwards.h
-include/asterisk/md5.h
-include/asterisk/media_index.h
-include/asterisk/message.h
-include/asterisk/mixmonitor.h
-include/asterisk/mod_format.h
-include/asterisk/module.h
-include/asterisk/monitor.h
-include/asterisk/multicast_rtp.h
-include/asterisk/musiconhold.h
-include/asterisk/mwi.h
-include/asterisk/named_locks.h
-include/asterisk/netsock.h
-include/asterisk/netsock2.h
-include/asterisk/network.h
-include/asterisk/optional_api.h
-include/asterisk/options.h
-include/asterisk/opus.h
-include/asterisk/parking.h
-include/asterisk/paths.h
-include/asterisk/pbx.h
-include/asterisk/phoneprov.h
-include/asterisk/pickup.h
-include/asterisk/pktccops.h
-include/asterisk/plc.h
-include/asterisk/poll-compat.h
-include/asterisk/presencestate.h
-include/asterisk/privacy.h
-include/asterisk/pval.h
-include/asterisk/res_fax.h
-include/asterisk/res_hep.h
-include/asterisk/res_mwi_external.h
-include/asterisk/res_odbc.h
-include/asterisk/res_odbc_transaction.h
-include/asterisk/res_pjproject.h
-include/asterisk/res_pjsip.h
-include/asterisk/res_pjsip_body_generator_types.h
-include/asterisk/res_pjsip_cli.h
-include/asterisk/res_pjsip_outbound_publish.h
-include/asterisk/res_pjsip_presence_xml.h
-include/asterisk/res_pjsip_pubsub.h
-include/asterisk/res_pjsip_session.h
-include/asterisk/res_srtp.h
-include/asterisk/rtp_engine.h
-include/asterisk/say.h
-include/asterisk/sched.h
-include/asterisk/sdp_srtp.h
-include/asterisk/security_events.h
-include/asterisk/security_events_defs.h
-include/asterisk/select.h
-include/asterisk/sem.h
-include/asterisk/serializer.h
-include/asterisk/sha1.h
-include/asterisk/silk.h
-include/asterisk/sip_api.h
-include/asterisk/slin.h
-include/asterisk/slinfactory.h
-include/asterisk/smdi.h
-include/asterisk/smoother.h
-include/asterisk/sorcery.h
-include/asterisk/sounds_index.h
-include/asterisk/speech.h
-include/asterisk/spinlock.h
-include/asterisk/srv.h
-include/asterisk/stasis.h
-include/asterisk/stasis_app.h
-include/asterisk/stasis_app_device_state.h
-include/asterisk/stasis_app_impl.h
-include/asterisk/stasis_app_mailbox.h
-include/asterisk/stasis_app_playback.h
-include/asterisk/stasis_app_recording.h
-include/asterisk/stasis_app_snoop.h
-include/asterisk/stasis_bridges.h
-include/asterisk/stasis_cache_pattern.h
-include/asterisk/stasis_channels.h
-include/asterisk/stasis_endpoints.h
-include/asterisk/stasis_internal.h
-include/asterisk/stasis_message_router.h
-include/asterisk/stasis_system.h
-include/asterisk/stasis_test.h
-include/asterisk/statsd.h
-include/asterisk/stringfields.h
-include/asterisk/strings.h
-include/asterisk/stun.h
-include/asterisk/syslog.h
-include/asterisk/taskprocessor.h
-include/asterisk/tcptls.h
-include/asterisk/tdd.h
-include/asterisk/term.h
-include/asterisk/test.h
-include/asterisk/threadpool.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/uri.h
-include/asterisk/utf8.h
-include/asterisk/utils.h
-include/asterisk/uuid.h
-include/asterisk/vector.h
-include/asterisk/version.h
-include/asterisk/xml.h
-include/asterisk/xmldoc.h
-include/asterisk/xmpp.h
-%%PJSIP%%lib/libasteriskpj.so
-%%PJSIP%%lib/libasteriskpj.so.2
-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
-%%ASTVERSION%%sbin/astversion
-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
-%%XMLDOC%%%%DATADIR%%/documentation/appdocsxml.dtd
-%%XMLDOC%%%%DATADIR%%/documentation/appdocsxml.xslt
-%%XMLDOC%%%%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%%/rest-api/applications.json
-%%DATADIR%%/rest-api/asterisk.json
-%%DATADIR%%/rest-api/bridges.json
-%%DATADIR%%/rest-api/channels.json
-%%DATADIR%%/rest-api/deviceStates.json
-%%DATADIR%%/rest-api/endpoints.json
-%%DATADIR%%/rest-api/events.json
-%%DATADIR%%/rest-api/mailboxes.json
-%%DATADIR%%/rest-api/playbacks.json
-%%DATADIR%%/rest-api/recordings.json
-%%DATADIR%%/rest-api/resources.json
-%%DATADIR%%/rest-api/sounds.json
-%%DATADIR%%/scripts/ast_coredumper
-%%DATADIR%%/scripts/ast_logescalator
-%%DATADIR%%/scripts/ast_loggrabber
-%%XMLDOC%%%%DATADIR%%/static-http/appdocsxml.xslt
-%%DATADIR%%/static-http/ajamdemo.html
-%%DATADIR%%/static-http/astman.css
-%%DATADIR%%/static-http/astman.js
-%%XMLDOC%%%%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%%/documentation/thirdparty
-@dir %%DATADIR%%/firmware/iax
-@dir %%DATADIR%%/images
-@dir %%DATADIR%%/keys
-@dir %%DATADIR%%/moh
-@dir %%DATADIR%%/sounds
-@dir %%DATADIR%%/third-party
-%%PJSIP%%@dir %%DATADIR%%/third-party/pjproject
-@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/recording
-@dir %%VARDIR%%/spool/asterisk
-@dir %%VARDIR%%/spool/asterisk/system
-@dir %%VARDIR%%/spool/asterisk/tmp
-@dir %%VARDIR%%/db/asterisk
-@dir %%VARDIR%%/run/asterisk
-@owner
-@group