diff --git a/devel/ocaml-opam/Makefile b/devel/ocaml-opam/Makefile index 6ee5fe018b62..e8b861e2b1d5 100644 --- a/devel/ocaml-opam/Makefile +++ b/devel/ocaml-opam/Makefile @@ -1,58 +1,57 @@ PORTNAME= opam -DISTVERSION= 2.1.6 +DISTVERSION= 2.2.1 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 \ - gpatch:devel/patch \ - gmake:devel/gmake + gmake:devel/gmake \ + gpatch:devel/patch USES= gmake -ARCH!= uname -p -.if ${ARCH} == armv6 || ${ARCH} == armv7 -RUN_DEPENDS+= ${LOCALBASE}/bin/as:devel/binutils -USE_BINUTILS= yes -.endif GNU_CONFIGURE= yes -GNU_CONFIGURE_MANPREFIX=${PREFIX}/share -CONFIGURE_ARGS= --disable-checks +CONFIGURE_ARGS= --with-mccs --with-vendored-deps MAKE_JOBS_UNSAFE= yes -ALL_TARGET= cold-lib-ext cold-all - -LDFLAGS_armv6= -Wl,-z,notext -LDFLAGS_armv7= -Wl,-z,notext -LDFLAGS_powerpc= -Wl,-z,notext -LDFLAGS_i386= -Wl,-z,notext -LDFLAGS+= ${LDFLAGS_${ARCH}} +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 +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 + 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 +.include diff --git a/devel/ocaml-opam/distinfo b/devel/ocaml-opam/distinfo index 4b15d663b0ad..607fab395275 100644 --- a/devel/ocaml-opam/distinfo +++ b/devel/ocaml-opam/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1715883550 -SHA256 (opam-full-2.1.6.tar.gz) = d2af5edc85f552e0cf5ec0ddcc949d94f2dc550dc5df595174a06a4eaf8af628 -SIZE (opam-full-2.1.6.tar.gz) = 11704198 +TIMESTAMP = 1729018045 +SHA256 (opam-full-2.2.1.tar.gz) = 07ad3887f61e0bc61a0923faae16fcc141285ece5b248a9e2cd4f902523cc121 +SIZE (opam-full-2.2.1.tar.gz) = 12775920 diff --git a/devel/ocaml-opam/files/patch-shell_bootstrap-ocaml.sh b/devel/ocaml-opam/files/patch-shell_bootstrap-ocaml.sh index a70a0a9b9c99..0aa13d3cc539 100644 --- a/devel/ocaml-opam/files/patch-shell_bootstrap-ocaml.sh +++ b/devel/ocaml-opam/files/patch-shell_bootstrap-ocaml.sh @@ -1,12 +1,12 @@ --- shell/bootstrap-ocaml.sh.orig 2023-05-27 13:09:27 UTC +++ shell/bootstrap-ocaml.sh @@ -42,6 +42,9 @@ - mkdir -p ${V} + mkdir -p ocaml-${V} fi - cd ${V} + cd ocaml-${V} +for p in ../../src_ext/ocaml-patches/*.patch; do + patch -p1 < $p; +done; PATH_PREPEND= LIB_PREPEND= INC_PREPEND= diff --git a/devel/ocaml-opam/files/patch-src__ext_ocaml-patches_0001-Fix-relocation-ocaml-32-bit.patch b/devel/ocaml-opam/files/patch-src__ext_ocaml-patches_0001-arm-powerpc.patch similarity index 80% rename from devel/ocaml-opam/files/patch-src__ext_ocaml-patches_0001-Fix-relocation-ocaml-32-bit.patch rename to devel/ocaml-opam/files/patch-src__ext_ocaml-patches_0001-arm-powerpc.patch index 23e6f41d0a99..23d42ded5f29 100644 --- a/devel/ocaml-opam/files/patch-src__ext_ocaml-patches_0001-Fix-relocation-ocaml-32-bit.patch +++ b/devel/ocaml-opam/files/patch-src__ext_ocaml-patches_0001-arm-powerpc.patch @@ -1,35 +1,35 @@ ---- src_ext/ocaml-patches/0001-Fix-relocation-ocaml-32-bit.patch.orig 2023-05-27 13:17:37 UTC -+++ src_ext/ocaml-patches/0001-Fix-relocation-ocaml-32-bit.patch +--- src_ext/ocaml-patches/0001-arm-powerpc.patch 2023-05-27 13:17:37 UTC ++++ src_ext/ocaml-patches/0001-arm-powerpc.patch @@ -0,0 +1,32 @@ +--- a/configure.orig 2023-05-27 13:13:22 UTC ++++ a/configure -+@@ -14256,12 +14256,20 @@ case $host in #( ++@@ -14344,12 +14344,20 @@ case $host in #( + arch=amd64; system=win64 ;; #( + powerpc64le*-*-linux*) : + arch=power; model=ppc64le; system=elf ;; #( ++ powerpc64le*-*-freebsd*) : ++ arch=power; model=ppc64le; system=bsd_elf ;; #( + powerpc*-*-linux*) : + arch=power; if $arch64; then : + model=ppc64 + else + model=ppc + fi; system=elf ;; #( ++ powerpc*-*-freebsd*) : ++ arch=power; if $arch64; then : ++ model=ppc64 ++else ++ model=ppc ++fi; system=bsd_elf ;; #( + s390x*-*-linux*) : + arch=s390x; model=z10; system=elf ;; #( + # expected to match "gnueabihf" as well as "musleabihf" -+@@ -14281,6 +14289,8 @@ ++@@ -14369,6 +14377,8 @@ + arch=arm; model=armv6; system=linux_eabi ;; #( + armv6*-*-freebsd*) : + arch=arm; model=armv6; system=freebsd ;; #( ++ armv7*-*-freebsd*) : ++ arch=arm; model=armv7; system=freebsd ;; #( + earmv6*-*-netbsd*) : + arch=arm; model=armv6; system=netbsd ;; #( + earmv7*-*-netbsd*) : diff --git a/devel/ocaml-opam/pkg-plist b/devel/ocaml-opam/pkg-plist index dca86ff640d3..8e9a60673323 100644 --- a/devel/ocaml-opam/pkg-plist +++ b/devel/ocaml-opam/pkg-plist @@ -1,42 +1,45 @@ bin/opam bin/opam-installer share/man/man1/opam-admin-add-constraint.1.gz share/man/man1/opam-admin-add-hashes.1.gz share/man/man1/opam-admin-cache.1.gz share/man/man1/opam-admin-check.1.gz share/man/man1/opam-admin-filter.1.gz share/man/man1/opam-admin-help.1.gz share/man/man1/opam-admin-index.1.gz share/man/man1/opam-admin-lint.1.gz share/man/man1/opam-admin-list.1.gz share/man/man1/opam-admin-make.1.gz +share/man/man1/opam-admin-update-extrafiles.1.gz share/man/man1/opam-admin-upgrade.1.gz share/man/man1/opam-admin.1.gz share/man/man1/opam-clean.1.gz share/man/man1/opam-config.1.gz share/man/man1/opam-env.1.gz share/man/man1/opam-exec.1.gz share/man/man1/opam-help.1.gz share/man/man1/opam-info.1.gz share/man/man1/opam-init.1.gz share/man/man1/opam-install.1.gz share/man/man1/opam-installer.1.gz -share/man/man1/opam-list.1.gz share/man/man1/opam-lint.1.gz +share/man/man1/opam-list.1.gz share/man/man1/opam-lock.1.gz share/man/man1/opam-option.1.gz share/man/man1/opam-pin.1.gz share/man/man1/opam-reinstall.1.gz -share/man/man1/opam-remove.1.gz share/man/man1/opam-remote.1.gz +share/man/man1/opam-remove.1.gz share/man/man1/opam-repository.1.gz share/man/man1/opam-search.1.gz -share/man/man1/opam-source.1.gz share/man/man1/opam-show.1.gz +share/man/man1/opam-source.1.gz share/man/man1/opam-switch.1.gz -share/man/man1/opam-update.1.gz -share/man/man1/opam-upgrade.1.gz +share/man/man1/opam-tree.1.gz share/man/man1/opam-uninstall.1.gz share/man/man1/opam-unpin.1.gz +share/man/man1/opam-update.1.gz +share/man/man1/opam-upgrade.1.gz share/man/man1/opam-var.1.gz +share/man/man1/opam-why.1.gz share/man/man1/opam.1.gz