macports update

NatronGitHub · Apr 3, 2024 · aa68fbe · aa68fbe
1 parent 26c3c85
commit aa68fbe
Show file tree

Hide file tree

Showing 22 changed files with 190 additions and 485 deletions.
diff --git a/tools/MacPorts/devel/gnutls/Portfile b/tools/MacPorts/devel/gnutls/Portfile
@@ -36,12 +36,12 @@ subport ${name} {
 subport ${name}-devel {
     conflicts   ${name}
 
-    version     3.8.2
+    version     3.8.4
     revision    0
 
-    checksums   rmd160  94154bab53fef5b66365cb8ebd9caa616e3ed741 \
-                sha256  e765e5016ffa9b9dd243e363a0460d577074444ee2491267db2e96c9c2adef77 \
-                size    6456540
+    checksums   rmd160  42eea662a17b646f78f3dd423200c9d17f9e3943 \
+                sha256  2bea4e154794f3f00180fa2a5c51fe8b005ac7a31cd58bd44cdfa7f36ebc3a9b \
+                size    6487520
 
     patchfiles      patch-lib-system-certs.c.diff
 }

diff --git a/tools/MacPorts/devel/gnutls/Portfile.orig b/tools/MacPorts/devel/gnutls/Portfile.orig
@@ -36,12 +36,12 @@ subport ${name} {
 subport ${name}-devel {
     conflicts   ${name}
 
-    version     3.8.2
+    version     3.8.4
     revision    0
 
-    checksums   rmd160  94154bab53fef5b66365cb8ebd9caa616e3ed741 \
-                sha256  e765e5016ffa9b9dd243e363a0460d577074444ee2491267db2e96c9c2adef77 \
-                size    6456540
+    checksums   rmd160  42eea662a17b646f78f3dd423200c9d17f9e3943 \
+                sha256  2bea4e154794f3f00180fa2a5c51fe8b005ac7a31cd58bd44cdfa7f36ebc3a9b \
+                size    6487520
 
     patchfiles      patch-lib-system-certs.c.diff
 }

diff --git a/tools/MacPorts/graphics/ImageMagick/Portfile b/tools/MacPorts/graphics/ImageMagick/Portfile
@@ -2,28 +2,28 @@
 
 PortSystem                  1.0
 PortGroup                   conflicts_build 1.0
+PortGroup                   legacysupport 1.1
 PortGroup                   compiler_blacklist_versions 1.0
 
+# TARGET_OS_IOS, TARGET_OS_WATCH, TARGET_OS_TV missing in TargetConditionals.h:
+legacysupport.newest_darwin_requires_legacy 10
+
 # Keep relevant lines in sync between ImageMagick and p5-perlmagick.
 
 # Before updating to a newer version, install phpNN-imagick. After updating, run `phpNN -v`. If the following warning appears, revbump php-imagick.
 # 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
-# 6.9.11-61 changes the major version of libMagickCore which will
-# require increasing the revision of all ports that link with it.
-version                     6.9.11-60
-revision                    11
-checksums                   rmd160  1c293ba06fd43833be35efb4476e559bf137ccef \
-                            sha256  ba0fa683b0721d1f22b0ccb364e4092e9a7a34ffd3bd6348c82b50fd93b1d7ba \
-                            size    9167220
+version                     6.9.13-7
+revision                    0
+checksums                   rmd160  9025e38a212d8cfe5706f07c4f900a96b708c016 \
+                            sha256  2a521f7992b3dd32469b7b7254a81df8a0045cb0b963372e3ba6404b0a4efeae \
+                            size    9604796
 
 categories                  graphics devel
 maintainers                 {ryandesign @ryandesign}
 license                     Apache-2
 use_xz                      yes
-platforms                   darwin
-use_parallel_build          yes
 
 description                 Tools and libraries to manipulate images in many formats
 
@@ -70,11 +70,8 @@ depends_lib                 port:bzip2 \
                             port:libxml2 \
                             port:libheif
 
-patchfiles \
-    ImageMagick-6.9.10-gimp210.diff
-
 # Magick-config etc. use pkg-config
-depends_lib-append          port:pkgconfig
+depends_lib-append          path:bin/pkg-config:pkgconfig
 
 depends_run                 port:urw-fonts
 

diff --git a/tools/MacPorts/graphics/ImageMagick/Portfile.orig b/tools/MacPorts/graphics/ImageMagick/Portfile.orig
@@ -2,27 +2,27 @@
 
 PortSystem                  1.0
 PortGroup                   conflicts_build 1.0
+PortGroup                   legacysupport 1.1
+
+# TARGET_OS_IOS, TARGET_OS_WATCH, TARGET_OS_TV missing in TargetConditionals.h:
+legacysupport.newest_darwin_requires_legacy 10
 
 # Keep relevant lines in sync between ImageMagick and p5-perlmagick.
 
 # Before updating to a newer version, install phpNN-imagick. After updating, run `phpNN -v`. If the following warning appears, revbump php-imagick.
 # 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
-# 6.9.11-61 changes the major version of libMagickCore which will
-# require increasing the revision of all ports that link with it.
-version                     6.9.11-60
-revision                    11
-checksums                   rmd160  1c293ba06fd43833be35efb4476e559bf137ccef \
-                            sha256  ba0fa683b0721d1f22b0ccb364e4092e9a7a34ffd3bd6348c82b50fd93b1d7ba \
-                            size    9167220
+version                     6.9.13-7
+revision                    0
+checksums                   rmd160  9025e38a212d8cfe5706f07c4f900a96b708c016 \
+                            sha256  2a521f7992b3dd32469b7b7254a81df8a0045cb0b963372e3ba6404b0a4efeae \
+                            size    9604796
 
 categories                  graphics devel
 maintainers                 {ryandesign @ryandesign}
 license                     Apache-2
 use_xz                      yes
-platforms                   darwin
-use_parallel_build          yes
 
 description                 Tools and libraries to manipulate images in many formats
 
@@ -70,7 +70,7 @@ depends_lib                 port:bzip2 \
                             port:libheif
 
 # Magick-config etc. use pkg-config
-depends_lib-append          port:pkgconfig
+depends_lib-append          path:bin/pkg-config:pkgconfig
 
 depends_run                 port:urw-fonts
 

diff --git a/tools/MacPorts/graphics/ImageMagick/Portfile.patch b/tools/MacPorts/graphics/ImageMagick/Portfile.patch
@@ -1,24 +1,14 @@
---- Portfile.orig	2021-02-13 18:25:46.000000000 -0800
-+++ Portfile	2021-02-14 09:09:09.000000000 -0800
-@@ -2,6 +2,7 @@
-
+--- Portfile.orig	2024-04-03 11:45:38
++++ Portfile	2024-04-03 12:55:41
+@@ -3,6 +3,7 @@
  PortSystem                  1.0
  PortGroup                   conflicts_build 1.0
+ PortGroup                   legacysupport 1.1
 +PortGroup                   compiler_blacklist_versions 1.0
 
- # Keep relevant lines in sync between ImageMagick and p5-perlmagick.
-
-@@ -69,6 +70,9 @@
-                             port:libxml2 \
-                             port:libheif
-
-+patchfiles \
-+    ImageMagick-6.9.10-gimp210.diff
-+
- # Magick-config etc. use pkg-config
- depends_lib-append          port:pkgconfig
-
-@@ -85,11 +89,13 @@
+ # TARGET_OS_IOS, TARGET_OS_WATCH, TARGET_OS_TV missing in TargetConditionals.h:
+ legacysupport.newest_darwin_requires_legacy 10
+@@ -85,11 +86,13 @@
                              --with-dps \
                              --with-bzlib \
                              --with-djvu \
@@ -32,7 +22,7 @@
                              --with-openjp2 \
                              --with-png \
                              --with-tiff \
-@@ -122,6 +128,60 @@
+@@ -122,6 +125,60 @@
      }
  }
 
@@ -93,7 +83,7 @@
  test.run                    yes
  test.target                 check
  test.env                    DYLD_LIBRARY_PATH=${worksrcpath}/magick/.libs
-@@ -129,6 +189,23 @@
+@@ -129,6 +186,23 @@
  # ImageMagick uses .la files at runtime to find its coder modules.
  destroot.delete_la_files    no
 
@@ -117,7 +107,7 @@
  variant graphviz description {Support Graphviz} {
      depends_lib-append      path:bin/dot:graphviz
      configure.args-replace  --without-gvc --with-gvc
-@@ -163,6 +240,11 @@
+@@ -163,6 +237,11 @@
 
  default_variants            +x11