Import of pkgsrc-2016Q3

sysutils/pciutils/Makefile

@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.25 2014/12/08 04:50:17 obache Exp $
+# $NetBSD: Makefile,v 1.31 2016/05/23 05:25:14 msaitoh Exp $
 
-DISTNAME=	pciutils-3.3.0
+DISTNAME=	pciutils-3.5.1
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/ \
 		ftp://ftp.kernel.org/pub/software/utils/pciutils/
@@ -11,22 +11,21 @@ COMMENT=	PCI bus manipulation utility similar to NetBSD pcictl(8)
 LICENSE=	gnu-gpl-v2
 
 MAKE_JOBS_SAFE=		no
-ONLY_FOR_PLATFORM=	AIX-*-* FreeBSD-*-* Linux-*-* NetBSD-*-*
+ONLY_FOR_PLATFORM=	AIX-*-* Darwin-*-* FreeBSD-*-* Linux-*-* NetBSD-*-*
 ONLY_FOR_PLATFORM+=	DragonFly-*-* OpenBSD-*-* SunOS-5.11-* Haiku-*-*
 
+MAKE_FLAGS+=		CFLAGS=${CFLAGS:Q}
+MAKE_FLAGS+=		LDFLAGS=${LDFLAGS:Q}
+
 INSTALL_TARGET=		install install-lib
 USE_TOOLS+=		gmake pkg-config
 REPLACE_SH=		*.sh
 
 PKGCONFIG_OVERRIDE=	lib/libpci.pc.in
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "NetBSD"
-PCIUTILS_LIBNAME=	pciutils
-.else
-PCIUTILS_LIBNAME=	pci
-.endif
+OPSYSVARS+=			PCIUTILS_LIBNAME
+PCIUTILS_LIBNAME.NetBSD=	pciutils
+PCIUTILS_LIBNAME.*=		pci
 
 PLIST_SUBST+=		PCIUTILS_LIBNAME=${PCIUTILS_LIBNAME}
 
@@ -36,12 +35,10 @@ SUBST_MESSAGE.pc=	Fixing library link specification in pkg-config file.
 SUBST_STAGE.pc=		pre-configure
 SUBST_VARS.pc=		PCIUTILS_LIBNAME
 
-.if ${OPSYS} == "SunOS"
-SUBST_CLASSES=		dns
+SUBST_CLASSES.SunOS+=	dns
 SUBST_MESSAGE.dns=	Disabling DNS support on Solaris
 SUBST_STAGE.dns=	pre-configure
 SUBST_FILES.dns=	Makefile
 SUBST_SED.dns=		-e 's/^DNS=/DNS=no/'
-.endif
 
 .include "../../mk/bsd.pkg.mk"

sysutils/pciutils/distinfo

@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.16 2014/11/27 11:45:56 msaitoh Exp $
+$NetBSD: distinfo,v 1.22 2016/05/23 05:25:14 msaitoh Exp $
 
-SHA1 (pciutils-3.3.0.tar.gz) = cb1ad848c3a4384a43b5e516fb72e0aa6eb3d380
-RMD160 (pciutils-3.3.0.tar.gz) = 0a48d5327279a8eb1ba7e85740b6d9da01dc5525
-Size (pciutils-3.3.0.tar.gz) = 419917 bytes
-SHA1 (patch-aa) = 7be11cd0eff91f6fe51d795fa7b9e05fdefb038d
-SHA1 (patch-ab) = 8837e3a6e6c87802614b50ac511d1c1b7375b908
+SHA1 (pciutils-3.5.1.tar.gz) = 512f68df5ee6d661ebc209befdf89ecffcdcf69d
+RMD160 (pciutils-3.5.1.tar.gz) = 8ffd6acfff25fb47900577c7536ed86f4b559c56
+SHA512 (pciutils-3.5.1.tar.gz) = a324e96556db23011cf86a3ef082851a608c1ef6dd3841cd3231c2e9ef20085cadc22fc6517fc86595610a6d45fc9a05663ebd4d8702e6fbb9def91d2f5e5985
+Size (pciutils-3.5.1.tar.gz) = 413052 bytes
+SHA1 (patch-aa) = cc08da2eefdc32fe85f89fc7e508a9790adfb1b4
+SHA1 (patch-ab) = 881db39792c9d72f527438e2b475ac2ea842b536
 SHA1 (patch-ac) = 4b90e99c051391b9cd3a6c1f5781f41b4a855c29
 SHA1 (patch-ad) = bfe9069e96fd46798afec73c93ad71db3a0e0e37

sysutils/pciutils/patches/patch-aa

@@ -1,15 +1,15 @@
---- Makefile.orig	2014-11-10 22:37:47.000000000 +0900
-+++ Makefile	2014-11-26 14:10:21.000000000 +0900
+--- Makefile.orig	2016-05-22 16:57:08.000000000 +0900
++++ Makefile	2016-05-23 14:20:02.224489165 +0900
 @@ -1,8 +1,7 @@
  # Makefile for The PCI Utilities
- # (c) 1998--2014 Martin Mares <mj@ucw.cz>
+ # (c) 1998--2016 Martin Mares <mj@ucw.cz>
  
 -OPT=-O2
 -CFLAGS=$(OPT) -Wall -W -Wno-parentheses -Wstrict-prototypes -Wmissing-prototypes
 +CFLAGS=-Wall -W -Wno-parentheses -Wstrict-prototypes -Wmissing-prototypes
  
- VERSION=3.3.0
- DATE=2014-11-10
+ VERSION=3.5.1
+ DATE=2016-05-22
 @@ -13,7 +12,7 @@
  CROSS_COMPILE=
  

sysutils/pciutils/patches/patch-ab

@@ -1,3 +1,5 @@
+$NetBSD: patch-ab,v 1.3 2015/12/29 04:04:31 dholland Exp $
+
 --- lib/configure.orig	2014-11-02 19:09:25.000000000 +0900
 +++ lib/configure	2014-11-26 14:15:03.000000000 +0900
 @@ -260,7 +260,7 @@