svn commit: r483629 - in head: . audio/asterisk-espeak audio/asterisk-flite net net/asterisk-g72x net/asterisk13 net/asterisk15 net/asterisk16 net/asterisk16/files
Guido Falsi
madpilot at FreeBSD.org
Wed Oct 31 23:42:57 UTC 2018
Author: madpilot
Date: Wed Oct 31 23:42:52 2018
New Revision: 483629
URL: https://svnweb.freebsd.org/changeset/ports/483629
Log:
- Add asterisk 16.0.0 to ports
- Update g72x module to 1.4.3, which add support for asterisk 16
- Add asterisk16 flavor and conflicts to asterisk modules ports
which support it
- Add conflicts to other asterisk versions ports
- Add deprecation notice to asterisk15 which will reach EOL on
2019-10-03
- Fix wording on SOUNDS option description
- Remove old MOVED line for asterisk16 which was for the long removed
asterisk 1.6 version
Approved by: portmgr (flavors already approved in the past)
Added:
head/net/asterisk16/
- copied from r481702, head/net/asterisk15/
Modified:
head/MOVED
head/audio/asterisk-espeak/Makefile
head/audio/asterisk-flite/Makefile
head/net/Makefile
head/net/asterisk-g72x/Makefile
head/net/asterisk-g72x/distinfo
head/net/asterisk13/Makefile
head/net/asterisk15/Makefile
head/net/asterisk16/Makefile
head/net/asterisk16/distinfo
head/net/asterisk16/files/patch-Makefile
head/net/asterisk16/files/patch-channels-chan_dahdi.c
head/net/asterisk16/files/patch-configure
head/net/asterisk16/files/patch-main__Makefile
head/net/asterisk16/files/patch-main__asterisk.exports.in
head/net/asterisk16/files/patch-main__lock.c
head/net/asterisk16/pkg-plist
Modified: head/MOVED
==============================================================================
--- head/MOVED Wed Oct 31 23:36:03 2018 (r483628)
+++ head/MOVED Wed Oct 31 23:42:52 2018 (r483629)
@@ -3593,7 +3593,6 @@ misc/gpt||2012-08-20|Has expired: was a dependency for
www/xxxterm|www/xombrero|2012-08-20|Project renamed
www/cakephp2|www/cakephp21|2012-08-21|Moved to match port version
databases/libudbc||2012-08-21|Has expired: Does not fetch and no vendor support anymore
-net/asterisk16||2012-08-22|Unsupported upstream, please use net/asterisk instead
net/asterisk16-addons||2012-08-22|Unsupported upstream, now part of net/asterisk
databases/edb||2012-08-26|Has expired: Deprecated by enlightenment.org team
databases/php5-rrdtool||2012-08-26|Has expired: deprecated via upstream please use databases/pecl-rrd
Modified: head/audio/asterisk-espeak/Makefile
==============================================================================
--- head/audio/asterisk-espeak/Makefile Wed Oct 31 23:36:03 2018 (r483628)
+++ head/audio/asterisk-espeak/Makefile Wed Oct 31 23:42:52 2018 (r483629)
@@ -14,18 +14,23 @@ LICENSE= GPLv2
LIB_DEPENDS= libespeak.so:audio/espeak \
libsamplerate.so:audio/libsamplerate
-FLAVORS= asterisk13 asterisk15
+FLAVORS= asterisk13 asterisk15 asterisk16
FLAVOR?= ${FLAVORS[1]}
asterisk13_PKGNAMEPREFIX= asterisk13-
-asterisk13_CONFLICTS_INSTALL= asterisk15-espeak
+asterisk13_CONFLICTS_INSTALL= asterisk15-espeak asterisk16-espeak
asterisk13_BUILD_DEPENDS= asterisk:net/asterisk13
asterisk13_RUN_DEPENDS= asterisk:net/asterisk13
asterisk15_PKGNAMEPREFIX= asterisk15-
-asterisk15_CONFLICTS_INSTALL= asterisk13-espeak
+asterisk15_CONFLICTS_INSTALL= asterisk13-espeak asterisk16-espeak
asterisk15_BUILD_DEPENDS= asterisk:net/asterisk15
asterisk15_RUN_DEPENDS= asterisk:net/asterisk15
+
+asterisk16_PKGNAMEPREFIX= asterisk16-
+asterisk16_CONFLICTS_INSTALL= asterisk13-espeak asterisk15-espeak
+asterisk16_BUILD_DEPENDS= asterisk:net/asterisk16
+asterisk16_RUN_DEPENDS= asterisk:net/asterisk16
USES= compiler gmake localbase
INSTALL_TARGET= install samples
Modified: head/audio/asterisk-flite/Makefile
==============================================================================
--- head/audio/asterisk-flite/Makefile Wed Oct 31 23:36:03 2018 (r483628)
+++ head/audio/asterisk-flite/Makefile Wed Oct 31 23:42:52 2018 (r483629)
@@ -13,18 +13,23 @@ LICENSE= GPLv2
LIB_DEPENDS= libflite.so:audio/flite
-FLAVORS= asterisk13 asterisk15
+FLAVORS= asterisk13 asterisk15 asterisk16
FLAVOR?= ${FLAVORS[1]}
asterisk13_PKGNAMEPREFIX= asterisk13-
-asterisk13_CONFLICTS_INSTALL= asterisk15-flite
+asterisk13_CONFLICTS_INSTALL= asterisk15-flite asterisk16-flite
asterisk13_BUILD_DEPENDS= asterisk:net/asterisk13
asterisk13_RUN_DEPENDS= asterisk:net/asterisk13
asterisk15_PKGNAMEPREFIX= asterisk15-
-asterisk15_CONFLICTS_INSTALL= asterisk13-flite
+asterisk15_CONFLICTS_INSTALL= asterisk13-flite asterisk16-flite
asterisk15_BUILD_DEPENDS= asterisk:net/asterisk15
asterisk15_RUN_DEPENDS= asterisk:net/asterisk15
+
+asterisk16_PKGNAMEPREFIX= asterisk16-
+asterisk16_CONFLICTS_INSTALL= asterisk13-flite asterisk15-flite
+asterisk16_BUILD_DEPENDS= asterisk:net/asterisk16
+asterisk16_RUN_DEPENDS= asterisk:net/asterisk16
USES= compiler gmake localbase
INSTALL_TARGET= install samples
Modified: head/net/Makefile
==============================================================================
--- head/net/Makefile Wed Oct 31 23:36:03 2018 (r483628)
+++ head/net/Makefile Wed Oct 31 23:42:52 2018 (r483629)
@@ -34,6 +34,7 @@
SUBDIR += asterisk-g72x
SUBDIR += asterisk13
SUBDIR += asterisk15
+ SUBDIR += asterisk16
SUBDIR += avahi
SUBDIR += avahi-app
SUBDIR += avahi-autoipd
Modified: head/net/asterisk-g72x/Makefile
==============================================================================
--- head/net/asterisk-g72x/Makefile Wed Oct 31 23:36:03 2018 (r483628)
+++ head/net/asterisk-g72x/Makefile Wed Oct 31 23:42:52 2018 (r483629)
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= g72x
-PORTVERSION= 1.4.2
-PORTREVISION= 1
+PORTVERSION= 1.4.3
CATEGORIES= net
MASTER_SITES= http://asterisk.hosting.lv/src/
DISTNAME= asterisk-${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
@@ -12,20 +11,26 @@ COMMENT= G.729 codec for Asterisk PBX
LIB_DEPENDS= libbcg729.so:audio/bcg729
-FLAVORS= asterisk13 asterisk15
+FLAVORS= asterisk13 asterisk15 asterisk16
FLAVOR?= ${FLAVORS[1]}
asterisk13_PKGNAMEPREFIX= asterisk13-
-asterisk13_CONFLICTS_INSTALL= asterisk15-g72x
+asterisk13_CONFLICTS_INSTALL= asterisk15-g72x asterisk16-g72x
asterisk13_BUILD_DEPENDS= asterisk:net/asterisk13
asterisk13_RUN_DEPENDS= asterisk:net/asterisk13
asterisk15_CONFIGURE_ARGS= --with-asterisk130
asterisk15_PKGNAMEPREFIX= asterisk15-
-asterisk15_CONFLICTS_INSTALL= asterisk13-g72x
+asterisk15_CONFLICTS_INSTALL= asterisk13-g72x asterisk16-g72x
asterisk15_BUILD_DEPENDS= asterisk:net/asterisk15
asterisk15_RUN_DEPENDS= asterisk:net/asterisk15
asterisk15_CONFIGURE_ARGS= --with-asterisk150
+
+asterisk16_PKGNAMEPREFIX= asterisk16-
+asterisk16_CONFLICTS_INSTALL= asterisk13-g72x asterisk15-g72x
+asterisk16_BUILD_DEPENDS= asterisk:net/asterisk16
+asterisk16_RUN_DEPENDS= asterisk:net/asterisk16
+asterisk16_CONFIGURE_ARGS= --with-asterisk160
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-bcg729
Modified: head/net/asterisk-g72x/distinfo
==============================================================================
--- head/net/asterisk-g72x/distinfo Wed Oct 31 23:36:03 2018 (r483628)
+++ head/net/asterisk-g72x/distinfo Wed Oct 31 23:42:52 2018 (r483629)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1521966069
-SHA256 (asterisk-g72x-1.4.2.tar.bz2) = 0c6cb1a61d408c882ce3fe10db4d467407ce3863f672a91aa7d3aea082a23fbc
-SIZE (asterisk-g72x-1.4.2.tar.bz2) = 125789
+TIMESTAMP = 1539248414
+SHA256 (asterisk-g72x-1.4.3.tar.bz2) = ffea55374c2134415569b876a68d9a12ce376146a22fad3963c8edc281052adf
+SIZE (asterisk-g72x-1.4.3.tar.bz2) = 126220
Modified: head/net/asterisk13/Makefile
==============================================================================
--- head/net/asterisk13/Makefile Wed Oct 31 23:36:03 2018 (r483628)
+++ head/net/asterisk13/Makefile Wed Oct 31 23:42:52 2018 (r483629)
@@ -54,7 +54,7 @@ MAKE_ARGS+= NOISY_BUILD=yes \
CONFLICTS= ossp-uuid-[0-9]*
CONFLICTS_BUILD= linuxthreads-*
-CONFLICTS_INSTALL= asterisk15
+CONFLICTS_INSTALL= asterisk15 asterisk16
OPTIONS_DEFINE= ASTVERSION BACKTRACE CURL EXCHANGE FREETDS LDAP LUA \
MP3PLAYER OOH323 OPTIMIZED_CFLAGS PJSIP PORTAUDIO RADIUS SNMP \
@@ -92,7 +92,7 @@ NEWT_DESC= Newt User Interface
OPTIONS_GROUP+= SOUNDS
OPTIONS_GROUP_SOUNDS= G729 JAPANESE
-SOUNDS_DESC= Core and/or Music-on-Hold (MoH) Sound Files
+SOUNDS_DESC= Core and Music-on-Hold (MoH) Sound Files
G729_DESC= Install G.729 format sounds
JAPANESE_DESC= Install Japanese voice prompts
ASTERISK_CORE_G729_SOUNDS= asterisk-core-sounds-en-g729-1.5.tar.gz
Modified: head/net/asterisk15/Makefile
==============================================================================
--- head/net/asterisk15/Makefile Wed Oct 31 23:36:03 2018 (r483628)
+++ head/net/asterisk15/Makefile Wed Oct 31 23:42:52 2018 (r483629)
@@ -16,6 +16,9 @@ COMMENT= Open Source PBX and telephony toolkit
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE
+DEPRECATED= Asterisk 15.x will reach EOL on 2019-10-03. Please migrate to net/asterisk16
+EXPIRATION_DATE=2019-10-03
+
LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid \
libjansson.so:devel/jansson
@@ -55,7 +58,7 @@ MAKE_ARGS+= NOISY_BUILD=yes \
CONFLICTS= ossp-uuid-[0-9]*
CONFLICTS_BUILD= linuxthreads-*
-CONFLICTS_INSTALL= asterisk13
+CONFLICTS_INSTALL= asterisk13 asterisk16
OPTIONS_DEFINE= ASTVERSION BACKTRACE CURL EXCHANGE FREETDS LDAP LUA \
MP3PLAYER OOH323 OPTIMIZED_CFLAGS PJSIP PORTAUDIO RADIUS SNMP \
@@ -93,7 +96,7 @@ NEWT_DESC= Newt User Interface
OPTIONS_GROUP+= SOUNDS
OPTIONS_GROUP_SOUNDS= G729 JAPANESE
-SOUNDS_DESC= Core and/or Music-on-Hold (MoH) Sound Files
+SOUNDS_DESC= Core and Music-on-Hold (MoH) Sound Files
G729_DESC= Install G.729 format sounds
JAPANESE_DESC= Install Japanese voice prompts
ASTERISK_CORE_G729_SOUNDS= asterisk-core-sounds-en-g729-1.5.tar.gz
Modified: head/net/asterisk16/Makefile
==============================================================================
--- head/net/asterisk15/Makefile Wed Oct 10 08:25:57 2018 (r481702)
+++ head/net/asterisk16/Makefile Wed Oct 31 23:42:52 2018 (r483629)
@@ -1,13 +1,13 @@
# $FreeBSD$
PORTNAME= asterisk
-PORTVERSION= 15.6.1
+PORTVERSION= 16.0.0
CATEGORIES= net
MASTER_SITES= https://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729
MASTER_SITE_SUBDIR= asterisk/ \
asterisk/old-releases/ \
sounds/releases/:g729
-PKGNAMESUFFIX= 15
+PKGNAMESUFFIX= 16
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= madpilot at FreeBSD.org
@@ -55,7 +55,7 @@ MAKE_ARGS+= NOISY_BUILD=yes \
CONFLICTS= ossp-uuid-[0-9]*
CONFLICTS_BUILD= linuxthreads-*
-CONFLICTS_INSTALL= asterisk13
+CONFLICTS_INSTALL= asterisk13 asterisk15
OPTIONS_DEFINE= ASTVERSION BACKTRACE CURL EXCHANGE FREETDS LDAP LUA \
MP3PLAYER OOH323 OPTIMIZED_CFLAGS PJSIP PORTAUDIO RADIUS SNMP \
@@ -93,7 +93,7 @@ NEWT_DESC= Newt User Interface
OPTIONS_GROUP+= SOUNDS
OPTIONS_GROUP_SOUNDS= G729 JAPANESE
-SOUNDS_DESC= Core and/or Music-on-Hold (MoH) Sound Files
+SOUNDS_DESC= Core and Music-on-Hold (MoH) Sound Files
G729_DESC= Install G.729 format sounds
JAPANESE_DESC= Install Japanese voice prompts
ASTERISK_CORE_G729_SOUNDS= asterisk-core-sounds-en-g729-1.5.tar.gz
Modified: head/net/asterisk16/distinfo
==============================================================================
--- head/net/asterisk15/distinfo Wed Oct 10 08:25:57 2018 (r481702)
+++ head/net/asterisk16/distinfo Wed Oct 31 23:42:52 2018 (r483629)
@@ -1,6 +1,6 @@
-TIMESTAMP = 1537517995
-SHA256 (asterisk-15.6.1.tar.gz) = 9cb86585fb4efcd86423fa7586e55d9d3c74fda43a2e0b1b9c9eb3742df73155
-SIZE (asterisk-15.6.1.tar.gz) = 27692982
+TIMESTAMP = 1539154646
+SHA256 (asterisk-16.0.0.tar.gz) = 49fae7b140ef579c5a31eb77ef4e433e3a28d9db6cae1c16fe05fdf41e4b263d
+SIZE (asterisk-16.0.0.tar.gz) = 27713317
SHA256 (asterisk-core-sounds-en-g729-1.5.tar.gz) = 8b28a59cfa53b59c76e0a191704f0708e3d83acffab8c5e6f25dfc599f0123f9
SIZE (asterisk-core-sounds-en-g729-1.5.tar.gz) = 1551123
SHA256 (asterisk-moh-opsound-g729-2.03.tar.gz) = 0147ca9a97f0c550227aacb7793499057c4d2c64e021c95f93722f27d5549585
Modified: head/net/asterisk16/files/patch-Makefile
==============================================================================
--- head/net/asterisk15/files/patch-Makefile Wed Oct 10 08:25:57 2018 (r481702)
+++ head/net/asterisk16/files/patch-Makefile Wed Oct 31 23:42:52 2018 (r483629)
@@ -1,6 +1,6 @@
---- Makefile.orig 2018-08-28 19:19:14 UTC
+--- Makefile.orig 2018-08-08 16:02:31 UTC
+++ Makefile
-@@ -141,7 +141,7 @@ ASTTOPDIR:=$(subst $(space),\$(space),$(CURDIR))
+@@ -138,7 +138,7 @@ ASTTOPDIR:=$(subst $(space),\$(space),$(CURDIR))
OVERWRITE=y
# Include debug and macro symbols in the executables (-g) and profiling info (-pg)
@@ -9,7 +9,7 @@
# Asterisk.conf is located in ASTETCDIR or by using the -C flag
# when starting Asterisk
-@@ -165,7 +165,7 @@ LINKER_SYMBOL_PREFIX=
+@@ -162,7 +162,7 @@ LINKER_SYMBOL_PREFIX=
#_ASTCFLAGS+=-DOLD_DSP_ROUTINES
# Default install directory for DAHDI hooks.
@@ -18,7 +18,7 @@
# 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
-@@ -225,7 +225,7 @@ endif
+@@ -222,7 +222,7 @@ endif
ifeq ($(OSARCH),FreeBSD)
# -V is understood by BSD Make, not by GNU make.
@@ -27,7 +27,7 @@
_ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi)
endif
-@@ -465,8 +465,12 @@ endif
+@@ -462,8 +462,12 @@ endif
$(INSTALL) -m 644 $$n "$(DESTDIR)$(ASTDATADIR)/static-http/docs" ; \
done \
fi
@@ -41,7 +41,7 @@
done
$(MAKE) -C sounds install
find rest-api -name "*.json" | while read x; do \
-@@ -565,7 +569,7 @@ INSTALLDIRS="$(ASTLIBDIR)" "$(ASTMODDIR)" "$(ASTSBINDI
+@@ -562,7 +566,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)" \
@@ -50,7 +50,7 @@
installdirs:
@for i in $(INSTALLDIRS); do \
-@@ -604,10 +608,10 @@ endif
+@@ -601,10 +605,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
@@ -65,7 +65,7 @@
$(SUBDIRS_INSTALL):
+ at DESTDIR="$(DESTDIR)" ASTSBINDIR="$(ASTSBINDIR)" ASTDATADIR="$(ASTDATADIR)" $(SUBMAKE) -C $(@:-install=) install
-@@ -722,7 +726,7 @@ ifneq ($(filter ~%,$(DESTDIR)),)
+@@ -719,7 +723,7 @@ ifneq ($(filter ~%,$(DESTDIR)),)
@exit 1
endif
@@ -74,10 +74,10 @@
@if [ -x /usr/sbin/asterisk-post-install ]; then \
/usr/sbin/asterisk-post-install "$(DESTDIR)" . ; \
fi
-@@ -767,23 +771,10 @@ upgrade: bininstall
+@@ -764,23 +768,10 @@ upgrade: bininstall
# (2) the extension to strip off
define INSTALL_CONFIGS
- @for x in $(1)/*$(2); do \
+ @for x in configs/$(1)/*$(2); do \
- dst="$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x $(2)`"; \
- if [ -f "$${dst}" ]; then \
- if [ "$(OVERWRITE)" = "y" ]; then \
@@ -93,14 +93,14 @@
- fi ; \
echo "Installing file $$x"; \
- $(INSTALL) -m 644 "$$x" "$${dst}" ;\
-+ $(INSTALL) -m 644 "$$x" "$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`.sample" ; \
++ $(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)|' \
-@@ -796,8 +787,8 @@ define INSTALL_CONFIGS
+@@ -793,8 +784,8 @@ define INSTALL_CONFIGS
-e 's|^astrundir.*$$|astrundir => $(ASTVARRUNDIR)|' \
-e 's|^astlogdir.*$$|astlogdir => $(ASTLOGDIR)|' \
-e 's|^astsbindir.*$$|astsbindir => $(ASTSBINDIR)|' \
@@ -111,7 +111,7 @@
rm -f "$(DESTDIR)$(ASTCONFPATH).tmp" ; \
fi
endef
-@@ -821,7 +812,7 @@ adsi:
+@@ -810,7 +801,7 @@ adsi:
else \
echo "Installing $$x" ; \
fi ; \
Modified: head/net/asterisk16/files/patch-channels-chan_dahdi.c
==============================================================================
--- head/net/asterisk15/files/patch-channels-chan_dahdi.c Wed Oct 10 08:25:57 2018 (r481702)
+++ head/net/asterisk16/files/patch-channels-chan_dahdi.c Wed Oct 31 23:42:52 2018 (r483629)
@@ -1,6 +1,6 @@
---- channels/chan_dahdi.c.orig 2017-12-20 20:39:39 UTC
+--- channels/chan_dahdi.c.orig 2018-08-08 16:02:31 UTC
+++ channels/chan_dahdi.c
-@@ -4589,6 +4589,8 @@ void dahdi_ec_enable(struct dahdi_pvt *p)
+@@ -4599,6 +4599,8 @@ void dahdi_ec_enable(struct dahdi_pvt *p)
return;
}
if (p->echocancel.head.tap_length) {
@@ -9,7 +9,7 @@
#if defined(HAVE_PRI) || defined(HAVE_SS7)
switch (p->sig) {
#if defined(HAVE_PRI)
-@@ -4619,7 +4621,9 @@ void dahdi_ec_enable(struct dahdi_pvt *p)
+@@ -4629,7 +4631,9 @@ void dahdi_ec_enable(struct dahdi_pvt *p)
break;
}
#endif /* defined(HAVE_PRI) || defined(HAVE_SS7) */
@@ -20,7 +20,7 @@
if (res) {
ast_log(LOG_WARNING, "Unable to enable echo cancellation on channel %d (%s)\n", p->channel, strerror(errno));
} else {
-@@ -4653,8 +4657,9 @@ void dahdi_ec_disable(struct dahdi_pvt *p)
+@@ -4663,8 +4667,9 @@ void dahdi_ec_disable(struct dahdi_pvt *p)
if (p->echocanon) {
struct dahdi_echocanparams ecp = { .tap_length = 0 };
Modified: head/net/asterisk16/files/patch-configure
==============================================================================
--- head/net/asterisk15/files/patch-configure Wed Oct 10 08:25:57 2018 (r481702)
+++ head/net/asterisk16/files/patch-configure Wed Oct 31 23:42:52 2018 (r483629)
@@ -1,15 +1,15 @@
---- configure.orig 2018-04-19 18:45:51 UTC
+--- configure.orig 2018-08-08 16:02:31 UTC
+++ configure
-@@ -4676,8 +4676,6 @@ case "${host_os}" in
+@@ -4661,8 +4661,6 @@ case "${host_os}" in
;;
- freebsd*)
+ dragonfly*|freebsd*)
ac_default_prefix=/usr/local
- CPPFLAGS=-I/usr/local/include
- LDFLAGS=-L/usr/local/lib
;;
openbsd*)
ac_default_prefix=/usr/local
-@@ -20680,6 +20678,8 @@ $as_echo_n "checking for getifaddrs() support... " >&6
+@@ -20328,6 +20326,8 @@ $as_echo_n "checking for getifaddrs() support... " >&6
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -18,7 +18,7 @@
#include <ifaddrs.h>
int
main ()
-@@ -29299,6 +29299,8 @@ fi
+@@ -29156,6 +29156,8 @@ fi
for ver in 5.3 5.2 5.1; do
@@ -27,7 +27,7 @@
if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no"; then
pbxlibdir=""
# if --with-LUA=DIR has been specified, use it.
-@@ -29313,13 +29315,13 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no";
+@@ -29170,13 +29172,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`
@@ -44,7 +44,7 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -29361,7 +29363,7 @@ fi
+@@ -29218,7 +29220,7 @@ fi
# now check for the header.
if test "${AST_LUA_FOUND}" = "yes"; then
@@ -53,7 +53,7 @@
# if --with-LUA=DIR has been specified, use it.
if test "x${LUA_DIR}" != "x"; then
LUA_INCLUDE="-I${LUA_DIR}/include"
-@@ -29371,8 +29373,8 @@ fi
+@@ -29228,8 +29230,8 @@ fi
# check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${LUA_INCLUDE}"
@@ -64,7 +64,7 @@
if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
LUA_HEADER_FOUND=1
else
-@@ -29399,9 +29401,9 @@ fi
+@@ -29256,9 +29258,9 @@ fi
if test "x${PBX_LUA}" = "x1" ; then
if test x"${LUA_DIR}" = x; then
Modified: head/net/asterisk16/files/patch-main__Makefile
==============================================================================
--- head/net/asterisk15/files/patch-main__Makefile Wed Oct 10 08:25:57 2018 (r481702)
+++ head/net/asterisk16/files/patch-main__Makefile Wed Oct 31 23:42:52 2018 (r483629)
@@ -1,6 +1,6 @@
---- main/Makefile.orig 2017-10-13 17:46:56 UTC
+--- main/Makefile.orig 2018-08-08 16:02:31 UTC
+++ main/Makefile
-@@ -75,9 +75,12 @@ endif
+@@ -80,9 +80,12 @@ endif
ifeq ($(OSARCH),FreeBSD)
# -V is understood by BSD Make, not by GNU make.
Modified: head/net/asterisk16/files/patch-main__asterisk.exports.in
==============================================================================
--- head/net/asterisk15/files/patch-main__asterisk.exports.in Wed Oct 10 08:25:57 2018 (r481702)
+++ head/net/asterisk16/files/patch-main__asterisk.exports.in Wed Oct 31 23:42:52 2018 (r483629)
@@ -1,6 +1,6 @@
---- main/asterisk.exports.in.orig 2017-10-13 17:46:56 UTC
+--- main/asterisk.exports.in.orig 2018-08-08 16:02:31 UTC
+++ main/asterisk.exports.in
-@@ -70,6 +70,8 @@
+@@ -63,6 +63,8 @@
*/
LINKER_SYMBOL_PREFIX_IO_stdin_used;
Modified: head/net/asterisk16/files/patch-main__lock.c
==============================================================================
--- head/net/asterisk15/files/patch-main__lock.c Wed Oct 10 08:25:57 2018 (r481702)
+++ head/net/asterisk16/files/patch-main__lock.c Wed Oct 31 23:42:52 2018 (r483629)
@@ -1,6 +1,6 @@
---- main/lock.c.orig 2017-12-20 20:39:39 UTC
+--- main/lock.c.orig 2018-08-08 16:02:31 UTC
+++ main/lock.c
-@@ -710,9 +710,6 @@ int __ast_rwlock_init(int tracking, const char *filena
+@@ -692,9 +692,6 @@ int __ast_rwlock_init(int tracking, const char *filena
#endif /* DEBUG_THREADS */
pthread_rwlockattr_init(&attr);
Modified: head/net/asterisk16/pkg-plist
==============================================================================
--- head/net/asterisk15/pkg-plist Wed Oct 10 08:25:57 2018 (r481702)
+++ head/net/asterisk16/pkg-plist Wed Oct 31 23:42:52 2018 (r483629)
@@ -14,6 +14,7 @@
@sample %%ETCDIR%%/ccss.conf.sample
@sample %%ETCDIR%%/cdr.conf.sample
@sample %%ETCDIR%%/cdr_adaptive_odbc.conf.sample
+ at sample %%ETCDIR%%/cdr_beanstalkd.conf.sample
@sample %%ETCDIR%%/cdr_custom.conf.sample
@sample %%ETCDIR%%/cdr_manager.conf.sample
@sample %%ETCDIR%%/cdr_mysql.conf.sample
@@ -23,6 +24,7 @@
@sample %%ETCDIR%%/cdr_syslog.conf.sample
@sample %%ETCDIR%%/cdr_tds.conf.sample
@sample %%ETCDIR%%/cel.conf.sample
+ at sample %%ETCDIR%%/cel_beanstalkd.conf.sample
@sample %%ETCDIR%%/cel_custom.conf.sample
@sample %%ETCDIR%%/cel_odbc.conf.sample
@sample %%ETCDIR%%/cel_pgsql.conf.sample
@@ -126,9 +128,7 @@ 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
@@ -236,7 +236,6 @@ include/asterisk/monitor.h
include/asterisk/multicast_rtp.h
include/asterisk/musiconhold.h
include/asterisk/named_locks.h
-include/asterisk/netsock.h
include/asterisk/netsock2.h
include/asterisk/network.h
include/asterisk/optional_api.h
More information about the svn-ports-head
mailing list