diff --git a/devel/ocaml-opam/Makefile b/devel/ocaml-opam/Makefile index 33dce793759d..2620d6c16343 100644 --- a/devel/ocaml-opam/Makefile +++ b/devel/ocaml-opam/Makefile @@ -1,59 +1,59 @@ PORTNAME= opam -DISTVERSION= 2.4.1 +DISTVERSION= 2.5.0 CATEGORIES= devel MASTER_SITES= https://github.com/ocaml/opam/releases/download/${DISTVERSION}/ PKGNAMEPREFIX= ocaml- DISTNAME= opam-full-${DISTVERSION} MAINTAINER= hannes@mehnert.org COMMENT= Source-based package manager for OCaml WWW= https://opam.ocaml.org/ LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= curl:ftp/curl \ gmake:devel/gmake USES= gmake GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-mccs --with-vendored-deps MAKE_JOBS_UNSAFE= yes ALL_TARGET= cold-all NOPRECIOUSMAKEVARS= yes OPTIONS_DEFINE= DARCS GIT MERCURIAL RSYNC OPTIONS_DEFAULT= GIT RSYNC NO_OPTIONS_SORT= yes RSYNC_DESC= Remote repository synchronized with Rsync DARCS_RUN_DEPENDS= darcs:devel/hs-darcs GIT_RUN_DEPENDS= git:devel/git MERCURIAL_RUN_DEPENDS= ${PY_MERCURIAL} RSYNC_RUN_DEPENDS= rsync:net/rsync .include .if ${ARCH} == armv6 || ${ARCH} == armv7 || ${ARCH} == i386 || \ ${ARCH} == powerpc LDFLAGS+= -Wl,-z,notext .endif .if ${ARCH} == armv6 || ${ARCH} == armv7 RUN_DEPENDS+= ${LOCALBASE}/bin/as:devel/binutils USE_BINUTILS= yes .endif .if ${ARCH} == powerpc LLD_UNSAFE= yes .endif pre-configure: @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} compiler) post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/opam-installer @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/opam .include diff --git a/devel/ocaml-opam/distinfo b/devel/ocaml-opam/distinfo index bbe83cdb1d0a..1a7e7aaf74e0 100644 --- a/devel/ocaml-opam/distinfo +++ b/devel/ocaml-opam/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1753269679 -SHA256 (opam-full-2.4.1.tar.gz) = c4d053029793c714e4e7340b1157428c0f90783585fb17f35158247a640467d9 -SIZE (opam-full-2.4.1.tar.gz) = 14294433 +TIMESTAMP = 1764284392 +SHA256 (opam-full-2.5.0.tar.gz) = 25fb98f962c4227c1261e142afc68a416778e6e819600bd5ee3ec4a18ae1e238 +SIZE (opam-full-2.5.0.tar.gz) = 14465057 diff --git a/devel/ocaml-opam/files/patch-Makefile b/devel/ocaml-opam/files/patch-Makefile index 9e275c51ad28..116aa3533dd9 100644 --- a/devel/ocaml-opam/files/patch-Makefile +++ b/devel/ocaml-opam/files/patch-Makefile @@ -1,11 +1,11 @@ ---- Makefile.orig 2023-05-27 12:33:21 UTC +--- Makefile.orig 2025-11-25 15:04:46 UTC +++ Makefile -@@ -258,7 +258,7 @@ +@@ -282,7 +282,7 @@ compiler: .PHONY: compiler cold compiler: -- env MAKE=$(MAKE) BOOTSTRAP_EXTRA_OPTS= BOOTSTRAP_TARGETS=world.opt BOOTSTRAP_ROOT=.. BOOTSTRAP_DIR=bootstrap ./shell/bootstrap-ocaml.sh $(OCAML_PORT) -+ env CC="$(CC)" MAKE=$(MAKE) BOOTSTRAP_EXTRA_OPTS= BOOTSTRAP_TARGETS=world.opt BOOTSTRAP_ROOT=.. BOOTSTRAP_DIR=bootstrap ./shell/bootstrap-ocaml.sh $(OCAML_PORT) +- env MAKE=$(MAKE) BOOTSTRAP_EXTRA_OPTS= BOOTSTRAP_TARGETS=world.opt BOOTSTRAP_ROOT=.. BOOTSTRAP_DIR=bootstrap MAKEFLAGS= MAKEOVERRIDES= ./shell/bootstrap-ocaml.sh $(OCAML_PORT) ++ env CC="$(CC)" MAKE=$(MAKE) BOOTSTRAP_EXTRA_OPTS= BOOTSTRAP_TARGETS=world.opt BOOTSTRAP_ROOT=.. BOOTSTRAP_DIR=bootstrap MAKEFLAGS= MAKEOVERRIDES= ./shell/bootstrap-ocaml.sh $(OCAML_PORT) src_ext/secondary/ocaml/bin/ocaml: - env MAKE=$(MAKE) BOOTSTRAP_EXTRA_OPTS="--disable-ocamldoc --disable-debug-runtime --disable-debugger" BOOTSTRAP_TARGETS="world opt" BOOTSTRAP_ROOT=../.. BOOTSTRAP_DIR=src_ext/secondary ./shell/bootstrap-ocaml.sh $(OCAML_PORT) + env MAKE=$(MAKE) BOOTSTRAP_EXTRA_OPTS="--disable-ocamldoc --disable-debug-runtime --disable-debugger" BOOTSTRAP_TARGETS="world opt" BOOTSTRAP_ROOT=../.. BOOTSTRAP_DIR=src_ext/secondary MAKEFLAGS= MAKEOVERRIDES= ./shell/bootstrap-ocaml.sh $(OCAML_PORT)