Index: head/devel/libvirt/Makefile
===================================================================
--- head/devel/libvirt/Makefile	(revision 463186)
+++ head/devel/libvirt/Makefile	(revision 463187)
@@ -1,187 +1,185 @@
 # Created by: Jason Helfman <jgh@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	libvirt
 PORTVERSION=	4.0.0
 CATEGORIES=	devel
 MASTER_SITES=	http://libvirt.org/sources/ \
 		ftp://libvirt.org/libvirt/
 
 MAINTAINER=	novel@FreeBSD.org
 COMMENT=	Toolkit to interact with virtualization capabilities
 
 LICENSE=	LGPL3
 
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libgcrypt.so:security/libgcrypt \
 		libxml2.so:textproc/libxml2
 BUILD_DEPENDS=	dnsmasq:dns/dnsmasq \
 		xsltproc:textproc/libxslt
 RUN_DEPENDS=	dnsmasq:dns/dnsmasq
 
 OPTIONS_DEFINE=	DOCS GNUTLS NLS NSS QEMU READLINE SASL LIBSSH LIBSSH2 ZFS
 OPTIONS_DEFAULT=	GNUTLS READLINE LIBSSH LIBSSH2 ZFS
 OPTIONS_DEFINE_amd64=	XEN
 .if exists(/usr/sbin/bhyve)
 OPTIONS_DEFINE_amd64+=	BHYVE
 OPTIONS_DEFAULT_amd64+=	BHYVE
 .else
 PLIST_SUB+=		BHYVE="@comment "
 SUB_LIST+=		BHYVE="@comment "
 CONFIGURE_ARGS+=	--without-bhyve
 .endif
 QEMU_DESC=	QEMU driver
 BHYVE_DESC=	bhyve driver
 XEN_DESC=	Xen support via libxl
 NSS_DESC=	Name Service Switch plugin
 LIBSSH_DESC=	libssh remote transport
 LIBSSH2_DESC=	libssh2 remote transport
 ZFS_DESC=	ZFS storage driver
 
 OPTIONS_SUB=	yes
 
 BHYVE_CONFIGURE_WITH=	bhyve
 
 QEMU_CONFIGURE_WITH=	qemu
 QEMU_RUN_DEPENDS=	dmidecode:sysutils/dmidecode \
 			qemu-io:emulators/qemu
 
 GNUTLS_CONFIGURE_ON=	--with-gnutls=${LOCALBASE}
 GNUTLS_CONFIGURE_OFF=	--without-gnutls
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 
 NLS_USES=	gettext
 NLS_CONFIGURE_ENABLE=	nls
 NLS_CONFIGURE_ON=	--with-libintl-prefix=${LOCALBASE}
 
 NSS_CONFIGURE_WITH=	nss-plugin
 
 READLINE_CONFIGURE_WITH=	readline
 READLINE_USES=		readline
 
 SASL_CONFIGURE_WITH=	sasl=${LOCALBASE}
 SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
 
 XEN_CONFIGURE_WITH=	libxl
 XEN_CFLAGS=	-I${LOCALBASE}/include
 XEN_LIB_DEPENDS=	libxenlight.so:sysutils/xen-tools
 
 LIBSSH_CONFIGURE_WITH=	libssh
 LIBSSH_LIB_DEPENDS=	libssh.so:security/libssh
 
 LIBSSH2_CONFIGURE_WITH=	ssh2
 LIBSSH2_LIB_DEPENDS=	libssh2.so:security/libssh2
 
 ZFS_CONFIGURE_WITH=	storage-zfs
 
 VARDIR=		/var
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--without-avahi \
 		--without-dbus \
 		--without-polkit \
 		--without-hal \
 		--without-udev \
 		--without-netcf \
 		--without-sysctl \
 		--without-xen \
 		--without-login-shell \
 		--without-wireshark-dissector \
 		--localstatedir=${VARDIR}
 
 # random_data fix can be removed when 8.x is eol
 CONFIGURE_ENV=	ac_cv_type_struct_random_data=""
 
 # limit production release x.x.x
 PORTSCOUT=	limit:\d+\.\d+\.\d+$$
 
 LDFLAGS+=	-L${LOCALBASE}/lib -fstack-protector
 
 USES=		charsetfix cpe gettext-runtime gmake libtool pathfix \
 		perl5 python:2.7,build pkgconfig shebangfix tar:xz
 USE_RC_SUBR=	libvirtd virtlogd
 CPE_VENDOR=	redhat
 USE_PERL5=	build
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
+TEST_TARGET=	check
 SHLIB_VER=	0.4000.0
 PLIST_SUB+=	PORTVERSION="-${PORTVERSION}" \
 		SHLIB_VER=${SHLIB_VER}
 PORTDOCS=	*
 SHEBANG_FILES=	src/keycodemapdb/tools/keymap-gen
 
 SUB_FILES=	pkg-message
 SUB_LIST+=	PORTVERSION="-${PORTVERSION}"
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MQEMU} || ${PORT_OPTIONS:MNSS}
 LIB_DEPENDS+=		libyajl.so:devel/yajl
 CONFIGURE_ARGS+=	--with-yajl=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=	--without-yajl
 .endif
 
 .if !${PLIST_SUB:MXEN}
 PLIST_SUB+=	XEN="@comment "
 .endif
 
 CONF_FILES=	\
 		bhyve.conf \
 		libvirt-admin.conf \
 		libvirt.conf \
 		libvirtd.conf \
 		libxl.conf \
 		qemu.conf \
 		virtlockd.conf \
 		virtlogd.conf
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|$$(LN_S) ../default.xml default.xml|true|' \
 			  -e 's|$$(DESTDIR)$$(confdir)/qemu/networks|${STAGEDIR}${EXAMPLESDIR}/networks|' \
 			  ${WRKSRC}/src/Makefile.in
 
 	@${REINPLACE_CMD} -e 's|cp $$(DESTDIR)|cp -f $$(DESTDIR)|' \
 		${WRKSRC}/src/Makefile.in
 
 post-install:
 	@${RMDIR} ${STAGEDIR}${EXAMPLESDIR}/networks/autostart
 	@${MKDIR} ${STAGEDIR}${ETCDIR}/qemu/networks/autostart
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for doc in AUTHORS ChangeLog INSTALL NEWS README
 	${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .for dir in run/libvirt/network \
 	run/libvirt/qemu \
 	run/libvirt/lockd \
 	log/libvirt/uml \
 	log/libvirt/qemu \
 	log/libvirt/lxc \
 	lib/libvirt/boot \
 	lib/libvirt/lockd/files \
 	lib/libvirt/images \
 	lib/libvirt/dnsmasq \
 	lib/libvirt/filesystems \
 	lib/libvirt/network \
 	lib/libvirt/qemu/channel/target \
 	cache/libvirt/qemu
 	@${MKDIR} "${STAGEDIR}/${VARDIR}/${dir}"
 .endfor
 
 .for file in ${CONF_FILES}
 	@if test -f ${STAGEDIR}${ETCDIR}/${file}; then \
 		${MV} ${STAGEDIR}${ETCDIR}/${file} \
 		${STAGEDIR}${ETCDIR}/${file}.sample; fi
 .endfor
-
-regression-test: build
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == amd64 || ${ARCH} == i386
 RUN_DEPENDS+=	dmidecode:sysutils/dmidecode
 .endif
 
 .include <bsd.port.post.mk>