- update to 015

- add USE_GMAKE because it's now doesn't builds with make(1)
- remove files/patch-fwcutter.c[h] that was applied upstream
- remove firmware sample from fwcutter_list.h, that was added upstream

Notes:
- patch from original PR didn't applied. I asked submitter to fix it,
  but never got any response (for some reason my request didn't found
  it's way into audit trail)
- maintainer also timeouts
- i'm successfully using this version of fwcutter for about a month now
  and rebuilded my firmware kmod several times w/o any problems

PR:             162013
Submitted by:   Kurt Jaeger <fbsd-ports at opsec dot eu>
Approved by:    maintainer (timeout, 1 month+),
                novel (mentor, implicit)

5 files changed, 62 insertions, 155 deletions

diff --git a/sysutils/b43-fwcutter/Makefile b/sysutils/b43-fwcutter/Makefile
index 0708869278a..1aab2d2f263 100644
--- a/sysutils/b43-fwcutter/Makefile
+++ b/sysutils/b43-fwcutter/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	b43-fwcutter
-PORTVERSION=	012
+PORTVERSION=	015
 CATEGORIES=	sysutils
 MASTER_SITES=	http://bu3sch.de/b43/fwcutter/
 
@@ -14,6 +14,7 @@ MAINTAINER=	swhetzel@gmail.com
 COMMENT=	Extracts firmware for Broadcom Wireless adapters
 
 USE_BZIP2=	yes
+USE_GMAKE=	yes
 
 MAN1=		b43-fwcutter.1
 PLIST_FILES=	bin/b43-fwcutter
diff --git a/sysutils/b43-fwcutter/distinfo b/sysutils/b43-fwcutter/distinfo
index 0b8482ea20d..c6151532dbc 100644
--- a/sysutils/b43-fwcutter/distinfo
+++ b/sysutils/b43-fwcutter/distinfo
@@ -1,2 +1,2 @@
-SHA256 (b43-fwcutter-012.tar.bz2) = bfc4844d7b077cdff04b2f73da9527bc623c640be2057ab49812908e49d84475
-SIZE (b43-fwcutter-012.tar.bz2) = 14138
+SHA256 (b43-fwcutter-015.tar.bz2) = 4c6a53d1f5d76b8aa224d294bee47726b1477f35327f4e23e8cb799865e0f6eb
+SIZE (b43-fwcutter-015.tar.bz2) = 18210
diff --git a/sysutils/b43-fwcutter/files/patch-fwcutter.c b/sysutils/b43-fwcutter/files/patch-fwcutter.c
deleted file mode 100644
index 1edf0f402c6..00000000000
--- a/sysutils/b43-fwcutter/files/patch-fwcutter.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./fwcutter.c.orig	2008-02-13 11:46:26.000000000 -0600
-+++ ./fwcutter.c	2009-05-07 01:24:22.345157339 -0500
-@@ -38,7 +38,7 @@
- #include <sys/stat.h>
- #include <sys/types.h>
- 
--#ifdef __DragonFly__
-+#if defined(__DragonFly__) || defined(__FreeBSD__)
- #include <sys/endian.h>
- #else
- #include <byteswap.h>
-@@ -48,7 +48,7 @@
- #include "fwcutter.h"
- #include "fwcutter_list.h"
- 
--#ifdef __DragonFly__
-+#if defined(__DragonFly__) || defined(__FreeBSD__)
- #define V3_FW_DIRNAME	"v3"
- #define V4_FW_DIRNAME	"v4"
- #else
diff --git a/sysutils/b43-fwcutter/files/patch-fwcutter.h b/sysutils/b43-fwcutter/files/patch-fwcutter.h
deleted file mode 100644
index 34513467d1e..00000000000
--- a/sysutils/b43-fwcutter/files/patch-fwcutter.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./fwcutter.h.orig	2008-02-13 11:46:26.000000000 -0600
-+++ ./fwcutter.h	2009-05-07 01:28:47.979870488 -0500
-@@ -12,7 +12,7 @@
- typedef uint16_t be16_t; /* Big-endian 16bit */
- typedef uint32_t be32_t; /* Big-endian 32bit */
- 
--#ifdef __DragonFly__
-+#if defined(__DragonFly__) || defined(__FreeBSD__)
- #define bswap_16	bswap16
- #define bswap_32	bswap32
- #endif
diff --git a/sysutils/b43-fwcutter/files/patch-fwcutter_list.h b/sysutils/b43-fwcutter/files/patch-fwcutter_list.h
index 1229a16cce3..4783f8cde0a 100644
--- a/sysutils/b43-fwcutter/files/patch-fwcutter_list.h
+++ b/sysutils/b43-fwcutter/files/patch-fwcutter_list.h
@@ -1,136 +1,73 @@
---- ./fwcutter_list.h.orig	2009-06-02 08:52:55.000000000 -0700
-+++ ./fwcutter_list.h	2010-02-16 19:22:34.000000000 -0800
-@@ -238,6 +238,108 @@
+--- fwcutter_list.h.orig	2011-08-21 16:17:01.000000000 +0400
++++ fwcutter_list.h	2011-12-19 18:23:16.000000000 +0400
+@@ -131,6 +131,55 @@
  	EXTRACT_LIST_END
  };
  
 +static struct extract _1a258b2d93efa641c32ddf3c3a962028[] =
 +{
-+	/* { .name = "ucode4", .offset = 0xAFE08, .type = EXT_UCODE_1, .length = 0x4EA0 }, */
-+	/* { .name = "pcm4", .offset = 0xE8FE0, .type = EXT_PCM, .length = 0x520 }, */
-+	/* { .name = "b0g0initvals4", .offset = 0xA2878, .type = EXT_IV, .length = 0xE80 }, */
-+	/* { .name = "a0g0bsinitvals4", .offset = 0xA45C0, .type = EXT_IV, .length = 0x30 }, */
-+	/* { .name = "b0g0bsinitvals4", .offset = 0xA3700, .type = EXT_IV, .length = 0x30 }, */
-+	/* { .name = "a0g0initvals4", .offset = 0xA3738, .type = EXT_IV, .length = 0xE80 }, */
-+	{ .name = "ucode5", .offset = 0xB4CAC, .type = EXT_UCODE_2, .length = 0x56F0 },
-+	{ .name = "pcm5", .offset = 0xE9504, .type = EXT_PCM, .length = 0x520 },
-+	{ .name = "a0g0bsinitvals5", .offset = 0xA6578, .type = EXT_IV, .length = 0x118 },
-+	{ .name = "b0g0bsinitvals5", .offset = 0xA5018, .type = EXT_IV, .length = 0x118 },
-+	{ .name = "a0g0initvals5", .offset = 0xA5138, .type = EXT_IV, .length = 0xA18 },
-+	{ .name = "a0g1initvals5", .offset = 0xA5B58, .type = EXT_IV, .length = 0xA18 },
-+	{ .name = "b0g0initvals5", .offset = 0xA45F8, .type = EXT_IV, .length = 0xA18 },
-+	{ .name = "a0g1bsinitvals5", .offset = 0xA6698, .type = EXT_IV, .length = 0x118 },
-+	{ .name = "ucode9", .offset = 0xBA3A0, .type = EXT_UCODE_2, .length = 0x6248 },
-+	{ .name = "a0g0bsinitvals9", .offset = 0xA89C0, .type = EXT_IV, .length = 0x118 },
-+	{ .name = "b0g0initvals9", .offset = 0xA67B8, .type = EXT_IV, .length = 0xAF0 },
-+	{ .name = "a0g1bsinitvals9", .offset = 0xA8AE0, .type = EXT_IV, .length = 0x118 },
-+	{ .name = "b0g0bsinitvals9", .offset = 0xA72B0, .type = EXT_IV, .length = 0x118 },
-+	{ .name = "a0g0initvals9", .offset = 0xA73D0, .type = EXT_IV, .length = 0xAF0 },
-+	{ .name = "a0g1initvals9", .offset = 0xA7EC8, .type = EXT_IV, .length = 0xAF0 },
-+	{ .name = "ucode11", .offset = 0xC05EC, .type = EXT_UCODE_2, .length = 0x8000 },
-+	{ .name = "n0initvals11", .offset = 0xA8C00, .type = EXT_IV, .length = 0xBC8 },
-+	{ .name = "n0bsinitvals11", .offset = 0xA97D0, .type = EXT_IV, .length = 0x118 },
-+	{ .name = "n0absinitvals11", .offset = 0xA98F0, .type = EXT_IV, .length = 0x118 },
-+	{ .name = "ucode13", .offset = 0xC85F0, .type = EXT_UCODE_2, .length = 0x7AC8 },
-+	{ .name = "b0g0bsinitvals13", .offset = 0xABA70, .type = EXT_IV, .length = 0x118 },
-+	{ .name = "b0g0initvals13", .offset = 0xAAED0, .type = EXT_IV, .length = 0xB98 },
-+	{ .name = "a0g1bsinitvals13", .offset = 0xAC730, .type = EXT_IV, .length = 0x118 },
-+	{ .name = "a0g1initvals13", .offset = 0xABB90, .type = EXT_IV, .length = 0xB98 },
-+	{ .name = "lp0bsinitvals13", .offset = 0xAADB0, .type = EXT_IV, .length = 0x118 },
-+	{ .name = "lp0initvals13", .offset = 0xA9A10, .type = EXT_IV, .length = 0x1398 },
-+	{ .name = "ucode14", .offset = 0xD00BC, .type = EXT_UCODE_2, .length = 0x7910 },
-+	{ .name = "lp0initvals14", .offset = 0xAC850, .type = EXT_IV, .length = 0xB80 },
-+	{ .name = "lp0bsinitvals14", .offset = 0xAD3D8, .type = EXT_IV, .length = 0x118 },
-+	{ .name = "ucode15", .offset = 0xD79D0, .type = EXT_UCODE_3, .length = 0x8768 },
-+	{ .name = "lp0initvals15", .offset = 0xAD4F8, .type = EXT_IV, .length = 0xC68 },
-+	{ .name = "lp0bsinitvals15", .offset = 0xAE168, .type = EXT_IV, .length = 0x118 },
-+	{ .name = "ucode16", .offset = 0xE013C, .type = EXT_UCODE_3, .length = 0x8EA0 },
-+	{ .name = "lp0bsinitvals16", .offset = 0xAFCE8, .type = EXT_IV, .length = 0x118 },
-+	{ .name = "n0bsinitvals16", .offset = 0xAEF20, .type = EXT_IV, .length = 0x118 },
-+	{ .name = "sslpn0initvals16", .offset = 0xAF040, .type = EXT_IV, .length = 0x0 },
-+	{ .name = "n0initvals16", .offset = 0xAE288, .type = EXT_IV, .length = 0xC90 },
-+	{ .name = "lp0initvals16", .offset = 0xAF050, .type = EXT_IV, .length = 0xC90 },
-+	{ .name = "sslpn0bsinitvals16", .offset = 0xAF048, .type = EXT_IV, .length = 0x0 },
-+	EXTRACT_LIST_END
++    /* { .name = "ucode4", .offset = 0xAFE08, .type = EXT_UCODE_1, .length = 0x4EA0 }, */
++    /* { .name = "pcm4", .offset = 0xE8FE0, .type = EXT_PCM, .length = 0x520 }, */
++    /* { .name = "b0g0initvals4", .offset = 0xA2878, .type = EXT_IV, .length = 0xE80 }, */
++    /* { .name = "a0g0bsinitvals4", .offset = 0xA45C0, .type = EXT_IV, .length = 0x30 }, */
++    /* { .name = "b0g0bsinitvals4", .offset = 0xA3700, .type = EXT_IV, .length = 0x30 }, */
++    /* { .name = "a0g0initvals4", .offset = 0xA3738, .type = EXT_IV, .length = 0xE80 }, */
++    { .name = "ucode5", .offset = 0xB4CAC, .type = EXT_UCODE_2, .length = 0x56F0 },
++    { .name = "pcm5", .offset = 0xE9504, .type = EXT_PCM, .length = 0x520 },
++    { .name = "a0g0bsinitvals5", .offset = 0xA6578, .type = EXT_IV, .length = 0x118 },
++    { .name = "b0g0bsinitvals5", .offset = 0xA5018, .type = EXT_IV, .length = 0x118 },
++    { .name = "a0g0initvals5", .offset = 0xA5138, .type = EXT_IV, .length = 0xA18 },
++    { .name = "a0g1initvals5", .offset = 0xA5B58, .type = EXT_IV, .length = 0xA18 },
++    { .name = "b0g0initvals5", .offset = 0xA45F8, .type = EXT_IV, .length = 0xA18 },
++    { .name = "a0g1bsinitvals5", .offset = 0xA6698, .type = EXT_IV, .length = 0x118 },
++    { .name = "ucode9", .offset = 0xBA3A0, .type = EXT_UCODE_2, .length = 0x6248 },
++    { .name = "a0g0bsinitvals9", .offset = 0xA89C0, .type = EXT_IV, .length = 0x118 },
++    { .name = "b0g0initvals9", .offset = 0xA67B8, .type = EXT_IV, .length = 0xAF0 },
++    { .name = "a0g1bsinitvals9", .offset = 0xA8AE0, .type = EXT_IV, .length = 0x118 },
++    { .name = "b0g0bsinitvals9", .offset = 0xA72B0, .type = EXT_IV, .length = 0x118 },
++    { .name = "a0g0initvals9", .offset = 0xA73D0, .type = EXT_IV, .length = 0xAF0 },
++    { .name = "a0g1initvals9", .offset = 0xA7EC8, .type = EXT_IV, .length = 0xAF0 },
++    { .name = "ucode11", .offset = 0xC05EC, .type = EXT_UCODE_2, .length = 0x8000 },
++    { .name = "n0initvals11", .offset = 0xA8C00, .type = EXT_IV, .length = 0xBC8 },
++    { .name = "n0bsinitvals11", .offset = 0xA97D0, .type = EXT_IV, .length = 0x118 },
++    { .name = "n0absinitvals11", .offset = 0xA98F0, .type = EXT_IV, .length = 0x118 },
++    { .name = "ucode13", .offset = 0xC85F0, .type = EXT_UCODE_2, .length = 0x7AC8 },
++    { .name = "b0g0bsinitvals13", .offset = 0xABA70, .type = EXT_IV, .length = 0x118 },
++    { .name = "b0g0initvals13", .offset = 0xAAED0, .type = EXT_IV, .length = 0xB98 },
++    { .name = "a0g1bsinitvals13", .offset = 0xAC730, .type = EXT_IV, .length = 0x118 },
++    { .name = "a0g1initvals13", .offset = 0xABB90, .type = EXT_IV, .length = 0xB98 },
++    { .name = "lp0bsinitvals13", .offset = 0xAADB0, .type = EXT_IV, .length = 0x118 },
++    { .name = "lp0initvals13", .offset = 0xA9A10, .type = EXT_IV, .length = 0x1398 },
++    { .name = "ucode14", .offset = 0xD00BC, .type = EXT_UCODE_2, .length = 0x7910 },
++    { .name = "lp0initvals14", .offset = 0xAC850, .type = EXT_IV, .length = 0xB80 },
++    { .name = "lp0bsinitvals14", .offset = 0xAD3D8, .type = EXT_IV, .length = 0x118 },
++    { .name = "ucode15", .offset = 0xD79D0, .type = EXT_UCODE_3, .length = 0x8768 },
++    { .name = "lp0initvals15", .offset = 0xAD4F8, .type = EXT_IV, .length = 0xC68 },
++    { .name = "lp0bsinitvals15", .offset = 0xAE168, .type = EXT_IV, .length = 0x118 },
++    { .name = "ucode16", .offset = 0xE013C, .type = EXT_UCODE_3, .length = 0x8EA0 },
++    { .name = "lp0bsinitvals16", .offset = 0xAFCE8, .type = EXT_IV, .length = 0x118 },
++    { .name = "n0bsinitvals16", .offset = 0xAEF20, .type = EXT_IV, .length = 0x118 },
++    { .name = "sslpn0initvals16", .offset = 0xAF040, .type = EXT_IV, .length = 0x0 },
++    { .name = "n0initvals16", .offset = 0xAE288, .type = EXT_IV, .length = 0xC90 },
++    { .name = "lp0initvals16", .offset = 0xAF050, .type = EXT_IV, .length = 0xC90 },
++    { .name = "sslpn0bsinitvals16", .offset = 0xAF048, .type = EXT_IV, .length = 0x0 },
++    EXTRACT_LIST_END
 +};
-+
-+static struct extract _bb8537e3204a1ea5903fe3e66b5e2763[] =
-+{
-+	/* ucode major version at offset 0xa8b70 */
-+	/* ucode minor version at offset 0xa8b74 */
-+	/* { .name = "ucode4", .offset = 0xB6108, .type = EXT_UCODE_1, .length = 0x4EA0 }, */
-+	/* { .name = "pcm4", .offset = 0xEF2E0, .type = EXT_PCM, .length = 0x520 }, */
-+	/* { .name = "b0g0initvals4", .offset = 0xA8B78, .type = EXT_IV, .length = 0xE80 }, */
-+	/* { .name = "a0g0bsinitvals4", .offset = 0xAA8C0, .type = EXT_IV, .length = 0x30 }, */
-+	/* { .name = "b0g0bsinitvals4", .offset = 0xA9A00, .type = EXT_IV, .length = 0x30 }, */
-+	/* { .name = "a0g0initvals4", .offset = 0xA9A38, .type = EXT_IV, .length = 0xE80 }, */
-+	{ .name = "ucode5", .offset = 0xBAFAC, .type = EXT_UCODE_2, .length = 0x56F0 },
-+	{ .name = "pcm5", .offset = 0xEF804, .type = EXT_PCM, .length = 0x520 },
-+	{ .name = "b0g0bsinitvals5", .offset = 0xAB318, .type = EXT_IV, .length = 0x118 },
-+	{ .name = "a0g0bsinitvals5", .offset = 0xAC878, .type = EXT_IV, .length = 0x118 },
-+	{ .name = "b0g0initvals5", .offset = 0xAA8F8, .type = EXT_IV, .length = 0xA18 },
-+	{ .name = "a0g1initvals5", .offset = 0xABE58, .type = EXT_IV, .length = 0xA18 },
-+	{ .name = "a0g0initvals5", .offset = 0xAB438, .type = EXT_IV, .length = 0xA18 },
-+	{ .name = "a0g1bsinitvals5", .offset = 0xAC998, .type = EXT_IV, .length = 0x118 },
-+	{ .name = "ucode9", .offset = 0xC06A0, .type = EXT_UCODE_2, .length = 0x6248 },
-+	{ .name = "a0g1initvals9", .offset = 0xAE1C8, .type = EXT_IV, .length = 0xAF0 },
-+	{ .name = "a0g0bsinitvals9", .offset = 0xAECC0, .type = EXT_IV, .length = 0x118 },
-+	{ .name = "b0g0bsinitvals9", .offset = 0xAD5B0, .type = EXT_IV, .length = 0x118 },
-+	{ .name = "b0g0initvals9", .offset = 0xACAB8, .type = EXT_IV, .length = 0xAF0 },
-+	{ .name = "a0g1bsinitvals9", .offset = 0xAEDE0, .type = EXT_IV, .length = 0x118 },
-+	{ .name = "a0g0initvals9", .offset = 0xAD6D0, .type = EXT_IV, .length = 0xAF0 },
-+	{ .name = "ucode11", .offset = 0xC68EC, .type = EXT_UCODE_2, .length = 0x8000 },
-+	{ .name = "n0bsinitvals11", .offset = 0xAFAD0, .type = EXT_IV, .length = 0x118 },
-+	{ .name = "n0absinitvals11", .offset = 0xAFBF0, .type = EXT_IV, .length = 0x118 },
-+	{ .name = "n0initvals11", .offset = 0xAEF00, .type = EXT_IV, .length = 0xBC8 },
-+	{ .name = "ucode13", .offset = 0xCE8F0, .type = EXT_UCODE_2, .length = 0x7AC8 },
-+	{ .name = "b0g0initvals13", .offset = 0xB11D0, .type = EXT_IV, .length = 0xB98 },
-+	{ .name = "a0g1bsinitvals13", .offset = 0xB2A30, .type = EXT_IV, .length = 0x118 },
-+	{ .name = "a0g1initvals13", .offset = 0xB1E90, .type = EXT_IV, .length = 0xB98 },
-+	{ .name = "lp0bsinitvals13", .offset = 0xB10B0, .type = EXT_IV, .length = 0x118 },
-+	{ .name = "b0g0bsinitvals13", .offset = 0xB1D70, .type = EXT_IV, .length = 0x118 },
-+	{ .name = "lp0initvals13", .offset = 0xAFD10, .type = EXT_IV, .length = 0x1398 },
-+	{ .name = "ucode14", .offset = 0xD63BC, .type = EXT_UCODE_2, .length = 0x7910 },
-+	{ .name = "lp0initvals14", .offset = 0xB2B50, .type = EXT_IV, .length = 0xB80 },
-+	{ .name = "lp0bsinitvals14", .offset = 0xB36D8, .type = EXT_IV, .length = 0x118 },
-+	{ .name = "ucode15", .offset = 0xDDCD0, .type = EXT_UCODE_3, .length = 0x8768 },
-+	{ .name = "lp0bsinitvals15", .offset = 0xB4468, .type = EXT_IV, .length = 0x118 },
-+	{ .name = "lp0initvals15", .offset = 0xB37F8, .type = EXT_IV, .length = 0xC68 },
-+	{ .name = "ucode16", .offset = 0xE643C, .type = EXT_UCODE_3, .length = 0x8EA0 },
-+	{ .name = "n0bsinitvals16", .offset = 0xB5220, .type = EXT_IV, .length = 0x118 },
-+	{ .name = "sslpn0initvals16", .offset = 0xB5340, .type = EXT_IV, .length = 0x0 },
-+	{ .name = "n0initvals16", .offset = 0xB4588, .type = EXT_IV, .length = 0xC90 },
-+	{ .name = "lp0initvals16", .offset = 0xB5350, .type = EXT_IV, .length = 0xC90 },
-+	{ .name = "sslpn0bsinitvals16", .offset = 0xB5348, .type = EXT_IV, .length = 0x0 },
-+	{ .name = "lp0bsinitvals16", .offset = 0xB5FE8, .type = EXT_IV, .length = 0x118 },
-+	EXTRACT_LIST_END
-+};
-+
- /*
-  * Links change, so let's not put them into the README.
-  * I still put them here so we know where the file was obtained.
-@@ -299,6 +401,24 @@
- 		.flags		= FW_FLAG_LE | FW_FLAG_V4 | FW_FLAG_UNSUPPORTED,
- 		.extract	= _2dd738b8feb8b3559fd9d8fbaf3bfffc,
+ 
+ static struct extract _cb8d70972b885b1f8883b943c0261a3c[] =
+ {
+@@ -811,6 +860,14 @@
+ 		.extract	= _1e4763b4cb8cfbaae43e5c6d3d6b2ae7,
  	},
-+	{
+ 	{
 +		/* ftp://downloads.netgear.com/files/GPL/WNDR3300-V1.0.29_gpl_src.zip */
 +		.name		= "wl_apsta.o",
-+		.id		= "FW15",
 +		.ucode_version	= "478.104",
 +		.md5		= "1a258b2d93efa641c32ddf3c3a962028",
 +		.flags		= FW_FLAG_LE | FW_FLAG_V4,
 +		.extract	= _1a258b2d93efa641c32ddf3c3a962028,
 +	},
 +	{
-+		/* http://downloads.openwrt.org/sources/broadcom-wl-4.178.10.4.tar.bz2 */
-+		.name		= "wl_apsta.o",
-+		.id		= "FW15",
-+		.ucode_version	= "478.104",
-+		.md5		= "bb8537e3204a1ea5903fe3e66b5e2763",
-+		.flags		= FW_FLAG_LE | FW_FLAG_V4,
-+		.extract	= _bb8537e3204a1ea5903fe3e66b5e2763,
-+	},
- };
- 
- #define FILES (sizeof(files) / sizeof(files[0]))
+ 		/* http://mirror2.openwrt.org/sources/broadcom-wl-4.150.10.5.tar.bz2 */
+ 		.name		= "wl_apsta_mimo.o",
+ 		.ucode_version	= "410.2160",