svn commit: r465561 - in branches/2018Q1/www/waterfox: . files

[Jan Beich]

Author: jbeich
Date: Mon Mar 26 08:06:27 2018
New Revision: 465561
URL: https://svnweb.freebsd.org/changeset/ports/465561

Log:
  MFH: r465511
  
  www/waterfox: update to 56.1.0
  
  Changes:	https://github.com/MrAlex94/Waterfox/compare/a9c77bbb9f25...56.1.0
  Approved by:	ports-secteam blanket

Deleted:
  branches/2018Q1/www/waterfox/files/patch-a-bug1393284
  branches/2018Q1/www/waterfox/files/patch-bug1366201
  branches/2018Q1/www/waterfox/files/patch-bug1377278
  branches/2018Q1/www/waterfox/files/patch-bug1414440
  branches/2018Q1/www/waterfox/files/patch-bug1426988
  branches/2018Q1/www/waterfox/files/patch-bug1443865
  branches/2018Q1/www/waterfox/files/patch-z-bug868797
Modified:
  branches/2018Q1/www/waterfox/Makefile
  branches/2018Q1/www/waterfox/distinfo
  branches/2018Q1/www/waterfox/files/patch-bug1412558
  branches/2018Q1/www/waterfox/files/patch-typos
Directory Properties:
  branches/2018Q1/   (props changed)

Modified: branches/2018Q1/www/waterfox/Makefile
==============================================================================
--- branches/2018Q1/www/waterfox/Makefile	Mon Mar 26 07:18:44 2018	(r465560)
+++ branches/2018Q1/www/waterfox/Makefile	Mon Mar 26 08:06:27 2018	(r465561)
@@ -1,16 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	waterfox
-DISTVERSION=	56.0.4-72
-DISTVERSIONSUFFIX=	-ga9c77bbb9f25
-PORTREVISION=	2
+DISTVERSION=	56.1.0
 CATEGORIES=	www ipv6
-
-PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES=	ad38ad1b4750.patch:-p1 \
-		557f604cc4b3.patch:-p1 \
-		75c3dd6b9888.patch:-p1 \
-		${NULL}
 
 MAINTAINER=	jbeich at FreeBSD.org
 COMMENT=	Distilled fork of Firefox

Modified: branches/2018Q1/www/waterfox/distinfo
==============================================================================
--- branches/2018Q1/www/waterfox/distinfo	Mon Mar 26 07:18:44 2018	(r465560)
+++ branches/2018Q1/www/waterfox/distinfo	Mon Mar 26 08:06:27 2018	(r465561)
@@ -1,6 +1,6 @@
-TIMESTAMP = 1521489939
-SHA256 (MrAlex94-Waterfox-56.0.4-72-ga9c77bbb9f25_GH0.tar.gz) = 5f492fa42d46cb90c06ac7129a28afff7b979170f13461747deffd77faa03bb4
-SIZE (MrAlex94-Waterfox-56.0.4-72-ga9c77bbb9f25_GH0.tar.gz) = 394039973
+TIMESTAMP = 1521928239
+SHA256 (MrAlex94-Waterfox-56.1.0_GH0.tar.gz) = 638d3c2bf092c36fac3a93ace4aa30bcfee0b7fe867e5b515f304238b9414d17
+SIZE (MrAlex94-Waterfox-56.1.0_GH0.tar.gz) = 394072277
 SHA256 (ad38ad1b4750.patch) = e012573f35c6eb57730f3de790808edcab03a452f6e89ead972648bb68c3b3f5
 SIZE (ad38ad1b4750.patch) = 621136
 SHA256 (557f604cc4b3.patch) = 369c1cc78d9e82351fdf01cc4246d02ea2571a4ce4b1002d10288e4dfb83994a

Modified: branches/2018Q1/www/waterfox/files/patch-bug1412558
==============================================================================
--- branches/2018Q1/www/waterfox/files/patch-bug1412558	Mon Mar 26 07:18:44 2018	(r465560)
+++ branches/2018Q1/www/waterfox/files/patch-bug1412558	Mon Mar 26 08:06:27 2018	(r465561)
@@ -21,47 +21,6 @@ index 53fc3c9937f7..b23771ab80fa 100644
  #else
    // Until bug 1295886 is fixed.
    return false;
-diff --git media/ffvpx/README_MOZILLA media/ffvpx/README_MOZILLA
-index 5d3a6037efe0..43144b726a92 100644
---- media/ffvpx/README_MOZILLA
-+++ media/ffvpx/README_MOZILLA
-@@ -17,14 +17,6 @@ configuration files were generated as follow using the configure script:
- config*:
- replace: /HAVE_(MALLOC_H|ARC4RANDOM|LOCALTIME_R|MEMALIGN|POSIX_MEMALIGN)/d
- 
--config_darwin32.h:
--add to configure command: --disable-asm --disable-yasm --cc='clang -m32'
--
--config_unix32.h:
--add to configure command: --disable-asm --disable-yasm --cc='clang -m32'
--replace: s/HAVE_SYSCTL 1/HAVE_SYSCTL 0/ and s/HAVE_MEMALIGN 1/HAVE_MEMALIGN 0/ and s/HAVE_POSIX_MEMALIGN 1/HAVE_POSIX_MEMALIGN 0/
--
--
- config_unix64.h/config_unix64.asm:
- replace: s/HAVE_SYSCTL 1/HAVE_SYSCTL 0
- 
-diff --git media/ffvpx/config.h media/ffvpx/config.h
-index dab01e05cd65..26ebe529bd98 100644
---- media/ffvpx/config.h
-+++ media/ffvpx/config.h
-@@ -27,17 +27,9 @@
- #define HAVE_LIBC_MSVCRT 0
- #endif
- #elif defined(XP_DARWIN)
--#if defined(HAVE_64BIT_BUILD)
- #include "config_darwin64.h"
--#else
--#include "config_darwin32.h"
--#endif
- #elif defined(XP_UNIX)
--#if defined(HAVE_64BIT_BUILD)
- #include "config_unix64.h"
--#else
--#include "config_unix32.h"
--#endif
- #endif
- #include "config_common.h"
- #endif // MOZ_FFVPX_CONFIG_H
 diff --git old-configure.in old-configure.in
 index b8ce71278548..410be683c2f6 100644
 --- old-configure.in

Modified: branches/2018Q1/www/waterfox/files/patch-typos
==============================================================================
--- branches/2018Q1/www/waterfox/files/patch-typos	Mon Mar 26 07:18:44 2018	(r465560)
+++ branches/2018Q1/www/waterfox/files/patch-typos	Mon Mar 26 08:06:27 2018	(r465561)
@@ -30,16 +30,6 @@ Mismerges found by comparing changes with Firefox 56
  class nsIDocument;
  class nsIDOMNode;
  class nsIURI;
---- gfx/2d/DrawTargetD2D1.cpp
-+++ gfx/2d/DrawTargetD2D1.cpp
-@@ -1251,6 +1251,7 @@ DrawTargetD2D1::CleanupD2D()
-   }
- }
- 
-+void
- DrawTargetD2D1::FlushInternal(bool aHasDependencyMutex /* = false */)
- {
-   if (IsDeviceContextValid()) {
 --- security/nss/lib/softoken/softkver.h.orig
 +++ security/nss/lib/softoken/softkver.h
 @@ -26,6 +26,6 @@