diff --git a/audio/mixxx/Makefile b/audio/mixxx/Makefile
index 753cf89e8bef..6c05d667cd70 100644
--- a/audio/mixxx/Makefile
+++ b/audio/mixxx/Makefile
@@ -1,97 +1,90 @@
 # Created by: Jean-Yves Lefort <jylefort@brutele.be>
 
 PORTNAME=	mixxx
 DISTVERSION=	2.3.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	DJ mixing application
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	lv2>=1.14.0:audio/lv2
 LIB_DEPENDS=	libchromaprint.so:audio/chromaprint \
 		libFLAC.so:audio/flac \
 		libfftw3.so:math/fftw3 \
 		libhidapi.so:comms/hidapi \
 		libid3tag.so:audio/libid3tag \
 		libmad.so:audio/libmad \
 		libmodplug.so:audio/libmodplug \
 		libportaudio.so:audio/portaudio \
 		libSoundTouch.so:audio/soundtouch \
 		libebur128.so:audio/libebur128 \
 		librubberband.so:audio/rubberband \
 		libsndfile.so:audio/libsndfile \
 		libogg.so:audio/libogg \
 		libvorbisfile.so:audio/libvorbis \
 		libtag.so:audio/taglib \
 		libprotobuf.so:devel/protobuf \
 		liblilv-0.so:audio/lilv \
 		libportmidi.so:audio/portmidi \
 		libupower-glib.so:sysutils/upower \
 		libkeyfinder.so:audio/libkeyfinder \
 		libmp3lame.so:audio/lame
 
 USES=		cmake compiler:c++11-lang gl iconv ninja qt:5 pkgconfig sqlite \
 		ssl xorg
 USE_XORG=	ice sm x11 xext
 USE_GL=		gl glu
 USE_GITHUB=	yes
 GH_ACCOUNT=	mixxxdj
 USE_QT=		buildtools concurrent core dbus gui linguisttools_build network \
 		opengl qmake_build  script scripttools sql sql-sqlite3 svg \
 		testlib x11extras xml xmlpatterns widgets
 
 CONFLICTS=	mixxx22*
 
 CMAKE_ARGS+=	-DINSTALL_USER_UDEV_RULES:BOOL=OFF \
 		-DOPTIMIZE:STRING=native \
 		-DBATTERY:BOOL=OFF \
 		-DFAAD:BOOL=OFF \
 		-DMODPLUG:BOOL=ON \
 		-DMAD:BOOL=ON
 
 PORTDOCS=	*
 
 OPTIONS_DEFINE=		BROADCAST DOCS FFMPEG GPERFTOOLS HID OPUS \
 			QTKEYCHAIN WAVPACK
 OPTIONS_DEFAULT=	BROADCAST FFMPEG HID OPUS QTKEYCHAIN WAVPACK
 OPTIONS_SUB=		yes
 
 BROADCAST_DESC=		Live Broadcasting (Shoutcast) support
 #BROADCAST_LIB_DEPENDS=	libshout-idjc.so:audio/shout-idjc
-BROADCAST_CMAKE_ARGS=	-DBROADCAST:BOOL=ON
-BROADCAST_CMAKE_ARGS_OFF=-DBROADCAST:BOOL=OFF
+BROADCAST_CMAKE_BOOL=	BROADCAST
 FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
-FFMPEG_CMAKE_ARGS=	-DFFMPEG:BOOL=ON
-FFMPEG_CMAKE_ARGS_OFF=	-DFFMPEG:BOOL=OFF
+FFMPEG_CMAKE_BOOL=	FFMPEG
 GPERFTOOLS_LIB_DEPENDS=	libtcmalloc.so:devel/google-perftools
-GPERFTOOLS_CMAKE_ARGS=	-DPERFTOOLS:BOOL=ON
-GPERFTOOLS_CMAKE_ARGS_OFF=	-DPERFTOOLS:BOOL=OFF
-HID_DESC=			USB HID controllers support
-HID_CMAKE_ARGS=		-DHID:BOOL=ON
-HID_CMAKE_ARGS_OFF=	-DHID:BOOL=OFF
+GPERFTOOLS_CMAKE_BOOL=	GPERFTOOLS
+HID_DESC=		USB HID controllers support
+HID_CMAKE_BOOL=		HID
 OPUS_LIB_DEPENDS=	libopus.so:audio/opus \
 			libopusfile.so:audio/opusfile
-OPUS_CMAKE_ARGS=	-DOPUS:BOOL=ON
-OPUS_CMAKE_ARGS_OFF=	-DOPUS:BOOL=OFF
+OPUS_CMAKE_BOOL=	OPUS
 QTKEYCHAIN_DESC=	Secure credentials storage for Live Broadcasting profiles
 QTKEYCHAIN_LIB_DEPENDS=	libqt5keychain.so:security/qtkeychain
-QTKEYCHAIN_CMAKE_ARGS=	-DQTKEYCHAIN:BOOL:ON
-QTKEYCHAIN_CMAKE_ARGS_OFF=-DQTKEYCHAIN:BOOL:OFF
+QTKEYCHAIN_CMAKE_BOOL=	QTKEYCHAIN
 WAVPACK_LIB_DEPENDS=	libwavpack.so:audio/wavpack
-WAVPACK_CMAKE_ARGS=	-DWAVPACK:BOOL=ON
-WAVPACK_CMAKE_ARGS_OFF=	-DWAVPACK:BOOL=OFF
+WAVPACK_CMAKE_BOOL=	WAVPACK
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|^Exec=.*|Exec=mixxx|" \
 		${WRKSRC}/res/linux/mixxx.desktop
 	@${REINPLACE_CMD} -e "s,(Q_OS_LINUX),(Q_OS_LINUX) || defined(Q_OS_FREEBSD),g" \
 		${WRKSRC}/src/util/screensaver.h
 .for i in midi/midimessage.h
 	@${ECHO_CMD} >> ${WRKSRC}/src/controllers/${i}
 .endfor
 
 .include <bsd.port.mk>