UPDATE: avrdude-5.11
Hi,
This is gonzalo's update to avrdude-5.11 (it was posted here a while
back). I have just re-merged the diff to work with -current.
I was hoping this would fix an issue I have with the SD library and my
Uno, but alas it did not.
Anyway, I tested this update with devel/arduino using an Arduino Uno
(without SD) and a knockoff Arduino Mega. They work fine.
OK?
Index: Makefile
===
RCS file: /cvs/ports/devel/avrdude/Makefile,v
retrieving revision 1.19
diff -u -p -u -r1.19 Makefile
--- Makefile11 Mar 2013 10:50:01 - 1.19
+++ Makefile4 May 2013 10:29:55 -
@@ -2,9 +2,8 @@
COMMENT= AVR microcontroller hardware in-system programmer
-V= 5.10
+V= 5.11
DISTNAME= avrdude-${V}
-REVISION= 3
DISTFILES+=avrdude-${V}.tar.gz avrdude-doc-${V}.pdf
CATEGORIES=devel
@@ -15,7 +14,7 @@ MAINTAINER= Chris Kuethe ckuethe@openbs
# GPLv2+
PERMIT_PACKAGE_CDROM= Yes
-WANTLIB= c m ncurses readline termcap usb pthread
+WANTLIB += c m ncurses pthread readline termcap usb usb-1.0
MASTER_SITES= ${MASTER_SITE_SAVANNAH:=avrdude/}
EXTRACT_ONLY= avrdude-${V}${EXTRACT_SUFX}
@@ -23,7 +22,6 @@ EXTRACT_ONLY= avrdude-${V}${EXTRACT_SUFX
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= CPPFLAGS=-I${LOCALBASE}/include \
LDFLAGS=-L${LOCALBASE}/lib -pthread
-USE_GROFF =Yes
LIB_DEPENDS= devel/libusb-compat
Index: distinfo
===
RCS file: /cvs/ports/devel/avrdude/distinfo,v
retrieving revision 1.5
diff -u -p -u -r1.5 distinfo
--- distinfo27 Jun 2010 20:39:33 - 1.5
+++ distinfo4 May 2013 10:29:55 -
@@ -1,10 +1,4 @@
-MD5 (avrdude-5.10.tar.gz) = abCCaDBH4FQ0gIj9Y7rS/w==
-MD5 (avrdude-doc-5.10.pdf) = eKd1R9aVkwQAWv4yWc4P+Q==
-RMD160 (avrdude-5.10.tar.gz) = OM6UB6M79KTGVmUQcbRKkv291jk=
-RMD160 (avrdude-doc-5.10.pdf) = +BUkUNOF1SEAfCk0F2bu1O741sY=
-SHA1 (avrdude-5.10.tar.gz) = wJFn6mTD9gtZTQ5Npxr37eoNb4M=
-SHA1 (avrdude-doc-5.10.pdf) = DCiMzcJzDauswcSUqeOOppgYOkg=
-SHA256 (avrdude-5.10.tar.gz) = gVAbY9W4aZh00AyeykKDe4VpW8CCC6mEOxf1c844vl4=
-SHA256 (avrdude-doc-5.10.pdf) = Se1csAoAGETPbsz5RErY+iaL2++PEXYOjQwBW1zZO3A=
-SIZE (avrdude-5.10.tar.gz) = 525750
-SIZE (avrdude-doc-5.10.pdf) = 231216
+SHA256 (avrdude-5.11.tar.gz) = Yxf08w/LG69+B+VeXHQ68+Hn+UnyBtOHKmIq7THVldc=
+SHA256 (avrdude-doc-5.11.pdf) = 7mmFOgnvMLPV2yVrxpDT6lp4ezQjVsDTghUrLBbNEtM=
+SIZE (avrdude-5.11.tar.gz) = 549113
+SIZE (avrdude-doc-5.11.pdf) = 236872
Index: patches/patch-avrdude_conf_in
===
RCS file: /cvs/ports/devel/avrdude/patches/patch-avrdude_conf_in,v
retrieving revision 1.1
diff -u -p -u -r1.1 patch-avrdude_conf_in
--- patches/patch-avrdude_conf_in 2 Mar 2011 07:20:53 - 1.1
+++ patches/patch-avrdude_conf_in 4 May 2013 10:29:55 -
@@ -3,9 +3,9 @@ $OpenBSD: patch-avrdude_conf_in,v 1.1 20
Add support for attiny4313:
http://savannah.nongnu.org/patch/?7393
avrdude.conf.in.orig Fri Feb 25 20:19:05 2011
-+++ avrdude.conf.inFri Feb 25 20:19:26 2011
-@@ -8918,6 +8918,193 @@ part
+--- avrdude.conf.in.orig Fri Aug 26 21:50:33 2011
avrdude.conf.inSat May 4 10:30:28 2013
+@@ -9788,6 +9788,193 @@ part
;
#
Index: patches/patch-stk500v2_c
===
RCS file: /cvs/ports/devel/avrdude/patches/patch-stk500v2_c,v
retrieving revision 1.4
diff -u -p -u -r1.4 patch-stk500v2_c
--- patches/patch-stk500v2_c27 Jun 2010 20:39:33 - 1.4
+++ patches/patch-stk500v2_c4 May 2013 10:29:55 -
@@ -1,15 +1,15 @@
$OpenBSD: patch-stk500v2_c,v 1.4 2010/06/27 20:39:33 ckuethe Exp $
stk500v2.c.origTue Jan 19 03:39:11 2010
-+++ stk500v2.c Sat Jun 26 15:41:53 2010
-@@ -353,6 +353,7 @@ static void stk500v2_jtagmkII_setup(PROGRAMMER * pgm)
- static void stk500v2_teardown(PROGRAMMER * pgm)
+--- stk500v2.c.origFri Aug 26 21:22:10 2011
stk500v2.c Sat May 4 10:30:28 2013
+@@ -319,6 +319,7 @@ static void stk500v2_jtagmkII_setup(PROGRAMMER * pgm)
+ void stk500v2_teardown(PROGRAMMER * pgm)
{
free(pgm-cookie);
+ pgm-cookie = NULL;
}
static void stk500v2_jtagmkII_teardown(PROGRAMMER * pgm)
-@@ -364,6 +365,7 @@ static void stk500v2_jtagmkII_teardown(PROGRAMMER * pg
+@@ -330,6 +331,7 @@ static void stk500v2_jtagmkII_teardown(PROGRAMMER * pg
jtagmkII_teardown(pgm);
free(mycookie);
@@ -17,7 +17,7 @@ $OpenBSD: patch-stk500v2_c,v 1.4 2010/06
}
-@@ -1169,12 +1171,14 @@ static int stk500hv_initialize(PROGRAMMER * pgm, AVRPA
+@@ -1158,12 +1160,14 @@ static int stk500hv_initialize(PROGRAMMER * pgm, AVRPA
if ((PDATA(pgm)-flash_pagecache = malloc(PDATA(pgm)-flash_pagesize)) ==
NULL) {
fprintf(stderr, %s:
UPDATE: Avrdude-5.11
Hi,
Update for Avrdude to 5.11 with:
* avrdude.1: Update the list of supported AVR devices.
* configure.ac: add -lusb as other libraries when checking
for libftdi.
* butterfly.c: Add some specific logic to handle the
mikrokopter.de butterfly bootloader.
* butterfly.h: Add one related function declaration.
* config_gram.y: Add butterfly_mk keyword.
* avrdude.conf.in: Add entry for butterfly_mk.
And others.
Test are wellcome.
Cheers.
--
Sending from my VCR...
Index: Makefile
===
RCS file: /cvs/ports/devel/avrdude/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- Makefile9 Dec 2011 12:25:44 - 1.18
+++ Makefile27 Nov 2012 13:23:54 -
@@ -2,9 +2,8 @@
COMMENT= AVR microcontroller hardware in-system programmer
-V= 5.10
+V= 5.11
DISTNAME= avrdude-${V}
-REVISION= 3
DISTFILES+=avrdude-${V}.tar.gz avrdude-doc-${V}.pdf
CATEGORIES=devel
@@ -18,7 +17,7 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM=Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB= c m ncurses readline termcap usb pthread
+WANTLIB += c m ncurses pthread readline termcap usb usb-1.0
MASTER_SITES= ${MASTER_SITE_SAVANNAH:=avrdude/}
EXTRACT_ONLY= avrdude-${V}${EXTRACT_SUFX}
@@ -26,7 +25,6 @@ EXTRACT_ONLY= avrdude-${V}${EXTRACT_SUFX
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= CPPFLAGS=-I${LOCALBASE}/include \
LDFLAGS=-L${LOCALBASE}/lib -pthread
-USE_GROFF =Yes
LIB_DEPENDS= devel/libusb-compat
Index: distinfo
===
RCS file: /cvs/ports/devel/avrdude/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo27 Jun 2010 20:39:33 - 1.5
+++ distinfo27 Nov 2012 13:23:54 -
@@ -1,10 +1,4 @@
-MD5 (avrdude-5.10.tar.gz) = abCCaDBH4FQ0gIj9Y7rS/w==
-MD5 (avrdude-doc-5.10.pdf) = eKd1R9aVkwQAWv4yWc4P+Q==
-RMD160 (avrdude-5.10.tar.gz) = OM6UB6M79KTGVmUQcbRKkv291jk=
-RMD160 (avrdude-doc-5.10.pdf) = +BUkUNOF1SEAfCk0F2bu1O741sY=
-SHA1 (avrdude-5.10.tar.gz) = wJFn6mTD9gtZTQ5Npxr37eoNb4M=
-SHA1 (avrdude-doc-5.10.pdf) = DCiMzcJzDauswcSUqeOOppgYOkg=
-SHA256 (avrdude-5.10.tar.gz) = gVAbY9W4aZh00AyeykKDe4VpW8CCC6mEOxf1c844vl4=
-SHA256 (avrdude-doc-5.10.pdf) = Se1csAoAGETPbsz5RErY+iaL2++PEXYOjQwBW1zZO3A=
-SIZE (avrdude-5.10.tar.gz) = 525750
-SIZE (avrdude-doc-5.10.pdf) = 231216
+SHA256 (avrdude-5.11.tar.gz) = Yxf08w/LG69+B+VeXHQ68+Hn+UnyBtOHKmIq7THVldc=
+SHA256 (avrdude-doc-5.11.pdf) = 7mmFOgnvMLPV2yVrxpDT6lp4ezQjVsDTghUrLBbNEtM=
+SIZE (avrdude-5.11.tar.gz) = 549113
+SIZE (avrdude-doc-5.11.pdf) = 236872
Index: patches/patch-avrdude_conf_in
===
RCS file: /cvs/ports/devel/avrdude/patches/patch-avrdude_conf_in,v
retrieving revision 1.1
diff -u -p -r1.1 patch-avrdude_conf_in
--- patches/patch-avrdude_conf_in 2 Mar 2011 07:20:53 - 1.1
+++ patches/patch-avrdude_conf_in 27 Nov 2012 13:23:54 -
@@ -3,9 +3,9 @@ $OpenBSD: patch-avrdude_conf_in,v 1.1 20
Add support for attiny4313:
http://savannah.nongnu.org/patch/?7393
avrdude.conf.in.orig Fri Feb 25 20:19:05 2011
-+++ avrdude.conf.inFri Feb 25 20:19:26 2011
-@@ -8918,6 +8918,193 @@ part
+--- avrdude.conf.in.orig Fri Aug 26 17:50:33 2011
avrdude.conf.inTue Nov 27 10:07:59 2012
+@@ -9788,6 +9788,193 @@ part
;
#
Index: patches/patch-stk500v2_c
===
RCS file: /cvs/ports/devel/avrdude/patches/patch-stk500v2_c,v
retrieving revision 1.4
diff -u -p -r1.4 patch-stk500v2_c
--- patches/patch-stk500v2_c27 Jun 2010 20:39:33 - 1.4
+++ patches/patch-stk500v2_c27 Nov 2012 13:23:54 -
@@ -1,15 +1,15 @@
$OpenBSD: patch-stk500v2_c,v 1.4 2010/06/27 20:39:33 ckuethe Exp $
stk500v2.c.origTue Jan 19 03:39:11 2010
-+++ stk500v2.c Sat Jun 26 15:41:53 2010
-@@ -353,6 +353,7 @@ static void stk500v2_jtagmkII_setup(PROGRAMMER * pgm)
- static void stk500v2_teardown(PROGRAMMER * pgm)
+--- stk500v2.c.origFri Aug 26 17:22:10 2011
stk500v2.c Tue Nov 27 10:07:59 2012
+@@ -319,6 +319,7 @@ static void stk500v2_jtagmkII_setup(PROGRAMMER * pgm)
+ void stk500v2_teardown(PROGRAMMER * pgm)
{
free(pgm-cookie);
+ pgm-cookie = NULL;
}
static void stk500v2_jtagmkII_teardown(PROGRAMMER * pgm)
-@@ -364,6 +365,7 @@ static void stk500v2_jtagmkII_teardown(PROGRAMMER * pg
+@@ -330,6 +331,7 @@ static void stk500v2_jtagmkII_teardown(PROGRAMMER * pg
jtagmkII_teardown(pgm);
free(mycookie);
@@ -17,7 +17,7 @@ $OpenBSD: patch-stk500v2_c,v 1.4 2010/06
}
-@@ -1169,12 +1171,14 @@ static int stk500hv_initialize(PROGRAMMER * pgm, AVRPA
+@@ -1158,12 +1160,14 @@ static int
