From ad9d5639610c7cb4801212ed248b6b6616555fcb Mon Sep 17 00:00:00 2001 From: Frederic Devernay Date: Sun, 24 Oct 2021 10:30:06 -0700 Subject: [PATCH] MacPorts update --- tools/MacPorts/multimedia/ffmpeg/Portfile | 9 ++++++--- tools/MacPorts/multimedia/ffmpeg/Portfile.orig | 9 ++++++--- tools/MacPorts/net/curl/Portfile | 8 ++++---- tools/MacPorts/net/curl/Portfile.orig | 8 ++++---- 4 files changed, 20 insertions(+), 14 deletions(-) diff --git a/tools/MacPorts/multimedia/ffmpeg/Portfile b/tools/MacPorts/multimedia/ffmpeg/Portfile index 7a1eca0f97..f64d9a29bf 100644 --- a/tools/MacPorts/multimedia/ffmpeg/Portfile +++ b/tools/MacPorts/multimedia/ffmpeg/Portfile @@ -14,6 +14,7 @@ PortGroup legacysupport 1.1 PortGroup xcode_workaround 1.0 name ffmpeg +set my_name ffmpeg conflicts ffmpeg-devel # Please increase the revision of mpv whenever ffmpeg's version is updated. epoch 1 @@ -21,7 +22,7 @@ version 4.4 revision 5 license LGPL-2.1+ categories multimedia -maintainers {devans @dbevans} {jeremyhu @jeremyhu} openmaintainer +maintainers {devans @dbevans} {jeremyhu @jeremyhu} {mascguy @mascguy} openmaintainer description FFmpeg is a complete solution to play, record, convert and \ stream audio and video. @@ -57,7 +58,8 @@ long_description FFmpeg is a complete solution to record, convert and \ platforms darwin homepage https://ffmpeg.org/ master_sites ${homepage}releases/ - +distname ${my_name}-${version} +dist_subdir ${my_name} use_xz yes checksums rmd160 0169ae4eb185de3a851a9926bc0b3289512c4be0 \ @@ -67,6 +69,7 @@ checksums rmd160 0169ae4eb185de3a851a9926bc0b3289512c4be0 \ depends_build port:pkgconfig \ port:gmake \ port:ld64 \ + port:cctools \ port:texinfo depends_lib port:lame \ @@ -538,4 +541,4 @@ and is therefore licensed under LGPL v2.1 or later. livecheck.type regex livecheck.url ${master_sites} -livecheck.regex "${name}-(\\d+(?:\\.\\d+)*)${extract.suffix}" +livecheck.regex "${my_name}-(\\d+(?:\\.\\d+)*)${extract.suffix}" diff --git a/tools/MacPorts/multimedia/ffmpeg/Portfile.orig b/tools/MacPorts/multimedia/ffmpeg/Portfile.orig index 1e4e24536a..8b7d771005 100644 --- a/tools/MacPorts/multimedia/ffmpeg/Portfile.orig +++ b/tools/MacPorts/multimedia/ffmpeg/Portfile.orig @@ -14,6 +14,7 @@ PortGroup legacysupport 1.1 PortGroup xcode_workaround 1.0 name ffmpeg +set my_name ffmpeg conflicts ffmpeg-devel # Please increase the revision of mpv whenever ffmpeg's version is updated. epoch 1 @@ -21,7 +22,7 @@ version 4.4 revision 5 license LGPL-2.1+ categories multimedia -maintainers {devans @dbevans} {jeremyhu @jeremyhu} openmaintainer +maintainers {devans @dbevans} {jeremyhu @jeremyhu} {mascguy @mascguy} openmaintainer description FFmpeg is a complete solution to play, record, convert and \ stream audio and video. @@ -57,7 +58,8 @@ long_description FFmpeg is a complete solution to record, convert and \ platforms darwin homepage https://ffmpeg.org/ master_sites ${homepage}releases/ - +distname ${my_name}-${version} +dist_subdir ${my_name} use_xz yes checksums rmd160 0169ae4eb185de3a851a9926bc0b3289512c4be0 \ @@ -67,6 +69,7 @@ checksums rmd160 0169ae4eb185de3a851a9926bc0b3289512c4be0 \ depends_build port:pkgconfig \ port:gmake \ port:ld64 \ + port:cctools \ port:texinfo depends_lib port:lame \ @@ -435,4 +438,4 @@ and is therefore licensed under LGPL v2.1 or later. livecheck.type regex livecheck.url ${master_sites} -livecheck.regex "${name}-(\\d+(?:\\.\\d+)*)${extract.suffix}" +livecheck.regex "${my_name}-(\\d+(?:\\.\\d+)*)${extract.suffix}" diff --git a/tools/MacPorts/net/curl/Portfile b/tools/MacPorts/net/curl/Portfile index 633ace6b4d..2f312fa080 100644 --- a/tools/MacPorts/net/curl/Portfile +++ b/tools/MacPorts/net/curl/Portfile @@ -4,7 +4,7 @@ PortSystem 1.0 PortGroup clang_dependency 1.0 name curl -version 7.78.0 +version 7.79.1 categories net www platforms darwin freebsd maintainers {ryandesign @ryandesign} @@ -26,9 +26,9 @@ set curl_distfile ${distfiles} distfiles ${curl_distfile}:curl checksums ${curl_distfile} \ - rmd160 a3c6639da7482c5ed9aac36a16d1daa253e4a9d1 \ - sha256 be42766d5664a739c3974ee3dfbbcbe978a4ccb1fe628bb1d9b59ac79e445fb5 \ - size 2440640 + rmd160 5cf55aa1d995063cce339518626514750c2fed47 \ + sha256 0606f74b1182ab732a17c11613cbbaf7084f2e6cca432642d0e3ad7c224c3689 \ + size 2465212 if {${name} eq ${subport}} { PortGroup muniversal 1.0 diff --git a/tools/MacPorts/net/curl/Portfile.orig b/tools/MacPorts/net/curl/Portfile.orig index 33c64b0977..0e5b5cb53f 100644 --- a/tools/MacPorts/net/curl/Portfile.orig +++ b/tools/MacPorts/net/curl/Portfile.orig @@ -4,7 +4,7 @@ PortSystem 1.0 PortGroup clang_dependency 1.0 name curl -version 7.78.0 +version 7.79.1 categories net www platforms darwin freebsd maintainers {ryandesign @ryandesign} @@ -26,9 +26,9 @@ set curl_distfile ${distfiles} distfiles ${curl_distfile}:curl checksums ${curl_distfile} \ - rmd160 a3c6639da7482c5ed9aac36a16d1daa253e4a9d1 \ - sha256 be42766d5664a739c3974ee3dfbbcbe978a4ccb1fe628bb1d9b59ac79e445fb5 \ - size 2440640 + rmd160 5cf55aa1d995063cce339518626514750c2fed47 \ + sha256 0606f74b1182ab732a17c11613cbbaf7084f2e6cca432642d0e3ad7c224c3689 \ + size 2465212 if {${name} eq ${subport}} { PortGroup muniversal 1.0