Wed Apr 6 09:34:20 2016 UTC ()
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.


(fhajny)
diff -r1.52 -r1.53 pkgsrc/devel/gdb/Makefile
diff -r1.1 -r0 pkgsrc/devel/gdb/PLIST.NetBSD
diff -r1.1 -r0 pkgsrc/devel/gdb/PLIST.OpenBSD
diff -r1.1 -r1.2 pkgsrc/devel/gdb/PLIST.SunOS
diff -r1.9 -r1.10 pkgsrc/devel/gdb/PLIST.common
diff -r1.25 -r1.26 pkgsrc/devel/gdb/distinfo
diff -r0 -r1.1 pkgsrc/devel/gdb/patches/patch-Makefile.in
diff -r1.1 -r0 pkgsrc/devel/gdb/patches/patch-bfd_Makefile.in
cvs diff -r1.52 -r1.53 pkgsrc/devel/gdb/Makefile (expand / switch to unified diff)

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

--- pkgsrc/devel/gdb/Attic/PLIST.SunOS 2016/02/02 07:24:47 1.1
+++ pkgsrc/devel/gdb/Attic/PLIST.SunOS 2016/04/06 09:34:20 1.2
@@ -1,10 +1,3 @@ @@ -1,10 +1,3 @@
1@comment $NetBSD: PLIST.SunOS,v 1.1 2016/02/02 07:24:47 fhajny Exp $ 1@comment $NetBSD: PLIST.SunOS,v 1.2 2016/04/06 09:34:20 fhajny Exp $
2bin/gcore 2bin/gcore
3include/ansidecl.h 
4include/bfd.h 
5include/bfdlink.h 
6include/dis-asm.h 
7include/symcat.h 
8lib/libbfd.la 
9lib/libopcodes.la 
10man/man1/gcore.1 3man/man1/gcore.1
cvs diff -r1.9 -r1.10 pkgsrc/devel/gdb/PLIST.common (expand / switch to unified diff)

--- pkgsrc/devel/gdb/PLIST.common 2016/01/19 12:18:24 1.9
+++ pkgsrc/devel/gdb/PLIST.common 2016/04/06 09:34:20 1.10
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1@comment $NetBSD: PLIST.common,v 1.9 2016/01/19 12:18:24 ryoon Exp $ 1@comment $NetBSD: PLIST.common,v 1.10 2016/04/06 09:34:20 fhajny Exp $
2bin/gdb 2bin/gdb
3include/gdb/jit-reader.h 3include/gdb/jit-reader.h
4include/plugin-api.h 
5info/annotate.info 4info/annotate.info
6info/bfd.info 5info/bfd.info
7info/gdb.info 6info/gdb.info
8info/stabs.info 7info/stabs.info
9man/man1/gdb.1 8man/man1/gdb.1
10man/man1/gdbserver.1 9man/man1/gdbserver.1
11man/man5/gdbinit.5 10man/man5/gdbinit.5
12share/gdb/python/gdb/FrameDecorator.py 11share/gdb/python/gdb/FrameDecorator.py
13share/gdb/python/gdb/FrameIterator.py 12share/gdb/python/gdb/FrameIterator.py
14share/gdb/python/gdb/__init__.py 13share/gdb/python/gdb/__init__.py
15share/gdb/python/gdb/command/__init__.py 14share/gdb/python/gdb/command/__init__.py
16share/gdb/python/gdb/command/explore.py 15share/gdb/python/gdb/command/explore.py
17share/gdb/python/gdb/command/frame_filters.py 16share/gdb/python/gdb/command/frame_filters.py
@@ -37,43 +36,13 @@ share/gdb/syscalls/arm-linux.xml @@ -37,43 +36,13 @@ share/gdb/syscalls/arm-linux.xml
37share/gdb/syscalls/gdb-syscalls.dtd 36share/gdb/syscalls/gdb-syscalls.dtd
38share/gdb/syscalls/i386-linux.xml 37share/gdb/syscalls/i386-linux.xml
39share/gdb/syscalls/mips-n32-linux.xml 38share/gdb/syscalls/mips-n32-linux.xml
40share/gdb/syscalls/mips-n64-linux.xml 39share/gdb/syscalls/mips-n64-linux.xml
41share/gdb/syscalls/mips-o32-linux.xml 40share/gdb/syscalls/mips-o32-linux.xml
42share/gdb/syscalls/ppc-linux.xml 41share/gdb/syscalls/ppc-linux.xml
43share/gdb/syscalls/ppc64-linux.xml 42share/gdb/syscalls/ppc64-linux.xml
44share/gdb/syscalls/s390-linux.xml 43share/gdb/syscalls/s390-linux.xml
45share/gdb/syscalls/s390x-linux.xml 44share/gdb/syscalls/s390x-linux.xml
46share/gdb/syscalls/sparc-linux.xml 45share/gdb/syscalls/sparc-linux.xml
47share/gdb/syscalls/sparc64-linux.xml 46share/gdb/syscalls/sparc64-linux.xml
48share/gdb/system-gdbinit/elinos.py 47share/gdb/system-gdbinit/elinos.py
49share/gdb/system-gdbinit/wrs-linux.py 48share/gdb/system-gdbinit/wrs-linux.py
50share/locale/da/LC_MESSAGES/bfd.mo 
51share/locale/da/LC_MESSAGES/opcodes.mo 
52share/locale/de/LC_MESSAGES/opcodes.mo 
53share/locale/es/LC_MESSAGES/bfd.mo 
54share/locale/es/LC_MESSAGES/opcodes.mo 
55share/locale/fi/LC_MESSAGES/bfd.mo 
56share/locale/fi/LC_MESSAGES/opcodes.mo 
57share/locale/fr/LC_MESSAGES/bfd.mo 
58share/locale/fr/LC_MESSAGES/opcodes.mo 
59share/locale/ga/LC_MESSAGES/opcodes.mo 
60share/locale/id/LC_MESSAGES/bfd.mo 
61share/locale/id/LC_MESSAGES/opcodes.mo 
62share/locale/it/LC_MESSAGES/opcodes.mo 
63share/locale/ja/LC_MESSAGES/bfd.mo 
64share/locale/nl/LC_MESSAGES/opcodes.mo 
65share/locale/pt_BR/LC_MESSAGES/opcodes.mo 
66share/locale/ro/LC_MESSAGES/bfd.mo 
67share/locale/ro/LC_MESSAGES/opcodes.mo 
68share/locale/ru/LC_MESSAGES/bfd.mo 
69share/locale/rw/LC_MESSAGES/bfd.mo 
70share/locale/sv/LC_MESSAGES/bfd.mo 
71share/locale/sv/LC_MESSAGES/opcodes.mo 
72share/locale/tr/LC_MESSAGES/bfd.mo 
73share/locale/tr/LC_MESSAGES/opcodes.mo 
74share/locale/uk/LC_MESSAGES/bfd.mo 
75share/locale/uk/LC_MESSAGES/opcodes.mo 
76share/locale/vi/LC_MESSAGES/bfd.mo 
77share/locale/vi/LC_MESSAGES/opcodes.mo 
78share/locale/zh_CN/LC_MESSAGES/bfd.mo 
79share/locale/zh_CN/LC_MESSAGES/opcodes.mo 
cvs diff -r1.25 -r1.26 pkgsrc/devel/gdb/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/gdb/distinfo 2016/03/05 09:08:46 1.25
+++ pkgsrc/devel/gdb/distinfo 2016/04/06 09:34:20 1.26
@@ -1,11 +1,12 @@ @@ -1,11 +1,12 @@
1$NetBSD: distinfo,v 1.25 2016/03/05 09:08:46 ryoon Exp $ 1$NetBSD: distinfo,v 1.26 2016/04/06 09:34:20 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-ao) = fe55dc7245f438fccb7965ceb220be951f85a535 8SHA1 (patch-ao) = fe55dc7245f438fccb7965ceb220be951f85a535
8SHA1 (patch-gdb_bsd-kvm.c) = 837614b107181f79fd5c018ebd76a9010e5ab602 9SHA1 (patch-gdb_bsd-kvm.c) = 837614b107181f79fd5c018ebd76a9010e5ab602
9SHA1 (patch-gdb_ppcnbsd-nat.c) = 94c9f552fd00e3641e7a0fa8372de538b4571d0b 10SHA1 (patch-gdb_ppcnbsd-nat.c) = 94c9f552fd00e3641e7a0fa8372de538b4571d0b
10SHA1 (patch-opcodes_i386-dis_c) = 57b2b2ce85567faf112ec9f435b9aed0ffc943fb 11SHA1 (patch-opcodes_i386-dis_c) = 57b2b2ce85567faf112ec9f435b9aed0ffc943fb
11SHA1 (patch-sim_ppc_emul_netbsd.c) = 34fcb884c3c82e8eae6cd6f8c87ce42e9354c347 12SHA1 (patch-sim_ppc_emul_netbsd.c) = 34fcb884c3c82e8eae6cd6f8c87ce42e9354c347
File Added: pkgsrc/devel/gdb/patches/Attic/patch-Makefile.in
$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 \
File Deleted: pkgsrc/devel/gdb/patches/Attic/patch-bfd_Makefile.in