pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

avrdude: Remove, version in pkgsrc is newer



Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <micha%NetBSD.org@localhost>
Pushed By:	micha
Date:		Mon May 23 15:20:08 2022 +0200
Changeset:	0afe8c9c8a10abf7b6b20f4f596375331a27b4a9

Modified Files:
	Makefile
Removed Files:
	avrdude/COMMIT_MSG
	avrdude/DESCR
	avrdude/Makefile
	avrdude/PLIST
	avrdude/TODO
	avrdude/distinfo
	avrdude/options.mk
	avrdude/patches/patch-aa
	avrdude/patches/patch-ab
	avrdude/patches/patch-ac
	avrdude/patches/patch-ad
	avrdude/patches/patch-ae
	avrdude/patches/patch-af
	avrdude/patches/patch-fileio_c

Log Message:
avrdude: Remove, version in pkgsrc is newer

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=0afe8c9c8a10abf7b6b20f4f596375331a27b4a9

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 Makefile                       |  1 -
 avrdude/COMMIT_MSG             | 27 -------------
 avrdude/DESCR                  |  5 ---
 avrdude/Makefile               | 42 -------------------
 avrdude/PLIST                  | 36 -----------------
 avrdude/TODO                   | 17 --------
 avrdude/distinfo               | 12 ------
 avrdude/options.mk             | 27 -------------
 avrdude/patches/patch-aa       | 33 ---------------
 avrdude/patches/patch-ab       | 18 ---------
 avrdude/patches/patch-ac       | 15 -------
 avrdude/patches/patch-ad       | 15 -------
 avrdude/patches/patch-ae       | 92 ------------------------------------------
 avrdude/patches/patch-af       | 15 -------
 avrdude/patches/patch-fileio_c | 24 -----------
 15 files changed, 379 deletions(-)

diffs:
diff --git a/Makefile b/Makefile
index b33d6951ca..ea9ef1b55f 100644
--- a/Makefile
+++ b/Makefile
@@ -243,7 +243,6 @@ SUBDIR+=	avida2
 SUBDIR+=	avp
 SUBDIR+=	avr-gdb
 SUBDIR+=	avra
-SUBDIR+=	avrdude
 SUBDIR+=	axe
 SUBDIR+=	axel
 SUBDIR+=	axpbox-git
diff --git a/avrdude/COMMIT_MSG b/avrdude/COMMIT_MSG
deleted file mode 100644
index 7b866e65df..0000000000
--- a/avrdude/COMMIT_MSG
+++ /dev/null
@@ -1,27 +0,0 @@
-(Upstream) update 6.0.1 to 6.1
-----------------------------------------------------------------------
-Current:
-
-  * Major changes compared to the previous version:
-    - Atmel EDBG protocol support added (JTAGICE3, XplainedPro, Atmel-ICE)
-
-  * New programmers supported:
-    - Atmel DFU, using FLIP protocol version 1 (AT90USB and ATmega*U* devices),
-      or version 2 (Xmega devices)
-    - Atmel-ICE (ARM/AVR), JTAG, PDI, debugWIRE, ISP modi
-
-  * Bugfixes
-    - bug #40055: AVRDUDE segfaults when writing eeprom
-    - bug #40085: Typo fix in fuses report (for 6.1-svn-20130917)
-    - bug #40782: Verify errors for object size > 16 k on x32e5 due
-      to typo in avrdude.conf
-    - bug #40817: Elf file support (possibly) not working on 6.0.1 windows build
-    - bug #40897: AT Mega2560 not correctly programmed with stk500(v1)
-      ISP (solution patch)
-    - bug #41357: OS X: Avrdude messes with the usb stack?
-    - bug #41402: dfu.c missing include <stdint.h>
-    - patch #7896: DFU FLIPv2 programming support
-    - patch #XXXX: xxx
-
-  * Internals:
-    - (Some) programmers can take a list of USB PIDs now.
diff --git a/avrdude/DESCR b/avrdude/DESCR
deleted file mode 100644
index 8783c05624..0000000000
--- a/avrdude/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-AVRDUDE - AVR Downloader/UploaDEr - is a program for updating the
-flash, eeprom, and fuse bit memories of Atmel AVR microcontrollers.
-Avrdude supports a wide variety of chip programmers (including the
-widely used STK500) that attach to the serial port, and, if supported
-by the underlying OS, to the parallel port.
diff --git a/avrdude/Makefile b/avrdude/Makefile
deleted file mode 100644
index 35de285f3b..0000000000
--- a/avrdude/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-# $NetBSD: Makefile,v 1.6 2015/01/18 07:50:32 makoto Exp $
-
-DISTNAME=		avrdude-6.3
-CATEGORIES=		cross
-MASTER_SITES=		http://download.savannah.gnu.org/releases/avrdude/
-
-MAINTAINER=		pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=		https://www.nongnu.org/avrdude/
-COMMENT=		Downloader/uploader for Atmel AVR 8-bit RISC microcontrollers
-LICENSE=		gnu-gpl-v2
-
-# make: make: don't know how to make ./libavrdude.a. Stop
-MAKE_JOBS_SAFE=		no
-
-.include "../../mk/bsd.prefs.mk"
-
-GNU_CONFIGURE=		yes
-USE_TOOLS+=		autoconf automake autoreconf
-INFO_FILES=		yes
-EGDIR=			${PREFIX}/share/examples/avrdude
-CONF_FILES_PERMS=	${EGDIR}/avrdude.conf ${PKG_SYSCONFDIR}/avrdude.conf \
-			${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 644
-
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
-CONFIGURE_ENV+=		DEFAULT_SER_PORT=${DEFAULT_SERIAL_DEVICE:Q}
-PLIST_SUBST+=		DISTNAME=${DISTNAME}
-
-# The autotools used by this pkg are older than what's in pkgsrc
-# currently.  This makes the diffs huge.
-pre-configure:
-	cd ${WRKSRC} && autoreconf -vif
-
-.include "options.mk"
-.include "../../devel/libftdi/buildlink3.mk"
-.include "../../devel/libhid/buildlink3.mk"
-.include "../../wip/libftdi1/buildlink3.mk"
-.include "../../mk/libusb.buildlink3.mk"
-.include "../../devel/libusb1/buildlink3.mk"
-# elf_getshdrstrndx
-.include "../../devel/libelf/buildlink3.mk"
-.include "../../devel/readline/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/avrdude/PLIST b/avrdude/PLIST
deleted file mode 100644
index cff1fe81bd..0000000000
--- a/avrdude/PLIST
+++ /dev/null
@@ -1,36 +0,0 @@
-@comment $NetBSD$
-bin/avrdude
-include/libavrdude.h
-lib/libavrdude.a
-lib/libavrdude.la
-lib/libavrdude.so
-lib/libavrdude.so.1
-lib/libavrdude.so.1.0
-man/man1/avrdude.1
-share/examples/avrdude/avrdude.conf
-${PLIST.doc}info/avrdude.info
-${PLIST.doc}share/doc/${DISTNAME}/avrdude-html/avrdude.html
-${PLIST.doc}share/doc/${DISTNAME}/avrdude-html/avrdude_1.html
-${PLIST.doc}share/doc/${DISTNAME}/avrdude-html/avrdude_10.html
-${PLIST.doc}share/doc/${DISTNAME}/avrdude-html/avrdude_11.html
-${PLIST.doc}share/doc/${DISTNAME}/avrdude-html/avrdude_12.html
-${PLIST.doc}share/doc/${DISTNAME}/avrdude-html/avrdude_13.html
-${PLIST.doc}share/doc/${DISTNAME}/avrdude-html/avrdude_14.html
-${PLIST.doc}share/doc/${DISTNAME}/avrdude-html/avrdude_15.html
-${PLIST.doc}share/doc/${DISTNAME}/avrdude-html/avrdude_16.html
-${PLIST.doc}share/doc/${DISTNAME}/avrdude-html/avrdude_17.html
-${PLIST.doc}share/doc/${DISTNAME}/avrdude-html/avrdude_18.html
-${PLIST.doc}share/doc/${DISTNAME}/avrdude-html/avrdude_19.html
-${PLIST.doc}share/doc/${DISTNAME}/avrdude-html/avrdude_2.html
-${PLIST.doc}share/doc/${DISTNAME}/avrdude-html/avrdude_20.html
-${PLIST.doc}share/doc/${DISTNAME}/avrdude-html/avrdude_3.html
-${PLIST.doc}share/doc/${DISTNAME}/avrdude-html/avrdude_4.html
-${PLIST.doc}share/doc/${DISTNAME}/avrdude-html/avrdude_5.html
-${PLIST.doc}share/doc/${DISTNAME}/avrdude-html/avrdude_6.html
-${PLIST.doc}share/doc/${DISTNAME}/avrdude-html/avrdude_7.html
-${PLIST.doc}share/doc/${DISTNAME}/avrdude-html/avrdude_8.html
-${PLIST.doc}share/doc/${DISTNAME}/avrdude-html/avrdude_9.html
-${PLIST.doc}share/doc/${DISTNAME}/avrdude-html/avrdude_abt.html
-${PLIST.doc}share/doc/${DISTNAME}/avrdude-html/avrdude_toc.html
-${PLIST.doc}share/doc/${DISTNAME}/avrdude.pdf
-${PLIST.doc}share/doc/${DISTNAME}/avrdude.ps
diff --git a/avrdude/TODO b/avrdude/TODO
deleted file mode 100644
index fccdb3f607..0000000000
--- a/avrdude/TODO
+++ /dev/null
@@ -1,17 +0,0 @@
-Now we have:
-Configuration summary:
-----------------------
-DO HAVE    libelf
-DO HAVE    libusb
-DO HAVE    libusb_1_0
-DO HAVE    libftdi1
-DO HAVE    libftdi (but prefer to use libftdi1)
-DON'T HAVE libhid
-DO HAVE    pthread
-ENABLED    doc
-DISABLED   parport
-DISABLED   linuxgpio
-
-(for DON'T HAVE libhid):
- ...  [Define if HID support is enabled via the Win32 DDK])
- ...  wip/libhid doesn't make it ;-(
diff --git a/avrdude/distinfo b/avrdude/distinfo
deleted file mode 100644
index 485d5e8c04..0000000000
--- a/avrdude/distinfo
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: distinfo,v 1.4 2015/01/18 07:50:32 makoto Exp $
-
-RMD160 (avrdude-6.3.tar.gz) = 245c20fa6f6be274093f43fa4932295ea47dafaa
-SHA512 (avrdude-6.3.tar.gz) = b671008388d6a552e71066fec46429bc7f6639e8eac41113bcbba5a56212b78be31fcf04956b31e11c6b14888b0f6e825f7458395b9ff4fc28406074c7ded2b2
-Size (avrdude-6.3.tar.gz) = 909744 bytes
-SHA1 (patch-aa) = 619f682af2e8eff36684993b331ba37cd1b446b6
-SHA1 (patch-ab) = a9105ae562c078eec5c87df6e7f27a80184bb6d4
-SHA1 (patch-ac) = df871808200e5732f77d50ef2d7fb51234173445
-SHA1 (patch-ad) = f9e7465b355f5b3feda8868287d6aaa5cd1dcd28
-SHA1 (patch-ae) = 8268734c36c02dfded64addba99e542747e746c7
-SHA1 (patch-af) = 4ae54ce739ff41964fe56bc1b3e85611288a6e0c
-SHA1 (patch-fileio_c) = d0c01ae237bc5df0fd76d2362160d6946ef04846
diff --git a/avrdude/options.mk b/avrdude/options.mk
deleted file mode 100644
index 76b72e0099..0000000000
--- a/avrdude/options.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-# $NetBSD: options.mk,v 1.3 2015/07/20 23:03:24 dholland Exp $
-
-PKG_OPTIONS_VAR=		PKG_OPTIONS.avrdude
-PKG_SUPPORTED_OPTIONS+=		doc
-PKG_SUGGESTED_OPTIONS=
-PLIST_VARS+=			doc
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mdoc)
-CONFIGURE_ARGS+=	--enable-doc
-
-BUILD_DEPENDS+=		dvipsk-[0-9]*:../../print/dvipsk
-BUILD_DEPENDS+=		tex-latex-fonts-[0-9]*:../../fonts/tex-latex-fonts
-BUILD_DEPENDS+=		tex-pdftex-[0-9]*:../../print/tex-pdftex
-TEXINFO_REQD=		4.9
-USE_TOOLS+=		makeinfo texi2html yacc lex
-
-# DragonFly has stripped makeinfo in the base - without texi2dvi.
-.  if ${OPSYS} == "DragonFly"
-BUILD_DEPENDS+=		gtexinfo-[0-9]*:../../devel/gtexinfo
-.  endif
-PLIST.doc=		yes
-
-.else
-CONFIGURE_ARGS+=	--disable-doc
-.endif
diff --git a/avrdude/patches/patch-aa b/avrdude/patches/patch-aa
deleted file mode 100644
index 1c7f713bbd..0000000000
--- a/avrdude/patches/patch-aa
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2013/10/06 09:41:40 makoto Exp $
-
-- Fix the SUBDIRS stuff so it actually works right with multiple automake
-  versions.
-
-- Use supported automake methods to install the example config file to
-  egconfdir instead of hacking the configure script and Makefile.in directly.
-
-
---- Makefile.am.orig	2010-01-19 10:39:11.000000000 +0000
-+++ Makefile.am
-@@ -153,7 +153,8 @@ avrdude_SOURCES = \
- 
- man_MANS = avrdude.1
- 
--sysconf_DATA = avrdude.conf
-+egconfdir=	${datadir}/examples/avrdude
-+egconf_DATA = avrdude.conf
- 
- install-exec-local: backup-avrdude-conf
- 
-@@ -162,8 +163,6 @@ distclean-local:
- 
- # This will get run before the config file is installed.
- backup-avrdude-conf:
--	@echo "Backing up avrdude.conf in ${DESTDIR}${sysconfdir}"
--	@if test -e ${DESTDIR}${sysconfdir}/avrdude.conf; then \
--		cp -pR ${DESTDIR}${sysconfdir}/avrdude.conf \
--			${DESTDIR}${sysconfdir}/avrdude.conf.bak; \
--	fi
-+	@echo "No back up of avrdude.conf in ${DESTDIR}${sysconfdir} is required"
-+	@echo "because we simply install an example into ${DESTDIR}${egconfdir}"
-+	@echo "and leave it to the user to install/update the actual working copy"
diff --git a/avrdude/patches/patch-ab b/avrdude/patches/patch-ab
deleted file mode 100644
index ae3162692e..0000000000
--- a/avrdude/patches/patch-ab
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2013/10/06 09:41:41 makoto Exp $
-
-Apparently FreeBSD adaptation, not recently confirmed (mef)
-
---- freebsd_ppi.h.orig	2009-03-06 20:09:11.000000000 +0000
-+++ freebsd_ppi.h
-@@ -22,7 +22,11 @@
- #ifndef freebsd_ppi_h
- #define freebsd_ppi_h
- 
-+#ifdef __FreeBSD__
- #include <dev/ppbus/ppi.h>
-+#else
-+#include <dev/misc/ppi/ppi.h>
-+#endif
- 
- #define ppi_claim(fd) {}
- 
diff --git a/avrdude/patches/patch-ac b/avrdude/patches/patch-ac
deleted file mode 100644
index c2f015e318..0000000000
--- a/avrdude/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2013/10/06 09:41:41 makoto Exp $
-
-the builtin [ on at least solaris doesn't understand -e
-
---- 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) $(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 \
- 	 mkdir -p avrdude-html ; \
- 	 mv -f *.html avrdude-html ; \
- 	else \
diff --git a/avrdude/patches/patch-ad b/avrdude/patches/patch-ad
deleted file mode 100644
index 624d191b67..0000000000
--- a/avrdude/patches/patch-ad
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2013/10/06 09:41:41 makoto Exp $
-
-regen
-
---- 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) $(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 \
- 	 mkdir -p avrdude-html ; \
- 	 mv -f *.html avrdude-html ; \
- 	else \
diff --git a/avrdude/patches/patch-ae b/avrdude/patches/patch-ae
deleted file mode 100644
index 8046147514..0000000000
--- a/avrdude/patches/patch-ae
+++ /dev/null
@@ -1,92 +0,0 @@
-$NetBSD: patch-ae,v 1.9 2017/01/29 02:24:54 mef Exp $
-
-- ERROR: [check-portability.awk] => Found test ... == ...:
-
-- automake-1.13 compat.
-
-- add missing AM_PROG_CC_C_O that automake wants for the yacc
-  sources.
-
-- allow a different default serial/parallel port to be specified
-  which is useful for pkgsrc (since we have defaults for various
-  platforms available and they're not the same for different
-  MACHINE_ARCH's in NetBSD).
-
---- configure.ac.orig	2016-02-17 06:29:19.000000000 +0900
-+++ configure.ac	2017-01-29 11:15:27.000000000 +0900
-@@ -49,7 +49,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
-@@ -189,6 +189,7 @@ AC_CHECK_HEADERS([ddk/hidsdi.h],,,[#incl
- 
- # Checks for typedefs, structures, and compiler characteristics.
- AC_C_CONST
-+AM_PROG_CC_C_O
- AC_HEADER_TIME
- 
- # WinSock2
-@@ -318,32 +319,44 @@ AC_SUBST(DIST_SUBDIRS_AC, $DIST_SUBDIRS_
- # If a system doesn't have a PC style parallel, mark it as unknown.
- case $target in
- 	i[[3456]]86-*-linux*|x86_64-*-linux*)
--		DEFAULT_PAR_PORT="/dev/parport0"
--		DEFAULT_SER_PORT="/dev/ttyS0"
-+		DEFAULT_PAR_PORT=${DEFAULT_PAR_PORT:-"/dev/parport0"}
-+		DEFAULT_SER_PORT=${DEFAULT_SER_PORT:-"/dev/ttyS0"}
- 		;;
- 	*-*-linux*)
--		DEFAULT_PAR_PORT="unknown"
--		DEFAULT_SER_PORT="/dev/ttyS0"
-+		DEFAULT_PAR_PORT=${DEFAULT_PAR_PORT:-"unknown"}
-+		DEFAULT_SER_PORT=${DEFAULT_SER_PORT:-"/dev/ttyS0"}
- 		;;
- 	i[[3456]]86-*-*freebsd*|amd64-*-*freebsd*)
--		DEFAULT_PAR_PORT="/dev/ppi0"
--		DEFAULT_SER_PORT="/dev/cuad0"
-+		DEFAULT_PAR_PORT=${DEFAULT_PAR_PORT:-"/dev/ppi0"}
-+		DEFAULT_SER_PORT=${DEFAULT_SER_PORT:-"/dev/cuad0"}
- 		;;
- 	*-*-*freebsd*)
--		DEFAULT_PAR_PORT="unknown"
--		DEFAULT_SER_PORT="/dev/cuad0"
-+		DEFAULT_PAR_PORT=${DEFAULT_PAR_PORT:-"unknown"}
-+		DEFAULT_SER_PORT=${DEFAULT_SER_PORT:-"/dev/cuad0"}
-+		;;
-+	*-*-dragonfly*)
-+		DEFAULT_PAR_PORT=${DEFAULT_PAR_PORT:-"/dev/ppi0"}
-+		DEFAULT_SER_PORT=${DEFAULT_SER_PORT:-"/dev/cuad0"}
-+		;;
-+	*-*-netbsd*)
-+		DEFAULT_PAR_PORT=${DEFAULT_PAR_PORT:-"unknown"}
-+		DEFAULT_SER_PORT=${DEFAULT_SER_PORT:-"/dev/tty00"}
- 		;;
- 	*-*-solaris*)
--		DEFAULT_PAR_PORT="/dev/printers/0"
--		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="unknown"
--		DEFAULT_SER_PORT="unknown"
- 		;;
- esac
- 
diff --git a/avrdude/patches/patch-af b/avrdude/patches/patch-af
deleted file mode 100644
index e6fe6c3da9..0000000000
--- a/avrdude/patches/patch-af
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-af,v 1.1 2013/10/06 09:41:41 makoto Exp $
-
-Add DragonFly
-
---- ppi.c.orig	2010-01-19 10:39:11.000000000 +0000
-+++ ppi.c
-@@ -33,7 +33,7 @@
- #include <unistd.h>
- #include <errno.h>
- 
--#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
- # include "freebsd_ppi.h"
- #elif defined(__linux__)
- # include "linux_ppdev.h"
diff --git a/avrdude/patches/patch-fileio_c b/avrdude/patches/patch-fileio_c
deleted file mode 100644
index ce178861c4..0000000000
--- a/avrdude/patches/patch-fileio_c
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-fileio_c,v 1.2 2013/10/06 09:47:18 makoto 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 <stdint.h>
- 
- #ifdef HAVE_LIBELF
--#ifdef HAVE_LIBELF_H
--#include <libelf.h>
--#elif defined(HAVE_LIBELF_LIBELF_H)
-+#ifdef HAVE_LIBELF_LIBELF_H
- #include <libelf/libelf.h>
-+#elif defined(HAVE_LIBELF_H)
-+#include <libelf.h>
- #endif
- #define EM_AVR32 0x18ad         /* inofficial */
- #endif


Home | Main Index | Thread Index | Old Index