Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 20 Jun 2017 14:41:06 +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: r443979 - branches/2017Q2/net/asterisk13
Message-ID:  <201706201441.v5KEf6Ua078282@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



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