update MacPorts

NatronGitHub · Sep 12, 2024 · 37429ff · 37429ff
1 parent a64ef01
commit 37429ff
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 18 deletions.
diff --git a/tools/MacPorts/devel/gnutls/Portfile b/tools/MacPorts/devel/gnutls/Portfile
@@ -10,7 +10,7 @@ PortGroup       muniversal 1.0
 
 name            gnutls
 version         3.7.11
-revision        0
+revision        1
 categories      devel security
 # yes, some of the libs are GPL only
 license         LGPL-2.1+ GPL-3+
@@ -35,9 +35,9 @@ subport ${name} {
 
 subport ${name}-devel {
     conflicts   ${name}
-    
+
     version     3.8.7.1
-    revision    0
+    revision    1
 
     checksums   rmd160  c8df6a44fe967c394ef6264f01817209f2e861f2 \
                 sha256  9ca0ddaccce28a74fa18d738744190afb3b0daebef74e6ad686bf7bef99abd60 \
@@ -123,11 +123,18 @@ subport ${name} {
                 --without-brotli
     }
 
-    variant guile description {Build guile bindings} {
+    variant guile description {Build guile-2.2 bindings} {
     # there currently is a build issue with the guile variant
     # the workaround is to first install guile w/o guile and then with +guile
-        depends_lib-append      port:guile
+        depends_lib-append      port:guile-2.2
         configure.args-replace  --disable-guile --enable-guile
+        # It should not be this hard :/
+        configure.env-append    guile_snarf=${prefix}/bin/guile-snarf-2.2
+        configure.env-append    GUILD=${prefix}/bin/guild-2.2
+        configure.env-append    GUILE=${prefix}/bin/guile-2.2
+        configure.env-append    GUILE_CONFIG=${prefix}/bin/guile-config-2.2
+        configure.env-append    GUILE_TOOLS=${prefix}/bin/guile-tools-2.2
+        configure.env-append    GUILE_EFFECTIVE_VERSION=2.2
     }
 }
 

diff --git a/tools/MacPorts/devel/gnutls/Portfile.orig b/tools/MacPorts/devel/gnutls/Portfile.orig
@@ -10,7 +10,7 @@ PortGroup       muniversal 1.0
 
 name            gnutls
 version         3.7.11
-revision        0
+revision        1
 categories      devel security
 # yes, some of the libs are GPL only
 license         LGPL-2.1+ GPL-3+
@@ -35,9 +35,9 @@ subport ${name} {
 
 subport ${name}-devel {
     conflicts   ${name}
-    
+
     version     3.8.7.1
-    revision    0
+    revision    1
 
     checksums   rmd160  c8df6a44fe967c394ef6264f01817209f2e861f2 \
                 sha256  9ca0ddaccce28a74fa18d738744190afb3b0daebef74e6ad686bf7bef99abd60 \
@@ -123,11 +123,18 @@ subport ${name} {
                 --without-brotli
     }
 
-    variant guile description {Build guile bindings} {
+    variant guile description {Build guile-2.2 bindings} {
     # there currently is a build issue with the guile variant
     # the workaround is to first install guile w/o guile and then with +guile
-        depends_lib-append      port:guile
+        depends_lib-append      port:guile-2.2
         configure.args-replace  --disable-guile --enable-guile
+        # It should not be this hard :/
+        configure.env-append    guile_snarf=${prefix}/bin/guile-snarf-2.2
+        configure.env-append    GUILD=${prefix}/bin/guild-2.2
+        configure.env-append    GUILE=${prefix}/bin/guile-2.2
+        configure.env-append    GUILE_CONFIG=${prefix}/bin/guile-config-2.2
+        configure.env-append    GUILE_TOOLS=${prefix}/bin/guile-tools-2.2
+        configure.env-append    GUILE_EFFECTIVE_VERSION=2.2
     }
 }
 

diff --git a/tools/MacPorts/graphics/ImageMagick/Portfile b/tools/MacPorts/graphics/ImageMagick/Portfile
@@ -14,11 +14,11 @@ legacysupport.newest_darwin_requires_legacy 10
 # PHP Warning:  Version warning: Imagick was compiled against Image Magick version XXXX but version YYYY is loaded. Imagick will run but may behave surprisingly in Unknown on line 0
 
 name                        ImageMagick
-version                     6.9.13-14
+version                     6.9.13-16
 revision                    0
-checksums                   rmd160  528d9542ca873d49322ecaae1a7681b4241282ee \
-                            sha256  2ca9cbb27f2c47e2c4e20e4c6b299ff692077ed1e5e01104fcf72176fd6e2254 \
-                            size    9621048
+checksums                   rmd160  a76f0d3808d23e96badfd95fbaf9d1ec5c647694 \
+                            sha256  a2ca04c37ef56e669f442954d878bab7d096fadabdc75f6027f755bfdbf89a98 \
+                            size    9613864
 
 categories                  graphics devel
 maintainers                 {ryandesign @ryandesign}

diff --git a/tools/MacPorts/graphics/ImageMagick/Portfile.orig b/tools/MacPorts/graphics/ImageMagick/Portfile.orig
@@ -13,11 +13,11 @@ legacysupport.newest_darwin_requires_legacy 10
 # PHP Warning:  Version warning: Imagick was compiled against Image Magick version XXXX but version YYYY is loaded. Imagick will run but may behave surprisingly in Unknown on line 0
 
 name                        ImageMagick
-version                     6.9.13-14
+version                     6.9.13-16
 revision                    0
-checksums                   rmd160  528d9542ca873d49322ecaae1a7681b4241282ee \
-                            sha256  2ca9cbb27f2c47e2c4e20e4c6b299ff692077ed1e5e01104fcf72176fd6e2254 \
-                            size    9621048
+checksums                   rmd160  a76f0d3808d23e96badfd95fbaf9d1ec5c647694 \
+                            sha256  a2ca04c37ef56e669f442954d878bab7d096fadabdc75f6027f755bfdbf89a98 \
+                            size    9613864
 
 categories                  graphics devel
 maintainers                 {ryandesign @ryandesign}