MacPorts update

NatronGitHub · Oct 4, 2024 · 21d6f2a · 21d6f2a
1 parent f7a0345
commit 21d6f2a
Show file tree

Hide file tree

Showing 12 changed files with 55 additions and 61 deletions.
diff --git a/tools/MacPorts/graphics/ImageMagick/Portfile b/tools/MacPorts/graphics/ImageMagick/Portfile
@@ -15,7 +15,7 @@ legacysupport.newest_darwin_requires_legacy 10
 
 name                        ImageMagick
 version                     6.9.13-16
-revision                    0
+revision                    1
 checksums                   rmd160  a76f0d3808d23e96badfd95fbaf9d1ec5c647694 \
                             sha256  a2ca04c37ef56e669f442954d878bab7d096fadabdc75f6027f755bfdbf89a98 \
                             size    9613864

diff --git a/tools/MacPorts/graphics/ImageMagick/Portfile.orig b/tools/MacPorts/graphics/ImageMagick/Portfile.orig
@@ -14,7 +14,7 @@ legacysupport.newest_darwin_requires_legacy 10
 
 name                        ImageMagick
 version                     6.9.13-16
-revision                    0
+revision                    1
 checksums                   rmd160  a76f0d3808d23e96badfd95fbaf9d1ec5c647694 \
                             sha256  a2ca04c37ef56e669f442954d878bab7d096fadabdc75f6027f755bfdbf89a98 \
                             size    9613864

diff --git a/tools/MacPorts/multimedia/ffmpeg/Portfile b/tools/MacPorts/multimedia/ffmpeg/Portfile
@@ -15,7 +15,6 @@ 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.
 version             4.4.4

diff --git a/tools/MacPorts/multimedia/ffmpeg/Portfile.orig b/tools/MacPorts/multimedia/ffmpeg/Portfile.orig
@@ -15,7 +15,6 @@ 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.
 version             4.4.4

diff --git a/tools/MacPorts/multimedia/libvpx/Portfile b/tools/MacPorts/multimedia/libvpx/Portfile
@@ -2,6 +2,7 @@
 
 PortSystem          1.0
 PortGroup           compiler_blacklist_versions 1.0
+PortGroup           conflicts_build 1.0
 PortGroup           muniversal 1.0
 
 name                libvpx
@@ -48,6 +49,9 @@ compiler.cxx_standard 2011
 configure.ldflags-append \
                     {*}${configure.cxxflags}
 
+# https://trac.macports.org/ticket/70989
+conflicts_build     gtest
+
 # Uses newer assembly features on Intel.
 # Also blacklist clang 8, due to issues like:
 #   error: use of undeclared identifier 'abs'

diff --git a/tools/MacPorts/multimedia/libvpx/Portfile.orig b/tools/MacPorts/multimedia/libvpx/Portfile.orig
@@ -2,6 +2,7 @@
 
 PortSystem          1.0
 PortGroup           compiler_blacklist_versions 1.0
+PortGroup           conflicts_build 1.0
 PortGroup           muniversal 1.0
 
 name                libvpx
@@ -48,6 +49,9 @@ compiler.cxx_standard 2011
 configure.ldflags-append \
                     {*}${configure.cxxflags}
 
+# https://trac.macports.org/ticket/70989
+conflicts_build     gtest
+
 # Uses newer assembly features on Intel.
 # Also blacklist clang 8, due to issues like:
 #   error: use of undeclared identifier 'abs'

diff --git a/tools/MacPorts/net/curl/Portfile b/tools/MacPorts/net/curl/Portfile
@@ -6,10 +6,10 @@ PortGroup                       clang_dependency 1.0
 # Increase the revision of p5-www-curl whenever the version of curl gets updated.
 
 name                            curl
-version                         8.9.1
-checksums                       rmd160  4d9eb5b927e1bda4562c38ecbf766a5329c9efbd \
-                                sha256  f292f6cc051d5bbabf725ef85d432dfeacc8711dd717ea97612ae590643801e5 \
-                                size    2782364
+version                         8.10.1
+checksums                       rmd160  ddd20616891b01574bbc1c187affd78a19b7d54a \
+                                sha256  73a4b0e99596a09fa5924a4fb7e4b995a85fda0d18a2c02ab9cf134bebce04ee \
+                                size    2726748
 
 categories                      net www
 platforms                       darwin freebsd
@@ -41,6 +41,8 @@ if {${name} eq ${subport}} {
 
     depends_lib                 port:zlib
 
+    patchfiles-append           curl-config.in.patch
+
     configure.args              --disable-silent-rules \
                                 --enable-ipv6 \
                                 --without-brotli \
@@ -110,35 +112,28 @@ if {${name} eq ${subport}} {
         xinstall -d ${destroot}${docdir}/html/libcurl ${destroot}${docdir}/pdf/libcurl \
             ${destroot}${prefix}/share/aclocal
         xinstall -m 0644 -W ${worksrcpath} \
-            CHANGES \
+            CHANGES.md \
             COPYING \
             README \
             RELEASE-NOTES \
             ${destroot}${docdir}
         xinstall -m 0644 -W ${worksrcpath}/docs \
-            ALTSVC.md \
             BINDINGS.md \
-            BUFREF.md \
             BUGS.md \
             CIPHERS.md \
             CODE_OF_CONDUCT.md \
-            CODE_STYLE.md \
-            CONNECTION-FILTERS.md \
             CONTRIBUTE.md \
             CURL-DISABLE.md \
             DEPRECATE.md \
-            DYNBUF.md \
             FAQ \
             FEATURES.md \
             GOVERNANCE.md \
             HELP-US.md \
             HISTORY.md \
-            HSTS.md \
             HTTP-COOKIES.md \
             INTERNALS.md \
             KNOWN_BUGS \
             MAIL-ETIQUETTE.md \
-            PARALLEL-TRANSFERS.md \
             ROADMAP.md \
             SECURITY-ADVISORY.md \
             SSL-PROBLEMS.md \
@@ -148,14 +143,8 @@ if {${name} eq ${subport}} {
             TheArtOfHttpScripting.md \
             URL-SYNTAX.md \
             VERSIONS.md \
-            WEBSOCKET.md \
             VULN-DISCLOSURE-POLICY.md \
             ${destroot}${docdir}
-        if {[variant_isset http2]} {
-            xinstall -m 0644 -W ${worksrcpath}/docs \
-                HTTP2.md \
-                ${destroot}${docdir}
-        }
         if {[variant_isset http3]} {
             xinstall -m 0644 -W ${worksrcpath}/docs \
                 HTTP3.md \
@@ -347,7 +336,7 @@ subport curl-ca-bundle {
                                 size    285603
 
     extract.only                ${curl_distfile}
-    extract.post_args-append    ${worksrcdir}/Makefile \
+    extract.post_args-append    ${worksrcdir}/Makefile.dist \
                                 ${worksrcdir}/scripts/mk-ca-bundle.pl
 
     post-extract {
@@ -360,6 +349,7 @@ subport curl-ca-bundle {
 
     use_configure               no
 
+    build.args                  -f Makefile.dist
     build.target                ca-bundle
 
     destroot {

diff --git a/tools/MacPorts/net/curl/Portfile.orig b/tools/MacPorts/net/curl/Portfile.orig
@@ -6,10 +6,10 @@ PortGroup                       clang_dependency 1.0
 # Increase the revision of p5-www-curl whenever the version of curl gets updated.
 
 name                            curl
-version                         8.9.1
-checksums                       rmd160  4d9eb5b927e1bda4562c38ecbf766a5329c9efbd \
-                                sha256  f292f6cc051d5bbabf725ef85d432dfeacc8711dd717ea97612ae590643801e5 \
-                                size    2782364
+version                         8.10.1
+checksums                       rmd160  ddd20616891b01574bbc1c187affd78a19b7d54a \
+                                sha256  73a4b0e99596a09fa5924a4fb7e4b995a85fda0d18a2c02ab9cf134bebce04ee \
+                                size    2726748
 
 categories                      net www
 platforms                       darwin freebsd
@@ -41,6 +41,8 @@ if {${name} eq ${subport}} {
 
     depends_lib                 port:zlib
 
+    patchfiles-append           curl-config.in.patch
+
     configure.args              --disable-silent-rules \
                                 --enable-ipv6 \
                                 --without-brotli \
@@ -106,35 +108,28 @@ if {${name} eq ${subport}} {
         xinstall -d ${destroot}${docdir}/html/libcurl ${destroot}${docdir}/pdf/libcurl \
             ${destroot}${prefix}/share/aclocal
         xinstall -m 0644 -W ${worksrcpath} \
-            CHANGES \
+            CHANGES.md \
             COPYING \
             README \
             RELEASE-NOTES \
             ${destroot}${docdir}
         xinstall -m 0644 -W ${worksrcpath}/docs \
-            ALTSVC.md \
             BINDINGS.md \
-            BUFREF.md \
             BUGS.md \
             CIPHERS.md \
             CODE_OF_CONDUCT.md \
-            CODE_STYLE.md \
-            CONNECTION-FILTERS.md \
             CONTRIBUTE.md \
             CURL-DISABLE.md \
             DEPRECATE.md \
-            DYNBUF.md \
             FAQ \
             FEATURES.md \
             GOVERNANCE.md \
             HELP-US.md \
             HISTORY.md \
-            HSTS.md \
             HTTP-COOKIES.md \
             INTERNALS.md \
             KNOWN_BUGS \
             MAIL-ETIQUETTE.md \
-            PARALLEL-TRANSFERS.md \
             ROADMAP.md \
             SECURITY-ADVISORY.md \
             SSL-PROBLEMS.md \
@@ -144,14 +139,8 @@ if {${name} eq ${subport}} {
             TheArtOfHttpScripting.md \
             URL-SYNTAX.md \
             VERSIONS.md \
-            WEBSOCKET.md \
             VULN-DISCLOSURE-POLICY.md \
             ${destroot}${docdir}
-        if {[variant_isset http2]} {
-            xinstall -m 0644 -W ${worksrcpath}/docs \
-                HTTP2.md \
-                ${destroot}${docdir}
-        }
         if {[variant_isset http3]} {
             xinstall -m 0644 -W ${worksrcpath}/docs \
                 HTTP3.md \
@@ -343,7 +332,7 @@ subport curl-ca-bundle {
                                 size    285603
 
     extract.only                ${curl_distfile}
-    extract.post_args-append    ${worksrcdir}/Makefile \
+    extract.post_args-append    ${worksrcdir}/Makefile.dist \
                                 ${worksrcdir}/scripts/mk-ca-bundle.pl
 
     post-extract {
@@ -356,6 +345,7 @@ subport curl-ca-bundle {
 
     use_configure               no
 
+    build.args                  -f Makefile.dist
     build.target                ca-bundle
 
     destroot {

diff --git a/tools/MacPorts/net/curl/files/curl-config.in.patch b/tools/MacPorts/net/curl/files/curl-config.in.patch
@@ -0,0 +1,14 @@
+curl-config.in: Don't surround CA path with quotes
+
+https://github.com/curl/curl/issues/15041
+--- curl-config.in.orig
++++ curl-config.in
+@@ -71,7 +71,7 @@ while test "$#" -gt 0; do
+     ;;
+
+   --ca)
+-    echo '@CURL_CA_BUNDLE@'
++    echo @CURL_CA_BUNDLE@
+     ;;
+
+   --cc)
diff --git a/tools/MacPorts/net/curl/files/patch-no-autodownload.diff b/tools/MacPorts/net/curl/files/patch-no-autodownload.diff
@@ -1,11 +1,11 @@
---- Makefile.orig	2024-07-24 01:21:35.000000000 -0500
-+++ Makefile	2024-07-24 06:28:30.000000000 -0500
+--- Makefile.dist.orig	2024-09-18 00:56:40.000000000 -0500
++++ Makefile.dist	2024-09-22 13:57:59.000000000 -0500
 @@ -64,7 +64,7 @@
 
  ca-bundle: scripts/mk-ca-bundle.pl
  	@echo "generate a fresh ca-bundle.crt"
 -	@perl $< -b -l -u lib/ca-bundle.crt
 +	@perl $< -n lib/ca-bundle.crt
 
- ca-firefox: lib/firefox-db2pem.sh
+ ca-firefox: scripts/firefox-db2pem.sh
  	@echo "generate a fresh ca-bundle.crt"
diff --git a/tools/MacPorts/print/ghostscript/Portfile b/tools/MacPorts/print/ghostscript/Portfile
@@ -4,7 +4,7 @@ PortSystem          1.0
 PortGroup           muniversal 1.0
 
 name                ghostscript
-version             10.03.1
+version             10.04.0
 revision            0
 
 categories          print
@@ -34,9 +34,9 @@ distfiles           ${distname}.tar.gz:source \
                     ${mappingresources_commit}.zip:misc
 
 checksums           ${distname}.tar.gz \
-                    rmd160  56619c52c32237c97739d1830b0513cd6b17d2a8 \
-                    sha256  8ea9dd8768b64576bc4ee2d79611450c9e1edeb686f7824f3bf94b92457b882a \
-                    size    98222799 \
+                    rmd160  ab1bac9af5538bf441f7ec309a63513af427a96d \
+                    sha256  8b1594b067e00e386f818270a255eef6baba593197173725951d5f0c316dc205 \
+                    size    98270469 \
                     ghostscript-fonts-other-6.0.tar.gz \
                     rmd160  ab60dbf71e7d91283a106c3df381cadfe173082f \
                     sha256  4fa051e341167008d37fe34c19d241060cd17b13909932cd7ca7fe759243c2de \
@@ -70,13 +70,9 @@ post-extract {
     copy -force {*}[glob ${workpath}/mapping-resources-pdf-${mappingresources_commit}/pdf2other/*]    ${worksrcpath}/Resource/CMap
 }
 
-patchfiles-append   patch-base_unix-dll.mak.diff
 patchfiles-append   patch-base_unixinst.mak.diff
-patchfiles-append   pdf_sec.c.diff
 
 post-patch {
-    reinplace "s|__PREFIX__|${prefix}|" \
-                    ${worksrcpath}/base/unix-dll.mak
     reinplace "s|ZLIBDIR=src|ZLIBDIR=${prefix}/include|" \
                     ${worksrcpath}/configure.ac
 
@@ -115,6 +111,7 @@ configure.checks.implicit_function_declaration.whitelist-append strchr
 # tell ghostscript it's OK to use the system pkg-config even when cross-compiling
 # see https://trac.macports.org/ticket/66627
 configure.env-append \
+		    DARWIN_LDFLAGS_SO_PREFIX="${prefix}/lib/" \
                     PKGCONFIG=${prefix}/bin/pkg-config
 
 # https://trac.macports.org/ticket/56137

diff --git a/tools/MacPorts/print/ghostscript/Portfile.orig b/tools/MacPorts/print/ghostscript/Portfile.orig
@@ -4,7 +4,7 @@ PortSystem          1.0
 PortGroup           muniversal 1.0
 
 name                ghostscript
-version             10.03.1
+version             10.04.0
 revision            0
 
 categories          print
@@ -34,9 +34,9 @@ distfiles           ${distname}.tar.gz:source \
                     ${mappingresources_commit}.zip:misc
 
 checksums           ${distname}.tar.gz \
-                    rmd160  56619c52c32237c97739d1830b0513cd6b17d2a8 \
-                    sha256  8ea9dd8768b64576bc4ee2d79611450c9e1edeb686f7824f3bf94b92457b882a \
-                    size    98222799 \
+                    rmd160  ab1bac9af5538bf441f7ec309a63513af427a96d \
+                    sha256  8b1594b067e00e386f818270a255eef6baba593197173725951d5f0c316dc205 \
+                    size    98270469 \
                     ghostscript-fonts-other-6.0.tar.gz \
                     rmd160  ab60dbf71e7d91283a106c3df381cadfe173082f \
                     sha256  4fa051e341167008d37fe34c19d241060cd17b13909932cd7ca7fe759243c2de \
@@ -70,13 +70,9 @@ post-extract {
     copy -force {*}[glob ${workpath}/mapping-resources-pdf-${mappingresources_commit}/pdf2other/*]    ${worksrcpath}/Resource/CMap
 }
 
-patchfiles-append   patch-base_unix-dll.mak.diff
 patchfiles-append   patch-base_unixinst.mak.diff
-patchfiles-append   pdf_sec.c.diff
 
 post-patch {
-    reinplace "s|__PREFIX__|${prefix}|" \
-                    ${worksrcpath}/base/unix-dll.mak
     reinplace "s|ZLIBDIR=src|ZLIBDIR=${prefix}/include|" \
                     ${worksrcpath}/configure.ac
 
@@ -115,6 +111,7 @@ configure.checks.implicit_function_declaration.whitelist-append strchr
 # tell ghostscript it's OK to use the system pkg-config even when cross-compiling
 # see https://trac.macports.org/ticket/66627
 configure.env-append \
+		    DARWIN_LDFLAGS_SO_PREFIX="${prefix}/lib/" \
                     PKGCONFIG=${prefix}/bin/pkg-config
 
 # https://trac.macports.org/ticket/56137