From owner-svn-ports-head@freebsd.org Mon Sep 2 07:08:55 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E4FA3D3B81; Mon, 2 Sep 2019 07:08:55 +0000 (UTC) (envelope-from madpilot@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46MLm75kVDz4LXh; Mon, 2 Sep 2019 07:08:55 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A8CE7E5D2; Mon, 2 Sep 2019 07:08:55 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x8278teB031300; Mon, 2 Sep 2019 07:08:55 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x8278tmc031299; Mon, 2 Sep 2019 07:08:55 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <201909020708.x8278tmc031299@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Mon, 2 Sep 2019 07:08:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r510764 - head/net/asterisk-g72x X-SVN-Group: ports-head X-SVN-Commit-Author: madpilot X-SVN-Commit-Paths: head/net/asterisk-g72x X-SVN-Commit-Revision: 510764 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Sep 2019 07:08:56 -0000 Author: madpilot Date: Mon Sep 2 07:08:55 2019 New Revision: 510764 URL: https://svnweb.freebsd.org/changeset/ports/510764 Log: - Correctly pass CONFIGURE_ARGS depending on flavor - Fix default FLAVOR definition PR: 240238 Submitted by: tobik MFH: 2019Q3 Modified: head/net/asterisk-g72x/Makefile Modified: head/net/asterisk-g72x/Makefile ============================================================================== --- head/net/asterisk-g72x/Makefile Mon Sep 2 06:57:19 2019 (r510763) +++ head/net/asterisk-g72x/Makefile Mon Sep 2 07:08:55 2019 (r510764) @@ -2,7 +2,7 @@ PORTNAME= g72x PORTVERSION= 1.4.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net MASTER_SITES= http://asterisk.hosting.lv/src/ DISTNAME= asterisk-${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX} @@ -13,28 +13,34 @@ COMMENT= G.729 codec for Asterisk PBX LIB_DEPENDS= libbcg729.so:audio/bcg729 FLAVORS= asterisk13 asterisk15 asterisk16 -FLAVOR?= ${FLAVORS[1]} +FLAVOR?= ${FLAVORS:[1]} asterisk13_PKGNAMEPREFIX= asterisk13- asterisk13_CONFLICTS_INSTALL= asterisk15-g72x asterisk16-g72x asterisk13_BUILD_DEPENDS= asterisk:net/asterisk13 asterisk13_RUN_DEPENDS= asterisk:net/asterisk13 -asterisk15_CONFIGURE_ARGS= --with-asterisk130 +.if ${FLAVOR} == asterisk13 +CONFIGURE_ARGS+= --with-asterisk130 +.endif asterisk15_PKGNAMEPREFIX= asterisk15- asterisk15_CONFLICTS_INSTALL= asterisk13-g72x asterisk16-g72x asterisk15_BUILD_DEPENDS= asterisk:net/asterisk15 asterisk15_RUN_DEPENDS= asterisk:net/asterisk15 -asterisk15_CONFIGURE_ARGS= --with-asterisk150 +.if ${FLAVOR} == asterisk15 +CONFIGURE_ARGS+= --with-asterisk150 +.endif 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 +.if ${FLAVOR} == asterisk16 +CONFIGURE_ARGS+= --with-asterisk160 +.endif GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-bcg729 +CONFIGURE_ARGS+= --with-bcg729 USES= autoreconf compiler libtool localbase tar:bzip2 PLIST_FILES= lib/asterisk/modules/codec_g729.so