Thu Apr 14 08:40:44 2016 UTC ()
Conclude the previous fix by not installing bfd.info either. Makes
package co-exist finally with devel/binutils. Bump PKGREVISION.


(fhajny)
diff -r1.53 -r1.54 pkgsrc/devel/gdb/Makefile
diff -r1.10 -r1.11 pkgsrc/devel/gdb/PLIST.common
diff -r1.26 -r1.27 pkgsrc/devel/gdb/distinfo
diff -r1.1 -r1.2 pkgsrc/devel/gdb/patches/patch-Makefile.in
cvs diff -r1.53 -r1.54 pkgsrc/devel/gdb/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/gdb/Makefile 2016/04/06 09:34:20 1.53
+++ pkgsrc/devel/gdb/Makefile 2016/04/14 08:40:44 1.54
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.53 2016/04/06 09:34:20 fhajny Exp $ 1# $NetBSD: Makefile,v 1.54 2016/04/14 08:40:44 fhajny Exp $
2 2
3DISTNAME= gdb-7.11 3DISTNAME= gdb-7.11
4PKGREVISION= 1 4PKGREVISION= 2
5CATEGORIES= devel 5CATEGORIES= devel
6MASTER_SITES= ${MASTER_SITE_GNU:=gdb/} 6MASTER_SITES= ${MASTER_SITE_GNU:=gdb/}
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.gnu.org/software/gdb/gdb.html 9HOMEPAGE= http://www.gnu.org/software/gdb/gdb.html
10COMMENT= Symbolic debugger for multiple language frontends 10COMMENT= Symbolic debugger for multiple language frontends
11LICENSE= gnu-gpl-v3 11LICENSE= gnu-gpl-v3
12 12
13BROKEN_GETTEXT_DETECTION= yes 13BROKEN_GETTEXT_DETECTION= yes
14GNU_CONFIGURE= YES 14GNU_CONFIGURE= YES
15USE_PKGLOCALEDIR= YES 15USE_PKGLOCALEDIR= YES
16USE_LIBTOOL= YES 16USE_LIBTOOL= YES
17USE_TOOLS+= gmake msgfmt makeinfo perl:build 17USE_TOOLS+= gmake msgfmt makeinfo perl:build
cvs diff -r1.10 -r1.11 pkgsrc/devel/gdb/PLIST.common (expand / switch to unified diff)

--- pkgsrc/devel/gdb/PLIST.common 2016/04/06 09:34:20 1.10
+++ pkgsrc/devel/gdb/PLIST.common 2016/04/14 08:40:44 1.11
@@ -1,18 +1,17 @@ @@ -1,18 +1,17 @@
1@comment $NetBSD: PLIST.common,v 1.10 2016/04/06 09:34:20 fhajny Exp $ 1@comment $NetBSD: PLIST.common,v 1.11 2016/04/14 08:40:44 fhajny Exp $
2bin/gdb 2bin/gdb
3include/gdb/jit-reader.h 3include/gdb/jit-reader.h
4info/annotate.info 4info/annotate.info
5info/bfd.info 
6info/gdb.info 5info/gdb.info
7info/stabs.info 6info/stabs.info
8man/man1/gdb.1 7man/man1/gdb.1
9man/man1/gdbserver.1 8man/man1/gdbserver.1
10man/man5/gdbinit.5 9man/man5/gdbinit.5
11share/gdb/python/gdb/FrameDecorator.py 10share/gdb/python/gdb/FrameDecorator.py
12share/gdb/python/gdb/FrameIterator.py 11share/gdb/python/gdb/FrameIterator.py
13share/gdb/python/gdb/__init__.py 12share/gdb/python/gdb/__init__.py
14share/gdb/python/gdb/command/__init__.py 13share/gdb/python/gdb/command/__init__.py
15share/gdb/python/gdb/command/explore.py 14share/gdb/python/gdb/command/explore.py
16share/gdb/python/gdb/command/frame_filters.py 15share/gdb/python/gdb/command/frame_filters.py
17share/gdb/python/gdb/command/pretty_printers.py 16share/gdb/python/gdb/command/pretty_printers.py
18share/gdb/python/gdb/command/prompt.py 17share/gdb/python/gdb/command/prompt.py
cvs diff -r1.26 -r1.27 pkgsrc/devel/gdb/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/gdb/distinfo 2016/04/06 09:34:20 1.26
+++ pkgsrc/devel/gdb/distinfo 2016/04/14 08:40:44 1.27
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1$NetBSD: distinfo,v 1.26 2016/04/06 09:34:20 fhajny Exp $ 1$NetBSD: distinfo,v 1.27 2016/04/14 08:40:44 fhajny Exp $
2 2
3SHA1 (gdb-7.11.tar.gz) = 99f5795cf670e00a623266cb4ce59cc76ec6e5a2 3SHA1 (gdb-7.11.tar.gz) = 99f5795cf670e00a623266cb4ce59cc76ec6e5a2
4RMD160 (gdb-7.11.tar.gz) = 9181c3a79dc676d36e58162567051cf9f68d354d 4RMD160 (gdb-7.11.tar.gz) = 9181c3a79dc676d36e58162567051cf9f68d354d
5SHA512 (gdb-7.11.tar.gz) = 6854774bba73ecf02c4d8bb4e194b8fd8fd3c6c661cbead0b3b816b9d9f736df1b85f331a669808700b0ad0f945b58483fffb77d49f5b690e828a00f65c04893 5SHA512 (gdb-7.11.tar.gz) = 6854774bba73ecf02c4d8bb4e194b8fd8fd3c6c661cbead0b3b816b9d9f736df1b85f331a669808700b0ad0f945b58483fffb77d49f5b690e828a00f65c04893
6Size (gdb-7.11.tar.gz) = 35215975 bytes 6Size (gdb-7.11.tar.gz) = 35215975 bytes
7SHA1 (patch-Makefile.in) = 5620c3fc3545dfb720017d7d373702040dd67bd9 7SHA1 (patch-Makefile.in) = 48f65798f96fdda2a35eb8b18a7cc2993023bcc7
8SHA1 (patch-ao) = fe55dc7245f438fccb7965ceb220be951f85a535 8SHA1 (patch-ao) = fe55dc7245f438fccb7965ceb220be951f85a535
9SHA1 (patch-gdb_bsd-kvm.c) = 837614b107181f79fd5c018ebd76a9010e5ab602 9SHA1 (patch-gdb_bsd-kvm.c) = 837614b107181f79fd5c018ebd76a9010e5ab602
10SHA1 (patch-gdb_ppcnbsd-nat.c) = 94c9f552fd00e3641e7a0fa8372de538b4571d0b 10SHA1 (patch-gdb_ppcnbsd-nat.c) = 94c9f552fd00e3641e7a0fa8372de538b4571d0b
11SHA1 (patch-opcodes_i386-dis_c) = 57b2b2ce85567faf112ec9f435b9aed0ffc943fb 11SHA1 (patch-opcodes_i386-dis_c) = 57b2b2ce85567faf112ec9f435b9aed0ffc943fb
12SHA1 (patch-sim_ppc_emul_netbsd.c) = 34fcb884c3c82e8eae6cd6f8c87ce42e9354c347 12SHA1 (patch-sim_ppc_emul_netbsd.c) = 34fcb884c3c82e8eae6cd6f8c87ce42e9354c347
cvs diff -r1.1 -r1.2 pkgsrc/devel/gdb/patches/Attic/patch-Makefile.in (expand / switch to unified diff)

--- pkgsrc/devel/gdb/patches/Attic/patch-Makefile.in 2016/04/06 09:34:20 1.1
+++ pkgsrc/devel/gdb/patches/Attic/patch-Makefile.in 2016/04/14 08:40:44 1.2
@@ -1,24 +1,32 @@ @@ -1,24 +1,32 @@
1$NetBSD: patch-Makefile.in,v 1.1 2016/04/06 09:34:20 fhajny Exp $ 1$NetBSD: patch-Makefile.in,v 1.2 2016/04/14 08:40:44 fhajny Exp $
2 2
3Do not install bfd and opcodes. Conflicts with devel/binutils. 3Do not install bfd and opcodes. Conflicts with devel/binutils.
4 4
5--- Makefile.in.orig 2016-02-24 09:57:08.000000000 +0000 5--- Makefile.in.orig 2016-02-24 09:57:08.000000000 +0000
6+++ Makefile.in 6+++ Makefile.in
7@@ -2482,8 +2482,6 @@ install: 7@@ -1596,7 +1596,6 @@ do-install-info:
 8
 9 .PHONY: install-info-host
 10
 11-install-info-host: maybe-install-info-bfd
 12 install-info-host: maybe-install-info-opcodes
 13 install-info-host: maybe-install-info-binutils
 14 install-info-host: maybe-install-info-bison
 15@@ -2482,8 +2481,6 @@ install:
8  16
9 .PHONY: install-host-nogcc 17 .PHONY: install-host-nogcc
10 install-host-nogcc: \ 18 install-host-nogcc: \
11- maybe-install-bfd \ 19- maybe-install-bfd \
12- maybe-install-opcodes \ 20- maybe-install-opcodes \
13 maybe-install-binutils \ 21 maybe-install-binutils \
14 maybe-install-bison \ 22 maybe-install-bison \
15 maybe-install-cgen \ 23 maybe-install-cgen \
16@@ -2530,8 +2528,6 @@ install-host-nogcc: \ 24@@ -2530,8 +2527,6 @@ install-host-nogcc: \
17  25
18 .PHONY: install-host 26 .PHONY: install-host
19 install-host: \ 27 install-host: \
20- maybe-install-bfd \ 28- maybe-install-bfd \
21- maybe-install-opcodes \ 29- maybe-install-opcodes \
22 maybe-install-binutils \ 30 maybe-install-binutils \
23 maybe-install-bison \ 31 maybe-install-bison \
24 maybe-install-cgen \ 32 maybe-install-cgen \