On 2025/11/27 22:51, Kate wrote: > Hi, > > here is a patch updating the opam package to its latest version. > > I'm not too sure what the AUTOCONF_VERSION and AUTOMAKE_VERSION variables > are about but i assumed this is some helper to know which version was used > to generate the configure file etc. > If that's the case, i've fixed AUTOCONF_VERSION to be the version we > actually use, and removed AUTOMAKE_VERSION since we're not using automake.
CONFIGURE_STYLE includes "autoreconf" so autoreconf is run during the build, which runs aclocal (and sometimes also automake). by removing AUTOMAKE_VERSION you now use the default, 1.4, which is probably not what you want. this and AUTOCONF_VERSION should generally be whichever versions were used by upstream to generate things. (2.71 is correct here for autoconf). > If these variables are here for different purpose, feel free to just discard > these lines from my patch. > > Many thanks, > Kate > From 83f7fe5fa9a99ab72e1da55a25f40602142c2744 Mon Sep 17 00:00:00 2001 > From: Kate <[email protected]> > Date: Thu, 27 Nov 2025 20:08:11 +0000 > Subject: [PATCH] sysutils/opam: update to 2.5.0 > > --- > sysutils/opam/Makefile | 5 ++--- > sysutils/opam/distinfo | 4 ++-- > 2 files changed, 4 insertions(+), 5 deletions(-) > > diff --git a/sysutils/opam/Makefile b/sysutils/opam/Makefile > index d5dfd262064..cb4331a6236 100644 > --- a/sysutils/opam/Makefile > +++ b/sysutils/opam/Makefile > @@ -4,7 +4,7 @@ COMMENT = OCaml source-based package manager > > CATEGORIES = sysutils devel > > -V = 2.4.1 > +V = 2.5.0 > PKGNAME = opam-${V} > DISTNAME = opam-full-${V} > > @@ -40,8 +40,7 @@ CONFIGURE_ENV += CFLAGS="${CFLAGS}" \ > LDFLAGS="${LDFLAGS}" > CONFIGURE_STYLE = gnu autoreconf no-autoheader > CONFIGURE_ARGS = --with-vendored-deps > -AUTOCONF_VERSION = 2.69 > -AUTOMAKE_VERSION = 1.16 > +AUTOCONF_VERSION = 2.71 > > TEST_TARGET = tests > > diff --git a/sysutils/opam/distinfo b/sysutils/opam/distinfo > index b0b7b274eed..292c2683b7f 100644 > --- a/sysutils/opam/distinfo > +++ b/sysutils/opam/distinfo > @@ -1,2 +1,2 @@ > -SHA256 (opam-full-2.4.1.tar.gz) = > xNBTApeTxxTk5zQLEVdCjA+QeDWF+xfzUVgkemQEZ9k= > -SIZE (opam-full-2.4.1.tar.gz) = 14294433 > +SHA256 (opam-full-2.5.0.tar.gz) = > JfuY+WLEInwSYeFCr8aKQWd45ugZYAvV7j7EoYrh4jg= > +SIZE (opam-full-2.5.0.tar.gz) = 14465057 > -- > 2.51.1 >
