Skip to content

Commit

Permalink
update MacPorts
Browse files Browse the repository at this point in the history
  • Loading branch information
@devernay
devernay committed Aug 28, 2024
1 parent f63b74d commit a64ef01
Show file tree
Hide file tree
Showing 7 changed files with 163 additions and 105 deletions.
53 changes: 31 additions & 22 deletions tools/MacPorts/devel/gnutls/Portfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,16 @@ subport ${name} {
subport ${name}-devel {
conflicts ${name}

version 3.8.6
version 3.8.7.1
revision 0

checksums rmd160 fa7d5faf5359e6de786eacb369b8c4077b15fd99 \
sha256 2e1588aae53cb32d43937f1f4eca28febd9c0c7aa1734fc5dd61a7e81e0ebcdd \
size 6517476
checksums rmd160 c8df6a44fe967c394ef6264f01817209f2e861f2 \
sha256 9ca0ddaccce28a74fa18d738744190afb3b0daebef74e6ad686bf7bef99abd60 \
size 6695404

depends_lib-append \
port:brotli \
port:zstd

patchfiles patch-lib-system-certs.c.diff
}
Expand Down Expand Up @@ -89,11 +93,9 @@ post-patch {
reinplace {/^#/d} {*}[glob ${worksrcpath}/lib/accelerated/x86/macosx/*.s]
}

# 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 \
Expand All @@ -103,9 +105,31 @@ configure.args-append \
--with-p11-kit \
--with-system-priority-file="${prefix}/etc/gnutls/default-priorities" \
--with-default-trust-store-pkcs11=pkcs11: \
ac_cv_prog_AWK=/usr/bin/awk

subport ${name} {
# Note: configure script detects zstd, but flags it as missing anyway
# the guile variant is only available for gnutls
configure.args-append \
--without-brotli \
--disable-guile \
--without-zstd \
ac_cv_prog_AWK=/usr/bin/awk

variant brotli description {Build brotli support} {
depends_lib-append \
port:brotli

configure.args-delete \
--without-brotli
}

variant guile description {Build guile 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
configure.args-replace --disable-guile --enable-guile
}
}

# https://trac.macports.org/wiki/WimplicitFunctionDeclaration#strchr
configure.checks.implicit_function_declaration.whitelist-append strchr
Expand All @@ -126,14 +150,6 @@ platform darwin 8 {
configure.cppflags-append -D__WORDSIZE=32
}

variant brotli description {Build brotli support} {
depends_lib-append \
port:brotli

configure.args-delete \
--without-brotli
}

variant dane description {Build libdane using unbound libraries} {
depends_lib-append port:unbound
configure.args-append --with-unbound-root-key-file="${prefix}/var/run/unbound/root.key"
Expand Down Expand Up @@ -164,13 +180,6 @@ if {[variant_isset dane] && ![file exists ${prefix}/var/run/unbound/root.key]} {
"
}

variant guile description {Build guile 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
configure.args-replace --disable-guile --enable-guile
}

if {${universal_possible} && [variant_isset universal]} {
set merger_host(x86_64) x86_64-apple-${os.platform}${os.major}
set merger_host(i386) i686-apple-${os.platform}${os.major}
Expand Down
53 changes: 31 additions & 22 deletions tools/MacPorts/devel/gnutls/Portfile.orig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,16 @@ subport ${name} {
subport ${name}-devel {
conflicts ${name}

version 3.8.6
version 3.8.7.1
revision 0

checksums rmd160 fa7d5faf5359e6de786eacb369b8c4077b15fd99 \
sha256 2e1588aae53cb32d43937f1f4eca28febd9c0c7aa1734fc5dd61a7e81e0ebcdd \
size 6517476
checksums rmd160 c8df6a44fe967c394ef6264f01817209f2e861f2 \
sha256 9ca0ddaccce28a74fa18d738744190afb3b0daebef74e6ad686bf7bef99abd60 \
size 6695404

depends_lib-append \
port:brotli \
port:zstd

patchfiles patch-lib-system-certs.c.diff
}
Expand Down Expand Up @@ -89,11 +93,9 @@ post-patch {
reinplace {/^#/d} {*}[glob ${worksrcpath}/lib/accelerated/x86/macosx/*.s]
}

# 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 \
Expand All @@ -103,9 +105,31 @@ configure.args-append \
--with-p11-kit \
--with-system-priority-file="${prefix}/etc/gnutls/default-priorities" \
--with-default-trust-store-pkcs11=pkcs11: \
ac_cv_prog_AWK=/usr/bin/awk

subport ${name} {
# Note: configure script detects zstd, but flags it as missing anyway
# the guile variant is only available for gnutls
configure.args-append \
--without-brotli \
--disable-guile \
--without-zstd \
ac_cv_prog_AWK=/usr/bin/awk

variant brotli description {Build brotli support} {
depends_lib-append \
port:brotli

configure.args-delete \
--without-brotli
}

variant guile description {Build guile 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
configure.args-replace --disable-guile --enable-guile
}
}

# https://trac.macports.org/wiki/WimplicitFunctionDeclaration#strchr
configure.checks.implicit_function_declaration.whitelist-append strchr
Expand All @@ -126,14 +150,6 @@ platform darwin 8 {
configure.cppflags-append -D__WORDSIZE=32
}

variant brotli description {Build brotli support} {
depends_lib-append \
port:brotli

configure.args-delete \
--without-brotli
}

variant dane description {Build libdane using unbound libraries} {
depends_lib-append port:unbound
configure.args-append --with-unbound-root-key-file="${prefix}/var/run/unbound/root.key"
Expand Down Expand Up @@ -164,13 +180,6 @@ if {[variant_isset dane] && ![file exists ${prefix}/var/run/unbound/root.key]} {
"
}

variant guile description {Build guile 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
configure.args-replace --disable-guile --enable-guile
}

if {${universal_possible} && [variant_isset universal]} {
set merger_host(x86_64) x86_64-apple-${os.platform}${os.major}
set merger_host(i386) i686-apple-${os.platform}${os.major}
Expand Down
8 changes: 4 additions & 4 deletions tools/MacPorts/graphics/ImageMagick/Portfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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-12
version 6.9.13-14
revision 0
checksums rmd160 b3696f5a09d6a89ee66fd128abb95f83401bca1c \
sha256 cc6189a5999c00f2fb8a0cdd2cddd8207c64bac5146639b8106e56e277c763bf \
size 9617108
checksums rmd160 528d9542ca873d49322ecaae1a7681b4241282ee \
sha256 2ca9cbb27f2c47e2c4e20e4c6b299ff692077ed1e5e01104fcf72176fd6e2254 \
size 9621048

categories graphics devel
maintainers {ryandesign @ryandesign}
Expand Down
8 changes: 4 additions & 4 deletions tools/MacPorts/graphics/ImageMagick/Portfile.orig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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-12
version 6.9.13-14
revision 0
checksums rmd160 b3696f5a09d6a89ee66fd128abb95f83401bca1c \
sha256 cc6189a5999c00f2fb8a0cdd2cddd8207c64bac5146639b8106e56e277c763bf \
size 9617108
checksums rmd160 528d9542ca873d49322ecaae1a7681b4241282ee \
sha256 2ca9cbb27f2c47e2c4e20e4c6b299ff692077ed1e5e01104fcf72176fd6e2254 \
size 9621048

categories graphics devel
maintainers {ryandesign @ryandesign}
Expand Down
70 changes: 45 additions & 25 deletions tools/MacPorts/net/curl/Portfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.8.0
checksums rmd160 d8494c0468d2a775d45ecb9f1e7c260d085689f3 \
sha256 0f58bb95fc330c8a46eeb3df5701b0d90c9d9bfcc42bd1cd08791d12551d4400 \
size 2748860
version 8.9.1
checksums rmd160 4d9eb5b927e1bda4562c38ecbf766a5329c9efbd \
sha256 f292f6cc051d5bbabf725ef85d432dfeacc8711dd717ea97612ae590643801e5 \
size 2782364

categories net www
platforms darwin freebsd
Expand Down Expand Up @@ -39,46 +39,37 @@ if {${name} eq ${subport}} {

depends_build path:bin/pkg-config:pkgconfig

depends_lib port:brotli \
port:libidn2 \
port:libpsl \
port:nghttp2 \
port:zlib \
port:zstd

patchfiles-append patch-docs-Makefile.in.diff
patchfiles-append x509asn1.patch
depends_lib port:zlib

configure.args --disable-silent-rules \
--enable-ipv6 \
--without-brotli \
--without-gnutls \
--without-gssapi \
--without-libgsasl \
--without-libidn2 \
--without-libpsl \
--without-librtmp \
--without-libssh2 \
--without-mbedtls \
--without-nghttp2 \
--without-nghttp3 \
--without-ngtcp2 \
--without-openssl \
--without-ssl \
--without-secure-transport \
--without-wolfssl \
--without-zstd \
--disable-ares \
--disable-ldap \
--disable-ldaps \
--with-brotli \
--with-libidn2=${prefix} \
--with-nghttp2=${prefix} \
--with-zlib=${prefix} \
--with-zstd \
ac_cv_prog_AWK=/usr/bin/awk

configure.cflags-append -mmacosx-version-min=${macosx_deployment_target}

configure.checks.implicit_function_declaration.whitelist-append strchr

configure.env PKG_CONFIG_PATH=${prefix}

if {${os.platform} eq "darwin" && ${os.major} < 10} {
depends_build-append port:cctools
configure.env-append NM=${prefix}/bin/nm
Expand Down Expand Up @@ -179,6 +170,11 @@ if {${name} eq ${subport}} {
configure.args-replace --disable-ares --enable-ares
}

variant brotli description {Support brotli compression} {
depends_lib-append port:brotli
configure.args-replace --without-brotli --with-brotli
}

variant darwinssl conflicts gnutls mbedtls ssl wolfssl description {Allow secure connections using Apple OS native TLS} {
configure.args-delete --without-ssl
configure.args-replace --without-secure-transport --with-secure-transport
Expand Down Expand Up @@ -220,19 +216,36 @@ if {${name} eq ${subport}} {
configure.args-replace --without-gssapi --with-gssapi
}

variant http2 description {Support HTTP/2} {
depends_lib-append port:nghttp2
configure.args-replace --without-nghttp2 --with-nghttp2=${prefix}
}

variant http3 requires gnutls description {Support HTTP/3 with nghttp3 and ngtcp2} {
depends_lib-append port:nghttp3 \
port:ngtcp2
configure.args-replace --without-nghttp3 --with-nghttp3=${prefix} \
--without-ngtcp2 --with-ngtcp2=${prefix}
}

variant idn description {Support internationalized domain names} {
depends_lib-append port:libidn2
configure.args-replace --without-libidn2 --with-libidn2=${prefix}
}

variant openldap description {Support performing Lightweight Directory Access Protocol queries with OpenLDAP} {
depends_lib-append path:lib/libldap.dylib:openldap
configure.args-replace --disable-ldap --enable-ldap
configure.args-replace --disable-ldaps --enable-ldaps
}

# Curl's psl support does not require its idn support but the libpsl port
# depends on the libidn2 port so we might as well enable curl's idn support.
variant psl requires idn description {Use the public suffix list to avoid privacy-leaking "supercookies"} {
depends_lib-append port:libpsl
configure.args-replace --without-libpsl --with-libpsl
}

variant rtmp description {Support RTMP media streams} {
depends_lib-append port:rtmpdump
configure.args-replace --without-librtmp --with-librtmp
Expand All @@ -251,6 +264,13 @@ if {${name} eq ${subport}} {
configure.args-append --with-ca-bundle=${prefix}/share/curl/curl-ca-bundle.crt
}

variant zstd description {Support zstd compression} {
depends_lib-append port:zstd
configure.args-replace --without-zstd --with-zstd
}

default_variants +brotli +http2 +idn +psl +zstd

if {![variant_isset darwinssl] && ![variant_isset gnutls] && ![variant_isset mbedtls] && ![variant_isset wolfssl]} {
default_variants-append +ssl
}
Expand Down Expand Up @@ -297,11 +317,11 @@ subport curl-ca-bundle {

# The approximate time (in seconds since the epoch) when the port maintainer
# updated the certdata.txt file in this port. (The output of "date +%s".)
set certdata_updated 1711566911
set certdata_updated 1722278626
# The upstream commit in which certdata.txt was last updated.
set certdata_commit bfb3a675d0569b740fe865ad6d2ac70f22163e98
set certdata_commit e3195e969188a333692e5e366d6fda6bb8d7c761
# The date (in YYYYMMDD format) that commit was pushed.
set certdata_date 20240215
set certdata_date 20240703
set certdata_file certdata.txt
# Using tar.bz2 would be preferable because it's smaller but upstream has
# disabled the creation of all but zip archives:
Expand All @@ -322,9 +342,9 @@ subport curl-ca-bundle {
distfiles-append ${certdata_distfile}:certdata

checksums-append ${certdata_distfile} \
rmd160 3194caff79a4773853d478e84287ed7f36e80485 \
sha256 3e7d59004501c3fa85cd504544edc23c7544766a783f14bc3c5fa6216ea58abf \
size 284455
rmd160 713e3d54ce7985975048c7c632352f6e42533a37 \
sha256 3d7b01525e04a2c9b896eb054e31767d113058ead9b00761f8ead014b861fd8e \
size 285603

extract.only ${curl_distfile}
extract.post_args-append ${worksrcdir}/Makefile \
Expand Down
Loading

0 comments on commit a64ef01

Please sign in to comment.