Attachment #254270 for bug #280227

Lines 1-5 Link Here

(-)b/devel/ocaml-opam/Makefile (-3 / +3 lines)
1	PORTNAME= opam	1	PORTNAME= opam
2	DISTVERSION= 2.1.6	2	DISTVERSION= 2.2.1
3	CATEGORIES= devel	3	CATEGORIES= devel
4	MASTER_SITES= https://github.com/ocaml/opam/releases/download/${DISTVERSION}/	4	MASTER_SITES= https://github.com/ocaml/opam/releases/download/${DISTVERSION}/
5	PKGNAMEPREFIX= ocaml-	5	PKGNAMEPREFIX= ocaml-
Lines 24-33 USE_BINUTILS= yes Link Here
24		24
25	GNU_CONFIGURE= yes	25	GNU_CONFIGURE= yes
26	GNU_CONFIGURE_MANPREFIX=${PREFIX}/share	26	GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
27	CONFIGURE_ARGS= --disable-checks	27	CONFIGURE_ARGS= --with-vendored-deps --with-mccs
28		28
29	MAKE_JOBS_UNSAFE= yes	29	MAKE_JOBS_UNSAFE= yes
30	ALL_TARGET= cold-lib-ext cold-all	30	ALL_TARGET= cold-all
31		31
32	LDFLAGS_armv6= -Wl,-z,notext	32	LDFLAGS_armv6= -Wl,-z,notext
33	LDFLAGS_armv7= -Wl,-z,notext	33	LDFLAGS_armv7= -Wl,-z,notext

Lines 1-3 Link Here

(-)b/devel/ocaml-opam/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1715883550	1	TIMESTAMP = 1729018045
2	SHA256 (opam-full-2.1.6.tar.gz) = d2af5edc85f552e0cf5ec0ddcc949d94f2dc550dc5df595174a06a4eaf8af628	2	SHA256 (opam-full-2.2.1.tar.gz) = 07ad3887f61e0bc61a0923faae16fcc141285ece5b248a9e2cd4f902523cc121
3	SIZE (opam-full-2.1.6.tar.gz) = 11704198	3	SIZE (opam-full-2.2.1.tar.gz) = 12775920

Lines 1-9 Link Here

(-)b/devel/ocaml-opam/files/patch-shell_bootstrap-ocaml.sh (-2 / +2 lines)
1	--- shell/bootstrap-ocaml.sh.orig 2023-05-27 13:09:27 UTC	1	--- shell/bootstrap-ocaml.sh.orig 2023-05-27 13:09:27 UTC
2	+++ shell/bootstrap-ocaml.sh	2	+++ shell/bootstrap-ocaml.sh
3	@@ -42,6 +42,9 @@	3	@@ -42,6 +42,9 @@
4	mkdir -p ${V}	4	mkdir -p ocaml-${V}
5	fi	5	fi
6	cd ${V}	6	cd ocaml-${V}
7	+for p in ../../src_ext/ocaml-patches/*.patch; do	7	+for p in ../../src_ext/ocaml-patches/*.patch; do
8	+ patch -p1 < $p;	8	+ patch -p1 < $p;
9	+done;	9	+done;




--- 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
+@@ -14344,12 +14344,20 @@ case $host in #(
+     arch=amd64; system=win64 ;; #(
+   powerpc64le*-*-linux*) :
+     arch=power; model=ppc64le; system=elf ;; #(

+   s390x*-*-linux*) :
+     arch=s390x; model=z10; system=elf ;; #(
+   # expected to match "gnueabihf" as well as "musleabihf"
+@@ -14369,6 +14377,8 @@
+     arch=arm; model=armv6; system=linux_eabi ;; #(
+   armv6*-*-freebsd*) :
+     arch=arm; model=armv6; system=freebsd ;; #(




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-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-tree.1.gz
share/man/man1/opam-upgrade.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

Return to bug 280227

Lines 1-9 Link Here

(-)b/devel/ocaml-opam/files/patch-src__ext_ocaml-patches_0001-arm-powerpc.patch (-4 / +4 lines)
1	--- src_ext/ocaml-patches/0001-Fix-relocation-ocaml-32-bit.patch.orig 2023-05-27 13:17:37 UTC	1	--- src_ext/ocaml-patches/0001-arm-powerpc.patch 2023-05-27 13:17:37 UTC
2	+++ src_ext/ocaml-patches/0001-Fix-relocation-ocaml-32-bit.patch	2	+++ src_ext/ocaml-patches/0001-arm-powerpc.patch
3	@@ -0,0 +1,32 @@	3	@@ -0,0 +1,32 @@
4	+--- a/configure.orig 2023-05-27 13:13:22 UTC	4	+--- a/configure.orig 2023-05-27 13:13:22 UTC
5	++++ a/configure	5	++++ a/configure
6	+@@ -14256,12 +14256,20 @@ case $host in #(	6	+@@ -14344,12 +14344,20 @@ case $host in #(
7	+ arch=amd64; system=win64 ;; #(	7	+ arch=amd64; system=win64 ;; #(
8	+ powerpc64le--linux*) :	8	+ powerpc64le--linux*) :
9	+ arch=power; model=ppc64le; system=elf ;; #(	9	+ arch=power; model=ppc64le; system=elf ;; #(
Lines 24-30 Link Here
24	+ s390x--linux*) :	24	+ s390x--linux*) :
25	+ arch=s390x; model=z10; system=elf ;; #(	25	+ arch=s390x; model=z10; system=elf ;; #(
26	+ # expected to match "gnueabihf" as well as "musleabihf"	26	+ # expected to match "gnueabihf" as well as "musleabihf"
27	+@@ -14281,6 +14289,8 @@	27	+@@ -14369,6 +14377,8 @@
28	+ arch=arm; model=armv6; system=linux_eabi ;; #(	28	+ arch=arm; model=armv6; system=linux_eabi ;; #(
29	+ armv6--freebsd*) :	29	+ armv6--freebsd*) :
30	+ arch=arm; model=armv6; system=freebsd ;; #(	30	+ arch=arm; model=armv6; system=freebsd ;; #(

Lines 10-15 share/man/man1/opam-admin-index.1.gz Link Here

(-)b/devel/ocaml-opam/pkg-plist (-5 / +8 lines)
10	share/man/man1/opam-admin-lint.1.gz	10	share/man/man1/opam-admin-lint.1.gz
11	share/man/man1/opam-admin-list.1.gz	11	share/man/man1/opam-admin-list.1.gz
12	share/man/man1/opam-admin-make.1.gz	12	share/man/man1/opam-admin-make.1.gz
		13	share/man/man1/opam-admin-update-extrafiles.1.gz
13	share/man/man1/opam-admin-upgrade.1.gz	14	share/man/man1/opam-admin-upgrade.1.gz
14	share/man/man1/opam-admin.1.gz	15	share/man/man1/opam-admin.1.gz
15	share/man/man1/opam-clean.1.gz	16	share/man/man1/opam-clean.1.gz
Lines 21-42 share/man/man1/opam-info.1.gz Link Here
21	share/man/man1/opam-init.1.gz	22	share/man/man1/opam-init.1.gz
22	share/man/man1/opam-install.1.gz	23	share/man/man1/opam-install.1.gz
23	share/man/man1/opam-installer.1.gz	24	share/man/man1/opam-installer.1.gz
24	share/man/man1/opam-list.1.gz
25	share/man/man1/opam-lint.1.gz	25	share/man/man1/opam-lint.1.gz
		26	share/man/man1/opam-list.1.gz
26	share/man/man1/opam-lock.1.gz	27	share/man/man1/opam-lock.1.gz
27	share/man/man1/opam-option.1.gz	28	share/man/man1/opam-option.1.gz
28	share/man/man1/opam-pin.1.gz	29	share/man/man1/opam-pin.1.gz
29	share/man/man1/opam-reinstall.1.gz	30	share/man/man1/opam-reinstall.1.gz
30	share/man/man1/opam-remove.1.gz
31	share/man/man1/opam-remote.1.gz	31	share/man/man1/opam-remote.1.gz
		32	share/man/man1/opam-remove.1.gz
32	share/man/man1/opam-repository.1.gz	33	share/man/man1/opam-repository.1.gz
33	share/man/man1/opam-search.1.gz	34	share/man/man1/opam-search.1.gz
34	share/man/man1/opam-source.1.gz
35	share/man/man1/opam-show.1.gz	35	share/man/man1/opam-show.1.gz
		36	share/man/man1/opam-source.1.gz
36	share/man/man1/opam-switch.1.gz	37	share/man/man1/opam-switch.1.gz
37	share/man/man1/opam-update.1.gz	38	share/man/man1/opam-tree.1.gz
38	share/man/man1/opam-upgrade.1.gz
39	share/man/man1/opam-uninstall.1.gz	39	share/man/man1/opam-uninstall.1.gz
40	share/man/man1/opam-unpin.1.gz	40	share/man/man1/opam-unpin.1.gz
		41	share/man/man1/opam-update.1.gz
		42	share/man/man1/opam-upgrade.1.gz
41	share/man/man1/opam-var.1.gz	43	share/man/man1/opam-var.1.gz
		44	share/man/man1/opam-why.1.gz
42	share/man/man1/opam.1.gz	45	share/man/man1/opam.1.gz