From: Stuart Henderson Subject: brotli update To: Pascal Stumpf Cc: ports Date: Sat, 6 Dec 2025 13:22:37 +0000 I'm currently testing reverse dependencies; if that goes well, ok to update brotli? I would have preferred not to switch to cmake (it means that curl couldn't enable brotli unless we make further changes[1], because cmake depends on curl) but upstream removed autoconf support in 1.1.0. https://github.com/google/brotli/releases/tag/v1.1.0 https://github.com/google/brotli/releases/tag/v1.2.0 [1] macports has https://ports.macports.org/port/cmake-bootstrap/ which doesn't seem like a bad idea... Index: Makefile =================================================================== RCS file: /cvs/ports/archivers/brotli/Makefile,v diff -u -p -r1.13 Makefile --- Makefile 22 Feb 2025 19:26:07 -0000 1.13 +++ Makefile 6 Dec 2025 13:08:27 -0000 @@ -2,12 +2,12 @@ COMMENT = generic lossless compressor GH_ACCOUNT = google GH_PROJECT = brotli -GH_TAGNAME = v1.0.9 -REVISION = 1 +GH_TAGNAME = v1.2.0 -SHARED_LIBS += brotlicommon 1.2 # 1.0.9 -SHARED_LIBS += brotlidec 1.1 # 1.0.9 -SHARED_LIBS += brotlienc 1.0 # 1.0.9 +# upstream version from BROTLI_ABI_* in c/common/version.h +SHARED_LIBS += brotlicommon 2.0 # 3.0 +SHARED_LIBS += brotlidec 2.0 # 3.0 +SHARED_LIBS += brotlienc 2.0 # 3.0 CATEGORIES = archivers @@ -18,20 +18,11 @@ PERMIT_PACKAGE = Yes WANTLIB += c m -CONFIGURE_STYLE = autoreconf -AUTORECONF = ./bootstrap -AUTOCONF_VERSION = 2.71 -AUTOMAKE_VERSION = 1.16 +MODULES = devel/cmake DEBUG_PACKAGES = ${BUILD_PACKAGES} post-install: - ${INSTALL_MAN} ${WRKSRC}/docs/brotli.1 ${PREFIX}/man/man1 - -do-test: - -ln -s .. ${WRKSRC}/tests/bin - -ln -s . ${WRKSRC}/tests/tests - mkdir -p ${WRKSRC}/tests/bin/tmp - cd ${WRKSRC}/tests; ${MAKE_PROGRAM} + ln ${PREFIX}/bin/brotli ${PREFIX}/bin/brcat .include Index: distinfo =================================================================== RCS file: /cvs/ports/archivers/brotli/distinfo,v diff -u -p -r1.8 distinfo --- distinfo 18 Oct 2020 18:37:19 -0000 1.8 +++ distinfo 6 Dec 2025 13:08:27 -0000 @@ -1,2 +1,2 @@ -SHA256 (brotli-1.0.9.tar.gz) = +ejYHQQFumbRgVKa9CozVPg4yTkJX/mZMNpqqc32/kY= -SIZE (brotli-1.0.9.tar.gz) = 486984 +SHA256 (brotli-1.2.0.tar.gz) = gWyW6Ojxk7QBUdrX6P83sSIdAZ28ucNc0/rb/mR33+w= +SIZE (brotli-1.2.0.tar.gz) = 646315 Index: patches/patch-bootstrap =================================================================== RCS file: patches/patch-bootstrap diff -N patches/patch-bootstrap --- patches/patch-bootstrap 22 Feb 2025 19:26:07 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ -Index: bootstrap ---- bootstrap.orig -+++ bootstrap -@@ -5,10 +5,6 @@ echo "WARNING: OSX autogen build is not supported" - fi - - REQUIRED='is required, but not installed.' --bc -v >/dev/null 2>&1 || { echo >&2 "'bc' $REQUIRED"; exit 1; } --if [ `uname -s` != "FreeBSD" ]; then --sed --version >/dev/null 2>&1 || { echo >&2 "'sed' $REQUIRED"; exit 1; } --fi - autoreconf --version >/dev/null 2>&1 || { echo >&2 "'autoconf' $REQUIRED"; exit 1; } - - # If libtool is not installed -> "error: Libtool library used but 'LIBTOOL' is undefined" Index: patches/patch-tests_compatibility_test_sh =================================================================== RCS file: patches/patch-tests_compatibility_test_sh diff -N patches/patch-tests_compatibility_test_sh --- patches/patch-tests_compatibility_test_sh 11 Mar 2022 18:16:18 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,8 +0,0 @@ ---- tests/compatibility_test.sh.orig Mon Apr 10 10:42:24 2017 -+++ tests/compatibility_test.sh Tue Apr 18 18:31:26 2017 -@@ -1,4 +1,4 @@ --#!/usr/bin/env bash -+#!/bin/sh - # - # Test that the brotli command-line tool can decompress old brotli-compressed - # files. Index: patches/patch-tests_roundtrip_test_sh =================================================================== RCS file: patches/patch-tests_roundtrip_test_sh diff -N patches/patch-tests_roundtrip_test_sh --- patches/patch-tests_roundtrip_test_sh 11 Mar 2022 18:16:18 -0000 1.4 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,9 +0,0 @@ -Index: tests/roundtrip_test.sh ---- tests/roundtrip_test.sh.orig -+++ tests/roundtrip_test.sh -@@ -1,4 +1,4 @@ --#!/usr/bin/env bash -+#!/bin/sh - # - # Roundtrip test for the brotli command-line tool. - # Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/archivers/brotli/pkg/PLIST,v diff -u -p -r1.7 PLIST --- pkg/PLIST 22 Feb 2025 19:26:07 -0000 1.7 +++ pkg/PLIST 6 Dec 2025 13:08:27 -0000 @@ -1,21 +1,19 @@ +@bin bin/brcat @bin bin/brotli include/brotli/ include/brotli/decode.h include/brotli/encode.h include/brotli/port.h +include/brotli/shared_dictionary.h include/brotli/types.h -@static-lib lib/libbrotlicommon.a -@comment lib/libbrotlicommon.la @lib lib/libbrotlicommon.so.${LIBbrotlicommon_VERSION} -@static-lib lib/libbrotlidec.a -@comment lib/libbrotlidec.la @lib lib/libbrotlidec.so.${LIBbrotlidec_VERSION} -@static-lib lib/libbrotlienc.a -@comment lib/libbrotlienc.la @lib lib/libbrotlienc.so.${LIBbrotlienc_VERSION} lib/pkgconfig/libbrotlicommon.pc lib/pkgconfig/libbrotlidec.pc lib/pkgconfig/libbrotlienc.pc @man man/man1/brotli.1 -share/doc/brotli/ -share/doc/brotli/README +@comment @man man/man3/constants.h.3 +@comment @man man/man3/decode.h.3 +@comment @man man/man3/encode.h.3 +@comment @man man/man3/types.h.3