From d083910bc19e1a238f1112d672ebca8de4e074fc Mon Sep 17 00:00:00 2001
From: shannonjr <shannonjr@pkgsrc.org>
Date: Thu, 3 Jun 2004 18:48:48 +0000
Subject: [PATCH] Revised Makefile so that the GNU libraries: libbfd.a,
 libbfd.la, libiberty.a libmmalloc.a, libopcodes.a, and libopcodes.la along
 with associated header files are installed relative to ${PREFIX}/gdb6 rather
 than ${PREFIX} to avoid conflicts with other packages. PLIST adjusted
 accordingly.

---
 devel/gdb6/Makefile |  7 ++++++-
 devel/gdb6/PLIST    | 27 +++++++++++++++------------
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/devel/gdb6/Makefile b/devel/gdb6/Makefile
index 11e4bbfc7d7d..ab694dd5a3dd 100644
--- a/devel/gdb6/Makefile
+++ b/devel/gdb6/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/06/01 19:29:30 shannonjr Exp $
+# $NetBSD: Makefile,v 1.2 2004/06/03 18:48:48 shannonjr Exp $
 #
 
 DISTNAME=		gdb-6.1
+PKGREVISION=		1
 CATEGORIES=		devel
 MASTER_SITES=		ftp://sources.redhat.com/pub/gdb/releases/
 EXTRACT_SUFX=		.tar.bz2
@@ -18,6 +19,10 @@ USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
+GDB_SUBPREFIX=		gdb6
+GDB_PREFIX=		${PREFIX}/${GDB_SUBPREFIX}
+CONFIGURE_ARGS+=	--libdir=${GDB_PREFIX}/lib
+CONFIGURE_ARGS+=	--includedir=${GDB_PREFIX}/include
 
 USE_MAKEINFO=		yes
 INFO_FILES=		annotate.info bfd.info configure.info
diff --git a/devel/gdb6/PLIST b/devel/gdb6/PLIST
index e59adb4fe762..b38b6ddf2b8a 100644
--- a/devel/gdb6/PLIST
+++ b/devel/gdb6/PLIST
@@ -1,17 +1,17 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/06/01 19:29:30 shannonjr Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/06/03 18:48:48 shannonjr Exp $
 bin/gdb
 bin/gdbtui
-include/ansidecl.h
-include/bfd.h
-include/bfdlink.h
-include/dis-asm.h
-include/symcat.h
-lib/libbfd.a
-lib/libbfd.la
-lib/libiberty.a
-lib/libmmalloc.a
-lib/libopcodes.a
-lib/libopcodes.la
+gdb6/include/ansidecl.h
+gdb6/include/bfd.h
+gdb6/include/bfdlink.h
+gdb6/include/dis-asm.h
+gdb6/include/symcat.h
+gdb6/lib/libbfd.a
+gdb6/lib/libbfd.la
+gdb6/lib/libiberty.a
+gdb6/lib/libmmalloc.a
+gdb6/lib/libopcodes.a
+gdb6/lib/libopcodes.la
 man/man1/gdb.1
 man/man1/gdbtui.1
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/bfd.mo
@@ -32,3 +32,6 @@ ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/opcodes.mo
 ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/bfd.mo
 ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/opcodes.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/bfd.mo
+@dirrm gdb6/lib
+@dirrm gdb6/include
+@dirrm gdb6