Switch from using 'nacl_main' to 'main' entry point

ports/blackbox/nacl.patch

Index: ports/blackbox/nacl.patch
diff --git a/ports/blackbox/nacl.patch b/ports/blackbox/nacl.patch
index a764958891bebda24606157f85f7367569cc08f8..cc27fea129a151843a8ad0af894581e3b908833c 100644
--- a/ports/blackbox/nacl.patch
+++ b/ports/blackbox/nacl.patch
@@ -316,18 +316,6 @@ diff --git a/src/main.cc b/src/main.cc
  
  
  static void showHelp(int exitval) {
-@@ -72,6 +74,11 @@ static void showHelp(int exitval) {
-   ::exit(exitval);
- }
- 
-+#if defined(__native_client__)
-+#include "nacl_main.h"
-+#define main nacl_main
-+#endif
-+
- int main(int argc, char **argv) {
-   const char *dpy_name = 0;
-   std::string rc_file;
 diff --git a/util/Makefile.in b/util/Makefile.in
 --- a/util/Makefile.in
 +++ b/util/Makefile.in
@@ -356,29 +344,3 @@ diff --git a/util/bsetroot.cc b/util/bsetroot.cc
  
  
  // ignore all X errors
-@@ -339,6 +341,11 @@ void bsetroot::usage(int exit_code) {
-   exit(exit_code);
- }
- 
-+#if defined(__native_client__)
-+# include "nacl_main.h"
-+# define main nacl_main
-+#endif
-+
- int main(int argc, char **argv) {
-   char *display_name = 0;
-   bool multi_head = False;
-diff --git a/util/bstyleconvert.cc b/util/bstyleconvert.cc
---- a/util/bstyleconvert.cc
-+++ b/util/bstyleconvert.cc
-@@ -710,6 +710,10 @@ void writeStyle(const std::string &filename, const NewStyle &style)
- }
- 
- 
-+#if defined(__native_client__)
-+# include "nacl_main.h"
-+# define main nacl_main
-+#endif
- 
- int main(int argc, char* argv[]) {
-   for (int i = 1; i < argc; ++i) {