Do not install libbfd and libopcodes. The objects are used in the

build, but not linked at runtime. Fixes PLIST conflict with
devel/binutils and subsequently makes pbulk on (at least) SunOS
happy. This follows what e.g. ports and homebrew already do.
Remove a leftover patch file while at it.
Bump PKGREVISION.
In-freeze, OK by wiz.

8 files changed, 30 insertions, 72 deletions

diff --git a/devel/gdb/Makefile b/devel/gdb/Makefile
index a3539a0b2ad..17769a43b19 100644
--- a/devel/gdb/Makefile
+++ b/devel/gdb/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.52 2016/03/05 09:08:46 ryoon Exp $
+# $NetBSD: Makefile,v 1.53 2016/04/06 09:34:20 fhajny Exp $
 
 DISTNAME=	gdb-7.11
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU:=gdb/}
 
diff --git a/devel/gdb/PLIST.NetBSD b/devel/gdb/PLIST.NetBSD
deleted file mode 100644
index 71d5bfc5147..00000000000
--- a/devel/gdb/PLIST.NetBSD
+++ /dev/null
@@ -1,8 +0,0 @@
-@comment $NetBSD: PLIST.NetBSD,v 1.1 2015/03/15 14:56:46 bsiegert Exp $
-include/ansidecl.h
-include/bfd.h
-include/bfdlink.h
-include/dis-asm.h
-include/symcat.h
-lib/libbfd.la
-lib/libopcodes.la
diff --git a/devel/gdb/PLIST.OpenBSD b/devel/gdb/PLIST.OpenBSD
deleted file mode 100644
index 6339c1dbe49..00000000000
--- a/devel/gdb/PLIST.OpenBSD
+++ /dev/null
@@ -1,10 +0,0 @@
-@comment $NetBSD: PLIST.OpenBSD,v 1.1 2015/12/22 13:19:55 sevan Exp $
-include/ansidecl.h
-include/bfd.h
-include/bfdlink.h
-include/dis-asm.h
-include/symcat.h
-lib/libbfd.a
-lib/libbfd.la
-lib/libopcodes.a
-lib/libopcodes.la
diff --git a/devel/gdb/PLIST.SunOS b/devel/gdb/PLIST.SunOS
index ac997a7531d..5b9f19a6279 100644
--- a/devel/gdb/PLIST.SunOS
+++ b/devel/gdb/PLIST.SunOS
@@ -1,10 +1,3 @@
-@comment $NetBSD: PLIST.SunOS,v 1.1 2016/02/02 07:24:47 fhajny Exp $
+@comment $NetBSD: PLIST.SunOS,v 1.2 2016/04/06 09:34:20 fhajny Exp $
 bin/gcore
-include/ansidecl.h
-include/bfd.h
-include/bfdlink.h
-include/dis-asm.h
-include/symcat.h
-lib/libbfd.la
-lib/libopcodes.la
 man/man1/gcore.1
diff --git a/devel/gdb/PLIST.common b/devel/gdb/PLIST.common
index 5c11d4f7cc8..53163ccc063 100644
--- a/devel/gdb/PLIST.common
+++ b/devel/gdb/PLIST.common
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST.common,v 1.9 2016/01/19 12:18:24 ryoon Exp $
+@comment $NetBSD: PLIST.common,v 1.10 2016/04/06 09:34:20 fhajny Exp $
 bin/gdb
 include/gdb/jit-reader.h
-include/plugin-api.h
 info/annotate.info
 info/bfd.info
 info/gdb.info
@@ -47,33 +46,3 @@ share/gdb/syscalls/sparc-linux.xml
 share/gdb/syscalls/sparc64-linux.xml
 share/gdb/system-gdbinit/elinos.py
 share/gdb/system-gdbinit/wrs-linux.py
-share/locale/da/LC_MESSAGES/bfd.mo
-share/locale/da/LC_MESSAGES/opcodes.mo
-share/locale/de/LC_MESSAGES/opcodes.mo
-share/locale/es/LC_MESSAGES/bfd.mo
-share/locale/es/LC_MESSAGES/opcodes.mo
-share/locale/fi/LC_MESSAGES/bfd.mo
-share/locale/fi/LC_MESSAGES/opcodes.mo
-share/locale/fr/LC_MESSAGES/bfd.mo
-share/locale/fr/LC_MESSAGES/opcodes.mo
-share/locale/ga/LC_MESSAGES/opcodes.mo
-share/locale/id/LC_MESSAGES/bfd.mo
-share/locale/id/LC_MESSAGES/opcodes.mo
-share/locale/it/LC_MESSAGES/opcodes.mo
-share/locale/ja/LC_MESSAGES/bfd.mo
-share/locale/nl/LC_MESSAGES/opcodes.mo
-share/locale/pt_BR/LC_MESSAGES/opcodes.mo
-share/locale/ro/LC_MESSAGES/bfd.mo
-share/locale/ro/LC_MESSAGES/opcodes.mo
-share/locale/ru/LC_MESSAGES/bfd.mo
-share/locale/rw/LC_MESSAGES/bfd.mo
-share/locale/sv/LC_MESSAGES/bfd.mo
-share/locale/sv/LC_MESSAGES/opcodes.mo
-share/locale/tr/LC_MESSAGES/bfd.mo
-share/locale/tr/LC_MESSAGES/opcodes.mo
-share/locale/uk/LC_MESSAGES/bfd.mo
-share/locale/uk/LC_MESSAGES/opcodes.mo
-share/locale/vi/LC_MESSAGES/bfd.mo
-share/locale/vi/LC_MESSAGES/opcodes.mo
-share/locale/zh_CN/LC_MESSAGES/bfd.mo
-share/locale/zh_CN/LC_MESSAGES/opcodes.mo
diff --git a/devel/gdb/distinfo b/devel/gdb/distinfo
index 153a50e1fde..913cdb9e5c8 100644
--- a/devel/gdb/distinfo
+++ b/devel/gdb/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.25 2016/03/05 09:08:46 ryoon Exp $
+$NetBSD: distinfo,v 1.26 2016/04/06 09:34:20 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-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
new file mode 100644
index 00000000000..4ae422ca9ae
--- /dev/null
+++ b/devel/gdb/patches/patch-Makefile.in
@@ -0,0 +1,24 @@
+$NetBSD: patch-Makefile.in,v 1.1 2016/04/06 09:34:20 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:
+ 
+ .PHONY: install-host-nogcc
+ install-host-nogcc:  \
+-    maybe-install-bfd \
+-    maybe-install-opcodes \
+     maybe-install-binutils \
+     maybe-install-bison \
+     maybe-install-cgen \
+@@ -2530,8 +2528,6 @@ install-host-nogcc:  \
+ 
+ .PHONY: install-host
+ install-host:  \
+-    maybe-install-bfd \
+-    maybe-install-opcodes \
+     maybe-install-binutils \
+     maybe-install-bison \
+     maybe-install-cgen \
diff --git a/devel/gdb/patches/patch-bfd_Makefile.in b/devel/gdb/patches/patch-bfd_Makefile.in
deleted file mode 100644
index a9b89020a5f..00000000000
--- a/devel/gdb/patches/patch-bfd_Makefile.in
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-bfd_Makefile.in,v 1.1 2015/05/03 19:44:38 joerg Exp $
-
---- bfd/Makefile.in.orig	2015-05-03 13:26:51.000000000 +0000
-+++ bfd/Makefile.in
-@@ -1035,6 +1035,7 @@ OPTIONAL_BACKENDS_CFILES = \
- 	hpux-core.c \
- 	irix-core.c \
- 	lynx-core.c \
-+	netbsd-core.c \
- 	osf-core.c \
- 	rs6000-core.c \
- 	sco5-core.c \