MacPorts update

NatronGitHub · Jul 4, 2023 · 0f747f1 · 0f747f1
1 parent 86e8688
commit 0f747f1
Show file tree

Hide file tree

Showing 15 changed files with 701 additions and 458 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.9
-revision        2
+revision        3
 categories      devel security
 # yes, some of the libs are GPL only
 license         LGPL-2.1+ GPL-3+
@@ -35,7 +35,7 @@ subport ${name}-devel {
     conflicts   ${name}
 
     version     3.8.0
-    revision    0
+    revision    1
 
     checksums   rmd160  927aa3762946bcb3ef825832d7895f041e66a314 \
                 sha256  0ea0d11a1660a1e63f960f157b197abe6d0c8cb3255be24e1fb3815930b9bdc5 \
@@ -65,7 +65,6 @@ conflicts_build autogen
 
 depends_build-append \
                 port:gettext \
-                port:gtk-doc \
                 port:pkgconfig
 
 depends_lib-append \
@@ -89,11 +88,13 @@ post-patch {
 # Note: configure script detects zstd, but flags it as missing anyway
 configure.args-append \
                 --disable-dependency-tracking \
+                --disable-doc \
                 --disable-guile \
                 --disable-heartbeat-support \
                 --disable-libdane \
                 --disable-silent-rules \
                 --disable-static \
+                --enable-manpages \
                 --enable-openssl-compatibility \
                 --with-p11-kit \
                 --with-system-priority-file="${prefix}/etc/gnutls/default-priorities" \
@@ -132,6 +133,14 @@ variant dane description {Build libdane using unbound libraries} {
     configure.args-delete   --disable-libdane
 }
 
+variant docs description {Install supplemental developer documentation} {
+    depends_build-append \
+                port:gtk-doc
+
+    configure.args-delete \
+                --disable-doc
+}
+
 # as of r120660 (#43881) unbound installs its root key file at ${prefix}/var/run/unbound/root.key
 # the following may be superfluous
 

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.9
-revision        2
+revision        3
 categories      devel security
 # yes, some of the libs are GPL only
 license         LGPL-2.1+ GPL-3+
@@ -35,7 +35,7 @@ subport ${name}-devel {
     conflicts   ${name}
 
     version     3.8.0
-    revision    0
+    revision    1
 
     checksums   rmd160  927aa3762946bcb3ef825832d7895f041e66a314 \
                 sha256  0ea0d11a1660a1e63f960f157b197abe6d0c8cb3255be24e1fb3815930b9bdc5 \
@@ -65,7 +65,6 @@ conflicts_build autogen
 
 depends_build-append \
                 port:gettext \
-                port:gtk-doc \
                 port:pkgconfig
 
 depends_lib-append \
@@ -89,11 +88,13 @@ post-patch {
 # Note: configure script detects zstd, but flags it as missing anyway
 configure.args-append \
                 --disable-dependency-tracking \
+                --disable-doc \
                 --disable-guile \
                 --disable-heartbeat-support \
                 --disable-libdane \
                 --disable-silent-rules \
                 --disable-static \
+                --enable-manpages \
                 --enable-openssl-compatibility \
                 --with-p11-kit \
                 --with-system-priority-file="${prefix}/etc/gnutls/default-priorities" \
@@ -132,6 +133,14 @@ variant dane description {Build libdane using unbound libraries} {
     configure.args-delete   --disable-libdane
 }
 
+variant docs description {Install supplemental developer documentation} {
+    depends_build-append \
+                port:gtk-doc
+
+    configure.args-delete \
+                --disable-doc
+}
+
 # as of r120660 (#43881) unbound installs its root key file at ${prefix}/var/run/unbound/root.key
 # the following may be superfluous
 

diff --git a/tools/MacPorts/graphics/ImageMagick/Portfile b/tools/MacPorts/graphics/ImageMagick/Portfile
@@ -13,7 +13,7 @@ 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                    8
+revision                    9
 checksums                   rmd160  1c293ba06fd43833be35efb4476e559bf137ccef \
                             sha256  ba0fa683b0721d1f22b0ccb364e4092e9a7a34ffd3bd6348c82b50fd93b1d7ba \
                             size    9167220

diff --git a/tools/MacPorts/graphics/ImageMagick/Portfile.orig b/tools/MacPorts/graphics/ImageMagick/Portfile.orig
@@ -12,7 +12,7 @@ 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                    8
+revision                    9
 checksums                   rmd160  1c293ba06fd43833be35efb4476e559bf137ccef \
                             sha256  ba0fa683b0721d1f22b0ccb364e4092e9a7a34ffd3bd6348c82b50fd93b1d7ba \
                             size    9167220

diff --git a/tools/MacPorts/lang/libomp/Portfile.orig b/tools/MacPorts/lang/libomp/Portfile.orig
@@ -30,7 +30,7 @@ subport                 libomp-devel {}
 
 if {${os.platform} eq "darwin" && ${configure.cxx_stdlib} ne "libstdc++"} {
 
-    version             16.0.3
+    version             16.0.6
     revision            0
 
     if { ${subport} eq "libomp-devel" } {
@@ -46,13 +46,13 @@ if {${os.platform} eq "darwin" && ${configure.cxx_stdlib} ne "libstdc++"} {
 
     checksums \
         openmp-${version}.src.tar.xz \
-        rmd160  e62aa3e855e692554dfdf946daffe6606848241c \
-        sha256  6ff2bb78c95d9b430203dcba50e41433e1f72696af7b2196c8056ac4bc9f2516 \
-        size    1278080 \
+        rmd160  de7bc41e8207077aee79e3ff45c782f489f8f383 \
+        sha256  a2536f06373774f2829d892b72eea5f97bab20e69b26b03042d947f992eb8e38 \
+        size    1278072 \
         cmake-${version}.src.tar.xz \
-        rmd160  e12f24f24ed8ad6b2adb5973a2db5fd107e237f9 \
-        sha256  b6d83c91f12757030d8361dedc5dd84357b3edb8da406b5d0850df8b6f7798b1 \
-        size    9004
+        rmd160  94ead500d749de031894e9a14c51ed17951c8fd7 \
+        sha256  39d342a4161095d2f28fb1253e4585978ac50521117da666e2b1f6f28b62f514 \
+        size    9008
 
     if {${os.major} <= 12} {
         # kmp_alloc.c includes <atomic> but libc++ is not the default on

diff --git a/tools/MacPorts/lang/libomp/Portfile.patch b/tools/MacPorts/lang/libomp/Portfile.patch
@@ -1,4 +1,4 @@
---- Portfile.orig	2023-05-10 16:10:39.000000000 -0700
+--- Portfile.orig	2023-07-03 17:37:19.000000000 -0700
 +++ Portfile	2023-04-04 12:02:53.000000000 -0700
 @@ -1,7 +1,7 @@
  # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
@@ -23,7 +23,7 @@
 
  if {${os.platform} eq "darwin" && ${configure.cxx_stdlib} ne "libstdc++"} {
 -
--    version             16.0.3
+-    version             16.0.6
 -    revision            0
 -
      if { ${subport} eq "libomp-devel" } {
@@ -48,13 +48,13 @@
 -
 -    checksums \
 -        openmp-${version}.src.tar.xz \
--        rmd160  e62aa3e855e692554dfdf946daffe6606848241c \
--        sha256  6ff2bb78c95d9b430203dcba50e41433e1f72696af7b2196c8056ac4bc9f2516 \
--        size    1278080 \
+-        rmd160  de7bc41e8207077aee79e3ff45c782f489f8f383 \
+-        sha256  a2536f06373774f2829d892b72eea5f97bab20e69b26b03042d947f992eb8e38 \
+-        size    1278072 \
 -        cmake-${version}.src.tar.xz \
--        rmd160  e12f24f24ed8ad6b2adb5973a2db5fd107e237f9 \
--        sha256  b6d83c91f12757030d8361dedc5dd84357b3edb8da406b5d0850df8b6f7798b1 \
--        size    9004
+-        rmd160  94ead500d749de031894e9a14c51ed17951c8fd7 \
+-        sha256  39d342a4161095d2f28fb1253e4585978ac50521117da666e2b1f6f28b62f514 \
+-        size    9008
 +    revision            0
 
      if {${os.major} <= 12} {