- Update asterisk13 to 13.30.0

- Fix build on powerpc64 [1]
- Remove COMPILER option [1]

PR:		242831 [1]
Submitted by:	pkubaj

4 files changed, 11 insertions, 29 deletions

diff --git a/net/asterisk13/Makefile b/net/asterisk13/Makefile
index 172a042dff51..74a9c2b8652a 100644
--- a/net/asterisk13/Makefile
+++ b/net/asterisk13/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	asterisk
-PORTVERSION=	13.29.2
+PORTVERSION=	13.30.0
 CATEGORIES=	net
 MASTER_SITES=	https://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729
 MASTER_SITE_SUBDIR=	asterisk/ \
@@ -20,11 +20,11 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 LIB_DEPENDS=	libuuid.so:misc/e2fsprogs-libuuid \
 		libjansson.so:devel/jansson
 
-ONLY_FOR_ARCHS=	amd64 armv6 armv7 i386 powerpc sparc64
+ONLY_FOR_ARCHS=	amd64 armv6 armv7 i386 powerpc powerpc64 sparc64
 
 EXTRACT_ONLY:=	${DISTNAME}${EXTRACT_SUFX}
 
-USES=		bison cpe gmake gnome iconv libedit localbase \
+USES=		bison compiler:c11 cpe gmake gnome iconv libedit localbase \
 		shebangfix sqlite ssl ncurses
 USE_CSTD=	gnu89
 USE_GNOME=	libxml2
@@ -68,21 +68,15 @@ OPTIONS_DEFINE_i386=		DAHDI
 OPTIONS_DEFINE_amd64=		DAHDI
 OPTIONS_DEFINE_sparc64=		DAHDI
 
-OPTIONS_DEFAULT_i386=		DAHDI BASE XMPP
-OPTIONS_DEFAULT_amd64=		DAHDI BASE XMPP
-OPTIONS_DEFAULT_sparc64=	DAHDI GCC XMPP
-OPTIONS_DEFAULT_powerpc=	GCC XMPP
-OPTIONS_DEFAULT_armv6=		BASE
-OPTIONS_DEFAULT_armv7=		BASE
+OPTIONS_DEFAULT_i386=		DAHDI XMPP
+OPTIONS_DEFAULT_amd64=		DAHDI XMPP
+OPTIONS_DEFAULT_sparc64=	DAHDI XMPP
+OPTIONS_DEFAULT_powerpc=	XMPP
 
 OPTIONS_GROUP=			CODECS
 OPTIONS_GROUP_CODECS=		GSM NEWG711 OPUS SPEEX VORBIS
 CODECS_DESC=			Encoder/Decoder (Codec) Support
 
-OPTIONS_SINGLE=			COMPILER
-OPTIONS_SINGLE_COMPILER=	BASE GCC
-COMPILER_DESC=			Compiler to use
-
 OPTIONS_GROUP+=			DATABASE
 OPTIONS_GROUP_DATABASE=		MYSQL ODBC PGSQL SQLITE2
 DATABASE_DESC=			Database Support
@@ -137,8 +131,6 @@ FREETDS_CONFIGURE_ON=	--with-tds=${LOCALBASE}
 FREETDS_CONFIGURE_OFF=	--without-tds
 FREETDS_LIB_DEPENDS=	libsybdb.so:databases/freetds
 
-GCC_USE=		GCC=yes
-
 GSM_CONFIGURE_WITH=	gsm
 GSM_LIB_DEPENDS=	libgsm.so:audio/gsm
 
diff --git a/net/asterisk13/distinfo b/net/asterisk13/distinfo
index 5c89ef19e511..0bc010df871d 100644
--- a/net/asterisk13/distinfo
+++ b/net/asterisk13/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1574413466
-SHA256 (asterisk/asterisk-13.29.2.tar.gz) = 8511e1ac7fd66f653c9c1297809ec74a27d0b895bd64947501684d96d5c030b0
-SIZE (asterisk/asterisk-13.29.2.tar.gz) = 33062878
+TIMESTAMP = 1577177923
+SHA256 (asterisk/asterisk-13.30.0.tar.gz) = 14f46feb9001a1b3f8791359346d73c80644bfca90b5b15000e240b3a9577e0f
+SIZE (asterisk/asterisk-13.30.0.tar.gz) = 33100207
 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
diff --git a/net/asterisk13/files/patch-cdr_cdr__pgsql.c b/net/asterisk13/files/patch-cdr_cdr__pgsql.c
deleted file mode 100644
index 373b300ae735..000000000000
--- a/net/asterisk13/files/patch-cdr_cdr__pgsql.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- cdr/cdr_pgsql.c.orig	2019-10-06 21:08:37 UTC
-+++ cdr/cdr_pgsql.c
-@@ -707,7 +707,7 @@ static int config_module(int reload)
- 			schemaname = ast_alloca(strlen(tmp_schemaname) * 2 + 1);
- 			PQescapeStringConn(conn, schemaname, tmp_schemaname, strlen(tmp_schemaname), NULL);
- 
--			snprintf(sqlcmd, sizeof(sqlcmd), "SELECT a.attname, t.typname, a.attlen, a.attnotnull, d.adsrc, a.atttypmod FROM (((pg_catalog.pg_class c INNER JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace AND c.relname = '%s' AND n.nspname = %s%s%s) INNER JOIN pg_catalog.pg_attribute a ON (NOT a.attisdropped) AND a.attnum > 0 AND a.attrelid = c.oid) INNER JOIN pg_catalog.pg_type t ON t.oid = a.atttypid) LEFT OUTER JOIN pg_attrdef d ON a.atthasdef AND d.adrelid = a.attrelid AND d.adnum = a.attnum ORDER BY n.nspname, c.relname, attnum",
-+			snprintf(sqlcmd, sizeof(sqlcmd), "SELECT a.attname, t.typname, a.attlen, a.attnotnull, pg_catalog.pg_get_expr(d.adbin, d.adrelid) adsrc, a.atttypmod FROM (((pg_catalog.pg_class c INNER JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace AND c.relname = '%s' AND n.nspname = %s%s%s) INNER JOIN pg_catalog.pg_attribute a ON (NOT a.attisdropped) AND a.attnum > 0 AND a.attrelid = c.oid) INNER JOIN pg_catalog.pg_type t ON t.oid = a.atttypid) LEFT OUTER JOIN pg_attrdef d ON a.atthasdef AND d.adrelid = a.attrelid AND d.adnum = a.attnum ORDER BY n.nspname, c.relname, attnum",
- 				tablename,
- 				ast_strlen_zero(schemaname) ? "" : "'", ast_strlen_zero(schemaname) ? "current_schema()" : schemaname, ast_strlen_zero(schemaname) ? "" : "'");
- 		} else {
diff --git a/net/asterisk13/pkg-plist b/net/asterisk13/pkg-plist
index 9008277a4448..bd418f354382 100644
--- a/net/asterisk13/pkg-plist
+++ b/net/asterisk13/pkg-plist
@@ -262,6 +262,7 @@ include/asterisk/security_events.h
 include/asterisk/security_events_defs.h
 include/asterisk/select.h
 include/asterisk/sem.h
+include/asterisk/serializer.h
 include/asterisk/sha1.h
 include/asterisk/silk.h
 include/asterisk/sip_api.h