--- audio/strawberry/Makefile	2020-05-17 22:19:40.248741000 +0200
+++ /usr/ports.svn/audio/strawberry/Makefile	2020-05-17 22:19:12.475483000 +0200
@@ -1,9 +1,10 @@
-# $FreeBSD$
+# $FreeBSD: head/audio/strawberry/Makefile 535673 2020-05-17 20:19:09Z mandree $
 
 PORTNAME=	strawberry
 DISTVERSION=	0.6.11
 CATEGORIES=	audio
-MASTER_SITES=	https://files.jkvinge.net/packages/strawberry/
+MASTER_SITES=	https://github.com/strawberrymusicplayer/${PORTNAME}/releases/download/${DISTVERSION}/ \
+		https://files.jkvinge.net/packages/strawberry/
 
 MAINTAINER=	menelkir@itroll.org
 COMMENT=	Fork of clementine with many features
@@ -12,42 +13,52 @@
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	boost-libs>0:devel/boost-libs
-
 LIB_DEPENDS=	libgnutls.so:security/gnutls \
 		libprotobuf.so:devel/protobuf \
 		libtag.so:audio/taglib
+TEST_DEPENDS=	googletest>=0:devel/googletest
 
-USES=		compiler:c++11-lang cmake desktop-file-utils gnome pkgconfig \
+USES=		compiler:c++11-lang cmake desktop-file-utils gnome \
+		gettext-runtime gettext-tools iconv pkgconfig \
 		qt:5 sqlite pkgconfig tar:xz xorg
+
 USE_GNOME=	glib20
-USE_QT=		buildtools_build concurrent core dbus gui network qmake_build \
-		sql testlib_build widgets x11extras
+USE_GSTREAMER1=	yes
+USE_QT=		buildtools_build concurrent core dbus gui network \
+		linguisttools qmake_build sql testlib_build widgets x11extras
 USE_XORG=	ice sm x11 xcb xext
 INSTALLS_ICONS=	yes
 
-CMAKE_ARGS=	-DUSE_SYSTEM_TAGLIB=ON -DENABLE_UDISKS2=OFF -DENABLE_XINE=OFF
+CMAKE_ARGS=	-DUSE_SYSTEM_TAGLIB=ON -DENABLE_UDISKS2=OFF -DENABLE_XINE=OFF \
+		-DENABLE_GSTREAMER:BOOL=true \
+		-DENABLE_TRANSLATIONS:BOOL=true
 
 TEST_TARGET=	strawberry_test
 
-OPTIONS_DEFINE=	APPLEDEV AUDIOCD IPOD MOODBAR MTPDEV MUSICBRAINZ NLS SUBSONIC \
-		TEST TIDAL
+# NLS is not optional, as of 0.6.11,
+# src/core/utilities.cpp always includes iconv.h and calls iconv_*().
+
+# GSTREAMER is not optional, as of 0.6.11, disabling it kills the build on
+# src/core/mainwindow.cpp:229:7: 
+# error: member initializer 'transcode_dialog_' does not name a non-static data member or base class
+# transcode_dialog_([=]() {
+
+OPTIONS_DEFINE=		APPLEDEV AUDIOCD IPOD MOODBAR MTPDEV MUSICBRAINZ \
+			SUBSONIC TIDAL VLC
 APPLEDEV_IMPLIES=	IPOD
-MOODBAR_IMPLIES=	GSTREAMER
-OPTIONS_DEFAULT=	GSTREAMER PULSEAUDIO
+OPTIONS_DEFAULT=	PULSEAUDIO
 
-BACKEND_DESC=	Multimedia backend(s)
+BACKEND_DESC=		Multimedia backend(s)
 
-OPTIONS_MULTI=	BACKEND SOUND
-OPTIONS_MULTI_BACKEND=	GSTREAMER VLC
+OPTIONS_MULTI=		SOUND
 OPTIONS_MULTI_SOUND=	ALSA PULSEAUDIO
 
 APPLEDEV_DESC=		Enable support for more recent Apple devices
 AUDIOCD_DESC=		Enable support for Audio CDs
 IPOD_DESC=		Enable support for iPod Classic
-MTPDEV_DESC=		Enable support for Media Transport Protocol
 MOODBAR_DESC=		Enable moodbar
+MTPDEV_DESC=		Enable support for Media Transport Protocol
 MUSICBRAINZ_DESC=	Enable tag fetching from MusicBrainz
-NLS_DESC=		Enable translations
 SUBSONIC_DESC=		Enable support for Subsonic music streamer
 TIDAL_DESC=		Enable support for TIDAL music service
 VLC_DESC=		Multimedia support via (lib)vlc
@@ -61,7 +72,7 @@
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 
 AUDIOCD_CMAKE_BOOL=	ENABLE_AUDIOCD
-ALSA_LIB_DEPENDS=	libcdio.so:sysutils/libcdio
+AUDIOCD_LIB_DEPENDS=	libcdio.so:sysutils/libcdio
 
 IPOD_CMAKE_BOOL=	ENABLE_LIBGPOD
 IPOD_LIB_DEPENDS=	libgpod.so:audio/libgpod
@@ -75,33 +86,14 @@
 MUSICBRAINZ_CMAKE_BOOL=	ENABLE_CHROMAPRINT
 MUSICBRAINZ_LIB_DEPENDS=	libchromaprint.so:audio/chromaprint
 
-PULSEAUDIO_CMAKE_BOOL=	ENABLE_PULSE
+PULSEAUDIO_CMAKE_BOOL=	ENABLE_LIBPULSE
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 
 SUBSONIC_CMAKE_BOOL=	ENABLE_SUBSONIC
 
 TIDAL_CMAKE_BOOL=	ENABLE_TIDAL
 
-TEST_LIB_DEPENDS=	libgtest.so:devel/googletest
-
 VLC_CMAKE_BOOL=		ENABLE_VLC
 VLC_LIB_DEPENDS=	libvlc.so:multimedia/vlc
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MGSTREAMER}
-USE_GSTREAMER1=		yes
-CMAKE_ARGS+=		-DUSE_GSTREAMER=ON
-.else
-CMAKE_ARGS+=		-DUSE_GSTREAMER=OFF
-.endif
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=			gettext-runtime gettext-tools iconv
-USE_QT+=		linguisttools
-CMAKE_ARGS+=		-DUSE_TRANSLATIONS=ON
-.else
-CMAKE_ARGS+=		-DUSE_TRANSLATIONS=OFF
-.endif
 
 .include <bsd.port.mk>