[pkgsrc/trunk]: pkgsrc/sysutils/bcmfw update to v2.1

[plunky <plunky%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4765dfa200ed
branches:  trunk
changeset: 363075:4765dfa200ed
user:      plunky <plunky%pkgsrc.org@localhost>
date:      Wed May 31 18:12:47 2017 +0000

description:
update to v2.1

changes:
        use %zu for size_t (from patches/patch-bcmfw-install.c)
        avoid C99 feature (from Bernhard Riedel)
        bcmfw is now hosted on github

diffstat:

 sysutils/bcmfw/Makefile                      |  14 +++++++---
 sysutils/bcmfw/distinfo                      |  19 +++++++-------
 sysutils/bcmfw/patches/patch-bcmfw-install.c |  36 ----------------------------
 3 files changed, 18 insertions(+), 51 deletions(-)

diffs (94 lines):

diff -r 6efb1c758da2 -r 4765dfa200ed sysutils/bcmfw/Makefile
--- a/sysutils/bcmfw/Makefile   Wed May 31 17:32:32 2017 +0000
+++ b/sysutils/bcmfw/Makefile   Wed May 31 18:12:47 2017 +0000
@@ -1,17 +1,21 @@
-# $NetBSD: Makefile,v 1.10 2016/02/17 10:58:19 plunky Exp $
+# $NetBSD: Makefile,v 1.11 2017/05/31 18:12:47 plunky Exp $
 
-DISTNAME=              bcmfw-2.0
+DISTNAME=              bcmfw-2.1
 CATEGORIES=            sysutils
-MASTER_SITES=          http://www.NetBSD.org/~plunky/
-DISTFILES=             ${DISTNAME}.tar.gz              \
-                       bluez-firmware-1.2.tar.gz
+MASTER_SITES=          http://github.com/plunky/bcmfw/archive/
+DIST_SUBDIR=           ${PKGNAME_NOREV}
+DISTFILES=             v${PKGVERSION_NOREV}.tar.gz
+DISTFILES+=            bluez-firmware-1.2.tar.gz
 SITES.bluez-firmware-1.2.tar.gz= \
                        http://bluez.sourceforge.net/download/
 
 MAINTAINER=            plunky%NetBSD.org@localhost
+HOMEPAGE=              https://github.com/plunky/bcmfw
 COMMENT=               Broadcom Bluetooth Firmware Loader
 LICENSE=               bcmfw-license
 
+EXTRACT_USING=         bsdtar
+
 RESTRICTED=            No clear permission to redistribute firmware
 NO_BIN_ON_CDROM=       ${RESTRICTED}
 NO_BIN_ON_FTP=         ${RESTRICTED}
diff -r 6efb1c758da2 -r 4765dfa200ed sysutils/bcmfw/distinfo
--- a/sysutils/bcmfw/distinfo   Wed May 31 17:32:32 2017 +0000
+++ b/sysutils/bcmfw/distinfo   Wed May 31 18:12:47 2017 +0000
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.4 2016/02/24 21:43:39 plunky Exp $
+$NetBSD: distinfo,v 1.5 2017/05/31 18:12:47 plunky Exp $
 
-SHA1 (bcmfw-2.0.tar.gz) = 94f6881e0772333599b6cae0b7938d99d2959187
-RMD160 (bcmfw-2.0.tar.gz) = 14c6d1e5ba4266377a34655c082f3a9b3432469f
-SHA512 (bcmfw-2.0.tar.gz) = 7bab88f4ea5a4fba5eb3cee90c6acc53a7be170d9eaf5dcaadd8fc30a2e941a275760261d326ea2721be854fc0304675f7190615853718be1630f48cb96c6eb7
-Size (bcmfw-2.0.tar.gz) = 11822 bytes
-SHA1 (bluez-firmware-1.2.tar.gz) = 43f98fdd518a2b4371d25015aaafb1d6f3cbde2c
-RMD160 (bluez-firmware-1.2.tar.gz) = 1651dd837c2263cf5d6d5d4da30664cf408b0ba9
-SHA512 (bluez-firmware-1.2.tar.gz) = 15db2f9d38a496882e4cc3754af1e58aa99e1b849f2066c541d76c66a8ffdc5532799fe1fd473cfc158bf5ea86a46687716cbcf83c6dcac0ce66d97d679648dd
-Size (bluez-firmware-1.2.tar.gz) = 370623 bytes
-SHA1 (patch-bcmfw-install.c) = 0712b682fdafe8e4cec833534d55424170a2a8fe
+SHA1 (bcmfw-2.1/bluez-firmware-1.2.tar.gz) = 43f98fdd518a2b4371d25015aaafb1d6f3cbde2c
+RMD160 (bcmfw-2.1/bluez-firmware-1.2.tar.gz) = 1651dd837c2263cf5d6d5d4da30664cf408b0ba9
+SHA512 (bcmfw-2.1/bluez-firmware-1.2.tar.gz) = 15db2f9d38a496882e4cc3754af1e58aa99e1b849f2066c541d76c66a8ffdc5532799fe1fd473cfc158bf5ea86a46687716cbcf83c6dcac0ce66d97d679648dd
+Size (bcmfw-2.1/bluez-firmware-1.2.tar.gz) = 370623 bytes
+SHA1 (bcmfw-2.1/v2.1.tar.gz) = 615874d113fcd134f14dbd095914b76467958e2c
+RMD160 (bcmfw-2.1/v2.1.tar.gz) = 58e1c17d162520803aa85bbc684dbfa2538d90d2
+SHA512 (bcmfw-2.1/v2.1.tar.gz) = fe95528325c54a5c865504fe3ae1ac6bd99539788a94b846660c2fdf5a150d1a5b86e3ea427197f534e1d4c14b564f9a75eafe3674dff75f3bc49f19a46c7c12
+Size (bcmfw-2.1/v2.1.tar.gz) = 12105 bytes
diff -r 6efb1c758da2 -r 4765dfa200ed sysutils/bcmfw/patches/patch-bcmfw-install.c
--- a/sysutils/bcmfw/patches/patch-bcmfw-install.c      Wed May 31 17:32:32 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-$NetBSD: patch-bcmfw-install.c,v 1.1 2016/02/24 21:43:39 plunky Exp $
-
-use %zu for size_t
-
---- bcmfw-install.c.orig       2016-02-24 21:39:09.000000000 +0000
-+++ bcmfw-install.c
-@@ -194,9 +194,9 @@ start:
-                               }
-                       }
-                       if (quote)
--                              warnx("unterminated quote on line #%d", lineno);
-+                              warnx("unterminated quote on line #%zu", lineno);
-                       if (stringkey)
--                              warnx("unterminated string key on line #%d", lineno);
-+                              warnx("unterminated string key on line #%zu", lineno);
-                       if (space)
-                               len = space;    /* drop trailing spaces */
-                       if (ch == EOF) {
-@@ -216,7 +216,7 @@ start:
-                               if (buf[len - 1] == ']')
-                                       section = section_add(buf + 1, len - 2);
-                               else {
--                                      warnx("malformed section header on line #%d", lineno);
-+                                      warnx("malformed section header on line #%zu", lineno);
-                                       section = NULL;
-                               }
-                       } else if (section != NULL) /* ignore lines with no section */
-@@ -257,7 +257,7 @@ start:
-               buf[len++] = (uint8_t)ch;
-       }
- 
--      err(EXIT_FAILURE, "line #%d too long", lineno);
-+      err(EXIT_FAILURE, "line #%zu too long", lineno);
- }
- 
- static bool