Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 2 Sep 2019 07:36:54 +0000 (UTC)
From:      Guido Falsi <madpilot@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r510768 - branches/2019Q3/net/asterisk-g72x
Message-ID:  <201909020736.x827asdm049850@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: madpilot
Date: Mon Sep  2 07:36:54 2019
New Revision: 510768
URL: https://svnweb.freebsd.org/changeset/ports/510768

Log:
  MFH: r510764
  
  - Correctly pass CONFIGURE_ARGS depending on flavor
  - Fix default FLAVOR definition
  
  PR:		240238
  Submitted by:	tobik
  
  Approved by:	ports-secteam (joneum)

Modified:
  branches/2019Q3/net/asterisk-g72x/Makefile
Directory Properties:
  branches/2019Q3/   (props changed)

Modified: branches/2019Q3/net/asterisk-g72x/Makefile
==============================================================================
--- branches/2019Q3/net/asterisk-g72x/Makefile	Mon Sep  2 07:22:29 2019	(r510767)
+++ branches/2019Q3/net/asterisk-g72x/Makefile	Mon Sep  2 07:36:54 2019	(r510768)
@@ -2,7 +2,7 @@
 
 PORTNAME=	g72x
 PORTVERSION=	1.4.3
-PORTREVISION=	1
+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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201909020736.x827asdm049850>