git: 49ff47b24866 - main - multimedia/winff: upgrade to 1.6.3

From: Thierry Thomas <thierry_at_FreeBSD.org>
Date: Tue, 20 Feb 2024 19:09:14 UTC
The branch main has been updated by thierry:

URL: https://cgit.FreeBSD.org/ports/commit/?id=49ff47b24866255b6794019a164c6f41ff3e2046

commit 49ff47b24866255b6794019a164c6f41ff3e2046
Author:     Thierry Thomas <thierry@FreeBSD.org>
AuthorDate: 2024-02-20 18:32:48 +0000
Commit:     Thierry Thomas <thierry@FreeBSD.org>
CommitDate: 2024-02-20 19:06:14 +0000

    multimedia/winff: upgrade to 1.6.3
---
 multimedia/winff/Makefile                    |  5 +--
 multimedia/winff/distinfo                    |  6 +--
 multimedia/winff/files/patch-winff_unit1.pas | 58 ++++------------------------
 multimedia/winff/pkg-plist                   |  1 -
 4 files changed, 12 insertions(+), 58 deletions(-)

diff --git a/multimedia/winff/Makefile b/multimedia/winff/Makefile
index 784183377097..665731fce3fa 100644
--- a/multimedia/winff/Makefile
+++ b/multimedia/winff/Makefile
@@ -1,8 +1,7 @@
 PORTNAME=	WinFF
-PORTVERSION=	1.6.2
-PORTREVISION=	1
+PORTVERSION=	1.6.3
 CATEGORIES=	multimedia
-MASTER_SITES=	https://github.com/WinFF/winff/archive/refs/tags/
+#MASTER_SITES=	https://github.com/WinFF/winff/archive/refs/tags/
 PKGNAMESUFFIX=	${LAZARUS_PKGNAMESUFFIX}
 DISTNAME=	${_PORTNAME}-${PORTVERSION}
 
diff --git a/multimedia/winff/distinfo b/multimedia/winff/distinfo
index fe794fcf13fc..f729d7be0111 100644
--- a/multimedia/winff/distinfo
+++ b/multimedia/winff/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1696178544
-SHA256 (winff-1.6.2.tar.gz) = c06e8f35f0ee67025422265baa07dab7508596a11d80034c93b519af0472a730
-SIZE (winff-1.6.2.tar.gz) = 40479616
+TIMESTAMP = 1708452527
+SHA256 (winff-1.6.3.tar.gz) = 7205b855c65f2d642cd3619e1c3e2943f058ed97d0c69d1544a91164c713786a
+SIZE (winff-1.6.3.tar.gz) = 40479311
diff --git a/multimedia/winff/files/patch-winff_unit1.pas b/multimedia/winff/files/patch-winff_unit1.pas
index 990eec4851c7..f7022575e327 100644
--- a/multimedia/winff/files/patch-winff_unit1.pas
+++ b/multimedia/winff/files/patch-winff_unit1.pas
@@ -1,55 +1,11 @@
---- winff/unit1.pas.orig	2023-10-01 15:40:03 UTC
+--- winff/unit1.pas.orig	2024-02-19 13:49:13 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, LazUTF8, LazFileUtils;
-+  PoTranslator, types, FileUtil, regexpr {$IFDEF WINDOWS}, LazUTF8, LazFileUtils{$endif} {$IFDEF linux}, LazUTF8, LazFileUtils{$endif};
+@@ -31,7 +31,7 @@ uses
+   {$IFDEF TRANSLATESTRING}, DefaultTranslator{$ENDIF},
+   ExtCtrls, ComCtrls, Spin, UTF8Process, PoTranslator, types, FileUtil, regexpr
+   {$IFDEF WINDOWS}, LazUTF8, LazFileUtils {$endif}
+-  {$IFDEF linux},   LazUTF8, LazFileUtils {$endif};
++  {$IFDEF unix},   LazUTF8, LazFileUtils {$endif};
  
  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 @@ 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';
-@@ -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 5c9b3815f297..82bd83e13e6f 100644
--- a/multimedia/winff/pkg-plist
+++ b/multimedia/winff/pkg-plist
@@ -36,7 +36,6 @@ share/pixmaps/winff.png
 %%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