Updated sysutils/pciutils to 3.5.4.

2017-02-25  Martin Mares <mj@ucw.cz>

	* Released as 3.5.4.

	* Previous version broke compilation on systems, for which lib/types.h
	  did not provide a 64-bit integer type. It is provided everywhere now.

4 files changed, 12 insertions, 48 deletions

diff --git a/sysutils/pciutils/Makefile b/sysutils/pciutils/Makefile
index 9ca96e33510..04d61f0113c 100644
--- a/sysutils/pciutils/Makefile
+++ b/sysutils/pciutils/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.34 2017/02/16 05:52:55 msaitoh Exp $
+# $NetBSD: Makefile,v 1.35 2017/02/26 06:44:17 msaitoh Exp $
 
-DISTNAME=	pciutils-3.5.3
+DISTNAME=	pciutils-3.5.4
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/
 MASTER_SITES+=	ftp://ftp.kernel.org/pub/software/utils/pciutils/
diff --git a/sysutils/pciutils/distinfo b/sysutils/pciutils/distinfo
index 330cf9cdc99..1609edc225f 100644
--- a/sysutils/pciutils/distinfo
+++ b/sysutils/pciutils/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.24 2017/02/16 05:52:55 msaitoh Exp $
+$NetBSD: distinfo,v 1.25 2017/02/26 06:44:17 msaitoh Exp $
 
-SHA1 (pciutils-3.5.3.tar.gz) = 768a591dcb9da28f1a4a4dbf026140dd62208c5b
-RMD160 (pciutils-3.5.3.tar.gz) = 52a1486835058db5f150f9b8c94329208740d06a
-SHA512 (pciutils-3.5.3.tar.gz) = aa0232d3a8d3d1fdc15b790bfed46070de4db0d7ca2cff79122200d6002b709e20383a44558c1735da46e920500d9eb2159983148c766bef91a42545cfe2cc58
-Size (pciutils-3.5.3.tar.gz) = 423828 bytes
-SHA1 (patch-aa) = 9396085bde1aee4ef07decd08d1d5db3217aab4a
+SHA1 (pciutils-3.5.4.tar.gz) = 4fc1ec91181a1211e7af0f1889b14d17dc431532
+RMD160 (pciutils-3.5.4.tar.gz) = 84d20c85a6b02cb0fb427d303cdc24ce458d227c
+SHA512 (pciutils-3.5.4.tar.gz) = 502a28ba0e159c5df6b832585fb3db581c54bbde1ed17ddbf7f6e31fc2a145c8c6736be98876e0fe3b6e679ea39efb6b069417e2f4f0ec0a03b015e2eff4530b
+Size (pciutils-3.5.4.tar.gz) = 418401 bytes
+SHA1 (patch-aa) = bda21718adc90e0b115c41e872f008bde3c4d521
 SHA1 (patch-ab) = 881db39792c9d72f527438e2b475ac2ea842b536
 SHA1 (patch-ac) = 4b90e99c051391b9cd3a6c1f5781f41b4a855c29
 SHA1 (patch-ad) = bfe9069e96fd46798afec73c93ad71db3a0e0e37
-SHA1 (patch-lib_types.h) = 2766833ba945d2fc71aa36bd6ebfac0e511fd8cb
diff --git a/sysutils/pciutils/patches/patch-aa b/sysutils/pciutils/patches/patch-aa
index 2cbbf640abe..9c9ea11c7cd 100644
--- a/sysutils/pciutils/patches/patch-aa
+++ b/sysutils/pciutils/patches/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.orig	2017-02-15 18:17:08.000000000 +0900
-+++ Makefile	2017-02-16 12:34:04.536298774 +0900
+--- Makefile.orig	2017-02-26 07:58:49.000000000 +0900
++++ Makefile	2017-02-26 15:40:04.602258606 +0900
 @@ -1,8 +1,7 @@
  # Makefile for The PCI Utilities
  # (c) 1998--2017 Martin Mares <mj@ucw.cz>
@@ -8,8 +8,8 @@
 -CFLAGS=$(OPT) -Wall -W -Wno-parentheses -Wstrict-prototypes -Wmissing-prototypes
 +CFLAGS=-Wall -W -Wno-parentheses -Wstrict-prototypes -Wmissing-prototypes
  
- VERSION=3.5.3
- DATE=2017-02-15
+ VERSION=3.5.4
+ DATE=2017-02-25
 @@ -13,7 +12,7 @@ RELEASE=
  CROSS_COMPILE=
  
diff --git a/sysutils/pciutils/patches/patch-lib_types.h b/sysutils/pciutils/patches/patch-lib_types.h
deleted file mode 100644
index 0edf9b3d7b3..00000000000
--- a/sysutils/pciutils/patches/patch-lib_types.h
+++ /dev/null
@@ -1,35 +0,0 @@
---- lib/types.h.orig	2011-01-08 06:04:28.000000000 +0900
-+++ lib/types.h	2017-02-16 13:37:32.460850605 +0900
-@@ -7,6 +7,7 @@
-  */
- 
- #include <sys/types.h>
-+#include <limits.h>
- 
- #ifndef PCI_HAVE_Uxx_TYPES
- 
-@@ -20,22 +21,19 @@ typedef DWORD u32;
- typedef uint8_t u8;
- typedef uint16_t u16;
- typedef uint32_t u32;
-+typedef uint64_t u64;
- #else
- typedef u_int8_t u8;
- typedef u_int16_t u16;
- typedef u_int32_t u32;
-+typedef u_int64_t u64;
- #endif
- 
--#ifdef PCI_HAVE_64BIT_ADDRESS
--#include <limits.h>
- #if ULONG_MAX > 0xffffffff
--typedef unsigned long u64;
- #define PCI_U64_FMT "l"
- #else
--typedef unsigned long long u64;
- #define PCI_U64_FMT "ll"
- #endif
--#endif
- 
- #endif	/* PCI_HAVE_Uxx_TYPES */
-