[84793] trunk/dports/cross/avrdude

ryandesign at macports.org ryandesign at macports.org
Sat Oct 1 18:07:19 PDT 2011


Revision: 84793
          http://trac.macports.org/changeset/84793
Author:   ryandesign at macports.org
Date:     2011-10-01 18:07:19 -0700 (Sat, 01 Oct 2011)
Log Message:
-----------
avrdude: update to 5.11.1; see #31476

Modified Paths:
--------------
    trunk/dports/cross/avrdude/Portfile
    trunk/dports/cross/avrdude/files/patch-Makefile.in.diff
    trunk/dports/cross/avrdude/files/patch-avr910.c.diff
    trunk/dports/cross/avrdude/files/patch-avrdude.conf.in.diff
    trunk/dports/cross/avrdude/files/patch-config_gram.y.diff
    trunk/dports/cross/avrdude/files/patch-lexer.l.diff
    trunk/dports/cross/avrdude/files/patch-stk500v2.c.diff

Modified: trunk/dports/cross/avrdude/Portfile
===================================================================
--- trunk/dports/cross/avrdude/Portfile	2011-10-02 01:06:55 UTC (rev 84792)
+++ trunk/dports/cross/avrdude/Portfile	2011-10-02 01:07:19 UTC (rev 84793)
@@ -4,7 +4,7 @@
 PortSystem 1.0
 
 name              avrdude
-version           5.10
+version           5.11.1
 categories        cross devel
 maintainers       bdmicro.com:bsd
 description       an Atmel AVR MCU programmer
@@ -16,9 +16,10 @@
 homepage          http://www.nongnu.org/avrdude/
 platforms         darwin
 master_sites      http://savannah.nongnu.org/download/avrdude/
-checksums         md5 69b082683047e054348088fd63bad2ff \
-                  sha1 c09167ea64c3f60b594d0e4da71af7edea0d6f83 \
-                  rmd160 38ce9407a33bf4a4c656651071b44a92fdbdd639
+
+checksums         rmd160  8d5e0d9a8642aee63b505dc4e9090fb50c5a4d2d \
+                  sha256  52cd4586ec28e892407ae09e81bb8e719df08ee79acd88e5110fa890c82cec90
+
 depends_lib       port:libusb-compat \
                   port:ncurses \
                   port:readline

Modified: trunk/dports/cross/avrdude/files/patch-Makefile.in.diff
===================================================================
--- trunk/dports/cross/avrdude/files/patch-Makefile.in.diff	2011-10-02 01:06:55 UTC (rev 84792)
+++ trunk/dports/cross/avrdude/files/patch-Makefile.in.diff	2011-10-02 01:07:19 UTC (rev 84793)
@@ -1,15 +1,15 @@
---- Makefile.in.orig	2010-01-19 11:42:18.000000000 +0100
-+++ Makefile.in	2010-02-14 12:46:58.000000000 +0100
-@@ -82,6 +82,7 @@
+--- Makefile.in.orig	2011-09-16 06:02:09.000000000 -0500
++++ Makefile.in	2011-10-01 20:00:50.000000000 -0500
+@@ -85,6 +85,7 @@
  libavrdude_a_LIBADD =
  am_libavrdude_a_OBJECTS = libavrdude_a-config_gram.$(OBJEXT) \
  	libavrdude_a-lexer.$(OBJEXT) libavrdude_a-arduino.$(OBJEXT) \
 +	libavrdude_a-serjtag.$(OBJEXT) libavrdude_a-ft245r.$(OBJEXT) \
  	libavrdude_a-avr.$(OBJEXT) libavrdude_a-avr910.$(OBJEXT) \
- 	libavrdude_a-avrpart.$(OBJEXT) libavrdude_a-bitbang.$(OBJEXT) \
- 	libavrdude_a-buspirate.$(OBJEXT) \
-@@ -308,6 +309,10 @@
- 	avrdude.h \
+ 	libavrdude_a-avrftdi.$(OBJEXT) libavrdude_a-avrpart.$(OBJEXT) \
+ 	libavrdude_a-bitbang.$(OBJEXT) \
+@@ -364,6 +365,10 @@
+ 	avrftdi.h \
  	avrpart.c \
  	avrpart.h \
 +	serjtag.c \
@@ -19,16 +19,16 @@
  	bitbang.c \
  	bitbang.h \
  	buspirate.c \
-@@ -485,6 +490,8 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libavrdude_a-avr.Po at am__quote@
+@@ -560,6 +565,8 @@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libavrdude_a-avr910.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libavrdude_a-avrftdi.Po at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libavrdude_a-avrpart.Po at am__quote@
 + at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/avrdude-serjtag.Po at am__quote@
 + at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/avrdude-ft245r.Po at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libavrdude_a-bitbang.Po at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libavrdude_a-buspirate.Po at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libavrdude_a-butterfly.Po at am__quote@
-@@ -613,6 +620,34 @@
+@@ -703,6 +710,34 @@
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libavrdude_a_CPPFLAGS) $(CPPFLAGS) $(libavrdude_a_CFLAGS) $(CFLAGS) -c -o libavrdude_a-avrpart.obj `if test -f 'avrpart.c'; then $(CYGPATH_W) 'avrpart.c'; else $(CYGPATH_W) '$(srcdir)/avrpart.c'; fi`
  
@@ -62,4 +62,4 @@
 +
  libavrdude_a-bitbang.o: bitbang.c
  @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libavrdude_a_CPPFLAGS) $(CPPFLAGS) $(libavrdude_a_CFLAGS) $(CFLAGS) -MT libavrdude_a-bitbang.o -MD -MP -MF $(DEPDIR)/libavrdude_a-bitbang.Tpo -c -o libavrdude_a-bitbang.o `test -f 'bitbang.c' || echo '$(srcdir)/'`bitbang.c
- @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libavrdude_a-bitbang.Tpo $(DEPDIR)/libavrdude_a-bitbang.Po
+ @am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libavrdude_a-bitbang.Tpo $(DEPDIR)/libavrdude_a-bitbang.Po

Modified: trunk/dports/cross/avrdude/files/patch-avr910.c.diff
===================================================================
--- trunk/dports/cross/avrdude/files/patch-avr910.c.diff	2011-10-02 01:06:55 UTC (rev 84792)
+++ trunk/dports/cross/avrdude/files/patch-avr910.c.diff	2011-10-02 01:07:19 UTC (rev 84793)
@@ -1,5 +1,5 @@
---- avr910.c.orig	2010-01-01 15:33:04.000000000 +0100
-+++ avr910.c	2010-01-01 15:22:57.000000000 +0100
+--- avr910.c.orig	2011-09-15 09:37:04.000000000 -0500
++++ avr910.c	2011-10-01 20:00:50.000000000 -0500
 @@ -55,6 +55,10 @@
    unsigned char use_blockmode;
  };
@@ -53,7 +53,7 @@
  }
  
  
-@@ -518,35 +527,54 @@
+@@ -520,35 +529,54 @@
    avr910_set_addr(pgm, addr>>1);
  
    while (addr < max_addr) {
@@ -130,7 +130,7 @@
      report_progress (addr, max_addr, NULL);
    }
  
-@@ -676,24 +704,36 @@
+@@ -678,24 +706,36 @@
      avr910_set_addr(pgm, addr);
  
      while (addr < max_addr) {

Modified: trunk/dports/cross/avrdude/files/patch-avrdude.conf.in.diff
===================================================================
--- trunk/dports/cross/avrdude/files/patch-avrdude.conf.in.diff	2011-10-02 01:06:55 UTC (rev 84792)
+++ trunk/dports/cross/avrdude/files/patch-avrdude.conf.in.diff	2011-10-02 01:07:19 UTC (rev 84793)
@@ -1,5 +1,5 @@
---- avrdude.conf.in.orig	2010-02-14 12:27:06.000000000 +0100
-+++ avrdude.conf.in	2010-02-14 12:33:36.000000000 +0100
+--- avrdude.conf.in.orig	2011-09-15 09:57:51.000000000 -0500
++++ avrdude.conf.in	2011-10-01 20:00:50.000000000 -0500
 @@ -17,7 +17,7 @@
  #       desc     = <description> ;                  # quoted string
  #       type     = par | stk500 | stk500v2 | stk500pp | stk500hvsp | stk500generic |
@@ -9,8 +9,8 @@
  #                  jtagmki | jtagmkii | jtagmkii_isp | jtagmkii_dw |
  #                  jtagmkII_avr32 | jtagmkii_pdi |
  #                  dragon_dw | dragon_jtag | dragon_isp | dragon_pp |
-@@ -320,6 +320,43 @@
-   type  = arduino;
+@@ -428,6 +428,43 @@
+ # from Amontec
  ;
  
 +#arduino duemilanove

Modified: trunk/dports/cross/avrdude/files/patch-config_gram.y.diff
===================================================================
--- trunk/dports/cross/avrdude/files/patch-config_gram.y.diff	2011-10-02 01:06:55 UTC (rev 84792)
+++ trunk/dports/cross/avrdude/files/patch-config_gram.y.diff	2011-10-02 01:07:19 UTC (rev 84793)
@@ -1,23 +1,23 @@
---- config_gram.y.orig	2010-02-14 12:26:47.000000000 +0100
-+++ config_gram.y	2010-02-14 12:30:44.000000000 +0100
-@@ -42,6 +42,7 @@
- #include "stk500v2.h"
+--- config_gram.y.orig	2011-09-15 09:57:51.000000000 -0500
++++ config_gram.y	2011-10-01 20:00:50.000000000 -0500
+@@ -43,6 +43,7 @@
+ #include "wiring.h"
  #include "stk500generic.h"
  #include "avr910.h"
 +#include "serjtag.h"
  #include "butterfly.h"
  #include "usbasp.h"
  #include "usbtiny.h"
-@@ -148,6 +149,8 @@
+@@ -152,6 +153,8 @@
  %token K_STK600HVSP
  %token K_STK600PP
  %token K_AVR910
 +%token K_SERJTAG
 +%token K_FT245R
  %token K_USBASP
- %token K_USBTINY
- %token K_BUTTERFLY
-@@ -462,6 +465,18 @@
+ %token K_USBDEV
+ %token K_USBSN
+@@ -492,6 +495,18 @@
      }
    } |
  
@@ -36,7 +36,7 @@
    K_TYPE TKN_EQUAL K_USBASP {
      {
        usbasp_initpgm(current_prog);
-@@ -1371,10 +1386,10 @@
+@@ -1459,10 +1474,10 @@
  
    value = v->value.number;
  

Modified: trunk/dports/cross/avrdude/files/patch-lexer.l.diff
===================================================================
--- trunk/dports/cross/avrdude/files/patch-lexer.l.diff	2011-10-02 01:06:55 UTC (rev 84792)
+++ trunk/dports/cross/avrdude/files/patch-lexer.l.diff	2011-10-02 01:07:19 UTC (rev 84793)
@@ -1,9 +1,9 @@
---- lexer.l.orig	2009-03-06 21:09:11.000000000 +0100
-+++ lexer.l	2009-08-02 22:31:27.000000000 +0200
-@@ -120,6 +120,8 @@
- arduino          { yylval=NULL; return K_ARDUINO; }
+--- lexer.l.orig	2011-10-01 23:28:26.000000000 +0900
++++ lexer.l	2011-10-01 23:29:15.000000000 +0900
+@@ -121,6 +121,8 @@
  avr910           { yylval=NULL; return K_AVR910; }
  avr910_devcode   { yylval=NULL; return K_AVR910_DEVCODE; }
+ avrftdi          { yylval=NULL; return K_AVRFTDI; }
 +serjtag          { yylval=NULL; return K_SERJTAG; }
 +ft245r           { yylval=NULL; return K_FT245R; }
  usbasp           { yylval=NULL; return K_USBASP; }

Modified: trunk/dports/cross/avrdude/files/patch-stk500v2.c.diff
===================================================================
--- trunk/dports/cross/avrdude/files/patch-stk500v2.c.diff	2011-10-02 01:06:55 UTC (rev 84792)
+++ trunk/dports/cross/avrdude/files/patch-stk500v2.c.diff	2011-10-02 01:07:19 UTC (rev 84793)
@@ -1,6 +1,6 @@
---- stk500v2.c.orig	2010-02-14 12:37:19.000000000 +0100
-+++ stk500v2.c	2010-02-14 12:39:43.000000000 +0100
-@@ -667,7 +667,7 @@
+--- stk500v2.c.orig	2011-10-01 23:37:05.000000000 +0900
++++ stk500v2.c	2011-10-01 23:37:45.000000000 +0900
+@@ -633,7 +633,7 @@
  
    DEBUG("STK500V2: stk500v2_getsync()\n");
  
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111001/b4561b90/attachment.html>


More information about the macports-changes mailing list