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

ports/texlive/nacl.patch

Index: ports/texlive/nacl.patch
diff --git a/ports/texlive/nacl.patch b/ports/texlive/nacl.patch
index da42ed743a731a552d7c99a8e845cc504eafd53f..eb7a2653cdd19ad46c67c41c04da8953900b6b0a 100644
--- a/ports/texlive/nacl.patch
+++ b/ports/texlive/nacl.patch
@@ -417,33 +417,6 @@ index 6a0e564..b3ea841 100644
  LIBTOOL = @LIBTOOL@
  LIPO = @LIPO@
  LN_S = @LN_S@
-diff --git a/texk/bibtex-x/bibtex.c b/texk/bibtex-x/bibtex.c
-index 0964f4d..15d49f3 100644
---- a/texk/bibtex-x/bibtex.c
-+++ b/texk/bibtex-x/bibtex.c
-@@ -102,6 +102,10 @@
- #include <config.h>
- #endif
- 
-+#if defined(__native_client__)
-+#include "nacl_main.h"
-+#endif
-+
- #ifdef KPATHSEA
- #include <kpathsea/config.h>
- #include <kpathsea/progname.h>
-@@ -226,7 +230,11 @@ END
-  * In addition, the program sends error messages and other remarks to the
-  * |log_file| and terminal.
-  ***************************************************************************/
-+#if defined(__native_client__)
-+int                     nacl_main (int argc, char **argv)
-+#else
- int                     main (int argc, char **argv)
-+#endif
- BEGIN
-     extern Integer8_T       history;
-     int			    exit_status;
 diff --git a/texk/dvipdfm-x/Makefile.in b/texk/dvipdfm-x/Makefile.in
 index ad763f7..6687720 100644
 --- a/texk/dvipdfm-x/Makefile.in
@@ -457,30 +430,6 @@ index ad763f7..6687720 100644
  LIBTOOL = @LIBTOOL@
  LIPO = @LIPO@
  LN_S = @LN_S@
-diff --git a/texk/dvipdfm-x/dvipdfmx.c b/texk/dvipdfm-x/dvipdfmx.c
-index f95614d..56902ac 100644
---- a/texk/dvipdfm-x/dvipdfmx.c
-+++ b/texk/dvipdfm-x/dvipdfmx.c
-@@ -28,6 +28,10 @@
- #include <config.h>
- #endif
- 
-+#if defined(__native_client__)
-+#include "nacl_main.h"
-+#endif
-+
- #include <stdio.h>
- #include <string.h>
- #include <limits.h>
-@@ -902,6 +906,8 @@ extern __declspec(dllexport) int DLLPROC (int argc, char *argv[]);
- 
- #if defined(MIKTEX)
- #  define main Main
-+#elif defined(__native_client__)
-+#  define main nacl_main
- #endif
- 
- int
 diff --git a/texk/dvipdfm-x/pdfencrypt.c b/texk/dvipdfm-x/pdfencrypt.c
 index 480823c..5f95549 100644
 --- a/texk/dvipdfm-x/pdfencrypt.c
@@ -839,151 +788,6 @@ index 79bf895..d2424d1 100755
  fi
  
  # configure is writing to config.log, and then calls config.status.
-diff --git a/texk/web2c/ctangleboot.cin b/texk/web2c/ctangleboot.cin
-index caa5fde..3112d93 100644
---- a/texk/web2c/ctangleboot.cin
-+++ b/texk/web2c/ctangleboot.cin
-@@ -7,6 +7,9 @@
- #line 121 "cwebdir/ctang-w2c.ch"
- #include <kpathsea/kpathsea.h> 
- #include <stdio.h> 
-+#if defined(__native_client__)
-+#include "nacl_main.h"
-+#endif
- #line 37 "cwebdir/common.h"
- 
- /*:5*//*61:*/
-@@ -410,7 +413,11 @@ static void skip_limbo(void);
- #line 91 "cwebdir/ctangle.w"
- 
- #line 70 "cwebdir/ctang-w2c.ch"
-+#if defined(__native_client__)
-+int nacl_main(int ac,char**av)
-+#else
- int main(int ac,char**av)
-+#endif
- #line 95 "cwebdir/ctangle.w"
- {
- argc= ac;argv= av;
-diff --git a/texk/web2c/ctiedir/ctie-k.ch b/texk/web2c/ctiedir/ctie-k.ch
-index 5741bb1..6f03f0a 100644
---- a/texk/web2c/ctiedir/ctie-k.ch
-+++ b/texk/web2c/ctiedir/ctie-k.ch
-@@ -29,7 +29,11 @@
- main(argc, argv)
-         int argc; string *argv;
- @y
-+#if defined(__native_client__)
-+int nacl_main (int argc, string *argv)
-+#else
- int main (int argc, string *argv)
-+#endif
- @z
- 
- @x l.105 Set up kpathsea stuff
-diff --git a/texk/web2c/cwebdir/ctang-w2c.ch b/texk/web2c/cwebdir/ctang-w2c.ch
-index f1be29a..285587e 100644
---- a/texk/web2c/cwebdir/ctang-w2c.ch
-+++ b/texk/web2c/cwebdir/ctang-w2c.ch
-@@ -67,7 +67,11 @@ int main (ac, av)
- int ac;
- char **av;
- @y
-+#if defined(__native_client__)
-+int nacl_main (int ac, char **av)
-+#else
- int main (int ac, char **av)
-+#endif
- @z
- 
- @x l.100 - Add Web2C version to banner.
-@@ -120,6 +124,9 @@ Section 6.
- @y
- #include <kpathsea/kpathsea.h>
- #include <stdio.h>
-+#if defined(__native_client__)
-+#include "nacl_main.h"
-+#endif
- @z
- 
- @x common.h l.65
-diff --git a/texk/web2c/cwebdir/cweav-w2c.ch b/texk/web2c/cwebdir/cweav-w2c.ch
-index 0fde9a7..97b5489 100644
---- a/texk/web2c/cwebdir/cweav-w2c.ch
-+++ b/texk/web2c/cwebdir/cweav-w2c.ch
-@@ -72,7 +72,11 @@ int main (ac, av)
- int ac; /* argument count */
- char **av; /* argument values */
- @y
-+#if defined(__native_client__)
-+int nacl_main (int ac, char **av)
-+#else
- int main (int ac, char **av)
-+#endif
- @z
- 
- @x l.107 - Add Web2C version to banner.
-@@ -146,6 +150,9 @@ Section 6.
- @y
- #include <kpathsea/kpathsea.h>
- #include <stdio.h>
-+#if defined(__native_client__)
-+#include "nacl_main.h"
-+#endif
- @z
- 
- @x common.h l.65
-diff --git a/texk/web2c/lib/main.c b/texk/web2c/lib/main.c
-index d3f5a45..2922ab8 100644
---- a/texk/web2c/lib/main.c
-+++ b/texk/web2c/lib/main.c
-@@ -4,6 +4,10 @@
- #include <w2c/config.h>
- #include "lib.h"
- 
-+#if defined(__native_client__)
-+#include "nacl_main.h"
-+#endif
-+
- /* These variables are referenced from the change files.  */
- char **argv;
- int argc;
-@@ -12,7 +16,11 @@ int argc;
-    have more to do.  We just have to set up the command line.  web2c
-    transforms Pascal's main block into a procedure `main_body'.  */
- int
-+#if defined(__native_client__)
-+nacl_main (int  ac,  string* av)
-+#else
- main (int  ac,  string* av)
-+#endif
- {
- #ifdef __EMX__
-   _wildcard (&ac, &av);
-diff --git a/texk/web2c/lib/texmfmp.c b/texk/web2c/lib/texmfmp.c
-index 00e32e6..ca53c30 100644
---- a/texk/web2c/lib/texmfmp.c
-+++ b/texk/web2c/lib/texmfmp.c
-@@ -37,6 +37,10 @@
- 
- #include <texmfmp-help.h>
- 
-+#if defined(__native_client__)
-+#include "nacl_main.h"
-+#endif
-+
- /* {tex,mf}d.h defines TeX, MF, INI, and other such symbols.
-    Unfortunately there's no way to get the banner into this code, so
-    just repeat the text.  */
-@@ -922,6 +926,8 @@ maininit (int ac, string *av)
- int
- #if defined(DLLPROC)
- DLLPROC (int ac, string *av)
-+#elif defined(__native_client__)
-+nacl_main (int ac, string *av)
- #else
- main (int ac, string *av)
- #endif
 diff --git a/texk/web2c/luatexdir/lua/loslibext.c b/texk/web2c/luatexdir/lua/loslibext.c
 index 5a20a63..94e7f6f 100644
 --- a/texk/web2c/luatexdir/lua/loslibext.c
@@ -1062,142 +866,6 @@ index acee671..22bb1a3 100644
      t_socket sock = open(path, O_RDWR);
  #else
      t_socket sock = open(path, O_NOCTTY|O_RDWR);
-diff --git a/texk/web2c/luatexdir/luatex.c b/texk/web2c/luatexdir/luatex.c
-index 509c10e..c245ea5 100644
---- a/texk/web2c/luatexdir/luatex.c
-+++ b/texk/web2c/luatexdir/luatex.c
-@@ -59,6 +59,10 @@ const char *engine_name = my_name;     /* the name of this engine */
- 
- #include <signal.h>             /* Catch interrupts.  */
- 
-+#if defined(__native_client__)
-+#include "nacl_main.h"
-+#endif
-+
- 
- /* {tex,mf}d.h defines TeX, MF, INI, and other such symbols.
-    Unfortunately there's no way to get the banner into this code, so
-@@ -473,6 +477,8 @@ static void myInvalidParameterHandler(const wchar_t * expression,
- int
- #if defined(DLLPROC)
- DLLPROC (int ac, string *av)
-+#elif defined(__native_client__)
-+nacl_main (int ac, string *av)
- #else
- main (int ac, string *av)
- #endif
-diff --git a/texk/web2c/mplibdir/mpost.w b/texk/web2c/mplibdir/mpost.w
-index cf87cce..5b99d24 100644
---- a/texk/web2c/mplibdir/mpost.w
-+++ b/texk/web2c/mplibdir/mpost.w
-@@ -1310,6 +1310,8 @@ static char *cleaned_invocation_name(char *arg)
- int
- #if defined(DLLPROC)
- DLLPROC (int argc, char **argv)
-+#elif defined(__native_client__)
-+nacl_main (int argc, char **argv)
- #else
- main (int argc, char **argv)
- #endif
-diff --git a/texk/web2c/pdftexdir/pdftosrc.cc b/texk/web2c/pdftexdir/pdftosrc.cc
-index ef59b1f..7048848 100644
---- a/texk/web2c/pdftexdir/pdftosrc.cc
-+++ b/texk/web2c/pdftexdir/pdftosrc.cc
-@@ -55,7 +55,11 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
- 
- static XRef *xref = 0;
- 
-+#if defined(__native_client__)
-+extern "C" int nacl_main(int argc, char *argv[])
-+#else
- int main(int argc, char *argv[])
-+#endif
- {
-     char *p, buf[1024];
-     PDFDoc *doc;
-diff --git a/texk/web2c/pdftexdir/ttf2afm.c b/texk/web2c/pdftexdir/ttf2afm.c
-index be3d436..45aed4b 100644
---- a/texk/web2c/pdftexdir/ttf2afm.c
-+++ b/texk/web2c/pdftexdir/ttf2afm.c
-@@ -1015,7 +1015,11 @@ static void usage(void)
-     _exit(-1);
- }
- 
-+#if defined(__native_client__)
-+int nacl_main(int argc, char **argv)
-+#else
- int main(int argc, char **argv)
-+#endif
- {
-     char date[128], *s;
-     time_t t = time(&t);
-diff --git a/texk/web2c/synctexdir/synctex_main.c b/texk/web2c/synctexdir/synctex_main.c
-index cf07d4c..5014681 100644
---- a/texk/web2c/synctexdir/synctex_main.c
-+++ b/texk/web2c/synctexdir/synctex_main.c
-@@ -101,7 +101,11 @@ inline static double my_fmax(double x, double y) { return (x < y) ? y : x; }
- #   endif
- #endif
- 
-+#if defined(__native_client__)
-+int nacl_main(int argc, char *argv[]);
-+#else
- int main(int argc, char *argv[]);
-+#endif
- 
- void synctex_help(const char * error,...);
- void synctex_help_view(const char * error,...);
-@@ -113,7 +117,11 @@ int synctex_edit(int argc, char *argv[]);
- int synctex_update(int argc, char *argv[]);
- int synctex_test(int argc, char *argv[]);
- 
-+#if defined(__native_client__)
-+int nacl_main(int argc, char *argv[])
-+#else
- int main(int argc, char *argv[])
-+#endif
- {
- 	int arg_index = 1;
- 	printf("This is SyncTeX command line utility, version 1.2\n");
-diff --git a/texk/web2c/tiedir/tie-w2c.ch b/texk/web2c/tiedir/tie-w2c.ch
-index 37d5bd7..93b30e6 100644
---- a/texk/web2c/tiedir/tie-w2c.ch
-+++ b/texk/web2c/tiedir/tie-w2c.ch
-@@ -139,7 +139,11 @@ void usage (void)
- main(argc,argv)
-         int argc; string *argv;
- @y
-+#if defined(__native_client__)
-+int nacl_main (int argc, string *argv)
-+#else
- int main (int argc, string *argv)
-+#endif
- @z
- 
- @x
-@@ -163,4 +167,4 @@ int main (int argc, string *argv)
- @y
-       default: /* Anything except spotless, troublesome, or fatal is a bug. */
-       case fatal: msg="That was a fatal error, my friend";  break;
--@z
-\ No newline at end of file
-+@z
-diff --git a/texk/web2c/web2c/main.c b/texk/web2c/web2c/main.c
-index 78f7041..3e0a5ef 100644
---- a/texk/web2c/web2c/main.c
-+++ b/texk/web2c/web2c/main.c
-@@ -224,7 +224,11 @@ initialize (void)
- #endif
- 
- int
-+#if defined(__native_client__)
-+nacl_main (int argc, string *argv)
-+#else
- main (int argc, string *argv)
-+#endif
- {
-   int i;
- 
 diff --git a/texk/xdvik/configure b/texk/xdvik/configure
 index 2f2d1b7..6ef4a86 100755
 --- a/texk/xdvik/configure