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

ports/blackbox/nacl.patch

 diff --git a/configure b/configure
 --- a/configure
 +++ b/configure
 @@ -20734,7 +20734,7 @@ if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lX11  $LIBS"
 +LIBS="-lX11 -lxcb -lXau $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
@@ skipping 298 matching lines @@
 +++ b/src/main.cc
 @@ -35,6 +35,8 @@
  #include "../version.h"
  
  #include <stdio.h>
 +#include <string.h>
 +#include <stdlib.h>
  
  
  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
 @@ -31,6 +31,8 @@
  
  #include <X11/Xatom.h>
  #include <stdio.h>
 +#include <stdlib.h>
 +#include <string.h>
  
  
  // 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) {