x11/xpra: Update to 3.0.7. Regenerate patches, some hunks were upstreamed.

Reported by:	portscout!

3 files changed, 11 insertions, 40 deletions

diff --git a/x11/xpra/Makefile b/x11/xpra/Makefile
index 170ef37f788a..8580f66c0f9e 100644
--- a/x11/xpra/Makefile
+++ b/x11/xpra/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	xpra
-PORTVERSION=	3.0.6
+PORTVERSION=	3.0.7
 CATEGORIES=	x11
 MASTER_SITES=	http://xpra.org/src/
 
diff --git a/x11/xpra/distinfo b/x11/xpra/distinfo
index 63956b8de436..617dee2edc72 100644
--- a/x11/xpra/distinfo
+++ b/x11/xpra/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1581160018
-SHA256 (xpra-3.0.6.tar.xz) = 0854503added465d745c7b079bd4784c42926c9e768a056fc8df2c78e3285557
-SIZE (xpra-3.0.6.tar.xz) = 2754452
+TIMESTAMP = 1585322822
+SHA256 (xpra-3.0.7.tar.xz) = dc88ab4f7011f0f50f79f2cba97dd14503b336b451db2849f92bdf921b2b8c44
+SIZE (xpra-3.0.7.tar.xz) = 2757140
diff --git a/x11/xpra/files/patch-setup.py b/x11/xpra/files/patch-setup.py
index e02663cddded..39bd641ec0a9 100644
--- a/x11/xpra/files/patch-setup.py
+++ b/x11/xpra/files/patch-setup.py
@@ -1,35 +1,15 @@
---- setup.py.orig	2020-02-07 11:19:08 UTC
+--- setup.py.orig	2020-03-13 16:51:18 UTC
 +++ setup.py
-@@ -165,7 +165,7 @@ html5_brotli_ENABLED = DEFAULT
- minify_ENABLED = html5_ENABLED
- pam_ENABLED = DEFAULT and (server_ENABLED or proxy_ENABLED) and POSIX and not OSX and (os.path.exists("/usr/include/pam/pam_misc.h") or os.path.exists("/usr/include/security/pam_misc.h"))
- 
--xdg_open_ENABLED        = LINUX and DEFAULT
-+xdg_open_ENABLED        = (LINUX or FREEBSD) and DEFAULT
- netdev_ENABLED          = LINUX and DEFAULT
- vsock_ENABLED           = LINUX and os.path.exists("/usr/include/linux/vm_sockets.h")
- bencode_ENABLED         = DEFAULT
-@@ -1481,11 +1481,11 @@ if WIN32:
- #*******************************************************************************
- else:
-     #OSX and *nix:
+@@ -1491,7 +1491,7 @@ else:
+         libexec = "libexec"
+     else:
+         libexec = "lib"
 -    if LINUX:
 +    if LINUX or FREEBSD:
          if scripts_ENABLED:
              scripts += ["scripts/xpra_udev_product_version", "scripts/xpra_signal_listener"]
          libexec_scripts = []
--        if is_Fedora() or is_CentOS() or is_RedHat():
-+        if is_Fedora() or is_CentOS() or is_RedHat() or FREEBSD:
-             libexec = "libexec"
-         else:
-             libexec = "lib"
-@@ -1497,12 +1497,12 @@ else:
-             add_data_files("%s/xpra/" % libexec, libexec_scripts)
-     if data_ENABLED:
-         man_path = "share/man"
--        if OPENBSD:
-+        if OPENBSD or FREEBSD:
-             man_path = "man"
+@@ -1508,7 +1508,7 @@ else:
          add_data_files("%s/man1" % man_path,  ["man/xpra.1", "man/xpra_launcher.1"])
          add_data_files("share/applications",  glob.glob("xdg/*.desktop"))
          add_data_files("share/mime/packages", ["xdg/application-x-xpraconfig.xml"])
@@ -38,16 +18,7 @@
          add_data_files("share/metainfo",      ["xdg/xpra.appdata.xml"])
  
      #here, we override build and install so we can
-@@ -1551,7 +1551,7 @@ else:
- 
-             if printing_ENABLED and POSIX:
-                 #install "/usr/lib/cups/backend" with 0700 permissions:
--                copytodir("cups/xpraforwarder", "lib/cups/backend", chmod=0o700)
-+                copytodir("cups/xpraforwarder", "libexec/cups/backend", chmod=0o700)
- 
-             if x11_ENABLED:
-                 #install xpra_Xdummy if we need it:
-@@ -1624,8 +1624,8 @@ else:
+@@ -1633,8 +1633,8 @@ else:
          remove_packages("xpra.platform.win32", "xpra.platform.darwin")
          if data_ENABLED:
              #not supported by all distros, but doesn't hurt to install them anyway: