aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThierry Thomas <thierry@FreeBSD.org>2024-01-18 14:57:15 +0000
committerThierry Thomas <thierry@FreeBSD.org>2024-01-18 16:27:32 +0000
commitf0b2e1e06c7658e3ee1ed72c8b37d4f0b14e5086 (patch)
tree1539ba203e4365d3b6332ed3f2c7ae62b16af70f
parentdf88995dafba3f107e2dd814074307921ba301d6 (diff)
downloadports-f0b2e1e06c7658e3ee1ed72c8b37d4f0b14e5086.tar.gz
ports-f0b2e1e06c7658e3ee1ed72c8b37d4f0b14e5086.zip
multimedia/winff: upgrade to 1.6.2
And also back to the pool.
-rw-r--r--multimedia/winff/Makefile16
-rw-r--r--multimedia/winff/distinfo6
-rw-r--r--multimedia/winff/files/patch-winff_unit1.pas19
-rw-r--r--multimedia/winff/pkg-plist2
4 files changed, 24 insertions, 19 deletions
diff --git a/multimedia/winff/Makefile b/multimedia/winff/Makefile
index 0bef82032c81..888bdece1ad7 100644
--- a/multimedia/winff/Makefile
+++ b/multimedia/winff/Makefile
@@ -1,12 +1,11 @@
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
@@ -17,7 +16,9 @@ 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}
@@ -32,7 +33,8 @@ DESKTOP_ENTRIES= "${PORTNAME}" \
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
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,15 +1,18 @@
---- 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);
@@ -25,7 +28,7 @@
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);
@@ -39,9 +42,9 @@
- {$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);
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
@@ -5,6 +5,7 @@ man/man1/winff.1.gz
%%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
@@ -12,7 +13,6 @@ share/pixmaps/winff.png
%%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