Index: head/sysutils/xen-tools/Makefile
===================================================================
--- head/sysutils/xen-tools/Makefile	(revision 378153)
+++ head/sysutils/xen-tools/Makefile	(revision 378154)
@@ -1,52 +1,60 @@
 # Created by: Evan Sarmiento <esarmiento@wayfair.com>
 # $FreeBSD$
 
 PORTNAME=	xen-tools
-PORTVERSION=	4.1.3
-PORTREVISION=	3
+PORTVERSION=	4.2.2
+PORTREVISION=	0
 CATEGORIES=	sysutils
 DISTNAME=	xen-${PORTVERSION}
 
-MAINTAINER=	feld@FreeBSD.org
+MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Xen tools within FreeBSD domU
 
 MASTER_SITES=	http://bits.xensource.com/oss-xen/release/${PORTVERSION}/
 DISTFILES=	xen-${PORTVERSION}.tar.gz
 
-USES=		gmake python
-MAKE_ENV+=	PYTHON=${PYTHON_CMD}
+BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash \
+		lib/libglib-2.0.so:${PORTSDIR}/devel/glib20 \
+		lib/ibyajl.so:${PORTSDIR}/devel/yajl
+
+USES=		gmake python:configure perl5 gettext-runtime:build gettext-tools:build pkgconfig
+USE_PERL5=	build
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV+=	PYTHON=${PYTHON_CMD} PYTHON_PATH=${PYTHON_CMD}
+CONFIGURE_ENV+=	APPEND_LIB="${LOCALBASE}/lib"
+USE_LDCONFIG=	yes
 
 ONLY_FOR_ARCHS=		amd64 i386 ia64
 ONLY_FOR_ARCHS_REASON=	"not yet ported to anything other than amd64, i386, or ia64"
 
 PLIST_FILES=	lib/libxenstore.so.3.0 \
 		bin/xen-detect \
 		bin/xenstore \
 		bin/xenstore-control \
 		bin/xenstore-chmod \
 		bin/xenstore-exists \
 		bin/xenstore-list \
 		bin/xenstore-ls \
 		bin/xenstore-read \
 		bin/xenstore-rm \
 		bin/xenstore-write
 
 do-build:
 	cd ${WRKSRC}/tools && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} -C include
 	cd ${WRKSRC}/tools/misc && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} xen-detect
 	cd ${WRKSRC}/tools/xenstore && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} clients
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/tools/misc/xen-detect ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/tools/xenstore/xenstore ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/tools/xenstore/xenstore-control ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/tools/xenstore/libxenstore.so.3.0 ${STAGEDIR}${PREFIX}/lib
 	${LN} -sf ${PREFIX}/bin/xenstore ${STAGEDIR}${PREFIX}/bin/xenstore-chmod
 	${LN} -sf ${PREFIX}/bin/xenstore ${STAGEDIR}${PREFIX}/bin/xenstore-exists
 	${LN} -sf ${PREFIX}/bin/xenstore ${STAGEDIR}${PREFIX}/bin/xenstore-list
 	${LN} -sf ${PREFIX}/bin/xenstore ${STAGEDIR}${PREFIX}/bin/xenstore-ls
 	${LN} -sf ${PREFIX}/bin/xenstore ${STAGEDIR}${PREFIX}/bin/xenstore-read
 	${LN} -sf ${PREFIX}/bin/xenstore ${STAGEDIR}${PREFIX}/bin/xenstore-rm
 	${LN} -sf ${PREFIX}/bin/xenstore ${STAGEDIR}${PREFIX}/bin/xenstore-write
 
 .include <bsd.port.mk>
Index: head/sysutils/xen-tools/distinfo
===================================================================
--- head/sysutils/xen-tools/distinfo	(revision 378153)
+++ head/sysutils/xen-tools/distinfo	(revision 378154)
@@ -1,2 +1,2 @@
-SHA256 (xen-4.1.3.tar.gz) = 178ef186aca2490126aef69ceb41fc509baf89e0d582768cfa33b17fd145c0e4
-SIZE (xen-4.1.3.tar.gz) = 10382132
+SHA256 (xen-4.2.2.tar.gz) = c9bfe91a5e72f8545acebad9889d64368020359bfe18044c0e683133e55ae005
+SIZE (xen-4.2.2.tar.gz) = 15602746
Index: head/sysutils/xen-tools/files/patch-config_StdGNU.mk
===================================================================
--- head/sysutils/xen-tools/files/patch-config_StdGNU.mk	(revision 378153)
+++ head/sysutils/xen-tools/files/patch-config_StdGNU.mk	(revision 378154)
@@ -1,10 +1,15 @@
---- config/StdGNU.mk.orig	2013-10-30 14:56:35.070570838 -0500
-+++ config/StdGNU.mk	2013-10-30 14:56:42.021581306 -0500
-@@ -1,6 +1,6 @@
+--- config/StdGNU.mk.orig	2013-04-23 18:42:55.000000000 +0200
++++ config/StdGNU.mk	2015-01-30 09:12:53.000000000 +0100
+@@ -1,10 +1,10 @@
  AS         = $(CROSS_COMPILE)as
  LD         = $(CROSS_COMPILE)ld
+ ifeq ($(clang),y)
+-CC         = $(CROSS_COMPILE)clang
++CC         ?= $(CROSS_COMPILE)clang
+ LD_LTO     = $(CROSS_COMPILE)llvm-ld
+ else
 -CC         = $(CROSS_COMPILE)gcc
 +CC         ?= $(CROSS_COMPILE)gcc
+ LD_LTO     = $(CROSS_COMPILE)ld
+ endif
  CPP        = $(CC) -E
- AR         = $(CROSS_COMPILE)ar
- RANLIB     = $(CROSS_COMPILE)ranlib