- update to 0.9.7

- change maintainer's email
- drop LICENSE_FILE for standard license (GPLv2)
- mark MAKE_JOBS_UNSAFE (thanks to stefanct and idwer)
- whitespace fixes, while here

PR:		181654
Submitted by:	Hakisho Nukama <nukama@gmail.com> (maintainer)

3 files changed, 7 insertions, 71 deletions

diff --git a/sysutils/flashrom/Makefile b/sysutils/flashrom/Makefile
index 2523994475a9..3ad3f5b1eb48 100644
--- a/sysutils/flashrom/Makefile
+++ b/sysutils/flashrom/Makefile
@@ -2,15 +2,14 @@
 # $FreeBSD$
 
 PORTNAME=	flashrom
-PORTVERSION=	0.9.6.1
+PORTVERSION=	0.9.7
 CATEGORIES=	sysutils
 MASTER_SITES=	http://download.flashrom.org/releases/
 
-MAINTAINER=	nukama@gmail.com
+MAINTAINER=	nukama+maintainer@gmail.com
 COMMENT=	Utility for reading, writing, verifying, and erasing flash ROM chips
 
 LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	pci:${PORTSDIR}/devel/libpci
 
@@ -22,8 +21,9 @@ FTDI_DESC=	Enable external FT2232SPI flasher support
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-CPPFLAGS+=      -I${LOCALBASE}/include
-LDFLAGS+=       -L${LOCALBASE}/lib -lc
+MAKE_JOBS_UNSAFE=	yes
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -lc
 
 ONLY_FOR_ARCHS=	amd64 i386
 
diff --git a/sysutils/flashrom/distinfo b/sysutils/flashrom/distinfo
index e8f02cbb0096..60578a490155 100644
--- a/sysutils/flashrom/distinfo
+++ b/sysutils/flashrom/distinfo
@@ -1,2 +1,2 @@
-SHA256 (flashrom-0.9.6.1.tar.bz2) = 6f7b588cce74c90b4fe9c9c794de105de76e0323442fb5770b1aeab81e9d560a
-SIZE (flashrom-0.9.6.1.tar.bz2) = 368133
+SHA256 (flashrom-0.9.7.tar.bz2) = 5a55212d00791981a9a1cb0cdca9d9e58bea6d399864251e7b410b4d3d6137e9
+SIZE (flashrom-0.9.7.tar.bz2) = 408883
diff --git a/sysutils/flashrom/files/patch-duplicate-const b/sysutils/flashrom/files/patch-duplicate-const
deleted file mode 100644
index 68693a262d34..000000000000
--- a/sysutils/flashrom/files/patch-duplicate-const
+++ /dev/null
@@ -1,64 +0,0 @@
---- ichspi.c.orig	2013-02-19 16:43:01.000000000 +0100
-+++ ichspi.c	2013-02-19 16:43:12.000000000 +0100
-@@ -1127,7 +1127,7 @@
- static uint32_t ich_hwseq_get_erase_block_size(unsigned int addr)
- {
- 	uint8_t enc_berase;
--	static const uint32_t const dec_berase[4] = {
-+	static uint32_t const dec_berase[4] = {
- 		256,
- 		4 * 1024,
- 		8 * 1024,
---- bitbang_spi.c.orig	2013-02-19 16:45:02.000000000 +0100
-+++ bitbang_spi.c	2013-02-19 16:45:34.000000000 +0100
-@@ -26,33 +26,33 @@
- #include "spi.h"
- 
- /* Note that CS# is active low, so val=0 means the chip is active. */
--static void bitbang_spi_set_cs(const const struct bitbang_spi_master *master, int val)
-+static void bitbang_spi_set_cs(const struct bitbang_spi_master *master, int val)
- {
- 	master->set_cs(val);
- }
- 
--static void bitbang_spi_set_sck(const const struct bitbang_spi_master *master, int val)
-+static void bitbang_spi_set_sck(const struct bitbang_spi_master *master, int val)
- {
- 	master->set_sck(val);
- }
- 
--static void bitbang_spi_set_mosi(const const struct bitbang_spi_master *master, int val)
-+static void bitbang_spi_set_mosi(const struct bitbang_spi_master *master, int val)
- {
- 	master->set_mosi(val);
- }
- 
--static int bitbang_spi_get_miso(const const struct bitbang_spi_master *master)
-+static int bitbang_spi_get_miso(const struct bitbang_spi_master *master)
- {
- 	return master->get_miso();
- }
- 
--static void bitbang_spi_request_bus(const const struct bitbang_spi_master *master)
-+static void bitbang_spi_request_bus(const struct bitbang_spi_master *master)
- {
- 	if (master->request_bus)
- 		master->request_bus();
- }
- 
--static void bitbang_spi_release_bus(const const struct bitbang_spi_master *master)
-+static void bitbang_spi_release_bus(const struct bitbang_spi_master *master)
- {
- 	if (master->release_bus)
- 		master->release_bus();
---- dummyflasher.c.orig	2013-02-19 16:45:38.000000000 +0100
-+++ dummyflasher.c	2013-02-19 16:45:49.000000000 +0100
-@@ -66,7 +66,7 @@
- static uint8_t emu_status = 0;
- 
- /* A legit complete SFDP table based on the MX25L6436E (rev. 1.8) datasheet. */
--static const uint8_t const sfdp_table[] = {
-+static uint8_t const sfdp_table[] = {
- 	0x53, 0x46, 0x44, 0x50, // @0x00: SFDP signature
- 	0x00, 0x01, 0x01, 0xFF, // @0x04: revision 1.0, 2 headers
- 	0x00, 0x00, 0x01, 0x09, // @0x08: JEDEC SFDP header rev. 1.0, 9 DW long