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

ports/avrdude/nacl.patch

Index: ports/avrdude/nacl.patch
diff --git a/ports/avrdude/nacl.patch b/ports/avrdude/nacl.patch
index 5602c3b0796f9d0c3475742afc6cab95f4c51c5b..a3dd62a79d2a6aba53c60dc82f26bce09dd9bb4c 100644
--- a/ports/avrdude/nacl.patch
+++ b/ports/avrdude/nacl.patch
@@ -1,15 +1,3 @@
-diff --git a/Makefile.in b/Makefile.in
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -708,7 +708,7 @@ clean-binPROGRAMS:
- 
- avrdude$(EXEEXT): $(avrdude_OBJECTS) $(avrdude_DEPENDENCIES) $(EXTRA_avrdude_DEPENDENCIES) 
- 	@rm -f avrdude$(EXEEXT)
--	$(AM_V_CCLD)$(avrdude_LINK) $(avrdude_OBJECTS) $(avrdude_LDADD) $(LIBS)
-+	$(AM_V_CCLD)$(avrdude_LINK) $(avrdude_OBJECTS) $(EXTRA_LIBS) $(avrdude_LDADD) $(LIBS)

[binji, 2015/10/27 21:52:38]

remove definition of EXTRA_LIBS too?

[Sam Clegg, 2015/10/28 17:06:30]

It was removed from ports/avrdude/build.sh.  It was never defined in the
Makefile.

- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
 diff --git a/dfu.c b/dfu.c
 --- a/dfu.c
 +++ b/dfu.c
@@ -258,18 +246,3 @@ diff --git a/flip2.c b/flip2.c
  
    return cmd_result;
  }
-diff --git a/main.c b/main.c
---- a/main.c
-+++ b/main.c
-@@ -297,7 +297,11 @@ static void cleanup_main(void)
- /*
-  * main routine
-  */
-+#if defined(__native_client__)
-+int nacl_main(int argc, char **argv)
-+#else
- int main(int argc, char * argv [])
-+#endif
- {
-   int              rc;          /* general return code checking */
-   int              exitrc;      /* exit code for main() */