Upgrade uBlock Origin to 1.4.0.

Release notes at <https://github.com/gorhill/uBlock/releases/tag/1.4.0>.

3 files changed, 9 insertions, 47 deletions

diff --git a/www/xpi-uBlock_origin/Makefile b/www/xpi-uBlock_origin/Makefile
index dd34ab5116da..44038b3ba473 100644
--- a/www/xpi-uBlock_origin/Makefile
+++ b/www/xpi-uBlock_origin/Makefile
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	ublock_origin
-PORTVERSION=	1.3.6
-DISTVERSIONSUFFIX=	-sm+tb+fx+an
+PORTVERSION=	1.4.0
+DISTVERSIONSUFFIX=	-an+sm+tb+fx
 CATEGORIES=	www
 
 MAINTAINER=	thierry@FreeBSD.org
diff --git a/www/xpi-uBlock_origin/distinfo b/www/xpi-uBlock_origin/distinfo
index 219f4ee98074..1eeeb7c871d0 100644
--- a/www/xpi-uBlock_origin/distinfo
+++ b/www/xpi-uBlock_origin/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xpi/ublock_origin-1.3.6-sm+tb+fx+an.xpi) = b47f6faecf4ee93d892619bf01f9f86d99c3b3ad0b92f49d1dd1de55586255a2
-SIZE (xpi/ublock_origin-1.3.6-sm+tb+fx+an.xpi) = 1478281
+SHA256 (xpi/ublock_origin-1.4.0-an+sm+tb+fx.xpi) = 755da6f96ae02cfed40c1142e66842f0fdd571f5fd0d7e515d05c2fb5890651d
+SIZE (xpi/ublock_origin-1.4.0-an+sm+tb+fx.xpi) = 1338001
diff --git a/www/xpi-uBlock_origin/pkg-plist b/www/xpi-uBlock_origin/pkg-plist
index 6e7d1f309f6d..c4e1d0f7e5ab 100644
--- a/www/xpi-uBlock_origin/pkg-plist
+++ b/www/xpi-uBlock_origin/pkg-plist
@@ -4,59 +4,22 @@
 %%XPI_XPIDIR%%/about.html
 %%XPI_XPIDIR%%/asset-viewer.html
 %%XPI_XPIDIR%%/assets/checksums.txt
-%%XPI_XPIDIR%%/assets/thirdparties/adblock.gardar.net/is.abp.txt
-%%XPI_XPIDIR%%/assets/thirdparties/adblock.schack.dk/block.txt
-%%XPI_XPIDIR%%/assets/thirdparties/dl.dropboxusercontent.com/u/1289327/abpxfiles/filtri.txt
-%%XPI_XPIDIR%%/assets/thirdparties/easylist-downloads.adblockplus.org/advblock.txt
-%%XPI_XPIDIR%%/assets/thirdparties/easylist-downloads.adblockplus.org/bitblock.txt
 %%XPI_XPIDIR%%/assets/thirdparties/easylist-downloads.adblockplus.org/easylist.txt
-%%XPI_XPIDIR%%/assets/thirdparties/easylist-downloads.adblockplus.org/easylist_noelemhide.txt
-%%XPI_XPIDIR%%/assets/thirdparties/easylist-downloads.adblockplus.org/easylistchina.txt
-%%XPI_XPIDIR%%/assets/thirdparties/easylist-downloads.adblockplus.org/easylistdutch.txt
-%%XPI_XPIDIR%%/assets/thirdparties/easylist-downloads.adblockplus.org/easylistgermany.txt
-%%XPI_XPIDIR%%/assets/thirdparties/easylist-downloads.adblockplus.org/easylistitaly.txt
 %%XPI_XPIDIR%%/assets/thirdparties/easylist-downloads.adblockplus.org/easyprivacy.txt
-%%XPI_XPIDIR%%/assets/thirdparties/easylist-downloads.adblockplus.org/fanboy-annoyance.txt
-%%XPI_XPIDIR%%/assets/thirdparties/easylist-downloads.adblockplus.org/fanboy-social.txt
-%%XPI_XPIDIR%%/assets/thirdparties/easylist-downloads.adblockplus.org/liste_fr.txt
-%%XPI_XPIDIR%%/assets/thirdparties/gitorious.org/adblock-latvian/adblock-latvian/raw/master_lists/latvian-list.txt
-%%XPI_XPIDIR%%/assets/thirdparties/home.fredfiber.no/langsholt/adblock.txt
-%%XPI_XPIDIR%%/assets/thirdparties/hosts-file.net/ad-servers
-%%XPI_XPIDIR%%/assets/thirdparties/liste-ar-adblock.googlecode.com/hg/Liste_AR.txt
-%%XPI_XPIDIR%%/assets/thirdparties/margevicius.lt/easylistlithuania.txt
 %%XPI_XPIDIR%%/assets/thirdparties/mirror1.malwaredomains.com/files/README.md
-%%XPI_XPIDIR%%/assets/thirdparties/mirror1.malwaredomains.com/files/immortal_domains.txt
 %%XPI_XPIDIR%%/assets/thirdparties/mirror1.malwaredomains.com/files/justdomains
 %%XPI_XPIDIR%%/assets/thirdparties/pgl.yoyo.org/as/README.md
 %%XPI_XPIDIR%%/assets/thirdparties/pgl.yoyo.org/as/serverlist
 %%XPI_XPIDIR%%/assets/thirdparties/publicsuffix.org/list/effective_tld_names.dat
-%%XPI_XPIDIR%%/assets/thirdparties/raw.githubusercontent.com/AdBlockPlusIsrael/EasyListHebrew/master/EasyListHebrew.txt
-%%XPI_XPIDIR%%/assets/thirdparties/raw.githubusercontent.com/adblockpolska/Adblock_PL_List/master/adblock_polska.txt
-%%XPI_XPIDIR%%/assets/thirdparties/raw.githubusercontent.com/cjx82630/cjxlist/master/cjxlist.txt
-%%XPI_XPIDIR%%/assets/thirdparties/raw.githubusercontent.com/k2jp/abp-japanese-filters/master/abp_jp.txt
-%%XPI_XPIDIR%%/assets/thirdparties/raw.githubusercontent.com/reek/anti-adblock-killer/master/anti-adblock-killer-filters.txt
-%%XPI_XPIDIR%%/assets/thirdparties/raw.githubusercontent.com/szpeter80/hufilter/master/hufilter.txt
-%%XPI_XPIDIR%%/assets/thirdparties/raw.githubusercontent.com/tomasko126/easylistczechandslovak/master/filters.txt
-%%XPI_XPIDIR%%/assets/thirdparties/raw.githubusercontent.com/wiltteri/wiltteri.txt/master/wiltteri.txt
-%%XPI_XPIDIR%%/assets/thirdparties/someonewhocares.org/hosts/hosts
-%%XPI_XPIDIR%%/assets/thirdparties/spam404bl.com/spam404scamlist.txt
-%%XPI_XPIDIR%%/assets/thirdparties/stanev.org/abp/adblock_bg.txt
-%%XPI_XPIDIR%%/assets/thirdparties/winhelp2002.mvps.org/hosts.txt
-%%XPI_XPIDIR%%/assets/thirdparties/www.fanboy.co.nz/enhancedstats.txt
-%%XPI_XPIDIR%%/assets/thirdparties/www.fanboy.co.nz/fanboy-antifacebook.txt
-%%XPI_XPIDIR%%/assets/thirdparties/www.fanboy.co.nz/fanboy-korean.txt
-%%XPI_XPIDIR%%/assets/thirdparties/www.fanboy.co.nz/fanboy-swedish.txt
-%%XPI_XPIDIR%%/assets/thirdparties/www.fanboy.co.nz/fanboy-ultimate.txt
-%%XPI_XPIDIR%%/assets/thirdparties/www.fanboy.co.nz/fanboy-vietnam.txt
 %%XPI_XPIDIR%%/assets/thirdparties/www.malwaredomainlist.com/hostslist/README.md
 %%XPI_XPIDIR%%/assets/thirdparties/www.malwaredomainlist.com/hostslist/hosts.txt
-%%XPI_XPIDIR%%/assets/thirdparties/www.void.gr/kargig/void-gr-filters.txt
-%%XPI_XPIDIR%%/assets/thirdparties/www.zoso.ro/pages/rolist.txt
 %%XPI_XPIDIR%%/assets/ublock/badware.txt
+%%XPI_XPIDIR%%/assets/ublock/experimental.txt
 %%XPI_XPIDIR%%/assets/ublock/filter-lists.json
 %%XPI_XPIDIR%%/assets/ublock/filters.txt
-%%XPI_XPIDIR%%/assets/ublock/mirror-candidates.txt
 %%XPI_XPIDIR%%/assets/ublock/privacy.txt
+%%XPI_XPIDIR%%/assets/ublock/redirect-resources.txt
+%%XPI_XPIDIR%%/assets/ublock/redirect.txt
 %%XPI_XPIDIR%%/assets/ublock/unbreak.txt
 %%XPI_XPIDIR%%/background.html
 %%XPI_XPIDIR%%/bootstrap.js
@@ -97,7 +60,6 @@
 %%XPI_XPIDIR%%/js/about.js
 %%XPI_XPIDIR%%/js/asset-viewer.js
 %%XPI_XPIDIR%%/js/assets.js
-%%XPI_XPIDIR%%/js/async.js
 %%XPI_XPIDIR%%/js/background.js
 %%XPI_XPIDIR%%/js/cloud-ui.js
 %%XPI_XPIDIR%%/js/contentscript-end.js
@@ -115,10 +77,10 @@
 %%XPI_XPIDIR%%/js/logger-ui.js
 %%XPI_XPIDIR%%/js/logger.js
 %%XPI_XPIDIR%%/js/messaging.js
-%%XPI_XPIDIR%%/js/mirrors.js
 %%XPI_XPIDIR%%/js/pagestore.js
 %%XPI_XPIDIR%%/js/popup.js
 %%XPI_XPIDIR%%/js/profiler.js
+%%XPI_XPIDIR%%/js/redirect-engine.js
 %%XPI_XPIDIR%%/js/reverselookup-worker.js
 %%XPI_XPIDIR%%/js/reverselookup.js
 %%XPI_XPIDIR%%/js/rpcreceiver.js
@@ -128,11 +90,11 @@
 %%XPI_XPIDIR%%/js/scriptlets/cosmetic-survey.js
 %%XPI_XPIDIR%%/js/scriptlets/dom-inspector.js
 %%XPI_XPIDIR%%/js/scriptlets/element-picker.js
+%%XPI_XPIDIR%%/js/scriptlets/subscriber.js
 %%XPI_XPIDIR%%/js/settings.js
 %%XPI_XPIDIR%%/js/start.js
 %%XPI_XPIDIR%%/js/static-net-filtering.js
 %%XPI_XPIDIR%%/js/storage.js
-%%XPI_XPIDIR%%/js/subscriber.js
 %%XPI_XPIDIR%%/js/tab.js
 %%XPI_XPIDIR%%/js/traffic.js
 %%XPI_XPIDIR%%/js/ublock.js