Remove most expired ports that depend on Python 2.7:

Exceptions are:
- mail/mailman, our listservers still use it
- www/chromium, solely because of popular demand,
  upstream is (slowly) working on porting it to Python 3
- ports that have actual patches for Python 3 against
  them (Cinnamon and a few unrelated other ports)
- llvm70 and qt5-webengine because they seem to have a lot
  of dependencies which need further analysis
- sysutils/uefi-edk2-bhyve because bhyve seems to use them
- python2 and python27 themselves

I'm sure there will be complaints, but the nice thing about
a version control system is that we can revert and adjust things.

2020-12-31 audio/ardour: Uses Python 2.7 version of scons, and Python 2.7 which is EOLed upstream
2020-12-31 audio/mixxx21: Uses Python 2.7 version of scons, and Python 2.7 which is EOLed upstream
2020-12-31 audio/xmms2: Uses Python 2.7 which is EOLed upstream
2020-12-31 chinese/sunpinyin: Uses Python 2.7 which is EOLed upstream
2020-12-31 databases/arangodb32: Uses Python 2.7 which is EOLed upstream
2020-12-31 databases/arangodb33: Uses Python 2.7 which is EOLed upstream
2020-12-31 devel/bzr: Uses Python 2.7 which is EOLed upstream
2020-12-31 devel/chromium-gn: Uses deprecated version of python, use devel/gn instead
2020-12-31 devel/electron4: Uses Python 2.7 which is EOLed upstream
2020-12-31 devel/electron5: Uses Python 2.7 which is EOLed upstream
2020-12-31 devel/electron6: Uses Python 2.7 which is EOLed upstream
2020-12-31 devel/electron7: Uses Python 2.7 which is EOLed upstream
2020-12-31 devel/gnatpython: Uses Python 2.7 which is EOLed upstream
2020-12-31 devel/godot2: Uses Python 2.7 version of scons, and Python 2.7 which is EOLed upstream
2020-12-31 devel/godot2-tools: Uses Python 2.7 version of scons, and Python 2.7 which is EOLed upstream
2020-12-31 devel/libhid: Uses Python 2.7 which is EOLed upstream
2020-12-31 devel/libosmocore: Uses Python 2.7 which is EOLed upstream
2020-12-31 devel/llvm60: Uses Python 2.7 which is EOLed upstream
2020-12-31 devel/mongo-cxx-driver: Uses Python 2.7 version of scons, and Python 2.7 which is EOLed upstream
2020-06-30 devel/p5-Log-Any-Adapter-Callback: Use devel/p5-Log-Any (Log::Any::Adapter::Capture) instead
2020-12-31 devel/py-backports.functools_lru_cache: Uses Python 2.7 which is EOLed upstream
2020-12-31 devel/py-backports.os: Python 2 is EOL upstream
2020-12-31 devel/py-backports.shutil_get_terminal_size: Python 2 is EOL upstream
2020-12-31 devel/py-backports_abc: Uses Python 2.7 which is EOLed upstream
2020-12-31 devel/py-cheetah: Uses Python 2.7 which is EOLed upstream
2020-12-31 devel/py-dis3: Python 2 only, backport of Python 3
2020-12-31 devel/py-enum34: Will be removed along with python27
2020-12-31 devel/py-functools32: Python 2 only, backport of Python 3
2020-12-31 devel/py-futures: Uses Python 2.7 which is EOLed upstream
2020-12-31 devel/py-more-itertools5: Uses Python 2.7 which is EOLed upstream
2020-12-31 devel/py-pathlib: Uses Python 2.7 which is EOLed upstream
2020-12-31 devel/py-selectors2: Python 2 is EOL upstream
2020-12-31 devel/py-should_dsl: Uses Python 2.7 which is EOLed upstream
2020-12-31 devel/py-singledispatch: Uses Python 2.7 which is EOLed upstream
2020-12-31 devel/py-subprocess32: Python 2 only, following EOL of lang/python27
2020-12-31 devel/py-total-ordering: Uses Python 2.7 which is EOLed upstream
2020-12-31 devel/py-typing: Python 2 only, backport of Python 3
2020-12-31 devel/py-weakrefmethod: Python 2 only, backport of Python 3
2020-12-31 devel/rbtools: Uses Python 2.7 which is EOLed upstream
2020-12-31 devel/subversion-lts: Uses Python 2.7 which is EOLed upstream
2020-12-31 devel/viewvc: Uses Python 2.7 which is EOLed upstream
2020-12-31 dns/py-dns: Uses Python 2.7 which is EOLed upstream
2020-12-31 editors/atom: Uses Python 2.7 which is EOLed upstream
2020-12-31 emulators/fceux: Uses Python 2.7 version of scons, and Python 2.7 which is EOLed upstream
2020-12-31 emulators/gem5: Uses Python 2.7 version of scons, and Python 2.7 which is EOLed upstream
2020-12-31 emulators/nonpareil: Uses Python 2.7 version of scons, and Python 2.7 which is EOLed upstream
2020-12-31 games/0ad: Uses deprecated version of python
2020-12-31 games/dangerdeep: Uses Python 2.7 version of scons, and Python 2.7 which is EOLed upstream
2020-12-31 games/freera: Uses Python 2.7 version of scons, and Python 2.7 which is EOLed upstream
2020-12-31 games/glob2: Uses Python 2.7 version of scons, and Python 2.7 which is EOLed upstream
2020-12-31 games/marsnomercy: Uses Python 2.7 version of scons, and Python 2.7 which is EOLed upstream
2020-12-31 games/netpanzer: Uses Python 2.7 version of scons, and Python 2.7 which is EOLed upstream
2020-12-31 games/pingus: Uses Python 2.7 version of scons, and Python 2.7 which is EOLed upstream
2020-12-31 games/renpy: Uses deprecated version of python
2020-12-31 graphics/goxel: Uses Python 2.7 version of scons, and Python 2.7 which is EOLed upstream
2020-12-31 graphics/py-pillow6: Uses Python 2.7 which is EOLed upstream
2020-12-31 graphics/sk1libs: Uses Python 2.7 which is EOLed upstream
2020-12-31 graphics/uniconvertor: Uses deprecated version of python
2020-12-31 lang/julia10: Uses Python 2.7 which is EOLed upstream
2020-12-31 lang/pypy: Uses Python 2.7 which is EOLed upstream
2020-12-31 lang/pypy3: Uses Python 2.7 which is EOLed upstream
2020-12-31 lang/spidermonkey185: Uses Python 2.7 which is EOLed upstream
2020-12-31 lang/spidermonkey24: Uses Python 2.7 which is EOLed upstream
2020-12-31 lang/spidermonkey52: Uses Python 2.7 which is EOLed upstream
2020-12-31 lang/spidermonkey60: Requires python2 to build
2020-12-31 lang/tolua++: Uses Python 2.7 version of scons, and Python 2.7 which is EOLed upstream
2020-12-31 mail/getmail: Uses deprecated version of python
2020-12-31 math/gringo: Uses Python 2.7 which is EOLed upstream
2020-12-31 multimedia/ffmpeg2theora: Uses Python 2.7 version of scons, and Python 2.7 which is EOLed upstream
2020-12-31 multimedia/mimms: Uses Python 2.7 which is EOLed upstream
2020-12-31 net/py-ipaddress: Uses Python 2.7 which is EOLed upstream
2020-12-31 net-p2p/linuxdcpp: Uses Python 2.7 version of scons, and Python 2.7 which is EOLed upstream
2020-12-31 security/broccoli: Depends lang/python27 which is EOLed upstream
2020-12-31 security/orthrus: Uses Python 2.7 version of scons, and Python 2.7 which is EOLed upstream
2020-12-31 security/py-backports.ssl_match_hostname: Uses Python 2.7 which is EOLed upstream
2020-12-31 security/sandsifter: Uses deprecated version of python, see https://github.com/rigred/sandsifter/issues/10
2020-12-31 sysutils/cinnamon-control-center: Uses Python 2.7 which is EOLed upstream
2020-12-31 sysutils/ori: Uses Python 2.7 version of scons, and Python 2.7 which is EOLed upstream
2020-12-31 sysutils/osquery: Uses Python 2.7 which is EOLed upstream
2020-12-31 sysutils/py-shutilwhich: Python 2 only, backport of Python 3
2020-12-31 sysutils/uefi-edk2-bhyve-csm: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/cliqz: Uses deprecated version of python
2020-12-31 www/iridium: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/moinmoin: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/node10: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/node12: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-OhlohWidgetsMacro: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-TracGoogleAnalytics: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-accountmanager: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-advancedticketworkflow: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-autocomplete: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-ccselector: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-customfieldadmin: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-datefield: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-defaultcc: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-devel: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-discussion: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-downloads: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-email2trac: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-email2trac-postfix: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-estimator: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-fivestarvote: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-fullblog: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-fullblognotification: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-graphviz: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-iniadmin: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-keywords: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-keywordsecretticket: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-ldap: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-ldapauthstore: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-math: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-mercurial: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-navadd: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-permredirect: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-privatetickets: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-pydotorgtheme: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-scrumburndown: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-spam-filter: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-subtickets: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-tags: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-themeengine: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-ticketimport: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-tickettemplate: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-timingandestimation: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-tocmacro: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-tweakui: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-vote: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-wikigoodies: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-wikinotification: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-wikitemplates: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-wikitopdf: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-wysiwyg: Uses Python 2.7 which is EOLed upstream
2020-12-31 www/trac-xmlrpc: Uses Python 2.7 which is EOLed upstream

10 files changed, 0 insertions, 351 deletions

diff --git a/devel/godot2/files/patch-SConstruct b/devel/godot2/files/patch-SConstruct
deleted file mode 100644
index b73a2b71f708..000000000000
--- a/devel/godot2/files/patch-SConstruct
+++ /dev/null
@@ -1,36 +0,0 @@
---- SConstruct.orig	2016-11-15 18:44:21 UTC
-+++ SConstruct
-@@ -65,7 +65,7 @@ elif (os.name == "nt"):
-     if (os.getenv("VSINSTALLDIR") == None or platform_arg == "android"):
-         custom_tools = ['mingw']
- 
--env_base = Environment(tools=custom_tools)
-+env_base = Environment(tools=custom_tools, ENV = os.environ)
- if 'TERM' in os.environ:
-     env_base['ENV']['TERM'] = os.environ['TERM']
- env_base.AppendENVPath('PATH', os.getenv('PATH'))
-@@ -272,15 +272,16 @@ if selected_platform in platform_list:
-     if env["extra_suffix"] != '':
-         env.extra_suffix += '.' + env["extra_suffix"]
- 
--    CCFLAGS = env.get('CCFLAGS', '')
--    env['CCFLAGS'] = ''
--
--    env.Append(CCFLAGS=str(CCFLAGS).split())
--
--    CFLAGS = env.get('CFLAGS', '')
--    env['CFLAGS'] = ''
--
-+    env['CC'] = os.environ['CC']
-+    env['CXX'] = os.environ['CXX']
-+    
-+    CFLAGS = os.environ['CFLAGS']
-+    env['CFLAGS'] = []
-     env.Append(CFLAGS=str(CFLAGS).split())
-+    
-+    CCFLAGS = os.environ['CXXFLAGS']
-+    env['CCFLAGS'] = []
-+    env.Append(CCFLAGS=str(CCFLAGS).split())
- 
-     LINKFLAGS = env.get('LINKFLAGS', '')
-     env['LINKFLAGS'] = ''
diff --git a/devel/godot2/files/patch-drivers_SCsub b/devel/godot2/files/patch-drivers_SCsub
deleted file mode 100644
index ada05634533e..000000000000
--- a/devel/godot2/files/patch-drivers_SCsub
+++ /dev/null
@@ -1,11 +0,0 @@
---- drivers/SCsub.orig	2016-11-30 21:41:21 UTC
-+++ drivers/SCsub
-@@ -14,7 +14,7 @@ SConscript('windows/SCsub')
- # Sounds drivers
- SConscript('alsa/SCsub')
- SConscript('pulseaudio/SCsub')
--if (env["platform"] == "windows"):
-+if (env["platform"] == "windows") or (env["platform"] == "x11"):
-     SConscript("rtaudio/SCsub")
- 
- # Graphics drivers
diff --git a/devel/godot2/files/patch-drivers_rtaudio_audio__driver__rtaudio.cpp b/devel/godot2/files/patch-drivers_rtaudio_audio__driver__rtaudio.cpp
deleted file mode 100644
index 39fbefd0727f..000000000000
--- a/devel/godot2/files/patch-drivers_rtaudio_audio__driver__rtaudio.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
---- drivers/rtaudio/audio_driver_rtaudio.cpp.orig	2016-08-09 07:52:15 UTC
-+++ drivers/rtaudio/audio_driver_rtaudio.cpp
-@@ -35,8 +35,14 @@ const char* AudioDriverRtAudio::get_name
- 
- #ifdef OSX_ENABLED
- 	return "RtAudio-OSX";
--#elif defined(UNIX_ENABLED)
-+#elif defined(UNIX_ENABLED) && (defined(ALSA_ENABLED) || defined(PULSEAUDIO_ENABLED) || defined(OSS_ENABLED))
-+#if defined(OSS_ENABLED)
-+	return "RtAudio-OSS";
-+#elif defined(ALSA_ENABLED)
- 	return "RtAudio-ALSA";
-+#elif defined(PULSEAUDIO_ENABLED)
-+	return "RtAudio-PulseAudio";
-+#endif
- #elif defined(WINDOWS_ENABLED)
- 	return "RtAudio-DirectSound";
- #else
diff --git a/devel/godot2/files/patch-drivers_unix_os__unix.cpp b/devel/godot2/files/patch-drivers_unix_os__unix.cpp
deleted file mode 100644
index 1180857446fd..000000000000
--- a/devel/godot2/files/patch-drivers_unix_os__unix.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
---- drivers/unix/os_unix.cpp.orig	2017-08-28 01:55:12 UTC
-+++ drivers/unix/os_unix.cpp
-@@ -51,6 +51,7 @@
- 
- #if defined(__FreeBSD__) || defined(__OpenBSD__)
- #include <sys/param.h>
-+#include <sys/sysctl.h>
- #endif
- #include "globals.h"
- #include <assert.h>
-@@ -375,17 +376,7 @@ Error OS_Unix::execute(const String &p_p
- 			args.push_back((char *)cs[i].get_data()); // shitty C cast
- 		args.push_back(0);
- 
--#ifdef __FreeBSD__
--		if (p_path.find("/")) {
--			// exec name contains path so use it
--			execv(p_path.utf8().get_data(), &args[0]);
--		} else {
--			// use program name and search through PATH to find it
--			execvp(getprogname(), &args[0]);
--		}
--#else
- 		execv(p_path.utf8().get_data(), &args[0]);
--#endif
- 		// still alive? something failed..
- 		fprintf(stderr, "**ERROR** OS_Unix::execute - Could not create child process while executing: %s\n", p_path.utf8().get_data());
- 		abort();
-@@ -499,12 +490,24 @@ String OS_Unix::get_executable_path() co
- 		return OS::get_executable_path();
- 	}
- 	return b;
--#elif defined(__FreeBSD__) || defined(__OpenBSD__)
-+#elif defined(__OpenBSD__)
- 	char resolved_path[MAXPATHLEN];
- 
- 	realpath(OS::get_executable_path().utf8().get_data(), resolved_path);
- 
- 	return String(resolved_path);
-+
-+#elif defined(__FreeBSD__)
-+	int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 };
-+	char buf[MAXPATHLEN];
-+	size_t len = sizeof(buf);
-+	if (sysctl(mib, 4, buf, &len, NULL, 0) != 0) {
-+		WARN_PRINT("Couldn't get executable path from sysctl");
-+		return OS::get_executable_path();
-+	}
-+	String b;
-+	b.parse_utf8(buf);
-+	return b;
- #elif defined(__APPLE__)
- 	char temp_path[1];
- 	uint32_t buff_size = 1;
diff --git a/devel/godot2/files/patch-modules_speex_audio__stream__speex.cpp b/devel/godot2/files/patch-modules_speex_audio__stream__speex.cpp
deleted file mode 100644
index 9cb0eac898e6..000000000000
--- a/devel/godot2/files/patch-modules_speex_audio__stream__speex.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- modules/speex/audio_stream_speex.cpp.orig	2017-12-28 01:20:49 UTC
-+++ modules/speex/audio_stream_speex.cpp
-@@ -29,7 +29,7 @@
- #include "audio_stream_speex.h"
- 
- #include "os/os.h"
--#include "os_support.h"
-+#include "thirdparty/speex/os_support.h"
- #define READ_CHUNK 1024
- 
- static _FORCE_INLINE_ uint16_t le_short(uint16_t s) {
diff --git a/devel/godot2/files/patch-modules_squish_SCsub b/devel/godot2/files/patch-modules_squish_SCsub
deleted file mode 100644
index 307d0a3ccb25..000000000000
--- a/devel/godot2/files/patch-modules_squish_SCsub
+++ /dev/null
@@ -1,11 +0,0 @@
---- modules/squish/SCsub.orig	2018-06-13 13:01:57 UTC
-+++ modules/squish/SCsub
-@@ -23,7 +23,7 @@ if (env['builtin_squish'] != 'no'):
-     thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
- 
-     env_squish.add_source_files(env.modules_sources, thirdparty_sources)
--    env_squish.Append(CPPPATH=[thirdparty_dir])
-+    env_squish.Prepend(CPPPATH=[thirdparty_dir])
- 
- # Godot source files
- env_squish.add_source_files(env.modules_sources, "*.cpp")
diff --git a/devel/godot2/files/patch-platform_x11_detect.py b/devel/godot2/files/patch-platform_x11_detect.py
deleted file mode 100644
index efa93447d436..000000000000
--- a/devel/godot2/files/patch-platform_x11_detect.py
+++ /dev/null
@@ -1,94 +0,0 @@
---- platform/x11/detect.py.orig	2018-07-29 00:47:52 UTC
-+++ platform/x11/detect.py
-@@ -56,7 +56,9 @@ def get_opts():
-         ('use_sanitizer', 'Use llvm compiler sanitize address', 'no'),
-         ('use_leak_sanitizer', 'Use llvm compiler sanitize memory leaks', 'no'),
-         ('use_lto', 'Use link time optimization', 'no'),
--        ('pulseaudio', 'Detect & Use pulseaudio', 'yes'),
-+        ('alsa','Detect & Use alsa audio','no'),
-+        ('oss','Detect & Use OSS audio','no'),
-+        ('pulseaudio', 'Detect & Use pulseaudio', 'no'),
-         ('udev', 'Use udev for gamepad connection callbacks', 'no'),
-         ('debug_release', 'Add debug symbols to release version', 'no'),
-         ('touch', 'Enable touch events', 'yes'),
-@@ -85,10 +87,6 @@ def configure(env):
- 
-     env.Append(CPPPATH=['#platform/x11'])
-     if (env["use_llvm"] == "yes"):
--        if 'clang++' not in env['CXX']:
--            env["CC"] = "clang"
--            env["CXX"] = "clang++"
--            env["LD"] = "clang++"
-         env.Append(CPPFLAGS=['-DTYPED_METHOD_BIND'])
-         env.extra_suffix = ".llvm"
-     elif (os.system("gcc --version > /dev/null 2>&1") == 0): # GCC
-@@ -126,19 +124,14 @@ def configure(env):
-     env.Append(LINKFLAGS=['-pipe'])
- 
-     if (env["target"] == "release"):
--        env.Prepend(CCFLAGS=['-Ofast'])
--        if (env["debug_release"] == "yes"):
--            env.Prepend(CCFLAGS=['-g2'])
-+        pass
- 
-     elif (env["target"] == "release_debug"):
--
--        env.Prepend(CCFLAGS=['-O2', '-ffast-math', '-DDEBUG_ENABLED'])
--        if (env["debug_release"] == "yes"):
--            env.Prepend(CCFLAGS=['-g2'])
--
-+        env.Prepend(CCFLAGS=['-DDEBUG_ENABLED'])
-+        
-     elif (env["target"] == "debug"):
- 
--        env.Prepend(CCFLAGS=['-g2', '-DDEBUG_ENABLED', '-DDEBUG_MEMORY_ENABLED'])
-+        env.Prepend(CCFLAGS=['-DDEBUG_ENABLED', '-DDEBUG_MEMORY_ENABLED'])
-         env.Append(LINKFLAGS=['-rdynamic'])
- 
-     env.ParseConfig('pkg-config x11 --cflags --libs')
-@@ -155,7 +148,12 @@ def configure(env):
-         env.Append(CPPFLAGS=['-DTOUCH_ENABLED'])
- 
-     if (env['builtin_openssl'] == 'no'):
--        env.ParseConfig('pkg-config openssl --cflags --libs')
-+        try:
-+            # try to find a port installed openssl
-+            env.ParseConfig('pkg-config openssl --cflags --libs')
-+        except:
-+            # if none found use base system openssl
-+            env.ParseConfig('echo -lssl -lcrypto')
- 
-     if (env['builtin_libwebp'] == 'no'):
-         env.ParseConfig('pkg-config libwebp --cflags --libs')
-@@ -200,12 +198,13 @@ def configure(env):
-     if (env['builtin_glew'] == 'no'):
-         env.ParseConfig('pkg-config glew --cflags --libs')
- 
--    if os.system("pkg-config --exists alsa") == 0:
--        print("Enabling ALSA")
--        env.Append(CPPFLAGS=["-DALSA_ENABLED"])
--        env.ParseConfig('pkg-config alsa --cflags --libs')
--    else:
--        print("ALSA libraries not found, disabling driver")
-+    if (env["alsa"]=="yes"):
-+        if os.system("pkg-config --exists alsa")==0:
-+            print("Enabling ALSA")
-+            env.Append(CPPFLAGS=["-DALSA_ENABLED"])
-+            env.Append(LIBS=['asound'])
-+        else:
-+            print("ALSA libraries not found, disabling driver")
- 
-     if (platform.system() == "Linux"):
-         env.Append(CPPFLAGS=["-DJOYDEV_ENABLED"])
-@@ -220,6 +219,11 @@ def configure(env):
-         else:
-             print("libudev development libraries not found, disabling udev support")
- 
-+    if (env["oss"]=="yes"):
-+        print("Enabling OSS Audio")
-+        env.Append(CPPFLAGS=["-DOSS_ENABLED"])
-+        env.Append(CCFLAGS=['-Ithirdparty/rtaudio'])
-+
-     if (env["pulseaudio"] == "yes"):
-         if not os.system("pkg-config --exists libpulse-simple"):
-             print("Enabling PulseAudio")
diff --git a/devel/godot2/files/patch-thirdparty_glew_glew.c b/devel/godot2/files/patch-thirdparty_glew_glew.c
deleted file mode 100644
index 3c7c2653c2c5..000000000000
--- a/devel/godot2/files/patch-thirdparty_glew_glew.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- thirdparty/glew/glew.c.orig	2017-12-28 02:06:18 UTC
-+++ thirdparty/glew/glew.c
-@@ -30,7 +30,7 @@
- ** THE POSSIBILITY OF SUCH DAMAGE.
- */
- 
--#include <GL/glew.h>
-+#include "thirdparty/glew/GL/glew.h"
- 
- #if defined(_WIN32)
- #  include <GL/wglew.h>
diff --git a/devel/godot2/files/patch-thirdparty_rtaudio_RtAudio.cpp b/devel/godot2/files/patch-thirdparty_rtaudio_RtAudio.cpp
deleted file mode 100644
index 02dd71439c98..000000000000
--- a/devel/godot2/files/patch-thirdparty_rtaudio_RtAudio.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
---- thirdparty/rtaudio/RtAudio.cpp.orig	2016-08-09 07:52:15 UTC
-+++ thirdparty/rtaudio/RtAudio.cpp
-@@ -8589,6 +8589,12 @@ bool RtApiPulse::probeDeviceOpen( unsign
- #include <errno.h>
- #include <math.h>
- 
-+#if defined(__FreeBSD__)
-+#define SND_DEVICE "/dev/dsp"
-+#else
-+#define SND_DEVICE "/dev/mixer"
-+#endif
-+
- static void *ossCallbackHandler(void * ptr);
- 
- // A structure to hold various information related to the OSS API
-@@ -8615,9 +8621,11 @@ RtApiOss :: ~RtApiOss()
- 
- unsigned int RtApiOss :: getDeviceCount( void )
- {
--  int mixerfd = open( "/dev/mixer", O_RDWR, 0 );
-+  int mixerfd = open( SND_DEVICE, O_RDWR, 0 );
-   if ( mixerfd == -1 ) {
--    errorText_ = "RtApiOss::getDeviceCount: error opening '/dev/mixer'.";
-+    errorText_ = "RtApiOss::getDeviceCount: error opening '";
-+    errorText_ += SND_DEVICE;
-+    errorText_ += "'.";
-     error( RtAudioError::WARNING );
-     return 0;
-   }
-@@ -8639,9 +8647,11 @@ RtAudio::DeviceInfo RtApiOss :: getDevic
-   RtAudio::DeviceInfo info;
-   info.probed = false;
- 
--  int mixerfd = open( "/dev/mixer", O_RDWR, 0 );
-+  int mixerfd = open( SND_DEVICE, O_RDWR, 0 );
-   if ( mixerfd == -1 ) {
--    errorText_ = "RtApiOss::getDeviceInfo: error opening '/dev/mixer'.";
-+    errorText_ = "RtApiOss::getDeviceInfo: error opening '";
-+    errorText_ += SND_DEVICE;
-+    errorText_ += "'.";
-     error( RtAudioError::WARNING );
-     return info;
-   }
-@@ -8697,8 +8707,10 @@ RtAudio::DeviceInfo RtApiOss :: getDevic
-     info.nativeFormats |= RTAUDIO_SINT8;
-   if ( mask & AFMT_S32_LE || mask & AFMT_S32_BE )
-     info.nativeFormats |= RTAUDIO_SINT32;
-+#if defined(AFMT_FLOAT)
-   if ( mask & AFMT_FLOAT )
-     info.nativeFormats |= RTAUDIO_FLOAT32;
-+#endif
-   if ( mask & AFMT_S24_LE || mask & AFMT_S24_BE )
-     info.nativeFormats |= RTAUDIO_SINT24;
- 
-@@ -8757,9 +8769,11 @@ bool RtApiOss :: probeDeviceOpen( unsign
-                                   RtAudioFormat format, unsigned int *bufferSize,
-                                   RtAudio::StreamOptions *options )
- {
--  int mixerfd = open( "/dev/mixer", O_RDWR, 0 );
-+  int mixerfd = open( SND_DEVICE, O_RDWR, 0 );
-   if ( mixerfd == -1 ) {
--    errorText_ = "RtApiOss::probeDeviceOpen: error opening '/dev/mixer'.";
-+    errorText_ = "RtApiOss::probeDeviceOpen: error opening '";
-+    errorText_ += SND_DEVICE;
-+    errorText_ += "'.";
-     return FAILURE;
-   }
- 
-@@ -8787,7 +8801,11 @@ bool RtApiOss :: probeDeviceOpen( unsign
-   }
- 
-   oss_audioinfo ainfo;
-+#if defined(__FreeBSD__)
-+  ainfo.dev = -1; // specify -1 to get default device
-+#else
-   ainfo.dev = device;
-+#endif
-   result = ioctl( mixerfd, SNDCTL_AUDIOINFO, &ainfo );
-   close( mixerfd );
-   if ( result == -1 ) {
-@@ -9025,7 +9043,7 @@ bool RtApiOss :: probeDeviceOpen( unsign
-   }
- 
-   // Verify the sample rate setup worked.
--  if ( abs( srate - sampleRate ) > 100 ) {
-+  if ( abs( srate - (int)sampleRate ) > 100 ) {
-     close( fd );
-     errorStream_ << "RtApiOss::probeDeviceOpen: device (" << ainfo.name << ") does not support sample rate (" << sampleRate << ").";
-     errorText_ = errorStream_.str();
diff --git a/devel/godot2/files/patch-thirdparty_rtaudio_RtAudio.h b/devel/godot2/files/patch-thirdparty_rtaudio_RtAudio.h
deleted file mode 100644
index 010a8222e1a8..000000000000
--- a/devel/godot2/files/patch-thirdparty_rtaudio_RtAudio.h
+++ /dev/null
@@ -1,16 +0,0 @@
---- thirdparty/rtaudio/RtAudio.h.orig	2016-08-09 07:52:15 UTC
-+++ thirdparty/rtaudio/RtAudio.h
-@@ -5,7 +5,13 @@
- #if defined(OSX_ENABLED)
-     #define __MACOSX_CORE__
- #elif defined(UNIX_ENABLED)
-+#if defined(OSS_ENABLED)
-+    #define __LINUX_OSS__
-+#elif defined(ALSA_ENABLED)
-     #define __LINUX_ALSA__
-+#elif defined(PULSEAUDIO_ENABLED)
-+    #define __LINUX_PULSE__
-+#endif
- #elif defined(WINDOWS_ENABLED)
-     #if defined(WINRT_ENABLED)
-         #define __RTAUDIO_DUMMY__