From a7dfbd8b2ebe5d14d8ab71207d3eed42a1143148 Mon Sep 17 00:00:00 2001 From: Muhammad Moinur Rahman Date: Fri, 29 Dec 2023 23:42:55 +0100 Subject: net/asterisk16: Remove expired port 2023-12-31 net/asterisk16: Upstream EOL reaches on 2023-10-09 --- MOVED | 1 + audio/asterisk-espeak/Makefile | 6 +- audio/asterisk-flite/Makefile | 6 +- net/Makefile | 1 - net/asterisk-chan_sccp/Makefile | 11 +- net/asterisk-g72x/Makefile | 10 +- net/asterisk16/Makefile | 308 --------------- net/asterisk16/distinfo | 11 - net/asterisk16/files/asterisk.in | 86 ----- net/asterisk16/files/patch-Makefile | 126 ------ net/asterisk16/files/patch-Makefile.rules | 27 -- net/asterisk16/files/patch-agi_Makefile | 13 - .../patch-build__tools_make__xml__documentation | 11 - net/asterisk16/files/patch-channels_chan__dahdi.c | 33 -- .../files/patch-channels_sip_include_sip.h | 11 - net/asterisk16/files/patch-configure | 87 ----- net/asterisk16/files/patch-contrib_Makefile | 23 -- net/asterisk16/files/patch-main_Makefile | 14 - net/asterisk16/files/patch-main_lock.c | 12 - net/asterisk16/files/patch-main_term.c | 10 - net/asterisk16/files/patch-menuselect_configure | 11 - .../files/patch-third-party_pjproject_Makefile | 30 -- .../patch-third-party_pjproject_Makefile.rules | 20 - net/asterisk16/pkg-descr | 3 - net/asterisk16/pkg-message | 42 -- net/asterisk16/pkg-plist | 425 --------------------- 26 files changed, 6 insertions(+), 1332 deletions(-) delete mode 100644 net/asterisk16/Makefile delete mode 100644 net/asterisk16/distinfo delete mode 100644 net/asterisk16/files/asterisk.in delete mode 100644 net/asterisk16/files/patch-Makefile delete mode 100644 net/asterisk16/files/patch-Makefile.rules delete mode 100644 net/asterisk16/files/patch-agi_Makefile delete mode 100644 net/asterisk16/files/patch-build__tools_make__xml__documentation delete mode 100644 net/asterisk16/files/patch-channels_chan__dahdi.c delete mode 100644 net/asterisk16/files/patch-channels_sip_include_sip.h delete mode 100644 net/asterisk16/files/patch-configure delete mode 100644 net/asterisk16/files/patch-contrib_Makefile delete mode 100644 net/asterisk16/files/patch-main_Makefile delete mode 100644 net/asterisk16/files/patch-main_lock.c delete mode 100644 net/asterisk16/files/patch-main_term.c delete mode 100644 net/asterisk16/files/patch-menuselect_configure delete mode 100644 net/asterisk16/files/patch-third-party_pjproject_Makefile delete mode 100644 net/asterisk16/files/patch-third-party_pjproject_Makefile.rules delete mode 100644 net/asterisk16/pkg-descr delete mode 100644 net/asterisk16/pkg-message delete mode 100644 net/asterisk16/pkg-plist diff --git a/MOVED b/MOVED index 3c65169a9cf5..1c5529149562 100644 --- a/MOVED +++ b/MOVED @@ -8235,3 +8235,4 @@ graphics/sage||2023-12-31|Has expired: There has been no release for most of the dns/updatedd||2023-12-31|Has expired: Last release in 2006 and upstream is dead. Consider migrating to dns/inadyn, dns/ddclient or dns/godns multimedia/ppm2fli||2023-12-31|Has expired: BROKEN on all supported versions after the EOL of 12 www/drupal9||2023-12-31|Has expired: Upstream EOL reaches on 2023-11-01 +net/asterisk16|asterisk18|2023-12-31|Has expired: Upstream EOL reaches on 2023-10-09 diff --git a/audio/asterisk-espeak/Makefile b/audio/asterisk-espeak/Makefile index 984b8b4388e8..945435f2b685 100644 --- a/audio/asterisk-espeak/Makefile +++ b/audio/asterisk-espeak/Makefile @@ -13,13 +13,9 @@ LICENSE= GPLv2 LIB_DEPENDS= libespeak-ng.so:audio/espeak-ng \ libsamplerate.so:audio/libsamplerate -FLAVORS= asterisk18 asterisk16 +FLAVORS= asterisk18 FLAVOR?= ${FLAVORS:[1]} -asterisk16_PKGNAMEPREFIX= asterisk16- -asterisk16_BUILD_DEPENDS= asterisk:net/asterisk16 -asterisk16_RUN_DEPENDS= asterisk:net/asterisk16 - asterisk18_PKGNAMEPREFIX= asterisk18- asterisk18_BUILD_DEPENDS= asterisk:net/asterisk18 asterisk18_RUN_DEPENDS= asterisk:net/asterisk18 diff --git a/audio/asterisk-flite/Makefile b/audio/asterisk-flite/Makefile index 54436bef0e2c..9f8e21f0e28c 100644 --- a/audio/asterisk-flite/Makefile +++ b/audio/asterisk-flite/Makefile @@ -12,13 +12,9 @@ LICENSE= GPLv2 LIB_DEPENDS= libflite.so:audio/flite -FLAVORS= asterisk18 asterisk16 +FLAVORS= asterisk18 FLAVOR?= ${FLAVORS:[1]} -asterisk16_PKGNAMEPREFIX= asterisk16- -asterisk16_BUILD_DEPENDS= asterisk:net/asterisk16 -asterisk16_RUN_DEPENDS= asterisk:net/asterisk16 - asterisk18_PKGNAMEPREFIX= asterisk18- asterisk18_BUILD_DEPENDS= asterisk:net/asterisk18 asterisk18_RUN_DEPENDS= asterisk:net/asterisk18 diff --git a/net/Makefile b/net/Makefile index 0e33fb1e0993..b52574c722a7 100644 --- a/net/Makefile +++ b/net/Makefile @@ -33,7 +33,6 @@ SUBDIR += aslookup SUBDIR += asterisk-chan_sccp SUBDIR += asterisk-g72x - SUBDIR += asterisk16 SUBDIR += asterisk18 SUBDIR += astron SUBDIR += avahi diff --git a/net/asterisk-chan_sccp/Makefile b/net/asterisk-chan_sccp/Makefile index b45a27a8a77d..a9efae0693e4 100644 --- a/net/asterisk-chan_sccp/Makefile +++ b/net/asterisk-chan_sccp/Makefile @@ -12,7 +12,7 @@ WWW= https://sourceforge.net/projects/chan-sccp-b/ LICENSE= GPLv1 LICENSE_FILE= ${WRKSRC}/COPYING -FLAVORS= asterisk18 asterisk16 +FLAVORS= asterisk18 FLAVOR?= ${FLAVORS:[1]} LIB_DEPENDS= libltdl.so:devel/libltdl @@ -39,11 +39,6 @@ PLIST_FILES= etc/asterisk/sccp.conf.annotated \ lib/asterisk/modules/chan_sccp.so \ share/asterisk/documentation/thirdparty/chan_sccp-en_US.xml -asterisk16_PKGNAMEPREFIX= asterisk16- -asterisk16_CONFLICTS_INSTALL= asterisk13-chan_sccp asterisk18-chan_sccp -asterisk16_BUILD_DEPENDS= asterisk:net/asterisk16 -asterisk16_RUN_DEPENDS= asterisk:net/asterisk16 - asterisk18_PKGNAMEPREFIX= asterisk18- asterisk18_CONFLICTS_INSTALL= asterisk13-chan_sccp asterisk16-chan_sccp asterisk18_BUILD_DEPENDS= asterisk:net/asterisk18 @@ -57,9 +52,7 @@ VIDEO_DESC= Enable Video Support CONFERENCE_CONFIGURE_ENABLE= conference VIDEO_CONFIGURE_ENABLE= video -.if ${FLAVOR} == asterisk16 -CONFIGURE_ARGS+= --with-asterisk-version=16 -.elif ${FLAVOR} == asterisk18 +.if ${FLAVOR} == asterisk18 CONFIGURE_ARGS+= --with-asterisk-version=18 .endif diff --git a/net/asterisk-g72x/Makefile b/net/asterisk-g72x/Makefile index b62b61f371ba..2889e6b49106 100644 --- a/net/asterisk-g72x/Makefile +++ b/net/asterisk-g72x/Makefile @@ -11,17 +11,9 @@ WWW= http://asterisk.hosting.lv/ LIB_DEPENDS= libbcg729.so:audio/bcg729 -FLAVORS= asterisk18 asterisk16 +FLAVORS= asterisk18 FLAVOR?= ${FLAVORS:[1]} -asterisk16_PKGNAMEPREFIX= asterisk16- -asterisk16_CONFLICTS_INSTALL= asterisk13-g72x asterisk18-g72x -asterisk16_BUILD_DEPENDS= asterisk:net/asterisk16 -asterisk16_RUN_DEPENDS= asterisk:net/asterisk16 -.if ${FLAVOR} == asterisk16 -CONFIGURE_ARGS+= --with-asterisk160 -.endif - asterisk18_PKGNAMEPREFIX= asterisk18- asterisk18_CONFLICTS_INSTALL= asterisk13-g72x asterisk16-g72x asterisk18_BUILD_DEPENDS= asterisk:net/asterisk18 diff --git a/net/asterisk16/Makefile b/net/asterisk16/Makefile deleted file mode 100644 index 34ed1709fbc6..000000000000 --- a/net/asterisk16/Makefile +++ /dev/null @@ -1,308 +0,0 @@ -PORTNAME= asterisk -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 - -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) -USES+= llvm:max=14 -.endif - -.if ( ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400092 && ${SSL_DEFAULT} == base ) || ${SSL_DEFAULT:Mopenssl3*} -LIB_DEPENDS+= libgnutls.so:security/gnutls -CXXFLAGS+= -DOPENSSL_API_COMPAT=0x10100000L -LDFLAGS+= -lgnutls -.endif - -.include - -.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 diff --git a/net/asterisk16/distinfo b/net/asterisk16/distinfo deleted file mode 100644 index f952d03d80c2..000000000000 --- a/net/asterisk16/distinfo +++ /dev/null @@ -1,11 +0,0 @@ -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/asterisk.in b/net/asterisk16/files/asterisk.in deleted file mode 100644 index 5fab82c5700e..000000000000 --- a/net/asterisk16/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 -rx '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 -rx 'reload' -} - -run_rc_command "$1" diff --git a/net/asterisk16/files/patch-Makefile b/net/asterisk16/files/patch-Makefile deleted file mode 100644 index d9e5c55c759c..000000000000 --- a/net/asterisk16/files/patch-Makefile +++ /dev/null @@ -1,126 +0,0 @@ ---- Makefile.orig 2022-08-18 15:13:55 UTC -+++ Makefile -@@ -144,7 +144,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 -@@ -168,7 +168,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 - - # If the file .asterisk.makeopts is present in your home directory, you can - # include all of your favorite menuselect options so that every time you download -@@ -226,12 +226,6 @@ else ifneq ($(findstring BSD,$(OSARCH)),) - _ASTCFLAGS+=-isystem /usr/local/include - 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) -- _ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi) --endif -- - ifeq ($(OSARCH),NetBSD) - _ASTCFLAGS+=-pthread -D__LIBPTHREAD_SOURCE__ -I/usr/pkg/include - endif -@@ -475,8 +469,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 \ -@@ -545,7 +543,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}/keys/stir_shaken" -+ "$(ASTDATADIR)/third-party" "${ASTDATADIR}/keys/stir_shaken" "$(ASTSPOOLDIR)/outgoing" - - installdirs: - @for i in $(INSTALLDIRS); do \ -@@ -578,10 +576,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 -@@ -706,7 +704,7 @@ ifeq ($(ASTERISKVERSION),UNKNOWN__git_check_fail) - endif - - --install: badshell versioncheck bininstall datafiles -+install: badshell versioncheck bininstall datafiles samples - @if [ -x /usr/sbin/asterisk-post-install ]; then \ - /usr/sbin/asterisk-post-install "$(DESTDIR)" . ; \ - fi -@@ -751,23 +749,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|^astcachedir.*$$|astcachedir => $(ASTCACHEDIR)|' \ - -e 's|^astetcdir.*$$|astetcdir => $(ASTETCDIR)|' \ -@@ -781,8 +766,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 -@@ -816,7 +801,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/asterisk16/files/patch-Makefile.rules b/net/asterisk16/files/patch-Makefile.rules deleted file mode 100644 index 9815b1524554..000000000000 --- a/net/asterisk16/files/patch-Makefile.rules +++ /dev/null @@ -1,27 +0,0 @@ ---- Makefile.rules.orig 2022-08-18 15:13:55 UTC -+++ Makefile.rules -@@ -107,6 +107,11 @@ ifeq ($(C_COMPILER_FAMILY),clang) - # Clang -Werror warning suppressions - ifeq ($(C_COMPILER_FAMILY),clang) - CC_CFLAGS+=-Wno-unused-value -Wno-parentheses-equality -+ BINARY_LLD_FLAGS= -z noexecstack -+ LLD_EMULATION=%%LLD_EMULATION%% -+else -+ BINARY_LLD_FLAGS= -+ LLD_EMULATION= - endif - - ifeq ($(GNU_LD),1) -@@ -213,10 +218,10 @@ endif - # extern const size_t _binary_abc_def_xml_size; - %.o: %.xml - $(ECHO_PREFIX) echo " [LD] $^ -> $@" -- $(CMD_PREFIX) $(CC) -g -nostartfiles -nodefaultlibs -nostdlib -r -Wl,-b,binary -o $@ $^ -+ $(CMD_PREFIX) $(CC) -g -nostartfiles -nodefaultlibs -nostdlib $(BINARY_LLD_FLAGS) -r -Wl,-b,binary,-m,$(LLD_EMULATION) -o $@ $^ - - %.o: %.xslt - $(ECHO_PREFIX) echo " [LD] $^ -> $@" -- $(CMD_PREFIX) $(CC) -g -nostartfiles -nodefaultlibs -nostdlib -r -Wl,-b,binary -o $@ $^ -+ $(CMD_PREFIX) $(CC) -g -nostartfiles -nodefaultlibs -nostdlib $(BINARY_LLD_FLAGS) -r -Wl,-b,binary,-m,$(LLD_EMULATION) -o $@ $^ - - dist-clean:: clean diff --git a/net/asterisk16/files/patch-agi_Makefile b/net/asterisk16/files/patch-agi_Makefile deleted file mode 100644 index 019ad10e1ef9..000000000000 --- a/net/asterisk16/files/patch-agi_Makefile +++ /dev/null @@ -1,13 +0,0 @@ ---- agi/Makefile.orig 2020-07-09 15:39:17 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/asterisk16/files/patch-build__tools_make__xml__documentation b/net/asterisk16/files/patch-build__tools_make__xml__documentation deleted file mode 100644 index 05202d303aee..000000000000 --- a/net/asterisk16/files/patch-build__tools_make__xml__documentation +++ /dev/null @@ -1,11 +0,0 @@ ---- build_tools/make_xml_documentation.orig 2022-06-23 15:21:01 UTC -+++ build_tools/make_xml_documentation -@@ -214,7 +214,7 @@ for subdir in ${mod_subdirs} ; do - ${XMLSTARLET} val -e -d "${source_tree}/doc/appdocsxml.dtd" "${i}" || { echo "" ; exit 1 ; } - fi - fi -- ${SED} -r "/^\s*(<[?]xml|<.DOCTYPE|<.?docs)/d" "${i}" >> "${output_file}" -+ ${SED} -r "/^[[:space:]]*(<[?]xml|<.DOCTYPE|<.?docs)/d" "${i}" >> "${output_file}" - done - done - echo "" >> "${output_file}" diff --git a/net/asterisk16/files/patch-channels_chan__dahdi.c b/net/asterisk16/files/patch-channels_chan__dahdi.c deleted file mode 100644 index 69d226ee9b37..000000000000 --- a/net/asterisk16/files/patch-channels_chan__dahdi.c +++ /dev/null @@ -1,33 +0,0 @@ ---- channels/chan_dahdi.c.orig 2022-08-18 15:13:55 UTC -+++ channels/chan_dahdi.c -@@ -4803,6 +4803,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) -@@ -4833,7 +4835,9 @@ 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 { -@@ -4867,8 +4871,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/asterisk16/files/patch-channels_sip_include_sip.h b/net/asterisk16/files/patch-channels_sip_include_sip.h deleted file mode 100644 index 7b1c3c6d7325..000000000000 --- a/net/asterisk16/files/patch-channels_sip_include_sip.h +++ /dev/null @@ -1,11 +0,0 @@ ---- channels/sip/include/sip.h.orig 2022-06-23 15:21:01 UTC -+++ channels/sip/include/sip.h -@@ -193,7 +193,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/asterisk16/files/patch-configure b/net/asterisk16/files/patch-configure deleted file mode 100644 index eed529d4a530..000000000000 --- a/net/asterisk16/files/patch-configure +++ /dev/null @@ -1,87 +0,0 @@ ---- 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 -@@ -19524,8 +19522,6 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 - $as_echo "yes" >&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 -+ #include - #include - int - 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. -@@ -30498,13 +30498,13 @@ - 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. */ - -@@ -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" -@@ -30556,8 +30556,8 @@ - # 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 -@@ -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 diff --git a/net/asterisk16/files/patch-contrib_Makefile b/net/asterisk16/files/patch-contrib_Makefile deleted file mode 100644 index dc38a639baad..000000000000 --- a/net/asterisk16/files/patch-contrib_Makefile +++ /dev/null @@ -1,23 +0,0 @@ ---- contrib/Makefile.orig 2020-07-09 15:39:17 UTC -+++ contrib/Makefile -@@ -24,14 +24,14 @@ 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/refstats.py "$(DESTDIR)$(ASTDATADIR)/scripts/refstats.py" -- $(INSTALL) -m 755 scripts/reflocks.py "$(DESTDIR)$(ASTDATADIR)/scripts/reflocks.py" -+# $(INSTALL) -m 755 scripts/refcounter.py "$(DESTDIR)$(ASTDATADIR)/scripts/refcounter.py" -+# $(INSTALL) -m 755 scripts/refstats.py "$(DESTDIR)$(ASTDATADIR)/scripts/refstats.py" -+# $(INSTALL) -m 755 scripts/reflocks.py "$(DESTDIR)$(ASTDATADIR)/scripts/reflocks.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/refstats.py" -- -rm -f "$(DESTDIR)$(ASTDATADIR)/scripts/reflocks.py" -+# -rm -f "$(DESTDIR)$(ASTDATADIR)/scripts/refcounter.py" -+# -rm -f "$(DESTDIR)$(ASTDATADIR)/scripts/refstats.py" -+# -rm -f "$(DESTDIR)$(ASTDATADIR)/scripts/reflocks.py" diff --git a/net/asterisk16/files/patch-main_Makefile b/net/asterisk16/files/patch-main_Makefile deleted file mode 100644 index 00e93713ba49..000000000000 --- a/net/asterisk16/files/patch-main_Makefile +++ /dev/null @@ -1,14 +0,0 @@ ---- main/Makefile.orig 2022-08-18 15:13:55 UTC -+++ main/Makefile -@@ -79,9 +79,8 @@ else - 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) -- AST_LIBS+=$(shell if test $(BSDVERSION) -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi) -+ AST_LIBS+=-pthread -+ CRYPT_LIB=-lcrypt - AST_LIBS+=-lcrypto - endif - diff --git a/net/asterisk16/files/patch-main_lock.c b/net/asterisk16/files/patch-main_lock.c deleted file mode 100644 index 019735f7079f..000000000000 --- a/net/asterisk16/files/patch-main_lock.c +++ /dev/null @@ -1,12 +0,0 @@ ---- main/lock.c.orig 2020-07-09 15:39:17 UTC -+++ main/lock.c -@@ -689,9 +689,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/asterisk16/files/patch-main_term.c b/net/asterisk16/files/patch-main_term.c deleted file mode 100644 index 3594c04dcd0f..000000000000 --- a/net/asterisk16/files/patch-main_term.c +++ /dev/null @@ -1,10 +0,0 @@ ---- main/term.c.orig 2022-06-23 15:21:01 UTC -+++ main/term.c -@@ -46,6 +46,7 @@ static char enddata[80] = ""; - static char quitdata[80] = ""; - - static const char * const termpath[] = { -+ "%%LOCALBASE%%/share/terminfo", - "/usr/share/terminfo", - "/usr/local/share/misc/terminfo", - "/usr/lib/terminfo", diff --git a/net/asterisk16/files/patch-menuselect_configure b/net/asterisk16/files/patch-menuselect_configure deleted file mode 100644 index 20a2f48603da..000000000000 --- a/net/asterisk16/files/patch-menuselect_configure +++ /dev/null @@ -1,11 +0,0 @@ ---- menuselect/configure.orig 2022-06-23 15:21:01 UTC -+++ menuselect/configure -@@ -5099,7 +5099,7 @@ else - printf "%s\n" "yes" >&6; } - - PBX_LIBXML2=1 -- LIBXML2_INCLUDE=$(echo ${LIBXML2_CFLAGS} | $SED -e "s|-std=c99||g") -+ LIBXML2_INCLUDE=$(echo ${LIBXML2_CFLAGS} | sed -e "s|-std=c99||g") - LIBXML2_LIB="$LIBXML2_LIBS" - - printf "%s\n" "#define HAVE_LIBXML2 1" >>confdefs.h diff --git a/net/asterisk16/files/patch-third-party_pjproject_Makefile b/net/asterisk16/files/patch-third-party_pjproject_Makefile deleted file mode 100644 index 45ae5db97c97..000000000000 --- a/net/asterisk16/files/patch-third-party_pjproject_Makefile +++ /dev/null @@ -1,30 +0,0 @@ ---- third-party/pjproject/Makefile.orig 2022-02-03 12:19:37 UTC -+++ third-party/pjproject/Makefile -@@ -88,15 +88,11 @@ SHELL_ECHO_PREFIX := echo '[pjproject] ' - - _all: $(TARGETS) - --$(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)) ;\ -- $(SHELL_ECHO_PREFIX) Unpacking $< ;\ -+ $(SHELL_ECHO_PREFIX) Unpacking $< ;\ - rm -rf source pjproject-*/ $(REALLY_QUIET) || : ;\ - $(TAR) -xjf $< ;\ - mv pjproject-$(PJPROJECT_VERSION) source -@@ -202,7 +198,7 @@ $(ALL_LIB_FILES): source/build.mak source/pjlib/includ - - 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/asterisk16/files/patch-third-party_pjproject_Makefile.rules b/net/asterisk16/files/patch-third-party_pjproject_Makefile.rules deleted file mode 100644 index 424b4f4a3740..000000000000 --- a/net/asterisk16/files/patch-third-party_pjproject_Makefile.rules +++ /dev/null @@ -1,20 +0,0 @@ ---- third-party/pjproject/Makefile.rules.orig 2020-07-09 15:39:17 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/asterisk16/pkg-descr b/net/asterisk16/pkg-descr deleted file mode 100644 index 52bfedc88569..000000000000 --- a/net/asterisk16/pkg-descr +++ /dev/null @@ -1,3 +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. diff --git a/net/asterisk16/pkg-message b/net/asterisk16/pkg-message deleted file mode 100644 index c32bcc7656ec..000000000000 --- a/net/asterisk16/pkg-message +++ /dev/null @@ -1,42 +0,0 @@ -[ -{ type: install - message: <