diff --git a/multimedia/smplayer/Makefile b/multimedia/smplayer/Makefile
index 6e9f4d544fdd..8b6772ee95ee 100644
--- a/multimedia/smplayer/Makefile
+++ b/multimedia/smplayer/Makefile
@@ -1,85 +1,81 @@
 PORTNAME=	smplayer
 DISTVERSION=	22.7.0
 PORTREVISION=	1
 CATEGORIES=	multimedia audio kde
 MASTER_SITES=	SF/${PORTNAME}/SMPlayer/${PORTVERSION}
 
 MAINTAINER=	vvd@FreeBSD.org
 COMMENT=	Complete front-end based on Qt for mplayer
 WWW=		https://www.smplayer.info/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/Copying.txt
 
 USES=		cpe compiler:c++11-lang desktop-file-utils dos2unix gl \
 		gmake qmake qt:5 tar:bzip2 xorg
 USE_GL=		gl
 USE_QT=		buildtools:build linguisttools:build \
 		core dbus gui network script widgets xml
 USE_XORG=	x11 xext
 
 CPE_VENDOR=	ricardo_villalba
-DOS2UNIX_REGEX=	.*.[^p][^n][^g]$
+DOS2UNIX_GLOB=	*.md *.txt
 
 ALL_TARGET=	src/smplayer
 CONFIGURE_WRKSRC=	${WRKSRC}/src
-MAKE_ARGS=	PREFIX=${PREFIX} DESTDIR=${STAGEDIR}
+MAKE_ENV=	DESTDIR=${STAGEDIR} LRELEASE=${LRELEASE}
 QMAKE_ARGS=	"DEFINES_DISABLED+=MPLAYER2_SUPPORT"
 
 PORTDOCS=	${DOCS:T}
 DOCS=		old-docs/Changelog old-docs/dvdmenus.txt old-docs/Finding_subtitles.txt \
 		old-docs/Not_so_obvious_things.txt old-docs/Release_notes.txt \
 		old-docs/Watching_TV.txt README.md Readme.txt Release_notes.md
 
 OPTIONS_MULTI=		ENGINE
 OPTIONS_MULTI_ENGINE=	MPLAYER MPV
 OPTIONS_DEFINE=		DOCS DEBUG SKINS THEMES
 OPTIONS_DEFAULT=	MPV SKINS THEMES
 
 ENGINE_DESC=	Multimedia engine
 MPLAYER_DESC=	Allow to use MPlayer as multimedia engine
 MPV_DESC=	Allow to use mpv as multimedia engine
 SKINS_DESC=	Install additional skins
 THEMES_DESC=	Install additional themes
 
 MPLAYER_RUN_DEPENDS=	mplayer:multimedia/mplayer
 MPLAYER_QMAKE_OFF=	"DEFINES_DISABLED+=MPLAYER_SUPPORT"
 
 MPV_RUN_DEPENDS=	mpv:multimedia/mpv
 MPV_QMAKE_OFF=		"DEFINES_DISABLED+=MPV_SUPPORT"
 
 SKINS_RUN_DEPENDS=	smplayer-skins>=0:multimedia/smplayer-skins
 THEMES_RUN_DEPENDS=	smplayer-themes>=0:multimedia/smplayer-themes
 
 # Do not use unstable versions
 PORTSCOUT=	site:http://sourceforge.net/projects/smplayer/files/Unstable/releases/
 
 SUB_FILES=	pkg-message
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|&& $$(QMAKE) $$(QMAKE_OPTS)||; \
-		s|lrelease|${LRELEASE}|; \
-		s| make| ${MAKE_CMD}|g' \
-		${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e 's|-O2 -W -Wall -Werror|${CFLAGS}|' \
 		${WRKSRC}/webserver/Makefile
 	@${REINPLACE_CMD} -e 's|^sed|#sed|' \
 		${WRKSRC}/install_appdata.sh
 
 post-patch-DEBUG-on:
 	@${REINPLACE_CMD} -e '/CONFIG += debug/s|#||' \
 		${WRKSRC}/src/smplayer.pro
 
 post-patch-DEBUG-off:
 	@${REINPLACE_CMD} -e '/DEFINES += NO_DEBUG_ON_CONSOLE/s|#||' \
 		${WRKSRC}/src/smplayer.pro
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/simple_web_server
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/multimedia/smplayer/files/patch-Makefile b/multimedia/smplayer/files/patch-Makefile
index 7559e40252aa..e5751409740a 100644
--- a/multimedia/smplayer/files/patch-Makefile
+++ b/multimedia/smplayer/files/patch-Makefile
@@ -1,33 +1,62 @@
---- Makefile.orig	2018-01-12 15:20:18 UTC
+--- Makefile.orig	2021-08-01 06:29:39 UTC
 +++ Makefile
-@@ -5,7 +5,6 @@ PREFIX=/usr/local
+@@ -1,11 +1,10 @@
+ 
+-PREFIX=/usr/local
++PREFIX?=/usr/local
+ #PREFIX=/tmp/smplayer
+ 
  CONF_PREFIX=$(PREFIX)
  
  DATA_PATH=$(PREFIX)/share/smplayer
 -DOC_PATH=$(PREFIX)/share/doc/packages/smplayer
  TRANSLATION_PATH=$(PREFIX)/share/smplayer/translations
  THEMES_PATH=$(PREFIX)/share/smplayer/themes
  SHORTCUTS_PATH=$(PREFIX)/share/smplayer/shortcuts
-@@ -19,7 +18,7 @@ LRELEASE=lrelease
+@@ -14,26 +13,26 @@ ICONS_DIR=$(PREFIX)/share/icons/hicolor/
+ APPLNK_DIR=$(PREFIX)/share/applications/
+ METAINFO_DIR=$(PREFIX)/share/metainfo/
+ 
+-QMAKE=qmake
+-LRELEASE=lrelease
++QMAKE?=qmake
++LRELEASE?=lrelease
  
  DEFS=DATA_PATH=\\\"$(DATA_PATH)\\\" \
       TRANSLATION_PATH=\\\"$(TRANSLATION_PATH)\\\" \
 -     DOC_PATH=\\\"$(DOC_PATH)\\\" THEMES_PATH=\\\"$(THEMES_PATH)\\\" \
 +     THEMES_PATH=\\\"$(THEMES_PATH)\\\" \
       SHORTCUTS_PATH=\\\"$(SHORTCUTS_PATH)\\\"
  
  all: src/smplayer webserver/simple_web_server
+ 
+ src/smplayer:
+ 	./get_svn_revision.sh
+-	+cd src && $(QMAKE) $(QMAKE_OPTS) && $(DEFS) make
++	$(MAKE) -C src $(DEFS)
+ 	cd src && $(LRELEASE) smplayer.pro
+ 
+ webserver/simple_web_server:
+-	cd webserver && make
++	$(MAKE) -C webserver
+ 
+ clean:
+-	if [ -f src/Makefile ]; then cd src && make distclean; fi
++	if [ -f src/Makefile ]; then $(MAKE) -C src distclean; fi
+ 	-rm src/translations/smplayer_*.qm
+ 	-rm webserver/simple_web_server
+ 
 @@ -44,13 +43,8 @@ install: all
  	install -m 644 src/input.conf $(DESTDIR)$(DATA_PATH)
  	-install -d $(DESTDIR)$(TRANSLATION_PATH)
  	install -m 644 src/translations/*.qm $(DESTDIR)$(TRANSLATION_PATH)
 -	-install -d $(DESTDIR)$(DOC_PATH)
 -	install -m 644 Release_notes.md *.txt $(DESTDIR)$(DOC_PATH)
  
  	install -m 755 webserver/simple_web_server $(DESTDIR)$(PREFIX)/bin/
 -
 -	-install -d $(DESTDIR)$(DOC_PATH)
 -	tar -C docs/ --exclude=.svn -c -f - . | tar -C $(DESTDIR)$(DOC_PATH) -x -f -
  
  	-install -d $(DESTDIR)$(SHORTCUTS_PATH)
  	cp src/shortcuts/* $(DESTDIR)$(SHORTCUTS_PATH)
diff --git a/multimedia/smplayer/files/pkg-message.in b/multimedia/smplayer/files/pkg-message.in
index 80daf058d0e5..366f08894263 100644
--- a/multimedia/smplayer/files/pkg-message.in
+++ b/multimedia/smplayer/files/pkg-message.in
@@ -1,9 +1,9 @@
 [
 { type: install
   message: <<EOM
 SMPlayer has been installed.
 
-For Youtube Videos please use multimedia/smtube port.
+For YouTube videos please use multimedia/smtube port.
 EOM
 }
 ]