Index: multimedia/qmmp-qt5/Makefile
===================================================================
--- multimedia/qmmp-qt5/Makefile	(revision 436666)
+++ multimedia/qmmp-qt5/Makefile	(working copy)
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	qmmp
-PORTVERSION=	1.1.2
-PORTREVISION=	2
+PORTVERSION=	1.1.7
 CATEGORIES=	multimedia
 MASTER_SITES=	http://qmmp.ylsoftware.com/files/ \
 	SF/qmmp-dev/${PORTNAME}/
@@ -55,12 +54,12 @@
 OPTIONS_GROUP_PLUGIN_NETWORKING=	COVER CURL LYRICS MMS SB SCROBBLER
 
 MISC_DESC=	Other features
-OPTIONS_GROUP_MISC=	CONVERTER CUE ENCA MPLAYER1 MPLAYER2 MPRIS RGSCAN SID
+OPTIONS_GROUP_MISC=	CONVERTER CUE ENCA MPLAYER MPRIS RGSCAN SID
 
 OPTIONS_DEFAULT=	ALSA ANALYZER BS2B CDDA CONVERTER COPYPASTE COVER \
 		CROSSFADE CUE CURL DIR_ASSOC ENCA FAAD FFMPEG FILEOPS FLAC \
 		GNOMEHOTKEY GME HAL HOTKEY JACK KDENOTIFY LADSPA LYRICS MAD \
-		MMS MODPLUG MPRIS MPLAYER1 MUSEPACK NOTIFIER NULLOUT \
+		MMS MODPLUG MPRIS MPLAYER MUSEPACK NOTIFIER NULLOUT \
 		OPUS OSS4 PROJECTM PULSEAUDIO QMMP_DIALOG QSUI QTMULTIMEDIA \
 		RGSCAN SB SCROBBLER SID SKINNEDUI SNDFILE SOXR STATICON STEREO \
 		TRACKCHANGE TWOPANELDIALOG UDISKS2 VORBIS WAVPACK WILDMIDI
@@ -128,12 +127,9 @@
 ENCA_LIB_DEPENDS=	libenca.so:converters/enca
 ENCA_CMAKE_BOOL=	USE_ENCA
 
-MPLAYER1_DESC=	mplayer-1.x (multimedia/mplayer)
-MPLAYER2_DESC=	mplayer-2.x (multimedia/mplayer2)
-MPLAYER1_RUN_DEPENDS=	mplayer:multimedia/mplayer
-MPLAYER2_RUN_DEPENDS=	mplayer:multimedia/mplayer2
-MPLAYER1_PREVENTS=	MPLAYER2
-MPLAYER2_PREVENTS=	MPLAYER1
+MPLAYER_DESC=	Enable showing videos by mplayer
+MPLAYER_RUN_DEPENDS=	mplayer:multimedia/mplayer
+MPLAYER_CMAKE_BOOL=	USE_MPLAYER
 
 PROJECTM_DESC=	Support the projectM music visualiser
 PROJECTM_LIB_DEPENDS=	libprojectM.so.2:graphics/libprojectm
@@ -265,16 +261,6 @@
 TWOPANELDIALOG_DESC=	File dialog by two-panel selector
 TWOPANELDIALOG_CMAKE_BOOL=	USE_TWO_PANEL_DIALOG
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MMPLAYER1} || ${PORT_OPTIONS:MMPLAYER2}
-CMAKE_ARGS+=	-DUSE_MPLAYER:BOOL=TRUE
-PLIST_SUB+=	MPLAYER=""
-.else
-CMAKE_ARGS+=	-DUSE_MPLAYER:BOOL=FALSE
-PLIST_SUB+=	MPLAYER="@comment "
-.endif
-
 PLIST_SUB+=	SHLIB_VER=${PORTVERSION:C/-.*//}
 
 PATHFIX_CMAKELISTSTXT=	\\"CMakeLists.txt -exec grep -l /pkgconfig {} +\\"