Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 18 Jan 2019 20:10:14 +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: r490667 - in head/net: asterisk13 asterisk15 asterisk16
Message-ID:  <201901182010.x0IKAE99092097@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: madpilot
Date: Fri Jan 18 20:10:14 2019
New Revision: 490667
URL: https://svnweb.freebsd.org/changeset/ports/490667

Log:
  Use github helper to get OPUS option distfile.
  
  Suggested by:	mat

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

Modified: head/net/asterisk13/Makefile
==============================================================================
--- head/net/asterisk13/Makefile	Fri Jan 18 20:03:08 2019	(r490666)
+++ head/net/asterisk13/Makefile	Fri Jan 18 20:10:14 2019	(r490667)
@@ -4,8 +4,7 @@ PORTNAME=	asterisk
 PORTVERSION=	13.24.1
 PORTREVISION=	1
 CATEGORIES=	net
-MASTER_SITES=	https://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729 \
-		https://github.com/traud/asterisk-opus/archive/:opus
+MASTER_SITES=	https://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729
 MASTER_SITE_SUBDIR=	asterisk/ \
 			asterisk/old-releases/ \
 			sounds/releases/:g729
@@ -32,6 +31,7 @@ USE_CSTD=	gnu89
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	asterisk
+USE_GITHUB=	nodefault
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--datarootdir=${DATADIR} \
@@ -171,10 +171,8 @@ ODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC \
 			libltdl.so:devel/libltdl
 
 OPUS_LIB_DEPENDS=	libopus.so:audio/opus
-OPUS_COMMIT=		83e1b458c77e0e287adeca494eeb79edb077b0ff
-OPUS_SRC=		asterisk-opus-${OPUS_COMMIT}
-OPUS_EXTRACT_ONLY=	${OPUS_COMMIT}${EXTRACT_SUFX}
-OPUS_DISTFILES=		${OPUS_COMMIT}${EXTRACT_SUFX}:opus
+OPUS_EXTRACT_ONLY=	${DISTFILE_opus}
+OPUS_GH_TUPLE=		traud:asterisk-opus:83e1b458c77e0e287adeca494eeb79edb077b0ff:opus
 
 PGSQL_CONFIGURE_WITH=	postgres
 PGSQL_USES=		pgsql
@@ -257,9 +255,9 @@ post-extract-G729-on:
 	${CP} ${DISTDIR}/${DIST_SUBDIR}/${ASTERISK_MOH_G729_SOUNDS} ${WRKSRC}/sounds
 
 post-extract-OPUS-on:
-	${CP} ${WRKDIR}/${OPUS_SRC}/include/asterisk/* ${WRKSRC}/include/asterisk
-	${CP} ${WRKDIR}/${OPUS_SRC}/codecs/* ${WRKSRC}/codecs
-	${CP} ${WRKDIR}/${OPUS_SRC}/res/* ${WRKSRC}/res
+	${CP} ${WRKSRC_opus}/include/asterisk/* ${WRKSRC}/include/asterisk
+	${CP} ${WRKSRC_opus}/codecs/* ${WRKSRC}/codecs
+	${CP} ${WRKSRC_opus}/res/* ${WRKSRC}/res
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/var/lib|${PREFIX}/share|g' ${WRKSRC}/configs/samples/musiconhold.conf.sample

Modified: head/net/asterisk13/distinfo
==============================================================================
--- head/net/asterisk13/distinfo	Fri Jan 18 20:03:08 2019	(r490666)
+++ head/net/asterisk13/distinfo	Fri Jan 18 20:10:14 2019	(r490667)
@@ -1,9 +1,9 @@
-TIMESTAMP = 1547713284
+TIMESTAMP = 1547834117
 SHA256 (asterisk/asterisk-13.24.1.tar.gz) = f381b2184579e4f3e0a2f758a5db9b2cdd628fa35b1c9e69d0325047b69790be
 SIZE (asterisk/asterisk-13.24.1.tar.gz) = 32977390
 SHA256 (asterisk/asterisk-core-sounds-en-g729-1.5.tar.gz) = 8b28a59cfa53b59c76e0a191704f0708e3d83acffab8c5e6f25dfc599f0123f9
 SIZE (asterisk/asterisk-core-sounds-en-g729-1.5.tar.gz) = 1551123
 SHA256 (asterisk/asterisk-moh-opsound-g729-2.03.tar.gz) = 0147ca9a97f0c550227aacb7793499057c4d2c64e021c95f93722f27d5549585
 SIZE (asterisk/asterisk-moh-opsound-g729-2.03.tar.gz) = 1103000
-SHA256 (asterisk/83e1b458c77e0e287adeca494eeb79edb077b0ff.tar.gz) = 572a3c956371ed62b44a4bcd973db10eb4c84f3040cf7156e3acfad3b6bf3ded
-SIZE (asterisk/83e1b458c77e0e287adeca494eeb79edb077b0ff.tar.gz) = 24044
+SHA256 (asterisk/traud-asterisk-opus-83e1b458c77e0e287adeca494eeb79edb077b0ff_GH0.tar.gz) = 572a3c956371ed62b44a4bcd973db10eb4c84f3040cf7156e3acfad3b6bf3ded
+SIZE (asterisk/traud-asterisk-opus-83e1b458c77e0e287adeca494eeb79edb077b0ff_GH0.tar.gz) = 24044

Modified: head/net/asterisk15/Makefile
==============================================================================
--- head/net/asterisk15/Makefile	Fri Jan 18 20:03:08 2019	(r490666)
+++ head/net/asterisk15/Makefile	Fri Jan 18 20:10:14 2019	(r490667)
@@ -4,8 +4,7 @@ PORTNAME=	asterisk
 PORTVERSION=	15.7.1
 PORTREVISION=	1
 CATEGORIES=	net
-MASTER_SITES=	https://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729  \
-		https://github.com/traud/asterisk-opus/archive/:opus
+MASTER_SITES=	https://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729
 MASTER_SITE_SUBDIR=	asterisk/ \
 			asterisk/old-releases/ \
 			sounds/releases/:g729
@@ -35,6 +34,7 @@ USE_CSTD=	gnu89
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	asterisk
+USE_GITHUB=	nodefault
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--datarootdir=${DATADIR} \
@@ -175,10 +175,8 @@ ODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC \
 			libltdl.so:devel/libltdl
 
 OPUS_LIB_DEPENDS=	libopus.so:audio/opus
-OPUS_COMMIT=	83e1b458c77e0e287adeca494eeb79edb077b0ff
-OPUS_SRC=	asterisk-opus-${OPUS_COMMIT}
-OPUS_EXTRACT_ONLY=	${OPUS_COMMIT}${EXTRACT_SUFX}
-OPUS_DISTFILES=	${OPUS_COMMIT}${EXTRACT_SUFX}:opus
+OPUS_EXTRACT_ONLY=	${DISTFILE_opus}
+OPUS_GH_TUPLE=		traud:asterisk-opus:83e1b458c77e0e287adeca494eeb79edb077b0ff:opus
 
 PGSQL_CONFIGURE_WITH=	postgres
 PGSQL_USES=		pgsql
@@ -261,9 +259,9 @@ post-extract-G729-on:
 	${CP} ${DISTDIR}/${DIST_SUBDIR}/${ASTERISK_MOH_G729_SOUNDS} ${WRKSRC}/sounds
 
 post-extract-OPUS-on:
-	${CP} ${WRKDIR}/${OPUS_SRC}/include/asterisk/* ${WRKSRC}/include/asterisk
-	${CP} ${WRKDIR}/${OPUS_SRC}/codecs/* ${WRKSRC}/codecs
-	${CP} ${WRKDIR}/${OPUS_SRC}/res/* ${WRKSRC}/res
+	${CP} ${WRKSRC_opus}/include/asterisk/* ${WRKSRC}/include/asterisk
+	${CP} ${WRKSRC_opus}/codecs/* ${WRKSRC}/codecs
+	${CP} ${WRKSRC_opus}/res/* ${WRKSRC}/res
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/var/lib|${PREFIX}/share|g' ${WRKSRC}/configs/samples/musiconhold.conf.sample

Modified: head/net/asterisk15/distinfo
==============================================================================
--- head/net/asterisk15/distinfo	Fri Jan 18 20:03:08 2019	(r490666)
+++ head/net/asterisk15/distinfo	Fri Jan 18 20:10:14 2019	(r490667)
@@ -1,9 +1,9 @@
-TIMESTAMP = 1547713284
+TIMESTAMP = 1547834728
 SHA256 (asterisk/asterisk-15.7.1.tar.gz) = 67514d4c81f506fe0f564dd899c14b3ee6f98fd635233682432c590935baa4c1
 SIZE (asterisk/asterisk-15.7.1.tar.gz) = 27591665
 SHA256 (asterisk/asterisk-core-sounds-en-g729-1.5.tar.gz) = 8b28a59cfa53b59c76e0a191704f0708e3d83acffab8c5e6f25dfc599f0123f9
 SIZE (asterisk/asterisk-core-sounds-en-g729-1.5.tar.gz) = 1551123
 SHA256 (asterisk/asterisk-moh-opsound-g729-2.03.tar.gz) = 0147ca9a97f0c550227aacb7793499057c4d2c64e021c95f93722f27d5549585
 SIZE (asterisk/asterisk-moh-opsound-g729-2.03.tar.gz) = 1103000
-SHA256 (asterisk/83e1b458c77e0e287adeca494eeb79edb077b0ff.tar.gz) = 572a3c956371ed62b44a4bcd973db10eb4c84f3040cf7156e3acfad3b6bf3ded
-SIZE (asterisk/83e1b458c77e0e287adeca494eeb79edb077b0ff.tar.gz) = 24044
+SHA256 (asterisk/traud-asterisk-opus-83e1b458c77e0e287adeca494eeb79edb077b0ff_GH0.tar.gz) = 572a3c956371ed62b44a4bcd973db10eb4c84f3040cf7156e3acfad3b6bf3ded
+SIZE (asterisk/traud-asterisk-opus-83e1b458c77e0e287adeca494eeb79edb077b0ff_GH0.tar.gz) = 24044

Modified: head/net/asterisk16/Makefile
==============================================================================
--- head/net/asterisk16/Makefile	Fri Jan 18 20:03:08 2019	(r490666)
+++ head/net/asterisk16/Makefile	Fri Jan 18 20:10:14 2019	(r490667)
@@ -4,8 +4,7 @@ PORTNAME=	asterisk
 PORTVERSION=	16.1.1
 PORTREVISION=	1
 CATEGORIES=	net
-MASTER_SITES=	https://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729 \
-		https://github.com/traud/asterisk-opus/archive/:opus
+MASTER_SITES=	https://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729
 MASTER_SITE_SUBDIR=	asterisk/ \
 			asterisk/old-releases/ \
 			sounds/releases/:g729
@@ -32,6 +31,7 @@ USE_CSTD=	gnu89
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	asterisk
+USE_GITHUB=	nodefault
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--datarootdir=${DATADIR} \
@@ -172,10 +172,8 @@ ODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC \
 			libltdl.so:devel/libltdl
 
 OPUS_LIB_DEPENDS=	libopus.so:audio/opus
-OPUS_COMMIT=	83e1b458c77e0e287adeca494eeb79edb077b0ff
-OPUS_SRC=	asterisk-opus-${OPUS_COMMIT}
-OPUS_EXTRACT_ONLY=	${OPUS_COMMIT}${EXTRACT_SUFX}
-OPUS_DISTFILES=	${OPUS_COMMIT}${EXTRACT_SUFX}:opus
+OPUS_EXTRACT_ONLY=	${DISTFILE_opus}
+OPUS_GH_TUPLE=		traud:asterisk-opus:83e1b458c77e0e287adeca494eeb79edb077b0ff:opus
 
 PGSQL_CONFIGURE_WITH=	postgres
 PGSQL_USES=		pgsql
@@ -258,9 +256,9 @@ post-extract-G729-on:
 	${CP} ${DISTDIR}/${DIST_SUBDIR}/${ASTERISK_MOH_G729_SOUNDS} ${WRKSRC}/sounds
 
 post-extract-OPUS-on:
-	${CP} ${WRKDIR}/${OPUS_SRC}/include/asterisk/* ${WRKSRC}/include/asterisk
-	${CP} ${WRKDIR}/${OPUS_SRC}/codecs/* ${WRKSRC}/codecs
-	${CP} ${WRKDIR}/${OPUS_SRC}/res/* ${WRKSRC}/res
+	${CP} ${WRKSRC_opus}/include/asterisk/* ${WRKSRC}/include/asterisk
+	${CP} ${WRKSRC_opus}/codecs/* ${WRKSRC}/codecs
+	${CP} ${WRKSRC_opus}/res/* ${WRKSRC}/res
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/var/lib|${PREFIX}/share|g' ${WRKSRC}/configs/samples/musiconhold.conf.sample

Modified: head/net/asterisk16/distinfo
==============================================================================
--- head/net/asterisk16/distinfo	Fri Jan 18 20:03:08 2019	(r490666)
+++ head/net/asterisk16/distinfo	Fri Jan 18 20:10:14 2019	(r490667)
@@ -1,9 +1,9 @@
-TIMESTAMP = 1547164616
+TIMESTAMP = 1547834889
 SHA256 (asterisk/asterisk-16.1.1.tar.gz) = bbf21452dfb213ecc0f24ef05d240e72b57cbc834f9e2e113062c2db2bde6ea5
 SIZE (asterisk/asterisk-16.1.1.tar.gz) = 27490688
 SHA256 (asterisk/asterisk-core-sounds-en-g729-1.5.tar.gz) = 8b28a59cfa53b59c76e0a191704f0708e3d83acffab8c5e6f25dfc599f0123f9
 SIZE (asterisk/asterisk-core-sounds-en-g729-1.5.tar.gz) = 1551123
 SHA256 (asterisk/asterisk-moh-opsound-g729-2.03.tar.gz) = 0147ca9a97f0c550227aacb7793499057c4d2c64e021c95f93722f27d5549585
 SIZE (asterisk/asterisk-moh-opsound-g729-2.03.tar.gz) = 1103000
-SHA256 (asterisk/83e1b458c77e0e287adeca494eeb79edb077b0ff.tar.gz) = 572a3c956371ed62b44a4bcd973db10eb4c84f3040cf7156e3acfad3b6bf3ded
-SIZE (asterisk/83e1b458c77e0e287adeca494eeb79edb077b0ff.tar.gz) = 24044
+SHA256 (asterisk/traud-asterisk-opus-83e1b458c77e0e287adeca494eeb79edb077b0ff_GH0.tar.gz) = 572a3c956371ed62b44a4bcd973db10eb4c84f3040cf7156e3acfad3b6bf3ded
+SIZE (asterisk/traud-asterisk-opus-83e1b458c77e0e287adeca494eeb79edb077b0ff_GH0.tar.gz) = 24044



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