gecko: restore support for native extensions after r470668/r470672

PR:		226919

10 files changed, 19 insertions, 19 deletions

diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
index 242af3613d0b..853c6d555e0b 100644
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	thunderbird
 DISTVERSION=	52.8.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	mail news net-im ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
 		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source
diff --git a/mail/thunderbird/files/patch-addon-search b/mail/thunderbird/files/patch-addon-search
index e92bf3c15652..dcc684409e80 100644
--- a/mail/thunderbird/files/patch-addon-search
+++ b/mail/thunderbird/files/patch-addon-search
@@ -45,7 +45,7 @@ index f70fd8d7e3bd8..81e8cd7764fdf 100644
            addon.isPlatformCompatible = Array.some(nodes, function(aNode) {
              let text = aNode.textContent.toLowerCase().trim();
 -            return text == "all" || text == Services.appinfo.OS.toLowerCase();
-+            return text == "all" || text == "linux";
++            return text == "all" || text == "linux" || text == Services.appinfo.OS.toLowerCase();
            });
            break;
          case "install":
@@ -54,7 +54,7 @@ index f70fd8d7e3bd8..81e8cd7764fdf 100644
              let os = node.getAttribute("os").trim().toLowerCase();
              // If the os is not ALL and not the current OS then ignore this xpi
 -            if (os != "all" && os != Services.appinfo.OS.toLowerCase())
-+            if (os != "all" && os != "linux")
++            if (os != "all" && os != "linux" && os != Services.appinfo.OS.toLowerCase())
                break;
            }
  
@@ -67,7 +67,7 @@ index f70fd8d7e3bd8..81e8cd7764fdf 100644
      try {
        for (let platform of this.targetPlatforms) {
 -        if (platform.os == Services.appinfo.OS) {
-+        if (platform.os == "Linux") {
++        if (platform.os == "Linux" || platform.os == Services.appinfo.OS) {
            if (platform.abi) {
              needsABI = true;
              if (platform.abi === abi)
diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile
index 565117469f46..a11a0fb7530e 100644
--- a/www/firefox-esr/Makefile
+++ b/www/firefox-esr/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	firefox
 DISTVERSION=	52.8.0
 DISTVERSIONSUFFIX=esr
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \
diff --git a/www/firefox-esr/files/patch-addon-search b/www/firefox-esr/files/patch-addon-search
index ce9d5362b826..4167cf9e23dd 100644
--- a/www/firefox-esr/files/patch-addon-search
+++ b/www/firefox-esr/files/patch-addon-search
@@ -44,7 +44,7 @@ index f70fd8d7e3bd8..81e8cd7764fdf 100644
            addon.isPlatformCompatible = Array.some(nodes, function(aNode) {
              let text = aNode.textContent.toLowerCase().trim();
 -            return text == "all" || text == Services.appinfo.OS.toLowerCase();
-+            return text == "all" || text == "linux";
++            return text == "all" || text == "linux" || text == Services.appinfo.OS.toLowerCase();
            });
            break;
          case "install":
@@ -53,7 +53,7 @@ index f70fd8d7e3bd8..81e8cd7764fdf 100644
              let os = node.getAttribute("os").trim().toLowerCase();
              // If the os is not ALL and not the current OS then ignore this xpi
 -            if (os != "all" && os != Services.appinfo.OS.toLowerCase())
-+            if (os != "all" && os != "linux")
++            if (os != "all" && os != "linux" && os != Services.appinfo.OS.toLowerCase())
                break;
            }
  
@@ -66,7 +66,7 @@ index f70fd8d7e3bd8..81e8cd7764fdf 100644
      try {
        for (let platform of this.targetPlatforms) {
 -        if (platform.os == Services.appinfo.OS) {
-+        if (platform.os == "Linux") {
++        if (platform.os == "Linux" || platform.os == Services.appinfo.OS) {
            if (platform.abi) {
              needsABI = true;
              if (platform.abi === abi)
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index 7ecb12ab2298..4ef4047fd2cf 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	firefox
 DISTVERSION=	60.0.1
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
diff --git a/www/firefox/files/patch-addon-search b/www/firefox/files/patch-addon-search
index a9f0490171a5..06e95a2e04ce 100644
--- a/www/firefox/files/patch-addon-search
+++ b/www/firefox/files/patch-addon-search
@@ -36,7 +36,7 @@ index f70fd8d7e3bd8..81e8cd7764fdf 100644
        if (Array.isArray(aEntry.current_version.files)) {
          for (let file of aEntry.current_version.files) {
 -          if (file.platform == "all" || file.platform == Services.appinfo.OS.toLowerCase()) {
-+          if (file.platform == "all" || file.platform == "linux") {
++          if (file.platform == "all" || file.platform == "linux" || file.platform == Services.appinfo.OS.toLowerCase()) {
              if (file.url) {
                addon.sourceURI = NetUtil.newURI(file.url);
              }
@@ -49,7 +49,7 @@ index f70fd8d7e3bd8..81e8cd7764fdf 100644
      try {
        for (let platform of this.targetPlatforms) {
 -        if (platform.os == Services.appinfo.OS) {
-+        if (platform.os == "Linux") {
++        if (platform.os == "Linux" || platform.os == Services.appinfo.OS) {
            if (platform.abi) {
              needsABI = true;
              if (platform.abi === abi)
diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile
index dacbab28f467..2a1dbaae9f10 100644
--- a/www/seamonkey/Makefile
+++ b/www/seamonkey/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	seamonkey
 DISTVERSION=	2.49.3
-PORTREVISION=	6
+PORTREVISION=	7
 MOZILLA_VER=	52 # above + 3
 CATEGORIES?=	www mail news editors irc ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
diff --git a/www/seamonkey/files/patch-addon-search b/www/seamonkey/files/patch-addon-search
index 4fd8f82f9f5a..cd3363a9cc4b 100644
--- a/www/seamonkey/files/patch-addon-search
+++ b/www/seamonkey/files/patch-addon-search
@@ -42,7 +42,7 @@ index f70fd8d7e3bd8..81e8cd7764fdf 100644
            addon.isPlatformCompatible = Array.some(nodes, function(aNode) {
              let text = aNode.textContent.toLowerCase().trim();
 -            return text == "all" || text == Services.appinfo.OS.toLowerCase();
-+            return text == "all" || text == "linux";
++            return text == "all" || text == "linux" || text == Services.appinfo.OS.toLowerCase();
            });
            break;
          case "install":
@@ -51,7 +51,7 @@ index f70fd8d7e3bd8..81e8cd7764fdf 100644
              let os = node.getAttribute("os").trim().toLowerCase();
              // If the os is not ALL and not the current OS then ignore this xpi
 -            if (os != "all" && os != Services.appinfo.OS.toLowerCase())
-+            if (os != "all" && os != "linux")
++            if (os != "all" && os != "linux" && os != Services.appinfo.OS.toLowerCase())
                break;
            }
  
@@ -64,7 +64,7 @@ index f70fd8d7e3bd8..81e8cd7764fdf 100644
      try {
        for (let platform of this.targetPlatforms) {
 -        if (platform.os == Services.appinfo.OS) {
-+        if (platform.os == "Linux") {
++        if (platform.os == "Linux" || platform.os == Services.appinfo.OS) {
            if (platform.abi) {
              needsABI = true;
              if (platform.abi === abi)
diff --git a/www/waterfox/Makefile b/www/waterfox/Makefile
index b75dfd964a65..b1ff6ecbad9d 100644
--- a/www/waterfox/Makefile
+++ b/www/waterfox/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	waterfox
 DISTVERSION=	56.2.0-13
 DISTVERSIONSUFFIX=	-gd2cdd42f4115b
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www ipv6
 
 MAINTAINER=	jbeich@FreeBSD.org
diff --git a/www/waterfox/files/patch-addon-search b/www/waterfox/files/patch-addon-search
index 27bffc98e887..a2fabaa456b7 100644
--- a/www/waterfox/files/patch-addon-search
+++ b/www/waterfox/files/patch-addon-search
@@ -42,7 +42,7 @@ index f70fd8d7e3bd8..81e8cd7764fdf 100644
            addon.isPlatformCompatible = Array.some(nodes, function(aNode) {
              let text = aNode.textContent.toLowerCase().trim();
 -            return text == "all" || text == Services.appinfo.OS.toLowerCase();
-+            return text == "all" || text == "linux";
++            return text == "all" || text == "linux" || text == Services.appinfo.OS.toLowerCase();
            });
            break;
          case "install":
@@ -51,7 +51,7 @@ index f70fd8d7e3bd8..81e8cd7764fdf 100644
              let os = node.getAttribute("os").trim().toLowerCase();
              // If the os is not ALL and not the current OS then ignore this xpi
 -            if (os != "all" && os != Services.appinfo.OS.toLowerCase())
-+            if (os != "all" && os != "linux")
++            if (os != "all" && os != "linux" && os != Services.appinfo.OS.toLowerCase())
                break;
            }
  
@@ -64,7 +64,7 @@ index f70fd8d7e3bd8..81e8cd7764fdf 100644
      try {
        for (let platform of this.targetPlatforms) {
 -        if (platform.os == Services.appinfo.OS) {
-+        if (platform.os == "Linux") {
++        if (platform.os == "Linux" || platform.os == Services.appinfo.OS) {
            if (platform.abi) {
              needsABI = true;
              if (platform.abi === abi)