diff --git a/net/asterisk16/Makefile b/net/asterisk16/Makefile
index 67f413434bd5..987d5c5488c6 100644
--- a/net/asterisk16/Makefile
+++ b/net/asterisk16/Makefile
@@ -1,306 +1,305 @@
 PORTNAME=	asterisk
-PORTVERSION=	16.30.0
-PORTREVISION=	1
+PORTVERSION=	16.30.1
 CATEGORIES=	net
 MASTER_SITES=	https://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729
 MASTER_SITE_SUBDIR=	asterisk/ \
 			asterisk/old-releases/ \
 			sounds/releases/:g729
 PKGNAMESUFFIX=	16
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 DIST_SUBDIR=	${PORTNAME}
 EXTRACT_ONLY:=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Open Source PBX and telephony toolkit
 WWW=		https://www.asterisk.org
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 DEPRECATED=		Upstream EOL reaches on 2023-10-09
 EXPIRATION_DATE=	2023-12-31
 
 LIB_DEPENDS=	libuuid.so:misc/e2fsprogs-libuuid \
 		libjansson.so:devel/jansson
 
 USES=		bison compiler:c11 cpe gmake gnome iconv libedit localbase \
 		pkgconfig shebangfix sqlite ssl ncurses
 CPE_VENDOR=	digium
 USE_GITHUB=	nodefault
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	asterisk
 
 SHEBANG_FILES=	agi/agi-test.agi \
 		agi/jukebox.agi \
 		contrib/scripts/astversion
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--datarootdir=${DATADIR} \
 		--with-ilbc=internal \
 		--with-crypto=${OPENSSLBASE} \
 		--with-ssl=${OPENSSLBASE} \
 		--with-externals-cache=${DISTDIR}/${DIST_SUBDIR}
 
 MAKE_ARGS+=	NOISY_BUILD=yes \
 		ASTDATADIR=${DATADIR}
 MAKE_ENV=	PTHREAD_LIBS="-lpthread" \
 		MKDIR="${MKDIR}" \
 		PWLIBDIR=${LOCALBASE}/share/pwlib \
 		OSVERSION=${OSVERSION} \
 		DOCSDIR=${DOCSDIR} \
 		ASTCFLAGS="${CFLAGS}" \
 		ASTLDFLAGS="${LDFLAGS}"
 
 LDFLAGS+=	-L.
 
 CONFLICTS=		ossp-uuid
 CONFLICTS_BUILD=	linuxthreads
 CONFLICTS_INSTALL=	asterisk13 asterisk18
 
 USERS=	${ASTERISK_USER}
 GROUPS=	${ASTERISK_GROUP} dahdi
 
 OPTIONS_DEFINE=			ASTVERSION BACKTRACE CURL EXCHANGE FREETDS G729 LDAP LUA MACRO \
 				MP3PLAYER OOH323 OPTIMIZED_CFLAGS PJSIP PORTAUDIO RADIUS SNMP \
 				SPANDSP SRTP SYSINFO URIPARSER XMLDOC XMPP
 OPTIONS_DEFINE_aarch64=		GEOLOCATION
 OPTIONS_DEFINE_amd64=		DAHDI GEOLOCATION
 OPTIONS_DEFINE_i386=		DAHDI GEOLOCATION
 OPTIONS_DEFINE_powerpc=		DAHDI
 OPTIONS_DEFINE_powerpc64=	DAHDI
 OPTIONS_DEFINE_powerpc64le=	DAHDI
 OPTIONS_DEFINE_sparc64=		DAHDI
 OPTIONS_DEFAULT=		CURL FREETDS GSM LUA MACRO MP3PLAYER NEWT ODBC OPUS MYSQL PGSQL \
 				PJSIP PORTAUDIO RADIUS SNMP SPANDSP SPEEX SRTP URIPARSER \
 				VORBIS XMLDOC
 OPTIONS_DEFAULT_amd64=		DAHDI XMPP
 OPTIONS_DEFAULT_i386=		DAHDI XMPP
 OPTIONS_DEFAULT_powerpc=	DAHDI XMPP
 OPTIONS_DEFAULT_powerpc64=	DAHDI XMPP
 OPTIONS_DEFAULT_powerpc64le=	DAHDI XMPP
 OPTIONS_DEFAULT_sparc64=	DAHDI XMPP
 OPTIONS_GROUP=			CODECS DATABASE
 OPTIONS_GROUP_CODECS=		GSM NEWG711 OPUS SPEEX VORBIS
 OPTIONS_GROUP_DATABASE=		MYSQL ODBC PGSQL
 OPTIONS_MULTI=			MENU
 OPTIONS_MULTI_MENU=		NCURSES NEWT
 OPTIONS_SUB=		yes
 
 ASTVERSION_DESC?= Install astversion (requires bash)
 BACKTRACE_DESC?= Stack backtrace support via (lib)execinfo
 CODECS_DESC=			Encoder/Decoder (Codec) Support
 DAHDI_DESC?=	DAHDI support
 DATABASE_DESC=			Database Support
 EXCHANGE_DESC?=	Exchange calendar support
 G729_DESC?=	Install G.729 format sounds for Music-on-Hold (MoH)
 GEOLOCATION_DESC?= Enable SIP Geolocation support
 MACRO_DESC?=	Enable app_macro (deprecated)
 MENU_DESC=			Menuselect Interface Backend
 MP3PLAYER_DESC=	Install MP3 Player for Music-On-Hold (mpg123)
 NEWG711_DESC?=	New G711 Codec
 NEWT_DESC=			Newt User Interface
 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
 
 ASTVERSION_RUN_DEPENDS=		bash:shells/bash
 BACKTRACE_CONFIGURE_WITH=	execinfo
 CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 CURL_CONFIGURE_WITH=	libcurl
 DAHDI_LIB_DEPENDS=	libpri.so:misc/libpri \
 			libopenr2.so:misc/openr2 \
 			libtonezone.so:misc/dahdi
 DAHDI_CONFIGURE_WITH=	dahdi openr2
 EXCHANGE_LIB_DEPENDS=	libneon.so:www/neon \
 			libexpat.so:textproc/expat2
 EXCHANGE_USES=		gettext-runtime
 EXCHANGE_CONFIGURE_OFF=	--without-neon --without-neon29
 FREETDS_LIB_DEPENDS=	libsybdb.so:databases/freetds
 FREETDS_CONFIGURE_ON=	--with-tds=${LOCALBASE}
 FREETDS_CONFIGURE_OFF=	--without-tds
 G729_DISTFILES=			${ASTERISK_CORE_G729_SOUNDS}:g729 \
 				${ASTERISK_MOH_G729_SOUNDS}:g729
 GEOLOCATION_USE=	GNOME=libxslt
 GSM_LIB_DEPENDS=	libgsm.so:audio/gsm
 GSM_CONFIGURE_WITH=	gsm
 LDAP_USES=		ldap
 LDAP_CONFIGURE_WITH=	ldap
 LUA_USES=		lua
 LUA_CONFIGURE_WITH=	lua
 LUA_CFLAGS=		-I${LUA_INCDIR}
 LUA_LDFLAGS=		-L${LUA_LIBDIR}
 MP3PLAYER_RUN_DEPENDS=	mpg123:audio/mpg123
 MYSQL_USES=		mysql
 MYSQL_CONFIGURE_WITH=	mysqlclient
 NCURSES_USES=		ncurses
 NEWT_LIB_DEPENDS=	libnewt.so:devel/newt
 ODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC \
 			libltdl.so:devel/libltdl
 ODBC_CONFIGURE_ON=	--with-ltdl
 ODBC_CONFIGURE_WITH=	unixodbc
 OPUS_EXTRACT_ONLY=	${DISTFILE_opus}
 OPUS_LIB_DEPENDS=	libopus.so:audio/opus
 OPUS_GH_TUPLE=		traud:asterisk-opus:83e1b458c77e0e287adeca494eeb79edb077b0ff:opus
 PGSQL_USES=		pgsql
 PGSQL_CONFIGURE_WITH=	postgres
 PJSIP_LIB_DEPENDS=	libsrtp2.so:net/libsrtp2 \
 			libspeex.so:audio/speex \
 			libspeexdsp.so:audio/speexdsp
 PJSIP_GH_TUPLE=		pjsip:pjproject:${PJSIP_VERSION}:pjsip
 PJSIP_CONFIGURE_WITH=	pjproject pjproject-bundled
 PORTAUDIO_LIB_DEPENDS=	libportaudio.so:audio/portaudio
 PORTAUDIO_CONFIGURE_WITH=	portaudio
 RADIUS_LIB_DEPENDS=	libradiusclient-ng.so:net/radiusclient
 RADIUS_CONFIGURE_WITH=	radius
 SNMP_LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp \
 			libpkg.so:${PKG_ORIGIN}
 SNMP_CONFIGURE_WITH=	netsnmp
 SPANDSP_LIB_DEPENDS=	libspandsp.so:comms/spandsp \
 			libtiff.so:graphics/tiff
 SPANDSP_CONFIGURE_WITH=	spandsp
 SPEEX_LIB_DEPENDS=	libspeex.so:audio/speex \
 			libspeexdsp.so:audio/speexdsp
 SPEEX_CONFIGURE_WITH=	speex
 SRTP_LIB_DEPENDS=	libsrtp2.so:net/libsrtp2
 SRTP_CONFIGURE_WITH=	srtp
 SYSINFO_LIB_DEPENDS=	libsysinfo.so:devel/libsysinfo
 URIPARSER_LIB_DEPENDS=	liburiparser.so:net/uriparser
 URIPARSER_CONFIGURE_WITH=	uriparser
 VORBIS_LIB_DEPENDS=	libvorbis.so:audio/libvorbis \
 			libogg.so:audio/libogg
 VORBIS_CONFIGURE_WITH=	ogg
 XMLDOC_CONFIGURE_ENABLE=	xmldoc
 XMPP_LIB_DEPENDS=	libiksemel.so:textproc/iksemel
 XMPP_CONFIGURE_WITH=	iksemel
 
 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
 ASTERISK_USER?=		asterisk
 ASTERISK_GROUP?=	asterisk
 PJSIP_VERSION=	2.12.1
 
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 USES+=		llvm:max=14
 CPP=            clang-cpp${LLVM_VERSION}
 CC=             clang${LLVM_VERSION}
 CXX=            clang++${LLVM_VERSION}
 .endif
 
 .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}
 
 .if ${PORT_OPTIONS:MGEOLOCATION}
 .if ${ARCH} == i386
 LLD_EMULATION= elf_i386
 .elif ${ARCH} == amd64
 LLD_EMULATION= elf_x86_64
 .elif ${ARCH} == aarch64
 LLD_EMULATION= aarch64elf
 .endif
 .endif
 
 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
 	@${REINPLACE_CMD} -e 's/@XMLSTARLET@//' ${WRKSRC}/makeopts.in
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/main/term.c
 .if exists(${FILESDIR}/.asterisk.makeopts)
 	${CP} ${FILESDIR}/.asterisk.makeopts ${WRKSRC}/menuselect.makeopts
 .endif
 
 post-patch-GEOLOCATION-on:
 	@${REINPLACE_CMD} -e 's/%%LLD_EMULATION%%/${LLD_EMULATION}/' ${WRKSRC}/Makefile.rules
 
 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-GEOLOCATION-on:
 	@cd ${WRKSRC} && ./menuselect/menuselect --enable res_geolocation menuselect.makeopts
 
 post-configure-GEOLOCATION-off:
 	@cd ${WRKSRC} && ./menuselect/menuselect --disable res_geolocation 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>
diff --git a/net/asterisk16/distinfo b/net/asterisk16/distinfo
index 1eb56ba98925..f952d03d80c2 100644
--- a/net/asterisk16/distinfo
+++ b/net/asterisk16/distinfo
@@ -1,11 +1,11 @@
-TIMESTAMP = 1678399461
-SHA256 (asterisk/asterisk-16.30.0.tar.gz) = f8448e8784df7fac019e459bf7c82529d80afe64ae97d73d40e6aa0e4fb39724
-SIZE (asterisk/asterisk-16.30.0.tar.gz) = 28131110
+TIMESTAMP = 1688844053
+SHA256 (asterisk/asterisk-16.30.1.tar.gz) = 8a91b0f8412d8e3dbd7172c118c52ba4ed4e016696f2778a466db094ec4b8b22
+SIZE (asterisk/asterisk-16.30.1.tar.gz) = 28234979
 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.12.1_GH0.tar.gz) = d0feef6963b07934e821ba4328aecb4c36358515c1b3e507da5874555d713533
 SIZE (asterisk/pjsip-pjproject-2.12.1_GH0.tar.gz) = 9660659
diff --git a/net/asterisk16/files/patch-configure b/net/asterisk16/files/patch-configure
index 5435e3fd970e..eed529d4a530 100644
--- a/net/asterisk16/files/patch-configure
+++ b/net/asterisk16/files/patch-configure
@@ -1,87 +1,87 @@
---- configure.orig	2022-06-23 15:21:01 UTC
-+++ configure
-@@ -5148,8 +5148,6 @@ case "${host_os}" in
+--- configure.orig	2023-07-08 22:22:44.676661000 +0200
++++ configure	2023-07-08 22:33:11.658421000 +0200
+@@ -4778,8 +4778,6 @@
       ;;
       dragonfly*|freebsd*)
       ac_default_prefix=/usr/local
 -     CPPFLAGS=-I/usr/local/include
 -     LDFLAGS=-L/usr/local/lib
       ;;
       openbsd*)
       ac_default_prefix=/usr/local
-@@ -21309,7 +21307,6 @@ then :
-   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- printf "%s\n" "yes" >&6; }
+@@ -19524,8 +19522,6 @@
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
  
--printf "%s\n" "#define HAVE_SYSINFO 1" >>confdefs.h
- 
- else $as_nop
-   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-@@ -22951,6 +22948,8 @@ printf %s "checking for getifaddrs() support... " >&6;
+-$as_echo "#define HAVE_SYSINFO 1" >>confdefs.h
+-
+ else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+@@ -21141,6 +21137,8 @@
  
  	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
 + #include <sys/types.h>
 + #include <sys/socket.h>
   #include <ifaddrs.h>
  int
- main (void)
-@@ -32266,6 +32265,8 @@ fi
+ main ()
+@@ -30484,6 +30482,8 @@
  
  for ver in ${LUA_VERSIONS:-5.4 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.
-@@ -32280,14 +32281,14 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no";
+@@ -30498,13 +30498,13 @@
        ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
        CFLAGS="${CFLAGS} "
-       as_ac_Lib=`printf "%s\n" "ac_cv_lib_lua${ver}""_luaL_newstate" | $as_tr_sh`
--{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua${ver}" >&5
--printf %s "checking for luaL_newstate in -llua${ver}... " >&6; }
-+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua-${ver}" >&5
-+printf %s "checking for luaL_newstate in -llua-${ver}... " >&6; }
- if eval test \${$as_ac_Lib+y}
- then :
-   printf %s "(cached) " >&6
- else $as_nop
+       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.  */
  
-@@ -32328,7 +32329,7 @@ fi
+@@ -30546,7 +30546,7 @@
  
     # 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"
-@@ -32338,8 +32339,8 @@ fi
+@@ -30556,8 +30556,8 @@
           # check for the header
           ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
           CPPFLAGS="${CPPFLAGS} ${LUA_INCLUDE}"
--         as_ac_Header=`printf "%s\n" "ac_cv_header_lua${ver}/lua.h" | $as_tr_sh`
--ac_fn_c_check_header_compile "$LINENO" "lua${ver}/lua.h" "$as_ac_Header" "$ac_includes_default"
-+         as_ac_Header=`printf "%s\n" "ac_cv_header_lua${vernodot}/lua.h" | $as_tr_sh`
-+ac_fn_c_check_header_compile "$LINENO" "lua${vernodot}/lua.h" "$as_ac_Header" "$ac_includes_default"
- if eval test \"x\$"$as_ac_Header"\" = x"yes"
- then :
+-         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
-@@ -32366,9 +32367,9 @@ fi
+ else
+@@ -30584,9 +30584,9 @@
  
  	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