From 6828ea7d03181d2c9cef8349278476494f34aeaa Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Tue, 9 Jun 2015 14:24:41 +0000 Subject: [PATCH] bsd.sites.mk: cleanup MOZILLA mirrors - Switch to CDN by default as mirrors are no longer kept up to date - Drop obsolete pointer to http://www.mozilla.org/mirrors.html - Drop redundant BUGZILLA and MOZILLA_EXTEND - Shorten MASTER_SITES in gecko@ ports - Move MOZILLA_ADDONS to bsd.sites.mk - Move one of MOZILLA mirrors with old addons under MOZILLA_ADDONS - Addons CDN redirects to https://, so don't mislead with http:// https://blog.mozilla.org/it/2012/08/03/dear-mozilla-mirrors-thank-you/ Differential Revision: https://reviews.freebsd.org/D2550 Tested by: distilator Reviewed by: mat (partial) Approved by: bz-ports (ohauer), portmgr blanket (office@ et al.) Approved by: portmgr (bapt, earlier version) MFH: 2015Q2 --- Mk/bsd.sites.mk | 35 +++++---------------------------- audio/opus-tools/Makefile | 2 +- audio/opus/Makefile | 2 +- audio/opusfile/Makefile | 2 +- devel/bugzilla44/Makefile | 2 +- lang/spidermonkey17/Makefile | 2 +- mail/linux-thunderbird/Makefile | 2 +- mail/thunderbird-i18n/Makefile | 2 +- mail/thunderbird/Makefile | 2 +- textproc/so-hunspell/Makefile | 2 +- textproc/sr-hunspell/Makefile | 2 +- textproc/ss-hunspell/Makefile | 2 +- textproc/tk-hunspell/Makefile | 2 +- textproc/tn-hunspell/Makefile | 2 +- textproc/ts-hunspell/Makefile | 2 +- textproc/ve-hunspell/Makefile | 2 +- textproc/xh-hunspell/Makefile | 2 +- textproc/yi-hunspell/Makefile | 2 +- textproc/zu-hunspell/Makefile | 2 +- www/firefox-esr-i18n/Makefile | 2 +- www/firefox-esr/Makefile | 2 +- www/firefox-i18n/Makefile | 2 +- www/firefox/Makefile | 2 +- www/libxul/Makefile | 2 +- www/linux-firefox/Makefile | 2 +- www/linux-seamonkey/Makefile | 2 +- www/seamonkey-i18n/Makefile | 2 +- www/seamonkey/Makefile | 2 +- www/xpi-adblock/Makefile.xpi | 2 -- www/xpi-downthemall/Makefile | 2 +- 30 files changed, 33 insertions(+), 60 deletions(-) diff --git a/Mk/bsd.sites.mk b/Mk/bsd.sites.mk index 7276f3e7bbee..167fa755cdec 100644 --- a/Mk/bsd.sites.mk +++ b/Mk/bsd.sites.mk @@ -873,43 +873,18 @@ MASTER_SITE_MOZDEV+= \ http://ftp.osuosl.org/pub/mozdev/%SUBDIR%/ .endif -# releases.mozilla.org mirror sites -# -# For the full list, see the following: -# -# http://www.mozilla.org/mirrors.html -# .if !defined(IGNORE_MASTER_SITE_MOZILLA) MASTER_SITE_MOZILLA+= \ - https://ftp.mozilla.org/pub/mozilla.org/%SUBDIR%/ \ - http://mirror3.mirrors.tds.net/pub/mozilla.org/%SUBDIR%/ \ - http://mozilla.isc.org/pub/mozilla.org/%SUBDIR%/ \ http://releases.mozilla.org/pub/mozilla.org/%SUBDIR%/ \ - http://kyoto-mz-dl.sinet.ad.jp/pub/mozilla.org/%SUBDIR%/ \ - http://jp-nii01.mozilla.org/pub/mozilla.org/%SUBDIR%/ \ - http://jp-nii02.mozilla.org/pub/mozilla.org/%SUBDIR%/ \ - http://mirror.internode.on.net/pub/mozilla/%SUBDIR%/ \ - http://ftp.acc.umu.se/pub/mozilla.org/%SUBDIR%/ \ - http://mozilla.c3sl.ufpr.br/releases/%SUBDIR%/ \ - http://www.gtlib.gatech.edu/pub/mozilla.org/%SUBDIR%/ \ - ftp://ftp.mozilla.org/pub/mozilla.org/%SUBDIR%/ \ - ftp://ftp.fh-wolfenbuettel.de/pub/www/mozilla/%SUBDIR%/ \ - ftp://ftp.informatik.rwth-aachen.de/pub/mirror/ftp.mozilla.org/pub/%SUBDIR%/ \ - http://ftp.twaren.net/Unix/Mozilla/%SUBDIR%/ -.endif - -.if !defined(IGNORE_MASTER_SITE_BUGZILLA) -MASTER_SITE_BUGZILLA+= \ https://ftp.mozilla.org/pub/mozilla.org/%SUBDIR%/ \ http://ftp.mozilla.org/pub/mozilla.org/%SUBDIR%/ \ - ftp://ftp.mozilla.org/pub/mozilla.org/%SUBDIR%/ \ - http://mirror.internode.on.net/pub/mozilla/%SUBDIR%/ + ftp://ftp.mozilla.org/pub/mozilla.org/%SUBDIR%/ .endif -.if !defined(IGNORE_MASTER_SITE_MOZILLA_EXTENDED) -MASTER_SITE_MOZILLA_EXTENDED+= \ - http://releases.mozilla.org/pub/mozilla.org/%SUBDIR%/ \ - ${MASTER_SITE_MOZILLA} +.if !defined(IGNORE_MASTER_SITE_MOZILLA_ADDONS) +MASTER_SITE_MOZILLA_ADDONS+= \ + https://addons.cdn.mozilla.net/user-media/%SUBDIR%/ \ + http://kyoto-mz-dl.sinet.ad.jp/pub/mozilla.org/%SUBDIR%/ .endif .if !defined(IGNORE_MASTER_SITE_MPLAYERHQ) diff --git a/audio/opus-tools/Makefile b/audio/opus-tools/Makefile index 08b44cbc3216..3c731542aa30 100644 --- a/audio/opus-tools/Makefile +++ b/audio/opus-tools/Makefile @@ -5,7 +5,7 @@ PORTVERSION= 0.1.9 PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= http://downloads.xiph.org/releases/opus/ \ - MOZILLA_EXTENDED/opus + MOZILLA/opus MAINTAINER= naddy@FreeBSD.org COMMENT= Encode, inspect, and decode Opus files diff --git a/audio/opus/Makefile b/audio/opus/Makefile index 11e48042eb54..142bfd4d8f6c 100644 --- a/audio/opus/Makefile +++ b/audio/opus/Makefile @@ -5,7 +5,7 @@ PORTVERSION= 1.1 PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= http://downloads.xiph.org/releases/opus/ \ - MOZILLA_EXTENDED/opus + MOZILLA/opus MAINTAINER= naddy@FreeBSD.org COMMENT= IETF audio codec diff --git a/audio/opusfile/Makefile b/audio/opusfile/Makefile index e8d7352084c8..58d1c61405c6 100644 --- a/audio/opusfile/Makefile +++ b/audio/opusfile/Makefile @@ -5,7 +5,7 @@ PORTVERSION= 0.6 PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= http://downloads.xiph.org/releases/opus/ \ - MOZILLA_EXTENDED/opus + MOZILLA/opus MAINTAINER= liangtai.s16@gmail.com COMMENT= Opus playback library diff --git a/devel/bugzilla44/Makefile b/devel/bugzilla44/Makefile index d30e4a614d48..c24d757e4084 100644 --- a/devel/bugzilla44/Makefile +++ b/devel/bugzilla44/Makefile @@ -4,7 +4,7 @@ PORTNAME= bugzilla PORTVERSION= 4.4.9 PORTREVISION= 1 CATEGORIES= devel -MASTER_SITES= BUGZILLA/webtools BUGZILLA/webtools/archived +MASTER_SITES= MOZILLA/webtools MOZILLA/webtools/archived MAINTAINER= bz-ports@FreeBSD.org COMMENT= Bug-tracking system developed by Mozilla Project diff --git a/lang/spidermonkey17/Makefile b/lang/spidermonkey17/Makefile index a2a3ce8d65e3..0641de010ecf 100644 --- a/lang/spidermonkey17/Makefile +++ b/lang/spidermonkey17/Makefile @@ -5,7 +5,7 @@ PORTNAME= spidermonkey17 DISTVERSION= 1.7.0 PORTREVISION= 1 CATEGORIES= lang -MASTER_SITES= MOZILLA_EXTENDED/js +MASTER_SITES= MOZILLA/js DISTNAME= js-${DISTVERSION} MAINTAINER= citric@cubicone.tmetic.com diff --git a/mail/linux-thunderbird/Makefile b/mail/linux-thunderbird/Makefile index 9725cb5260d2..65208b5eb3a9 100644 --- a/mail/linux-thunderbird/Makefile +++ b/mail/linux-thunderbird/Makefile @@ -5,7 +5,7 @@ PORTNAME= thunderbird DISTVERSION= 31.7.0 CATEGORIES= mail news net-im ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/linux-i686/en-US \ - https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/linux-i686/en-US/ + MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/linux-i686/en-US MAINTAINER= gecko@FreeBSD.org COMMENT= Mozilla Thunderbird is standalone mail and news that stands above diff --git a/mail/thunderbird-i18n/Makefile b/mail/thunderbird-i18n/Makefile index 5802a6f58382..97ac6cd20db8 100644 --- a/mail/thunderbird-i18n/Makefile +++ b/mail/thunderbird-i18n/Makefile @@ -5,7 +5,7 @@ PORTNAME= thunderbird-i18n PORTVERSION= 31.7.0 CATEGORIES= mail news net-im MASTER_SITES= MOZILLA/${PORTNAME:S|-i18n||}/releases/${DISTVERSION}/linux-i686/xpi \ - https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build1/linux-i686/xpi/ + MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build1/linux-i686/xpi PKGNAMEPREFIX= DISTFILES= ${THUNDERBIRD_I18N_:S/$/.xpi/} DIST_SUBDIR= xpi/${DISTNAME} diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile index c4bd76bbeabe..3aa7be24049a 100644 --- a/mail/thunderbird/Makefile +++ b/mail/thunderbird/Makefile @@ -5,7 +5,7 @@ PORTNAME= thunderbird DISTVERSION= 31.7.0 CATEGORIES= mail news net-im ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ - https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source/ + MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source DISTFILES= ${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX} EXTRACT_ONLY= ${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX} diff --git a/textproc/so-hunspell/Makefile b/textproc/so-hunspell/Makefile index 0d3cc490dcfd..81af2ecc97b7 100644 --- a/textproc/so-hunspell/Makefile +++ b/textproc/so-hunspell/Makefile @@ -4,7 +4,7 @@ PORTNAME= hunspell PORTVERSION= 1.0.2 PORTREVISION= 1 CATEGORIES= textproc -MASTER_SITES= MOZILLA_EXTENDED/addons/13375 +MASTER_SITES= MOZILLA_ADDONS/addons/13375 PKGNAMEPREFIX= so- DISTNAME= qaamuuska_af_soomaaliga-${PORTVERSION}-tb+fx EXTRACT_SUFX= .xpi diff --git a/textproc/sr-hunspell/Makefile b/textproc/sr-hunspell/Makefile index b0afaaa2743f..270422c0954a 100644 --- a/textproc/sr-hunspell/Makefile +++ b/textproc/sr-hunspell/Makefile @@ -4,7 +4,7 @@ PORTNAME= hunspell PORTVERSION= 0.18 PORTREVISION= 1 CATEGORIES= textproc -MASTER_SITES= MOZILLA_EXTENDED/addons/10894 +MASTER_SITES= MOZILLA_ADDONS/addons/10894 PKGNAMEPREFIX= sr- DISTNAME= serbian_dictionary-${PORTVERSION}-fx+tb+sm EXTRACT_SUFX= .xpi diff --git a/textproc/ss-hunspell/Makefile b/textproc/ss-hunspell/Makefile index 888973dd728b..047e8b6d3353 100644 --- a/textproc/ss-hunspell/Makefile +++ b/textproc/ss-hunspell/Makefile @@ -4,7 +4,7 @@ PORTNAME= hunspell PORTVERSION= 20110323 PORTREVISION= 1 CATEGORIES= textproc -MASTER_SITES= MOZILLA_EXTENDED/addons/46614 +MASTER_SITES= MOZILLA_ADDONS/addons/46614 PKGNAMEPREFIX= ss- DISTNAME= swati_spell_checker-${PORTVERSION}-tb+sm+fx+fn EXTRACT_SUFX= .xpi diff --git a/textproc/tk-hunspell/Makefile b/textproc/tk-hunspell/Makefile index 32042d375b9c..9dc6de2b21af 100644 --- a/textproc/tk-hunspell/Makefile +++ b/textproc/tk-hunspell/Makefile @@ -3,7 +3,7 @@ PORTNAME= hunspell PORTVERSION= 0.1.6 CATEGORIES= textproc -MASTER_SITES= MOZILLA_EXTENDED/addons/204314 +MASTER_SITES= MOZILLA_ADDONS/addons/204314 PKGNAMEPREFIX= tk- DISTNAME= turkmen_spell_checker_dictionary-${PORTVERSION}-tb+fx+sm EXTRACT_SUFX= .xpi diff --git a/textproc/tn-hunspell/Makefile b/textproc/tn-hunspell/Makefile index 442d6f26722c..89462d6ee497 100644 --- a/textproc/tn-hunspell/Makefile +++ b/textproc/tn-hunspell/Makefile @@ -4,7 +4,7 @@ PORTNAME= hunspell PORTVERSION= 20110323 PORTREVISION= 1 CATEGORIES= textproc -MASTER_SITES= MOZILLA_EXTENDED/addons/46617 +MASTER_SITES= MOZILLA_ADDONS/addons/46617 PKGNAMEPREFIX= tn- DISTNAME= tswana_spell_checker-${PORTVERSION}-tb+sm+fx+fn EXTRACT_SUFX= .xpi diff --git a/textproc/ts-hunspell/Makefile b/textproc/ts-hunspell/Makefile index 8fd6e020db61..97cdb2ceee30 100644 --- a/textproc/ts-hunspell/Makefile +++ b/textproc/ts-hunspell/Makefile @@ -4,7 +4,7 @@ PORTNAME= hunspell PORTVERSION= 20110323 PORTREVISION= 1 CATEGORIES= textproc -MASTER_SITES= MOZILLA_EXTENDED/addons/46611 +MASTER_SITES= MOZILLA_ADDONS/addons/46611 PKGNAMEPREFIX= ts- DISTNAME= tsonga_spell_checker-${PORTVERSION}-tb+sm+fx+fn EXTRACT_SUFX= .xpi diff --git a/textproc/ve-hunspell/Makefile b/textproc/ve-hunspell/Makefile index b85b0ea25c31..8c048f6c20c5 100644 --- a/textproc/ve-hunspell/Makefile +++ b/textproc/ve-hunspell/Makefile @@ -4,7 +4,7 @@ PORTNAME= hunspell PORTVERSION= 20110323 PORTREVISION= 1 CATEGORIES= textproc -MASTER_SITES= MOZILLA_EXTENDED/addons/46601 +MASTER_SITES= MOZILLA_ADDONS/addons/46601 PKGNAMEPREFIX= ve- DISTNAME= venda_spell_checker-${PORTVERSION}-tb+fn+fx+sm EXTRACT_SUFX= .xpi diff --git a/textproc/xh-hunspell/Makefile b/textproc/xh-hunspell/Makefile index 20da9ff21bcd..e8608bb9797e 100644 --- a/textproc/xh-hunspell/Makefile +++ b/textproc/xh-hunspell/Makefile @@ -4,7 +4,7 @@ PORTNAME= hunspell PORTVERSION= 20110323 PORTREVISION= 1 CATEGORIES= textproc -MASTER_SITES= MOZILLA_EXTENDED/addons/46599 +MASTER_SITES= MOZILLA_ADDONS/addons/46599 PKGNAMEPREFIX= xh- DISTNAME= xhosa_spell_checker-${PORTVERSION}-tb+fn+fx+sm EXTRACT_SUFX= .xpi diff --git a/textproc/yi-hunspell/Makefile b/textproc/yi-hunspell/Makefile index 29d3ef16c51f..9c6e547f3902 100644 --- a/textproc/yi-hunspell/Makefile +++ b/textproc/yi-hunspell/Makefile @@ -3,7 +3,7 @@ PORTNAME= hunspell PORTVERSION= 0.0.3 CATEGORIES= textproc -MASTER_SITES= MOZILLA_EXTENDED/addons/222538 +MASTER_SITES= MOZILLA_ADDONS/addons/222538 PKGNAMEPREFIX= yi- DISTNAME= yiddish_spell_checker_yivo-${PORTVERSION}-sm+fn+fx+tb EXTRACT_SUFX= .xpi diff --git a/textproc/zu-hunspell/Makefile b/textproc/zu-hunspell/Makefile index 9ffd885b3d68..42d4dd866ff3 100644 --- a/textproc/zu-hunspell/Makefile +++ b/textproc/zu-hunspell/Makefile @@ -4,7 +4,7 @@ PORTNAME= hunspell PORTVERSION= 20110323 PORTREVISION= 1 CATEGORIES= textproc -MASTER_SITES= MOZILLA_EXTENDED/addons/46490 +MASTER_SITES= MOZILLA_ADDONS/addons/46490 PKGNAMEPREFIX= zu- DISTNAME= zulu_spell_checker-${PORTVERSION}-tb+fn+fx+sm EXTRACT_SUFX= .xpi diff --git a/www/firefox-esr-i18n/Makefile b/www/firefox-esr-i18n/Makefile index 4e2db7912a77..45cc530f9a59 100644 --- a/www/firefox-esr-i18n/Makefile +++ b/www/firefox-esr-i18n/Makefile @@ -5,7 +5,7 @@ PORTNAME= firefox PORTVERSION= 31.7.0 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME:S|-i18n||}/releases/${DISTVERSION}esr/linux-i686/xpi \ - https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}esr-candidates/build2/linux-i686/xpi/ + MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}esr-candidates/build2/linux-i686/xpi PKGNAMEPREFIX= PKGNAMESUFFIX= -esr-i18n DISTFILES= ${FIREFOX_I18N_:S/$/.xpi/} diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile index 25f91335894d..9252ec301135 100644 --- a/www/firefox-esr/Makefile +++ b/www/firefox-esr/Makefile @@ -7,7 +7,7 @@ DISTVERSIONSUFFIX=esr.source PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \ - https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME}/candidates/${DISTVERSION}esr-candidates/build2/source/ + MOZILLA/${PORTNAME}/candidates/${DISTVERSION}esr-candidates/build2/source PKGNAMESUFFIX= -esr MAINTAINER= gecko@FreeBSD.org diff --git a/www/firefox-i18n/Makefile b/www/firefox-i18n/Makefile index b3c2e7b4f4cf..81d6635438e1 100644 --- a/www/firefox-i18n/Makefile +++ b/www/firefox-i18n/Makefile @@ -5,7 +5,7 @@ PORTNAME= firefox-i18n PORTVERSION= 38.0.5 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME:S|-i18n||}/releases/${DISTVERSION}/linux-i686/xpi \ - https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build4/linux-i686/xpi/ + MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build4/linux-i686/xpi PKGNAMEPREFIX= DISTFILES= ${FIREFOX_I18N_:S/$/.xpi/} DIST_SUBDIR= xpi/${DISTNAME} diff --git a/www/firefox/Makefile b/www/firefox/Makefile index 71c5b11505df..bc326577b873 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -7,7 +7,7 @@ DISTVERSIONSUFFIX=.source PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ - https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME}/candidates/${DISTVERSION}-candidates/build4/source/ + MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build4/source MAINTAINER= gecko@FreeBSD.org COMMENT= Web browser based on the browser portion of Mozilla diff --git a/www/libxul/Makefile b/www/libxul/Makefile index 6f4e53c209fe..c7fe41a80a45 100644 --- a/www/libxul/Makefile +++ b/www/libxul/Makefile @@ -5,7 +5,7 @@ PORTNAME= libxul DISTVERSION= 31.7.0 CATEGORIES?= www devel MASTER_SITES= MOZILLA/firefox/releases/${DISTVERSION}esr/source \ - https://ftp.mozilla.org/pub/mozilla.org/firefox/candidates/${DISTVERSION}esr-candidates/build2/source/ + MOZILLA/firefox/candidates/${DISTVERSION}esr-candidates/build2/source DISTNAME= firefox-${DISTVERSION}esr.source MAINTAINER?= gecko@FreeBSD.org diff --git a/www/linux-firefox/Makefile b/www/linux-firefox/Makefile index f56f3b39e943..3fd352017aca 100644 --- a/www/linux-firefox/Makefile +++ b/www/linux-firefox/Makefile @@ -6,7 +6,7 @@ DISTVERSION= 38.0.5 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/linux-i686/en-US \ - https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME}/candidates/${DISTVERSION}-candidates/build4/linux-i686/en-US/ + MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build4/linux-i686/en-US MAINTAINER= gecko@FreeBSD.org COMMENT= Web browser based on the browser portion of Mozilla diff --git a/www/linux-seamonkey/Makefile b/www/linux-seamonkey/Makefile index 232b6a38cffe..dc48c4e76340 100644 --- a/www/linux-seamonkey/Makefile +++ b/www/linux-seamonkey/Makefile @@ -5,7 +5,7 @@ PORTNAME= seamonkey DISTVERSION= 2.33.1 CATEGORIES= www mail news editors irc ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/linux-i686/en-US \ - https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/linux-i686/en-US/ + MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/linux-i686/en-US MAINTAINER= gecko@FreeBSD.org COMMENT= The open source, standards compliant web browser diff --git a/www/seamonkey-i18n/Makefile b/www/seamonkey-i18n/Makefile index 60c03ad95e36..738322db5fda 100644 --- a/www/seamonkey-i18n/Makefile +++ b/www/seamonkey-i18n/Makefile @@ -5,7 +5,7 @@ PORTNAME= seamonkey-i18n PORTVERSION= 2.33.1 CATEGORIES= www mail news editors irc MASTER_SITES= MOZILLA/${PORTNAME:S|-i18n||}/releases/${DISTVERSION}/langpack \ - https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build1/langpack/ + MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build1/langpack PKGNAMEPREFIX= DISTFILES= ${SEAMONKEY_I18N_:S/$/.langpack.xpi/:S/^/seamonkey-${PORTVERSION}./} DIST_SUBDIR= xpi/${DISTNAME} diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile index 0fbb1176e292..41847db932b3 100644 --- a/www/seamonkey/Makefile +++ b/www/seamonkey/Makefile @@ -6,7 +6,7 @@ DISTVERSION= 2.33.1 PORTREVISION= 3 CATEGORIES?= www mail news editors irc ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ - https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source/ + MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source DISTFILES= ${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX} EXTRACT_ONLY= ${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX} diff --git a/www/xpi-adblock/Makefile.xpi b/www/xpi-adblock/Makefile.xpi index 11c53150f5cd..6a58675a1693 100644 --- a/www/xpi-adblock/Makefile.xpi +++ b/www/xpi-adblock/Makefile.xpi @@ -59,8 +59,6 @@ # xpi ports do not depend on their master applications. You can install an # extension before the app and run relink when the app is present. -MASTER_SITE_MOZILLA_ADDONS= http://addons.cdn.mozilla.net/user-media/%SUBDIR%/ - .ifndef MASTER_SITES .ifdef XPI_NUM MASTER_SITES?= MOZILLA_ADDONS/addons/${XPI_NUM} diff --git a/www/xpi-downthemall/Makefile b/www/xpi-downthemall/Makefile index d8ec8890f90a..f091d2415a37 100644 --- a/www/xpi-downthemall/Makefile +++ b/www/xpi-downthemall/Makefile @@ -5,13 +5,13 @@ PORTNAME= downthemall PORTVERSION= 2.0.17 DISTVERSIONSUFFIX= -fx+sm CATEGORIES= www -MASTER_SITES= MOZILLA_EXTENDED/addons/201 MAINTAINER= gecko@FreeBSD.org COMMENT= Lets you download all the links in a webpage and much more XPI_DISTNAME= downthemall +XPI_NUM= 201 XPI_ID= {DDC359D1-844A-42a7-9AA1-88A850A938A8} .include "${.CURDIR}/../xpi-adblock/Makefile.xpi"