Index: head/multimedia/qt5-multimedia/Makefile
===================================================================
--- head/multimedia/qt5-multimedia/Makefile	(revision 458337)
+++ head/multimedia/qt5-multimedia/Makefile	(revision 458338)
@@ -1,55 +1,51 @@
 # $FreeBSD$
 
 PORTNAME=	multimedia
 DISTVERSION=	${QT5_VERSION}
+PORTREVISION=	1
 CATEGORIES=	multimedia
 PKGNAMEPREFIX=	qt5-
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt audio, video, radio and camera support module
 
 # LICENSE set via USES_QT5 (bsd.qt.mk)
 
 USES=		pkgconfig qmake:norecursive
 USE_GL=		gl
 USE_GNOME=	glib20
 USE_QT5=	core gui network opengl qml quick widgets \
 		buildtools_build
 QT_DIST=	${PORTNAME}
 USE_XORG=	x11 xext xv
 USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}
 
-QT_DEFINES=	XVIDEO
 QT_CONFIG=	xlib
 
 OPTIONS_DEFINE=			GSTREAMER OPENAL
 OPTIONS_DEFAULT=		ALSA GSTREAMER
 OPTIONS_RADIO=			AUDIOPLUGIN
 OPTIONS_RADIO_AUDIOPLUGIN=	ALSA PULSEAUDIO
 OPTIONS_SUB=			yes
 
 AUDIOPLUGIN_DESC=	Audio plugins to build
 OPENAL_DESC=		3D positional spatialized sound support
 
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
-ALSA_VARS=		QT_CONFIG+=alsa QT DEFINES+=ALSA
-ALSA_VARS_OFF=		QT_CONFIG+=-alsa QT_DEFINES+=-ALSA TBR_DEPENDS+=alsa
+ALSA_VARS=		QT_CONFIG+=alsa
+ALSA_VARS_OFF=		QT_CONFIG+=-alsa \
+			QMAKE_CONFIGURE_ARGS+=-no-alsa
 GSTREAMER_BUILD_DEPENDS=${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
-GSTREAMER_EXTRA_PATCHES_OFF=	${FILESDIR}/extrapatch-no-gstreamer
 GSTREAMER_USE=		GSTREAMER1=bad
-GSTREAMER_VARS=		QT_CONFIG+=gstreamer-1.0 QT_DEFINES+=GSTREAMER
-GSTREAMER_VARS_OFF=	QT_CONFIG+=-gstreamer-1.0 QT_DEFINES+=-GSTREAMER \
-			TBR_DEPENDS+=gstreamer
+GSTREAMER_VARS=		QT_CONFIG+=gstreamer-1.0 \
+			QMAKE_CONFIGURE_ARGS+=-gstreamer 1.0
+GSTREAMER_VARS_OFF=	QT_CONFIG+=-gstreamer-1.0 \
+			QMAKE_CONFIGURE_ARGS+=-no-gstreamer
 OPENAL_USES=		openal
-OPENAL_VARS_OFF=	TBR_DEPENDS+=openal
+OPENAL_VARS_OFF=	QMAKE_CONFIGURE_ARGS+=-no-openal
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
-PULSEAUDIO_VARS=	QT_CONFIG+=pulseaudio QT_DEFINES+=PULSEAUDIO
-PULSEAUDIO_VARS_OFF=	QT_CONFIG+=-pulseaudio QT_DEFINES+=-PULSEAUDIO \
-			TBR_DEPENDS+=pulseaudio
-
-post-patch:
-.for d in ${TBR_DEPENDS}
-	@${REINPLACE_CMD} -e '/${d}/ d' ${WRKSRC}/qtmultimedia.pro
-.endfor
+PULSEAUDIO_VARS=	QT_CONFIG+=pulseaudio
+PULSEAUDIO_VARS_OFF=	QT_CONFIG+=-pulseaudio \
+			QMAKE_CONFIGURE_ARGS+=-no-pulseaudio
 
 .include <bsd.port.mk>
Index: head/multimedia/qt5-multimedia/files/extrapatch-no-gstreamer
===================================================================
--- head/multimedia/qt5-multimedia/files/extrapatch-no-gstreamer	(revision 458337)
+++ head/multimedia/qt5-multimedia/files/extrapatch-no-gstreamer	(nonexistent)
@@ -1,24 +0,0 @@
---- qtmultimedia.pro.orig	2015-12-25 21:09:16 UTC
-+++ qtmultimedia.pro
-@@ -18,21 +18,6 @@ win32 {
-     contains(QT_CONFIG, alsa):qtCompileTest(alsa)
-     contains(QT_CONFIG, pulseaudio):qtCompileTest(pulseaudio)
- 
--    isEmpty(GST_VERSION) {
--        contains(QT_CONFIG, gstreamer-0.10) {
--            GST_VERSION = 0.10
--        } else: contains(QT_CONFIG, gstreamer-1.0) {
--            GST_VERSION = 1.0
--        }
--    }
--    cache(GST_VERSION, set)
--    !isEmpty(GST_VERSION):qtCompileTest(gstreamer) {
--        qtCompileTest(gstreamer_photography)
--        qtCompileTest(gstreamer_encodingprofiles)
--        qtCompileTest(gstreamer_appsrc)
--        qtCompileTest(linux_v4l)
--    }
--
-     qtCompileTest(resourcepolicy)
-     qtCompileTest(gpu_vivante)
- }

Property changes on: head/multimedia/qt5-multimedia/files/extrapatch-no-gstreamer
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/multimedia/qt5-multimedia/files/patch-src_multimedia_configure.json
===================================================================
--- head/multimedia/qt5-multimedia/files/patch-src_multimedia_configure.json	(nonexistent)
+++ head/multimedia/qt5-multimedia/files/patch-src_multimedia_configure.json	(revision 458338)
@@ -0,0 +1,11 @@
+Make it possible to disable OpenAL support via a command-line option.
+--- src/multimedia/configure.json
++++ src/multimedia/configure.json
+@@ -9,6 +9,7 @@
+         "options": {
+             "alsa": "boolean",
+             "gstreamer": { "type": "optionalString", "values": [ "no", "yes", "0.10", "1.0" ] },
++            "openal": "boolean",
+             "pulseaudio": "boolean",
+             "mediaplayer-backend": { "type": "string", "values": [ "directshow", "wmf" ] },
+             "wmf-backend": { "type": "void", "name": "mediaplayer-backend", "value": "wmf" }

Property changes on: head/multimedia/qt5-multimedia/files/patch-src_multimedia_configure.json
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property