From nobody Tue May 17 15:14:29 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id C5E601AEC048; Tue, 17 May 2022 15:14:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4L2fmP5FqNz4pwJ; Tue, 17 May 2022 15:14:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652800469; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6/GTVIsOcVBrDaEEoVadQ77BeucRaRigM38VvEyRT64=; b=fRkmvPpsTDkzlNiYleffhY12BRPy46hVXDLah0xEcPG64UdLw6d3GsiO9n2NJKZt/4NsME vbw7Nt6adLerVsTQwwjHixRM3252hcUDk9RtVnQPPQTK5JsCx0FuMH/fYzOCcIM6EMVdba FpbV7eC5SbZtDwW2oRXtRKLCRnAnQauQutQ6krxZUDQK6LTkJn3eT+yje46hlbgSJ8vuwN iv7wPrq0dYWvIJZ138P8DnU7lKPFekfeKdjWqmPyphE2t1OlpYRlJjb7wJcACcDadhcHi0 J8A7QdMNyFZ4vvt860LikV+i0dUZ4mn8ah3XCb8l2lllO4MkDtiIZAcdLAEDWw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 951F1171FA; Tue, 17 May 2022 15:14:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24HFETRr037133; Tue, 17 May 2022 15:14:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24HFETvo037132; Tue, 17 May 2022 15:14:29 GMT (envelope-from git) Date: Tue, 17 May 2022 15:14:29 GMT Message-Id: <202205171514.24HFETvo037132@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Guido Falsi Subject: git: f7aef8540293 - main - net/asterisk16: Fix configure issue when PJSIP option is disabled List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: madpilot X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f7aef8540293ec1a4e47857ccec9592023c953c5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652800469; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6/GTVIsOcVBrDaEEoVadQ77BeucRaRigM38VvEyRT64=; b=B8dWXJWcXj+N7TWtk/dARd6Bq+Wpyt8JRyK9/HO+GQ2St2c9B2vc6ZBizKNVvZ1TsD9SwT zkdRA+5zywvAiQKSxkl3oedBKKnOac0KejCQheniYusJpOCQweblRMEojR9eo6qZzaRIl9 bTwaaKXWkTCEL/8kAjTOvAKOkEyw2g0aLTkk29IvJrc47ae7I1iW/S+ztF5iwMSiKLdmB+ nlU7eTlzYxv9ywvrfrN6TbW3QJrAHP5oi1qRGf6KuWWYV9K/g0567yMhi2PXVCONj0P59O XBNJRBFybVZ0gA2PIDA+8IA23DNCmFTCxEakBS0V9sMD8gFhWWytle/gjKRDeA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652800469; a=rsa-sha256; cv=none; b=q9KpjBZQz1GmrtNqkB5tVOVAgq9d6Q5nc8npXkLHS71sL7XmciaqgdGeWCOVECqsWTqUdh VJ0IpF2iOi6Q1ORzrUbOrfPp99dElpKBtoTCOwlKAj68pLHp3l+wPy3zbxlyUrcVO/drn6 DvtoejgTyKb+NON2XeW7fLgWuQdvlLNdQU9IACxTwkCwZUCgNY1sMB95znY+uuc7df8B/I sX3iAvo88Ss9EaEXSU8Eu3qPYQ43JBNHQJ84+HIJiklXsYRbqgwP+brw6TOQnoD2q8ae0k GSs1XUOpTBoSvZILgaZn3qqUPXhlx7I8FlXtvZzVUzv/BaoSasbgfzbzeRR2Hg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=f7aef8540293ec1a4e47857ccec9592023c953c5 commit f7aef8540293ec1a4e47857ccec9592023c953c5 Author: Guido Falsi AuthorDate: 2022-05-17 15:10:31 +0000 Commit: Guido Falsi CommitDate: 2022-05-17 15:14:20 +0000 net/asterisk16: Fix configure issue when PJSIP option is disabled pkgconfig is now used by asterisk to detect most required dependencies, so add it to the global USES. At the same time there is a bug in the menuselect configure script that shows up when the PJSIP option is disabled. It tries to run sed through a $SED variable before populating it. As a workaround for now I just replace the $SED variable with the bare sed command. PR: 263980 Fixes: e8e6fba878cf12 --- net/asterisk16/Makefile | 3 +-- net/asterisk16/files/patch-menuselect_configure | 11 +++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/net/asterisk16/Makefile b/net/asterisk16/Makefile index 2e818c1bbb99..ba2fca18f020 100644 --- a/net/asterisk16/Makefile +++ b/net/asterisk16/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid \ libjansson.so:devel/jansson USES= bison compiler:c11 cpe gmake gnome iconv libedit localbase \ - shebangfix sqlite ssl ncurses + pkgconfig shebangfix sqlite ssl ncurses USE_GNOME= libxml2 USE_LDCONFIG= yes USE_RC_SUBR= asterisk @@ -166,7 +166,6 @@ PGSQL_CONFIGURE_WITH= postgres PGSQL_USES= pgsql PJSIP_CONFIGURE_WITH= pjproject pjproject-bundled -PJSIP_USES= pkgconfig PJSIP_LIB_DEPENDS= libsrtp2.so:net/libsrtp2 \ libspeex.so:audio/speex \ libspeexdsp.so:audio/speexdsp diff --git a/net/asterisk16/files/patch-menuselect_configure b/net/asterisk16/files/patch-menuselect_configure new file mode 100644 index 000000000000..30b3d50d7a34 --- /dev/null +++ b/net/asterisk16/files/patch-menuselect_configure @@ -0,0 +1,11 @@ +--- menuselect/configure.orig 2022-05-12 11:47:40 UTC ++++ menuselect/configure +@@ -5024,7 +5024,7 @@ printf "%s\n" "yes" >&6; } + 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