diff -urNP /usr/ports/devel/RStudio/files/patch-src_cpp_core_spelling_hunspell_affentry.hxx ./files/patch-src_cpp_core_spelling_hunspell_affentry.hxx
--- /usr/ports/devel/RStudio/files/patch-src_cpp_core_spelling_hunspell_affentry.hxx	1970-01-01 01:00:00.000000000 +0100
+++ ./files/patch-src_cpp_core_spelling_hunspell_affentry.hxx	2018-05-16 08:05:21.233239000 +0200
@@ -0,0 +1,20 @@
+--- src/cpp/core/spelling/hunspell/affentry.hxx.orig	2018-05-16 08:03:33.232684000 +0200
++++ src/cpp/core/spelling/hunspell/affentry.hxx	2018-05-16 08:04:38.957718000 +0200
+@@ -27,7 +27,7 @@
+   struct hentry *      checkword(const char * word, int len, char in_compound, 
+                             const FLAG needflag = FLAG_NULL);
+ 
+-  struct hentry *      check_twosfx(const char * word, int len, char in_compound, const FLAG needflag = NULL);
++  struct hentry *      check_twosfx(const char * word, int len, char in_compound, const FLAG needflag = FLAG_NULL);
+ 
+   char *      check_morph(const char * word, int len, char in_compound,
+                             const FLAG needflag = FLAG_NULL);
+@@ -90,7 +90,7 @@
+ //                    const FLAG cclass = FLAG_NULL, const FLAG needflag = FLAG_NULL, char in_compound=IN_CPD_NOT);
+                     const FLAG cclass = FLAG_NULL, const FLAG needflag = FLAG_NULL, const FLAG badflag = 0);
+ 
+-  struct hentry *   check_twosfx(const char * word, int len, int optflags, PfxEntry* ppfx, const FLAG needflag = NULL);
++  struct hentry *   check_twosfx(const char * word, int len, int optflags, PfxEntry* ppfx, const FLAG needflag = FLAG_NULL);
+ 
+   char *      check_twosfx_morph(const char * word, int len, int optflags,
+                  PfxEntry* ppfx, const FLAG needflag = FLAG_NULL);
diff --exclude ERR -urNP /usr/ports/devel/RStudio/files/patch-src_cpp_core_system_Process.cpp ./files/patch-src_cpp_core_system_Process.cpp
--- /usr/ports/devel/RStudio/files/patch-src_cpp_core_system_Process.cpp	1970-01-01 01:00:00.000000000 +0100
+++ ./files/patch-src_cpp_core_system_Process.cpp	2018-05-16 08:08:26.280360000 +0200
@@ -0,0 +1,13 @@
+--- src/cpp/core/system/Process.cpp.orig	2018-05-16 08:07:48.969066000 +0200
++++ src/cpp/core/system/Process.cpp	2018-05-16 08:08:05.143543000 +0200
+@@ -236,8 +236,8 @@
+    cb.onError = bind(&ChildCallbacks::onError, pCC, _1, _2);
+ 
+    // Not implemented for generic processes
+-   cb.onHasSubprocs = NULL;
+-   cb.reportCwd = NULL;
++   cb.onHasSubprocs = 0;
++   cb.reportCwd = 0;
+ 
+    // return it
+    return cb;
diff --exclude ERR -urNP /usr/ports/devel/RStudio/files/patch-src_cpp_session_modules_SessionCodeSearch.cpp ./files/patch-src_cpp_session_modules_SessionCodeSearch.cpp
--- /usr/ports/devel/RStudio/files/patch-src_cpp_session_modules_SessionCodeSearch.cpp	1970-01-01 01:00:00.000000000 +0100
+++ ./files/patch-src_cpp_session_modules_SessionCodeSearch.cpp	2018-05-16 08:19:24.360316000 +0200
@@ -0,0 +1,11 @@
+--- src/cpp/session/modules/SessionCodeSearch.cpp.orig	2018-05-16 08:18:53.884840000 +0200
++++ src/cpp/session/modules/SessionCodeSearch.cpp	2018-05-16 08:19:06.300137000 +0200
+@@ -771,7 +771,7 @@
+    
+    void walkFiles(const FilePath& parentPath,
+                   boost::function<void(const Entry&)> operation,
+-                  boost::function<bool(const Entry&)> filter = NULL)
++                  boost::function<bool(const Entry&)> filter = 0)
+    {
+       Entry parentEntry(core::toFileInfo(parentPath));
+       EntryTree::iterator parentItr = pEntries_->find_branch(parentEntry);