Index: head/multimedia/libva/Makefile
===================================================================
--- head/multimedia/libva/Makefile	(revision 456672)
+++ head/multimedia/libva/Makefile	(revision 456673)
@@ -1,55 +1,55 @@
 # $FreeBSD$
 
 PORTNAME=	libva
 PORTVERSION=	2.0.0
+PORTREVISION=	1
 CATEGORIES=	multimedia
 
 MAINTAINER=	madpilot@FreeBSD.org
 COMMENT=	VAAPI wrapper and dummy driver
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
 RUN_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
 LIB_DEPENDS=	libdrm.so:graphics/libdrm
 
 USES=		autoreconf gmake libtool localbase pkgconfig tar:bzip2
 USE_XORG=	glproto pciaccess x11 xext xfixes
 USE_GL=		gl
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--program-prefix=va
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	01org
 
 LDFLAGS+=	-lpthread
 # prevent types conflict: videodev2.h vs. drm.h
 CFLAGS+=	-DHAVE_LINUX_INTEGER_TYPES
 
 OPTIONS_DEFINE=	DEBUG WAYLAND
 WAYLAND_DESC=	Support wayland protocol
 OPTIONS_SUB=	yes
 
 DEBUG_CFLAGS=		-D_DEBUG
 DEBUG_CFLAGS_OFF=	-DNDEBUG
 
 WAYLAND_CONFIGURE_ENABLE=	wayland
 WAYLAND_LIB_DEPENDS=	libwayland-client.so:graphics/wayland
 WAYLAND_BUILD_DEPENDS=	gsed:textproc/gsed
 
 post-patch:	.SILENT
-	${REINPLACE_CMD} -e 's|\($$libdir\)/dri|\1/va|' \
-		-e 's|$${libdir}/\(pkgconfig\)|${PREFIX}/libdata/\1|' \
+	${REINPLACE_CMD} -e 's|$${libdir}/\(pkgconfig\)|${PREFIX}/libdata/\1|' \
 		${WRKSRC}/configure.ac
 	${REINPLACE_CMD} '/^export VA_HEADER_/d' \
 		${WRKSRC}/doc/Makefile.am
 	${REINPLACE_CMD} 's/-ldl//' ${WRKSRC}/va/Makefile.am
 
 post-configure-WAYLAND-on: .SILENT
 	${REINPLACE_CMD} -e 's|\(SED = \).*|\1${LOCALBASE}/bin/gsed|' \
 		${WRKSRC}/va/wayland/Makefile
 
 .include <bsd.port.mk>
Index: head/multimedia/libva-intel-driver/Makefile
===================================================================
--- head/multimedia/libva-intel-driver/Makefile	(revision 456672)
+++ head/multimedia/libva-intel-driver/Makefile	(revision 456673)
@@ -1,41 +1,42 @@
 # Created by: Manuel Creach <manuel.creach@me.com>
 # $FreeBSD$
 
 PORTNAME=	libva-intel-driver
 PORTVERSION=	2.0.0
+PORTREVISION=	1
 CATEGORIES=	multimedia
 
 MAINTAINER=	madpilot@FreeBSD.org
 COMMENT=	VAAPI intel driver
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libva.so:multimedia/libva
 BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
 
 GNU_CONFIGURE=	yes
 USES=		alias autoreconf compiler:c11 gmake libtool localbase \
 		pkgconfig tar:bzip2
 USE_GL=		gl
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	01org
 GH_PROJECT=	intel-vaapi-driver
 
-PLIST_FILES=	lib/va/i915_drv_video.so lib/va/i965_drv_video.so
+PLIST_FILES=	lib/dri/i915_drv_video.so lib/dri/i965_drv_video.so
 
 ONLY_FOR_ARCHS=	amd64 i386
 ONLY_FOR_ARCHS_REASON=	Driver for hardware present only on intel i386 and amd64 CPUs
 
 post-patch:	.SILENT
 	${REINPLACE_CMD} -e 's/-ldl//' \
 		${WRKSRC}/src/Makefile.am
 	${REINPLACE_CMD} -e 's|driverdir|& --define-variable prefix=${PREFIX}|' \
 		${WRKSRC}/configure.ac
 
 post-install:
-	${LN} -sf i965_drv_video.so ${STAGEDIR}${PREFIX}/lib/va/i915_drv_video.so
+	${LN} -sf i965_drv_video.so ${STAGEDIR}${PREFIX}/lib/dri/i915_drv_video.so
 
 .include <bsd.port.mk>
Index: head/multimedia/libva-vdpau-driver/Makefile
===================================================================
--- head/multimedia/libva-vdpau-driver/Makefile	(revision 456672)
+++ head/multimedia/libva-vdpau-driver/Makefile	(revision 456673)
@@ -1,38 +1,38 @@
 # $FreeBSD$
 
 PORTNAME=	libva-vdpau-driver
 PORTVERSION=	0.7.4
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.freedesktop.org/software/vaapi/releases/${PORTNAME}/
 
 MAINTAINER=	madpilot@FreeBSD.org
 COMMENT=	VDPAU-based backend for VAAPI
 
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
 LIB_DEPENDS=	libvdpau.so:multimedia/libvdpau
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/libva.pc:multimedia/libva \
 		${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
 
 LICENSE_FILE_GPLv2=	${WRKSRC}/COPYING
 USES=		libtool gmake localbase pkgconfig tar:bzip2
 USE_GL=		gl
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 
-PLIST_FILES=	lib/va/nvidia_drv_video.so lib/va/s3g_drv_video.so lib/va/vdpau_drv_video.so
+PLIST_FILES=	lib/dri/nvidia_drv_video.so lib/dri/s3g_drv_video.so lib/dri/vdpau_drv_video.so
 
 OPTIONS_DEFINE=	DEBUG
 
 DEBUG_CONFIGURE_ENABLE=	debug
 
 post-patch:	.SILENT
 	${REINPLACE_CMD} -e '/LIBS/{ s/-ldl//; s/-lrt//; }' \
 		-e 's|driverdir|& --define-variable prefix=${PREFIX}|' \
 		-e '/\^vdpau_version/s|$$CC -E|& ${CPPFLAGS}|' \
 		 ${WRKSRC}/configure
 
 .include <bsd.port.mk>