Import of pkgsrc-2014Q1

sysutils/flashrom/Makefile

@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2012/10/23 19:51:02 asau Exp $
+# $NetBSD: Makefile,v 1.8 2014/02/26 10:31:40 wiedi Exp $
 #
 
-DISTNAME=	flashrom-0.9.5.2
+DISTNAME=	flashrom-0.9.7
 PKGNAME=	${DISTNAME:S/-r/pre/}
 CATEGORIES=	sysutils
 MASTER_SITES=	http://download.flashrom.org/releases/
@@ -20,7 +20,7 @@ USE_TOOLS+= gmake pkg-config
 DEPENDS+=	dmidecode-[0-9]*:../../sysutils/dmidecode
 .endif
 
-.if ${OPSYS} == "NetBSD"
+.if ${OPSYS} == "NetBSD" || ${OPSYS} == "SunOS"
 
 SUBST_CLASSES+=	pciutils
 SUBST_FILES.pciutils=	Makefile
@@ -34,6 +34,11 @@ CPPFLAGS+= -I/${PREFIX}/include
 
 .endif
 
+LDFLAGS.SunOS+=	-lsocket -lnsl
+.if ${OPSYS} == "SunOS"
+MAKE_ENV+=	WARNERROR=0
+.endif
+
 INSTALLATION_DIRS=	sbin ${PKGMANDIR}/man8
 
 do-install:

sysutils/flashrom/distinfo

@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.6 2012/11/23 12:08:04 joerg Exp $
+$NetBSD: distinfo,v 1.8 2014/03/06 15:46:39 joerg Exp $
 
-SHA1 (flashrom-0.9.5.2.tar.bz2) = 483c16a4a8bb7ceec8ea439b13e2b97d669deb25
-RMD160 (flashrom-0.9.5.2.tar.bz2) = dba65b6f12370eb686321e937e00479aff4a3739
-Size (flashrom-0.9.5.2.tar.bz2) = 347242 bytes
-SHA1 (patch-bitbang__spi.c) = 63fa8611cf7ebe9fa5c8e669d860c7e21d1a1095
-SHA1 (patch-ichspi.c) = 6ef54e13e6075b665fb125dd99b53887a606fa8f
+SHA1 (flashrom-0.9.7.tar.bz2) = d08b4073ea3ebf63f03c3e502f4291f50ef348ee
+RMD160 (flashrom-0.9.7.tar.bz2) = e160e0ac1e0e138702f3f467707175df96b7e6b1
+Size (flashrom-0.9.7.tar.bz2) = 408883 bytes
+SHA1 (patch-flashrom.c) = 9867fa7ff7d0a55bff5fc0e6c8c6c901af6211f8

sysutils/flashrom/patches/patch-bitbang__spi.c

@@ -1,44 +0,0 @@
-$NetBSD: patch-bitbang__spi.c,v 1.1 2012/11/23 12:08:04 joerg Exp $
-
---- bitbang_spi.c.orig	2012-11-22 21:16:09.000000000 +0000
-+++ bitbang_spi.c
-@@ -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();

sysutils/flashrom/patches/patch-flashrom.c

@@ -0,0 +1,22 @@
+$NetBSD: patch-flashrom.c,v 1.1 2014/03/06 15:46:39 joerg Exp $
+
+--- flashrom.c.orig	2014-03-02 13:42:29.000000000 +0000
++++ flashrom.c
+@@ -1738,7 +1738,7 @@ int selfcheck(void)
+ 	 * For 'flashchips' we check the first element to be non-null. In the
+ 	 * other cases there exist use cases where the first element can be
+ 	 * null. */
+-	if (flashchips == NULL || flashchips[0].vendor == NULL) {
++	if (flashchips[0].vendor == NULL) {
+ 		msg_gerr("Flashchips table miscompilation!\n");
+ 		ret = 1;
+ 	}
+@@ -1746,7 +1746,7 @@ int selfcheck(void)
+ 		if (selfcheck_eraseblocks(chip))
+ 			ret = 1;
+ 
+-#if CONFIG_INTERNAL == 1
++#if 0 && CONFIG_INTERNAL == 1
+ 	if (chipset_enables == NULL) {
+ 		msg_gerr("Chipset enables table does not exist!\n");
+ 		ret = 1;

sysutils/flashrom/patches/patch-ichspi.c

@@ -1,13 +0,0 @@
-$NetBSD: patch-ichspi.c,v 1.1 2012/11/23 12:08:04 joerg Exp $
-
---- ichspi.c.orig	2012-11-22 21:15:44.000000000 +0000
-+++ ichspi.c
-@@ -1125,7 +1125,7 @@ static void ich_hwseq_set_addr(uint32_t 
- 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 const uint32_t dec_berase[4] = {
- 		256,
- 		4 * 1024,
- 		8 * 1024,