From 83da5e858c0969112ffc460b176fa50d67b5e9ec Mon Sep 17 00:00:00 2001
From: fhajny <fhajny@pkgsrc.org>
Date: Thu, 14 Apr 2016 08:40:44 +0000
Subject: [PATCH] Conclude the previous fix by not installing bfd.info either.
 Makes package co-exist finally with devel/binutils. Bump PKGREVISION.

---
 devel/gdb/Makefile                  |  4 ++--
 devel/gdb/PLIST.common              |  3 +--
 devel/gdb/distinfo                  |  4 ++--
 devel/gdb/patches/patch-Makefile.in | 14 +++++++++++---
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/devel/gdb/Makefile b/devel/gdb/Makefile
index 17769a43b193..2ba2f8fbde4e 100644
--- a/devel/gdb/Makefile
+++ b/devel/gdb/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.53 2016/04/06 09:34:20 fhajny Exp $
+# $NetBSD: Makefile,v 1.54 2016/04/14 08:40:44 fhajny Exp $
 
 DISTNAME=	gdb-7.11
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU:=gdb/}
 
diff --git a/devel/gdb/PLIST.common b/devel/gdb/PLIST.common
index 53163ccc063d..46327382c131 100644
--- a/devel/gdb/PLIST.common
+++ b/devel/gdb/PLIST.common
@@ -1,8 +1,7 @@
-@comment $NetBSD: PLIST.common,v 1.10 2016/04/06 09:34:20 fhajny Exp $
+@comment $NetBSD: PLIST.common,v 1.11 2016/04/14 08:40:44 fhajny Exp $
 bin/gdb
 include/gdb/jit-reader.h
 info/annotate.info
-info/bfd.info
 info/gdb.info
 info/stabs.info
 man/man1/gdb.1
diff --git a/devel/gdb/distinfo b/devel/gdb/distinfo
index 913cdb9e5c86..8bbd42b0dc23 100644
--- a/devel/gdb/distinfo
+++ b/devel/gdb/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.26 2016/04/06 09:34:20 fhajny Exp $
+$NetBSD: distinfo,v 1.27 2016/04/14 08:40:44 fhajny Exp $
 
 SHA1 (gdb-7.11.tar.gz) = 99f5795cf670e00a623266cb4ce59cc76ec6e5a2
 RMD160 (gdb-7.11.tar.gz) = 9181c3a79dc676d36e58162567051cf9f68d354d
 SHA512 (gdb-7.11.tar.gz) = 6854774bba73ecf02c4d8bb4e194b8fd8fd3c6c661cbead0b3b816b9d9f736df1b85f331a669808700b0ad0f945b58483fffb77d49f5b690e828a00f65c04893
 Size (gdb-7.11.tar.gz) = 35215975 bytes
-SHA1 (patch-Makefile.in) = 5620c3fc3545dfb720017d7d373702040dd67bd9
+SHA1 (patch-Makefile.in) = 48f65798f96fdda2a35eb8b18a7cc2993023bcc7
 SHA1 (patch-ao) = fe55dc7245f438fccb7965ceb220be951f85a535
 SHA1 (patch-gdb_bsd-kvm.c) = 837614b107181f79fd5c018ebd76a9010e5ab602
 SHA1 (patch-gdb_ppcnbsd-nat.c) = 94c9f552fd00e3641e7a0fa8372de538b4571d0b
diff --git a/devel/gdb/patches/patch-Makefile.in b/devel/gdb/patches/patch-Makefile.in
index 4ae422ca9ae5..88cfa27f1f64 100644
--- a/devel/gdb/patches/patch-Makefile.in
+++ b/devel/gdb/patches/patch-Makefile.in
@@ -1,10 +1,18 @@
-$NetBSD: patch-Makefile.in,v 1.1 2016/04/06 09:34:20 fhajny Exp $
+$NetBSD: patch-Makefile.in,v 1.2 2016/04/14 08:40:44 fhajny Exp $
 
 Do not install bfd and opcodes. Conflicts with devel/binutils.
 
 --- Makefile.in.orig	2016-02-24 09:57:08.000000000 +0000
 +++ Makefile.in
-@@ -2482,8 +2482,6 @@ install:
+@@ -1596,7 +1596,6 @@ do-install-info:
+ 
+ .PHONY: install-info-host
+ 
+-install-info-host: maybe-install-info-bfd
+ install-info-host: maybe-install-info-opcodes
+ install-info-host: maybe-install-info-binutils
+ install-info-host: maybe-install-info-bison
+@@ -2482,8 +2481,6 @@ install:
  
  .PHONY: install-host-nogcc
  install-host-nogcc:  \
@@ -13,7 +21,7 @@ Do not install bfd and opcodes. Conflicts with devel/binutils.
      maybe-install-binutils \
      maybe-install-bison \
      maybe-install-cgen \
-@@ -2530,8 +2528,6 @@ install-host-nogcc:  \
+@@ -2530,8 +2527,6 @@ install-host-nogcc:  \
  
  .PHONY: install-host
  install-host:  \