Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 20 Jun 2017 13:17:37 +0000 (UTC)
From:      Guido Falsi <madpilot@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r443951 - head/net/asterisk13
Message-ID:  <201706201317.v5KDHb6k040197@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: madpilot
Date: Tue Jun 20 13:17:36 2017
New Revision: 443951
URL: https://svnweb.freebsd.org/changeset/ports/443951

Log:
  - Fix user provided menuselect support
  - Make it work also when SYSINFO option is turned on
  
  MFH:		2017Q2

Modified:
  head/net/asterisk13/Makefile

Modified: head/net/asterisk13/Makefile
==============================================================================
--- head/net/asterisk13/Makefile	Tue Jun 20 13:05:41 2017	(r443950)
+++ head/net/asterisk13/Makefile	Tue Jun 20 13:17:36 2017	(r443951)
@@ -250,6 +250,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
@@ -257,9 +260,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?201706201317.v5KDHb6k040197>