From 61a4e8fcbee65476e8cafdc9f49c684e08a1c7ed Mon Sep 17 00:00:00 2001
From: rillig <rillig>
Date: Sat, 5 Nov 2005 17:14:52 +0000
Subject: Fixed pkglint warnings:

- Using "+=" with CONFIGURE_ARGS.
- Converted patch-ab to unified format.
- Replaced ${PKGNAME:...} with a simple "avr-gdb".
---
 cross/avr-gdb/Makefile         | 12 ++++++------
 cross/avr-gdb/distinfo         |  4 ++--
 cross/avr-gdb/patches/patch-ab | 28 +++++++++++++---------------
 3 files changed, 21 insertions(+), 23 deletions(-)

(limited to 'cross')

diff --git a/cross/avr-gdb/Makefile b/cross/avr-gdb/Makefile
index 3dbd248783c..b5359ba5149 100644
--- a/cross/avr-gdb/Makefile
+++ b/cross/avr-gdb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/06/16 06:57:44 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2005/11/05 17:14:52 rillig Exp $
 
 DISTNAME=	gdb-5.3
 PKGNAME=	avr-gdb-5.3
@@ -9,9 +9,10 @@ MASTER_SITES=	${MASTER_SITE_GNU:=gdb/}
 MAINTAINER=	karlj@mdstud.chalmers.se
 COMMENT=	GNU gdb for Atmel AVR 8-bit RISC microcontrollers
 
-USE_TOOLS+=	gmake
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--target=avr --program-prefix=avr
+USE_TOOLS+=		gmake
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--target=avr
+CONFIGURE_ARGS+=	--program-prefix=avr
 
 INSTALLATION_DIRS=	bin
 
@@ -19,7 +20,6 @@ pre-configure:
 	cd ${WRKSRC} ; ${RM} -rf dejagnu expect sim tcl texinfo
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/gdb/gdb \
-		${PREFIX}/bin/${PKGNAME:C/-[^-]*$//}
+	${INSTALL_PROGRAM} ${WRKSRC}/gdb/gdb ${PREFIX}/bin/avr-gdb
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/cross/avr-gdb/distinfo b/cross/avr-gdb/distinfo
index 810110c4049..f3692cd50e9 100644
--- a/cross/avr-gdb/distinfo
+++ b/cross/avr-gdb/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2005/02/24 10:16:52 agc Exp $
+$NetBSD: distinfo,v 1.6 2005/11/05 17:14:52 rillig Exp $
 
 SHA1 (gdb-5.3.tar.gz) = 24a6c9da6e89b1b82b7508f27f94098d989ff662
 RMD160 (gdb-5.3.tar.gz) = 3f88dc11115de08708c50c73b10acaf00ed25e96
 Size (gdb-5.3.tar.gz) = 14707600 bytes
-SHA1 (patch-ab) = b74ff228047ccb45267e1302e4bef20716b255f4
+SHA1 (patch-ab) = 005c0ca2aea16927504e102f85638a65fd610597
diff --git a/cross/avr-gdb/patches/patch-ab b/cross/avr-gdb/patches/patch-ab
index 1cdd5e88314..d205d23fdd7 100644
--- a/cross/avr-gdb/patches/patch-ab
+++ b/cross/avr-gdb/patches/patch-ab
@@ -1,16 +1,14 @@
-$NetBSD: patch-ab,v 1.1 2003/10/21 14:19:37 wennmach Exp $
+$NetBSD: patch-ab,v 1.2 2005/11/05 17:14:52 rillig Exp $
 
-*** gdb/avr-tdep.c.org	Sun Oct 12 02:35:53 2003
---- gdb/avr-tdep.c	Sun Oct 12 02:58:30 2003
-***************
-*** 480,485 ****
---- 480,488 ----
-  	prologue_end = fi->pc;
-        else if (sal.end < prologue_end)	/* next line begins after fn end */
-  	prologue_end = sal.end;	/* (probably means no prologue)  */
-+ 
-+       /* Check that we don't use a prologue larger then AVR_MAX_PROLOGUE_SIZE */
-+       prologue_end = min (prologue_end, prologue_start + AVR_MAX_PROLOGUE_SIZE);
-      }
-    else
-      /* We're in the boondocks: allow for */
+--- gdb/avr-tdep.c.orig	Wed Sep 18 19:14:22 2002
++++ gdb/avr-tdep.c	Sat Nov  5 18:12:23 2005
+@@ -480,6 +480,9 @@ avr_scan_prologue (struct frame_info *fi
+ 	prologue_end = fi->pc;
+       else if (sal.end < prologue_end)	/* next line begins after fn end */
+ 	prologue_end = sal.end;	/* (probably means no prologue)  */
++
++      /* Check that we don't use a prologue larger then AVR_MAX_PROLOGUE_SIZE */
++      prologue_end = min (prologue_end, prologue_start + AVR_MAX_PROLOGUE_SIZE);
+     }
+   else
+     /* We're in the boondocks: allow for */
-- 
cgit v1.2.3