svn commit: r553096 - in head: audio/asterisk-espeak audio/asterisk-flite net net/asterisk-g72x net/asterisk13 net/asterisk16 net/asterisk18 net/asterisk18/files

Guido Falsi madpilot at FreeBSD.org
Fri Oct 23 08:14:00 UTC 2020 

Author: madpilot
Date: Fri Oct 23 08:13:57 2020
New Revision: 553096
URL: https://svnweb.freebsd.org/changeset/ports/553096

Log:
  - Repocopy asterisk16 to asterisk18 and update to new version 18.0.0
  - Add conflicts and flavors for version 18 to asterisk modules I maintain.

Added:
  head/net/asterisk18/
     - copied from r553095, head/net/asterisk16/
Modified:
  head/audio/asterisk-espeak/Makefile
  head/audio/asterisk-flite/Makefile
  head/net/Makefile
  head/net/asterisk-g72x/Makefile
  head/net/asterisk13/Makefile
  head/net/asterisk16/Makefile
  head/net/asterisk18/Makefile
  head/net/asterisk18/distinfo
  head/net/asterisk18/files/patch-Makefile
  head/net/asterisk18/files/patch-third-party_pjproject_Makefile
  head/net/asterisk18/pkg-plist

Modified: head/audio/asterisk-espeak/Makefile
==============================================================================
--- head/audio/asterisk-espeak/Makefile	Fri Oct 23 08:07:59 2020	(r553095)
+++ head/audio/asterisk-espeak/Makefile	Fri Oct 23 08:13:57 2020	(r553096)
@@ -14,18 +14,23 @@ LICENSE=	GPLv2
 LIB_DEPENDS=	libespeak.so:audio/espeak \
 		libsamplerate.so:audio/libsamplerate
 
-FLAVORS=			asterisk16 asterisk13
+FLAVORS=			asterisk16 asterisk18 asterisk13
 FLAVOR?=			${FLAVORS:[1]}
 
 asterisk13_PKGNAMEPREFIX=	asterisk13-
-asterisk13_CONFLICTS_INSTALL=	asterisk16-espeak
+asterisk13_CONFLICTS_INSTALL=	asterisk16-espeak asterisk18-espeak
 asterisk13_BUILD_DEPENDS=	asterisk:net/asterisk13
 asterisk13_RUN_DEPENDS=		asterisk:net/asterisk13
 
 asterisk16_PKGNAMEPREFIX=	asterisk16-
-asterisk16_CONFLICTS_INSTALL=	asterisk13-espeak
+asterisk16_CONFLICTS_INSTALL=	asterisk13-espeak asterisk18-espeak
 asterisk16_BUILD_DEPENDS=	asterisk:net/asterisk16
 asterisk16_RUN_DEPENDS=		asterisk:net/asterisk16
+
+asterisk18_PKGNAMEPREFIX=	asterisk18-
+asterisk18_CONFLICTS_INSTALL=	asterisk13-espeak asterisk16-espeak
+asterisk18_BUILD_DEPENDS=	asterisk:net/asterisk18
+asterisk18_RUN_DEPENDS=		asterisk:net/asterisk18
 
 USES=		compiler:c11 gmake localbase
 INSTALL_TARGET=	install samples

Modified: head/audio/asterisk-flite/Makefile
==============================================================================
--- head/audio/asterisk-flite/Makefile	Fri Oct 23 08:07:59 2020	(r553095)
+++ head/audio/asterisk-flite/Makefile	Fri Oct 23 08:13:57 2020	(r553096)
@@ -13,18 +13,23 @@ LICENSE=	GPLv2
 
 LIB_DEPENDS=	libflite.so:audio/flite
 
-FLAVORS=			asterisk16 asterisk13
+FLAVORS=			asterisk16 asterisk18 asterisk13
 FLAVOR?=			${FLAVORS:[1]}
 
 asterisk13_PKGNAMEPREFIX=	asterisk13-
-asterisk13_CONFLICTS_INSTALL=	asterisk16-flite
+asterisk13_CONFLICTS_INSTALL=	asterisk16-flite asterisk18-flite
 asterisk13_BUILD_DEPENDS=	asterisk:net/asterisk13
 asterisk13_RUN_DEPENDS=		asterisk:net/asterisk13
 
 asterisk16_PKGNAMEPREFIX=	asterisk16-
-asterisk16_CONFLICTS_INSTALL=	asterisk13-flite
+asterisk16_CONFLICTS_INSTALL=	asterisk13-flite asterisk18-flite
 asterisk16_BUILD_DEPENDS=	asterisk:net/asterisk16
 asterisk16_RUN_DEPENDS=		asterisk:net/asterisk16
+
+asterisk18_PKGNAMEPREFIX=       asterisk18- 
+asterisk18_CONFLICTS_INSTALL=   asterisk13-flite asterisk16-flite
+asterisk18_BUILD_DEPENDS=       asterisk:net/asterisk18
+asterisk18_RUN_DEPENDS=         asterisk:net/asterisk18
 
 USES=		compiler:c11 gmake localbase
 INSTALL_TARGET=	install samples

Modified: head/net/Makefile
==============================================================================
--- head/net/Makefile	Fri Oct 23 08:07:59 2020	(r553095)
+++ head/net/Makefile	Fri Oct 23 08:13:57 2020	(r553096)
@@ -38,6 +38,7 @@
     SUBDIR += asterisk-g72x
     SUBDIR += asterisk13
     SUBDIR += asterisk16
+    SUBDIR += asterisk18
     SUBDIR += avahi
     SUBDIR += avahi-app
     SUBDIR += avahi-autoipd

Modified: head/net/asterisk-g72x/Makefile
==============================================================================
--- head/net/asterisk-g72x/Makefile	Fri Oct 23 08:07:59 2020	(r553095)
+++ head/net/asterisk-g72x/Makefile	Fri Oct 23 08:13:57 2020	(r553096)
@@ -12,11 +12,11 @@ COMMENT=	G.729 codec for Asterisk PBX
 
 LIB_DEPENDS=	libbcg729.so:audio/bcg729
 
-FLAVORS=			asterisk16 asterisk13
+FLAVORS=			asterisk16 asterisk18 asterisk13
 FLAVOR?=			${FLAVORS:[1]}
 
 asterisk13_PKGNAMEPREFIX=	asterisk13-
-asterisk13_CONFLICTS_INSTALL=	asterisk16-g72x
+asterisk13_CONFLICTS_INSTALL=	asterisk16-g72x asterisk18-g72x
 asterisk13_BUILD_DEPENDS=	asterisk:net/asterisk13
 asterisk13_RUN_DEPENDS=		asterisk:net/asterisk13
 .if ${FLAVOR} == asterisk13
@@ -24,10 +24,18 @@ CONFIGURE_ARGS+=		--with-asterisk130
 .endif
 
 asterisk16_PKGNAMEPREFIX=	asterisk16-
-asterisk16_CONFLICTS_INSTALL=	asterisk13-g72x
+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
+asterisk18_RUN_DEPENDS=		asterisk:net/asterisk18
+.if ${FLAVOR} == asterisk18
 CONFIGURE_ARGS+=		--with-asterisk160
 .endif
 

Modified: head/net/asterisk13/Makefile
==============================================================================
--- head/net/asterisk13/Makefile	Fri Oct 23 08:07:59 2020	(r553095)
+++ head/net/asterisk13/Makefile	Fri Oct 23 08:13:57 2020	(r553096)
@@ -57,7 +57,7 @@ MAKE_ARGS+=	NOISY_BUILD=yes \
 
 CONFLICTS=		ossp-uuid-[0-9]*
 CONFLICTS_BUILD=	linuxthreads-*
-CONFLICTS_INSTALL=	asterisk16
+CONFLICTS_INSTALL=	asterisk16 asterisk18
 
 OPTIONS_DEFINE=			ASTVERSION BACKTRACE CURL EXCHANGE FREETDS G729 LDAP LUA \
 				MP3PLAYER OOH323 OPTIMIZED_CFLAGS PJSIP PORTAUDIO RADIUS SNMP \

Modified: head/net/asterisk16/Makefile
==============================================================================
--- head/net/asterisk16/Makefile	Fri Oct 23 08:07:59 2020	(r553095)
+++ head/net/asterisk16/Makefile	Fri Oct 23 08:13:57 2020	(r553096)
@@ -57,7 +57,7 @@ MAKE_ARGS+=	NOISY_BUILD=yes \
 
 CONFLICTS=		ossp-uuid-[0-9]*
 CONFLICTS_BUILD=	linuxthreads-*
-CONFLICTS_INSTALL=	asterisk13
+CONFLICTS_INSTALL=	asterisk13 asterisk18
 
 OPTIONS_DEFINE=			ASTVERSION BACKTRACE CURL EXCHANGE FREETDS G729 LDAP LUA MACRO \
 				MP3PLAYER OOH323 OPTIMIZED_CFLAGS PJSIP PORTAUDIO RADIUS SNMP \

Modified: head/net/asterisk18/Makefile
==============================================================================
--- head/net/asterisk16/Makefile	Fri Oct 23 08:07:59 2020	(r553095)
+++ head/net/asterisk18/Makefile	Fri Oct 23 08:13:57 2020	(r553096)
@@ -1,13 +1,13 @@
 # $FreeBSD$
 
 PORTNAME=	asterisk
-PORTVERSION=	16.14.0
+PORTVERSION=	18.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=	16
+PKGNAMESUFFIX=	18
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 DIST_SUBDIR=	${PORTNAME}
 
@@ -57,14 +57,14 @@ 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 G729 LDAP LUA MACRO \
 				MP3PLAYER OOH323 OPTIMIZED_CFLAGS PJSIP PORTAUDIO RADIUS SNMP \
 				SPANDSP SRTP SYSINFO URIPARSER XMLDOC XMPP
 OPTIONS_DEFAULT=		CURL FREETDS GSM LUA MACRO MP3PLAYER NEWT ODBC OPUS MYSQL PGSQL \
 				PJSIP PORTAUDIO RADIUS SNMP SPANDSP SPEEX SRTP URIPARSER \
-				VORBIS XMLDOC
+				VORBIS XMLDOC 
 
 OPTIONS_DEFINE_i386=		DAHDI
 OPTIONS_DEFINE_amd64=		DAHDI

Modified: head/net/asterisk18/distinfo
==============================================================================
--- head/net/asterisk16/distinfo	Fri Oct 23 08:07:59 2020	(r553095)
+++ head/net/asterisk18/distinfo	Fri Oct 23 08:13:57 2020	(r553096)
@@ -1,10 +1,6 @@
-TIMESTAMP = 1603197290
-SHA256 (asterisk/asterisk-16.14.0.tar.gz) = a6c3077edcdf3cec75c79c1674fce1c80e3f3c3193f606238fe4412ac90522f8
-SIZE (asterisk/asterisk-16.14.0.tar.gz) = 27740877
-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
+TIMESTAMP = 1603197429
+SHA256 (asterisk/asterisk-18.0.0.tar.gz) = 9b780297c6620d057ef83ada1a0ea13ca9bc2e617c93ef847f2a9f86ba569f9c
+SIZE (asterisk/asterisk-18.0.0.tar.gz) = 27920458
 SHA256 (asterisk/traud-asterisk-opus-83e1b458c77e0e287adeca494eeb79edb077b0ff_GH0.tar.gz) = 572a3c956371ed62b44a4bcd973db10eb4c84f3040cf7156e3acfad3b6bf3ded
 SIZE (asterisk/traud-asterisk-opus-83e1b458c77e0e287adeca494eeb79edb077b0ff_GH0.tar.gz) = 24044
 SHA256 (asterisk/pjsip-pjproject-2.10_GH0.tar.gz) = 936a4c5b98601b52325463a397ddf11ab4106c6a7b04f8dc7cdd377efbb597de

Modified: head/net/asterisk18/files/patch-Makefile
==============================================================================
--- head/net/asterisk16/files/patch-Makefile	Fri Oct 23 08:07:59 2020	(r553095)
+++ head/net/asterisk18/files/patch-Makefile	Fri Oct 23 08:13:57 2020	(r553096)
@@ -1,4 +1,4 @@
---- Makefile.orig	2020-07-09 15:39:17 UTC
+--- Makefile.orig	2020-09-09 15:43:27 UTC
 +++ Makefile
 @@ -138,7 +138,7 @@ ASTTOPDIR:=$(subst $(space),\$(space),$(CURDIR))
  OVERWRITE=y
@@ -45,11 +45,20 @@
  	"$(ASTDATADIR)/firmware/iax" "$(ASTDATADIR)/images" "$(ASTDATADIR)/keys" \
  	"$(ASTDATADIR)/phoneprov" "$(ASTDATADIR)/rest-api" "$(ASTDATADIR)/static-http" \
  	"$(ASTDATADIR)/sounds" "$(ASTDATADIR)/moh" "$(ASTMANDIR)/man8" "$(AGI_DIR)" "$(ASTDBDIR)" \
--	"$(ASTDATADIR)/third-party"
-+	"$(ASTDATADIR)/third-party" "$(ASTSPOOLDIR)/outgoing"
+-	"$(ASTDATADIR)/third-party" "${ASTDATADIR}/keys/stir_shaken"
++	"$(ASTDATADIR)/third-party" "${ASTDATADIR}/keys/stir_shaken" "$(ASTSPOOLDIR)/outgoing"
  
  installdirs:
  	@for i in $(INSTALLDIRS); do \
+@@ -577,7 +581,7 @@ installdirs:
+ main-bininstall:
+ 	+ at DESTDIR="$(DESTDIR)" ASTSBINDIR="$(ASTSBINDIR)" ASTLIBDIR="$(ASTLIBDIR)" $(SUBMAKE) -C main bininstall
+ 
+-bininstall: _all installdirs $(SUBDIRS_INSTALL) main-bininstall
++bininstall: _all installdirs $(SUBDIRS_INSTALL) main-bininstall install-headers
+ 	$(INSTALL) -m 755 contrib/scripts/astversion "$(DESTDIR)$(ASTSBINDIR)/"
+ 	$(INSTALL) -m 755 contrib/scripts/astgenkey "$(DESTDIR)$(ASTSBINDIR)/"
+ 	$(INSTALL) -m 755 contrib/scripts/autosupport "$(DESTDIR)$(ASTSBINDIR)/"
 @@ -598,10 +602,10 @@ endif
  	if [ -f contrib/firmware/iax/iaxy.bin ] ; then \
  		$(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin "$(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin"; \
@@ -93,7 +102,7 @@
 -		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 \
@@ -116,7 +125,7 @@
  			echo "Installing $$x" ; \
  		fi ; \
 -		$(INSTALL) -m 644 "$$x" "$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`" ; \
-+		$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`.sample ; \
++		$(INSTALL) -m 644 "$$x" "$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`.sample" ; \
  	done
  
  samples: adsi

Modified: head/net/asterisk18/files/patch-third-party_pjproject_Makefile
==============================================================================
--- head/net/asterisk16/files/patch-third-party_pjproject_Makefile	Fri Oct 23 08:07:59 2020	(r553095)
+++ head/net/asterisk18/files/patch-third-party_pjproject_Makefile	Fri Oct 23 08:13:57 2020	(r553096)
@@ -1,6 +1,6 @@
---- third-party/pjproject/Makefile.orig	2020-07-09 15:39:17 UTC
+--- third-party/pjproject/Makefile.orig	2020-09-09 15:43:27 UTC
 +++ third-party/pjproject/Makefile
-@@ -88,14 +88,10 @@ _all: $(TARGETS)
+@@ -98,14 +98,10 @@ _all: $(TARGETS)
  
  .DELETE_ON_ERROR:
  
@@ -17,11 +17,11 @@
  	$(ECHO_PREFIX) Unpacking $<
  	- at rm -rf source pjproject-*/ >/dev/null 2>&1
  	$(CMD_PREFIX) $(TAR) -xjf $<
-@@ -155,7 +151,7 @@ $(PJSIP_LIB_FILES): $(PJLIB_UTIL_LIB_FILES)
+@@ -165,7 +161,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 -E -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

Modified: head/net/asterisk18/pkg-plist
==============================================================================
--- head/net/asterisk16/pkg-plist	Fri Oct 23 08:07:59 2020	(r553095)
+++ head/net/asterisk18/pkg-plist	Fri Oct 23 08:13:57 2020	(r553096)
@@ -77,6 +77,7 @@
 @sample %%ETCDIR%%/pjsip.conf.sample
 @sample %%ETCDIR%%/pjsip_notify.conf.sample
 @sample %%ETCDIR%%/pjsip_wizard.conf.sample
+ at sample %%ETCDIR%%/prometheus.conf.sample
 @sample %%ETCDIR%%/queuerules.conf.sample
 @sample %%ETCDIR%%/queues.conf.sample
 @sample %%ETCDIR%%/res_config_mysql.conf.sample
@@ -104,6 +105,7 @@
 @sample %%ETCDIR%%/ss7.timers.sample
 @sample %%ETCDIR%%/stasis.conf.sample
 @sample %%ETCDIR%%/statsd.conf.sample
+ at sample %%ETCDIR%%/stir_shaken.conf.sample
 @sample %%ETCDIR%%/telcordia-1.adsi.sample
 @sample %%ETCDIR%%/test_sorcery.conf.sample
 @sample %%ETCDIR%%/udptl.conf.sample
@@ -254,6 +256,7 @@ include/asterisk/poll-compat.h
 include/asterisk/presencestate.h
 include/asterisk/privacy.h
 include/asterisk/pval.h
+include/asterisk/res_audiosocket.h
 include/asterisk/res_fax.h
 include/asterisk/res_hep.h
 include/asterisk/res_mwi_external.h
@@ -267,7 +270,10 @@ include/asterisk/res_pjsip_outbound_publish.h
 include/asterisk/res_pjsip_presence_xml.h
 include/asterisk/res_pjsip_pubsub.h
 include/asterisk/res_pjsip_session.h
+include/asterisk/res_pjsip_session_caps.h
+include/asterisk/res_prometheus.h
 include/asterisk/res_srtp.h
+include/asterisk/res_stir_shaken.h
 include/asterisk/rtp_engine.h
 include/asterisk/say.h
 include/asterisk/sched.h
@@ -303,6 +309,7 @@ include/asterisk/stasis_channels.h
 include/asterisk/stasis_endpoints.h
 include/asterisk/stasis_internal.h
 include/asterisk/stasis_message_router.h
+include/asterisk/stasis_state.h
 include/asterisk/stasis_system.h
 include/asterisk/stasis_test.h
 include/asterisk/statsd.h
@@ -394,6 +401,7 @@ sbin/safe_asterisk
 @dir %%DATADIR%%/documentation/thirdparty
 @dir %%DATADIR%%/firmware/iax
 @dir %%DATADIR%%/images
+ at dir %%DATADIR%%/keys/stir_shaken
 @dir %%DATADIR%%/keys
 @dir %%DATADIR%%/moh
 @dir %%DATADIR%%/sounds

More information about the svn-ports-head mailing list