Import of pkgsrc-2016Q3

sysutils/xentools33/Makefile

@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.47 2015/08/18 07:31:18 wiz Exp $
+# $NetBSD: Makefile,v 1.52 2016/07/09 13:04:08 wiz Exp $
 
 VERSION=	3.3.2
 DISTNAME=	xen-${VERSION}
 PKGNAME=	xentools33-${VERSION}
-PKGREVISION=	19
+PKGREVISION=	21
 CATEGORIES=	sysutils
 MASTER_SITES=	http://bits.xensource.com/oss-xen/release/${VERSION}/
 
@@ -20,7 +20,7 @@ DEPENDS+=	${PYPKGPREFIX}-curses>=0nb4:../../devel/py-curses
 BUILD_DEPENDS+= dev86-[0-9]*:../../devel/dev86 # needed to build firmware
 
 PKG_SYSCONFSUBDIR=	xen
-PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # py-xml
+PYTHON_VERSIONS_INCOMPATIBLE=	34 35 # py-xml
 
 ONLY_FOR_PLATFORM=	Linux-2.6*-i386 Linux-2.6*-x86_64
 ONLY_FOR_PLATFORM+=	NetBSD-[5-9].*-x86_64 NetBSD-[5-9].*-i386
@@ -115,17 +115,14 @@ SUBST_SED.prefix=	-e "s,@PREFIX@,${PREFIX},g"
 
 REPLACE_PYTHON+=	misc/xsview
 
-.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_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}
@@ -154,6 +151,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/xentools33/distinfo

@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.30 2013/07/19 12:57:51 joerg Exp $
+$NetBSD: distinfo,v 1.32 2016/05/18 21:24:44 joerg Exp $
 
 SHA1 (xen-3.3.2.tar.gz) = 7f438e73ac81b25cf5e1570709e87001066bafe4
 RMD160 (xen-3.3.2.tar.gz) = 28faa56286f2a418e35dcba6079570ea871d6c7b
+SHA512 (xen-3.3.2.tar.gz) = e080dd9599a6bdd91be924c87316ac1ed825040d258c07ebf6035d84f909b5f81b7b0e4383b358b561a5aba6bff6940d2e8013f6e2ca503f428bdf377820911c
 Size (xen-3.3.2.tar.gz) = 11357576 bytes
 SHA1 (patch-.._xen_patch-common_libelf_libelf-private.h) = b115b0118f932b15c653c131c0c9c9885e2480ff
 SHA1 (patch-CVE-2011-1583) = c9f59d9fbb20f0cb76733a4c2d136a67253cae0a
@@ -57,6 +58,7 @@ SHA1 (patch-fd) = 619b865b2f17814e6e62ebab21de9183474dd075
 SHA1 (patch-fe) = 85d42672766fe8ce2dc7f745938722710c6ee5a3
 SHA1 (patch-ff) = 6ff97fa4f34f29c276e4aaab4b4db9ccf7b09957
 SHA1 (patch-fg) = 913295d341c1dd5bf4d1ef78f27520920f138d4c
+SHA1 (patch-fs-back_Makefile) = ef6908d5f9fa33817f1b029a75badb6fe49ad653
 SHA1 (patch-io_ring_h) = 83b01462d5d2b48b4f97b3d9a7980aa3300ad0b3
 SHA1 (patch-ioemu_block-vvfat.c) = 4e6d998fe2c006bb68caaf8e1d11e641319ff5c2
 SHA1 (patch-libfsimage_ufs_ufs.h) = dc59f33cf3abd08a8cdee5977ca4168613327513

sysutils/xentools33/patches/patch-fs-back_Makefile

@@ -0,0 +1,13 @@
+$NetBSD: patch-fs-back_Makefile,v 1.1 2016/05/18 21:24:44 joerg Exp $
+
+--- fs-back/Makefile.orig	2016-05-18 11:39:28.000000000 +0000
++++ fs-back/Makefile
+@@ -13,7 +13,7 @@ CFLAGS   += $(CFLAGS_libxenstore)
+ CFLAGS   += $(INCLUDES) -I.
+ CFLAGS   += -D_GNU_SOURCE
+ 
+-LIBS      := -L. -L.. -L../lib
++LIBS      := -L. -L.. -L../lib ${COMPILER_RPATH_FLAG}$(LIBDIR)
+ LIBS      += $(LDFLAGS_libxenctrl)
+ LIBS      += $(LDFLAGS_libxenstore)
+ LIBS      += -lpthread -lrt