From 17d07cd728010e87d7bd9ff988f749ada5411fb0 Mon Sep 17 00:00:00 2001 From: mef Date: Fri, 6 Dec 2013 07:27:15 +0000 Subject: (Upstream) - Bump version 5.11 to 6.0.1 (See cvs log for Makefile for changes). (pkgsrc) - Add patches/patch-fileio_c to avoid following problem: fileio.c:957:3: warning: implicit declaration of function 'elf_getshdrstrndx' --- cross/avrdude/distinfo | 19 ++++++++------- cross/avrdude/patches/patch-ab | 4 +++- cross/avrdude/patches/patch-ac | 10 ++++---- cross/avrdude/patches/patch-ad | 10 ++++---- cross/avrdude/patches/patch-ae | 46 +++++++++++++++++++----------------- cross/avrdude/patches/patch-ag | 4 ++-- cross/avrdude/patches/patch-fileio_c | 24 +++++++++++++++++++ 7 files changed, 73 insertions(+), 44 deletions(-) create mode 100644 cross/avrdude/patches/patch-fileio_c (limited to 'cross/avrdude') diff --git a/cross/avrdude/distinfo b/cross/avrdude/distinfo index f57f3fd4820..f808293ca27 100644 --- a/cross/avrdude/distinfo +++ b/cross/avrdude/distinfo @@ -1,12 +1,13 @@ -$NetBSD: distinfo,v 1.10 2013/01/26 22:10:13 wiz Exp $ +$NetBSD: distinfo,v 1.11 2013/12/06 07:27:15 mef Exp $ -SHA1 (avrdude-5.11.tar.gz) = 3427bf7df61e2b09c0fa33085da796ed5e9698e3 -RMD160 (avrdude-5.11.tar.gz) = a91777fd81c0ab8275c96db2b390d62607bd5383 -Size (avrdude-5.11.tar.gz) = 549113 bytes +SHA1 (avrdude-6.0.1.tar.gz) = b0f440f1b1ba3890da6e5b752003ca99e550e3bf +RMD160 (avrdude-6.0.1.tar.gz) = 412483e87c88d9111729db6e3f94acc81b04e145 +Size (avrdude-6.0.1.tar.gz) = 692284 bytes SHA1 (patch-aa) = 619f682af2e8eff36684993b331ba37cd1b446b6 -SHA1 (patch-ab) = d49e5988a83385471f863dd0ccb50db96f1c1783 -SHA1 (patch-ac) = f5281a525f0e61517c507db91f9abe71d2f02ae4 -SHA1 (patch-ad) = a91b4576d49953148054a7a1522690d1e4a2d9da -SHA1 (patch-ae) = 3d49b2cb871c876d646b1d37864f860f7965b6b1 +SHA1 (patch-ab) = a9105ae562c078eec5c87df6e7f27a80184bb6d4 +SHA1 (patch-ac) = df871808200e5732f77d50ef2d7fb51234173445 +SHA1 (patch-ad) = f9e7465b355f5b3feda8868287d6aaa5cd1dcd28 +SHA1 (patch-ae) = 4ad74b5abe90ddf29dd419043a2e6026f704d1c9 SHA1 (patch-af) = 4ae54ce739ff41964fe56bc1b3e85611288a6e0c -SHA1 (patch-ag) = 7a1652db68769ade576dd8825a562ab8e75167f5 +SHA1 (patch-ag) = 2a6a13c2878d28e476ec6ee747e7ca5d2e023468 +SHA1 (patch-fileio_c) = d0c01ae237bc5df0fd76d2362160d6946ef04846 diff --git a/cross/avrdude/patches/patch-ab b/cross/avrdude/patches/patch-ab index f33870feda4..486d19681ce 100644 --- a/cross/avrdude/patches/patch-ab +++ b/cross/avrdude/patches/patch-ab @@ -1,4 +1,6 @@ -$NetBSD: patch-ab,v 1.4 2010/01/26 02:01:47 jakllsch Exp $ +$NetBSD: patch-ab,v 1.5 2013/12/06 07:27:15 mef Exp $ + +Apparently FreeBSD adaptation, not recently confirmed (mef) --- freebsd_ppi.h.orig 2009-03-06 20:09:11.000000000 +0000 +++ freebsd_ppi.h diff --git a/cross/avrdude/patches/patch-ac b/cross/avrdude/patches/patch-ac index c13ce12443d..a0e73b4ee44 100644 --- a/cross/avrdude/patches/patch-ac +++ b/cross/avrdude/patches/patch-ac @@ -1,12 +1,12 @@ -$NetBSD: patch-ac,v 1.5 2010/01/26 02:01:47 jakllsch Exp $ +$NetBSD: patch-ac,v 1.6 2013/12/06 07:27:15 mef Exp $ the builtin [ on at least solaris doesn't understand -e ---- doc/Makefile.am.orig 2009-03-06 20:09:08.000000000 +0000 -+++ doc/Makefile.am -@@ -33,7 +33,7 @@ html: avrdude-html/avrdude.html +--- doc/Makefile.am.orig 2013-09-18 14:59:05.000000000 +0900 ++++ doc/Makefile.am 2013-10-06 16:20:30.000000000 +0900 +@@ -41,7 +41,7 @@ html: avrdude-html/avrdude.html - avrdude-html/avrdude.html: $(srcdir)/$(info_TEXINFOS) + avrdude-html/avrdude.html: $(srcdir)/$(info_TEXINFOS) $(GENERATED_TEXINFOS) texi2html -split_node $(srcdir)/$(info_TEXINFOS) - if [ -e ./avrdude.html -o -e ./avrdude_1.html ]; then \ + if [ -f ./avrdude.html -o -f ./avrdude_1.html ]; then \ diff --git a/cross/avrdude/patches/patch-ad b/cross/avrdude/patches/patch-ad index 4378e8005eb..ab01a3f76bb 100644 --- a/cross/avrdude/patches/patch-ad +++ b/cross/avrdude/patches/patch-ad @@ -1,12 +1,12 @@ -$NetBSD: patch-ad,v 1.5 2010/01/26 02:01:47 jakllsch Exp $ +$NetBSD: patch-ad,v 1.6 2013/12/06 07:27:15 mef Exp $ regen ---- doc/Makefile.in.orig 2009-07-10 22:52:12.000000000 +0000 -+++ doc/Makefile.in -@@ -617,7 +617,7 @@ html: avrdude-html/avrdude.html +--- doc/Makefile.in.orig 2013-09-18 15:19:52.000000000 +0900 ++++ doc/Makefile.in 2013-10-06 16:22:00.000000000 +0900 +@@ -789,7 +789,7 @@ html: avrdude-html/avrdude.html - avrdude-html/avrdude.html: $(srcdir)/$(info_TEXINFOS) + avrdude-html/avrdude.html: $(srcdir)/$(info_TEXINFOS) $(GENERATED_TEXINFOS) texi2html -split_node $(srcdir)/$(info_TEXINFOS) - if [ -e ./avrdude.html -o -e ./avrdude_1.html ]; then \ + if [ -f ./avrdude.html -o -f ./avrdude_1.html ]; then \ diff --git a/cross/avrdude/patches/patch-ae b/cross/avrdude/patches/patch-ae index 4e35130d790..79a47588d7c 100644 --- a/cross/avrdude/patches/patch-ae +++ b/cross/avrdude/patches/patch-ae @@ -1,4 +1,6 @@ -$NetBSD: patch-ae,v 1.7 2013/01/26 22:10:14 wiz Exp $ +$NetBSD: patch-ae,v 1.8 2013/12/06 07:27:15 mef Exp $ + +- ERROR: [check-portability.awk] => Found test ... == ...: - automake-1.13 compat. @@ -10,18 +12,18 @@ $NetBSD: patch-ae,v 1.7 2013/01/26 22:10:14 wiz Exp $ platforms available and they're not the same for different MACHINE_ARCH's in NetBSD). ---- configure.ac.orig 2011-08-27 19:49:40.000000000 +0000 -+++ configure.ac -@@ -32,7 +32,7 @@ AC_CANONICAL_TARGET - - AC_CONFIG_SRCDIR([main.c]) - AM_INIT_AUTOMAKE --AM_CONFIG_HEADER(ac_cfg.h) -+AC_CONFIG_HEADERS(ac_cfg.h) - - # Checks for programs. - AC_PROG_CC -@@ -120,6 +120,7 @@ AC_CHECK_HEADERS([ddk/hidsdi.h],,,[#incl +--- configure.ac.orig 2013-09-18 15:19:42.000000000 +0900 ++++ configure.ac 2013-10-06 19:44:09.000000000 +0900 +@@ -50,7 +50,7 @@ AC_PROG_AR + AH_TEMPLATE([HAVE_YYLEX_DESTROY], + [Define if lex/flex has yylex_destroy]) + # flex should have this +-if test "x$LEX" == xflex; then ++if test "x$LEX" = xflex; then + AC_MSG_CHECKING([whether yylex_destroy is generated by flex]) + flex_version=`$LEX -V -v --version 2>/dev/null | $SED -e 's/^.* //'` + case $flex_version in +@@ -190,6 +190,7 @@ AC_CHECK_HEADERS([ddk/hidsdi.h],,,[#incl # Checks for typedefs, structures, and compiler characteristics. AC_C_CONST @@ -29,12 +31,8 @@ $NetBSD: patch-ae,v 1.7 2013/01/26 22:10:14 wiz Exp $ AC_HEADER_TIME # Checks for library functions. -@@ -233,34 +234,44 @@ AC_SUBST(DIST_SUBDIRS_AC, $DIST_SUBDIRS_ - - # Find the parallel serial device files based on target system +@@ -317,32 +318,44 @@ AC_SUBST(DIST_SUBDIRS_AC, $DIST_SUBDIRS_ # If a system doesn't have a PC style parallel, mark it as unknown. -+# -+# Allow the user to set the value of both case $target in i[[3456]]86-*-linux*|x86_64-*-linux*) - DEFAULT_PAR_PORT="/dev/parport0" @@ -73,18 +71,22 @@ $NetBSD: patch-ae,v 1.7 2013/01/26 22:10:14 wiz Exp $ - DEFAULT_SER_PORT="/dev/term/a" + DEFAULT_PAR_PORT=${DEFAULT_PAR_PORT:-"/dev/printers/0"} + DEFAULT_SER_PORT=${DEFAULT_SER_PORT:-"/dev/term/a"} ++ ;; ++ *-*-msdos* | *-*-mingw32* | *-*-cygwin* | *-*-windows*) ++ DEFAULT_PAR_PORT=${DEFAULT_PAR_PORT:-"lpt1"} ++ DEFAULT_SER_PORT=${DEFAULT_SER_PORT:-"com1"} ++ ;; ++ *) ++ DEFAULT_PAR_PORT=${DEFAULT_PAR_PORT:-"unknown"} ++ DEFAULT_SER_PORT=${DEFAULT_SER_PORT:-"unknown"} ;; *-*-msdos* | *-*-mingw32* | *-*-cygwin* | *-*-windows*) - DEFAULT_PAR_PORT="lpt1" - DEFAULT_SER_PORT="com1" -+ DEFAULT_PAR_PORT=${DEFAULT_PAR_PORT:-"lpt1"} -+ DEFAULT_SER_PORT=${DEFAULT_SER_PORT:-"com1"} ;; *) - DEFAULT_PAR_PORT="unknown" - DEFAULT_SER_PORT="unknown" -+ DEFAULT_PAR_PORT=${DEFAULT_PAR_PORT:-"unknown"} -+ DEFAULT_SER_PORT=${DEFAULT_SER_PORT:-"unknown"} ;; esac diff --git a/cross/avrdude/patches/patch-ag b/cross/avrdude/patches/patch-ag index 5c3e4b6ec19..dded02d1e40 100644 --- a/cross/avrdude/patches/patch-ag +++ b/cross/avrdude/patches/patch-ag @@ -1,4 +1,4 @@ -$NetBSD: patch-ag,v 1.5 2012/02/07 00:21:49 mef Exp $ +$NetBSD: patch-ag,v 1.6 2013/12/06 07:27:15 mef Exp $ Work around AVRISP mkII initial sync stalls on NetBSD. @@ -16,7 +16,7 @@ Work around AVRISP mkII initial sync stalls on NetBSD. + */ + usb_control_msg(udev, USB_TYPE_STANDARD | USB_RECIP_ENDPOINT, + USB_REQ_CLEAR_FEATURE, USB_FEAT_ENDPOINT_HALT, -+ fd->usb.ep & 0xf, NULL, 0, 100); ++ fd->usb.rep & 0xf, NULL, 0, 100); +#endif + (void)usb_release_interface(udev, usb_interface); diff --git a/cross/avrdude/patches/patch-fileio_c b/cross/avrdude/patches/patch-fileio_c new file mode 100644 index 00000000000..dfce84232a4 --- /dev/null +++ b/cross/avrdude/patches/patch-fileio_c @@ -0,0 +1,24 @@ +$NetBSD: patch-fileio_c,v 1.1 2013/12/06 07:27:15 mef Exp $ + +To fix the warning: + fileio.c:957:3: warning: implicit declaration of function 'elf_getshdrstrndx' + +in libelf-0.8.13, elf_getshdrstrndx is declared in libelf/libelf.h, so +that header file is to come first in if..elfif..endif clause. + +--- fileio.c~ 2013-10-06 18:37:49.000000000 +0900 ++++ fileio.c 2013-10-06 18:38:23.000000000 +0900 +@@ -29,10 +29,10 @@ + #include + + #ifdef HAVE_LIBELF +-#ifdef HAVE_LIBELF_H +-#include +-#elif defined(HAVE_LIBELF_LIBELF_H) ++#ifdef HAVE_LIBELF_LIBELF_H + #include ++#elif defined(HAVE_LIBELF_H) ++#include + #endif + #define EM_AVR32 0x18ad /* inofficial */ + #endif -- cgit v1.2.3