svn commit: r490578 - in head/net: asterisk13 asterisk15 asterisk16

[Guido Falsi]

Author: madpilot
Date: Thu Jan 17 17:31:16 2019
New Revision: 490578
URL: https://svnweb.freebsd.org/changeset/ports/490578

Log:
  Fix extract phase when G729 option is enabled.
  
  I involuntarily introduced the failure in the previous commit.

Modified:
  head/net/asterisk13/Makefile
  head/net/asterisk15/Makefile
  head/net/asterisk16/Makefile

Modified: head/net/asterisk13/Makefile
==============================================================================
--- head/net/asterisk13/Makefile	Thu Jan 17 17:04:40 2019	(r490577)
+++ head/net/asterisk13/Makefile	Thu Jan 17 17:31:16 2019	(r490578)
@@ -253,8 +253,8 @@ post-extract:
 	@${FIND} ${WRKSRC} -name '*.d' -delete
 
 post-extract-G729-on:
-	${CP} ${DISTDIR}/${ASTERISK_CORE_G729_SOUNDS} ${WRKSRC}/sounds
-	${CP} ${DISTDIR}/${ASTERISK_MOH_G729_SOUNDS} ${WRKSRC}/sounds
+	${CP} ${DISTDIR}/${DIST_SUBDIR}/${ASTERISK_CORE_G729_SOUNDS} ${WRKSRC}/sounds
+	${CP} ${DISTDIR}/${DIST_SUBDIR}/${ASTERISK_MOH_G729_SOUNDS} ${WRKSRC}/sounds
 
 post-extract-OPUS-on:
 	${CP} ${WRKDIR}/${OPUS_SRC}/include/asterisk/* ${WRKSRC}/include/asterisk

Modified: head/net/asterisk15/Makefile
==============================================================================
--- head/net/asterisk15/Makefile	Thu Jan 17 17:04:40 2019	(r490577)
+++ head/net/asterisk15/Makefile	Thu Jan 17 17:31:16 2019	(r490578)
@@ -257,8 +257,8 @@ post-extract:
 	@${FIND} ${WRKSRC} -name '*.d' -delete
 
 post-extract-G729-on:
-	${CP} ${DISTDIR}/${ASTERISK_CORE_G729_SOUNDS} ${WRKSRC}/sounds
-	${CP} ${DISTDIR}/${ASTERISK_MOH_G729_SOUNDS} ${WRKSRC}/sounds
+	${CP} ${DISTDIR}/${DIST_SUBDIR}/${ASTERISK_CORE_G729_SOUNDS} ${WRKSRC}/sounds
+	${CP} ${DISTDIR}/${DIST_SUBDIR}/${ASTERISK_MOH_G729_SOUNDS} ${WRKSRC}/sounds
 
 post-extract-OPUS-on:
 	${CP} ${WRKDIR}/${OPUS_SRC}/include/asterisk/* ${WRKSRC}/include/asterisk

Modified: head/net/asterisk16/Makefile
==============================================================================
--- head/net/asterisk16/Makefile	Thu Jan 17 17:04:40 2019	(r490577)
+++ head/net/asterisk16/Makefile	Thu Jan 17 17:31:16 2019	(r490578)
@@ -254,8 +254,8 @@ post-extract:
 	@${FIND} ${WRKSRC} -name '*.d' -delete
 
 post-extract-G729-on:
-	${CP} ${DISTDIR}/${ASTERISK_CORE_G729_SOUNDS} ${WRKSRC}/sounds
-	${CP} ${DISTDIR}/${ASTERISK_MOH_G729_SOUNDS} ${WRKSRC}/sounds
+	${CP} ${DISTDIR}/${DIST_SUBDIR}/${ASTERISK_CORE_G729_SOUNDS} ${WRKSRC}/sounds
+	${CP} ${DISTDIR}/${DIST_SUBDIR}/${ASTERISK_MOH_G729_SOUNDS} ${WRKSRC}/sounds
 
 post-extract-OPUS-on:
 	${CP} ${WRKDIR}/${OPUS_SRC}/include/asterisk/* ${WRKSRC}/include/asterisk