Import of pkgsrc-2016Q3

sysutils/xentools3/Makefile

@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.44 2015/08/18 07:31:18 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2016/07/09 13:04:08 wiz Exp $
 
 VERSION=	3.1.4
 DISTNAME=	xen-${VERSION}
 PKGNAME=	xentools3-${VERSION}
-PKGREVISION=	20
+PKGREVISION=	21
 CATEGORIES=	sysutils
 MASTER_SITES=	http://bits.xensource.com/oss-xen/release/${VERSION}/
 
@@ -15,7 +15,7 @@ COMMENT=	Userland Tools for Xen
 DEPENDS+=	${PYPKGPREFIX}-readline-[0-9]*:../../devel/py-readline
 DEPENDS+=	${PYPKGPREFIX}-curses>=0nb4:../../devel/py-curses
 
-PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # py-xml
+PYTHON_VERSIONS_INCOMPATIBLE=	34 35 # py-xml
 
 MAKE_JOBS_SAFE=	no
 
@@ -110,18 +110,15 @@ SUBST_FILES.prefix+=	python/xen/xend/osdep.py
 SUBST_FILES.prefix+=	misc/xen-python-path
 SUBST_SED.prefix=	-e "s,@PREFIX@,${PREFIX},g"
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "NetBSD"
-SUBST_CLASSES+=		proc
+SUBST_CLASSES.NetBSD+=	proc
 SUBST_STAGE.proc=	pre-configure
 SUBST_FILES.proc=	python/xen/xend/XendVnet.py
 SUBST_FILES.proc+=	xenstore/xs_lib.c
 SUBST_SED.proc=		-e "s|/proc|/kern|g"
-PROCPATH=		/kern
-.else
-PROCPATH=		/proc
-.endif
+
+OPSYSVARS+=		PROCPATH
+PROCPATH.NetBSD=	/kern
+PROCPATH.*=		/proc
 
 RCD_SCRIPTS=		xend xenbackendd xendomains
 FILES_SUBST+=		RCD_INTERPRETER=${PYTHONBIN:Q}
@@ -146,6 +143,8 @@ EXTRA_CFLAGS+=	-Wno-error=ignored-attributes -no-integrated-as \
 		-Wno-error=tautological-compare -Wno-error=null-dereference \
 		-Wno-error=self-assign -Wno-error=sometimes-uninitialized \
 		-Wno-error=unused-function
+.elif !empty(PKGSRC_COMPILER:Mgcc)
+EXTRA_CFLAGS+=	-Wno-error=unused-but-set-variable
 .endif
 
 MAKE_ENV+=	EXTRA_HOSTCFLAGS=${EXTRA_HOSTCFLAGS:Q} EXTRA_CFLAGS=${EXTRA_CFLAGS:Q}

sysutils/xentools3/distinfo

@@ -1,14 +1,15 @@
-$NetBSD: distinfo,v 1.17 2013/07/17 09:39:18 joerg Exp $
+$NetBSD: distinfo,v 1.19 2015/12/29 04:04:32 dholland Exp $
 
 SHA1 (xen-3.1.4.tar.gz) = 0d784662776239195df10b3f29d40350f9d0644d
 RMD160 (xen-3.1.4.tar.gz) = c02ad2bd64e6306b127a4f37a8aa370dadc11859
+SHA512 (xen-3.1.4.tar.gz) = 25f797c1c47a807573b4d2d0a12b5b15185d1b1e463e5db46d4bc3843bde7d913ac66440d084dfd12d3968dfbe88738fe84c28047c31c12551530bb157788b1d
 Size (xen-3.1.4.tar.gz) = 6894493 bytes
 SHA1 (patch-.._patch-Config.mk) = 5ce1a561c8e358ceff4187b7109702c85fa29af8
 SHA1 (patch-.._xen_patch-common_libelf_libelf-private.h) = b115b0118f932b15c653c131c0c9c9885e2480ff
 SHA1 (patch-aa) = dca8b8de73b9bdbb17f8245224575eb881cdf00d
 SHA1 (patch-ab) = dcafc8b6c4cd1e4dfc6f4ec806fd8076b3104b86
 SHA1 (patch-ac) = d6d895e0361194cd84da13c42e17e17efecae7dd
-SHA1 (patch-ad) = 1d43550d5475538563129489e05b349337e77981
+SHA1 (patch-ad) = 0a950e4aeebb30f691d739cda2d99e1fa8fb7edb
 SHA1 (patch-al) = 87f2af4784a8c2266d40788fd572e282f100c7b0
 SHA1 (patch-as) = 040208cc9bf1d7fecc120b5b140b8bc72f2f84cf
 SHA1 (patch-au) = b2357fdaff2895a5e4da4371d72ccc3041c78a83

sysutils/xentools3/patches/patch-ad

@@ -1,3 +1,5 @@
+$NetBSD: patch-ad,v 1.3 2015/12/29 04:04:32 dholland Exp $
+
 --- libxc/xc_private.c.orig	2008-04-25 15:03:12.000000000 +0200
 +++ libxc/xc_private.c	2008-09-14 23:37:40.000000000 +0200
 @@ -10,7 +10,12 @@