From owner-svn-ports-branches@freebsd.org  Tue Jun 20 14:41:08 2017
Return-Path: <owner-svn-ports-branches@freebsd.org>
Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0601DD9A2C8;
 Tue, 20 Jun 2017 14:41:08 +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 mx1.freebsd.org (Postfix) with ESMTPS id C84EBB8E;
 Tue, 20 Jun 2017 14:41:07 +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 v5KEf7CB078283;
 Tue, 20 Jun 2017 14:41:07 GMT (envelope-from madpilot@FreeBSD.org)
Received: (from madpilot@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v5KEf6Ua078282;
 Tue, 20 Jun 2017 14:41:06 GMT (envelope-from madpilot@FreeBSD.org)
Message-Id: <201706201441.v5KEf6Ua078282@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: madpilot set sender to
 madpilot@FreeBSD.org using -f
From: Guido Falsi <madpilot@FreeBSD.org>
Date: Tue, 20 Jun 2017 14:41:06 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r443979 - branches/2017Q2/net/asterisk13
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
 <svn-ports-branches.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 20 Jun 2017 14:41:08 -0000

Author: madpilot
Date: Tue Jun 20 14:41:06 2017
New Revision: 443979
URL: https://svnweb.freebsd.org/changeset/ports/443979

Log:
  MFH: r443951
  
  - Fix user provided menuselect support
  - Make it work also when SYSINFO option is turned on
  
  Approved by:	ports-secteam (feld)

Modified:
  branches/2017Q2/net/asterisk13/Makefile
Directory Properties:
  branches/2017Q2/   (props changed)

Modified: branches/2017Q2/net/asterisk13/Makefile
==============================================================================
--- branches/2017Q2/net/asterisk13/Makefile	Tue Jun 20 14:36:49 2017	(r443978)
+++ branches/2017Q2/net/asterisk13/Makefile	Tue Jun 20 14:41:06 2017	(r443979)
@@ -249,6 +249,9 @@ post-extract-G729-on:
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/var/lib|${PREFIX}/share|g' ${WRKSRC}/configs/samples/musiconhold.conf.sample
+.if exists(${FILESDIR}/.asterisk.makeopts)
+	${CP} ${FILESDIR}/.asterisk.makeopts ${WRKSRC}/menuselect.makeopts
+.endif
 
 post-patch-SYSINFO-on:
 	@${REINPLACE_CMD} -e 's/%%LIBSYSINFO%%/-lsysinfo/' ${WRKSRC}/main/Makefile
@@ -256,9 +259,6 @@ post-patch-SYSINFO-on:
 post-patch-SYSINFO-off:
 	@${REINPLACE_CMD} -e '/#define HAVE_SYSINFO 1/d' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e '/%%LIBSYSINFO%%/d' ${WRKSRC}/main/Makefile
-.if exists(${FILESDIR}/.asterisk.makeopts)
-	${CP} ${USER_MAKEOPTS_FILE} ${WRKSRC}/menuselect.makeopts
-.endif
 
 post-configure:
 	@cd ${WRKSRC} && ${MAKE_CMD} menuselect.makeopts