CVS commit: pkgsrc/sysutils/netbt-hcidump

["Johnny C. Lam" <jlam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jlam
Date:           Wed Aug 23 17:53:45 UTC 2017

Modified Files:
        pkgsrc/sysutils/netbt-hcidump: distinfo
        pkgsrc/sysutils/netbt-hcidump/patches: patch-lib_Makefile
            patch-tools_parser_Makefile

Log Message:
sysutils/netbt-hcidump: Fix build using bootstrap bmake.

I'm not sure when NetBSD's <bsd.lib.mk> started allowing
LIBISPRIVATE=yes, but we should always be able to build using
bootstrap-mk-files <bsd.lib.mk>.  Adding MKLINKLIB=no MKPIC=no
MKPROFILE=no turns the library into a helper library that is not
installed.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/sysutils/netbt-hcidump/distinfo
cvs rdiff -u -r1.6 -r1.7 \
    pkgsrc/sysutils/netbt-hcidump/patches/patch-lib_Makefile
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/sysutils/netbt-hcidump/patches/patch-tools_parser_Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/netbt-hcidump/distinfo
diff -u pkgsrc/sysutils/netbt-hcidump/distinfo:1.15 pkgsrc/sysutils/netbt-hcidump/distinfo:1.16
--- pkgsrc/sysutils/netbt-hcidump/distinfo:1.15 Wed Nov  4 01:32:23 2015
+++ pkgsrc/sysutils/netbt-hcidump/distinfo      Wed Aug 23 17:53:44 2017
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.15 2015/11/04 01:32:23 agc Exp $
+$NetBSD: distinfo,v 1.16 2017/08/23 17:53:44 jlam Exp $
 
 SHA1 (bluez-5.27.tar.xz) = c1707e8ae38b299c07e6c18ff3c26a4b928d03bf
 RMD160 (bluez-5.27.tar.xz) = 21cec0a67c70215cc6972a0bfd5679b1a5fa8fac
 SHA512 (bluez-5.27.tar.xz) = 5e5e3ec17b4552027559083effb076e9c7d45528765fb27ca1aa1f3d8bb6a4a79c9fda91392f7b5b6da7aabf2b2b6e5bb16b0546323901501a93c53f79a66324
 Size (bluez-5.27.tar.xz) = 1542348 bytes
 SHA1 (patch-Makefile) = 24c3f132b0c454c7f06915ca368b67e463c4e4f0
-SHA1 (patch-lib_Makefile) = da5f72d18fe46ce3c13543976b38b3d010da4b86
+SHA1 (patch-lib_Makefile) = d881586878b8ee58f642f993bfad6a614148fb7b
 SHA1 (patch-lib_bluetooth.c) = 997da8b1f00bf0093ca45cdd5c416d6155c591ea
 SHA1 (patch-lib_bluetooth.h) = cd200dfefdabe7a517928c62848faceb41fb302a
 SHA1 (patch-lib_hci.c) = 825b01082e2be2336c429e27ec78348fe4c39985
@@ -16,7 +16,7 @@ SHA1 (patch-src_shared_util.h) = 349f886
 SHA1 (patch-tools_Makefile) = 4c63cb92ce4fc8446fcb6b16a60f17d68b25078f
 SHA1 (patch-tools_hcidump.1) = 3981ca329e9837ea9719fea59277357a435cc265
 SHA1 (patch-tools_hcidump.c) = ca6871ca562bc218ce445edf8b364f528d260d4e
-SHA1 (patch-tools_parser_Makefile) = 5f3e3c3b73a88756e485318d4b00e64d42366fa3
+SHA1 (patch-tools_parser_Makefile) = 4d4410493393d521c89ba429b39b0a3bbbba135b
 SHA1 (patch-tools_parser_bnep.c) = efbbe5f4cd47dcb0bf72c16bd67d9d93ba7cd43a
 SHA1 (patch-tools_parser_lmp.c) = f410be55cf07f6d7f7d3b1466b7fbe708b1a6de5
 SHA1 (patch-tools_parser_parser.h) = 19ff1cdd8d7af71d9ae86497d3e1f49ae9db9a2a

Index: pkgsrc/sysutils/netbt-hcidump/patches/patch-lib_Makefile
diff -u pkgsrc/sysutils/netbt-hcidump/patches/patch-lib_Makefile:1.6 pkgsrc/sysutils/netbt-hcidump/patches/patch-lib_Makefile:1.7
--- pkgsrc/sysutils/netbt-hcidump/patches/patch-lib_Makefile:1.6        Tue Dec 30 08:39:13 2014
+++ pkgsrc/sysutils/netbt-hcidump/patches/patch-lib_Makefile    Wed Aug 23 17:53:45 2017
@@ -1,15 +1,20 @@
-$NetBSD: patch-lib_Makefile,v 1.6 2014/12/30 08:39:13 plunky Exp $
+$NetBSD: patch-lib_Makefile,v 1.7 2017/08/23 17:53:45 jlam Exp $
 
 Though we only require a minimal part of the library,
 build a libbt.a to avoid filename conflicts
 
---- lib/Makefile.orig  2014-12-28 13:02:11.000000000 +0000
+--- lib/Makefile.orig  2017-08-12 23:18:21.000000000 +0000
 +++ lib/Makefile
-@@ -0,0 +1,9 @@
+@@ -0,0 +1,14 @@
 +#
 +
 +LIBISPRIVATE= yes
 +
++# For use with bootstrap-mk-files, which doesn't support LIBISPRIVATE.
++MKLINKLIB=    no
++MKPIC=                no
++MKPROFILE=    no
++
 +LIB=          bt
 +
 +SRCS=         bluetooth.c hci.c

Index: pkgsrc/sysutils/netbt-hcidump/patches/patch-tools_parser_Makefile
diff -u pkgsrc/sysutils/netbt-hcidump/patches/patch-tools_parser_Makefile:1.1 pkgsrc/sysutils/netbt-hcidump/patches/patch-tools_parser_Makefile:1.2
--- pkgsrc/sysutils/netbt-hcidump/patches/patch-tools_parser_Makefile:1.1       Tue Dec 30 08:39:13 2014
+++ pkgsrc/sysutils/netbt-hcidump/patches/patch-tools_parser_Makefile   Wed Aug 23 17:53:45 2017
@@ -1,13 +1,18 @@
-$NetBSD: patch-tools_parser_Makefile,v 1.1 2014/12/30 08:39:13 plunky Exp $
+$NetBSD: patch-tools_parser_Makefile,v 1.2 2017/08/23 17:53:45 jlam Exp $
 
 make a libparser.a file to link with, to avoid filename conflicts
 
---- tools/parser/Makefile.orig 2014-12-28 13:02:12.000000000 +0000
+--- tools/parser/Makefile.orig 2017-08-12 23:18:24.000000000 +0000
 +++ tools/parser/Makefile
-@@ -0,0 +1,13 @@
+@@ -0,0 +1,18 @@
 +#
 +
-+LIBISPRIVATE=yes
++LIBISPRIVATE= yes
++
++# For use with bootstrap-mk-files, which doesn't support LIBISPRIVATE.
++MKLINKLIB=    no
++MKPIC=                no
++MKPROFILE=    no
 +
 +LIB=  parser
 +