Index: head/sysutils/xen-guest-tools/Makefile
===================================================================
--- head/sysutils/xen-guest-tools/Makefile	(revision 416272)
+++ head/sysutils/xen-guest-tools/Makefile	(revision 416273)
@@ -1,66 +1,65 @@
 # Created by: Evan Sarmiento <esarmiento@wayfair.com>
 # $FreeBSD$
 
 PORTNAME=	xen-guest-tools
-PORTVERSION=	4.2.2
-PORTREVISION=	1
+PORTVERSION=	4.6.1
 CATEGORIES=	sysutils
+MASTER_SITES=	http://bits.xensource.com/oss-xen/release/${PORTVERSION}/
 DISTNAME=	xen-${PORTVERSION}
 
 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
-
 BUILD_DEPENDS=	${LOCALBASE}/bin/bash:shells/bash \
 		${LOCALBASE}/lib/libglib-2.0.so:devel/glib20 \
+		${LOCALBASE}/lib/libargp.so:devel/argp-standalone \
 		${LOCALBASE}/lib/libyajl.so:devel/yajl
 
+ONLY_FOR_ARCHS=		amd64 i386 ia64
+ONLY_FOR_ARCHS_REASON=	"not yet ported to anything other than amd64, i386, or ia64"
+CONFLICTS=	xen-tools-[0-9]*
+
 USES=		gmake python:2.7: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"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-I${LOCALBASE}/lib
 USE_LDCONFIG=	yes
-
-CONFLICTS=	xen-tools-[0-9]*
-
-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
 
 post-patch:
 	${REINPLACE_CMD} -e 's;86|x86_64;86no|x86_64no;' \
 		${WRKSRC}/tools/configure
 
 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-guest-tools/distinfo
===================================================================
--- head/sysutils/xen-guest-tools/distinfo	(revision 416272)
+++ head/sysutils/xen-guest-tools/distinfo	(revision 416273)
@@ -1,2 +1,2 @@
-SHA256 (xen-4.2.2.tar.gz) = c9bfe91a5e72f8545acebad9889d64368020359bfe18044c0e683133e55ae005
-SIZE (xen-4.2.2.tar.gz) = 15602746
+SHA256 (xen-4.6.1.tar.gz) = 44cc2fccba1e147ef4c8da0584ce0f24189c8743de0e3e9a9226da88ddb5f589
+SIZE (xen-4.6.1.tar.gz) = 19693042
Index: head/sysutils/xen-guest-tools/files/patch-config_StdGNU.mk
===================================================================
--- head/sysutils/xen-guest-tools/files/patch-config_StdGNU.mk	(revision 416272)
+++ head/sysutils/xen-guest-tools/files/patch-config_StdGNU.mk	(revision 416273)
@@ -1,15 +1,16 @@
 --- 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 @@
+@@ -1,11 +1,11 @@
  AS         = $(CROSS_COMPILE)as
  LD         = $(CROSS_COMPILE)ld
  ifeq ($(clang),y)
 -CC         = $(CROSS_COMPILE)clang
 +CC         ?= $(CROSS_COMPILE)clang
+ CXX        = $(CROSS_COMPILE)clang++
  LD_LTO     = $(CROSS_COMPILE)llvm-ld
  else
 -CC         = $(CROSS_COMPILE)gcc
 +CC         ?= $(CROSS_COMPILE)gcc
+ CXX        = $(CROSS_COMPILE)g++
  LD_LTO     = $(CROSS_COMPILE)ld
  endif
- CPP        = $(CC) -E