Skip to content

Commit 0f747f1

Browse files
committed
MacPorts update
1 parent 86e8688 commit 0f747f1

File tree

15 files changed

+701
-458
lines changed

15 files changed

+701
-458
lines changed

tools/MacPorts/devel/gnutls/Portfile

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ PortGroup muniversal 1.0
1010

1111
name gnutls
1212
version 3.7.9
13-
revision 2
13+
revision 3
1414
categories devel security
1515
# yes, some of the libs are GPL only
1616
license LGPL-2.1+ GPL-3+
@@ -35,7 +35,7 @@ subport ${name}-devel {
3535
conflicts ${name}
3636

3737
version 3.8.0
38-
revision 0
38+
revision 1
3939

4040
checksums rmd160 927aa3762946bcb3ef825832d7895f041e66a314 \
4141
sha256 0ea0d11a1660a1e63f960f157b197abe6d0c8cb3255be24e1fb3815930b9bdc5 \
@@ -65,7 +65,6 @@ conflicts_build autogen
6565

6666
depends_build-append \
6767
port:gettext \
68-
port:gtk-doc \
6968
port:pkgconfig
7069

7170
depends_lib-append \
@@ -89,11 +88,13 @@ post-patch {
8988
# Note: configure script detects zstd, but flags it as missing anyway
9089
configure.args-append \
9190
--disable-dependency-tracking \
91+
--disable-doc \
9292
--disable-guile \
9393
--disable-heartbeat-support \
9494
--disable-libdane \
9595
--disable-silent-rules \
9696
--disable-static \
97+
--enable-manpages \
9798
--enable-openssl-compatibility \
9899
--with-p11-kit \
99100
--with-system-priority-file="${prefix}/etc/gnutls/default-priorities" \
@@ -132,6 +133,14 @@ variant dane description {Build libdane using unbound libraries} {
132133
configure.args-delete --disable-libdane
133134
}
134135

136+
variant docs description {Install supplemental developer documentation} {
137+
depends_build-append \
138+
port:gtk-doc
139+
140+
configure.args-delete \
141+
--disable-doc
142+
}
143+
135144
# as of r120660 (#43881) unbound installs its root key file at ${prefix}/var/run/unbound/root.key
136145
# the following may be superfluous
137146

tools/MacPorts/devel/gnutls/Portfile.orig

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ PortGroup muniversal 1.0
1010

1111
name gnutls
1212
version 3.7.9
13-
revision 2
13+
revision 3
1414
categories devel security
1515
# yes, some of the libs are GPL only
1616
license LGPL-2.1+ GPL-3+
@@ -35,7 +35,7 @@ subport ${name}-devel {
3535
conflicts ${name}
3636

3737
version 3.8.0
38-
revision 0
38+
revision 1
3939

4040
checksums rmd160 927aa3762946bcb3ef825832d7895f041e66a314 \
4141
sha256 0ea0d11a1660a1e63f960f157b197abe6d0c8cb3255be24e1fb3815930b9bdc5 \
@@ -65,7 +65,6 @@ conflicts_build autogen
6565

6666
depends_build-append \
6767
port:gettext \
68-
port:gtk-doc \
6968
port:pkgconfig
7069

7170
depends_lib-append \
@@ -89,11 +88,13 @@ post-patch {
8988
# Note: configure script detects zstd, but flags it as missing anyway
9089
configure.args-append \
9190
--disable-dependency-tracking \
91+
--disable-doc \
9292
--disable-guile \
9393
--disable-heartbeat-support \
9494
--disable-libdane \
9595
--disable-silent-rules \
9696
--disable-static \
97+
--enable-manpages \
9798
--enable-openssl-compatibility \
9899
--with-p11-kit \
99100
--with-system-priority-file="${prefix}/etc/gnutls/default-priorities" \
@@ -132,6 +133,14 @@ variant dane description {Build libdane using unbound libraries} {
132133
configure.args-delete --disable-libdane
133134
}
134135

136+
variant docs description {Install supplemental developer documentation} {
137+
depends_build-append \
138+
port:gtk-doc
139+
140+
configure.args-delete \
141+
--disable-doc
142+
}
143+
135144
# as of r120660 (#43881) unbound installs its root key file at ${prefix}/var/run/unbound/root.key
136145
# the following may be superfluous
137146

tools/MacPorts/graphics/ImageMagick/Portfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ name ImageMagick
1313
# 6.9.11-61 changes the major version of libMagickCore which will
1414
# require increasing the revision of all ports that link with it.
1515
version 6.9.11-60
16-
revision 8
16+
revision 9
1717
checksums rmd160 1c293ba06fd43833be35efb4476e559bf137ccef \
1818
sha256 ba0fa683b0721d1f22b0ccb364e4092e9a7a34ffd3bd6348c82b50fd93b1d7ba \
1919
size 9167220

tools/MacPorts/graphics/ImageMagick/Portfile.orig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ name ImageMagick
1212
# 6.9.11-61 changes the major version of libMagickCore which will
1313
# require increasing the revision of all ports that link with it.
1414
version 6.9.11-60
15-
revision 8
15+
revision 9
1616
checksums rmd160 1c293ba06fd43833be35efb4476e559bf137ccef \
1717
sha256 ba0fa683b0721d1f22b0ccb364e4092e9a7a34ffd3bd6348c82b50fd93b1d7ba \
1818
size 9167220

tools/MacPorts/lang/libomp/Portfile.orig

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ subport libomp-devel {}
3030

3131
if {${os.platform} eq "darwin" && ${configure.cxx_stdlib} ne "libstdc++"} {
3232

33-
version 16.0.3
33+
version 16.0.6
3434
revision 0
3535

3636
if { ${subport} eq "libomp-devel" } {
@@ -46,13 +46,13 @@ if {${os.platform} eq "darwin" && ${configure.cxx_stdlib} ne "libstdc++"} {
4646

4747
checksums \
4848
openmp-${version}.src.tar.xz \
49-
rmd160 e62aa3e855e692554dfdf946daffe6606848241c \
50-
sha256 6ff2bb78c95d9b430203dcba50e41433e1f72696af7b2196c8056ac4bc9f2516 \
51-
size 1278080 \
49+
rmd160 de7bc41e8207077aee79e3ff45c782f489f8f383 \
50+
sha256 a2536f06373774f2829d892b72eea5f97bab20e69b26b03042d947f992eb8e38 \
51+
size 1278072 \
5252
cmake-${version}.src.tar.xz \
53-
rmd160 e12f24f24ed8ad6b2adb5973a2db5fd107e237f9 \
54-
sha256 b6d83c91f12757030d8361dedc5dd84357b3edb8da406b5d0850df8b6f7798b1 \
55-
size 9004
53+
rmd160 94ead500d749de031894e9a14c51ed17951c8fd7 \
54+
sha256 39d342a4161095d2f28fb1253e4585978ac50521117da666e2b1f6f28b62f514 \
55+
size 9008
5656

5757
if {${os.major} <= 12} {
5858
# kmp_alloc.c includes <atomic> but libc++ is not the default on

tools/MacPorts/lang/libomp/Portfile.patch

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
--- Portfile.orig 2023-05-10 16:10:39.000000000 -0700
1+
--- Portfile.orig 2023-07-03 17:37:19.000000000 -0700
22
+++ Portfile 2023-04-04 12:02:53.000000000 -0700
33
@@ -1,7 +1,7 @@
44
# -*- 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 @@
2323

2424
if {${os.platform} eq "darwin" && ${configure.cxx_stdlib} ne "libstdc++"} {
2525
-
26-
- version 16.0.3
26+
- version 16.0.6
2727
- revision 0
2828
-
2929
if { ${subport} eq "libomp-devel" } {
@@ -48,13 +48,13 @@
4848
-
4949
- checksums \
5050
- openmp-${version}.src.tar.xz \
51-
- rmd160 e62aa3e855e692554dfdf946daffe6606848241c \
52-
- sha256 6ff2bb78c95d9b430203dcba50e41433e1f72696af7b2196c8056ac4bc9f2516 \
53-
- size 1278080 \
51+
- rmd160 de7bc41e8207077aee79e3ff45c782f489f8f383 \
52+
- sha256 a2536f06373774f2829d892b72eea5f97bab20e69b26b03042d947f992eb8e38 \
53+
- size 1278072 \
5454
- cmake-${version}.src.tar.xz \
55-
- rmd160 e12f24f24ed8ad6b2adb5973a2db5fd107e237f9 \
56-
- sha256 b6d83c91f12757030d8361dedc5dd84357b3edb8da406b5d0850df8b6f7798b1 \
57-
- size 9004
55+
- rmd160 94ead500d749de031894e9a14c51ed17951c8fd7 \
56+
- sha256 39d342a4161095d2f28fb1253e4585978ac50521117da666e2b1f6f28b62f514 \
57+
- size 9008
5858
+ revision 0
5959

6060
if {${os.major} <= 12} {

0 commit comments

Comments
 (0)