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

ports/avrdude/nacl.patch

-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
 @@ -36,13 +36,13 @@
  
  #ifndef HAVE_LIBUSB
  
 -int dfu_open(struct dfu_dev *dfu, char *port_name) {
 +struct dfu_dev *dfu_open(char *port_name) {
    fprintf(stderr, "%s: Error: No USB support in this compile of avrdude\n",
@@ skipping 228 matching lines @@
    struct flip2_cmd cmd = {
      FLIP2_CMD_GROUP_DOWNLOAD, FLIP2_CMD_PROG_START, { 0, 0, 0, 0 }
 @@ -866,6 +880,7 @@ int flip2_write_max1k(struct dfu_dev *dfu,
          flip2_status_str(&status));
      dfu_clrstatus(dfu);
    }
 +#endif
  
    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() */