From nobody Tue May 17 15:14:30 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 2DB721AEC150; Tue, 17 May 2022 15:14:31 +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 4L2fmQ6fN6z4q2C; Tue, 17 May 2022 15:14:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652800471; 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=yZ+J9R36sAAgTFBN9H2UfR9bYuzrOibtIbWoDKpA3DY=; b=D9ihyGkEdHDYLhbgCzQqFmS9pKpikkJUYltKpWvkH6sFdC7J7x5h/ScDPYt7KCPGawMYD1 Y3q77wzxgipbX656mSi+qHGcNBQy/TBg6rTxeX2BN9WbsNRuFMOrcKJ2HOXHq0+NmERA+z EQm0XyMsRKnYgbUAb7Um/svZPcViznC85tiSEYW35baSFPGkitxpNc+ivc7VW77lq3u2oH gd6cYfOcAWH9uZr76Oz0dDtP75ZB4vlrshaDhVHhwKbGeb3wei53t4IJTcMQDiY1ZwiGO2 Z0FLWrYUdXo8FKPN88Lxx8I9WbadcHovj9Bkyr6pR08vTnokmZOA2pwLbpNEbQ== 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 B86C71716A; Tue, 17 May 2022 15:14:30 +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 24HFEUf4037157; Tue, 17 May 2022 15:14:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24HFEUH0037156; Tue, 17 May 2022 15:14:30 GMT (envelope-from git) Date: Tue, 17 May 2022 15:14:30 GMT Message-Id: <202205171514.24HFEUH0037156@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: 9dd2f21478d0 - main - net/asterisk18: 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: 9dd2f21478d0f8379f010677c74d917361e1ecea Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652800471; 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=yZ+J9R36sAAgTFBN9H2UfR9bYuzrOibtIbWoDKpA3DY=; b=heCwA8s/HoD0C7Eg5Fg0q2nuEm+97ug5qAlj/Wd4O15jGdPp6DfZ2C4GqaaCrhMSOgXHyW 5KzQEASvXFOh9i1oXMsdd3cYUqYA71NM4htkwIHcfME7/+ufdOMXssCAeALA0Tq+N2NhQ/ uhhfnKrGfmoA0uENzGPeR8CP+6qaG09X9gV2EgkhCpS/xp1hhQ03pNWmhMxDflFa22+/8O nl+wXJvE9ORxbH4Nz5CpjvYl3q5TnmFMCF8T28CKofPwct0PWbedPQR/YNFuMYk8Q+IpQg cznRQncMxnXGnURJLCajt0Mdcv9kyOkmKsRXsbNJDjm9QKIGFNDc9jFG3JMkaQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652800471; a=rsa-sha256; cv=none; b=RsAOF9YHgCXWPQhE4p5POTN9Dt/C/mK2iCNFMxP2DIwpys6gkImDq9exY7bVzB9MUtmXdO 9yPwrLCmdsKNxTki96YDCzreTiHWSm1Qd9rxzCSnOB9nBPjAHFXeZMoRzpOVlKc0r5onPu yQv4BP+h1FJ4PGVJ3sJ6HM/RHG59vcfLJR92vcHgbSBGUPVHsmHPQTXDNuDwNb41vsPTFS KzqNBph4jQFzEvcVuFonKTHHwPv65m4k8czACyPs1W0dtBM7Nf/7FYG+TZtDx1ENGx4kuf h77sy1TBOT1afvWTskbwz3iHnpHcMUs9pNLJ7WV2sako4c2hnkXw+ckRjIg4lA== 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=9dd2f21478d0f8379f010677c74d917361e1ecea commit 9dd2f21478d0f8379f010677c74d917361e1ecea Author: Guido Falsi AuthorDate: 2022-05-17 15:12:31 +0000 Commit: Guido Falsi CommitDate: 2022-05-17 15:14:20 +0000 net/asterisk18: 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: 8d2283b7663ce9 --- net/asterisk18/Makefile | 3 +-- net/asterisk18/files/patch-menuselect_configure | 11 +++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/net/asterisk18/Makefile b/net/asterisk18/Makefile index c0096ead9d8a..400744ea8729 100644 --- a/net/asterisk18/Makefile +++ b/net/asterisk18/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/asterisk18/files/patch-menuselect_configure b/net/asterisk18/files/patch-menuselect_configure new file mode 100644 index 000000000000..0447a4c09766 --- /dev/null +++ b/net/asterisk18/files/patch-menuselect_configure @@ -0,0 +1,11 @@ +--- menuselect/configure.orig 2022-05-12 11:50:59 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