From 4d1dc983e7e6636dde289d4bf6a9cf86d4f43058 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Tue, 11 Jul 2017 13:55:22 +0000 Subject: [PATCH] mozjs38: -devel conflicts with js-devel use ${MOZILLA_SITE} Closes #6989 --- srcpkgs/mozjs38/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/mozjs38/template b/srcpkgs/mozjs38/template index cc59c5cc95..1baa19613d 100644 --- a/srcpkgs/mozjs38/template +++ b/srcpkgs/mozjs38/template @@ -11,7 +11,7 @@ short_desc="Mozilla JavaScript interpreter and library (38.x series)" homepage="http://www.mozilla.org/js/" license="MPL-1.1, GPL-2, LGPL-2.1" maintainer="Juan RP " -distfiles="https://ftp.mozilla.org/pub/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.bz2" +distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.bz2" checksum=9475adcee29d590383c4885bc5f958093791d1db4302d694a5d2766698f59982 nopie=yes @@ -55,6 +55,7 @@ post_install() { mozjs38-devel_package() { depends="nspr-devel ${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" + conflicts="js-devel>0" # /usr/bin/js-config pkg_install() { vmove usr/bin/js-config vmove usr/include