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..0f88060597e7e7efff7a20b7eb5e09a9ae4a9ffd 100644
--- a/ports/blackbox/nacl.patch
+++ b/ports/blackbox/nacl.patch
@@ -213,18 +213,6 @@ diff --git a/src/BlackboxResource.cc b/src/BlackboxResource.cc
  
  BlackboxResource::BlackboxResource(const std::string& rc): rc_file(rc) {
    screen_resources = 0;
-diff --git a/src/Makefile.in b/src/Makefile.in
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -302,7 +302,7 @@ clean-binPROGRAMS:
- 	done
- blackbox$(EXEEXT): $(blackbox_OBJECTS) $(blackbox_DEPENDENCIES) 
- 	@rm -f blackbox$(EXEEXT)
--	$(CXXLINK) $(blackbox_LDFLAGS) $(blackbox_OBJECTS) $(blackbox_LDADD) $(LIBS)
-+	$(CXXLINK) $(blackbox_LDFLAGS) $(blackbox_OBJECTS) $(blackbox_LDADD) $(LIBS) $(EXTRA_LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
 diff --git a/src/Screen.cc b/src/Screen.cc
 --- a/src/Screen.cc
 +++ b/src/Screen.cc
@@ -316,34 +304,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
-@@ -282,10 +282,10 @@ clean-binPROGRAMS:
- 	done
- bsetroot$(EXEEXT): $(bsetroot_OBJECTS) $(bsetroot_DEPENDENCIES) 
- 	@rm -f bsetroot$(EXEEXT)
--	$(CXXLINK) $(bsetroot_LDFLAGS) $(bsetroot_OBJECTS) $(bsetroot_LDADD) $(LIBS)
-+	$(CXXLINK) $(bsetroot_LDFLAGS) $(bsetroot_OBJECTS) $(bsetroot_LDADD) $(LIBS) $(EXTRA_LIBS)
- bstyleconvert$(EXEEXT): $(bstyleconvert_OBJECTS) $(bstyleconvert_DEPENDENCIES) 
- 	@rm -f bstyleconvert$(EXEEXT)
--	$(CXXLINK) $(bstyleconvert_LDFLAGS) $(bstyleconvert_OBJECTS) $(bstyleconvert_LDADD) $(LIBS)
-+	$(CXXLINK) $(bstyleconvert_LDFLAGS) $(bstyleconvert_OBJECTS) $(bstyleconvert_LDADD) $(LIBS) $(EXTRA_LIBS)
- install-binSCRIPTS: $(bin_SCRIPTS)
- 	@$(NORMAL_INSTALL)
- 	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
 diff --git a/util/bsetroot.cc b/util/bsetroot.cc
 --- a/util/bsetroot.cc
 +++ b/util/bsetroot.cc
@@ -356,29 +316,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) {