Index: head/net/asterisk16/Makefile
===================================================================
--- head/net/asterisk16/Makefile	(revision 533565)
+++ head/net/asterisk16/Makefile	(revision 533566)
@@ -1,300 +1,301 @@
 # $FreeBSD$
 
 PORTNAME=	asterisk
 PORTVERSION=	16.10.0
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	https://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729 \
 		http://www.pjsip.org/release/${PJSIP_VERSION}/:PJSIP
 MASTER_SITE_SUBDIR=	asterisk/ \
 			asterisk/old-releases/ \
 			sounds/releases/:g729
 PKGNAMESUFFIX=	16
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		pjproject-${PJSIP_VERSION}.tar.bz2:PJSIP
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	madpilot@FreeBSD.org
 COMMENT=	Open Source PBX and telephony toolkit
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libuuid.so:misc/e2fsprogs-libuuid \
 		libjansson.so:devel/jansson
 
 ONLY_FOR_ARCHS=	amd64 armv6 armv7 i386 powerpc powerpc64 sparc64
 
 EXTRACT_ONLY:=	${DISTNAME}${EXTRACT_SUFX}
 
 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
 
 PJSIP_VERSION=	2.9
 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=	asterisk13
 
 OPTIONS_DEFINE=			ASTVERSION BACKTRACE CURL EXCHANGE FREETDS G729 LDAP LUA MACRO \
 				MP3PLAYER OOH323 OPTIMIZED_CFLAGS PJSIP PORTAUDIO RADIUS SNMP \
 				SPANDSP SRTP SYSINFO XMPP
 OPTIONS_DEFAULT=		CURL FREETDS GSM LUA MACRO MP3PLAYER NEWT ODBC MYSQL PGSQL \
 				PJSIP PORTAUDIO RADIUS SNMP SPANDSP SPEEX SQLITE2 SRTP VORBIS
 
 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 SQLITE2
 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)
 MACRO_DESC?=	Enable app_macro (deprecated)
 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
 XMPP_DESC?=	XMPP/GTALK support
 
 OPTIONS_SUB=		yes
 
 ASTVERSION_RUN_DEPENDS=		bash:shells/bash
 
 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 \
 			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_USES=		pkgconfig
 PJSIP_LIB_DEPENDS=	libsrtp2.so:net/libsrtp2 \
 			libspeex.so:audio/speex \
 			libspeexdsp.so:audio/speexdsp
 
 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
 
 SQLITE2_CONFIGURE_WITH=	sqlite
 SQLITE2_LIB_DEPENDS=	libsqlite.so:databases/sqlite2
 
 SRTP_CONFIGURE_WITH=	srtp
 SRTP_LIB_DEPENDS=	libsrtp2.so:net/libsrtp2
 
 SYSINFO_LIB_DEPENDS=	libsysinfo.so:devel/libsysinfo
 
 VORBIS_CONFIGURE_WITH=	ogg
 VORBIS_LIB_DEPENDS=	libvorbis.so:audio/libvorbis \
 			libogg.so:audio/libogg
 
 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-MACRO-on:
 	@cd ${WRKSRC} && ./menuselect/menuselect --enable app_macro 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>
Index: head/net/asterisk16/files/patch-configure
===================================================================
--- head/net/asterisk16/files/patch-configure	(revision 533565)
+++ head/net/asterisk16/files/patch-configure	(revision 533566)
@@ -1,78 +1,109 @@
---- configure.orig	2018-08-08 16:02:31 UTC
+--- configure.orig	2020-04-30 14:11:40 UTC
 +++ configure
-@@ -4661,8 +4661,6 @@ case "${host_os}" in
+@@ -4687,8 +4687,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
-@@ -20328,6 +20326,8 @@ $as_echo_n "checking for getifaddrs() support... " >&6
+@@ -9230,25 +9228,25 @@ $as_echo "configuring" >&6; }
  
+ 		this_host=$(./config.sub $(./config.guess))
+ 		if test "$build" != "$this_host" ; then
+-			PJPROJECT_CONFIGURE_OPTS+=" --build=$build_alias"
++			PJPROJECT_CONFIGURE_OPTS="${PJPROJECT_CONFIGURE_OPTS} --build=$build_alias"
+ 		fi
+ 		if test "$host" != "$this_host" ; then
+-			PJPROJECT_CONFIGURE_OPTS+=" --host=$host_alias"
++			PJPROJECT_CONFIGURE_OPTS="${PJPROJECT_CONFIGURE_OPTS} --host=$host_alias"
+ 		fi
+ 		# This was a copy of the autoconf generated code from the root ./configure.
+ 		# Hopefully, when you read this, the code is still the same.
+ 		if test "${with_ssl+set}" = set; then :
+ 			case $with_ssl in
+ 			n|no)
+-			PJPROJECT_CONFIGURE_OPTS+=" --disable-ssl"
++			PJPROJECT_CONFIGURE_OPTS="${PJPROJECT_CONFIGURE_OPTS} --disable-ssl"
+ 			;;
+ 			y|ye|yes)
+ 			# Not to mention SSL is the default in PJProject and means "autodetect".
+ 			# In Asterisk, "./configure --with-ssl" means "must be present".
+-			PJPROJECT_CONFIGURE_OPTS+=""
++			#PJPROJECT_CONFIGURE_OPTS+=""
+ 			;;
+ 			*)
+-			PJPROJECT_CONFIGURE_OPTS+=" --with-ssl=${with_ssl}"
++			PJPROJECT_CONFIGURE_OPTS="${PJPROJECT_CONFIGURE_OPTS} --with-ssl=${with_ssl}"
+ 			;;
+ 			esac
+ 		fi
+@@ -20351,6 +20349,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 ()
-@@ -29156,6 +29156,8 @@ fi
+@@ -29510,6 +29510,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.
-@@ -29170,13 +29172,13 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no";
+@@ -29524,13 +29526,13 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no";
        ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
        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 "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua-${ver}" >&5
 +$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.  */
  
-@@ -29218,7 +29220,7 @@ fi
+@@ -29572,7 +29574,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"
-@@ -29228,8 +29230,8 @@ fi
+@@ -29582,8 +29584,8 @@ fi
           # check for the header
           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"
 +         as_ac_Header=`$as_echo "ac_cv_header_lua${vernodot}/lua.h" | $as_tr_sh`
 +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
-@@ -29256,9 +29258,9 @@ fi
+@@ -29610,9 +29612,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
Index: head/net/asterisk16/files/patch-third-party_pjproject_Makefile
===================================================================
--- head/net/asterisk16/files/patch-third-party_pjproject_Makefile	(revision 533565)
+++ head/net/asterisk16/files/patch-third-party_pjproject_Makefile	(revision 533566)
@@ -1,11 +1,28 @@
---- third-party/pjproject/Makefile.orig	2020-03-12 14:44:05 UTC
+--- third-party/pjproject/Makefile.orig	2020-04-30 14:11:40 UTC
 +++ third-party/pjproject/Makefile
-@@ -155,7 +155,7 @@ $(PJSIP_LIB_FILES): $(PJLIB_UTIL_LIB_FILES)
+@@ -88,14 +88,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 $<
+@@ -155,7 +151,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 $@