diff --git a/multimedia/winff/Makefile b/multimedia/winff/Makefile
index 0bef82032c81..888bdece1ad7 100644
--- a/multimedia/winff/Makefile
+++ b/multimedia/winff/Makefile
@@ -1,61 +1,63 @@
 PORTNAME=	WinFF
-PORTVERSION=	1.5.5
-PORTREVISION=	32
+PORTVERSION=	1.6.2
 CATEGORIES=	multimedia
-MASTER_SITES=	LOCAL/thierry
+MASTER_SITES=	https://github.com/WinFF/winff/archive/refs/tags/
 PKGNAMESUFFIX=	${LAZARUS_PKGNAMESUFFIX}
-DISTNAME=	${_PORTNAME}-${PORTVERSION}-source
+DISTNAME=	${_PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	thierry@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Convert your videos quickly, easily, and all at once
 WWW=		https://www.biggmatt.com/p/winff.html
 
 LICENSE=	GPLv3
 
 LIB_DEPENDS=	libavutil.so:multimedia/ffmpeg
 
 USES=		fpc lazarus:flavors xorg
 USE_XORG=	x11
 
-NO_WRKSUBDIR=	yes
+#USE_GITHUB=	yes
+#GH_PROJECT=	${_PORTNAME}
+
 _PORTNAME=	${PORTNAME:tl}
 DATADIR=	${PREFIX}/share/${_PORTNAME}
 DOCSDIR=	${PREFIX}/share/doc/${_PORTNAME}
 
 DESKTOP_ENTRIES=	"${PORTNAME}"	\
 			"${COMMENT}"	\
 			"${_PORTNAME}"	\
 			"${_PORTNAME}"	\
 			"AudioVideo;"	\
 			true
 
 LAZARUS_PROJECT_FILES=	winff.lpr
 LAZBUILD_ARGS=		-d
 
-BUILD_WRKSRC=	${WRKDIR}/${PKGNAME}/${_PORTNAME}
+WRKSRC=		${WRKDIR}/${_PORTNAME}-${_PORTNAME}-${PORTVERSION}
+BUILD_WRKSRC=	${WRKSRC}/${_PORTNAME}
 
 .if ${FLAVOR:Ugtk2:Mgtk2}
 USES+=		gnome
 USE_GNOME+=	cairo
 .endif
 
 OPTIONS_DEFINE=	DOCS
 
 pre-configure:
 	${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|g' ${BUILD_WRKSRC}/unit1.pas
 .for fp in unit1.pas unit4.pas scripts/check_presets.sh
 	${REINPLACE_CMD} -e 's|/usr/bin/|${LOCALBASE}/bin/|g' ${BUILD_WRKSRC}/${fp}
 .endfor
 
 do-install:
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${PORTNAME:tl} ${STAGEDIR}${PREFIX}/bin
 	${MKDIR} ${STAGEDIR}${DATADIR}/languages
 	${INSTALL_DATA} ${BUILD_WRKSRC}/presets.xml ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${BUILD_WRKSRC}/languages/* ${STAGEDIR}${DATADIR}/languages/
 	${INSTALL_MAN} ${BUILD_WRKSRC}/${_PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1
 	${INSTALL_DATA} ${BUILD_WRKSRC}/winff-icons/48x48/${_PORTNAME}.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${BUILD_WRKSRC}/docs/*.pdf ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/multimedia/winff/distinfo b/multimedia/winff/distinfo
index 0909933648b1..fe794fcf13fc 100644
--- a/multimedia/winff/distinfo
+++ b/multimedia/winff/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1475613452
-SHA256 (winff-1.5.5-source.tar.gz) = 3f67400ab8f7f43d2290dff3c5a0a8b8a966ba67cd971edb5d63e6a127d7a485
-SIZE (winff-1.5.5-source.tar.gz) = 2622722
+TIMESTAMP = 1696178544
+SHA256 (winff-1.6.2.tar.gz) = c06e8f35f0ee67025422265baa07dab7508596a11d80034c93b519af0472a730
+SIZE (winff-1.6.2.tar.gz) = 40479616
diff --git a/multimedia/winff/files/patch-winff_unit1.pas b/multimedia/winff/files/patch-winff_unit1.pas
index e272ae6f9916..990eec4851c7 100644
--- a/multimedia/winff/files/patch-winff_unit1.pas
+++ b/multimedia/winff/files/patch-winff_unit1.pas
@@ -1,52 +1,55 @@
---- winff/unit1.pas	2016-09-21 16:40:54.000000000 -0500
-+++ winff/unit1.pas	2018-03-07 17:35:42.310241000 -0500
-@@ -27,7 +27,7 @@
+--- winff/unit1.pas.orig	2023-10-01 15:40:03 UTC
++++ winff/unit1.pas
+@@ -27,9 +27,9 @@ uses
    {$IFDEF WINDOWS} windows, shellapi, dos,{$endif}
    {$IFDEF unix} baseunix, unix, {$endif}
    laz_xmlcfg, dom, xmlread, xmlwrite, StdCtrls, Buttons, ActnList, Menus, unit2, unit3,
 -  unit4, unit5, gettext, translations, process
 +  unit4, unit5, gettext, translations, process, LazFileUtils, LazUTF8
    {$IFDEF TRANSLATESTRING}, DefaultTranslator{$ENDIF}, ExtCtrls, ComCtrls, Spin, UTF8Process,
-   PoTranslator, types, FileUtil, regexpr;
+-  PoTranslator, types, FileUtil, regexpr, LazUTF8, LazFileUtils;
++  PoTranslator, types, FileUtil, regexpr {$IFDEF WINDOWS}, LazUTF8, LazFileUtils{$endif} {$IFDEF linux}, LazUTF8, LazFileUtils{$endif};
  
-@@ -1241,13 +1241,13 @@
+ type
+ 
+@@ -1241,13 +1241,13 @@ procedure TfrmMain.launchbrowser(URL:string);
  
  // launch browser
  procedure TfrmMain.launchbrowser(URL:string);
 -{$IFDEF linux}
 +{$IFDEF unix}
  var
  launcher:tprocess;
  s:string;
  {$endif}
  begin
 -  {$ifdef linux}
 +  {$ifdef unix}
    s:='';
    if fileexists('/usr/bin/konqueror') then s:='/usr/bin/konqueror';
    if fileexists('/usr/bin/mozilla-firefox') then s:='/usr/bin/mozilla-firefox';
-@@ -1382,13 +1382,13 @@
+@@ -1382,13 +1382,13 @@ procedure TfrmMain.LaunchPdf(pdffile:string);
  
  // launch pdf
  procedure TfrmMain.LaunchPdf(pdffile:string);
 -{$IFDEF linux}
 +{$IFDEF unix}
  var
  launcher:tprocess;
  s:string;
  {$endif}
  begin
 -  {$ifdef linux}
 +  {$ifdef unix}
    s:='';
+   if fileexists('/usr/bin/okular') then s:='/usr/bin/okular';
    if fileexists('/usr/bin/evince') then s:='/usr/bin/evince';
-   if fileexists('/usr/bin/kpdf') then s:='/usr/bin/kpdf';
-@@ -1982,7 +1982,7 @@
+@@ -1984,7 +1984,7 @@ begin
  language: string;
  begin
    language:=leftstr(lang,2);
 -  {$ifdef linux}
 +  {$ifdef unix}
    s :='';
    if fileexists('/usr/share/doc/winff/WinFF.' + language + '.pdf.gz') then s:='/usr/share/doc/winff/WinFF.' + language + '.pdf.gz';
    if fileexists('/usr/share/doc/winff/WinFF.' + language + '.pdf') then s:='/usr/share/doc/winff/WinFF.' + language + '.pdf';
diff --git a/multimedia/winff/pkg-plist b/multimedia/winff/pkg-plist
index 7ca0490e70b6..ee01c9393e95 100644
--- a/multimedia/winff/pkg-plist
+++ b/multimedia/winff/pkg-plist
@@ -1,57 +1,57 @@
 bin/winff
 man/man1/winff.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/WinFF.ca.pdf
 %%PORTDOCS%%%%DOCSDIR%%/WinFF.en.pdf
 %%PORTDOCS%%%%DOCSDIR%%/WinFF.es.pdf
 %%PORTDOCS%%%%DOCSDIR%%/WinFF.fr.pdf
 %%PORTDOCS%%%%DOCSDIR%%/WinFF.nl.pdf
+%%PORTDOCS%%%%DOCSDIR%%/WinFF.pt.pdf
 share/pixmaps/winff.png
 %%DATADIR%%/languages/winff.ab.po
 %%DATADIR%%/languages/winff.ar.po
 %%DATADIR%%/languages/winff.ast.po
 %%DATADIR%%/languages/winff.bg.po
 %%DATADIR%%/languages/winff.ca.po
 %%DATADIR%%/languages/winff.cs.po
-%%DATADIR%%/languages/winff.de_DE.po
 %%DATADIR%%/languages/winff.de.po
 %%DATADIR%%/languages/winff.el.po
 %%DATADIR%%/languages/winff.en_GB.po
 %%DATADIR%%/languages/winff.es_AR.po
 %%DATADIR%%/languages/winff.es_UY.po
 %%DATADIR%%/languages/winff.es.po
 %%DATADIR%%/languages/winff.eu.po
 %%DATADIR%%/languages/winff.fr.po
 %%DATADIR%%/languages/winff.gl.po
 %%DATADIR%%/languages/winff.he.po
 %%DATADIR%%/languages/winff.hu.po
 %%DATADIR%%/languages/winff.it.po
 %%DATADIR%%/languages/winff.ja.po
 %%DATADIR%%/languages/winff.kk.po
 %%DATADIR%%/languages/winff.kn.po
 %%DATADIR%%/languages/winff.ku.po
 %%DATADIR%%/languages/winff.ky.po
 %%DATADIR%%/languages/winff.lt.po
 %%DATADIR%%/languages/winff.lv.po
 %%DATADIR%%/languages/winff.ms.po
 %%DATADIR%%/languages/winff.nb.po
 %%DATADIR%%/languages/winff.nl.po
 %%DATADIR%%/languages/winff.pl.po
 %%DATADIR%%/languages/winff.po
 %%DATADIR%%/languages/winff.pot
 %%DATADIR%%/languages/winff.pt_BR.po
 %%DATADIR%%/languages/winff.pt.po
 %%DATADIR%%/languages/winff.ro.po
 %%DATADIR%%/languages/winff.ru.po
 %%DATADIR%%/languages/winff.se.po
 %%DATADIR%%/languages/winff.si_LK.po
 %%DATADIR%%/languages/winff.sk.po
 %%DATADIR%%/languages/winff.sl.po
 %%DATADIR%%/languages/winff.sr.po
 %%DATADIR%%/languages/winff.sr@latin.po
 %%DATADIR%%/languages/winff.sv.po
 %%DATADIR%%/languages/winff.te.po
 %%DATADIR%%/languages/winff.tr.po
 %%DATADIR%%/languages/winff.uk.po
 %%DATADIR%%/languages/winff.zh_CN.po
 %%DATADIR%%/languages/winff.zh_TW.po
 %%DATADIR%%/presets.xml